构建mq

suishenbang-admin/src/main/resources/application-uat.yml

@@ -53,13 +53,6 @@ qiyeweixin:
   corpsecret: g37wunxe43I_g-W_umTUFFGEFU6m1ordFoMLuUe4rK8
   #应用id
   agentId: 1000089
-  #金牌点/随身邦/服务商配置
-  ssbCorpsecret: vsH9bzOhP13r2DAUEMO6SlHvlrxfTWxfJ1IqtZKvuy4
-  ssbAgentId: 1000137
-  jpdCorpsecret: mSEr2PSM2eORA6ENxrTMYRjsocO41elTEFTrgDfmvjE
-  jpdAgentId: 1000392
-  fwsCorpsecret: 3g1xDQMoLwYBkXMzBxu-S6CWtKVn1NndvGIopuBHuN0
-  fwsAgentId : 1000391
 
 
 # 开发环境配置

suishenbang-api/src/main/resources/application-uat.yml

@@ -145,6 +145,13 @@ qiyeweixin:
   corpsecret: g37wunxe43I_g-W_umTUFFGEFU6m1ordFoMLuUe4rK8
   #应用id
   agentId: 1000089
+  #金牌点/随身邦/服务商配置
+  ssbCorpsecret: vsH9bzOhP13r2DAUEMO6SlHvlrxfTWxfJ1IqtZKvuy4
+  ssbAgentId: 1000137
+  jpdCorpsecret: mSEr2PSM2eORA6ENxrTMYRjsocO41elTEFTrgDfmvjE
+  jpdAgentId: 1000392
+  fwsCorpsecret: 3g1xDQMoLwYBkXMzBxu-S6CWtKVn1NndvGIopuBHuN0
+  fwsAgentId: 1000391
 esign:
   #  SaaS版
   #  appId: 7438822756

suishenbang-wxportal/suishenbang-wxportal-api/src/main/java/com/dgtly/wxportal/controller/WxController.java

@@ -332,7 +332,7 @@ public class WxController extends ApiBaseController {
         return AjaxResult.success();
     }
 
-    @GetMapping
+    @GetMapping("test")
     public void testApproveTMSMessage(String user) {
         log.info("进来了");
         String msg = "测试消息";

suishenbang-wxportal/suishenbang-wxportal-common/src/main/java/com/dgtly/wxportal/utils/qywxutils/QyWxAccessTokenUtil.java

@@ -85,20 +85,24 @@ public class QyWxAccessTokenUtil {
         String url ="";
 
         try {
-            //token未过期使用缓存的token
-            long currentTiem = new Date().getTime();
-            if(this.accessToken!=null &&(currentTiem-createTime)<(expires*1000)){
-                log.info("本身的token为{}",this.accessToken);
-                return this.accessToken;
-            }
+//            //token未过期使用缓存的token
+//            long currentTiem = new Date().getTime();
+//            if(this.accessToken!=null &&(currentTiem-createTime)<(expires*1000)){
+//                log.info("本身的token为{}",this.accessToken);
+//                return this.accessToken;
+//            }
             //获取请求地址
             if (StringUtils.isEmpty(userType)){
+                log.info("好邦手发送");
                 url = QyWxServiceUrl.ACCESS_TOKEN_URL.getformatUrl(corpid, corpsecret);
             }else if ("1".equals(userType)){
+                log.info("经销商发送");
                 url = QyWxServiceUrl.ACCESS_TOKEN_URL.getformatUrl(corpid, ssbCorpsecret);
             }else if ("3".equals(userType)){
+                log.info("金牌店发送");
                 url = QyWxServiceUrl.ACCESS_TOKEN_URL.getformatUrl(corpid, jpdCorpsecret);
             }else if ("2".equals(userType)){
+                log.info("服务商发送");
                 url = QyWxServiceUrl.ACCESS_TOKEN_URL.getformatUrl(corpid, fwsCorpsecret);
             }
             log.info("getAccessToken url:{} ", url);
@@ -209,8 +213,18 @@ public class QyWxAccessTokenUtil {
         return corpsecret;
     }
 
-    public String getAgentId() {
-        return agentId;
+    public String getAgentId(String userType) {
+        if (StringUtils.isEmpty(userType)){
+            return agentId;
+        }else if ("1".equals(userType)){
+            return ssbAgentId;
+        }else if ("3".equals(userType)){
+            return jpdAgentId;
+        }else if ("2".equals(userType)){
+            return fwsAgentId;
+        }else {
+            return agentId;
+        }
     }
 
     public void setAgentId(String agentId) {

suishenbang-wxportal/suishenbang-wxportal-common/src/main/java/com/dgtly/wxportal/utils/qywxutils/QyWxSendMessageUtil.java

@@ -93,7 +93,7 @@ public class QyWxSendMessageUtil {
                     sendMessage(qyWxTextMessage,"3");
                 }
             }else {
-                if(("customer_level").equals(sysUser)||("reseller_level").equals(sysUser) ){
+                if(("customer_level").equals(sysUser.getSalesLevel())||("reseller_level").equals(sysUser.getSalesLevel()) ){
                     sendMessage(qyWxTextMessage,"1");
                 }else{
                     sendMessage(qyWxTextMessage,"");
@@ -406,7 +406,7 @@ public class QyWxSendMessageUtil {
      * @return
      */
     public boolean sendMessage(QyWxBaseMessage message,String userType){
-        message.setAgentid(qyWxAccessTokenUtil.getAgentId());
+        message.setAgentid(qyWxAccessTokenUtil.getAgentId(userType));
         String url = QyWxServiceUrl.SEND_MESSAGE_URL.getformatUrl(qyWxAccessTokenUtil.getAccessToken(userType));
         String result =  HttpUtils.sendJsonPost(url,message);
         JSONObject json = JSONObject.parseObject(result);