From 20c3b6644041dd063deeedba93cbfe4d08cbb214 Mon Sep 17 00:00:00 2001
From: "lisai17@sina.com" <lisai17@sina.com>
Date: Thu, 13 Aug 2020 09:23:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/cowr/local/ssjygl/main/Config.java    |  4 +--
 .../src/main/resources/dev/db.properties      |  2 +-
 .../com/cowr/service/ssjygl/main/Config.java  | 28 ++++++-------------
 .../src/main/resources/dev/db.properties      |  2 +-
 .../src/main/resources/prod/db.properties     |  2 +-
 5 files changed, 13 insertions(+), 25 deletions(-)

diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java
index c096084..55fbf85 100644
--- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java
+++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java
@@ -243,8 +243,8 @@ public class Config extends JFinalConfig {
                 dbprop.get("redis.ip"),
                 dbprop.getInt("redis.port"),
                 0
-//                , dbprop.get("redis.pwd")
-//                , dbprop.getInt("redis.db")
+                , dbprop.get("redis.pwd")
+                , dbprop.getInt("redis.db")
         ));
     }
 
diff --git a/ssjygl-xsx-local/src/main/resources/dev/db.properties b/ssjygl-xsx-local/src/main/resources/dev/db.properties
index 166a67a..b50c5ae 100644
--- a/ssjygl-xsx-local/src/main/resources/dev/db.properties
+++ b/ssjygl-xsx-local/src/main/resources/dev/db.properties
@@ -9,7 +9,7 @@ password=Ssjy_xs_890
 #password=Local_1
 
 # redis
-redis.basekey = ssjcgl_xsx_dev
+redis.basekey =ssjcgl_xsx_dev
 redis.ip=r-wz9168ab2f2f7ec4pd.redis.rds.aliyuncs.com
 redis.port=6379
 redis.pwd=CoWR1111
diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/Config.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/Config.java
index f529326..924b34d 100644
--- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/Config.java
+++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/main/Config.java
@@ -199,26 +199,14 @@ public class Config extends JFinalConfig {
         }
 
         me.add(new QuartzPlugin());
-
-        if (isprod) {
-            RedisPlugin redis = new RedisPlugin(
-                    com.cowr.common.Const.REDIS_CACHENAME,
-                    dbprop.get("redis.ip"),
-                    dbprop.getInt("redis.port"),
-                    0
-            );
-
-            me.add(redis);
-        } else {
-            me.add(new RedisPlugin(
-                    Const.REDIS_CACHENAME,
-                    dbprop.get("redis.ip"),
-                    dbprop.getInt("redis.port"),
-                    0,
-                    dbprop.get("redis.pwd"),
-                    dbprop.getInt("redis.db")
-            ));
-        }
+        me.add(new RedisPlugin(
+                Const.REDIS_CACHENAME,
+                dbprop.get("redis.ip"),
+                dbprop.getInt("redis.port"),
+                0,
+                dbprop.get("redis.pwd"),
+                dbprop.getInt("redis.db")
+        ));
     }
 
 
diff --git a/ssjygl-xsx-service/src/main/resources/dev/db.properties b/ssjygl-xsx-service/src/main/resources/dev/db.properties
index 1161594..67eef3b 100644
--- a/ssjygl-xsx-service/src/main/resources/dev/db.properties
+++ b/ssjygl-xsx-service/src/main/resources/dev/db.properties
@@ -9,7 +9,7 @@ password=Ssjy_xs_890
 #password=Local_1
 
 # redis
-redis.basekey = ssjcgl_xsx_dev
+redis.basekey=ssjcgl_xsx_dev
 redis.ip=r-wz9168ab2f2f7ec4pd.redis.rds.aliyuncs.com
 redis.port=6379
 redis.pwd=CoWR1111
diff --git a/ssjygl-xsx-service/src/main/resources/prod/db.properties b/ssjygl-xsx-service/src/main/resources/prod/db.properties
index f16b18d..28096c4 100644
--- a/ssjygl-xsx-service/src/main/resources/prod/db.properties
+++ b/ssjygl-xsx-service/src/main/resources/prod/db.properties
@@ -4,7 +4,7 @@ user=ssjy_xsx
 password=Ssjy_xs_890
 
 # redis
-redis.basekey = ssjcgl_xsx
+redis.basekey=ssjcgl_xsx
 redis.ip=192.168.0.219
 redis.port=6379
 redis.pwd=