配置文件改写为yml形式

mall-admin/src/main/resources/application-dev.properties

@@ -1,19 +0,0 @@
-#===datasource start===
-spring.datasource.url=jdbc:mysql://localhost:3306/mall?useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
-spring.datasource.username=root
-spring.datasource.password=root
-#===datasource end===
-
-#===druid start===
-#\u8FDE\u63A5\u6C60\u521D\u59CB\u5316\u5927\u5C0F
-spring.datasource.druid.initial-size=5
-#\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5\u6570
-spring.datasource.druid.min-idle=10
-#\u6700\u5927\u8FDE\u63A5\u6570
-spring.datasource.druid.max-active=20
-#\u4E0D\u7EDF\u8BA1\u8FD9\u4E9B\u8BF7\u6C42\u6570\u636E
-spring.datasource.druid.web-stat-filter.exclusions=*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*
-#\u8BBF\u95EE\u76D1\u63A7\u7F51\u9875\u7684\u767B\u5F55\u7528\u6237\u540D\u548C\u5BC6\u7801
-spring.datasource.druid.stat-view-servlet.login-username=druid
-spring.datasource.druid.stat-view-servlet.login-password=druid
-#===druid end===

mall-admin/src/main/resources/application-dev.yml

@@ -0,0 +1,14 @@
+spring:
+  datasource:
+    url: jdbc:mysql://localhost:3306/mall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
+    username: root
+    password: root
+    druid:
+      initial-size: 5 #连接池初始化大小
+      min-idle: 10 #最小空闲连接数
+      max-active: 20 #最大连接数
+      web-stat-filter:
+        exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*" #不统计这些请求数据
+      stat-view-servlet: #访问监控网页的登录用户名和密码
+        login-username: druid
+        login-password: druid

mall-admin/src/main/resources/application-prod.properties

@@ -1,22 +0,0 @@
-#===datasource start===
-spring.datasource.url=jdbc:mysql://db:3306/mall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
-spring.datasource.username=reader
-spring.datasource.password=123456
-#===datasource end===
-
-#\u914D\u7F6E\u65E5\u5FD7\u751F\u6210\u8DEF\u5F84
-logging.path=/var/logs
-
-#===druid start===
-#\u8FDE\u63A5\u6C60\u521D\u59CB\u5316\u5927\u5C0F
-spring.datasource.druid.initial-size=5
-#\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5\u6570
-spring.datasource.druid.min-idle=10
-#\u6700\u5927\u8FDE\u63A5\u6570
-spring.datasource.druid.max-active=20
-#\u4E0D\u7EDF\u8BA1\u8FD9\u4E9B\u8BF7\u6C42\u6570\u636E
-spring.datasource.druid.web-stat-filter.exclusions=*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*
-#\u8BBF\u95EE\u76D1\u63A7\u7F51\u9875\u7684\u767B\u5F55\u7528\u6237\u540D\u548C\u5BC6\u7801
-spring.datasource.druid.stat-view-servlet.login-username=druid
-spring.datasource.druid.stat-view-servlet.login-password=druid
-#===druid end===

mall-admin/src/main/resources/application-prod.yml

@@ -0,0 +1,17 @@
+spring:
+  datasource:
+    url: jdbc:mysql://db:3306/mall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
+    username: reader
+    password: 123456
+    druid:
+      initial-size: 5 #连接池初始化大小
+      min-idle: 10 #最小空闲连接数
+      max-active: 20 #最大连接数
+      web-stat-filter:
+        exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*" #不统计这些请求数据
+      stat-view-servlet: #访问监控网页的登录用户名和密码
+        login-username: druid
+        login-password: druid
+
+logging:
+  path: /var/logs #配置日志生成路径

mall-admin/src/main/resources/application.properties

@@ -1,47 +0,0 @@
-#\u9ED8\u8BA4\u4E3A\u5F00\u53D1\u73AF\u5883
-spring.profiles.active=dev
-
-#===mybatis start===
-mybatis.mapper-locations=classpath:dao/*.xml,classpath*:com/**/mapper/*.xml
-#===mybatis end===
-
-#===log start===
-#\u65E5\u5FD7\u914D\u7F6EDEBUG,INFO,WARN,ERROR
-logging.level.root=info
-#\u5355\u72EC\u914D\u7F6E\u65E5\u5FD7\u7EA7\u522B
-logging.level.com.macro.mall=debug
-#\u914D\u7F6E\u65E5\u5FD7\u751F\u6210\u8DEF\u5F84
-#logging.path=/var/logs
-#\u914D\u7F6E\u65E5\u5FD7\u6587\u4EF6\u540D\u79F0
-#logging.file=demo_log.log
-#===log end===
-
-#===thymeleaf start===
-spring.thymeleaf.mode=HTML5
-spring.thymeleaf.encoding=UTF-8
-spring.thymeleaf.server.content-type=text/html
-#\u5F00\u53D1\u65F6\u5173\u95ED\u7F13\u5B58,\u4E0D\u7136\u6CA1\u6CD5\u770B\u5230\u5B9E\u65F6\u9875\u9762
-spring.thymeleaf.cache=false
-#===thymeleaf end==
-
-#===JWT start===
-#JWT\u5B58\u50A8\u7684\u8BF7\u6C42\u5934
-jwt.tokenHeader=Authorization
-#JWT\u52A0\u89E3\u5BC6\u4F7F\u7528\u7684\u5BC6\u94A5
-jwt.secret=mySecret
-#JWT\u7684\u8D85\u671F\u9650\u65F6\u95F4(60*60*24)
-jwt.expiration=604800
-#JWT\u8D1F\u8F7D\u4E2D\u62FF\u5230\u5F00\u5934
-jwt.tokenHead=Bearer 
-#===JWT end===
-
-#===OSS start===
-aliyun.oss.endpoint=oss-cn-shenzhen.aliyuncs.com
-aliyun.oss.accessKeyId=test
-aliyun.oss.accessKeySecret=test
-aliyun.oss.bucketName=macro-oss
-aliyun.oss.policy.expire=300
-aliyun.oss.maxSize=10
-aliyun.oss.callback=http://localhost:8080/aliyun/oss/callback
-aliyun.oss.dir.prefix=mall/images/
-#===OSS end===

mall-admin/src/main/resources/application.yml

@@ -0,0 +1,34 @@
+spring:
+  profiles:
+    active: dev #默认为开发环境
+
+mybatis:
+  mapper-locations:
+    - classpath:dao/*.xml
+    - classpath*:com/**/mapper/*.xml
+
+jwt:
+  tokenHeader: Authorization #JWT存储的请求头
+  secret: mySecret #JWT加解密使用的密钥
+  expiration: 604800 #JWT的超期限时间(60*60*24)
+  tokenHead: Bearer  #JWT负载中拿到开头
+
+aliyun:
+  oss:
+    endpoint: oss-cn-shenzhen.aliyuncs.com
+    accessKeyId: test
+    accessKeySecret: test
+    bucketName: macro-oss
+    policy:
+      expire: 300
+    maxSize: 10
+    callback: http://localhost:8080/aliyun/oss/callback
+    dir:
+      prefix: mall/images/
+
+logging:
+  level:
+    root: info #日志配置DEBUG,INFO,WARN,ERROR
+    com.macro.mall: debug
+#  file: demo_log.log #配置日志生成路径
+#  path: /var/logs #配置日志文件名称