From a91cf826b1e520d341d339ac80b4f2742676b129 Mon Sep 17 00:00:00 2001
From: GYJ <1157756119@qq.com>
Date: Wed, 26 Jun 2024 09:06:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E9=85=8D=E7=BD=AE=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/config/application-dev.yml   |  3 ---
 .../src/main/resources/config/application.yml   | 17 +++++------------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/eladmin-system/src/main/resources/config/application-dev.yml b/eladmin-system/src/main/resources/config/application-dev.yml
index 2954817d..e139fcf7 100644
--- a/eladmin-system/src/main/resources/config/application-dev.yml
+++ b/eladmin-system/src/main/resources/config/application-dev.yml
@@ -7,9 +7,6 @@ spring:
       url: jdbc:mysql://101.37.12.135:3306/fycashier?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useJDBCCompliantTimezoneShift=true&serverTimezone=Asia/Shanghai&useSSL=false&allowMultiQueries=true
       username: fycashier
       password: Twc6MrzzjBiWSsjh
-#      url: jdbc:mysql://127.0.0.1:3306/fycashier?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useJDBCCompliantTimezoneShift=true&serverTimezone=Asia/Shanghai&useSSL=false&allowMultiQueries=true
-#      username: root
-#      password: gongyijieqp002
       driver-class-name: com.mysql.cj.jdbc.Driver
       # 初始连接数
       initial-size: 5
diff --git a/eladmin-system/src/main/resources/config/application.yml b/eladmin-system/src/main/resources/config/application.yml
index b0b30b71..b8878c3f 100644
--- a/eladmin-system/src/main/resources/config/application.yml
+++ b/eladmin-system/src/main/resources/config/application.yml
@@ -38,23 +38,16 @@ spring:
 #    port: ${REDIS_PORT:6379}
 #    password: ${REDIS_PWD:111111}
 
-#  redis:
-#    #数据库索引
-#    database: ${REDIS_DB:0}
-#    host: ${REDIS_HOST:127.0.0.1}
-#    port: ${REDIS_PORT:6379}
-#    password: ${REDIS_PWD:111111}
-#    #连接超时时间
-#    timeout: 5000
   redis:
     #数据库索引
-    database: 0
-    host: 127.0.0.1
-    port: 6379
-    password:
+    database: ${REDIS_DB:0}
+    host: ${REDIS_HOST:127.0.0.1}
+    port: ${REDIS_PORT:6379}
+    password: ${REDIS_PWD:111111}
     #连接超时时间
     timeout: 5000
 
+
 task:
   pool:
     # 核心线程池大小