From 425f910f7d4520e2b02da59b535d6733c48f348e Mon Sep 17 00:00:00 2001
From: dbdu <1797890817@qq.com>
Date: Sat, 20 Jun 2020 06:19:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=BF=BD=E7=95=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index dce96c00f..c75c505b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 *.iml
 */target/*
 */*.iml
+/.gradle/

From d992e9e909edb1158e32cc86475522ca75e71b75 Mon Sep 17 00:00:00 2001
From: dbdu <1797890817@qq.com>
Date: Wed, 5 Aug 2020 11:09:27 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=E6=94=AF=E6=8C=81=EF=BC=8C=E6=9C=89=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=E5=8F=98=E9=87=8F=E5=88=99=E4=BD=BF=E7=94=A8=EF=BC=8C?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=88=99=E4=BD=BF=E7=94=A8=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=80=BC=20=E5=9C=A8IDEA=E4=B8=AD=E9=85=8D=E7=BD=AE=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=E5=8F=98=E9=87=8F=EF=BC=8C=E5=8F=AF=E4=BB=A5=E5=81=9A?=
 =?UTF-8?q?=E5=88=B0=E4=B8=8D=E6=94=B9=E6=BA=90=E7=A0=81=E8=80=8C=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E5=85=B6=E4=BB=96=E7=9A=84=E9=85=8D=E7=BD=AE=EF=BC=9B?=
 =?UTF-8?q?=20=E5=91=BD=E4=BB=A4=E8=A1=8C=E5=90=AF=E5=8A=A8=E5=8F=AF?=
 =?UTF-8?q?=E4=BB=A5=E9=80=9A=E8=BF=87=E5=A6=82=E4=B8=8B=E7=9A=84=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=E5=B8=A6=E4=B8=8A=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?=
 =?UTF-8?q?=20java=20-jar=20-DDB=5FNAME=3DKLYU=20target/eladmin-system-2.5?=
 =?UTF-8?q?.0.jar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/config/application-dev.yml         | 6 +++---
 .../src/main/resources/config/application-prod.yml        | 6 +++---
 eladmin-system/src/main/resources/config/application.yml  | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/eladmin-system/src/main/resources/config/application-dev.yml b/eladmin-system/src/main/resources/config/application-dev.yml
index 411b9078f..83da6985d 100644
--- a/eladmin-system/src/main/resources/config/application-dev.yml
+++ b/eladmin-system/src/main/resources/config/application-dev.yml
@@ -4,9 +4,9 @@ spring:
     druid:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-      url: jdbc:log4jdbc:mysql://localhost:3306/eladmin?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
-      username: root
-      password: 123456
+      url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:eladmin}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
+      username: ${DB_USER:root}
+      password: ${DB_PWD:123456}
       # 初始连接数
       initial-size: 5
       # 最小连接数
diff --git a/eladmin-system/src/main/resources/config/application-prod.yml b/eladmin-system/src/main/resources/config/application-prod.yml
index 811ca032e..54bd74f5e 100644
--- a/eladmin-system/src/main/resources/config/application-prod.yml
+++ b/eladmin-system/src/main/resources/config/application-prod.yml
@@ -4,9 +4,9 @@ spring:
     druid:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-      url: jdbc:log4jdbc:mysql://localhost:3306/eladmin?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
-      username: root
-      password: 123456
+      url: jdbc:log4jdbc:mysql://${DB_HOST:localhost}:${DB_PORT:3306}/${DB_NAME:eladmin}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false
+      username: ${DB_USER:root}
+      password: ${DB_PWD:123456}
       # 初始连接数
       initial-size: 5
       # 最小连接数
diff --git a/eladmin-system/src/main/resources/config/application.yml b/eladmin-system/src/main/resources/config/application.yml
index a71231670..6635f2b69 100644
--- a/eladmin-system/src/main/resources/config/application.yml
+++ b/eladmin-system/src/main/resources/config/application.yml
@@ -23,10 +23,10 @@ spring:
 
   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:}
     #连接超时时间
     timeout: 5000