From 10f2cc6d8a3f79b18656be50bf3d3182ee806f60 Mon Sep 17 00:00:00 2001
From: Dftre <3066417822@qq.com>
Date: Thu, 9 May 2024 01:56:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=B7=B2=E7=9F=A5=E7=9A=84bu?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../redis/config/FastJson2JsonRedisSerializer.java        | 8 +++-----
 .../main/resources/mapper/generator/GenTableMapper.xml    | 2 +-
 .../main/java/com/ruoyi/ehcache/config/Ehcache3Cache.java | 2 ++
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ruoyi-middleware/ruoyi-middleware-redis/src/main/java/com/ruoyi/middleware/redis/config/FastJson2JsonRedisSerializer.java b/ruoyi-middleware/ruoyi-middleware-redis/src/main/java/com/ruoyi/middleware/redis/config/FastJson2JsonRedisSerializer.java
index 5071360..f2f6842 100644
--- a/ruoyi-middleware/ruoyi-middleware-redis/src/main/java/com/ruoyi/middleware/redis/config/FastJson2JsonRedisSerializer.java
+++ b/ruoyi-middleware/ruoyi-middleware-redis/src/main/java/com/ruoyi/middleware/redis/config/FastJson2JsonRedisSerializer.java
@@ -10,6 +10,7 @@ import com.alibaba.fastjson2.JSONReader;
 import com.alibaba.fastjson2.JSONWriter;
 // import com.alibaba.fastjson2.filter.Filter;
 import com.alibaba.fastjson2.filter.Filter;
+import com.ruoyi.common.constant.Constants;
 
 /**
  * Redis使用FastJson序列化
@@ -20,10 +21,7 @@ public class FastJson2JsonRedisSerializer<T> implements RedisSerializer<T>
 {
     public static final Charset DEFAULT_CHARSET = Charset.forName("UTF-8");
 
-    static final Filter autoTypeFilter = JSONReader.autoTypeFilter(
-            "org.springframework.security.core.authority.SimpleGrantedAuthority",
-            "com.ruoyi.***"
-    );
+    static final Filter AUTO_TYPE_FILTER = JSONReader.autoTypeFilter(Constants.JSON_WHITELIST_STR);
 
     private Class<T> clazz;
 
@@ -51,6 +49,6 @@ public class FastJson2JsonRedisSerializer<T> implements RedisSerializer<T>
             return null;
         }
         String str = new String(bytes, DEFAULT_CHARSET);
-        return JSON.parseObject(str, clazz, autoTypeFilter);
+        return JSON.parseObject(str, clazz, AUTO_TYPE_FILTER);
     }
 }
diff --git a/ruoyi-models/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml b/ruoyi-models/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
index 5bc7ccf..5045f3d 100644
--- a/ruoyi-models/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
+++ b/ruoyi-models/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml
@@ -126,7 +126,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 
 	<select id="selectGenTableByName" parameterType="String" resultMap="GenTableResult">
-	     SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.tpl_web_type, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark,
+	     SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.tpl_web_type, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark,t.have_sub_column,
 			   c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort,c.sub_column_table_name,c.sub_column_fk_name,c.sub_column_name,c.sub_column_java_type,c.sub_column_java_field
 		FROM gen_table t
 			 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
diff --git a/ruoyi-plugins/ruoyi-ehcache/src/main/java/com/ruoyi/ehcache/config/Ehcache3Cache.java b/ruoyi-plugins/ruoyi-ehcache/src/main/java/com/ruoyi/ehcache/config/Ehcache3Cache.java
index d03be75..bb865ff 100644
--- a/ruoyi-plugins/ruoyi-ehcache/src/main/java/com/ruoyi/ehcache/config/Ehcache3Cache.java
+++ b/ruoyi-plugins/ruoyi-ehcache/src/main/java/com/ruoyi/ehcache/config/Ehcache3Cache.java
@@ -8,6 +8,7 @@ import org.ehcache.core.EhcacheBase;
 import org.ehcache.impl.internal.concurrent.ConcurrentHashMap;
 import org.ehcache.impl.internal.store.heap.OnHeapStore;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.cache.Cache;
 import org.springframework.cache.jcache.JCacheCache;
 import org.springframework.cache.jcache.JCacheCacheManager;
@@ -17,6 +18,7 @@ import com.ruoyi.common.interceptor.cache.CacheKeys;
 import com.ruoyi.common.interceptor.cache.CacheNoTimeOut;
 
 @Component
+@ConditionalOnProperty(prefix = "spring.cache", name = { "type" }, havingValue = "jcache", matchIfMissing = false)
 public class Ehcache3Cache implements CacheNoTimeOut, CacheKeys {
 
     @Autowired