md

emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java

@@ -630,24 +630,19 @@ public class EmisCommonController extends EmisBaseController
     }
 
 
-    @GetMapping("/notifyTraceByKD100")
-    public AjaxResult notifyTraceByKD100(){
+    @PostMapping("/notifyTraceByKD100")
+    public String notifyTraceByKD100(){
         String lockKey="notifyTraceByKD100";
         log.error("notifyTraceByKD100 start");
+        String rst="{\n" +
+                "            \"result\":true,\n" +
+                "                \"returnCode\":\"200\",\n" +
+                "                \"message\":\"成功\"\n" +
+                "        }";
 
-        // 加锁查询
-//        redissonService.lock(lockKey,300);
-//        try{
-//        }catch(Exception ex){
-//            ex.printStackTrace();
-//            log.error("autoDoQueryTransferInfoTrigger exception:"+ex.getMessage());
-//        }
         log.error("notifyTraceByKD100 end");
-
-//        redissonService.unlock(lockKey);
-        return AjaxResult.success("发送成功");
+        return rst;
     }
 
 
-
 }

emis-biz/src/main/java/com/xdadan/erp/emis/service/print/cpcl/CvtTplToCpcl.java

@@ -6,6 +6,7 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.XML;
+import com.xdadan.erp.common.utils.AESUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.text.StrSubstitutor;
@@ -192,6 +193,14 @@ public class CvtTplToCpcl {
         return encCmd;
     }
 
+
+    public static String decryTplXmlStr(String encTplBase64Str){
+
+        String decStr=AESUtil.decrypt(encTplBase64Str,"203f8ce70aeeba38","ECB");
+
+        return null;
+    }
+
     public static void main(String[] args) {
 
         String tplFile="/Users/alan/Downloads/探路速运-130-0628缅甸特快极快-英文模版(无logo).frx";

emis-biz/src/main/java/com/xdadan/erp/emis/utils/Kd100Helper.java

@@ -92,7 +92,7 @@ public class Kd100Helper {
         parameters.put("callbackurl", "http://api.emis.tanex56.com/api/bizsvr/emis/common/notifyTraceByKD100");
         param.put("parameters", parameters);
         param.put("salt", "tanex56");
-        param.put("phone", "138188161237");
+        param.put("phone", phone);
         param.put("resultv2", "4");
 
         String mgsData = param.toJSONString();