wei.zhou

提交代码

...@@ -33,11 +33,7 @@ ...@@ -33,11 +33,7 @@
33 <artifactId>spring-boot-devtools</artifactId> 33 <artifactId>spring-boot-devtools</artifactId>
34 <optional>true</optional> 34 <optional>true</optional>
35 </dependency> 35 </dependency>
36 - <dependency> 36 +
37 - <groupId>org.springframework.boot</groupId>
38 - <artifactId>spring-boot-starter-tomcat</artifactId>
39 - <scope>provided</scope>
40 - </dependency>
41 37
42 <dependency> 38 <dependency>
43 <groupId>org.springframework.boot</groupId> 39 <groupId>org.springframework.boot</groupId>
...@@ -55,17 +51,6 @@ ...@@ -55,17 +51,6 @@
55 <version>1.1.9</version> 51 <version>1.1.9</version>
56 </dependency> 52 </dependency>
57 53
58 -<!-- <dependency>-->
59 -<!-- <groupId>org.springframework.boot</groupId>-->
60 -<!-- <artifactId>spring-boot-actuator</artifactId>-->
61 -<!-- <version>2.1.7.RELEASE</version>-->
62 -<!-- </dependency>-->
63 -<!-- <dependency>-->
64 -<!-- <groupId>org.springframework.boot</groupId>-->
65 -<!-- <artifactId>spring-boot-actuator-autoconfigure</artifactId>-->
66 -<!-- <version>2.1.7.RELEASE</version>-->
67 -<!-- </dependency>-->
68 -
69 <dependency> 54 <dependency>
70 <groupId>com.google.code.gson</groupId> 55 <groupId>com.google.code.gson</groupId>
71 <artifactId>gson</artifactId> 56 <artifactId>gson</artifactId>
...@@ -92,6 +77,12 @@ ...@@ -92,6 +77,12 @@
92 <artifactId>commons-lang3</artifactId> 77 <artifactId>commons-lang3</artifactId>
93 </dependency> 78 </dependency>
94 79
80 + <dependency>
81 + <groupId>javax.servlet</groupId>
82 + <artifactId>javax.servlet-api</artifactId>
83 + <version>3.1.0</version>
84 + <scope>provided</scope>
85 + </dependency>
95 86
96 87
97 88
...@@ -127,6 +118,22 @@ ...@@ -127,6 +118,22 @@
127 <artifactId>spring-boot-maven-plugin</artifactId> 118 <artifactId>spring-boot-maven-plugin</artifactId>
128 </plugin> 119 </plugin>
129 </plugins> 120 </plugins>
121 + <resources>
122 + <resource>
123 + <directory>src/main/java</directory>
124 + <includes>
125 + <include>**/*.xml</include>
126 + </includes>
127 + <filtering>false</filtering>
128 + </resource>
129 + <resource>
130 + <directory>src/main/resources</directory>
131 + <includes>
132 + <include>**/*.*</include>
133 + </includes>
134 + </resource>
135 + </resources>
136 + <finalName>${artifactId}-${version}_${activatedProperties}</finalName>
130 </build> 137 </build>
131 138
132 </project> 139 </project>
......
...@@ -22,6 +22,4 @@ public class IClearApiApplication { ...@@ -22,6 +22,4 @@ public class IClearApiApplication {
22 SpringApplication.run(IClearApiApplication.class, args); 22 SpringApplication.run(IClearApiApplication.class, args);
23 } 23 }
24 24
25 -
26 -
27 } 25 }
......
1 +package com.erry.iclear.dateInterface;
2 +
3 +import org.springframework.boot.builder.SpringApplicationBuilder;
4 +import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
5 +
6 +/**
7 + * @author Administrator
8 + */
9 +public class SpringBootStartApplication extends SpringBootServletInitializer {
10 + @Override
11 + protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
12 + return builder.sources(IClearApiApplication.class);
13 + }
14 +}
...\ No newline at end of file ...\ No newline at end of file
1 -server:
2 - port: 8080
3 -
4 -
5 spring: 1 spring:
6 - application:
7 - name: iClearExport.DataInterface
8 - profiles:
9 - active: @activatedProperties@
10 jpa: 2 jpa:
11 database: sql_server 3 database: sql_server
12 show-sql: true 4 show-sql: true
......
1 -server:
2 - port: 8080
3 -
4 -
5 -
6 spring: 1 spring:
7 - application: 2 + jpa:
8 - name: iClearExport.DataInterface 3 + database: sql_server
9 - profiles: 4 + show-sql: true
10 - active: @activatedProperties@ 5 + hibernate:
6 + ddl-auto: none
7 + naming:
8 + physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
9 + datasource:
10 + url: jdbc:sqlserver://yilansql.database.chinacloudapi.cn:1433;DatabaseName=IClear_Prod
11 + username: sqladmin
12 + password: ZXC1@3asd2019
13 + driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
14 + type: com.alibaba.druid.pool.DruidDataSource
15 +
11 16
12 task: 17 task:
13 pushMawbToIClear: 0 0/1 * * * ? 18 pushMawbToIClear: 0 0/1 * * * ?
...\ No newline at end of file ...\ No newline at end of file
......
1 -server:
2 - port: 8080
3 -
4 spring: 1 spring:
5 - application: 2 + jpa:
6 - name: iClearExport.DataInterface 3 + database: sql_server
7 - profiles: 4 + show-sql: true
8 - active: @activatedProperties@ 5 + hibernate:
6 + ddl-auto: none
7 + naming:
8 + physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
9 + datasource:
10 + url: jdbc:sqlserver://40.73.78.157:1433;DatabaseName=IClearDemo
11 + username: sa
12 + password: Fedex_123
13 + driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
14 + type: com.alibaba.druid.pool.DruidDataSource
15 +
9 16
10 17
11 task: 18 task:
12 pushMawbToIClear: 0 0/1 * * * ? 19 pushMawbToIClear: 0 0/1 * * * ?
20 +
21 +
......
1 +server:
2 + port: 8080
3 +
4 +spring:
5 + application:
6 + name: iClearExport.DataInterface
7 + profiles:
8 + active: test
9 +