czg_team/cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature' of https://gitee.com/liuyingfang/cashier-admin into feature

Browse Source 
# Conflicts:
#	eladmin-common/src/main/java/cn/ysk/cashier/config/RedisConfig.java
#	eladmin-system/src/main/java/cn/ysk/cashier/controller/order/TbOrderInfoController.java
#	eladmin-system/src/main/java/cn/ysk/cashier/dto/order/TbOrderInfoDto.java
This commit is contained in:
liuyingfang
2024-03-05 09:57:41 +08:00
parent 66f5c82c9d c6103ca00f
commit ec17ff6f8d
15 changed files with 140 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
eladmin-common/src/main/java/cn/ysk/cashier/config/RedisConfig.java
View File

@@ -21,7 +21,6 @@ import com.alibaba.fastjson.parser.ParserConfig;
import com.alibaba.fastjson.serializer.SerializerFeature;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.codec.digest.DigestUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.data.redis.RedisProperties;
@@ -37,8 +36,6 @@ import org.springframework.data.redis.cache.RedisCacheConfiguration;
import org.springframework.data.redis.connection.RedisConnectionFactory;
import org.springframework.data.redis.core.RedisOperations;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.listener.PatternTopic;
import org.springframework.data.redis.listener.RedisMessageListenerContainer;
import org.springframework.data.redis.serializer.RedisSerializationContext;
import org.springframework.data.redis.serializer.RedisSerializer;
import reactor.util.annotation.Nullable;
@@ -60,9 +57,6 @@ import java.util.Map;
@EnableConfigurationProperties(RedisProperties.class)
public class RedisConfig extends CachingConfigurerSupport {
@Autowired
private RedisKeyExpirationListener redisKeyExpirationListener;
/**
* 设置 redis 数据默认过期时间，默认2小时
* 设置@cacheable 序列化方式
@@ -89,10 +83,16 @@ public class RedisConfig extends CachingConfigurerSupport {
// fastjson 升级到 1.2.83 后需要指定序列化白名单
ParserConfig.getGlobalInstance().addAccept("cn.ysk.cashier.pojo");
ParserConfig.getGlobalInstance().addAccept("cn.ysk.cashier.service");
// 模块内的实体类
// ParserConfig.getGlobalInstance().addAccept("cn.ysk.cashier.mnt.domain");
// ParserConfig.getGlobalInstance().addAccept("cn.ysk.cashier.quartz.domain");
// ParserConfig.getGlobalInstance().addAccept("cn.ysk.cashier.system.domain");
// 模块内的 Dto
ParserConfig.getGlobalInstance().addAccept("cn.ysk.cashier.mnt");
ParserConfig.getGlobalInstance().addAccept("cn.ysk.cashier.system");
ParserConfig.getGlobalInstance().addAccept("cn.ysk.cashier.quartz");
ParserConfig.getGlobalInstance().addAccept("cn.ysk.cashier.config");
// ParserConfig.getGlobalInstance().addAccept("cn.ysk.cashier.system.service.dto");
// key的序列化采用StringRedisSerializer
template.setKeySerializer(new StringRedisSerializer());
template.setHashKeySerializer(new StringRedisSerializer());
@@ -100,17 +100,6 @@ public class RedisConfig extends CachingConfigurerSupport {
return template;
}
//redis key失效监听
@Bean
public RedisMessageListenerContainer redisMessageListenerContainer(RedisConnectionFactory connectionFactory) {
RedisMessageListenerContainer container = new RedisMessageListenerContainer();
container.setConnectionFactory(connectionFactory);
System.out.println(111);
// 监听特定键的过期事件
container.addMessageListener(redisKeyExpirationListener, new PatternTopic("__keyevent@0__:expired"));
return container;
}
/**
* 自定义缓存key生成策略，默认将使用该策略
*/

23
eladmin-common/src/main/java/cn/ysk/cashier/utils/CacheKey.java
View File

@@ -25,34 +25,39 @@ public interface CacheKey {
/**
* 用户
*/
String USER_ID = "user::id:";
String USER_ID = "user:id:";
/**
* 激活码
*/
String ACT_CODE = "act_code:";
/**
* 数据
*/
String DATA_USER = "data::user:";
String DATA_USER = "data:user:";
/**
* 菜单
*/
String MENU_ID = "menu::id:";
String MENU_USER = "menu::user:";
String MENU_ID = "menu:id:";
String MENU_USER = "menu:user:";
/**
* 角色授权
*/
String ROLE_AUTH = "role::auth:";
String ROLE_AUTH = "role:auth:";
/**
* 角色信息
*/
String ROLE_ID = "role::id:";
String ROLE_ID = "role:id:";
/**
* 部门
*/
String DEPT_ID = "dept::id:";
String DEPT_ID = "dept:id:";
/**
* 岗位
*/
String JOB_ID = "job::id:";
String JOB_ID = "job:id:";
/**
* 数据字典
*/
String DICT_NAME = "dict::name:";
String DICT_NAME = "dict:name:";
}