From b539939a90b8875431264967b8ba10169fbaf68b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?=
 <15040126243@163.com>
Date: Sat, 24 Jul 2021 18:29:12 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=9B=B4=E6=96=B0druid=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=20=E7=8B=AC=E7=AB=8B=E9=85=8D=E7=BD=AE=E6=9B=B4?=
 =?UTF-8?q?=E6=98=8E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/src/main/resources/application-dev.yml  | 9 +++++++--
 ruoyi-admin/src/main/resources/application-prod.yml | 9 +++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index 5effcea1..6491c855 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -42,6 +42,10 @@ spring:
         testOnReturn: false
         # 注意这个值和druid原生不一致，默认启动了stat
         filters: stat
+
+--- # druid 配置
+spring:
+  datasource:
     druid:
       webStatFilter:
         enabled: true
@@ -63,7 +67,9 @@ spring:
         wall:
           config:
             multi-statement-allow: true
-  # redis 配置
+
+--- # redis 配置
+spring:
   redis:
     # 地址
     host: localhost
@@ -78,7 +84,6 @@ spring:
     # 是否开启ssl
     ssl: false
 
---- # redisson 客户端配置
 redisson:
   # 线程池数量
   threads: 16
diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml
index 7cb17c8a..2640bc0e 100644
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -42,6 +42,10 @@ spring:
         testOnReturn: false
         # 注意这个值和druid原生不一致，默认启动了stat
         filters: stat
+
+--- # druid 配置
+spring:
+  datasource:
     druid:
       webStatFilter:
         enabled: true
@@ -63,7 +67,9 @@ spring:
         wall:
           config:
             multi-statement-allow: true
-  # redis 配置
+
+--- # redis 配置
+spring:
   redis:
     # 地址
     host: 172.30.0.48
@@ -78,7 +84,6 @@ spring:
     # 是否开启ssl
     ssl: false
 
---- # redisson 客户端配置
 redisson:
   # 线程池数量
   threads: 16