微调

semiconductor-system/src/main/java/com/system/api/KingDeeApi.java

@@ -8,7 +8,7 @@ import com.system.exception.KingDeeConnectException;
 import com.system.model.DelayedElement;
 import com.system.model.InitConnectParam;
 import com.system.serivce.ISynchronizationService;
-import com.system.utils.HttpClientUtil;
+import com.system.utils.HttpUtil;
 import com.system.utils.JsonUtil;
 import com.system.utils.KingDeeLogUtil;
 import com.system.utils.StringUtil;
@@ -17,7 +17,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
-import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -271,8 +270,8 @@ public class KingDeeApi {
 
     public String sendThirdParty(String json, int index) {
         try {
-            return HttpClientUtil.sendPost(this.thirdPartyUrl, json);
-        } catch (IOException e) {
+            return HttpUtil.httpPost(this.thirdPartyUrl, json).getBody();
+        } catch (Exception e) {
             if (index != 0) {
                 this.sendThirdParty(json, index - 1);
             } else {
@@ -302,8 +301,8 @@ public class KingDeeApi {
 
     public String sendPlugInUnit(String plugInUrl, String json, Integer index) {
         try {
-            return HttpClientUtil.sendPost(plugInUrl, json);
-        } catch (IOException e) {
+            return HttpUtil.httpPost(plugInUrl, json).getBody();
+        } catch (Exception e) {
             if (index != 0) {
                 this.sendPlugInUnit(plugInUrl, json, index - 1);
             }

semiconductor-system/src/main/java/com/system/api/KingDeeApiClient.java

 package com.system.api;
 
 import com.system.config.ThreadLocalConfig;
+import com.system.constants.Constants;
 import com.system.constants.KingDeeConstants;
 import com.system.serializer.SerializerProxy;
+import com.system.utils.HttpUtil;
 import com.system.utils.JsonUtil;
-import com.system.utils.StringUtil;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.util.CollectionUtils;
@@ -51,7 +52,7 @@ public class KingDeeApiClient {
         System.out.println("------------>" + url);
 
         long start = System.currentTimeMillis();
-        ResponseEntity<String> responseEntity = KingDeeHttpApi.httpPost(url, header, JsonUtil.toString(request));
+        ResponseEntity<String> responseEntity = HttpUtil.httpPost(url, header, JsonUtil.toString(request));
         long costTime = System.currentTimeMillis() - start;
 
         Map<String, Object> map = ThreadLocalConfig.get();
@@ -68,13 +69,13 @@ public class KingDeeApiClient {
             request.put("parameters", new Object[]{dbId, userName, password, lcid});
 
             String url = serverUrl + "Kingdee.BOS.WebApi.ServicesStub.AuthService.ValidateUser" + HTTP_SUFFIX;
-            ResponseEntity<String> responseEntity = KingDeeHttpApi.httpPost(url, JsonUtil.toString(request));
+            ResponseEntity<String> responseEntity = HttpUtil.httpPost(url, JsonUtil.toString(request));
             System.out.println(responseEntity.getBody());
 
             if (responseEntity.getStatusCode() == HttpStatus.OK) {
-                String cookieStore = this.getCookieStore(responseEntity);
-                if (StringUtil.isNotBlank(cookieStore)) {
-                    this.cookieStore = cookieStore;
+                Map<String, Object> map = JsonUtil.toMap(responseEntity.getBody(), String.class, Object.class);
+                if (!CollectionUtils.isEmpty(map) && Constants.ONE.equals(String.valueOf(map.get(KingDeeConstants.LOGIN_RESULT_TYPE)))) {
+                    this.cookieStore = this.getCookieStore(responseEntity);
                     return true;
                 } else {
                     return false;

semiconductor-system/src/main/java/com/system/constants/Constants.java

@@ -5,6 +5,9 @@ package com.system.constants;
  */
 public interface Constants {
 
+    String ONE = "1";
+
+
     String TIME_FORMAT = "yyyy-MM-dd HH:mm:ss";
 
 
@@ -23,5 +26,4 @@ public interface Constants {
     String DATA_NAME = "data";
 
 
-
 }

semiconductor-system/src/main/java/com/system/constants/KingDeeConstants.java

@@ -11,6 +11,9 @@ public interface KingDeeConstants {
     String KING_DEE_SESSION_NAME = "kdservice-sessionid";
 
 
+    String LOGIN_RESULT_TYPE = "LoginResultType";
+
+
     String CODE_NAME = "resultCode";
 
 

semiconductor-system/src/main/java/com/system/scheduler/LicScheduler.java

@@ -97,7 +97,7 @@ public class LicScheduler {
                 Map<String, Object> map = new HashMap<>(1);
                 map.put("data", RsaUtil.encryptByPublicKeyToLong(JsonUtil.toString(request), publicKey));
 
-                String result = HttpClientUtil.sendPost("http://192.168.0.37:8090/lic/api/lic/online/verification", JsonUtil.toString(map));
+                String result = HttpUtil.httpPost("http://192.168.0.37:8090/lic/api/lic/online/verification", JsonUtil.toString(map)).getBody();
                 Map<String, Object> temp = JsonUtil.toMap(RsaUtil.decryptByPublicKeyToLong(result, publicKey), String.class, Object.class);
 
                 if (!CollectionUtils.isEmpty(temp)) {

semiconductor-system/src/main/java/com/system/api/KingDeeHttpApi.java → semiconductor-system/src/main/java/com/system/utils/HttpUtil.java

-package com.system.api;
+package com.system.utils;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
@@ -14,7 +16,9 @@ import java.util.Set;
 /**
  * @author Inori
  */
-public class KingDeeHttpApi {
+public class HttpUtil {
+
+    private static final Logger log = LoggerFactory.getLogger(HttpUtil.class);
 
     /**
      * 连接超时时间
@@ -41,27 +45,6 @@ public class KingDeeHttpApi {
     }
 
     /**
-     * 发送Post请求
-     */
-    public static ResponseEntity<String> httpPost(String url, String json) {
-        //初始化header公共参数
-        HttpHeaders httpHeaders = initHeader();
-        //发送请求
-        return toPost(url, httpHeaders, json);
-    }
-
-    /**
-     * 发送Post请求
-     */
-    public static ResponseEntity<String> httpPost(String url, Map<String, Object> header, String json) {
-        //初始化header公共参数
-        HttpHeaders httpHeaders = initHeader();
-        setHeaderParam(httpHeaders, header);
-        //发送请求
-        return toPost(url, httpHeaders, json);
-    }
-
-    /**
      * 设置header公共参数
      */
     private static HttpHeaders initHeader() {
@@ -86,6 +69,81 @@ public class KingDeeHttpApi {
     }
 
     /**
+     * 发送Get请求
+     */
+    public static ResponseEntity<String> httpGet(String url) {
+        //初始化header公共参数
+        HttpHeaders httpHeaders = initHeader();
+        //发送请求
+        HttpEntity<String> httpEntity = new HttpEntity<>(null, httpHeaders);
+        return restTemplate.exchange(url, HttpMethod.GET, httpEntity, String.class);
+    }
+
+    /**
+     * 发送Get请求
+     */
+    public static ResponseEntity<String> httpGet(String url, Map<String, Object> param) {
+        //初始化header公共参数
+        HttpHeaders httpHeaders = initHeader();
+        //组装查询参数
+        url = setParam(url, param);
+        //发送请求
+        HttpEntity<String> httpEntity = new HttpEntity<>(null, httpHeaders);
+        log.info("【Get请求】Url: {}", url);
+        return restTemplate.exchange(url, HttpMethod.GET, httpEntity, String.class);
+    }
+
+    private static String setParam(String url, Map<String, Object> param) {
+        Set<String> keys = param.keySet();
+        StringBuilder builder = new StringBuilder();
+        builder.append("?");
+        for (String key : keys) {
+            builder.append(key).append("=").append(param.get(key)).append("&");
+        }
+        builder.deleteCharAt(builder.lastIndexOf("&"));
+        url = url + builder.toString();
+        return url;
+    }
+
+    /**
+     * 发送Get请求
+     */
+    public static ResponseEntity<String> httpGet(String url, Map<String, Object> headers, Map<String, Object> param) {
+        //如果查询参数为空，则调用不带参数的Get请求
+        if (CollectionUtils.isEmpty(param)) {
+            return httpGet(url, headers);
+        }
+        //组装查询参数
+        url = setParam(url, param);
+        //发送请求
+        log.info("【Get请求】Url: {}", url);
+        return httpGet(url, headers);
+    }
+
+    /**
+     * 发送Post请求
+     */
+    public static ResponseEntity<String> httpPost(String url, String json) {
+        //初始化header公共参数
+        HttpHeaders httpHeaders = initHeader();
+        //发送请求
+        log.info("【Post请求】Url: {}", url);
+        return toPost(url, httpHeaders, json);
+    }
+
+    /**
+     * 发送Post请求
+     */
+    public static ResponseEntity<String> httpPost(String url, Map<String, Object> header, String json) {
+        //初始化header公共参数
+        HttpHeaders httpHeaders = initHeader();
+        setHeaderParam(httpHeaders, header);
+        //发送请求
+        log.info("【Post请求】Url: {}", url);
+        return toPost(url, httpHeaders, json);
+    }
+
+    /**
      * 发送请求
      */
     private static ResponseEntity<String> toPost(String url, HttpHeaders httpHeaders, String json) {