Fedex / iClear-api

Go to a project
Toggle navigation Toggle navigation pinning
李俊
d627b0a0 1 parent d019fcf2

内网迁移环境代码调整

Inline Side-by-side
Showing 5 changed files with 41 additions and 25 deletions
......@@ -15,6 +15,7 @@ import java.util.Date;
/**
* @author Administrator
* /hscode/hscodeRequest
*/
@RestController
@RequestMapping("/hscode")
......
spring:
servlet:
context-path: /API
datasource:
url: jdbc:sqlserver://40.73.78.157:1433;DatabaseName=IClearDev
username: sa
password: Fedex_123
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
type: com.alibaba.druid.pool.DruidDataSource
# jndi-name: jdbc/iclearDS
jndi-name: jdbc/iclearProdTestDS
# url: jdbc:sqlserver://40.73.78.157:1433;DatabaseName=IClearUat
# username: sa
# password: Fedex_123
# driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
# type: com.alibaba.druid.pool.DruidDataSource
task:
#推送海关回执
......@@ -16,32 +21,32 @@ task:
#推送失败的申报数据
pushErrorDeclareDate: 0 0/3 * * * ?
#推送地址
api:
base-address: https://iclearexpuat.fedex.com.cn/Exp
base-address: https://declarationuat.fedex.com.cn/Exp
token-info:
#获取token账号
username: iclear_external_ctm
#获取token密码
password: toQu3arch6
address:
#IClear校验运单地址
iclear-check-url: ${api.base-address}/chmConsignmentController/checkChmAndDetaliD
#IClearC类提交运单地址
iclear-submit-url: ${api.base-address}/chmConsignmentController/submitConsignments
#IClear校验运单地址
iclear-check-url: ${api.base-address}/chmConsignmentController/checkChmAndDetaliD
#IClear校验C类运单地址
iclear-check-url-c: ${api.base-address}/chmConsignmentController/checkChmAndDetaliC
#获取token地址
token-url: https://apiuat.iclrccd-fedex.com/login
# token-url: https://apictm.iclrccd-fedex.com/login
#刷新token地址
refresh-token-url: https://apiuat.iclrccd-fedex.com/admin/user/token/refresh
refresh-token-url: https://apiuat.iclrccd-fedex.com/user/token/refresh
#传输海关回执地址
customs-url: https://apiuat.iclrccd-fedex.com/export/outbound/customs
#推送完整报文地址
complete-msg-url: https://apiuat.iclrccd-fedex.com/export/outbound/mawb
#http代理地址（刷新token、传输海关回执地址、推送完整报文地址）
#代理地址（刷新token、传输海关回执地址、推送完整报文地址）
# http://cn2-proxy.apac.fedex.com:3128
# http://internet.proxy.fedex.com:80
# http://internet.proxy.fedex.com
proxy-url: cn2-proxy.apac.fedex.com
proxy-port: 3128
......
spring:
servlet:
context-path: /API
datasource:
url: jdbc:sqlserver://yilansql.database.chinacloudapi.cn:1433;DatabaseName=IClear_Prod
username: sqladmin
password: ZXC1@3asd2019
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
type: com.alibaba.druid.pool.DruidDataSource
jndi-name: jdbc/iclearDS
# jndi-name: jdbc/iclearProdTestDS
# url: jdbc:sqlserver://40.73.78.157:1433;DatabaseName=IClearUat
# username: sa
# password: Fedex_123
# driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
# type: com.alibaba.druid.pool.DruidDataSource
task:
#推送海关回执
......@@ -18,18 +23,19 @@ task:
#推送地址
api:
base-address: https://declaration.fedex.com.cn/Exp
token-info:
#获取token账号 非prod
username: iclear_export_prod
#获取token密码
password: 1qaz@WSX
address:
#IClear校验运单地址
iclear-check-url: https://www.iclrccd-fedex.com/chmConsignmentController/checkChmAndDetaliD
#IClearC类提交运单地址
iclear-submit-url: https://www.iclrccd-fedex.com/chmConsignmentController/submitConsignments
iclear-submit-url: ${api.base-address}/chmConsignmentController/submitConsignments
#IClear校验运单地址
iclear-check-url: ${api.base-address}/chmConsignmentController/checkChmAndDetaliD
#IClear校验C类运单地址
iclear-check-url-c: https://www.iclrccd-fedex.com/chmConsignmentController/checkChmAndDetaliC
iclear-check-url-c: ${api.base-address}/chmConsignmentController/checkChmAndDetaliC
#获取token地址
token-url: https://apictm.iclrccd-fedex.com/login
#刷新token地址
......
......@@ -9,8 +9,6 @@ server:
spring:
profiles:
active: @activatedProperties@
......
......@@ -31,8 +31,14 @@ public class ApiTest {
public static String security = "6db193cb4165a71b";
public static void main(String[] args) throws Exception{
// BASF,iClearExportC,6db193cb4165a71b
System.out.println(new Date(Long.valueOf(timeStamp)));
String token = SHA256Util.getSHA256String("BASF" + "iClearExportC" + "6db193cb4165a71b" + ApiTest.timeStamp);
System.out.println(token);
//D类申报的数据落地接口
ApiTest.sendMawb();
// ApiTest.sendMawb();
//C类申报的数据落地接口
// ApiTest.sendMawbBasf();
//C类EDI数据接口
......@@ -51,7 +57,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" + "bb348f1ba6ab7cc1" + ApiTest.timeStamp);
System.out.println(token);
// Header[] headers = HttpHeader.custom()
......