Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/erry/iclear/dateInterface/service/ApiService.java

@@ -161,12 +161,12 @@ public class ApiService {
                     log.info("海关回执推送失败，推送相应码为："+tokenResult.getErrorcode() + "，推送ID为：" + d.getId());
                 }
             }catch(Exception ex){
+                log.error("推送海关回执异常：" + ex.getMessage(), ex);
                 //接口响应时间
                 declearTask.setResponseTime(new Date());
                 declearTask.setResponseResults("99999");
                 declearTask.setResponseContent(ex.getMessage());
                 declearTaskList.add(declearTask);
-                log.error("sendCustoms error",ex);
             }
         });
         declearTaskList.forEach(declearTask -> {

@@ -39,6 +39,10 @@
             <appender-ref ref="CONSOLE"/>
             <appender-ref ref="FILE"/>
         </root>
+        <root level="error">
+            <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="FILE"/>
+        </root>
     </springProfile>
 
     <springProfile name="prod">
@@ -46,6 +50,10 @@
             <appender-ref ref="CONSOLE"/>
             <appender-ref ref="FILE"/>
         </root>
+        <root level="error">
+            <appender-ref ref="CONSOLE"/>
+            <appender-ref ref="FILE"/>
+        </root>
     </springProfile>
 
 

@@ -28,7 +28,7 @@ public class ApiTest {
     public static String appId = "IDE";
     public static String appKey = "iClearExport";
     //需要申请
-    public static String security = "6db193cb4165a71b";
+    public static String security = "bb348f1ba6ab7cc1";
 
     public static void main(String[] args) throws Exception{
         //D类申报的数据落地接口
@@ -51,7 +51,7 @@ public class ApiTest {
         String masbJson ="{\"ieFlag\":\"E\",\"type\":\"EX\",\"agentCode\":\"1111980005\",\"agentName\":\"联邦快递（中国）有限公司\",\"billNo\":\"202204141\",\"contrNo\":\"3006622200\",\"customMaster\":\"0208\",\"cutMode\":\"601\",\"declTrnRel\":\"0\",\"distinatePort\":\"DEU000\",\"ediId\":\"001\",\"feeCurr\":\"EUR\",\"feeMark\":\"3\",\"feeRate\":110.9,\"grossWet\":4.6,\"iePort\":\"0101\",\"insurCurr\":\"EUR\",\"insurMark\":\"3\",\"insurRate\":0.74,\"netWt\":32,\"ownerCode\":\"3118962277\",\"ownerName\":\"测试核销单位\",\"packNo\":1,\"tradeCountry\":\"USA\",\"tradeMode\":\"110\",\"tradeCode\":\"32099616DM\",\"trafMode\":\"5\",\"tradeName\":\"测试发件人\",\"transMode\":\"1\",\"wrapType\":\"23\",\"tradeCodeScc\":\"A74125896321456987\",\"ownerCodeScc\":\"913100007421296207\",\"tradeAreaCode\":\"DEU\",\"entyPortCode\":\"310302\",\"goodsPlace\":\"\",\"declareName\":\"Jimmy shen\",\"overseasConsigneeEname\":\"PRYSMIAN KABEL UND SYSTEME GMBH\",\"mawbDetailList\":[{\"detailId\":\"204\",\"classMark\":\"\",\"codeTS\":\"8504409999\",\"declPrice\":3365,\"declTotal\":3365,\"dutyMode\":\"1\",\"exgNo\":\"\",\"exgVersion\":\"\",\"firstUnit\":\"007\",\"firstQty\":1,\"originCountry\":\"CHN\",\"secondUnit\":\"035\",\"secondQty\":1,\"tradeCurr\":\"EUR\",\"useTo\":\"03\",\"destinationCountry\":\"DEU\",\"ciqCode\":\"\",\"destCode\":\"110102\",\"districtCode\":\"44079\",\"gno\":1,\"gname\":\"变频调速装置\",\"gmodel\":\"4|0|控制电机用|240KW|西门子/SIEMENS|6RA8081-6GV62-0AA0|||\",\"gqty\":1,\"gunit\":\"007\"}]}";
 
         System.out.println(new Date(Long.valueOf(timeStamp)));
-        String token = SHA256Util.getSHA256String("BASF" + "iClearExportC" + ApiTest.security + ApiTest.timeStamp);
+        String token = SHA256Util.getSHA256String("DEMO1" + "iClearExportDemo1" + ApiTest.security + ApiTest.timeStamp);
         System.out.println(token);
 
 //        Header[] headers = HttpHeader.custom()