From af929b1c1d187f265cce0301f676c721bbd3bd1f Mon Sep 17 00:00:00 2001 From: Zhujx Date: Thu, 7 Aug 2025 10:57:59 +0800 Subject: [PATCH] =?UTF-8?q?perf:fwd=E6=B6=88=E6=81=AF=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xiang/ServiceScriptApplication.java | 6 +++++ .../fwd/config/DingTalkRobotConfig.java | 22 +++++++++++++++++++ .../fwd/schedule/FwdImportantMsgJob.java | 8 +++---- ...ice.java => DingTalkScriptMsgService.java} | 15 +++++-------- .../fwd/service/impl/PerformServiceImpl.java | 6 ++--- .../src/main/resources/application-local.yml | 6 ++--- 6 files changed, 44 insertions(+), 19 deletions(-) create mode 100644 script/src/main/java/com/xiang/xservice/fwd/config/DingTalkRobotConfig.java rename script/src/main/java/com/xiang/xservice/fwd/service/{DingTalkFWDMsgService.java => DingTalkScriptMsgService.java} (52%) diff --git a/script/src/main/java/com/xiang/ServiceScriptApplication.java b/script/src/main/java/com/xiang/ServiceScriptApplication.java index 2f02538..7043da4 100644 --- a/script/src/main/java/com/xiang/ServiceScriptApplication.java +++ b/script/src/main/java/com/xiang/ServiceScriptApplication.java @@ -3,6 +3,7 @@ package com.xiang; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.context.properties.ConfigurationPropertiesScan; import org.springframework.scheduling.annotation.EnableScheduling; /** @@ -16,6 +17,11 @@ import org.springframework.scheduling.annotation.EnableScheduling; "com.xiang.xservice.glados.repository", "com.xiang.xservice.xb.repository" }) +@ConfigurationPropertiesScan(basePackages = { + "com.xiang.xservice.fwd.config", + "com.xiang.xservice.xb.config", + "com.xiang.xservice.glados.config", +}) public class ServiceScriptApplication { public static void main(String[] args) { SpringApplication.run(ServiceScriptApplication.class, args); diff --git a/script/src/main/java/com/xiang/xservice/fwd/config/DingTalkRobotConfig.java b/script/src/main/java/com/xiang/xservice/fwd/config/DingTalkRobotConfig.java new file mode 100644 index 0000000..7bc1cab --- /dev/null +++ b/script/src/main/java/com/xiang/xservice/fwd/config/DingTalkRobotConfig.java @@ -0,0 +1,22 @@ +package com.xiang.xservice.fwd.config; + +import lombok.Getter; +import lombok.Setter; +import org.springframework.boot.context.properties.ConfigurationProperties; + +import java.util.List; + +/** + * @Author: xiang + * @Date: 2025-08-07 10:46 + */ +@Getter +@Setter +@ConfigurationProperties(prefix = "dingtalk.robot.script") +public class DingTalkRobotConfig { + + private String token; + private String secret; + private List users; + +} diff --git a/script/src/main/java/com/xiang/xservice/fwd/schedule/FwdImportantMsgJob.java b/script/src/main/java/com/xiang/xservice/fwd/schedule/FwdImportantMsgJob.java index e0014ed..3becca2 100644 --- a/script/src/main/java/com/xiang/xservice/fwd/schedule/FwdImportantMsgJob.java +++ b/script/src/main/java/com/xiang/xservice/fwd/schedule/FwdImportantMsgJob.java @@ -18,7 +18,7 @@ import com.xiang.xservice.fwd.mapper.FwdAudienceConfigMapper; import com.xiang.xservice.fwd.mapper.FwdPerformConfigMapper; import com.xiang.xservice.fwd.mapper.FwdPerformProjectInfoMapper; import com.xiang.xservice.fwd.mapper.FwdUserConfigMapper; -import com.xiang.xservice.fwd.service.DingTalkFWDMsgService; +import com.xiang.xservice.fwd.service.DingTalkScriptMsgService; import com.xiang.xservice.fwd.service.IPerformService; import com.xiang.xservice.fwd.service.IPerformServiceHttp; import com.xiang.xservice.schedule.core.DynamicTaskScheduler; @@ -62,7 +62,7 @@ public class FwdImportantMsgJob { private final FwdPerformProjectInfoMapper performProjectInfoMapper; private final FwdPerformConfigMapper performConfigMapper; private final DynamicTaskScheduler dynamicTaskScheduler; - private final DingTalkFWDMsgService dingTalkFWDMsgService; + private final DingTalkScriptMsgService dingTalkScriptMsgService; private final FwdUserConfigMapper fwdUserConfigMapper; private final FwdAudienceConfigMapper fwdAudienceConfigMapper; private final IPerformService iPerformService; @@ -132,7 +132,7 @@ public class FwdImportantMsgJob { savaTask(data, taskId, params); } msg.append("请注意进行数据库配置的更改！"); - dingTalkFWDMsgService.sendFWDMsg(msg.toString()); + dingTalkScriptMsgService.sendScriptMsg(msg.toString()); log.info("【芬玩岛】演唱会预售定时任务结束！time:{}", System.currentTimeMillis()); } @@ -229,7 +229,7 @@ public class FwdImportantMsgJob { } } }); - dingTalkFWDMsgService.sendFWDMsg(msg.toString()); + dingTalkScriptMsgService.sendScriptMsg(msg.toString()); } private void savaTask(FPerformProjectInfo data, long taskId, Map params) { diff --git a/script/src/main/java/com/xiang/xservice/fwd/service/DingTalkFWDMsgService.java b/script/src/main/java/com/xiang/xservice/fwd/service/DingTalkScriptMsgService.java similarity index 52% rename from script/src/main/java/com/xiang/xservice/fwd/service/DingTalkFWDMsgService.java rename to script/src/main/java/com/xiang/xservice/fwd/service/DingTalkScriptMsgService.java index 077771b..fe249dd 100644 --- a/script/src/main/java/com/xiang/xservice/fwd/service/DingTalkFWDMsgService.java +++ b/script/src/main/java/com/xiang/xservice/fwd/service/DingTalkScriptMsgService.java @@ -1,12 +1,11 @@ package com.xiang.xservice.fwd.service; import com.xiang.xservice.basic.xservice.dingTalk.service.DingTalkService; +import com.xiang.xservice.fwd.config.DingTalkRobotConfig; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import java.util.List; - /** * @Author: xiang * @Date: 2025-08-07 10:30 @@ -14,20 +13,18 @@ import java.util.List; @Slf4j @Service @RequiredArgsConstructor -public class DingTalkFWDMsgService { +public class DingTalkScriptMsgService { private final DingTalkService dingTalkService; - private static final String SECRET = "SEC768ed578c0fb31a9aec84b1c1db4f195f5aca203985bbb9d549e23e41c8874d1"; - private static final String TOKEN = "4709b708d961846e0aee523c5abc3b67e8fa424ee292501d85efd4e504f15a8b"; - private static final String USER_ID = "450841600726084717"; + private final DingTalkRobotConfig dingTalkRobotConfig; /** - * 发送芬玩岛消息 + * 发送脚本消息 * @param msg 消息 */ - public void sendFWDMsg(String msg) { + public void sendScriptMsg(String msg) { try { - dingTalkService.sendRobotMessage(SECRET, TOKEN, List.of(USER_ID), msg); + dingTalkService.sendRobotMessage(dingTalkRobotConfig.getSecret(), dingTalkRobotConfig.getToken(), dingTalkRobotConfig.getUsers(), msg); } catch (Exception e) { log.error("信息发送异常, 信息：{}", msg, e); } diff --git a/script/src/main/java/com/xiang/xservice/fwd/service/impl/PerformServiceImpl.java b/script/src/main/java/com/xiang/xservice/fwd/service/impl/PerformServiceImpl.java index be1f03b..00d816d 100644 --- a/script/src/main/java/com/xiang/xservice/fwd/service/impl/PerformServiceImpl.java +++ b/script/src/main/java/com/xiang/xservice/fwd/service/impl/PerformServiceImpl.java @@ -12,7 +12,7 @@ import com.xiang.xservice.fwd.mapper.FwdPerformConfigMapper; import com.xiang.xservice.fwd.mapper.FwdPerformProjectInfoMapper; import com.xiang.xservice.fwd.mapper.FwdPerformSeatInfoMapper; import com.xiang.xservice.fwd.mapper.FwdUserConfigMapper; -import com.xiang.xservice.fwd.service.DingTalkFWDMsgService; +import com.xiang.xservice.fwd.service.DingTalkScriptMsgService; import com.xiang.xservice.fwd.service.IPerformService; import com.xiang.xservice.fwd.service.IPerformServiceHttp; import com.xiang.xservice.http.helper.HttpRequestHelper; @@ -45,7 +45,7 @@ public class PerformServiceImpl implements IPerformService { private final FwdPerformProjectInfoMapper fwdPerformProjectInfoMapper; private final FwdPerformConfigMapper fwdPerformConfigMapper; private final IPerformServiceHttp performServiceHttp; - private final DingTalkFWDMsgService dingTalkService; + private final DingTalkScriptMsgService dingTalkService; private final FwdUserConfigMapper fwdUserConfigMapper; @Value("${DingTalk.chatId}") private String chatId; @@ -110,7 +110,7 @@ public class PerformServiceImpl implements IPerformService { if (Objects.nonNull(projectOrder)) { log.info("下单成功，订单信息:{}", JSONObject.toJSONString(projectOrder)); String msg = "【芬玩岛】下单成功✅✅✅，演出名称：" + performByProjectId.getProjectName() + "，请在2分钟内完成付款！"; - dingTalkService.sendFWDMsg(msg); + dingTalkService.sendScriptMsg(msg); return Boolean.TRUE; } } diff --git a/script/src/main/resources/application-local.yml b/script/src/main/resources/application-local.yml index ad132ed..49718f7 100644 --- a/script/src/main/resources/application-local.yml +++ b/script/src/main/resources/application-local.yml @@ -22,7 +22,7 @@ aliyun: RR: - local -DingTalk: +dingtalk: # 钉钉消息用户，用逗号隔开 userList: "450841600726084717" # 钉钉消息群ID，需要调用/chat/create api创建群返回 @@ -31,10 +31,10 @@ DingTalk: script: token: 797be7f32062e31dec1d567f8b490a5649a5366083618e236c7a1263df1f4af3 secret: SEC9aca642c0c29c9da261462869c464d34623247583d98fc82343a0a4464abbe91 - userIds: + users: - 450841600726084717 xb: token: ad21ead99f0fdc63aa00d6732b7b0888c17590f7612c68297edfcb71844d1437 secret: SECc09d8aad6635f1a4cbadb7c0ab365523c46299f138438cd885e445e0f5f4d730 - userIds: + users: - 450841600726084717 \ No newline at end of file