Fedex / iClear-api

Go to a project
Toggle navigation Toggle navigation pinning
李俊
0ce36c31 1 parent 3c15070f

内网迁移环境代码调整

Inline Side-by-side
Showing 8 changed files with 99 additions and 24 deletions
......@@ -109,6 +109,23 @@
<artifactId>httpclient</artifactId>
<version>4.5.3</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-legacy</artifactId>
<version>2.0.0.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
<optional>true</optional>
<scope>true</scope>
</dependency>
</dependencies>
<profiles>
......
......@@ -4,8 +4,11 @@ import com.erry.iclear.dateInterface.service.SimpleJpaRepositoryImpl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.web.bind.annotation.GetMapping;
/**
......@@ -16,10 +19,18 @@ import org.springframework.scheduling.annotation.EnableScheduling;
@SpringBootApplication
@EnableScheduling
//@EnableJpaRepositories(value = "com.erry.iclear.dateInterface.repository", repositoryBaseClass = SimpleJpaRepositoryImpl.class)
public class IClearApiApplication {
public class IClearApiApplication extends SpringBootServletInitializer {
@Override
protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
return builder.sources(IClearApiApplication.class);
}
public static void main(String[] args) {
SpringApplication.run(IClearApiApplication.class, args);
}
@GetMapping("/test")
public String test(){
return "test";
}
}
......
package com.erry.iclear.dateInterface;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
/**
* @author Administrator
*/
public class SpringBootStartApplication extends SpringBootServletInitializer {
@Override
protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
return builder.sources(IClearApiApplication.class);
}
}
\ No newline at end of file
//package com.erry.iclear.dateInterface;
//
//import org.springframework.boot.builder.SpringApplicationBuilder;
//import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
//
///**
// * @author Administrator
// */
//public class SpringBootStartApplication extends SpringBootServletInitializer {
// @Override
// protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
// return builder.sources(IClearApiApplication.class);
// }
//}
......
......@@ -14,7 +14,7 @@ import org.springframework.stereotype.Component;
/**
* @author Administrator
*/
@Component
//@Component
@Slf4j
public class IClearApiTask {
@Autowired
......
......@@ -19,6 +19,7 @@ task:
#推送地址
api:
base-address: http://localhost:8080
token-info:
#获取token账号
username: iclear_external_ctm
......@@ -26,11 +27,11 @@ api:
password: toQu3arch6
address:
#IClear校验运单地址
iclear-check-url: http://139.217.114.139:8082/chmConsignmentController/checkChmAndDetaliD
iclear-check-url: ${api.base-address}/chmConsignmentController/checkChmAndDetaliD
#IClearC类提交运单地址
iclear-submit-url: http://139.217.114.139:8082/chmConsignmentController/submitConsignments
iclear-submit-url: ${api.base-address}/chmConsignmentController/submitConsignments
#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地址
......
spring:
datasource:
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
jndi-name: jdbc/iclearDS
# 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:
#推送海关回执
......
<?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">
<container-descriptor>
<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>