优化代码,增加redisson配置
This commit is contained in:
parent
4dc183cdf5
commit
9aa7a6dcf3
21
buyer-api/src/main/resources/redisson.yaml
Normal file
21
buyer-api/src/main/resources/redisson.yaml
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
---
|
||||||
|
singleServerConfig:
|
||||||
|
idleConnectionTimeout: 10000
|
||||||
|
connectTimeout: 10000
|
||||||
|
timeout: 3000
|
||||||
|
retryAttempts: 3
|
||||||
|
retryInterval: 1500
|
||||||
|
password: lilishop
|
||||||
|
subscriptionsPerConnection: 5
|
||||||
|
clientName: null
|
||||||
|
address: "redis://pg2481.com:6379"
|
||||||
|
subscriptionConnectionMinimumIdleSize: 1
|
||||||
|
subscriptionConnectionPoolSize: 50
|
||||||
|
connectionMinimumIdleSize: 24
|
||||||
|
connectionPoolSize: 64
|
||||||
|
database: 0
|
||||||
|
dnsMonitoringInterval: 5000
|
||||||
|
threads: 16
|
||||||
|
nettyThreads: 32
|
||||||
|
codec: !<org.redisson.codec.MarshallingCodec> {}
|
||||||
|
transportMode: "NIO"
|
21
common-api/src/main/resources/redisson.yaml
Normal file
21
common-api/src/main/resources/redisson.yaml
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
---
|
||||||
|
singleServerConfig:
|
||||||
|
idleConnectionTimeout: 10000
|
||||||
|
connectTimeout: 10000
|
||||||
|
timeout: 3000
|
||||||
|
retryAttempts: 3
|
||||||
|
retryInterval: 1500
|
||||||
|
password: lilishop
|
||||||
|
subscriptionsPerConnection: 5
|
||||||
|
clientName: null
|
||||||
|
address: "redis://pg2481.com:6379"
|
||||||
|
subscriptionConnectionMinimumIdleSize: 1
|
||||||
|
subscriptionConnectionPoolSize: 50
|
||||||
|
connectionMinimumIdleSize: 24
|
||||||
|
connectionPoolSize: 64
|
||||||
|
database: 0
|
||||||
|
dnsMonitoringInterval: 5000
|
||||||
|
threads: 16
|
||||||
|
nettyThreads: 32
|
||||||
|
codec: !<org.redisson.codec.MarshallingCodec> {}
|
||||||
|
transportMode: "NIO"
|
21
consumer/src/main/resources/redisson.yaml
Normal file
21
consumer/src/main/resources/redisson.yaml
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
---
|
||||||
|
singleServerConfig:
|
||||||
|
idleConnectionTimeout: 10000
|
||||||
|
connectTimeout: 10000
|
||||||
|
timeout: 3000
|
||||||
|
retryAttempts: 3
|
||||||
|
retryInterval: 1500
|
||||||
|
password: lilishop
|
||||||
|
subscriptionsPerConnection: 5
|
||||||
|
clientName: null
|
||||||
|
address: "redis://pg2481.com:6379"
|
||||||
|
subscriptionConnectionMinimumIdleSize: 1
|
||||||
|
subscriptionConnectionPoolSize: 50
|
||||||
|
connectionMinimumIdleSize: 24
|
||||||
|
connectionPoolSize: 64
|
||||||
|
database: 0
|
||||||
|
dnsMonitoringInterval: 5000
|
||||||
|
threads: 16
|
||||||
|
nettyThreads: 32
|
||||||
|
codec: !<org.redisson.codec.MarshallingCodec> {}
|
||||||
|
transportMode: "NIO"
|
@ -129,7 +129,12 @@
|
|||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-starter-data-redis</artifactId>
|
<artifactId>spring-boot-starter-data-redis</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<!-- Swagger API文档 -->
|
<!-- https://mvnrepository.com/artifact/org.redisson/redisson-spring-boot-starter -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.redisson</groupId>
|
||||||
|
<artifactId>redisson</artifactId>
|
||||||
|
<version>${redisson}</version>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.github.xiaoymin</groupId>
|
<groupId>com.github.xiaoymin</groupId>
|
||||||
@ -165,12 +170,6 @@
|
|||||||
<artifactId>jasypt-spring-boot-starter</artifactId>
|
<artifactId>jasypt-spring-boot-starter</artifactId>
|
||||||
<version>${jasypt-version}</version>
|
<version>${jasypt-version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.redisson</groupId>
|
|
||||||
<artifactId>redisson</artifactId>
|
|
||||||
<version>${redisson}</version>
|
|
||||||
</dependency>
|
|
||||||
<!-- 阿里云核心包-->
|
<!-- 阿里云核心包-->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.aliyun</groupId>
|
<groupId>com.aliyun</groupId>
|
||||||
|
@ -4,6 +4,9 @@ import com.alibaba.fastjson.JSON;
|
|||||||
import com.alibaba.fastjson.parser.ParserConfig;
|
import com.alibaba.fastjson.parser.ParserConfig;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.commons.codec.digest.DigestUtils;
|
import org.apache.commons.codec.digest.DigestUtils;
|
||||||
|
import org.redisson.Redisson;
|
||||||
|
import org.redisson.api.RedissonClient;
|
||||||
|
import org.redisson.config.Config;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
|
||||||
@ -17,6 +20,7 @@ import org.springframework.cache.interceptor.KeyGenerator;
|
|||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
import org.springframework.context.annotation.Configuration;
|
||||||
import org.springframework.context.annotation.Primary;
|
import org.springframework.context.annotation.Primary;
|
||||||
|
import org.springframework.core.io.ClassPathResource;
|
||||||
import org.springframework.data.redis.cache.RedisCacheConfiguration;
|
import org.springframework.data.redis.cache.RedisCacheConfiguration;
|
||||||
import org.springframework.data.redis.cache.RedisCacheManager;
|
import org.springframework.data.redis.cache.RedisCacheManager;
|
||||||
import org.springframework.data.redis.cache.RedisCacheWriter;
|
import org.springframework.data.redis.cache.RedisCacheWriter;
|
||||||
@ -27,6 +31,7 @@ import org.springframework.data.redis.core.RedisTemplate;
|
|||||||
import org.springframework.data.redis.serializer.RedisSerializationContext;
|
import org.springframework.data.redis.serializer.RedisSerializationContext;
|
||||||
import org.springframework.data.redis.serializer.StringRedisSerializer;
|
import org.springframework.data.redis.serializer.StringRedisSerializer;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
import java.time.Duration;
|
import java.time.Duration;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
@ -99,6 +104,12 @@ public class RedisConfig extends CachingConfigurerSupport {
|
|||||||
return template;
|
return template;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Bean(destroyMethod = "shutdown")
|
||||||
|
public RedissonClient redisson() throws IOException {
|
||||||
|
return Redisson.create(
|
||||||
|
Config.fromYAML(new ClassPathResource("redisson.yaml").getInputStream()));
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 自定义缓存key生成策略,默认将使用该策略
|
* 自定义缓存key生成策略,默认将使用该策略
|
||||||
*/
|
*/
|
||||||
|
@ -45,8 +45,7 @@ public class UserContext {
|
|||||||
public static String getUuid() {
|
public static String getUuid() {
|
||||||
if (RequestContextHolder.getRequestAttributes() != null) {
|
if (RequestContextHolder.getRequestAttributes() != null) {
|
||||||
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
|
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
|
||||||
String uuid = request.getHeader(SecurityEnum.UUID.getValue());
|
return request.getHeader(SecurityEnum.UUID.getValue());
|
||||||
return uuid;
|
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
@ -1,15 +1,14 @@
|
|||||||
package cn.lili.modules.member.token;
|
package cn.lili.modules.member.token;
|
||||||
|
|
||||||
|
import cn.lili.common.context.ThreadContextHolder;
|
||||||
|
import cn.lili.common.enums.ClientTypeEnum;
|
||||||
import cn.lili.common.properties.RocketmqCustomProperties;
|
import cn.lili.common.properties.RocketmqCustomProperties;
|
||||||
import cn.lili.common.security.AuthUser;
|
import cn.lili.common.security.AuthUser;
|
||||||
import cn.lili.common.security.enums.UserEnums;
|
import cn.lili.common.security.enums.UserEnums;
|
||||||
import cn.lili.common.security.token.Token;
|
import cn.lili.common.security.token.Token;
|
||||||
import cn.lili.common.security.token.TokenUtil;
|
import cn.lili.common.security.token.TokenUtil;
|
||||||
import cn.lili.common.security.token.base.AbstractTokenGenerate;
|
import cn.lili.common.security.token.base.AbstractTokenGenerate;
|
||||||
import cn.lili.common.context.ThreadContextHolder;
|
|
||||||
import cn.lili.common.enums.ClientTypeEnum;
|
|
||||||
import cn.lili.modules.member.entity.dos.Member;
|
import cn.lili.modules.member.entity.dos.Member;
|
||||||
import cn.lili.modules.member.service.MemberService;
|
|
||||||
import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
|
import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
|
||||||
import cn.lili.rocketmq.tags.MemberTagsEnum;
|
import cn.lili.rocketmq.tags.MemberTagsEnum;
|
||||||
import org.apache.rocketmq.spring.core.RocketMQTemplate;
|
import org.apache.rocketmq.spring.core.RocketMQTemplate;
|
||||||
|
@ -8,7 +8,6 @@ import cn.lili.common.security.token.Token;
|
|||||||
import cn.lili.common.security.token.TokenUtil;
|
import cn.lili.common.security.token.TokenUtil;
|
||||||
import cn.lili.common.security.token.base.AbstractTokenGenerate;
|
import cn.lili.common.security.token.base.AbstractTokenGenerate;
|
||||||
import cn.lili.modules.member.entity.dos.Member;
|
import cn.lili.modules.member.entity.dos.Member;
|
||||||
import cn.lili.modules.member.service.MemberService;
|
|
||||||
import cn.lili.modules.store.entity.dos.Store;
|
import cn.lili.modules.store.entity.dos.Store;
|
||||||
import cn.lili.modules.store.service.StoreService;
|
import cn.lili.modules.store.service.StoreService;
|
||||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||||
@ -31,7 +30,7 @@ public class StoreTokenGenerate extends AbstractTokenGenerate<Member> {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Token createToken(Member member, Boolean longTerm) {
|
public Token createToken(Member member, Boolean longTerm) {
|
||||||
if (!member.getHaveStore()) {
|
if (Boolean.FALSE.equals(member.getHaveStore())) {
|
||||||
throw new ServiceException(ResultCode.STORE_NOT_OPEN);
|
throw new ServiceException(ResultCode.STORE_NOT_OPEN);
|
||||||
}
|
}
|
||||||
LambdaQueryWrapper<Store> queryWrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<Store> queryWrapper = new LambdaQueryWrapper<>();
|
||||||
|
21
manager-api/src/main/resources/redisson.yaml
Normal file
21
manager-api/src/main/resources/redisson.yaml
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
---
|
||||||
|
singleServerConfig:
|
||||||
|
idleConnectionTimeout: 10000
|
||||||
|
connectTimeout: 10000
|
||||||
|
timeout: 3000
|
||||||
|
retryAttempts: 3
|
||||||
|
retryInterval: 1500
|
||||||
|
password: lilishop
|
||||||
|
subscriptionsPerConnection: 5
|
||||||
|
clientName: null
|
||||||
|
address: "redis://pg2481.com:6379"
|
||||||
|
subscriptionConnectionMinimumIdleSize: 1
|
||||||
|
subscriptionConnectionPoolSize: 50
|
||||||
|
connectionMinimumIdleSize: 24
|
||||||
|
connectionPoolSize: 64
|
||||||
|
database: 0
|
||||||
|
dnsMonitoringInterval: 5000
|
||||||
|
threads: 16
|
||||||
|
nettyThreads: 32
|
||||||
|
codec: !<org.redisson.codec.MarshallingCodec> {}
|
||||||
|
transportMode: "NIO"
|
2
pom.xml
2
pom.xml
@ -31,7 +31,7 @@
|
|||||||
<jasypt-version>3.0.4</jasypt-version>
|
<jasypt-version>3.0.4</jasypt-version>
|
||||||
<neetl-version>2.9.10</neetl-version>
|
<neetl-version>2.9.10</neetl-version>
|
||||||
<lombok-version>1.18.22</lombok-version>
|
<lombok-version>1.18.22</lombok-version>
|
||||||
<redisson>3.5.5</redisson>
|
<redisson>3.15.6</redisson>
|
||||||
<aliyun-version>4.5.18</aliyun-version>
|
<aliyun-version>4.5.18</aliyun-version>
|
||||||
<aliyun-sdk-oss-version>3.11.1</aliyun-sdk-oss-version>
|
<aliyun-sdk-oss-version>3.11.1</aliyun-sdk-oss-version>
|
||||||
<aliyun-sdk-dysms-version>2.0.8</aliyun-sdk-dysms-version>
|
<aliyun-sdk-dysms-version>2.0.8</aliyun-sdk-dysms-version>
|
||||||
|
21
seller-api/src/main/resources/redisson.yaml
Normal file
21
seller-api/src/main/resources/redisson.yaml
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
---
|
||||||
|
singleServerConfig:
|
||||||
|
idleConnectionTimeout: 10000
|
||||||
|
connectTimeout: 10000
|
||||||
|
timeout: 3000
|
||||||
|
retryAttempts: 3
|
||||||
|
retryInterval: 1500
|
||||||
|
password: lilishop
|
||||||
|
subscriptionsPerConnection: 5
|
||||||
|
clientName: null
|
||||||
|
address: "redis://pg2481.com:6379"
|
||||||
|
subscriptionConnectionMinimumIdleSize: 1
|
||||||
|
subscriptionConnectionPoolSize: 50
|
||||||
|
connectionMinimumIdleSize: 24
|
||||||
|
connectionPoolSize: 64
|
||||||
|
database: 0
|
||||||
|
dnsMonitoringInterval: 5000
|
||||||
|
threads: 16
|
||||||
|
nettyThreads: 32
|
||||||
|
codec: !<org.redisson.codec.MarshallingCodec> {}
|
||||||
|
transportMode: "NIO"
|
Loading…
x
Reference in New Issue
Block a user