xueli.xue 9 лет назад
Родитель
Сommit
f215ff1bcf

+ 1 - 0
README.md Просмотреть файл

710
 - 3、任务跨天执行时生成多份日志文件的问题修复;
710
 - 3、任务跨天执行时生成多份日志文件的问题修复;
711
 - 4、底层日志底层日志调整,非敏感日志level调整为debug;
711
 - 4、底层日志底层日志调整,非敏感日志level调整为debug;
712
 - 5、升级数据库连接池c3p0版本;
712
 - 5、升级数据库连接池c3p0版本;
713
+- 6、底层代码重构和逻辑优化以及CleanCode;
713
 
714
 
714
 
715
 
715
 #### 规划中
716
 #### 规划中

+ 8 - 1
xxl-job-admin/src/main/java/com/xxl/job/admin/core/callback/XxlJobLogCallbackServerHandler.java Просмотреть файл

101
 			}
101
 			}
102
 		}
102
 		}
103
 
103
 
104
+		// handle msg
105
+		StringBuffer handleMsg = new StringBuffer();
106
+		handleMsg.append("执行备注:").append(requestModel.getMsg());
107
+		if (childTriggerMsg !=null) {
108
+			handleMsg.append("<br>子任务触发备注:").append(childTriggerMsg);
109
+		}
110
+
104
 		// success, save log
111
 		// success, save log
105
 		log.setHandleTime(new Date());
112
 		log.setHandleTime(new Date());
106
 		log.setHandleStatus(requestModel.getStatus());
113
 		log.setHandleStatus(requestModel.getStatus());
107
-		log.setHandleMsg(requestModel.getMsg() + childTriggerMsg);
114
+		log.setHandleMsg(handleMsg.toString());
108
 		DynamicSchedulerUtil.xxlJobLogDao.updateHandleInfo(log);
115
 		DynamicSchedulerUtil.xxlJobLogDao.updateHandleInfo(log);
109
 
116
 
110
 		return new ResponseModel(ResponseModel.SUCCESS, null);
117
 		return new ResponseModel(ResponseModel.SUCCESS, null);