Merge branch 'zx_redis_conf' of http://git.dayaedu.com/yonge/cooleshow into develop-new

cooleshow-common/src/main/java/com/yonge/cooleshow/common/redis/config/RedisConfig.java

@@ -5,6 +5,7 @@ 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.GenericJackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.JdkSerializationRedisSerializer;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
 
 @Configuration
@@ -16,15 +17,13 @@ public class RedisConfig {
 		RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
 		redisTemplate.setConnectionFactory(redisConnectionFactory);
 
-		// 创建序列号对象
-		StringRedisSerializer stringRedisSerializer = new StringRedisSerializer();
-		GenericJackson2JsonRedisSerializer genericJackson2JsonRedisSerializer = new GenericJackson2JsonRedisSerializer();
-
 		// 设置序列化器
-		redisTemplate.setKeySerializer(stringRedisSerializer);
-		redisTemplate.setValueSerializer(genericJackson2JsonRedisSerializer);
-		redisTemplate.setHashKeySerializer(stringRedisSerializer);
-		redisTemplate.setHashValueSerializer(genericJackson2JsonRedisSerializer);
+		StringRedisSerializer stringSerializer = new StringRedisSerializer();
+
+		redisTemplate.setKeySerializer(stringSerializer);
+		redisTemplate.setHashKeySerializer(stringSerializer);
+		redisTemplate.setValueSerializer(new JdkSerializationRedisSerializer());
+		redisTemplate.setHashValueSerializer(new JdkSerializationRedisSerializer());
 		redisTemplate.afterPropertiesSet();
 		return redisTemplate;
 	}

toolset/toolset-payment/pom.xml

@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.redisson</groupId>
             <artifactId>redisson-spring-boot-starter</artifactId>
-            <version>3.16.4</version>
+            <version>${redisson.version}</version>
         </dependency>
         <!-- 阿里 -->
         <dependency>