From 935b2cdb5a2a4749d550b63f1e43fc4a2b8824d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=87=E4=BD=B3?= Date: Fri, 17 Sep 2021 13:35:28 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../executor/service/email/EmailService.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/executor/src/main/java/cn/org/gitlink/notification/executor/service/email/EmailService.java b/executor/src/main/java/cn/org/gitlink/notification/executor/service/email/EmailService.java index d976f97..9f06fe4 100644 --- a/executor/src/main/java/cn/org/gitlink/notification/executor/service/email/EmailService.java +++ b/executor/src/main/java/cn/org/gitlink/notification/executor/service/email/EmailService.java @@ -24,10 +24,16 @@ public class EmailService { private Logger logger = LogManager.getLogger(EmailService.class); + //邮件任务处理状态 private static final Integer EMAIL_JOB_NOT_DISPATCHED = -1; //处理成功 private static final Integer EMAIL_JOB_DISPATCHED_SUCCESS = 1; //处理成功 private static final Integer EMAIL_JOB_DISPATCHED_FAIL = 2; //处理失败 + //邮件发送记录状态 + private static final Integer EMAIL_UNSENT_RECORD = -1; //处理成功 + private static final Integer EMAIL_SENT_SUCCESS = 1; //处理成功 + private static final Integer EMAIL_SENT_FAIL = 2; //处理失败 + @Autowired private EmailJobsService emailJobsService; @@ -85,7 +91,7 @@ public class EmailService { //获取待发送列表 List emailSendRecordList = new ArrayList<>(); try { - emailSendRecordList = emailSendRecordsService.getRecordsByStatus(platform, -1, sentNumber); + emailSendRecordList = emailSendRecordsService.getRecordsByStatus(platform, EMAIL_UNSENT_RECORD, sentNumber); } catch (Exception e) { logger.error("获取未发送邮件列表失败：\n" + e); } @@ -98,7 +104,7 @@ public class EmailService { emailUtils.sendMail(unSentEmailSendRecord.getSubject(), unSentEmailSendRecord.getEmail(), unSentEmailSendRecord.getContent()); flag = true; unSentEmailSendRecord.setSentAt(new Date()); - unSentEmailSendRecord.setStatus(flag ? 1 : 2); + unSentEmailSendRecord.setStatus(flag ? EMAIL_SENT_SUCCESS : EMAIL_SENT_FAIL); } catch (MessagingException e) { logger.error("发送邮件失败，email: " + unSentEmailSendRecord.getEmail() + "\n" + e); } From d4156ed7a608e4856e42bce4d552c3c6efe7dc74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=87=E4=BD=B3?= Date: Fri, 17 Sep 2021 14:30:01 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../notification/executor/service/email/EmailService.java | 4 +++- .../notification/model/dao/entity/vo/NewEmailJobParamsVo.java | 2 +- .../resources/mapper/notification/EmailSendRecordsMapper.xml | 2 -- .../notification/writer/controller/EmailJobsController.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/executor/src/main/java/cn/org/gitlink/notification/executor/service/email/EmailService.java b/executor/src/main/java/cn/org/gitlink/notification/executor/service/email/EmailService.java index 9f06fe4..63f2747 100644 --- a/executor/src/main/java/cn/org/gitlink/notification/executor/service/email/EmailService.java +++ b/executor/src/main/java/cn/org/gitlink/notification/executor/service/email/EmailService.java @@ -44,7 +44,8 @@ public class EmailService { private EmailUtils emailUtils; /** - * 处理邮件发送任务，根据emails添加到邮件发送记录表中。 + * 处理邮件发送任务，根据emails添加到邮件发送记录表中 + * * @param platform 平台编码 * @param dispatchNumber 待处理发送任务列表数量 * @return: void @@ -80,6 +81,7 @@ public class EmailService { /** * 发送邮件 + * * @param platform 平台编码 * @param sentNumber 一次发送数量 * @return: void diff --git a/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/NewEmailJobParamsVo.java b/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/NewEmailJobParamsVo.java index 35fb3a2..94409b5 100644 --- a/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/NewEmailJobParamsVo.java +++ b/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/NewEmailJobParamsVo.java @@ -22,7 +22,7 @@ public class NewEmailJobParamsVo { @ApiModelProperty(value = "邮件主题", required = true) @NotBlank(message = "邮件主题不能为空") - @Size(max = 255, message = "邮件主题长度在0~255") + @Size(max = 500, message = "邮件主题长度在0~500") private String subject; @ApiModelProperty(value = "邮件内容", required = true) diff --git a/model/src/main/resources/mapper/notification/EmailSendRecordsMapper.xml b/model/src/main/resources/mapper/notification/EmailSendRecordsMapper.xml index 7b13f60..b6dfd19 100644 --- a/model/src/main/resources/mapper/notification/EmailSendRecordsMapper.xml +++ b/model/src/main/resources/mapper/notification/EmailSendRecordsMapper.xml @@ -126,8 +126,6 @@ limit #{size} - - update ${platform}_email_send_records diff --git a/writer/src/main/java/cn/org/gitlink/notification/writer/controller/EmailJobsController.java b/writer/src/main/java/cn/org/gitlink/notification/writer/controller/EmailJobsController.java index 0bed2ad..4a02940 100644 --- a/writer/src/main/java/cn/org/gitlink/notification/writer/controller/EmailJobsController.java +++ b/writer/src/main/java/cn/org/gitlink/notification/writer/controller/EmailJobsController.java @@ -47,7 +47,7 @@ public class EmailJobsController { @ApiOperation("发送邮件任务") @RequestMapping(path = "/{platform}", method = RequestMethod.POST) @ResponseBody - public ResponseData sendNotification(@ApiParam(value = "平台编码", required = true) + public ResponseData sendEmail(@ApiParam(value = "平台编码", required = true) @PathVariable(name = "platform") String platform, @Validated @RequestBody NewEmailJobParamsVo newEmailJobParamsVo, From 2fd5441e1523b3715fd88bb752eeafddb9ad0c99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=87=E4=BD=B3?= Date: Fri, 17 Sep 2021 14:46:29 +0800 Subject: [PATCH 3/4] =?UTF-8?q?subject=E9=95=BF=E5=BA=A6=E9=99=90=E5=AE=9A?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../notification/model/dao/entity/vo/NewEmailJobParamsVo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/NewEmailJobParamsVo.java b/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/NewEmailJobParamsVo.java index 94409b5..35fb3a2 100644 --- a/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/NewEmailJobParamsVo.java +++ b/model/src/main/java/cn/org/gitlink/notification/model/dao/entity/vo/NewEmailJobParamsVo.java @@ -22,7 +22,7 @@ public class NewEmailJobParamsVo { @ApiModelProperty(value = "邮件主题", required = true) @NotBlank(message = "邮件主题不能为空") - @Size(max = 500, message = "邮件主题长度在0~500") + @Size(max = 255, message = "邮件主题长度在0~255") private String subject; @ApiModelProperty(value = "邮件内容", required = true) From 8b6ef05fae97e3ab6bf777b543d4e0351d0e9e65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=87=E4=BD=B3?= Date: Fri, 17 Sep 2021 16:35:16 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=97=B6=E5=8C=BA=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- executor/src/main/resources/application.yml.example | 8 ++++++++ reader/src/main/resources/application.yml.example | 7 +++++++ writer/src/main/resources/application.yml.example | 8 ++++++++ 3 files changed, 23 insertions(+) diff --git a/executor/src/main/resources/application.yml.example b/executor/src/main/resources/application.yml.example index 1c389ec..6dd55fd 100644 --- a/executor/src/main/resources/application.yml.example +++ b/executor/src/main/resources/application.yml.example @@ -50,4 +50,12 @@ spring: url: jdbc:mysql://mysql:3306/gitlink_notification?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2B8&allowMultiQueries=true&useSSL=false username: gitlink password: giTlinK0^827 + + jackson: + date-format: yyyy-MM-dd HH:mm:ss + time-zone: GMT+8 + serialization: + indent_output: true + fail_on_empty_beans: false + white-list: '*' \ No newline at end of file diff --git a/reader/src/main/resources/application.yml.example b/reader/src/main/resources/application.yml.example index e828e2e..5e49bde 100644 --- a/reader/src/main/resources/application.yml.example +++ b/reader/src/main/resources/application.yml.example @@ -31,4 +31,11 @@ spring: username: gitlink password: giTlinK0^827 + jackson: + date-format: yyyy-MM-dd HH:mm:ss + time-zone: GMT+8 + serialization: + indent_output: true + fail_on_empty_beans: false + white-list: '*' \ No newline at end of file diff --git a/writer/src/main/resources/application.yml.example b/writer/src/main/resources/application.yml.example index 0d6bf72..ec4217b 100644 --- a/writer/src/main/resources/application.yml.example +++ b/writer/src/main/resources/application.yml.example @@ -34,4 +34,12 @@ spring: url: jdbc:mysql://mysql:3306/gitlink_notification?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&serverTimezone=GMT%2B8&allowMultiQueries=true&useSSL=false username: gitlink password: giTlinK0^827 + + jackson: + date-format: yyyy-MM-dd HH:mm:ss + time-zone: GMT+8 + serialization: + indent_output: true + fail_on_empty_beans: false + white-list: '*' \ No newline at end of file