diff --git a/script/src/main/java/com/xiang/xservice/fwd/config/DingTalkRobotConfig.java b/script/src/main/java/com/xiang/xservice/config/DingTalkRobotScriptConfig.java similarity index 82% rename from script/src/main/java/com/xiang/xservice/fwd/config/DingTalkRobotConfig.java rename to script/src/main/java/com/xiang/xservice/config/DingTalkRobotScriptConfig.java index 7bc1cab..8e6d91a 100644 --- a/script/src/main/java/com/xiang/xservice/fwd/config/DingTalkRobotConfig.java +++ b/script/src/main/java/com/xiang/xservice/config/DingTalkRobotScriptConfig.java @@ -1,4 +1,4 @@ -package com.xiang.xservice.fwd.config; +package com.xiang.xservice.config; import lombok.Getter; import lombok.Setter; @@ -13,7 +13,7 @@ import java.util.List; @Getter @Setter @ConfigurationProperties(prefix = "dingtalk.robot.script") -public class DingTalkRobotConfig { +public class DingTalkRobotScriptConfig { private String token; private String secret; diff --git a/script/src/main/java/com/xiang/xservice/config/DingTalkRobotXbConfig.java b/script/src/main/java/com/xiang/xservice/config/DingTalkRobotXbConfig.java new file mode 100644 index 0000000..979ba8a --- /dev/null +++ b/script/src/main/java/com/xiang/xservice/config/DingTalkRobotXbConfig.java @@ -0,0 +1,22 @@ +package com.xiang.xservice.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.xb") +public class DingTalkRobotXbConfig { + + private String token; + private String secret; + private List users; + +} diff --git a/script/src/main/java/com/xiang/xservice/fwd/service/DingTalkScriptMsgService.java b/script/src/main/java/com/xiang/xservice/fwd/service/DingTalkScriptMsgService.java index fe249dd..d340163 100644 --- a/script/src/main/java/com/xiang/xservice/fwd/service/DingTalkScriptMsgService.java +++ b/script/src/main/java/com/xiang/xservice/fwd/service/DingTalkScriptMsgService.java @@ -1,7 +1,7 @@ package com.xiang.xservice.fwd.service; import com.xiang.xservice.basic.xservice.dingTalk.service.DingTalkService; -import com.xiang.xservice.fwd.config.DingTalkRobotConfig; +import com.xiang.xservice.config.DingTalkRobotScriptConfig; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -16,7 +16,7 @@ import org.springframework.stereotype.Service; public class DingTalkScriptMsgService { private final DingTalkService dingTalkService; - private final DingTalkRobotConfig dingTalkRobotConfig; + private final DingTalkRobotScriptConfig dingTalkRobotConfig; /** * 发送脚本消息 diff --git a/script/src/main/java/com/xiang/xservice/glados/service/DingTalkScriptMsgService.java b/script/src/main/java/com/xiang/xservice/glados/service/DingTalkScriptMsgService.java index 839e2e6..d5acdc7 100644 --- a/script/src/main/java/com/xiang/xservice/glados/service/DingTalkScriptMsgService.java +++ b/script/src/main/java/com/xiang/xservice/glados/service/DingTalkScriptMsgService.java @@ -1,12 +1,11 @@ package com.xiang.xservice.glados.service; import com.xiang.xservice.basic.xservice.dingTalk.service.DingTalkService; +import com.xiang.xservice.config.DingTalkRobotScriptConfig; 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 @@ -17,9 +16,7 @@ import java.util.List; 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 DingTalkRobotScriptConfig dingTalkRobotScriptConfig; /** * 发送脚本消息 @@ -27,7 +24,8 @@ public class DingTalkScriptMsgService { */ public void sendScriptMsg(String msg) { try { - dingTalkService.sendRobotMessage(SECRET, TOKEN, List.of(USER_ID), msg); + dingTalkService.sendRobotMessage(dingTalkRobotScriptConfig.getSecret(), dingTalkRobotScriptConfig.getToken(), + dingTalkRobotScriptConfig.getUsers(), msg); } catch (Exception e) { log.error("信息发送异常, 信息:{}", msg, e); } diff --git a/script/src/main/java/com/xiang/xservice/xb/service/DingTalkRobotService.java b/script/src/main/java/com/xiang/xservice/xb/service/DingTalkRobotService.java new file mode 100644 index 0000000..08ad4a1 --- /dev/null +++ b/script/src/main/java/com/xiang/xservice/xb/service/DingTalkRobotService.java @@ -0,0 +1,8 @@ +package com.xiang.xservice.xb.service; + +/** + * @Author: xiang + * @Date: 2025-08-07 11:02 + */ +public class DingTalkRobotService { +}