更新

src/main/java/com/tsl3060/open/extend/core/ApiClient.java

@@ -133,25 +133,28 @@ public class ApiClient {
         String signStr = iSecure.requestSign(apiRequest);
         apiRequest.setSign(signStr);
         String fBody = JSON.toJSONString(apiRequest, JSONWriter.Feature.WriteNullStringAsEmpty, JSONWriter.Feature.WriteNullListAsEmpty);
-        log.debug(">>> {}", fBody);
-        RequestBody requestBody = RequestBody.create(fBody, contentType);
-        /**
-         * 通讯主机地址
-         */
 
+        RequestBody requestBody = RequestBody.create(fBody, contentType);
+        //通讯主机地址
         String host = this.config.getHost();
+        String url = String.format("%s%s", host, apiRequest.getPath());
+
         Request request = new Request.Builder()
-                .url(String.format("%s%s", host, apiRequest.getPath()))
+                .url(url)
-                .addHeader("ACCEPT", acceptType.toString())
+                .addHeader("ACCEPT", acceptType != null ? acceptType.toString() : "application/json")
                 .post(requestBody)
                 .build();
         OkHttpClient.Builder builder = new OkHttpClient.Builder();
         //设置连接超时时间
         builder.connectTimeout(this.config.getTimeout(), TimeUnit.MILLISECONDS);
         OkHttpClient okHttpClient = builder.build();
+        log.debug(">>> {} {}", url, fBody);
         try {
             Call call = okHttpClient.newCall(request);
             try (Response response = call.execute()) {
+                if (!response.isSuccessful()) {
+                    throw new RuntimeException(String.format("接口请求执行未成功(%d)", response.code()));
+                }
                 ResponseBody responseBody = response.body();
                 ApiResponse apiResponse = null;
                 if (responseBody != null) {
@@ -160,19 +163,20 @@ public class ApiClient {
                     apiResponse = JSON.parseObject(bStr, ApiResponse.class);
                 }
                 if (apiResponse == null) {
-                    return null;
+                    throw new RuntimeException("反馈信息解析失败");
                 }
                 //验证签名
                 if (this.verifyResponse(apiResponse)) {
                     return apiResponse;
+                } else {
+                    throw new RuntimeException("反馈数据验签失败，请检查私钥是否正确");
                 }
-                return null;
 
             }
         } catch (IOException e) {
             log.error(e);
+            throw new RuntimeException("接口请求过程中遇到错误");
         }
-        return null;
     }
 
     /**
@@ -184,7 +188,7 @@ public class ApiClient {
     public boolean verifyResponse(ApiResponse response) {
         ISecure iSecure = this.secureTool.getSecure(response.getSignType());
         if (iSecure == null) {
-            log.debug("没有找到签名类型 %s", response.getSignType());
+            log.debug("没有找到签名类型 {}", response.getSignType());
             return false;
         }
         return iSecure.verifyResponse(response);