提交代码

@@ -6,7 +6,7 @@
         <groupId>org.springframework.boot</groupId>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
         <artifactId>spring-boot-starter-parent</artifactId>
         <version>2.1.17.RELEASE</version>
         <version>2.1.17.RELEASE</version>
-        <relativePath/> <!-- lookup parent from repository -->
+        <relativePath/>
     </parent>
     </parent>
     <groupId>com.erry.iclear</groupId>
     <groupId>com.erry.iclear</groupId>
     <artifactId>iclear-api</artifactId>
     <artifactId>iclear-api</artifactId>
@@ -85,30 +85,13 @@
             <artifactId>lombok</artifactId>
             <artifactId>lombok</artifactId>
             <scope>provided</scope>
             <scope>provided</scope>
         </dependency>
         </dependency>
-        <dependency>
-            <groupId>cn.hutool</groupId>
-            <artifactId>hutool-all</artifactId>
-            <version>5.2.3</version>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-            <version>1.2.60</version>
-        </dependency>
+
+
         <dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
         </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>20.0</version>
-        </dependency>
 
 
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-        </dependency>
 
 
 
 
 
 

@@ -95,14 +95,14 @@ public class CustomsDataInterface {
 
 
         //2、TODO 校验主单
         //2、TODO 校验主单
         sw.start("checkMawb");
         sw.start("checkMawb");
-        if(result.getSuccess()==true){
+        if(result.getSuccess()){
             //result.setSuccess(mawbService.checkMawb(mawb));
             //result.setSuccess(mawbService.checkMawb(mawb));
         }
         }
         sw.stop();
         sw.stop();
 
 
         //3、TODO 校验子单
         //3、TODO 校验子单
         sw.start("checkMawbDetail");
         sw.start("checkMawbDetail");
-        if(result.getSuccess()==true){
+        if(result.getSuccess()){
 
 
         }
         }
         sw.stop();
         sw.stop();
@@ -111,7 +111,7 @@ public class CustomsDataInterface {
         //4、保存运单到iclear中
         //4、保存运单到iclear中
 
 
         sw.start("saveToIClear");
         sw.start("saveToIClear");
-        if(result.getSuccess()==true){
+        if(result.getSuccess()){
             chmConsignmentService.processChmConsignment(mawb, timeStamp);
             chmConsignmentService.processChmConsignment(mawb, timeStamp);
         }
         }
         sw.stop();
         sw.stop();
@@ -177,7 +177,7 @@ public class CustomsDataInterface {
 
 
         if(StringUtils.isBlank(token)){
         if(StringUtils.isBlank(token)){
             result.setCode("-4");
             result.setCode("-4");
-            result.setMsg("TimeStamp 不能为空");
+            result.setMsg("token 不能为空");
             return result;
             return result;
         }
         }
 
 

 package com.erry.iclear.dateInterface.service;
 package com.erry.iclear.dateInterface.service;
 
 
-import cn.hutool.core.date.DateUtil;
+//import cn.hutool.core.date.DateUtil;
 import com.erry.iclear.dateInterface.api.request.Mawb;
 import com.erry.iclear.dateInterface.api.request.Mawb;
 import com.erry.iclear.dateInterface.common.Constant;
 import com.erry.iclear.dateInterface.common.Constant;
 import com.erry.iclear.dateInterface.entity.ChmCarryPort;
 import com.erry.iclear.dateInterface.entity.ChmCarryPort;

-package com.erry.iclear.dateInterface.util;
-
-import java.io.UnsupportedEncodingException;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.TreeMap;
-
-import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONException;
-import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson.parser.Feature;
-
-/**
- * @author Administrator
- */
-public class MD5Util {
-    private  static Log logger = LogFactory.getLog(MD5Util.class);
-    public static String md5(String inStr) {
-        try {
-            return DigestUtils.md5Hex(inStr.getBytes("UTF-8"));
-        } catch (UnsupportedEncodingException e) {
-            throw new RuntimeException("MD5签名过程中出现错误");
-        }
-    }
-
-    public static String sign(Map<String, Object> params, String appSecret) {
-        StringBuilder valueSb = new StringBuilder();
-        // 将参数以参数名的字典升序排序
-        Map<String, Object> sortParams = new TreeMap<String, Object>(params);
-        Set<Entry<String, Object>> entrys = sortParams.entrySet();
-        // 遍历排序的字典,并拼接value1+value2......格式
-        for (Entry<String, Object> entry : entrys) {
-            valueSb.append(entry.getValue());
-        }
-        valueSb.append(appSecret);
-        return md5(valueSb.toString());
-    }
-    public static String getParam(JSONObject jsonObj, StringBuffer sb) {
-        if(jsonObj.get("sign")!=null){
-            jsonObj.remove("sign");
-        }
-        // 将参数以参数名的字典升序排序
-        for (Entry<String, Object> entry : jsonObj.entrySet()) {
-            try{
-                JSONArray array = JSONArray.parseArray(entry.getValue().toString());
-                if(array!=null) {
-                    for (int i = 0; i < array.size(); i++) {
-                        getParam(array.getJSONObject(i), sb);
-                    }
-                }
-
-            }catch (JSONException e){
-                try{
-                    JSONObject obj = JSONObject.parseObject(entry.getValue().toString());
-                    getParam(obj,sb);
-                }catch (JSONException E2){
-                    sb.append(entry.getValue());
-                }
-            }
-        }
-        return sb.toString();
-    }
-
-    public static String md5(Object inStr,String key) {
-        try {
-             JSONObject json = JSON.parseObject(JSONObject.toJSONString(inStr), Feature.OrderedField);
-             String str = MD5Util.getParam(json,new StringBuffer());
-             return DigestUtils.md5Hex((str+key).getBytes("UTF-8"));
-        } catch (UnsupportedEncodingException e) {
-             throw new RuntimeException("MD5签名过程中出现错误");
-        }
-    }
-
-
-
-
-}

 package com.erry.iclear.dateInterface;
 package com.erry.iclear.dateInterface;
 
 
-import cn.hutool.core.date.DateUtil;
+//import cn.hutool.core.date.DateUtil;
 import com.erry.iclear.dateInterface.util.DateUtils;
 import com.erry.iclear.dateInterface.util.DateUtils;
 import com.erry.iclear.dateInterface.util.SHA256Util;
 import com.erry.iclear.dateInterface.util.SHA256Util;