升级springboot版本依赖到2.0,修复部分文件内容乱码,加入配置文件为properties

This commit is contained in:
cjl
2019-01-11 08:58:44 +08:00
parent c43441fe3a
commit 5b5f144abf
14 changed files with 845 additions and 899 deletions

25
pom.xml
View File

@@ -2,7 +2,30 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<profiles>
<profile>
<id>dev</id>
<properties>
<activatedProperties>dev</activatedProperties>
</properties>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
</profile>
<profile>
<id>test</id>
<properties>
<activatedProperties>test</activatedProperties>
</properties>
</profile>
<profile>
<id>prod</id>
<properties>
<activatedProperties>prod</activatedProperties>
</properties>
</profile>
</profiles>
<groupId>com.jsh</groupId>
<artifactId>jshERP</artifactId>
<version>2.0.2-SNAPSHOT</version>
@@ -14,7 +37,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.1.RELEASE</version>
<version>2.0.0.RELEASE</version>
</parent>
<properties>