Compare commits

..

No commits in common. '32ce96ccf9d0fa0948527079ee7555b988e6feff' and '99b3a41f39d2ff3c02a53f34334c716aa1f9edaf' have entirely different histories.

  1. 5
      ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/SecurityConstants.java
  2. 9
      ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/context/SecurityContextHolder.java
  3. 25
      ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/RedisConfig.java

5
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/SecurityConstants.java

@ -38,11 +38,6 @@ public class SecurityConstants @@ -38,11 +38,6 @@ public class SecurityConstants
public static final String USER_KEY = "user_key";
/**
* 厂商id
*/
public static final String FIRM_ID = "firm_id";
/**
* 登录用户
*/
public static final String LOGIN_USER = "login_user";

9
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/context/SecurityContextHolder.java

@ -77,15 +77,6 @@ public class SecurityContextHolder @@ -77,15 +77,6 @@ public class SecurityContextHolder
set(SecurityConstants.DETAILS_USERNAME, username);
}
public static void setUserAgent(String userId,String useragent)
{
set("userId", useragent);
}
public static String getUserAgent(String userId)
{
return get(userId);
}
public static String getUserKey()
{
return get(SecurityConstants.USER_KEY);

25
ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/RedisConfig.java

@ -8,7 +8,6 @@ import org.springframework.context.annotation.Bean; @@ -8,7 +8,6 @@ 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.JdkSerializationRedisSerializer;
import org.springframework.data.redis.serializer.StringRedisSerializer;
/**
@ -29,36 +28,16 @@ public class RedisConfig extends CachingConfigurerSupport @@ -29,36 +28,16 @@ public class RedisConfig extends CachingConfigurerSupport
template.setConnectionFactory(connectionFactory);
FastJson2JsonRedisSerializer serializer = new FastJson2JsonRedisSerializer(Object.class);
//JdkSerializationRedisSerializer serializer =new JdkSerializationRedisSerializer();
// 使用StringRedisSerializer来序列化和反序列化redis的key值
template.setKeySerializer(new StringRedisSerializer());
template.setValueSerializer(serializer);
// Hash的key也采用StringRedisSerializer的序列化方式
template.setHashKeySerializer(new StringRedisSerializer());
template.setHashValueSerializer((new StringRedisSerializer()));
template.setHashValueSerializer(serializer);
template.afterPropertiesSet();
return template;
}
// @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;
// }
}

Loading…
Cancel
Save