From bf78d8e41a2dc0983a63ac1ca7602114ac14fe1f Mon Sep 17 00:00:00 2001 From: 3y Date: Wed, 9 Feb 2022 19:49:29 +0800 Subject: [PATCH] =?UTF-8?q?1.=20fix=20sms=20bug=202.=20=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/java3y/austin/entity/XxlJobInfo.java | 1 + .../main/java/com/java3y/austin/script/TencentSmsScript.java | 2 +- .../austin/service/impl/MessageTemplateServiceImpl.java | 5 +++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/austin-cron/src/main/java/com/java3y/austin/entity/XxlJobInfo.java b/austin-cron/src/main/java/com/java3y/austin/entity/XxlJobInfo.java index 5993ebb..d5a03db 100644 --- a/austin-cron/src/main/java/com/java3y/austin/entity/XxlJobInfo.java +++ b/austin-cron/src/main/java/com/java3y/austin/entity/XxlJobInfo.java @@ -12,6 +12,7 @@ import java.util.Date; /** * xxl 任务信息 配置 + * @author 3y */ @Data @Accessors(chain = true) diff --git a/austin-handler/src/main/java/com/java3y/austin/script/TencentSmsScript.java b/austin-handler/src/main/java/com/java3y/austin/script/TencentSmsScript.java index 18c1978..ce9d7b7 100644 --- a/austin-handler/src/main/java/com/java3y/austin/script/TencentSmsScript.java +++ b/austin-handler/src/main/java/com/java3y/austin/script/TencentSmsScript.java @@ -112,7 +112,7 @@ public class TencentSmsScript implements SmsScript { httpProfile.setEndpoint(account.getUrl()); ClientProfile clientProfile = new ClientProfile(); clientProfile.setHttpProfile(httpProfile); - SmsClient client = new SmsClient(cred, account.getUrl(), clientProfile); + SmsClient client = new SmsClient(cred, account.getRegion(), clientProfile); return client; } diff --git a/austin-web/src/main/java/com/java3y/austin/service/impl/MessageTemplateServiceImpl.java b/austin-web/src/main/java/com/java3y/austin/service/impl/MessageTemplateServiceImpl.java index 611216a..4471156 100644 --- a/austin-web/src/main/java/com/java3y/austin/service/impl/MessageTemplateServiceImpl.java +++ b/austin-web/src/main/java/com/java3y/austin/service/impl/MessageTemplateServiceImpl.java @@ -69,6 +69,11 @@ public class MessageTemplateServiceImpl implements MessageTemplateService { public void deleteByIds(List ids) { Iterable messageTemplates = messageTemplateDao.findAllById(ids); messageTemplates.forEach(messageTemplate -> messageTemplate.setIsDeleted(AustinConstant.TRUE)); + for (MessageTemplate messageTemplate : messageTemplates) { + if (messageTemplate.getCronTaskId() > 0) { + cronTaskService.deleteCronTask(messageTemplate.getCronTaskId()); + } + } messageTemplateDao.saveAll(messageTemplates); }