From 79668ec4d4e01d565e2c2bf05342b49d4c4d08c2 Mon Sep 17 00:00:00 2001
From: tony <846249920@qq.com>
Date: Wed, 23 Feb 2022 19:44:52 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=95=B0=E6=8D=AE=E5=BA=93=E8=BF=9E?=
 =?UTF-8?q?=E6=8E=A5=E5=9C=B0=E5=9D=80=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 82cf5d0..6a02767 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -7,8 +7,8 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:p6spy:mysql://${address}:3306/flowable?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
-                username: ${user}
+                url: jdbc:p6spy:mysql://localhost:3306/flowable?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
+                username: root
                 password: ${mypass}
             # 从库数据源
             slave:
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 9b0e697..e7a862f 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -59,9 +59,9 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: ${address}
+    host: localhost
     # 端口，默认为6379
-    port: 6388
+    port: 6379
     # 数据库索引
     database: 0
     # 密码