基本完成

yudao-framework/yudao-spring-boot-starter-redis/src/main/java/cn/iocoder/yudao/framework/redis/config/YudaoRedisAutoConfiguration.java

@@ -1,136 +1,33 @@
 package cn.iocoder.yudao.framework.redis.config;
 
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.util.StrUtil;
-import cn.hutool.crypto.SecureUtil;
-import cn.hutool.json.JSONUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.cache.Cache;
-import org.springframework.cache.annotation.CachingConfigurerSupport;
-import org.springframework.cache.interceptor.CacheErrorHandler;
-import org.springframework.cache.interceptor.KeyGenerator;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
 import org.springframework.data.redis.serializer.RedisSerializer;
-import org.springframework.data.redis.serializer.StringRedisSerializer;
-import org.springframework.util.DigestUtils;
-
-import java.nio.charset.Charset;
-import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * Redis 配置类
  */
-@Slf4j
-public class YudaoRedisAutoConfiguration extends CachingConfigurerSupport {
+@Configuration
+public class YudaoRedisAutoConfiguration {
 
     /**
      * 创建 RedisTemplate Bean，使用 JSON 序列化方式
      */
-    @Bean
-    public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory factory) {
-        // 创建 RedisTemplate 对象
-        RedisTemplate<String, Object> template = new RedisTemplate<>();
-        //序列化
-        Jackson2JsonRedisSerializer<Object> jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer<>(Object.class);
-        // value值的序列化采用fastJsonRedisSerializer
-        template.setValueSerializer(jackson2JsonRedisSerializer);
-        template.setHashValueSerializer(jackson2JsonRedisSerializer);
-        // key的序列化采用StringRedisSerializer
-        template.setKeySerializer(new StringRedisSerializer());
-        template.setHashKeySerializer(new StringRedisSerializer());
-        // 设置 RedisConnection 工厂。😈 它就是实现多种 Java Redis 客户端接入的秘密工厂。感兴趣的胖友，可以自己去撸下。
-        template.setConnectionFactory(factory);
-        return template;
-    }
+//    @Bean
+//    public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory factory) {
+//        // 创建 RedisTemplate 对象
+//        RedisTemplate<String, Object> template = new RedisTemplate<>();
+//        // 设置 RedisConnection 工厂。😈 它就是实现多种 Java Redis 客户端接入的秘密工厂。感兴趣的胖友，可以自己去撸下。
+//        template.setConnectionFactory(factory);
+//        // 使用 String 序列化方式，序列化 KEY 。
+//        template.setKeySerializer(RedisSerializer.string());
+//        template.setHashKeySerializer(RedisSerializer.string());
+//        // 使用 JSON 序列化方式（库是 Jackson ），序列化 VALUE 。
+//        template.setValueSerializer(RedisSerializer.json());
+//        template.setHashValueSerializer(RedisSerializer.json());
+//        return template;
+//    }
 
-    /**
-     * 自定义缓存key生成策略，默认将使用该策略
-     */
-    @Bean
-    @Override
-    public KeyGenerator keyGenerator() {
-        return (target, method, params) -> {
-            Map<String,Object> container = new HashMap<>(3);
-            Class<?> targetClassClass = target.getClass();
-            // 类地址
-            container.put("class",targetClassClass.toGenericString());
-            // 方法名称
-            container.put("methodName",method.getName());
-            // 包名称
-            container.put("package",targetClassClass.getPackage());
-            // 参数列表
-            for (int i = 0; i < params.length; i++) {
-                container.put(String.valueOf(i),params[i]);
-            }
-            // 转为JSON字符串
-            String jsonString = JSONUtil.toJsonStr(container);
-            // 做SHA256 Hash计算，得到一个SHA256摘要作为Key
-            return SecureUtil.sha256(jsonString);
-//            return DigestUtils.sha256Hex(jsonString);
-        };
-    }
-
-    @Bean
-    @Override
-    public CacheErrorHandler errorHandler() {
-        // 异常处理，当Redis发生异常时，打印日志，但是程序正常走
-        log.info("初始化 -> [{}]", "Redis CacheErrorHandler");
-        return new CacheErrorHandler() {
-            @Override
-            public void handleCacheGetError(RuntimeException e, Cache cache, Object key) {
-                log.error("Redis occur handleCacheGetError：key -> [{}]", key, e);
-            }
-
-            @Override
-            public void handleCachePutError(RuntimeException e, Cache cache, Object key, Object value) {
-                log.error("Redis occur handleCachePutError：key -> [{}]；value -> [{}]", key, value, e);
-            }
-
-            @Override
-            public void handleCacheEvictError(RuntimeException e, Cache cache, Object key) {
-                log.error("Redis occur handleCacheEvictError：key -> [{}]", key, e);
-            }
-
-            @Override
-            public void handleCacheClearError(RuntimeException e, Cache cache) {
-                log.error("Redis occur handleCacheClearError：", e);
-            }
-        };
-    }
-
-
-    class StringRedisSerializer implements RedisSerializer<Object> {
-
-        private final Charset charset;
-
-        StringRedisSerializer() {
-            this(StandardCharsets.UTF_8);
-        }
-
-        private StringRedisSerializer(Charset charset) {
-            Assert.notNull(charset, "Charset must not be null!");
-            this.charset = charset;
-        }
-
-        @Override
-        public String deserialize(byte[] bytes) {
-            return (bytes == null ? null : new String(bytes, charset));
-        }
-
-        @Override
-        public byte[] serialize(Object object) {
-            String string = JSONUtil.toJsonStr(object);
-            if (StrUtil.isBlank(string)) {
-                return null;
-            }
-            string = string.replace("\"", "");
-            return string.getBytes(charset);
-        }
-    }
 }

yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java

@@ -143,7 +143,8 @@ public class YudaoWebSecurityConfigurerAdapter extends WebSecurityConfigurerAdap
         ;
 
 //        // 添加 JWT Filter
-//        httpSecurity.addFilterBefore(authenticationTokenFilter, UsernamePasswordAuthenticationFilter.class);
+
+        httpSecurity.addFilterBefore(authenticationTokenFilter, UsernamePasswordAuthenticationFilter.class);
     }
 
     private String buildAdminApi(String url) {