Merge branches 'dev' and 'dev_heart' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_heart

epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-third-server:
     container_name: epmet-third-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.103
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.104
     ports:
       - "8110:8110"
     network_mode: host # 使用现有网络

epmet-module/epmet-third/epmet-third-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.103</version>
+    <version>0.0.104</version>
 
     <parent>
         <groupId>com.epmet</groupId>

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java

@@ -206,28 +206,29 @@ public class WarrantServiceImpl implements WarrantService {
     public void dingDingRobot(String result,String event,String customerName,String clientType){
         DingTalkClient client = new DefaultDingTalkClient("https://oapi.dingtalk.com/robot/send?access_token=5b48fcbc3fde24b8ba4696aa062b7f8146479a9d3467dbb1f9cf132ec36b955a");
         OapiRobotSendRequest request = new OapiRobotSendRequest();
-        request.setMsgtype("text");
+        request.setMsgtype("markdown");
-        OapiRobotSendRequest.Text text = new OapiRobotSendRequest.Text();
+        OapiRobotSendRequest.Markdown markdown = new OapiRobotSendRequest.Markdown();
+        markdown.setTitle("代码审核结果");
         switch (event){
             case ModuleConstant.WEAPP_AUDIT_SUCCESS:
-                text.setContent("代码审核结果: 审核成功\n"+
+                markdown.setText("代码审核结果: 审核成功\n"+
-                        "客户名称：" + customerName +"\n"+
+                        "> 客户名称：" + customerName +"\n\n"+
-                        "客户端："+clientType+"\n");
+                        "> 客户端："+clientType+"\n");
                 break;
             case ModuleConstant.WEAPP_AUDIT_FAIL:
-                text.setContent("代码审核结果: 审核不通过\n"+
+                markdown.setText("代码审核结果: 审核不通过\n"+
-                        "客户名称：" + customerName +"\n"+
+                        "> 客户名称：" + customerName +"\n\n"+
-                        "客户端："+clientType+"\n"+
+                        "> 客户端："+clientType+"\n\n"+
-                        "不通过原因："+result);
+                        "> 不通过原因："+result);
                 break;
             case ModuleConstant.WEAPP_AUDIT_DELAY:
-                text.setContent("代码审核结果: 审核延时\n"+
+                markdown.setText("代码审核结果: 审核延时\n"+
-                        "客户名称：" + customerName +"\n"+
+                        "> 客户名称：" + customerName +"\n\n"+
-                        "客户端："+clientType+"\n"+
+                        "> 客户端："+clientType+"\n\n"+
-                        "延时原因："+result);
+                        "> 延时原因："+result);
                 break;
         }
-        request.setText(text);
+        request.setMarkdown(markdown);
         try {
             OapiRobotSendResponse response = client.execute(request);
         } catch (ApiException e) {