Fedex / iClear-api

Go to a project
Toggle navigation Toggle navigation pinning
李俊
71898906 1 parent 9b715928

内网迁移环境代码调整

Inline Side-by-side
Showing 5 changed files with 32 additions and 48 deletions
......@@ -19,7 +19,7 @@ task:
#推送地址
api:
base-address: http://localhost:8080
base-address: http://localhost:8080/Exp
token-info:
#获取token账号
username: iclear_external_ctm
......
spring:
servlet:
context-path: /API
datasource:
jndi-name: jdbc/iclearDS
# url: jdbc:sqlserver://40.73.78.157:1433;DatabaseName=IClearUat
......@@ -20,16 +22,19 @@ task:
#推送地址
api:
base-address: https://iclearexpuat.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: http://139.217.114.139:8082/chmConsignmentController/checkChmAndDetaliD
iclear-check-url: ${api.base-address}/chmConsignmentController/checkChmAndDetaliD
#IClear校验C类运单地址
iclear-check-url-c: http://139.217.114.139:8082/chmConsignmentController/checkChmAndDetaliC
iclear-check-url-c: ${api.base-address}/chmConsignmentController/checkChmAndDetaliC
#获取token地址
token-url: https://apiuat.iclrccd-fedex.com/login
#刷新token地址
......
......@@ -15,9 +15,9 @@
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<prudent>false</prudent>
<append>true</append>
<file>E:/api/logs/iClear-api.log</file>
<!-- <file>E:/api/logs/iClear-api.log</file>-->
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>E:/api/logs/iClear-api-%d.%i.log</fileNamePattern>
<!-- <fileNamePattern>E:/api/logs/iClear-api-%d.log</fileNamePattern>-->
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>500MB</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
......@@ -49,4 +49,4 @@
</springProfile>
</configuration>
\ No newline at end of file
</configuration>
......
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>com.erry.iclear.dateInterface.IClearApiApplication</param-value>
</context-param>
<listener>
<listener-class>org.springframework.boot.legacy.context.web.SpringBootContextLoaderListener</listener-class>
</listener>
<servlet>
<servlet-name>appServlet</servlet-name>
<servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
<init-param>
<param-name>contextAttribute</param-name>
<param-value>org.springframework.web.context.WebApplicationContext.ROOT</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet-mapping>
<servlet-name>appServlet</servlet-name>
<url-pattern>/API</url-pattern>
</servlet-mapping>
</web-app>
<?xml version='1.0' encoding='UTF-8'?>
<weblogic-web-app xmlns="http://xmlns.oracle.com/weblogic/weblogic-web-app"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.oracle.com/weblogic/weblogic-web-app http://xmlns.oracle.com/weblogic/weblogic-web-app/1.3/weblogic-web-app.xsd">
<?xml version="1.0" encoding="UTF-8"?>
<wls:weblogic-web-app
xmlns:wls="http://xmlns.oracle.com/weblogic/weblogic-web-app"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.oracle.com/weblogic/weblogic-web-app
http://xmlns.oracle.com/weblogic/weblogic-web-app/1.4/weblogic-web-app.xsd">
<wls:context-root>/API</wls:context-root>
<!-- <container-descriptor>-->
<!-- <servlet-reload-check-secs>-1</servlet-reload-check-secs>-->
<!-- <prefer-web-inf-classes>true</prefer-web-inf-classes>-->
<!-- </container-descriptor>-->
<container-descriptor>
<!-- <wls:library-ref>-->
<!-- <library-name>lib4iClear2</library-name>-->
<!-- <specification-version>1.0</specification-version>-->
<!-- </wls:library-ref>-->
<prefer-application-packages>
<package-name>org.slf4j</package-name>
<package-name>javax.validation.*</package-name>
<package-name>org.hibernate.*</package-name>
<package-name>javax.el.*</package-name>
<package-name>org.springframework.*</package-name>
</prefer-application-packages>
</container-descriptor>
<context-root>/API</context-root>
</weblogic-web-app>
<!-- 配置路径映射 -->
<!-- <virtual-directory-mapping>-->
<!-- <local-path>/var/share/iclear/resources</local-path>-->
<!-- <url-pattern>/*</url-pattern>-->
<!-- </virtual-directory-mapping>-->
</wls:weblogic-web-app>
......