diff --git a/mall-admin/src/main/resources/application-dev.properties b/mall-admin/src/main/resources/application-dev.properties
deleted file mode 100644
index cd6cae4..0000000
--- a/mall-admin/src/main/resources/application-dev.properties
+++ /dev/null
@@ -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===
\ No newline at end of file
diff --git a/mall-admin/src/main/resources/application-dev.yml b/mall-admin/src/main/resources/application-dev.yml
new file mode 100644
index 0000000..dc55068
--- /dev/null
+++ b/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
\ No newline at end of file
diff --git a/mall-admin/src/main/resources/application-prod.properties b/mall-admin/src/main/resources/application-prod.properties
deleted file mode 100644
index e392f52..0000000
--- a/mall-admin/src/main/resources/application-prod.properties
+++ /dev/null
@@ -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===
\ No newline at end of file
diff --git a/mall-admin/src/main/resources/application-prod.yml b/mall-admin/src/main/resources/application-prod.yml
new file mode 100644
index 0000000..1199a14
--- /dev/null
+++ b/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 #配置日志生成路径
\ No newline at end of file
diff --git a/mall-admin/src/main/resources/application.properties b/mall-admin/src/main/resources/application.properties
deleted file mode 100644
index c10ccc6..0000000
--- a/mall-admin/src/main/resources/application.properties
+++ /dev/null
@@ -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===
\ No newline at end of file
diff --git a/mall-admin/src/main/resources/application.yml b/mall-admin/src/main/resources/application.yml
new file mode 100644
index 0000000..d544484
--- /dev/null
+++ b/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 #配置日志文件名称
diff --git a/mall-demo/src/main/resources/application.properties b/mall-demo/src/main/resources/application.properties
deleted file mode 100644
index 4fd8f4d..0000000
--- a/mall-demo/src/main/resources/application.properties
+++ /dev/null
@@ -1,32 +0,0 @@
-#===server start===
-server.port=8082
-#===server end===
-
-#\u6570\u636E\u5E93\u8FDE\u63A5\u6C60\u914D\u7F6E
-spring.datasource.url=jdbc:mysql://localhost:3306/mall?useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
-spring.datasource.username=root
-spring.datasource.password=root
-
-#mybatis\u914D\u7F6E
-mybatis.mapper-locations=classpath:mapper/*.xml,classpath*:com/**/mapper/*.xml
-
-#\u65E5\u5FD7\u914D\u7F6EDEBUG,INFO,WARN,ERROR
-logging.level.root=warn
-#\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
-
-#thymeleaf start
-spring.thymeleaf.mode=HTML5
-spring.thymeleaf.encoding=UTF-8
-spring.thymeleaf.servlet.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
-
-#host \u914D\u7F6E start
-host.mall.admin=http://localhost:8080
-#host \u914D\u7F6E end
\ No newline at end of file
diff --git a/mall-demo/src/main/resources/application.yml b/mall-demo/src/main/resources/application.yml
new file mode 100644
index 0000000..319bfad
--- /dev/null
+++ b/mall-demo/src/main/resources/application.yml
@@ -0,0 +1,30 @@
+server:
+  port: 8082
+
+spring:
+  datasource:
+    url: jdbc:mysql://localhost:3306/mall?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
+    username: root
+    password: root
+  thymeleaf:
+    mode: HTML5
+    encoding: utf-8
+    servlet:
+      content-type: text/html
+    cache: false #开发时关闭缓存,不然没法看到实时页面
+
+mybatis:
+  mapper-locations:
+    - classpath:mapper/*.xml
+    - classpath*:com/**/mapper/*.xml
+
+logging:
+  level:
+    root: info #日志配置DEBUG,INFO,WARN,ERROR
+    com.macro.mall: debug
+#  file: demo_log.log #配置日志生成路径
+#  path: /var/logs #配置日志文件名称
+
+host:
+  mall:
+   admin: http://localhost:8080
diff --git a/mall-portal/src/main/java/com/macro/mall/portal/service/impl/UmsMemberServiceImpl.java b/mall-portal/src/main/java/com/macro/mall/portal/service/impl/UmsMemberServiceImpl.java
index 4fc41d2..78e1538 100644
--- a/mall-portal/src/main/java/com/macro/mall/portal/service/impl/UmsMemberServiceImpl.java
+++ b/mall-portal/src/main/java/com/macro/mall/portal/service/impl/UmsMemberServiceImpl.java
@@ -40,7 +40,7 @@ public class UmsMemberServiceImpl implements UmsMemberService {
     private RedisService redisService;
     @Value("${redis.key.prefix.authCode}")
     private String REDIS_KEY_PREFIX_AUTH_CODE;
-    @Value("${authCode.expire.seconds}")
+    @Value("${redis.key.expire.authCode}")
     private Long AUTH_CODE_EXPIRE_SECONDS;
 
     @Override
diff --git a/mall-portal/src/main/resources/application-dev.properties b/mall-portal/src/main/resources/application-dev.properties
deleted file mode 100644
index d46aab5..0000000
--- a/mall-portal/src/main/resources/application-dev.properties
+++ /dev/null
@@ -1,71 +0,0 @@
-#===https start===
-#\u5F00\u53D1\u73AF\u5883\u4F1A\u5F00\u542Fhttps
-server.port=8443
-server.ssl.key-store=keystore.p12
-server.ssl.key-alias=tomcat
-server.ssl.key-store-password=123456
-server.ssl.key-store-type=PKCS12
-#===https end===
-
-#===logging start===
-logging.level.org.springframework.data.mongodb.core=debug
-logging.level.com.macro.mall.mapper=debug
-logging.level.com.macro.mall.portal.dao=debug
-#===logging end===
-
-#===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===
-
-#===mongodb start===
-spring.data.mongodb.host=localhost
-spring.data.mongodb.port=27017
-spring.data.mongodb.database=mall-port
-#===mongodb end===
-
-#===redis start===
-# Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
-spring.redis.database=0
-# Redis\u670D\u52A1\u5668\u5730\u5740
-spring.redis.host=localhost
-# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u7AEF\u53E3
-spring.redis.port=6379
-# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09
-spring.redis.password=
-# \u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
-spring.redis.jedis.pool.max-active=8
-# \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
-spring.redis.jedis.pool.max-wait=-1ms
-# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5
-spring.redis.jedis.pool.max-idle=8
-# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5
-spring.redis.jedis.pool.min-idle=0
-# \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09
-spring.redis.timeout=0ms
-#===redis end===
-
-#===rabbitMq start===
-spring.rabbitmq.host=localhost
-spring.rabbitmq.port=5672
-spring.rabbitmq.virtual-host=/mall
-spring.rabbitmq.username=mall
-spring.rabbitmq.password=mall
-#\u5982\u679C\u5BF9\u5F02\u6B65\u6D88\u606F\u9700\u8981\u56DE\u8C03\u5FC5\u987B\u8BBE\u7F6E\u4E3Atrue
-spring.rabbitmq.publisher-confirms=true
-#===rabbitMq end===
\ No newline at end of file
diff --git a/mall-portal/src/main/resources/application-dev.yml b/mall-portal/src/main/resources/application-dev.yml
new file mode 100644
index 0000000..2f047d1
--- /dev/null
+++ b/mall-portal/src/main/resources/application-dev.yml
@@ -0,0 +1,57 @@
+server:
+  port: 8443 #开发环境会开启https
+  ssl:
+    key-store: keystore.p12
+    key-alias: tomcat
+    key-store-password: 123456
+    key-store-type: PKCS12
+
+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
+
+  data:
+    mongodb:
+      host: localhost
+      port: 27017
+      database: mall-port
+
+  redis:
+    host: localhost # Redis服务器地址
+    database: 0 # Redis数据库索引（默认为0）
+    port: 6379 # Redis服务器连接端口
+    password: # Redis服务器连接密码（默认为空）
+    jedis:
+      pool:
+        max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
+        max-wait: -1ms # 连接池最大阻塞等待时间（使用负值表示没有限制）
+        max-idle: 8 # 连接池中的最大空闲连接
+        min-idle: 0 # 连接池中的最小空闲连接
+    timeout: 0ms # 连接超时时间（毫秒）
+
+  rabbitmq:
+    host: localhost
+    port: 5672
+    virtual-host: /mall
+    username: mall
+    password: mall
+    publisher-confirms: true #如果对异步消息需要回调必须设置为true
+
+# 日志配置
+logging:
+  level:
+    org.springframework.data.mongodb.core: debug
+    com.macro.mall.mapper: debug
+    com.macro.mall.portal.dao: debug
+
diff --git a/mall-portal/src/main/resources/application-prod.properties b/mall-portal/src/main/resources/application-prod.properties
deleted file mode 100644
index 34bc8b0..0000000
--- a/mall-portal/src/main/resources/application-prod.properties
+++ /dev/null
@@ -1,53 +0,0 @@
-#===server start===
-server.port=8085
-#===server end===
-
-#\u914D\u7F6E\u65E5\u5FD7\u751F\u6210\u8DEF\u5F84
-logging.path=/var/logs
-
-#===datasource start===
-spring.datasource.url=jdbc:mysql://db:3306/mall?useUnicode=true&characterEncoding=utf-8
-spring.datasource.username=reader
-spring.datasource.password=123456
-#===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===
-
-#===mongodb start===
-spring.data.mongodb.host=mongo
-spring.data.mongodb.port=27017
-spring.data.mongodb.database=mall-port
-#===mongodb end===
-
-#===redis start===
-# Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
-spring.redis.database=0
-# Redis\u670D\u52A1\u5668\u5730\u5740
-spring.redis.host=redis
-# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u7AEF\u53E3
-spring.redis.port=6379
-# Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09
-spring.redis.password=
-# \u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
-spring.redis.jedis.pool.max-active=8
-# \u8FDE\u63A5\u6C60\u6700\u5927\u963B\u585E\u7B49\u5F85\u65F6\u95F4\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09
-spring.redis.jedis.pool.max-wait=-1ms
-# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5927\u7A7A\u95F2\u8FDE\u63A5
-spring.redis.jedis.pool.max-idle=8
-# \u8FDE\u63A5\u6C60\u4E2D\u7684\u6700\u5C0F\u7A7A\u95F2\u8FDE\u63A5
-spring.redis.jedis.pool.min-idle=0
-# \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4\uFF08\u6BEB\u79D2\uFF09
-spring.redis.timeout=0ms
-#===redis end===
diff --git a/mall-portal/src/main/resources/application-prod.yml b/mall-portal/src/main/resources/application-prod.yml
new file mode 100644
index 0000000..19105b2
--- /dev/null
+++ b/mall-portal/src/main/resources/application-prod.yml
@@ -0,0 +1,41 @@
+server:
+  port: 8085
+
+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
+
+  data:
+    mongodb:
+      host: mongo
+      port: 27017
+      database: mall-port
+
+  redis:
+    host: redis # Redis服务器地址
+    database: 0 # Redis数据库索引（默认为0）
+    port: 6379 # Redis服务器连接端口
+    password: # Redis服务器连接密码（默认为空）
+    jedis:
+      pool:
+        max-active: 8 # 连接池最大连接数（使用负值表示没有限制）
+        max-wait: -1ms # 连接池最大阻塞等待时间（使用负值表示没有限制）
+        max-idle: 8 # 连接池中的最大空闲连接
+        min-idle: 0 # 连接池中的最小空闲连接
+    timeout: 0ms # 连接超时时间（毫秒）
+
+# 日志配置
+logging:
+  path: /var/logs
+
diff --git a/mall-portal/src/main/resources/application.properties b/mall-portal/src/main/resources/application.properties
deleted file mode 100644
index 5ddd22d..0000000
--- a/mall-portal/src/main/resources/application.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-#\u9ED8\u8BA4\u4E3A\u5F00\u53D1\u73AF\u5883
-spring.profiles.active=dev
-
-#===server start===
-http.port=8085
-#===server end===
-
-#===mybatis start===
-mybatis.mapper-locations=classpath:dao/*.xml,classpath*:com/**/mapper/*.xml
-#===mybatis end===
-
-#===redis custom key start===
-redis.key.prefix.authCode=portal:authCode:
-redis.key.prefix.orderId=portal:orderId:
-authCode.expire.seconds=90
-#===redis custom key end===
-
-#===rabbitmq queue name start===
-rabbitmq.queue.name.cancelOrder="cancelOrderQueue"
-#===rabbitmq queue name end===
-
-
-
diff --git a/mall-portal/src/main/resources/application.yml b/mall-portal/src/main/resources/application.yml
new file mode 100644
index 0000000..736b461
--- /dev/null
+++ b/mall-portal/src/main/resources/application.yml
@@ -0,0 +1,27 @@
+spring:
+  profiles:
+    active: dev #默认为开发环境
+
+mybatis:
+  mapper-locations:
+    - classpath:dao/*.xml
+    - classpath*:com/**/mapper/*.xml
+
+http:
+  port: 8085 # http服务端口
+
+# 自定义redis key
+redis:
+  key:
+    prefix:
+      authCode: "portal:authCode:"
+      orderId: "portal:orderId:"
+    expire:
+      authCode: 90 # 验证码超期时间
+
+# 消息队列定义
+rabbitmq:
+  queue:
+    name:
+      cancelOrder: cancelOrderQueue
+
diff --git a/mall-search/src/main/resources/application-dev.properties b/mall-search/src/main/resources/application-dev.properties
deleted file mode 100644
index c5fd3e8..0000000
--- a/mall-search/src/main/resources/application-dev.properties
+++ /dev/null
@@ -1,24 +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===
-
-#===es start===
-spring.data.elasticsearch.repositories.enabled = true
-spring.data.elasticsearch.cluster-nodes = 127.0.0.1:9300
-#===es end===
\ No newline at end of file
diff --git a/mall-search/src/main/resources/application-dev.yml b/mall-search/src/main/resources/application-dev.yml
new file mode 100644
index 0000000..f1a2b81
--- /dev/null
+++ b/mall-search/src/main/resources/application-dev.yml
@@ -0,0 +1,19 @@
+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
+  data:
+    elasticsearch:
+      repositories:
+        enabled: true
+      cluster-nodes: 127.0.0.1:9300
\ No newline at end of file
diff --git a/mall-search/src/main/resources/application-prod.properties b/mall-search/src/main/resources/application-prod.properties
deleted file mode 100644
index 75cfbb0..0000000
--- a/mall-search/src/main/resources/application-prod.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-#===datasource start===
-spring.datasource.url=jdbc:mysql://db:3306/mall?useUnicode=true&characterEncoding=utf-8
-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===
-
-#===es start===
-spring.data.elasticsearch.repositories.enabled = true
-spring.data.elasticsearch.cluster-nodes = es:9300
-#===es end===
\ No newline at end of file
diff --git a/mall-search/src/main/resources/application-prod.yml b/mall-search/src/main/resources/application-prod.yml
new file mode 100644
index 0000000..e34237e
--- /dev/null
+++ b/mall-search/src/main/resources/application-prod.yml
@@ -0,0 +1,23 @@
+spring:
+  datasource:
+    url: jdbc:mysql://localhost: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
+
+  data:
+    elasticsearch:
+      repositories:
+        enabled: true
+      cluster-nodes: 127.0.0.1:9300
+
+logging:
+  path: /var/logs #配置日志生成路径
diff --git a/mall-search/src/main/resources/application.properties b/mall-search/src/main/resources/application.properties
deleted file mode 100644
index 1c6dfe0..0000000
--- a/mall-search/src/main/resources/application.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-#\u9ED8\u8BA4\u4E3A\u5F00\u53D1\u73AF\u5883
-spring.profiles.active=dev
-
-#===server start===
-server.port=8081
-#===server end===
-
-logging.level.root=info
-
-#===mybatis start===
-mybatis.mapper-locations=classpath:dao/*.xml,classpath*:com/**/mapper/*.xml
-#===mybatis end===
\ No newline at end of file
diff --git a/mall-search/src/main/resources/application.yml b/mall-search/src/main/resources/application.yml
new file mode 100644
index 0000000..7fad5de
--- /dev/null
+++ b/mall-search/src/main/resources/application.yml
@@ -0,0 +1,19 @@
+spring:
+  profiles:
+    active: dev #默认为开发环境
+
+server:
+  port: 8081
+
+mybatis:
+  mapper-locations:
+    - classpath:dao/*.xml
+    - classpath*:com/**/mapper/*.xml
+
+logging:
+  level:
+    root: info
+    com.macro.mall: debug
+
+
+