diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index 38b3aa60d..a904f5ada 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/ruoyi-admin/src/main/resources/application-dev.yml @@ -299,3 +299,10 @@ tencent: captcha: captchaAppId: 199022475 appSecretKey: wcqMdqjV3fnvFKxUAq5mwulnD + +# 飞书 +fs: + robot: + monitorSwitch: true + monitorChartId: oc_34e207df88addd15d83ec274fda95ef6 + monitorEnv: 测试 \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/application-local.yml b/ruoyi-admin/src/main/resources/application-local.yml index 765796f2a..c9bd6f6e4 100644 --- a/ruoyi-admin/src/main/resources/application-local.yml +++ b/ruoyi-admin/src/main/resources/application-local.yml @@ -300,3 +300,10 @@ tencent: captcha: captchaAppId: 199022475 appSecretKey: wcqMdqjV3fnvFKxUAq5mwulnD + +# 飞书 +fs: + robot: + monitorSwitch: false + monitorChartId: oc_34e207df88addd15d83ec274fda95ef6 + monitorEnv: 本地 \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml index 70595fe9b..bc798a68c 100644 --- a/ruoyi-admin/src/main/resources/application-prod.yml +++ b/ruoyi-admin/src/main/resources/application-prod.yml @@ -299,3 +299,10 @@ tencent: captcha: captchaAppId: 199022475 appSecretKey: wcqMdqjV3fnvFKxUAq5mwulnD + +# 飞书 +fs: + robot: + monitorSwitch: true + monitorChartId: oc_34e207df88addd15d83ec274fda95ef6 + monitorEnv: 生产 diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/notice/fs/FsNotice.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/notice/fs/FsNotice.java index 54c749e6b..c03958124 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/notice/fs/FsNotice.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/notice/fs/FsNotice.java @@ -35,10 +35,12 @@ public class FsNotice extends AbstractNotice { private String defaultAppSecret; @Value("${fs.robot.defaultChatId:oc_34e207df88addd15d83ec274fda95ef6}") private String defaultChatId; - @Value("${fs.robot.monitorSwitch:true}") + @Value("${fs.robot.monitorSwitch}") private Boolean monitorSwitch; - @Value("${fs.robot.monitorChartId:oc_34e207df88addd15d83ec274fda95ef6}") + @Value("${fs.robot.monitorChartId}") private String monitorChartId; + @Value("${fs.robot.monitorEnv}") + private String env; /** * 发送消息给默认会话 @@ -47,7 +49,10 @@ public class FsNotice extends AbstractNotice { * @param content */ public void sendMsg2DefaultChat(String title, String content) { - ThreadUtil.execAsync(() -> sendMsg(title, content, new String[]{defaultChatId})); + if (Boolean.TRUE.equals(monitorSwitch)) { + ThreadUtil.execAsync(() -> sendMsg(CharSequenceUtil.format("[{}]{}", env, title), content, + new String[]{defaultChatId})); + } } /** @@ -62,6 +67,8 @@ public class FsNotice extends AbstractNotice { //内容 FeiShuMsg.ZhCn zhCn = new FeiShuMsg.ZhCn(); List> contentFields = new ArrayList<>(); + contentFields.add(Collections.singletonList(FeiShuTextField + .createText(CharSequenceUtil.format("环境:{}", env)))); contentFields.add(Collections.singletonList(FeiShuTextField .createText(CharSequenceUtil.format("主机:{}", IpUtils.getHostIp())))); contentFields.add(Collections.singletonList(FeiShuTextField