Merge remote-tracking branch 'origin/master'

src/main/java/com/jqtx/windows/component/model/ZyHttpBaseResponse.java

@@ -5,9 +5,9 @@ import lombok.Data;
 @Data
 public class ZyHttpBaseResponse {
 
-    private String clientld;
+    private String clientId;
 
-    private String serviceld;
+    private String serviceId;
 
     private String segNo;
 

src/main/java/com/jqtx/windows/component/model/ZyJsonResult.java

+package com.jqtx.windows.component.model;
+
+import com.jqtx.windows.common.exception.BizException;
+import com.jqtx.windows.infrastructure.enums.ExceptionCodeEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.ToString;
+
+import java.io.Serializable;
+
+@ApiModel(
+        value = "ZyJsonResult",
+        description = "通用返回结果模型"
+)
+@ToString
+public class ZyJsonResult<T> implements Serializable {
+    private static final long serialVersionUID = 1475348231900998033L;
+    @ApiModelProperty("状态码")
+    private String code;
+    @ApiModelProperty("请求成功与否,true:成功,false:失败")
+    private Boolean success;
+    @ApiModelProperty("提示信息")
+    private String message;
+    @ApiModelProperty("返回业务数据")
+    private T result;
+
+    public ZyJsonResult() {
+    }
+
+    public ZyJsonResult(boolean isSuccess, String code, String message) {
+        this.success = isSuccess;
+        this.code = code;
+        this.message = message;
+    }
+
+    public String getCode() {
+        return this.code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public boolean isSuccess() {
+        return this.success;
+    }
+
+    public void setSuccess(boolean success) {
+        this.success = success;
+    }
+
+    public String getMessage() {
+        return this.message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public T getResult() {
+        return this.result;
+    }
+
+    public void setResult(T result) {
+        this.result = result;
+    }
+
+}

src/main/java/com/jqtx/windows/utils/AbcHttpClient.java

@@ -10,6 +10,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.jqtx.windows.component.model.ZyHttpBaseResponse;
 import com.jqtx.windows.component.model.ZyHttpBaseRquest;
+import com.jqtx.windows.component.model.ZyJsonResult;
 import com.jqtx.windows.web.request.AbcRequest;
 import com.jqtx.windows.web.response.JsonResult;
 import lombok.extern.slf4j.Slf4j;
@@ -39,7 +40,7 @@ public class AbcHttpClient {
     private String clientId;
 
 
-    public ZyHttpBaseResponse postRequest(String paramJson, String method) {
+    public ZyJsonResult postRequest(String paramJson, String method) {
         try {
             final String url = posetUrl;
             ZyHttpBaseRquest zyHttpBaseRquest = new ZyHttpBaseRquest();
@@ -60,16 +61,22 @@ public class AbcHttpClient {
                     .setConnectionTimeout(5000).execute();
             log.info("请求浙农加密返回数据:{}", JSON.toJSONString(response.body()));
             String body = response.body();
-            JSONObject responseJson = JSONObject.parseObject(body);
-            String data = responseJson.getString("data");
-            String sign = responseJson.getString("sign");
-            boolean f = SignUtil.veriSign(data, sign, AbcRsaUtil.getPublicKey(ypdPublicKey));
-            if (f) {
-                String dec = EncryptUtil.decrypt(data, AbcRsaUtil.getPrivateKey(privateKey));
-                log.info("请求浙农解密返回数据:{}", JSON.toJSONString(dec));
-                return JSONObject.parseObject(dec, ZyHttpBaseResponse.class);
+            ZyHttpBaseResponse zyHttpBaseResponse = JSONObject.parseObject(body, ZyHttpBaseResponse.class);
+            //成功
+            if (zyHttpBaseResponse.getReturnCode().equals("0000")) {
+                String data = zyHttpBaseResponse.getData();
+                String sign = zyHttpBaseResponse.getSign();
+                boolean f = SignUtil.veriSign(data, sign, AbcRsaUtil.getPublicKey(ypdPublicKey));
+                if (f) {
+                    String dec = EncryptUtil.decrypt(data, AbcRsaUtil.getPrivateKey(privateKey));
+                    log.info("请求浙农解密返回数据:{}", JSON.toJSONString(dec));
+                    return JSONObject.parseObject(dec, ZyJsonResult.class);
+                } else {
+                    log.info("验签异常");
+                }
             } else {
-                log.info("验签异常");
+                log.error("请求浙农异常");
+                return null;
             }
         } catch (
                 Exception e) {
@@ -94,7 +101,7 @@ public class AbcHttpClient {
             /*验签*/
             boolean f = SignUtil.veriSign(data, sign, AbcRsaUtil.getPublicKey(ypdPublicKey));
             if (f) {
-                data = "LbfVKZfHTWm0S6h81XLAgv8zRmUwljGCznpVln1be2oiuXH1vw00sPW2uA5iOJND0d+5KtCzT8O3xD4avg4qEHvwlUWDZ7nFCqs5y5X470MCSwyxrH1UbBGLNlrfiq8yWmz5eKcxlyjyhLy46IuVqpJlxZ8hP3yU2gObcACuT8YmiVgzPvzefomyF+YalaFf9l7kObTvmfayVfugC1vCvYDyIWlNs9BUeHpPboo8KUUMi7E7e/jIpunCSSd7fF7Sh3rziwa+170cZfE5wrkJ/m4cvHzK86kCzDrIOABbhuvTFIpaUs8SFNujV2E6YP6jxYJ2FR8IlgMS/W/B4fX7dQ==";
+                //data = "LbfVKZfHTWm0S6h81XLAgv8zRmUwljGCznpVln1be2oiuXH1vw00sPW2uA5iOJND0d+5KtCzT8O3xD4avg4qEHvwlUWDZ7nFCqs5y5X470MCSwyxrH1UbBGLNlrfiq8yWmz5eKcxlyjyhLy46IuVqpJlxZ8hP3yU2gObcACuT8YmiVgzPvzefomyF+YalaFf9l7kObTvmfayVfugC1vCvYDyIWlNs9BUeHpPboo8KUUMi7E7e/jIpunCSSd7fF7Sh3rziwa+170cZfE5wrkJ/m4cvHzK86kCzDrIOABbhuvTFIpaUs8SFNujV2E6YP6jxYJ2FR8IlgMS/W/B4fX7dQ==";
                 String dec = EncryptUtil.decrypt(data, AbcRsaUtil.getPrivateKey(privateKey));
                 System.out.println("解密后返回数据:" + dec);
             } else {