OA接口调用公共类优化

code/jyyy/nckd-jimin-jyyy-bd/src/main/java/nckd/jimin/jyyy/bd/common/oauth/FanWeiUtils.java

@@ -28,8 +28,8 @@ public class FanWeiUtils {
             String param_app_key = mapentity.get("app_key");
             String param_grant_type = mapentity.get("grant_type");
             String param_app_secret = mapentity.get("app_secret");
-            String param_code_url = mapentity.get("getcode");
-            String param_token_url = mapentity.get("gettoken");
+            String param_code_url = mapentity.get("getcode1");
+            String param_token_url = mapentity.get("gettoken1");
             String post_getspeaker_url = mapentity.get("getspeaker");
 
             if( StringUtils.isEmpty(param_corpid) || StringUtils.isEmpty(param_app_secret)
@@ -48,6 +48,9 @@ public class FanWeiUtils {
 
             //http://172.16.51.120:20600/papi/openapi/oauth2/authorize?corpid=ca9c4a14fe2e2d92d94125024c538ba3&response_type=code&state=jyyy
 
+            Map<String, String> header = new HashMap<>();
+            header.put("Content-Type", "application/json");
+
             //获取token
             StringBuilder authorizeUrl = new StringBuilder();
             authorizeUrl.append(param_code_url);
@@ -58,8 +61,11 @@ public class FanWeiUtils {
             authorizeUrl.append("&state=");
             authorizeUrl.append(param_state);
 
+            String tokenPostData = getTokenData();
+
             logger.info("请求泛微 接口：" + authorizeUrl.toString() );
-            String code = KHttpClientUtils.get(authorizeUrl.toString());
+            //String code = KHttpClientUtils.get(authorizeUrl.toString());
+            String code = KHttpClientUtils.postjson(authorizeUrl.toString().toString(),header,tokenPostData);
             logger.info("请求泛微 authorizeUrl Return：" + code );
 
             JSONObject codeJson  = JSONObject.parseObject(code);
@@ -76,15 +82,6 @@ public class FanWeiUtils {
                 tokenUrl.append("&code=");
                 tokenUrl.append(codeString);
 
-//                JSONObject jsonData = new JSONObject();
-//                jsonData.put("app_key",param_app_key);
-//                jsonData.put("app_secret",param_app_secret);
-//                jsonData.put("grant_type",param_grant_type);
-//                jsonData.put("code",codeString);
-
-                String tokenPostData = getTokenData();
-                Map<String, String> header = new HashMap<>();
-                header.put("Content-Type", "application/x-www-form-urlencoded");
                 logger.info("请求泛微 接口：" + tokenUrl.toString() );
                 String reToken = KHttpClientUtils.postjson(tokenUrl.toString(),header,tokenPostData);
                 logger.info("请求泛微 TokenUrl Return：" + reToken );
@@ -96,10 +93,8 @@ public class FanWeiUtils {
                     speakerUrl.append("?access_token=");
                     speakerUrl.append(tokenString);
                     String speakerJsonData = getSpeakerData();
-                    Map<String, String> header1 = new HashMap<>();
-                    header.put("Content-Type", "application/json");
                     logger.info("请求SAP 接口：" + speakerUrl.toString() );
-                    String result = KHttpClientUtils.postjson(speakerUrl.toString(), header1, speakerJsonData);
+                    String result = KHttpClientUtils.postjson(speakerUrl.toString(), header, speakerJsonData);
                     logger.info("请求SAP Speaker Return：" + result);
                     return result;
                 }