refactor: 迁移物流相关代码

src/main/java/com/starcharge/wios/client/DepponClient.java

@@ -4,6 +4,8 @@ import com.dtflys.forest.annotation.BaseRequest;
 import com.dtflys.forest.annotation.Body;
 import com.dtflys.forest.annotation.Body;
 import com.dtflys.forest.annotation.Post;
 import com.dtflys.forest.annotation.Post;
 
 
+import java.util.Map;
+
 /**
 /**
  * <p>
  * <p>
  * 德邦物流clinet,注意入参使用Map或者对象实体
  * 德邦物流clinet,注意入参使用Map或者对象实体
@@ -20,6 +22,6 @@ public interface DepponClient {
      * @return 字符串
      * @return 字符串
      */
      */
     @Post("newTraceQuery.action")
     @Post("newTraceQuery.action")
-    String newTraceQuery(@Body("params") String params);
+    String newTraceQuery(@Body("params") Map<String,Object> params);
 
 
 }
 }

src/main/java/com/starcharge/wios/client/DopInterceptor.java

 package com.starcharge.wios.client;
 package com.starcharge.wios.client;
 
 
+import com.deppon.dop.module.sdk.shared.util.FastJsonUtil;
 import com.deppon.dop.module.sdk.shared.util.SecurityUtil;
 import com.deppon.dop.module.sdk.shared.util.SecurityUtil;
 import com.dtflys.forest.exceptions.ForestRuntimeException;
 import com.dtflys.forest.exceptions.ForestRuntimeException;
 import com.dtflys.forest.http.ForestRequest;
 import com.dtflys.forest.http.ForestRequest;
@@ -18,11 +19,12 @@ import org.apache.commons.codec.digest.DigestUtils;
  */
  */
 public class DopInterceptor <T> implements Interceptor<T> {
 public class DopInterceptor <T> implements Interceptor<T> {
 
 
-    private final String companyCode="EWBXRCHSZX";
-    private final String appkey="fe38a755ce4f7629717342e441cdedff";
+    private final String companyCode = "EWBXRCHSZX";
+    private final String appkey = "fe38a755ce4f7629717342e441cdedff";
 
 
     /**
     /**
-     * 该方法在被调用时，检测token是否过期，并在beforeExecute前被调用
+     * 该方法在被调用时
+     *
      * @Param request Forest请求对象
      * @Param request Forest请求对象
      * @Param args 方法被调用时传入的参数数组
      * @Param args 方法被调用时传入的参数数组
      */
      */
@@ -32,16 +34,16 @@ public class DopInterceptor <T> implements Interceptor<T> {
 
 
     @Override
     @Override
     public boolean beforeExecute(ForestRequest request) {
     public boolean beforeExecute(ForestRequest request) {
-        request.addHeader("Content-Type","application/x-www-form-urlencoded;charset=utf-8");
-        String params = request.getBody().get(0).toString();
-//        String timestamp=System.currentTimeMillis()+"";
-        String timestamp="1697877426621";
-        //params+appkey+timestamp,,,ZDU0NzYzZWJkODRhZjBlZjcyYjEwZDYxYTNlNzRkNWQ=
-        String digest= SecurityUtil.getStandardDigest( params+appkey+timestamp);
+        request.addHeader("Content-Type", "application/x-www-form-urlencoded;charset=utf-8");
+//        String params = request.getBody().get(0)+"";
+        long timestamp = System.currentTimeMillis();
+        String params = FastJsonUtil.toJSONString(request.getBody().getNameValueBody("params").getValue());
+        String digest = SecurityUtil.getStandardDigest(params + appkey + timestamp);
         request.addBody("companyCode", companyCode);
         request.addBody("companyCode", companyCode);
-        request.addBody("digest",digest);
-        request.addBody("timestamp",timestamp);
-        return true;  // 继续执行请求返回true
+        request.addBody("digest", digest);
+        request.addBody("timestamp", timestamp);
+        request.addBody("params", params);
+        return true;
     }
     }
 
 
     /**
     /**
@@ -68,7 +70,7 @@ public class DopInterceptor <T> implements Interceptor<T> {
     public void afterExecute(ForestRequest req, ForestResponse res) {
     public void afterExecute(ForestRequest req, ForestResponse res) {
     }
     }
 
 
-    private  String getDigest(String plainText) {
-        return  Base64.encodeBase64String(DigestUtils.md5Hex(plainText).getBytes());
+    private String getDigest(String plainText) {
+        return Base64.encodeBase64String(DigestUtils.md5Hex(plainText).getBytes());
     }
     }
 }
 }

src/main/java/com/starcharge/wios/controller/WallboxApplyController.java

@@ -191,8 +191,7 @@ public class WallboxApplyController {
     public BaseResponse<Object> getTrace(@PathVariable("id") String id) {
     public BaseResponse<Object> getTrace(@PathVariable("id") String id) {
         Map<String, Object> paramMap = new HashMap<>();
         Map<String, Object> paramMap = new HashMap<>();
         paramMap.put("mailNo", id);
         paramMap.put("mailNo", id);
-        String rest = depponClient.newTraceQuery(JSON.toJSONString(paramMap));
-        return new BaseResponse<>(rest);
+        return new BaseResponse<>(JSON.parseObject(depponClient.newTraceQuery(paramMap)));
     }
     }
 
 
     /**
     /**