third_codes/PowerJob
1
0
Fork 1
mirror of https://github.com/PowerJob/PowerJob.git synced 2025-07-17 00:00:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

[dev] change version to 3.2.3 & optimize MailAlarmService's log

Browse Source
This commit is contained in:
tjq 2020-08-08 23:19:18 +08:00
parent ae18c5fd7c
commit 5b4591c8b1
11 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
powerjob-client/pom.xml
View File

@ -10,11 +10,11 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>powerjob-client</artifactId>
<version>3.2.2</version>
<version>3.2.3</version>
<packaging>jar</packaging>
<properties>
<powerjob.common.version>3.2.2</powerjob.common.version>
<powerjob.common.version>3.2.3</powerjob.common.version>
<junit.version>5.6.1</junit.version>
</properties>

2
powerjob-common/pom.xml
View File

@ -10,7 +10,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>powerjob-common</artifactId>
<version>3.2.2</version>
<version>3.2.3</version>
<packaging>jar</packaging>
<properties>

3
powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/OmsConstant.java
View File

@ -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";
}

4
powerjob-server/pom.xml
View File

@ -10,13 +10,13 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>powerjob-server</artifactId>
<version>3.2.2</version>
<version>3.2.3</version>
<packaging>jar</packaging>
<properties>
<swagger.version>2.9.2</swagger.version>
<springboot.version>2.2.6.RELEASE</springboot.version>
<powerjob.common.version>3.2.2</powerjob.common.version>
<powerjob.common.version>3.2.3</powerjob.common.version>
<!-- 数据库驱动版本，使用的是spring-boot-dependencies管理的版本 -->
<mysql.version>8.0.19</mysql.version>
<ojdbc.version>19.7.0.0</ojdbc.version>

3
powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/Alarm.java
View File

@ -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();
}

6
powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/impl/DingTalkAlarmService.java
View File

@ -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<DingTalkUtils.MarkdownEntity> 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());
}
}
}

2
powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/alarm/impl/MailAlarmService.java
View File

@ -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());
}
}

4
powerjob-worker-agent/pom.xml
View File

@ -10,12 +10,12 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>powerjob-worker-agent</artifactId>
<version>3.2.2</version>
<version>3.2.3</version>
<packaging>jar</packaging>
<properties>
<powerjob.worker.version>3.2.2-bugfix</powerjob.worker.version>
<powerjob.worker.version>3.2.3</powerjob.worker.version>
<logback.version>1.2.3</logback.version>
<picocli.version>4.3.2</picocli.version>

4
powerjob-worker-samples/pom.xml
View File

@ -10,11 +10,11 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>powerjob-worker-samples</artifactId>
<version>3.2.2</version>
<version>3.2.3</version>
<properties>
<springboot.version>2.2.6.RELEASE</springboot.version>
<powerjob.worker.starter.version>3.2.2-bugfix</powerjob.worker.starter.version>
<powerjob.worker.starter.version>3.2.3</powerjob.worker.starter.version>
<fastjson.version>1.2.68</fastjson.version>
<!-- 部署时跳过该module -->

4
powerjob-worker-spring-boot-starter/pom.xml
View File

@ -10,11 +10,11 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>powerjob-worker-spring-boot-starter</artifactId>
<version>3.2.2-bugfix</version>
<version>3.2.3</version>
<packaging>jar</packaging>
<properties>
<powerjob.worker.version>3.2.2-bugfix</powerjob.worker.version>
<powerjob.worker.version>3.2.3</powerjob.worker.version>
<springboot.version>2.2.6.RELEASE</springboot.version>
</properties>

4
powerjob-worker/pom.xml
View File

@ -10,12 +10,12 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>powerjob-worker</artifactId>
<version>3.2.2-bugfix</version>
<version>3.2.3</version>
<packaging>jar</packaging>
<properties>
<spring.version>5.2.4.RELEASE</spring.version>
<powerjob.common.version>3.2.2</powerjob.common.version>
<powerjob.common.version>3.2.3</powerjob.common.version>
<h2.db.version>1.4.200</h2.db.version>
<hikaricp.version>3.4.2</hikaricp.version>
<junit.version>5.6.1</junit.version>