update 删除一些基本用不上的配置 简化折叠一些配置

config/dev/application-common.yml

@@ -114,8 +114,6 @@ redisson:
   threads: 4
   # Netty线程池数量
   nettyThreads: 8
-  # 传输模式
-  transportMode: "NIO"
   # 单节点配置
   singleServerConfig:
     # 客户端名称
@@ -128,10 +126,6 @@ redisson:
     idleConnectionTimeout: 10000
     # 命令等待超时，单位：毫秒
     timeout: 3000
-    # 如果尝试在此限制之内发送成功，则开始启用 timeout 计时。
-    retryAttempts: 3
-    # 命令重试发送时间间隔，单位：毫秒
-    retryInterval: 1500
     # 发布和订阅连接池大小
     subscriptionConnectionPoolSize: 50
   # redisson 缓存配置
@@ -188,16 +182,12 @@ sa-token:
   is-concurrent: true
   # 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token)
   is-share: false
-  # 是否尝试从请求体里读取token
-  is-read-body: false
   # 是否尝试从header里读取token
   is-read-head: true
   # 是否尝试从cookie里读取token
   is-read-cookie: false
   # token前缀
   token-prefix: "Bearer"
-  # token风格
-  token-style: uuid
   # jwt秘钥
   jwt-secret-key: abcdefghijklmnopqrstuvwxyz
   # 是否输出操作日志

ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/config/RedisConfiguration.java

@@ -58,8 +58,7 @@ public class RedisConfiguration extends CachingConfigurerSupport {
         Config config = new Config();
         config.setThreads(redissonProperties.getThreads())
                 .setNettyThreads(redissonProperties.getNettyThreads())
-                .setCodec(JsonJacksonCodec.INSTANCE)
-                .setTransportMode(redissonProperties.getTransportMode());
+                .setCodec(JsonJacksonCodec.INSTANCE);
 
         RedissonProperties.SingleServerConfig singleServerConfig = redissonProperties.getSingleServerConfig();
         if (ObjectUtil.isNotNull(singleServerConfig)) {
@@ -70,8 +69,6 @@ public class RedisConfiguration extends CachingConfigurerSupport {
                     .setDatabase(redisProperties.getDatabase())
                     .setPassword(StringUtils.isNotBlank(redisProperties.getPassword()) ? redisProperties.getPassword() : null)
                     .setTimeout(singleServerConfig.getTimeout())
-                    .setRetryAttempts(singleServerConfig.getRetryAttempts())
-                    .setRetryInterval(singleServerConfig.getRetryInterval())
                     .setClientName(singleServerConfig.getClientName())
                     .setIdleConnectionTimeout(singleServerConfig.getIdleConnectionTimeout())
                     .setSubscriptionConnectionPoolSize(singleServerConfig.getSubscriptionConnectionPoolSize())
@@ -92,11 +89,8 @@ public class RedisConfiguration extends CachingConfigurerSupport {
                     .setConnectTimeout(((Long) redisProperties.getTimeout().toMillis()).intValue())
                     .setPassword(StringUtils.isNotBlank(redisProperties.getPassword()) ? redisProperties.getPassword() : null)
                     .setTimeout(clusterServersConfig.getTimeout())
-                    .setRetryAttempts(clusterServersConfig.getRetryAttempts())
-                    .setRetryInterval(clusterServersConfig.getRetryInterval())
                     .setClientName(clusterServersConfig.getClientName())
                     .setIdleConnectionTimeout(clusterServersConfig.getIdleConnectionTimeout())
-                    .setPingConnectionInterval(clusterServersConfig.getPingConnectionInterval())
                     .setSubscriptionConnectionPoolSize(clusterServersConfig.getSubscriptionConnectionPoolSize())
                     .setMasterConnectionMinimumIdleSize(clusterServersConfig.getMasterConnectionMinimumIdleSize())
                     .setMasterConnectionPoolSize(clusterServersConfig.getMasterConnectionPoolSize())
@@ -149,8 +143,6 @@ public class RedisConfiguration extends CachingConfigurerSupport {
      *   threads: 16
      *   # Netty线程池数量
      *   nettyThreads: 32
-     *   # 传输模式
-     *   transportMode: "NIO"
      *   # 集群配置
      *   clusterServersConfig:
      *     # 客户端名称
@@ -165,14 +157,8 @@ public class RedisConfiguration extends CachingConfigurerSupport {
      *     slaveConnectionPoolSize: 64
      *     # 连接空闲超时，单位：毫秒
      *     idleConnectionTimeout: 10000
-     *     # ping连接间隔
-     *     pingConnectionInterval: 1000
      *     # 命令等待超时，单位：毫秒
      *     timeout: 3000
-     *     # 如果尝试在此限制之内发送成功，则开始启用 timeout 计时。
-     *     retryAttempts: 3
-     *     # 命令重试发送时间间隔，单位：毫秒
-     *     retryInterval: 1500
      *     # 发布和订阅连接池大小
      *     subscriptionConnectionPoolSize: 50
      *     # 读取模式

ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/config/properties/RedissonProperties.java

@@ -28,11 +28,6 @@ public class RedissonProperties {
      */
     private int nettyThreads;
 
-    /**
-     * 传输模式
-     */
-    private TransportMode transportMode;
-
     /**
      * 单机服务配置
      */
@@ -77,16 +72,6 @@ public class RedissonProperties {
          */
         private int timeout;
 
-        /**
-         * 如果尝试在此限制之内发送成功，则开始启用 timeout 计时。
-         */
-        private int retryAttempts;
-
-        /**
-         * 命令重试发送时间间隔，单位：毫秒
-         */
-        private int retryInterval;
-
         /**
          * 发布和订阅连接池大小
          */
@@ -128,26 +113,11 @@ public class RedissonProperties {
          */
         private int idleConnectionTimeout;
 
-        /**
-         * ping超时
-         */
-        private int pingConnectionInterval;
-
         /**
          * 命令等待超时，单位：毫秒
          */
         private int timeout;
 
-        /**
-         * 如果尝试在此限制之内发送成功，则开始启用 timeout 计时。
-         */
-        private int retryAttempts;
-
-        /**
-         * 命令重试发送时间间隔，单位：毫秒
-         */
-        private int retryInterval;
-
         /**
          * 发布和订阅连接池大小
          */