1、泛微待办修改

code/jyyy/nckd-jimin-jyyy-bd/src/main/java/nckd/jimin/jyyy/bd/plugin/msg/ecology/FanweiCommonUtil.java

@@ -23,6 +23,7 @@ import kd.bos.workflow.engine.msg.info.MessageInfo;
 import kd.bos.workflow.engine.msg.info.ToDoInfo;
 import kd.bos.workflow.exception.WFErrorCode;
 import kd.bos.workflow.exception.WFMessageServiceException;
+import nckd.base.helper.CommonHelperUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLContext;
@@ -130,6 +131,7 @@ public final class FanweiCommonUtil {
                 logger.info("泛微推送数据日志保存成功");
 
                 String token = getFanWeiToken(false);
+                String bodyString = "";
                 String url = "";
                 String result = "";
 
@@ -141,7 +143,8 @@ public final class FanweiCommonUtil {
                     url = param_sendflow + "?access_token=" + token + "&secret_key=" + param_secretkey;
                     logger.info("泛微发送消息接口地址：" + url);
 
-                    result = KHttpClientUtils.postjson(url, header, JSON.toJSONString(fanweiBodyData));
+                    bodyString = CommonHelperUtils.buildEsbApiBodyJSON(fanweiBodyData);
+                    result = KHttpClientUtils.postjson(url, header, bodyString);
                 } catch (IOException e) {
                     logger.info(e.getMessage());
 
@@ -222,6 +225,7 @@ public final class FanweiCommonUtil {
                 logger.info("泛微推送数据日志保存成功");
 
                 String token = getFanWeiToken(false);
+                String bodyString = "";
                 String url = "";
                 String result = "";
 
@@ -233,7 +237,8 @@ public final class FanweiCommonUtil {
                     url = param_sendflow + "?access_token=" + token + "&secret_key=" + param_secretkey;
                     logger.info("泛微发送消息接口地址：" + url);
 
-                    result = KHttpClientUtils.postjson(url, header, JSON.toJSONString(fanweiBodyData));
+                    bodyString = CommonHelperUtils.buildEsbApiBodyJSON(fanweiBodyData);
+                    result = KHttpClientUtils.postjson(url, header, bodyString);
                 } catch (IOException e) {
                     logger.info(e.getMessage());
 
@@ -309,6 +314,7 @@ public final class FanweiCommonUtil {
                 logger.info("泛微推送数据日志保存成功");
 
                 String token = getFanWeiToken(false);
+                String bodyString = "";
                 String url = "";
                 String result = "";
 
@@ -320,7 +326,8 @@ public final class FanweiCommonUtil {
                     url = param_sendflow + "?access_token=" + token + "&secret_key=" + param_secretkey;
                     logger.info("泛微发送消息接口地址：" + url);
 
-                    result = KHttpClientUtils.postjson(url, header, JSON.toJSONString(fanweiBodyData));
+                    bodyString = CommonHelperUtils.buildEsbApiBodyJSON(fanweiBodyData);
+                    result = KHttpClientUtils.postjson(url, header, bodyString);
                 } catch (IOException e) {
                     logger.info(e.getMessage());
 
@@ -418,6 +425,7 @@ public final class FanweiCommonUtil {
                 logger.info("泛微推送数据日志保存成功");
 
                 String token = getFanWeiToken(false);
+                String bodyString = "";
                 String url = "";
                 String result = "";
 
@@ -428,8 +436,8 @@ public final class FanweiCommonUtil {
                 try {
                     url = param_sendflow + "?access_token=" + token + "&secret_key=" + param_secretkey;
                     logger.info("泛微发送消息接口地址：" + url);
-
-                    result = KHttpClientUtils.postjson(url, header, JSON.toJSONString(fanweiBodyData));
+                    bodyString = CommonHelperUtils.buildEsbApiBodyJSON(fanweiBodyData);
+                    result = KHttpClientUtils.postjson(url, header, bodyString);
                 } catch (IOException e) {
                     logger.info(e.getMessage());
 
@@ -935,16 +943,22 @@ public final class FanweiCommonUtil {
             setParmamValue();
         }
 
+        String bodyString = "";
         String token = "";
-
         String result = "";
         String url = "";
+
+        Map<String, String> header = new HashMap<>();
+        header.put("Content-Type", "application/json; charset=UTF-8");
+
+
         try {
             url = param_getcode + "?corpid=" + param_cropid + "&response_type=" + param_responsetype + "&state=" + param_state;
 
             logger.info("获取泛微code接口地址：" + url);
             //获取code
-            result = KHttpClientUtils.get(url);
+            bodyString = CommonHelperUtils.buildEsbApiBodyJSON(null);
+            result = KHttpClientUtils.postjson(url, header, bodyString);
         } catch (Exception e) {
             logger.info(e.getMessage());
 
@@ -968,25 +982,14 @@ public final class FanweiCommonUtil {
         }
         String code = codeObj.getString("code");
 
-        Map<String, String> header = new HashMap<>();
-        header.put("Content-Type", "application/json; charset=UTF-8");
-
-        Map<String, Object> params = new HashMap<>();
-//        Map<String, Object> body = new HashMap<>();
-
-        params.put("app_key", param_appkey);
-        params.put("app_secret", param_appsecret);
-        params.put("grant_type", param_granttype);
-        params.put("code", code);
-
         //获取token
         try {
-            url = param_gettoken;
+            url = param_gettoken + "?app_key=" + param_appkey + "&app_secret=" + param_appsecret + "&grant_type=" + param_granttype + "&code=" + code;
             logger.info("获取泛微token接口地址：" + url);
 
-            result = KHttpClientUtils.postjson(url, header, JSON.toJSONString(params));
-
+            bodyString = CommonHelperUtils.buildEsbApiBodyJSON(null);
 
+            result = KHttpClientUtils.postjson(url, header, bodyString);
         } catch (IOException e) {
             logger.info(e.getMessage());
 
@@ -1013,6 +1016,8 @@ public final class FanweiCommonUtil {
         return token;
     }
 
+
+
     /**
      * 保存日志
      * @param userid