Merge remote-tracking branch 'remotes/origin/dev_thirdplatform' into dev_temp

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

@@ -725,8 +725,9 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
             log.error("授权完成发送钉钉消息失败，原因：未查询到客户信息，客户Id->" + customerId);
             return null;
         }
-        String secret = "SEC68536dfc393790a35cb08e9bc531dad0c654cf84bb53b76667fa7a7f2cbed829";
-        String url = "https://oapi.dingtalk.com/robot/send?access_token=c3d34eac31acde342d37a01ac1792beac5b17b2890b4f5015e2759546fed1331";
+        String secret = "SEC54dfa7dfa877ea3ea81be14c7a6ae7e2c499b7a148d818d2a68c69f3df08ddfe";
+        String url = "https://oapi.dingtalk.com/robot/send?access_token=b5b403239205c95930f7291f1c2a8dd838640b22432ccb2dfa0c6d5e47d14892";
+
         //2.拼接钉钉消息内容并发送
         OapiRobotSendRequest request = new OapiRobotSendRequest();
         request.setMsgtype("markdown");

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

@@ -254,9 +254,10 @@ public class WarrantServiceImpl implements WarrantService {
         }
         request.setMarkdown(markdown);
         log.info("robot需要发送的内容为："+markdown.getText());
-        String url = "https://oapi.dingtalk.com/robot/send?access_token=2438902efbcc15909deb7076963c5cbe2d6fdbfdb9d66750faab2f2cce6eb09f";
-        String secret = "SECe3c785dd254659608667a4a623acc5a0395636143411617f6e36838b48941e74";
+        String url = "https://oapi.dingtalk.com/robot/send?access_token=b5b403239205c95930f7291f1c2a8dd838640b22432ccb2dfa0c6d5e47d14892";
+        String secret = "SEC54dfa7dfa877ea3ea81be14c7a6ae7e2c499b7a148d818d2a68c69f3df08ddfe";
         HttpClientManager.getInstance().sendDingMsg(JSON.toJSONString(request),url,secret);
+
     }
 
 

epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CustomerMpDao.xml

@@ -42,11 +42,13 @@
     <!-- 修改小程序授权的状态 -->
     <update id="updateAuthorizationFlag">
         UPDATE customer_mp
-            SET authorization_flag = 0
+            SET authorization_flag = 0,
+                app_id = ''
         WHERE
             app_id = #{authAppId}
     </update>
 
+
     <!-- 根据 客户Id和授权方AppId查询clientType -->
     <select id="selectClientTypeByCustomerIdAndAuthId" resultType="java.lang.String">
         SELECT