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

src/main/resources/application-dev.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

src/main/resources/application.properties

@@ -0,0 +1,37 @@
+server.port=9000
+#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=/**
+
+
+
+
+

src/main/resources/application.yml

@@ -1,13 +0,0 @@
-server:
-  port: 80
-erpDatasource:
-  driver-class-name: com.mysql.jdbc.Driver
-  url: jdbc:mysql://127.0.0.1:3306/jsh_erp?useUnicode=true&characterEncoding=utf8&useCursorFetch=true&defaultFetchSize=500&allowMultiQueries=true&rewriteBatchedStatements=true&useSSL=false
-  username: root
-  password: 1234
-web:
-  front:
-    base-dir: erp_web
-mybatis:
-  mapperLocations: classpath:mapper_xml/*.xml  #一定要对应mapper映射xml文件的所在路径
-  executorType: SIMPLE