From 65786c70a75a7b9dd0b1b777fbdd9faaa5152fa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=8A=93=E8=9B=99=E5=B8=88?= <770492966@qq.com>
Date: Thu, 14 Jul 2022 19:14:06 +0800
Subject: [PATCH] =?UTF-8?q?redission=E5=A4=84=E7=90=86=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E6=97=A0=E5=89=8D=E7=BC=80=E5=88=99=E4=B8=8D=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/src/main/resources/application-dev.yml       | 2 +-
 ruoyi-admin/src/main/resources/application-prod.yml      | 2 +-
 .../com/ruoyi/framework/handler/KeyPrefixHandler.java    | 9 ++++++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index 749f08691..88bc3a664 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -139,7 +139,7 @@ spring:
 
 redisson:
   # redis key前缀
-  keyPrefix: ruoyi-vue-plus
+  keyPrefix:
   # 线程池数量
   threads: 4
   # Netty线程池数量
diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml
index 3337036af..0987874fa 100644
--- a/ruoyi-admin/src/main/resources/application-prod.yml
+++ b/ruoyi-admin/src/main/resources/application-prod.yml
@@ -142,7 +142,7 @@ spring:
 
 redisson:
   # redis key前缀
-  keyPrefix: ruoyi-vue-plus
+  keyPrefix:
   # 线程池数量
   threads: 16
   # Netty线程池数量
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/KeyPrefixHandler.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/KeyPrefixHandler.java
index 28538055c..ddfa064e9 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/KeyPrefixHandler.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/KeyPrefixHandler.java
@@ -12,8 +12,9 @@ public class KeyPrefixHandler implements NameMapper {
   
   private final String keyPrefix;
   
+  //前缀为空 则返回空前缀
   public KeyPrefixHandler(String keyPrefix) {
-    this.keyPrefix = keyPrefix + ":";
+    this.keyPrefix = StringUtils.isBlank(keyPrefix) ? "" : keyPrefix + ":";
   }
   
   //增加前缀
@@ -22,6 +23,9 @@ public class KeyPrefixHandler implements NameMapper {
     if (StringUtils.isBlank(name)) {
       return null;
     }
+    if (StringUtils.isBlank(keyPrefix)) {
+      return name;
+    }
     if (!name.startsWith(keyPrefix)) {
       return keyPrefix + name;
     } else {
@@ -35,6 +39,9 @@ public class KeyPrefixHandler implements NameMapper {
     if (StringUtils.isBlank(name)) {
       return null;
     }
+    if (StringUtils.isBlank(keyPrefix)) {
+      return name;
+    }
     if (name.startsWith(keyPrefix)) {
       return name.substring(keyPrefix.length());
     }