From 1e5c102f7df8141ee7d2ca22e824a87a33acbc0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Thu, 21 Feb 2019 23:49:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E9=85=8D=E7=BD=AE=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       | 23 -------------------
 src/main/assembly/package.xml                 |  6 ++++-
 src/main/resources/application-dev.properties |  4 ----
 .../resources/application-prod.properties     |  0
 .../resources/application-test.properties     |  4 ----
 src/main/resources/application.properties     |  5 +++-
 src/main/resources/application.yml            |  0
 7 files changed, 9 insertions(+), 33 deletions(-)
 delete mode 100644 src/main/resources/application-dev.properties
 delete mode 100644 src/main/resources/application-prod.properties
 delete mode 100644 src/main/resources/application-test.properties
 delete mode 100644 src/main/resources/application.yml

diff --git a/pom.xml b/pom.xml
index 0516e47e..ba21d381 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,29 +2,6 @@
 <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>
diff --git a/src/main/assembly/package.xml b/src/main/assembly/package.xml
index c10a94c7..d191bf29 100644
--- a/src/main/assembly/package.xml
+++ b/src/main/assembly/package.xml
@@ -27,7 +27,11 @@ http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 ">
     </fileSets>
     <files>
         <file>
-            <source>src/main/resources/application.yml</source>
+            <source>src/main/resources/application.properties</source>
+            <outputDirectory>/conf</outputDirectory>
+        </file>
+        <file>
+            <source>src/main/resources/logback-spring.xml</source>
             <outputDirectory>/conf</outputDirectory>
         </file>
     </files>
diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties
deleted file mode 100644
index 463f95a6..00000000
--- a/src/main/resources/application-dev.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-spring.datasource.url=jdbc:mysql://127.0.0.1:3306/jsh_erp?useUnicode=true&characterEncoding=utf8&useCursorFetch=true&defaultFetchSize=500&allowMultiQueries=true&rewriteBatchedStatements=true&useSSL=false
-spring.datasource.driverClassName=com.mysql.jdbc.Driver
-spring.datasource.username=root
-spring.datasource.password=123456
\ No newline at end of file
diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/main/resources/application-test.properties b/src/main/resources/application-test.properties
deleted file mode 100644
index 463f95a6..00000000
--- a/src/main/resources/application-test.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-spring.datasource.url=jdbc:mysql://127.0.0.1:3306/jsh_erp?useUnicode=true&characterEncoding=utf8&useCursorFetch=true&defaultFetchSize=500&allowMultiQueries=true&rewriteBatchedStatements=true&useSSL=false
-spring.datasource.driverClassName=com.mysql.jdbc.Driver
-spring.datasource.username=root
-spring.datasource.password=123456
\ No newline at end of file
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 5e36727f..6afb2970 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,5 +1,8 @@
 server.port=8080
-spring.profiles.active=@activatedProperties@
+spring.datasource.url=jdbc:mysql://127.0.0.1:3306/jsh_erp?useUnicode=true&characterEncoding=utf8&useCursorFetch=true&defaultFetchSize=500&allowMultiQueries=true&rewriteBatchedStatements=true&useSSL=false
+spring.datasource.driverClassName=com.mysql.jdbc.Driver
+spring.datasource.username=root
+spring.datasource.password=1234
 #generatorConfig专用属性
 project=src/main/java
 resource=src/main/resources
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
deleted file mode 100644
index e69de29b..00000000