diff --git a/powerjob-client/pom.xml b/powerjob-client/pom.xml index d464c9d4..d1e080d8 100644 --- a/powerjob-client/pom.xml +++ b/powerjob-client/pom.xml @@ -10,11 +10,11 @@ 4.0.0 powerjob-client - 3.2.2 + 3.2.3 jar - 3.2.2 + 3.2.3 5.6.1 diff --git a/powerjob-common/pom.xml b/powerjob-common/pom.xml index 9aa123c9..8aec6af7 100644 --- a/powerjob-common/pom.xml +++ b/powerjob-common/pom.xml @@ -10,7 +10,7 @@ 4.0.0 powerjob-common - 3.2.2 + 3.2.3 jar diff --git a/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/OmsConstant.java b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/OmsConstant.java index 0bbb4b9c..ed1fd621 100644 --- a/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/OmsConstant.java +++ b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/OmsConstant.java @@ -12,4 +12,7 @@ public class OmsConstant { public static final String TIME_PATTERN_PLUS = "yyyy-MM-dd HH:mm:ss.SSS"; public static final String NONE = "N/A"; + + public static final String COMMA = ","; + public static final String LINE_SEPARATOR = "\r\n"; } diff --git a/powerjob-server/pom.xml b/powerjob-server/pom.xml index 2c5fce49..9b2b2378 100644 --- a/powerjob-server/pom.xml +++ b/powerjob-server/pom.xml @@ -10,13 +10,13 @@ 4.0.0 powerjob-server - 3.2.2 + 3.2.3 jar 2.9.2 2.2.6.RELEASE - 3.2.2 + 3.2.3 8.0.19 19.7.0.0 diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/Alarm.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/Alarm.java index 1187d41e..be669ad9 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/Alarm.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/Alarm.java @@ -1,6 +1,7 @@ package com.github.kfcfans.powerjob.server.service.alarm; import com.alibaba.fastjson.JSONObject; +import com.github.kfcfans.powerjob.common.OmsConstant; import com.github.kfcfans.powerjob.common.OmsSerializable; import com.github.kfcfans.powerjob.common.utils.CommonUtils; import org.apache.commons.lang3.StringUtils; @@ -29,7 +30,7 @@ public interface Alarm extends OmsSerializable { }catch (Exception ignore) { } } - sb.append(word).append("\n\r"); + sb.append(word).append(OmsConstant.LINE_SEPARATOR); }); return sb.toString(); } diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/impl/DingTalkAlarmService.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/impl/DingTalkAlarmService.java index a9cca5da..eedbf5ac 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/impl/DingTalkAlarmService.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/impl/DingTalkAlarmService.java @@ -1,5 +1,6 @@ package com.github.kfcfans.powerjob.server.service.alarm.impl; +import com.github.kfcfans.powerjob.common.OmsConstant; import com.github.kfcfans.powerjob.common.OmsException; import com.github.kfcfans.powerjob.common.utils.NetUtils; import com.github.kfcfans.powerjob.server.common.PowerJobServerConfigKey; @@ -72,12 +73,13 @@ public class DingTalkAlarmService implements Alarmable { String userListStr = SJ.commaJoiner.skipNulls().join(userIds); List markdownEntities = Lists.newLinkedList(); markdownEntities.add(new DingTalkUtils.MarkdownEntity("server", NetUtils.getLocalHost())); - markdownEntities.add(new DingTalkUtils.MarkdownEntity("content", alarm.fetchContent())); + String content = alarm.fetchContent().replaceAll(OmsConstant.LINE_SEPARATOR, OmsConstant.COMMA); + markdownEntities.add(new DingTalkUtils.MarkdownEntity("content", content)); try { dingTalkUtils.sendMarkdownAsync(alarm.fetchTitle(), markdownEntities, userListStr, agentId); }catch (Exception e) { - log.error("[DingTalkAlarmService] send ding message failed, msg is {}", e.getMessage()); + log.error("[DingTalkAlarmService] send ding message failed, reason is {}", e.getMessage()); } } } diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/impl/MailAlarmService.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/impl/MailAlarmService.java index 78ae48cb..ab9a346a 100644 --- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/impl/MailAlarmService.java +++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/impl/MailAlarmService.java @@ -49,7 +49,7 @@ public class MailAlarmService implements Alarmable { javaMailSender.send(sm); }catch (Exception e) { - log.error("[OmsMailAlarmService] send mail({}) failed, reason is {}", sm, e.getMessage()); + log.error("[MailAlarmService] send mail failed, reason is {}", e.getMessage()); } } diff --git a/powerjob-worker-agent/pom.xml b/powerjob-worker-agent/pom.xml index 92ccce1c..68ee9f0c 100644 --- a/powerjob-worker-agent/pom.xml +++ b/powerjob-worker-agent/pom.xml @@ -10,12 +10,12 @@ 4.0.0 powerjob-worker-agent - 3.2.2 + 3.2.3 jar - 3.2.2-bugfix + 3.2.3 1.2.3 4.3.2 diff --git a/powerjob-worker-samples/pom.xml b/powerjob-worker-samples/pom.xml index 2a65a060..80a5d7e2 100644 --- a/powerjob-worker-samples/pom.xml +++ b/powerjob-worker-samples/pom.xml @@ -10,11 +10,11 @@ 4.0.0 powerjob-worker-samples - 3.2.2 + 3.2.3 2.2.6.RELEASE - 3.2.2-bugfix + 3.2.3 1.2.68 diff --git a/powerjob-worker-spring-boot-starter/pom.xml b/powerjob-worker-spring-boot-starter/pom.xml index 2f6d520a..60a42a73 100644 --- a/powerjob-worker-spring-boot-starter/pom.xml +++ b/powerjob-worker-spring-boot-starter/pom.xml @@ -10,11 +10,11 @@ 4.0.0 powerjob-worker-spring-boot-starter - 3.2.2-bugfix + 3.2.3 jar - 3.2.2-bugfix + 3.2.3 2.2.6.RELEASE diff --git a/powerjob-worker/pom.xml b/powerjob-worker/pom.xml index 8c58ae13..e0ac3936 100644 --- a/powerjob-worker/pom.xml +++ b/powerjob-worker/pom.xml @@ -10,12 +10,12 @@ 4.0.0 powerjob-worker - 3.2.2-bugfix + 3.2.3 jar 5.2.4.RELEASE - 3.2.2 + 3.2.3 1.4.200 3.4.2 5.6.1