From f215ff1bcf69bb6835c9bead6c79ae21ab4ed79e Mon Sep 17 00:00:00 2001
From: "xueli.xue" <xueli.xue@dianping.com>
Date: Fri, 24 Feb 2017 19:29:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=A4=87=E6=B3=A8=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                                | 1 +
 .../core/callback/XxlJobLogCallbackServerHandler.java    | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 72a72b90..d82ac1b9 100644
--- a/README.md
+++ b/README.md
@@ -710,6 +710,7 @@ Tips: 历史版本(V1.3.x)目前已经Release至稳定版本, 进入维护阶段
 - 3、任务跨天执行时生成多份日志文件的问题修复；
 - 4、底层日志底层日志调整，非敏感日志level调整为debug；
 - 5、升级数据库连接池c3p0版本；
+- 6、底层代码重构和逻辑优化以及CleanCode；
 
 
 #### 规划中
diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/callback/XxlJobLogCallbackServerHandler.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/callback/XxlJobLogCallbackServerHandler.java
index 846f0433..af388eae 100644
--- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/callback/XxlJobLogCallbackServerHandler.java
+++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/callback/XxlJobLogCallbackServerHandler.java
@@ -101,10 +101,17 @@ public class XxlJobLogCallbackServerHandler extends AbstractHandler {
 			}
 		}
 
+		// handle msg
+		StringBuffer handleMsg = new StringBuffer();
+		handleMsg.append("执行备注：").append(requestModel.getMsg());
+		if (childTriggerMsg !=null) {
+			handleMsg.append("<br>子任务触发备注：").append(childTriggerMsg);
+		}
+
 		// success, save log
 		log.setHandleTime(new Date());
 		log.setHandleStatus(requestModel.getStatus());
-		log.setHandleMsg(requestModel.getMsg() + childTriggerMsg);
+		log.setHandleMsg(handleMsg.toString());
 		DynamicSchedulerUtil.xxlJobLogDao.updateHandleInfo(log);
 
 		return new ResponseModel(ResponseModel.SUCCESS, null);