Commit 64d242d58e7d0b52a2b0b643f78fd53ee4a75812
1 parent
d450dbd2
更新配置文件....
Showing
4 changed files
with
17 additions
and
6 deletions
pom.xml
| @@ -219,6 +219,12 @@ | @@ -219,6 +219,12 @@ | ||
| 219 | <artifactId>jaxrpc-api</artifactId> | 219 | <artifactId>jaxrpc-api</artifactId> |
| 220 | <version>1.1</version> | 220 | <version>1.1</version> |
| 221 | </dependency> | 221 | </dependency> |
| 222 | + | ||
| 223 | + <dependency> | ||
| 224 | + <groupId>org.springframework.boot</groupId> | ||
| 225 | + <artifactId>spring-boot-devtools</artifactId> | ||
| 226 | + <optional>true</optional> | ||
| 227 | + </dependency> | ||
| 222 | </dependencies> | 228 | </dependencies> |
| 223 | 229 | ||
| 224 | <dependencyManagement> | 230 | <dependencyManagement> |
| @@ -248,7 +254,6 @@ | @@ -248,7 +254,6 @@ | ||
| 248 | <artifactId>maven-war-plugin</artifactId> | 254 | <artifactId>maven-war-plugin</artifactId> |
| 249 | <version>2.2</version><!--$NO-MVN-MAN-VER$ --> | 255 | <version>2.2</version><!--$NO-MVN-MAN-VER$ --> |
| 250 | <configuration> | 256 | <configuration> |
| 251 | - <version>3.1</version> | ||
| 252 | <failOnMissingWebXml>false</failOnMissingWebXml> | 257 | <failOnMissingWebXml>false</failOnMissingWebXml> |
| 253 | </configuration> | 258 | </configuration> |
| 254 | </plugin> | 259 | </plugin> |
| @@ -257,6 +262,12 @@ | @@ -257,6 +262,12 @@ | ||
| 257 | <artifactId>spring-boot-maven-plugin</artifactId> | 262 | <artifactId>spring-boot-maven-plugin</artifactId> |
| 258 | </plugin> | 263 | </plugin> |
| 259 | </plugins> | 264 | </plugins> |
| 265 | + <resources> | ||
| 266 | + <resource> | ||
| 267 | + <directory>src/main/resources</directory> | ||
| 268 | + <filtering>false</filtering> | ||
| 269 | + </resource> | ||
| 270 | + </resources> | ||
| 260 | </build> | 271 | </build> |
| 261 | <repositories> | 272 | <repositories> |
| 262 | <repository> | 273 | <repository> |
src/main/resources/application-dev.properties
| @@ -6,9 +6,9 @@ spring.jpa.hibernate.ddl-auto= update | @@ -6,9 +6,9 @@ spring.jpa.hibernate.ddl-auto= update | ||
| 6 | spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy | 6 | spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy |
| 7 | #DATABASE | 7 | #DATABASE |
| 8 | spring.jpa.database= MYSQL | 8 | spring.jpa.database= MYSQL |
| 9 | -spring.jpa.show-sql= true | 9 | +spring.jpa.show-sql= false |
| 10 | spring.datasource.driver-class-name= com.mysql.jdbc.Driver | 10 | spring.datasource.driver-class-name= com.mysql.jdbc.Driver |
| 11 | -spring.datasource.url= jdbc:mysql://192.168.168.201:3306/mh_control | 11 | +spring.datasource.url= jdbc:mysql://192.168.168.201:3306/qp_control?useUnicode=true&characterEncoding=utf-8&useSSL=false |
| 12 | spring.datasource.username= root | 12 | spring.datasource.username= root |
| 13 | spring.datasource.password= 123456 | 13 | spring.datasource.password= 123456 |
| 14 | #DATASOURCE | 14 | #DATASOURCE |
src/main/resources/application-prod.properties
| @@ -8,7 +8,7 @@ spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy | @@ -8,7 +8,7 @@ spring.jpa.hibernate.naming_strategy= org.hibernate.cfg.ImprovedNamingStrategy | ||
| 8 | spring.jpa.database= MYSQL | 8 | spring.jpa.database= MYSQL |
| 9 | spring.jpa.show-sql= true | 9 | spring.jpa.show-sql= true |
| 10 | spring.datasource.driver-class-name= com.mysql.jdbc.Driver | 10 | spring.datasource.driver-class-name= com.mysql.jdbc.Driver |
| 11 | -spring.datasource.url= jdbc:mysql://192.168.40.100:3306/qp_control | 11 | +spring.datasource.url= jdbc:mysql://192.168.40.100:3306/qp_control?useUnicode=true&characterEncoding=utf-8&useSSL=false |
| 12 | spring.datasource.username= root | 12 | spring.datasource.username= root |
| 13 | spring.datasource.password= root@JSP2jsp | 13 | spring.datasource.password= root@JSP2jsp |
| 14 | #DATASOURCE | 14 | #DATASOURCE |
src/main/resources/ms-jdbc.properties
| 1 | #ms.mysql.driver= com.mysql.jdbc.Driver | 1 | #ms.mysql.driver= com.mysql.jdbc.Driver |
| 2 | -#ms.mysql.url= jdbc:mysql://192.168.40.82:3306/ms?useUnicode=true&characterEncoding=utf-8 | 2 | +#ms.mysql.url= jdbc:mysql://192.168.40.82:3306/ms?useUnicode=true&characterEncoding=utf-8&useSSL=false |
| 3 | #ms.mysql.username= root | 3 | #ms.mysql.username= root |
| 4 | #ms.mysql.password= 123456 | 4 | #ms.mysql.password= 123456 |
| 5 | 5 | ||
| 6 | ms.mysql.driver= com.mysql.jdbc.Driver | 6 | ms.mysql.driver= com.mysql.jdbc.Driver |
| 7 | -ms.mysql.url= jdbc:mysql://192.168.168.201:3306/ms?useUnicode=true&characterEncoding=utf-8 | 7 | +ms.mysql.url= jdbc:mysql://192.168.168.201:3306/ms?useUnicode=true&characterEncoding=utf-8&useSSL=false |
| 8 | ms.mysql.username= root | 8 | ms.mysql.username= root |
| 9 | ms.mysql.password= 123456 | 9 | ms.mysql.password= 123456 |