Fedex / iClear-api

Go to a project
Toggle navigation Toggle navigation pinning
李俊
2a8ce1fe 2 parents f7efaded b596387f

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	src/main/java/com/erry/iclear/dateInterface/service/ApiService.java
Inline Side-by-side
Showing 3 changed files with 11 additions and 3 deletions
...@@ -161,12 +161,12 @@ public class ApiService { ...@@ -161,12 +161,12 @@ public class ApiService {
161 log.info("海关回执推送失败，推送相应码为："+tokenResult.getErrorcode() + "，推送ID为：" + d.getId()); 161 log.info("海关回执推送失败，推送相应码为："+tokenResult.getErrorcode() + "，推送ID为：" + d.getId());
162 } 162 }
163 }catch(Exception ex){ 163 }catch(Exception ex){
164 + log.error("推送海关回执异常：" + ex.getMessage(), ex);
164 //接口响应时间 165 //接口响应时间
165 declearTask.setResponseTime(new Date()); 166 declearTask.setResponseTime(new Date());
166 declearTask.setResponseResults("99999"); 167 declearTask.setResponseResults("99999");
167 declearTask.setResponseContent(ex.getMessage()); 168 declearTask.setResponseContent(ex.getMessage());
168 declearTaskList.add(declearTask); 169 declearTaskList.add(declearTask);
169 - log.error("sendCustoms error",ex);
170 } 170 }
171 }); 171 });
172 declearTaskList.forEach(declearTask -> { 172 declearTaskList.forEach(declearTask -> {
......
...@@ -39,6 +39,10 @@ ...@@ -39,6 +39,10 @@
39 <appender-ref ref="CONSOLE"/> 39 <appender-ref ref="CONSOLE"/>
40 <appender-ref ref="FILE"/> 40 <appender-ref ref="FILE"/>
41 </root> 41 </root>
42 + <root level="error">
43 + <appender-ref ref="CONSOLE"/>
44 + <appender-ref ref="FILE"/>
45 + </root>
42 </springProfile> 46 </springProfile>
43 47
44 <springProfile name="prod"> 48 <springProfile name="prod">
...@@ -46,6 +50,10 @@ ...@@ -46,6 +50,10 @@
46 <appender-ref ref="CONSOLE"/> 50 <appender-ref ref="CONSOLE"/>
47 <appender-ref ref="FILE"/> 51 <appender-ref ref="FILE"/>
48 </root> 52 </root>
53 + <root level="error">
54 + <appender-ref ref="CONSOLE"/>
55 + <appender-ref ref="FILE"/>
56 + </root>
49 </springProfile> 57 </springProfile>
50 58
51 59
......
...@@ -28,7 +28,7 @@ public class ApiTest { ...@@ -28,7 +28,7 @@ public class ApiTest {
28 public static String appId = "IDE"; 28 public static String appId = "IDE";
29 public static String appKey = "iClearExport"; 29 public static String appKey = "iClearExport";
30 //需要申请 30 //需要申请
31 - public static String security = "6db193cb4165a71b"; 31 + public static String security = "bb348f1ba6ab7cc1";
32 32
33 public static void main(String[] args) throws Exception{ 33 public static void main(String[] args) throws Exception{
34 //D类申报的数据落地接口 34 //D类申报的数据落地接口
...@@ -51,7 +51,7 @@ public class ApiTest { ...@@ -51,7 +51,7 @@ public class ApiTest {
51 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\"}]}"; 51 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\"}]}";
52 52
53 System.out.println(new Date(Long.valueOf(timeStamp))); 53 System.out.println(new Date(Long.valueOf(timeStamp)));
54 - String token = SHA256Util.getSHA256String("BASF" + "iClearExportC" + ApiTest.security + ApiTest.timeStamp); 54 + String token = SHA256Util.getSHA256String("DEMO1" + "iClearExportDemo1" + ApiTest.security + ApiTest.timeStamp);
55 System.out.println(token); 55 System.out.println(token);
56 56
57 // Header[] headers = HttpHeader.custom() 57 // Header[] headers = HttpHeader.custom()
......