From 846564db2e04e972e548369ac31321e6e46d4fdb Mon Sep 17 00:00:00 2001
From: zhongpeng <zhongpeng@axzo.cn>
Date: Wed, 20 Nov 2024 17:39:38 +0800
Subject: [PATCH] =?UTF-8?q?Req-3117=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../client/common/enums/DingDingSceneEnum.java   | 14 --------------
 .../riven/config/DingDingRebootMainConfig.java   |  1 -
 .../riven/service/DingDingRebootService.java     |  1 -
 .../riven/test/DingDingMsgControllerTest.java    | 16 +---------------
 4 files changed, 1 insertion(+), 31 deletions(-)
 delete mode 100644 riven-api/src/main/java/cn/axzo/riven/client/common/enums/DingDingSceneEnum.java

diff --git a/riven-api/src/main/java/cn/axzo/riven/client/common/enums/DingDingSceneEnum.java b/riven-api/src/main/java/cn/axzo/riven/client/common/enums/DingDingSceneEnum.java
deleted file mode 100644
index 6c7048a..0000000
--- a/riven-api/src/main/java/cn/axzo/riven/client/common/enums/DingDingSceneEnum.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package cn.axzo.riven.client.common.enums;
-
-/**
- * 钉钉场景，不同的值对应不同的后端密钥
- * @author zhongpeng
- * @since 2024-11-18
- */
-public enum DingDingSceneEnum {
-    //运营群通知（目前用工一期发送消息给钉钉群通知云运营审核）
-    WORK_OPERATION,
-    //公用告警群
-    COMMON_ALERT,
-    ;
-}
diff --git a/riven-server/src/main/java/cn/axzo/riven/config/DingDingRebootMainConfig.java b/riven-server/src/main/java/cn/axzo/riven/config/DingDingRebootMainConfig.java
index d36799b..5779ec1 100644
--- a/riven-server/src/main/java/cn/axzo/riven/config/DingDingRebootMainConfig.java
+++ b/riven-server/src/main/java/cn/axzo/riven/config/DingDingRebootMainConfig.java
@@ -1,6 +1,5 @@
 package cn.axzo.riven.config;
 
-import cn.axzo.riven.client.common.enums.DingDingSceneEnum;
 import lombok.Getter;
 import lombok.Setter;
 import org.springframework.boot.context.properties.ConfigurationProperties;
diff --git a/riven-server/src/main/java/cn/axzo/riven/service/DingDingRebootService.java b/riven-server/src/main/java/cn/axzo/riven/service/DingDingRebootService.java
index 1cc071c..1d08216 100644
--- a/riven-server/src/main/java/cn/axzo/riven/service/DingDingRebootService.java
+++ b/riven-server/src/main/java/cn/axzo/riven/service/DingDingRebootService.java
@@ -2,7 +2,6 @@ package cn.axzo.riven.service;
 
 import cn.axzo.framework.data.mybatisplus.model.BaseEntity;
 import cn.axzo.framework.domain.web.code.BaseCode;
-import cn.axzo.riven.client.common.enums.DingDingSceneEnum;
 import cn.axzo.riven.client.req.DingDingSendRebootGroupMsgReq;
 import cn.axzo.riven.client.req.DingDingSendRebootMsgReq;
 import cn.axzo.riven.common.constants.DingDingJumpConstant;
diff --git a/riven-server/src/test/java/cn/axzo/riven/test/DingDingMsgControllerTest.java b/riven-server/src/test/java/cn/axzo/riven/test/DingDingMsgControllerTest.java
index a43556e..6f88ca4 100644
--- a/riven-server/src/test/java/cn/axzo/riven/test/DingDingMsgControllerTest.java
+++ b/riven-server/src/test/java/cn/axzo/riven/test/DingDingMsgControllerTest.java
@@ -1,24 +1,10 @@
 package cn.axzo.riven.test;
 
-import cn.axzo.basics.profiles.api.UserProfileServiceApi;
-import cn.axzo.riven.Application;
-import cn.axzo.riven.client.common.enums.DingDingSceneEnum;
 import cn.axzo.riven.client.common.enums.DingTalkMsgTypeEnum;
 import cn.axzo.riven.client.model.SampleActionCard6;
 import cn.axzo.riven.client.req.DingDingSendRebootGroupMsgReq;
-import cn.axzo.riven.config.FeignConfiguration;
 import cn.axzo.riven.controller.DingDingMsgController;
-import cn.axzo.riven.test.taizhou.AxzoUserProfileServiceApiTest;
-import cn.azxo.framework.common.logger.JobLoggerTemplate;
 import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.cloud.openfeign.EnableFeignClients;
-import org.springframework.cloud.openfeign.FeignAutoConfiguration;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 
 import javax.annotation.Resource;
 
@@ -40,7 +26,7 @@ public class DingDingMsgControllerTest extends BaseTest {
         DingDingSendRebootGroupMsgReq req = new DingDingSendRebootGroupMsgReq();
         req.setMsgType(DingTalkMsgTypeEnum.sampleActionCard6);
 
-        req.setDingDingSceneEnum(DingDingSceneEnum.WORK_OPERATION);
+        req.setDingDingScene("WORK_OPERATION");
 
         String title = "标题";
         String text = "内容 \n ## 标题1 你好";