Эх сурвалжийг харах

feat: 删除common包中的redis依赖

yangliu 3 сар өмнө
parent
commit
67e9e177a2

+ 4 - 4
hfln-framework-common/pom.xml

@@ -24,10 +24,10 @@
 			<scope>compile</scope>
 		</dependency>
 		<!-- SpringBoot Boot Redis -->
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-redis</artifactId>
-		</dependency>
+<!--		<dependency>-->
+<!--			<groupId>org.springframework.boot</groupId>-->
+<!--			<artifactId>spring-boot-starter-data-redis</artifactId>-->
+<!--		</dependency>-->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-aop</artifactId>

+ 44 - 44
hfln-framework-common/src/main/java/cn/hfln/framework/common/redis/FastJson2JsonRedisSerializer.java

@@ -1,44 +1,44 @@
-package cn.hfln.framework.common.redis;
-
-import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONReader;
-import com.alibaba.fastjson2.JSONWriter;
-import org.springframework.data.redis.serializer.RedisSerializer;
-import org.springframework.data.redis.serializer.SerializationException;
-
-import java.nio.charset.Charset;
-
-/**
- * Redis使用FastJson序列化
- *
- * @author cw
- */
-public class FastJson2JsonRedisSerializer<T> implements RedisSerializer<T> {
-    public static final Charset DEFAULT_CHARSET = Charset.forName("UTF-8");
-
-    private Class<T> clazz;
-
-
-    public FastJson2JsonRedisSerializer(Class<T> clazz) {
-        super();
-        this.clazz = clazz;
-    }
-
-    @Override
-    public byte[] serialize(T t) throws SerializationException {
-        if (t == null) {
-            return new byte[0];
-        }
-        return JSON.toJSONString(t, JSONWriter.Feature.WriteClassName).getBytes(DEFAULT_CHARSET);
-    }
-
-    @Override
-    public T deserialize(byte[] bytes) throws SerializationException {
-        if (bytes == null || bytes.length <= 0) {
-            return null;
-        }
-        String str = new String(bytes, DEFAULT_CHARSET);
-
-        return JSON.parseObject(str, clazz, JSONReader.Feature.SupportAutoType);
-    }
-}
+//package cn.hfln.framework.common.redis;
+//
+//import com.alibaba.fastjson2.JSON;
+//import com.alibaba.fastjson2.JSONReader;
+//import com.alibaba.fastjson2.JSONWriter;
+//import org.springframework.data.redis.serializer.RedisSerializer;
+//import org.springframework.data.redis.serializer.SerializationException;
+//
+//import java.nio.charset.Charset;
+//
+///**
+// * Redis使用FastJson序列化
+// *
+// * @author cw
+// */
+//public class FastJson2JsonRedisSerializer<T> implements RedisSerializer<T> {
+//    public static final Charset DEFAULT_CHARSET = Charset.forName("UTF-8");
+//
+//    private Class<T> clazz;
+//
+//
+//    public FastJson2JsonRedisSerializer(Class<T> clazz) {
+//        super();
+//        this.clazz = clazz;
+//    }
+//
+//    @Override
+//    public byte[] serialize(T t) throws SerializationException {
+//        if (t == null) {
+//            return new byte[0];
+//        }
+//        return JSON.toJSONString(t, JSONWriter.Feature.WriteClassName).getBytes(DEFAULT_CHARSET);
+//    }
+//
+//    @Override
+//    public T deserialize(byte[] bytes) throws SerializationException {
+//        if (bytes == null || bytes.length <= 0) {
+//            return null;
+//        }
+//        String str = new String(bytes, DEFAULT_CHARSET);
+//
+//        return JSON.parseObject(str, clazz, JSONReader.Feature.SupportAutoType);
+//    }
+//}

+ 54 - 54
hfln-framework-common/src/main/java/cn/hfln/framework/common/redis/RedisConfig.java

@@ -1,54 +1,54 @@
-package cn.hfln.framework.common.redis;
-
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
-import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
-import org.springframework.cache.annotation.CachingConfigurerSupport;
-import org.springframework.cache.annotation.EnableCaching;
-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.listener.RedisMessageListenerContainer;
-import org.springframework.data.redis.serializer.StringRedisSerializer;
-
-/**
- * redis配置
- *
- * @author cw
- */
-@Configuration
-@EnableCaching
-@AutoConfigureBefore(RedisAutoConfiguration.class)
-public class RedisConfig extends CachingConfigurerSupport {
-    @Bean
-    @SuppressWarnings(value = {"unchecked", "rawtypes"})
-    public RedisTemplate<Object, Object> redisTemplate(RedisConnectionFactory connectionFactory) {
-        RedisTemplate<Object, Object> template = new RedisTemplate<>();
-        template.setConnectionFactory(connectionFactory);
-
-        FastJson2JsonRedisSerializer serializer = new FastJson2JsonRedisSerializer(Object.class);
-
-        // 使用StringRedisSerializer来序列化和反序列化redis的key值
-        template.setKeySerializer(new StringRedisSerializer());
-        template.setValueSerializer(serializer);
-
-        // Hash的key也采用StringRedisSerializer的序列化方式
-        template.setHashKeySerializer(new StringRedisSerializer());
-        template.setHashValueSerializer(serializer);
-
-        template.afterPropertiesSet();
-        return template;
-    }
-
-    @Bean
-    public RedisMessageListenerContainer redisMessageListenerContainer(RedisConnectionFactory factory) {
-        RedisMessageListenerContainer container = new RedisMessageListenerContainer();
-
-        container.setConnectionFactory(factory);
-
-        //  container.setTaskExecutor(null);            // 设置用于执行监听器方法的 Executor
-        //  container.setErrorHandler(null);            // 设置监听器方法执行过程中出现异常的处理器
-        //  container.addMessageListener(null, null);   // 手动设置监听器 & 监听的 topic 表达式
-        return container;
-    }
-}
+//package cn.hfln.framework.common.redis;
+//
+//import org.springframework.boot.autoconfigure.AutoConfigureBefore;
+//import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
+//import org.springframework.cache.annotation.CachingConfigurerSupport;
+//import org.springframework.cache.annotation.EnableCaching;
+//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.listener.RedisMessageListenerContainer;
+//import org.springframework.data.redis.serializer.StringRedisSerializer;
+//
+///**
+// * redis配置
+// *
+// * @author cw
+// */
+//@Configuration
+//@EnableCaching
+//@AutoConfigureBefore(RedisAutoConfiguration.class)
+//public class RedisConfig extends CachingConfigurerSupport {
+//    @Bean
+//    @SuppressWarnings(value = {"unchecked", "rawtypes"})
+//    public RedisTemplate<Object, Object> redisTemplate(RedisConnectionFactory connectionFactory) {
+//        RedisTemplate<Object, Object> template = new RedisTemplate<>();
+//        template.setConnectionFactory(connectionFactory);
+//
+//        FastJson2JsonRedisSerializer serializer = new FastJson2JsonRedisSerializer(Object.class);
+//
+//        // 使用StringRedisSerializer来序列化和反序列化redis的key值
+//        template.setKeySerializer(new StringRedisSerializer());
+//        template.setValueSerializer(serializer);
+//
+//        // Hash的key也采用StringRedisSerializer的序列化方式
+//        template.setHashKeySerializer(new StringRedisSerializer());
+//        template.setHashValueSerializer(serializer);
+//
+//        template.afterPropertiesSet();
+//        return template;
+//    }
+//
+//    @Bean
+//    public RedisMessageListenerContainer redisMessageListenerContainer(RedisConnectionFactory factory) {
+//        RedisMessageListenerContainer container = new RedisMessageListenerContainer();
+//
+//        container.setConnectionFactory(factory);
+//
+//        //  container.setTaskExecutor(null);            // 设置用于执行监听器方法的 Executor
+//        //  container.setErrorHandler(null);            // 设置监听器方法执行过程中出现异常的处理器
+//        //  container.addMessageListener(null, null);   // 手动设置监听器 & 监听的 topic 表达式
+//        return container;
+//    }
+//}

+ 355 - 355
hfln-framework-common/src/main/java/cn/hfln/framework/common/redis/service/RedisService.java

@@ -1,355 +1,355 @@
-package cn.hfln.framework.common.redis.service;
-
-import cn.hutool.core.util.RandomUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.CommandLineRunner;
-import org.springframework.data.redis.core.BoundSetOperations;
-import org.springframework.data.redis.core.HashOperations;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.ValueOperations;
-import org.springframework.stereotype.Component;
-
-import java.util.*;
-import java.util.concurrent.TimeUnit;
-
-/**
- * spring redis 工具类
- *
- * @author cw
- **/
-@SuppressWarnings(value = {"unchecked", "rawtypes"})
-@Component
-public class RedisService implements CommandLineRunner {
-    @Autowired
-    public RedisTemplate redisTemplate;
-
-    /**
-     * 缓存基本的对象,Integer、String、实体类等
-     *
-     * @param key   缓存的键值
-     * @param value 缓存的值
-     */
-    public <T> void setCacheObject(final String key, final T value) {
-        redisTemplate.opsForValue().set(key, value);
-    }
-
-    /**
-     * 分布式锁
-     *
-     * @param key
-     * @param value
-     * @return
-     */
-    public boolean setNx(final String key, String value) {
-        return redisTemplate.opsForValue().setIfAbsent(key, value);
-    }
-
-    /**
-     * 分布式锁
-     *
-     * @param key
-     * @param value
-     * @return
-     */
-    public boolean setNx(final String key, String value, final Long timeout, final TimeUnit timeUnit) {
-        return redisTemplate.opsForValue().setIfAbsent(key, value, timeout, timeUnit);
-    }
-
-    /**
-     * 缓存基本的对象,Integer、String、实体类等
-     *
-     * @param key      缓存的键值
-     * @param value    缓存的值
-     * @param timeout  时间
-     * @param timeUnit 时间颗粒度
-     */
-    public <T> void setCacheObject(final String key, final T value, final Long timeout, final TimeUnit timeUnit) {
-        redisTemplate.opsForValue().set(key, value, timeout, timeUnit);
-    }
-
-    /**
-     * 设置有效时间
-     *
-     * @param key Redis键
-     * @param timeout 超时时间
-     * @return true=设置成功;false=设置失败
-     */
-    public boolean expire(final String key, final long timeout)
-    {
-        return expire(key, timeout, TimeUnit.SECONDS);
-    }
-
-    /**
-     * 设置有效时间
-     *
-     * @param key Redis键
-     * @param timeout 超时时间
-     * @param unit 时间单位
-     * @return true=设置成功;false=设置失败
-     */
-    public boolean expire(final String key, final long timeout, final TimeUnit unit)
-    {
-        return redisTemplate.expire(key, timeout, unit);
-    }
-
-    /**
-     * 获取有效时间
-     *
-     * @param key Redis键
-     * @return 有效时间
-     */
-    public long getExpire(final String key)
-    {
-        return redisTemplate.getExpire(key);
-    }
-
-    /**
-     * 判断 key是否存在
-     *
-     * @param key 键
-     * @return true 存在 false不存在
-     */
-    public Boolean hasKey(String key)
-    {
-        return redisTemplate.hasKey(key);
-    }
-
-    /**
-     * 获得缓存的基本对象。
-     *
-     * @param key 缓存键值
-     * @return 缓存键值对应的数据
-     */
-    public <T> T getCacheObject(final String key)
-    {
-        ValueOperations<String, T> operation = redisTemplate.opsForValue();
-        return operation.get(key);
-    }
-
-    /**
-     * 获得缓存的基本对象。
-     *
-     * @param key 缓存键值
-     * @return 缓存键值对应的数据
-     */
-    public Long increment(final String key) {
-        return redisTemplate.opsForValue().increment(key);
-    }
-
-    public Long incrementMap(String key, String filed) {
-        return redisTemplate.opsForHash().increment(key, filed, 1L);
-    }
-
-    /**
-     * 删除单个对象
-     *
-     * @param key
-     */
-    public boolean deleteObject(final String key) {
-        return redisTemplate.delete(key);
-    }
-
-    /**
-     * 删除集合对象
-     *
-     * @param collection 多个对象
-     * @return
-     */
-    public boolean deleteObject(final Collection collection)
-    {
-        return redisTemplate.delete(collection) > 0;
-    }
-
-    /**
-     * 缓存List数据
-     *
-     * @param key 缓存的键值
-     * @param dataList 待缓存的List数据
-     * @return 缓存的对象
-     */
-    public <T> long setCacheList(final String key, final List<T> dataList)
-    {
-        Long count = redisTemplate.opsForList().rightPushAll(key, dataList);
-        return count == null ? 0 : count;
-    }
-    /**
-     * 获得缓存的基本对象列表
-     *
-     * @param pattern 字符串前缀
-     * @return 对象列表
-     */
-    public Collection<String> keys(final String pattern)
-    {
-        return redisTemplate.keys(pattern);
-    }
-    /**
-     * 获得缓存的list对象
-     *
-     * @param key 缓存的键值
-     * @return 缓存键值对应的数据
-     */
-    public <T> List<T> getCacheList(final String key)
-    {
-        return redisTemplate.opsForList().range(key, 0, -1);
-    }
-
-    /**
-     * 缓存Set
-     *
-     * @param key 缓存键值
-     * @param dataSet 缓存的数据
-     * @return 缓存数据的对象
-     */
-    public <T> BoundSetOperations<String, T> setCacheSet(final String key, final Set<T> dataSet)
-    {
-        BoundSetOperations<String, T> setOperation = redisTemplate.boundSetOps(key);
-        Iterator<T> it = dataSet.iterator();
-        while (it.hasNext())
-        {
-            setOperation.add(it.next());
-        }
-        return setOperation;
-    }
-
-    /**
-     * 获得缓存的set
-     *
-     * @param key
-     * @return
-     */
-    public <T> Set<T> getCacheSet(final String key)
-    {
-        return redisTemplate.opsForSet().members(key);
-    }
-
-    /**
-     * 添加元素缓存的set
-     * @param key
-     * @param values
-     * @return
-     * @param <T>
-     */
-    public <T> Long addCacheSet(final String key, final T... values)
-    {
-        return redisTemplate.opsForSet().add(key, values);
-    }
-
-    /**
-     * 删除缓存set的元素
-     * @param key
-     * @param values
-     * @return
-     * @param <T>
-     */
-    public <T> Long removeCacheSet(final String key, final T... values)
-    {
-        return redisTemplate.opsForSet().remove(key, values);
-    }
-
-    /**
-     * 缓存的set的size
-     * @param key
-     * @return
-     * @param <T>
-     */
-    public <T> Long size(final String key)
-    {
-        return redisTemplate.opsForSet().size(key);
-    }
-
-    /**
-     * set是否包含value
-     * @param key
-     * @param object
-     * @return
-     */
-    public Boolean isMember(final String key, final Object object)
-    {
-        return redisTemplate.opsForSet().isMember(key, object);
-    }
-
-    /**
-     * 缓存Map
-     *
-     * @param key
-     * @param dataMap
-     */
-    public <T> void setCacheMap(final String key, final Map<String, T> dataMap)
-    {
-        if (dataMap != null) {
-            redisTemplate.opsForHash().putAll(key, dataMap);
-        }
-    }
-
-    /**
-     * 获得缓存的Map
-     *
-     * @param key
-     * @return
-     */
-    public <T> Map<String, T> getCacheMap(final String key)
-    {
-        return redisTemplate.opsForHash().entries(key);
-    }
-
-    /**
-     * 往Hash中存入数据
-     *
-     * @param key Redis键
-     * @param hKey Hash键
-     * @param value 值
-     */
-    public <T> void setCacheMapValue(final String key, final String hKey, final T value)
-    {
-        redisTemplate.opsForHash().put(key, hKey, value);
-    }
-
-    /**
-     * 获取Hash中的数据
-     *
-     * @param key Redis键
-     * @param hKey Hash键
-     * @return Hash中的对象
-     */
-    public <T> T getCacheMapValue(final String key, final String hKey)
-    {
-        HashOperations<String, String, T> opsForHash = redisTemplate.opsForHash();
-        return opsForHash.get(key, hKey);
-    }
-
-
-    /**
-     * 获取多个Hash中的数据
-     *
-     * @param key Redis键
-     * @param hKeys Hash键集合
-     * @return Hash对象集合
-     */
-    public <T> List<T> getMultiCacheMapValue(final String key, final Collection<Object> hKeys)
-    {
-        return redisTemplate.opsForHash().multiGet(key, hKeys);
-    }
-
-    /**
-     * 删除Hash中的某条数据
-     *
-     * @param key  Redis键
-     * @param hKey Hash键
-     * @return 是否成功
-     */
-    public boolean deleteCacheMapValue(final String key, final String hKey) {
-        return redisTemplate.opsForHash().delete(key, hKey) > 0;
-    }
-
-    @Override
-    public void run(String... args) throws Exception {
-        redisTemplate.opsForValue().set("test", RandomUtil.randomString(2));
-    }
-
-    /**
-     * 获得缓存的基本对象列表
-     *
-     * @param pattern 字符串前缀
-     * @return 对象列表
-     */
-}
+//package cn.hfln.framework.common.redis.service;
+//
+//import cn.hutool.core.util.RandomUtil;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.boot.CommandLineRunner;
+//import org.springframework.data.redis.core.BoundSetOperations;
+//import org.springframework.data.redis.core.HashOperations;
+//import org.springframework.data.redis.core.RedisTemplate;
+//import org.springframework.data.redis.core.ValueOperations;
+//import org.springframework.stereotype.Component;
+//
+//import java.util.*;
+//import java.util.concurrent.TimeUnit;
+//
+///**
+// * spring redis 工具类
+// *
+// * @author cw
+// **/
+//@SuppressWarnings(value = {"unchecked", "rawtypes"})
+//@Component
+//public class RedisService implements CommandLineRunner {
+//    @Autowired
+//    public RedisTemplate redisTemplate;
+//
+//    /**
+//     * 缓存基本的对象,Integer、String、实体类等
+//     *
+//     * @param key   缓存的键值
+//     * @param value 缓存的值
+//     */
+//    public <T> void setCacheObject(final String key, final T value) {
+//        redisTemplate.opsForValue().set(key, value);
+//    }
+//
+//    /**
+//     * 分布式锁
+//     *
+//     * @param key
+//     * @param value
+//     * @return
+//     */
+//    public boolean setNx(final String key, String value) {
+//        return redisTemplate.opsForValue().setIfAbsent(key, value);
+//    }
+//
+//    /**
+//     * 分布式锁
+//     *
+//     * @param key
+//     * @param value
+//     * @return
+//     */
+//    public boolean setNx(final String key, String value, final Long timeout, final TimeUnit timeUnit) {
+//        return redisTemplate.opsForValue().setIfAbsent(key, value, timeout, timeUnit);
+//    }
+//
+//    /**
+//     * 缓存基本的对象,Integer、String、实体类等
+//     *
+//     * @param key      缓存的键值
+//     * @param value    缓存的值
+//     * @param timeout  时间
+//     * @param timeUnit 时间颗粒度
+//     */
+//    public <T> void setCacheObject(final String key, final T value, final Long timeout, final TimeUnit timeUnit) {
+//        redisTemplate.opsForValue().set(key, value, timeout, timeUnit);
+//    }
+//
+//    /**
+//     * 设置有效时间
+//     *
+//     * @param key Redis键
+//     * @param timeout 超时时间
+//     * @return true=设置成功;false=设置失败
+//     */
+//    public boolean expire(final String key, final long timeout)
+//    {
+//        return expire(key, timeout, TimeUnit.SECONDS);
+//    }
+//
+//    /**
+//     * 设置有效时间
+//     *
+//     * @param key Redis键
+//     * @param timeout 超时时间
+//     * @param unit 时间单位
+//     * @return true=设置成功;false=设置失败
+//     */
+//    public boolean expire(final String key, final long timeout, final TimeUnit unit)
+//    {
+//        return redisTemplate.expire(key, timeout, unit);
+//    }
+//
+//    /**
+//     * 获取有效时间
+//     *
+//     * @param key Redis键
+//     * @return 有效时间
+//     */
+//    public long getExpire(final String key)
+//    {
+//        return redisTemplate.getExpire(key);
+//    }
+//
+//    /**
+//     * 判断 key是否存在
+//     *
+//     * @param key 键
+//     * @return true 存在 false不存在
+//     */
+//    public Boolean hasKey(String key)
+//    {
+//        return redisTemplate.hasKey(key);
+//    }
+//
+//    /**
+//     * 获得缓存的基本对象。
+//     *
+//     * @param key 缓存键值
+//     * @return 缓存键值对应的数据
+//     */
+//    public <T> T getCacheObject(final String key)
+//    {
+//        ValueOperations<String, T> operation = redisTemplate.opsForValue();
+//        return operation.get(key);
+//    }
+//
+//    /**
+//     * 获得缓存的基本对象。
+//     *
+//     * @param key 缓存键值
+//     * @return 缓存键值对应的数据
+//     */
+//    public Long increment(final String key) {
+//        return redisTemplate.opsForValue().increment(key);
+//    }
+//
+//    public Long incrementMap(String key, String filed) {
+//        return redisTemplate.opsForHash().increment(key, filed, 1L);
+//    }
+//
+//    /**
+//     * 删除单个对象
+//     *
+//     * @param key
+//     */
+//    public boolean deleteObject(final String key) {
+//        return redisTemplate.delete(key);
+//    }
+//
+//    /**
+//     * 删除集合对象
+//     *
+//     * @param collection 多个对象
+//     * @return
+//     */
+//    public boolean deleteObject(final Collection collection)
+//    {
+//        return redisTemplate.delete(collection) > 0;
+//    }
+//
+//    /**
+//     * 缓存List数据
+//     *
+//     * @param key 缓存的键值
+//     * @param dataList 待缓存的List数据
+//     * @return 缓存的对象
+//     */
+//    public <T> long setCacheList(final String key, final List<T> dataList)
+//    {
+//        Long count = redisTemplate.opsForList().rightPushAll(key, dataList);
+//        return count == null ? 0 : count;
+//    }
+//    /**
+//     * 获得缓存的基本对象列表
+//     *
+//     * @param pattern 字符串前缀
+//     * @return 对象列表
+//     */
+//    public Collection<String> keys(final String pattern)
+//    {
+//        return redisTemplate.keys(pattern);
+//    }
+//    /**
+//     * 获得缓存的list对象
+//     *
+//     * @param key 缓存的键值
+//     * @return 缓存键值对应的数据
+//     */
+//    public <T> List<T> getCacheList(final String key)
+//    {
+//        return redisTemplate.opsForList().range(key, 0, -1);
+//    }
+//
+//    /**
+//     * 缓存Set
+//     *
+//     * @param key 缓存键值
+//     * @param dataSet 缓存的数据
+//     * @return 缓存数据的对象
+//     */
+//    public <T> BoundSetOperations<String, T> setCacheSet(final String key, final Set<T> dataSet)
+//    {
+//        BoundSetOperations<String, T> setOperation = redisTemplate.boundSetOps(key);
+//        Iterator<T> it = dataSet.iterator();
+//        while (it.hasNext())
+//        {
+//            setOperation.add(it.next());
+//        }
+//        return setOperation;
+//    }
+//
+//    /**
+//     * 获得缓存的set
+//     *
+//     * @param key
+//     * @return
+//     */
+//    public <T> Set<T> getCacheSet(final String key)
+//    {
+//        return redisTemplate.opsForSet().members(key);
+//    }
+//
+//    /**
+//     * 添加元素缓存的set
+//     * @param key
+//     * @param values
+//     * @return
+//     * @param <T>
+//     */
+//    public <T> Long addCacheSet(final String key, final T... values)
+//    {
+//        return redisTemplate.opsForSet().add(key, values);
+//    }
+//
+//    /**
+//     * 删除缓存set的元素
+//     * @param key
+//     * @param values
+//     * @return
+//     * @param <T>
+//     */
+//    public <T> Long removeCacheSet(final String key, final T... values)
+//    {
+//        return redisTemplate.opsForSet().remove(key, values);
+//    }
+//
+//    /**
+//     * 缓存的set的size
+//     * @param key
+//     * @return
+//     * @param <T>
+//     */
+//    public <T> Long size(final String key)
+//    {
+//        return redisTemplate.opsForSet().size(key);
+//    }
+//
+//    /**
+//     * set是否包含value
+//     * @param key
+//     * @param object
+//     * @return
+//     */
+//    public Boolean isMember(final String key, final Object object)
+//    {
+//        return redisTemplate.opsForSet().isMember(key, object);
+//    }
+//
+//    /**
+//     * 缓存Map
+//     *
+//     * @param key
+//     * @param dataMap
+//     */
+//    public <T> void setCacheMap(final String key, final Map<String, T> dataMap)
+//    {
+//        if (dataMap != null) {
+//            redisTemplate.opsForHash().putAll(key, dataMap);
+//        }
+//    }
+//
+//    /**
+//     * 获得缓存的Map
+//     *
+//     * @param key
+//     * @return
+//     */
+//    public <T> Map<String, T> getCacheMap(final String key)
+//    {
+//        return redisTemplate.opsForHash().entries(key);
+//    }
+//
+//    /**
+//     * 往Hash中存入数据
+//     *
+//     * @param key Redis键
+//     * @param hKey Hash键
+//     * @param value 值
+//     */
+//    public <T> void setCacheMapValue(final String key, final String hKey, final T value)
+//    {
+//        redisTemplate.opsForHash().put(key, hKey, value);
+//    }
+//
+//    /**
+//     * 获取Hash中的数据
+//     *
+//     * @param key Redis键
+//     * @param hKey Hash键
+//     * @return Hash中的对象
+//     */
+//    public <T> T getCacheMapValue(final String key, final String hKey)
+//    {
+//        HashOperations<String, String, T> opsForHash = redisTemplate.opsForHash();
+//        return opsForHash.get(key, hKey);
+//    }
+//
+//
+//    /**
+//     * 获取多个Hash中的数据
+//     *
+//     * @param key Redis键
+//     * @param hKeys Hash键集合
+//     * @return Hash对象集合
+//     */
+//    public <T> List<T> getMultiCacheMapValue(final String key, final Collection<Object> hKeys)
+//    {
+//        return redisTemplate.opsForHash().multiGet(key, hKeys);
+//    }
+//
+//    /**
+//     * 删除Hash中的某条数据
+//     *
+//     * @param key  Redis键
+//     * @param hKey Hash键
+//     * @return 是否成功
+//     */
+//    public boolean deleteCacheMapValue(final String key, final String hKey) {
+//        return redisTemplate.opsForHash().delete(key, hKey) > 0;
+//    }
+//
+//    @Override
+//    public void run(String... args) throws Exception {
+//        redisTemplate.opsForValue().set("test", RandomUtil.randomString(2));
+//    }
+//
+//    /**
+//     * 获得缓存的基本对象列表
+//     *
+//     * @param pattern 字符串前缀
+//     * @return 对象列表
+//     */
+//}

+ 0 - 3
hfln-framework-common/src/main/resources/META-INF/spring.factories

@@ -1,3 +0,0 @@
-# Auto Configure
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-cn.hfln.framework.common.redis.service.RedisService

+ 2 - 5
hfln-framework-design-starter/redis-spring-boot-starter/src/main/java/cn/hfln/framework/redis/autoconfigure/AutoRedisConfiguration.java

@@ -1,17 +1,14 @@
 package cn.hfln.framework.redis.autoconfigure;
 
 import cn.hfln.framework.redis.util.RedisUtil;
-import cn.hfln.framework.redis.properties.RedisProperties;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.core.RedisTemplate;
 
 @Configuration
 @AutoConfigureAfter(name = "org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration")
-@EnableConfigurationProperties(RedisProperties.class)
 public class AutoRedisConfiguration {
 
     public AutoRedisConfiguration() {
@@ -19,7 +16,7 @@ public class AutoRedisConfiguration {
 
     @Bean
     @ConditionalOnBean(RedisTemplate.class)
-    public RedisUtil redisUtil(RedisTemplate<String, Object> redisTemplate, RedisProperties redisProperties) {
-        return new RedisUtil(redisTemplate, redisProperties);
+    public RedisUtil redisUtil(RedisTemplate<String, Object> redisTemplate) {
+        return new RedisUtil(redisTemplate);
     }
 }

+ 0 - 28
hfln-framework-design-starter/redis-spring-boot-starter/src/main/java/cn/hfln/framework/redis/properties/RedisProperties.java

@@ -1,28 +0,0 @@
-package cn.hfln.framework.redis.properties;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-
-@ConfigurationProperties(prefix = "hfln.redis")
-public class RedisProperties {
-    /**
-     * key 前缀
-     */
-    private String keyPrefix = "";
-    /**
-     * 默认超时时间(秒)
-     */
-    private long defaultTimeout = 3600;
-
-    public String getKeyPrefix() {
-        return keyPrefix;
-    }
-    public void setKeyPrefix(String keyPrefix) {
-        this.keyPrefix = keyPrefix;
-    }
-    public long getDefaultTimeout() {
-        return defaultTimeout;
-    }
-    public void setDefaultTimeout(long defaultTimeout) {
-        this.defaultTimeout = defaultTimeout;
-    }
-} 

+ 3 - 7
hfln-framework-design-starter/redis-spring-boot-starter/src/main/java/cn/hfln/framework/redis/util/RedisUtil.java

@@ -1,6 +1,5 @@
 package cn.hfln.framework.redis.util;
 
-import cn.hfln.framework.redis.properties.RedisProperties;
 import org.springframework.data.redis.core.RedisTemplate;
 
 import java.util.List;
@@ -13,22 +12,19 @@ import java.util.concurrent.TimeUnit;
  */
 public class RedisUtil {
     private final RedisTemplate<String, Object> redisTemplate;
-    private final RedisProperties redisProperties;
 
-    public RedisUtil(RedisTemplate<String, Object> redisTemplate, RedisProperties redisProperties) {
+    public RedisUtil(RedisTemplate<String, Object> redisTemplate) {
         System.out.println("【RedisUtil】构造方法被调用");
         this.redisTemplate = redisTemplate;
-        this.redisProperties = redisProperties;
     }
 
     private String wrapKey(String key) {
-        String prefix = redisProperties != null ? redisProperties.getKeyPrefix() : "";
-        return prefix + key;
+        return key;
     }
 
     // ============================= String ============================
     public void set(String key, Object value) {
-        set(key, value, redisProperties != null ? redisProperties.getDefaultTimeout() : 3600, TimeUnit.SECONDS);
+        set(key, value, 3600, TimeUnit.SECONDS);
     }
     public void set(String key, Object value, long timeout, TimeUnit unit) {
         redisTemplate.opsForValue().set(wrapKey(key), value, timeout, unit);