tao.mo

配置文件类型修改

mt
2023年1月9日17:59:33
......@@ -23,6 +23,12 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
......@@ -179,8 +185,8 @@
<directory>src/main/resources</directory>
<filtering>true</filtering>
<includes>
<include>application.yml</include>
<include>application-${activatedProperties}.yml</include>
<include>application.properties</include>
<include>application-${activatedProperties}.properties</include>
</includes>
</resource>
<resource>
......
......@@ -48,6 +48,7 @@ public class HsCodeInterface {
resultHsCode = hsCodeService.findHsCodeListByCode(hscode.getHscode());
return resultHsCode;
} else {
//如果没有传hscode需要限制10分钟只能查询一次
boolean rs = iClearApiHsCodeLogService.findIClearApiHsCodeLog();
if(rs == true){
......
spring.servlet.context-path=/API
spring.datasource.url=jdbc:sqlserver://192.168.1.250:1433;DatabaseName=IClearDev
spring.datasource.username=iclear
spring.datasource.password=root1234
spring.datasource.driver-class-name=com.microsoft.sqlserver.jdbc.SQLServerDriver
spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
#spring.datasource.jndi-name=jdbc/iclearProdTestDS
#推送海关回执
task.pushCustomsTask=0 0/1 * 1 * ?
#推送完整报文
task.pushMawbTask=0 0/1 * 1 * ?
#推送失败的回执数据
task.pushErrorReturnDate=0 0/3 * 1 * ?
#推送失败的申报数据
task.pushErrorDeclareDate=0 0/3 * 1 * ?
api.base-address=https://declarationuat.fedex.com.cn/Exp
#获取token账号
api.token-info.username=iclear_external_ctm
#获取token密码
api.token-info.password=toQu3arch6
#IClearC类提交运单地址
api.address.iclear-submit-url=${api.base-address}/chmConsignmentController/submitConsignments
#IClear校验运单地址
api.address.iclear-check-url=${api.base-address}/chmConsignmentController/checkChmAndDetaliD
#IClear校验C类运单地址
api.address.iclear-check-url-c=${api.base-address}/chmConsignmentController/checkChmAndDetaliC
#获取token地址
api.address.token-url=https://apiuat.iclrccd-fedex.com/login
#刷新token地址
api.address.refresh-token-url=https://apiuat.iclrccd-fedex.com/user/token/refresh
#传输海关回执地址
api.address.customs-url=https://apiuat.iclrccd-fedex.com/export/outbound/customs
#推送完整报文地址
api.address.complete-msg-url=https://apiuat.iclrccd-fedex.com/export/outbound/mawb
#代理地址(刷新token、传输海关回执地址、推送完整报文地址)
api.address.proxy-url=cn2-proxy.apac.fedex.com
api.address.proxy-port=3128
\ No newline at end of file
spring:
servlet:
context-path: /API
datasource:
# 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:
#推送海关回执
pushCustomsTask: 0 0/1 * 1 * ?
#推送完整报文
pushMawbTask: 0 0/1 * 1 * ?
#推送失败的回执数据
pushErrorReturnDate: 0 0/3 * 1 * ?
#推送失败的申报数据
pushErrorDeclareDate: 0 0/3 * 1 * ?
#推送地址
api:
base-address: https://declarationuat.fedex.com.cn/Exp
token-info:
#获取token账号
username: iclear_external_ctm
#获取token密码
password: toQu3arch6
address:
#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/user/token/refresh
#传输海关回执地址
customs-url: https://apiuat.iclrccd-fedex.com/export/outbound/customs
#推送完整报文地址
complete-msg-url: https://apiuat.iclrccd-fedex.com/export/outbound/mawb
#代理地址(刷新token、传输海关回执地址、推送完整报文地址)
# http://cn2-proxy.apac.fedex.com:3128
# http://internet.proxy.fedex.com
proxy-url: cn2-proxy.apac.fedex.com
proxy-port: 3128
spring.servlet.context-path=/API
spring.datasource.jndi-name=jdbc/iclearDS
#推送海关回执
task.pushCustomsTask=0 0/1 * * * ?
#推送完整报文
task.pushMawbTask=0 0/1 * 1 * ?
#推送失败的回执数据
task.pushErrorReturnDate=0 0/30 * * * ?
#推送失败的申报数据
task.pushErrorDeclareDate=0 0/30 * * * ?
api.base-address=https://declaration.fedex.com.cn/Exp
#获取token账号
api.token-info.username=iclear_export_prod
#获取token密码
api.token-info.password=1qaz@WSX
#IClearC类提交运单地址
api.address.iclear-submit-url=${api.base-address}/chmConsignmentController/submitConsignments
#IClear校验运单地址
api.address.iclear-check-url=${api.base-address}/chmConsignmentController/checkChmAndDetaliD
#IClear校验C类运单地址
api.address.iclear-check-url-c=${api.base-address}/chmConsignmentController/checkChmAndDetaliC
#获取token地址
api.address.token-url=https://apictm.iclrccd-fedex.com/login
#刷新token地址
api.address.refresh-token-url=https://apictm.iclrccd-fedex.com/admin/user/token/refresh
#传输海关回执地址
api.address.customs-url=https://apictm.iclrccd-fedex.com/export/outbound/customs
#推送完整报文地址
api.address.complete-msg-url=https://apictm.iclrccd-fedex.com/export/outbound/mawb
#代理地址(刷新token、传输海关回执地址、推送完整报文地址)
api.address.proxy-url=cn2-proxy.apac.fedex.com
api.address.proxy-port=3128
\ No newline at end of file
spring:
servlet:
context-path: /API
datasource:
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:
#推送海关回执
pushCustomsTask: 0 0/1 * * * ?
#推送完整报文
pushMawbTask: 0 0/1 * * * ?
#推送失败的回执数据
pushErrorReturnDate: 0 0/30 * * * ?
#推送失败的申报数据
pushErrorDeclareDate: 0 0/30 * * * ?
#推送地址
api:
base-address: https://declaration.fedex.com.cn/Exp
token-info:
#获取token账号 非prod
username: iclear_export_prod
#获取token密码
password: 1qaz@WSX
address:
#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://apictm.iclrccd-fedex.com/login
#刷新token地址
refresh-token-url: https://apictm.iclrccd-fedex.com/admin/user/token/refresh
#传输海关回执地址
customs-url: https://apictm.iclrccd-fedex.com/export/outbound/customs
#推送完整报文地址
complete-msg-url: https://apictm.iclrccd-fedex.com/export/outbound/mawb
#代理地址(刷新token、传输海关回执地址、推送完整报文地址)
# http://cn2-proxy.apac.fedex.com:3128
# http://internet.proxy.fedex.com
proxy-url: cn2-proxy.apac.fedex.com
proxy-port: 3128
spring.servlet.context-path=/API
spring.datasource.jndi-name=jdbc/iclearDS
#推送海关回执
task.pushCustomsTask=0 0/1 * * * ?
#推送完整报文
task.pushMawbTask=0 0/1 * 1 * ?
#推送失败的回执数据
task.pushErrorReturnDate=0 0/3 * * * ?
#推送失败的申报数据
task.pushErrorDeclareDate=0 0/3 * * * ?
api.base-address=https://declarationuat.fedex.com.cn/Exp
#获取token账号
api.token-info.username=iclear_external_ctm
#获取token密码
api.token-info.password=toQu3arch6
#IClearC类提交运单地址
api.address.iclear-submit-url=${api.base-address}/chmConsignmentController/submitConsignments
#IClear校验运单地址
api.address.iclear-check-url=${api.base-address}/chmConsignmentController/checkChmAndDetaliD
#IClear校验C类运单地址
api.address.iclear-check-url-c=${api.base-address}/chmConsignmentController/checkChmAndDetaliC
#获取token地址
api.address.token-url=https://apiuat.iclrccd-fedex.com/login
#刷新token地址
api.address.refresh-token-url=https://apiuat.iclrccd-fedex.com/user/token/refresh
#传输海关回执地址
api.address.customs-url=https://apiuat.iclrccd-fedex.com/export/outbound/customs
#推送完整报文地址
api.address.complete-msg-url=https://apiuat.iclrccd-fedex.com/export/outbound/mawb
#代理地址(刷新token、传输海关回执地址、推送完整报文地址)
api.address.proxy-url=cn2-proxy.apac.fedex.com
api.address.proxy-port=3128
\ No newline at end of file
spring:
servlet:
context-path: /API
datasource:
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:
#推送海关回执
pushCustomsTask: 0 0/1 * * * ?
#推送完整报文
pushMawbTask: 0 0/1 * * * ?
#推送失败的回执数据
pushErrorReturnDate: 0 0/3 * * * ?
#推送失败的申报数据
pushErrorDeclareDate: 0 0/3 * * * ?
#推送地址
api:
base-address: https://declarationuat.fedex.com.cn/Exp
token-info:
#获取token账号
username: iclear_external_ctm
#获取token密码
password: toQu3arch6
address:
#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/user/token/refresh
#传输海关回执地址
customs-url: https://apiuat.iclrccd-fedex.com/export/outbound/customs
#推送完整报文地址
complete-msg-url: https://apiuat.iclrccd-fedex.com/export/outbound/mawb
#代理地址(刷新token、传输海关回执地址、推送完整报文地址)
# http://cn2-proxy.apac.fedex.com:3128
# http://internet.proxy.fedex.com
proxy-url: cn2-proxy.apac.fedex.com
proxy-port: 3128
server.port=8780
server.ssl.enabled=true
server.ssl.key-store-type=PKCS12
server.ssl.key-store=classpath:iclearApiSSL.p12
server.ssl.key-store-password=iclear
server.ssl.key-alias=iclearApiSSL
spring.profiles.active=@activatedProperties@
spring.application.name=iClearExport.DataInterface
spring.jpa.database=sql_server
spring.jpa.show-sql=true
spring.jpa.hibernate.ddl-auto=none
spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
spring.jpa.properties.event.merge.entity_copy_observer=allow
\ No newline at end of file
server:
port: 8780
ssl:
enabled: true
key-store-type: PKCS12
key-store: classpath:iclearApiSSL.p12
key-store-password: iclear
key-alias: iclearApiSSL
spring:
profiles:
active: @activatedProperties@
# active: dev
application:
name: iClearExport.DataInterface
jpa:
database: sql_server
show-sql: true
hibernate:
ddl-auto: none
naming:
physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
properties:
event:
merge:
entity_copy_observer: allow