From 1e1e5f6ed5c08e4c9bd93556b31379e9b4d9aee1 Mon Sep 17 00:00:00 2001
From: cjl <qiankunpingtai@163.com>
Date: Tue, 15 Jan 2019 11:07:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  1 -
 src/main/java/com/jsh/erp/ErpApplication.java | 33 ++++++++++---------
 .../resources/application-test.properties     |  4 +++
 src/main/resources/application.properties     | 22 -------------
 src/main/resources/application.yml            |  0
 5 files changed, 22 insertions(+), 38 deletions(-)
 create mode 100644 src/main/resources/application.yml

diff --git a/pom.xml b/pom.xml
index 4e4cfd75..c97caa6d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,6 @@
 			<properties>
 				<activatedProperties>test</activatedProperties>
 			</properties>
-
 		</profile>
 		<profile>
 			<id>prod</id>
diff --git a/src/main/java/com/jsh/erp/ErpApplication.java b/src/main/java/com/jsh/erp/ErpApplication.java
index 8a94ce46..f519e836 100644
--- a/src/main/java/com/jsh/erp/ErpApplication.java
+++ b/src/main/java/com/jsh/erp/ErpApplication.java
@@ -1,15 +1,18 @@
-package com.jsh.erp;
-
-import org.mybatis.spring.annotation.MapperScan;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.scheduling.annotation.EnableScheduling;
-
-@SpringBootApplication
-@MapperScan(basePackages = {"com.jsh.erp.datasource.mappers"})
-@EnableScheduling
-public class ErpApplication {
-    public static void main(String[] args) {
-        SpringApplication.run(ErpApplication.class, args);
-    }
-}
+package com.jsh.erp;
+
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+@SpringBootApplication
+@MapperScan(basePackages = {"com.jsh.erp.datasource.mappers"})
+@EnableScheduling
+public class ErpApplication{
+    public static void main(String[] args) {
+        SpringApplication.run(ErpApplication.class, args);
+    }
+
+
+
+}
diff --git a/src/main/resources/application-test.properties b/src/main/resources/application-test.properties
index e69de29b..463f95a6 100644
--- a/src/main/resources/application-test.properties
+++ b/src/main/resources/application-test.properties
@@ -0,0 +1,4 @@
+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 c234628a..d6ebbd16 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,35 +1,13 @@
 server.port=8080
-#spring.application.name=erp
-#eureka.client.service-url.defaultZone=http://sinldo-eureka:8001/eureka/
-#eureka.client.service-url.defaultZone=http://localhost:8001/eureka/
-#eureka.instance.instance-id=${spring.application.name}-instance-${random.value}
-#eureka.instance.prefer-ip-address=true
 spring.profiles.active=@activatedProperties@
 #generatorConfig专用属性
 project=src/main/java
 resource=src/main/resources
 web.front.baseDir=erp_web
-#web.front.baseDir=erp_web
 mybatis.type-aliases-package=com.chinamobile.model.*
 mybatis.mapper-locations=classpath:./mapper_xml/*.xml
 
 
-spring.cas.sign-out-filters=/logout
-spring.cas.auth-filters=/*
-spring.cas.validate-filters=/*
-spring.cas.request-wrapper-filters=/*
-spring.cas.assertion-filters=/*
-spring.cas.cas-server-login-url=http://localhost:8080/login
-spring.cas.cas-server-url-prefix=http://localhost:8080
-spring.cas.redirect-after-validation=true
-spring.cas.use-session=true
-spring.cas.server-name=http://localhost:9000
-
-
-##静态资源路径
-#spring.mvc.view.prefix=/templates/
-#spring.mvc.view.suffix=.html
-#spring.mvc.static-path-pattern=/**
 
 
 
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
new file mode 100644
index 00000000..e69de29b