luminghui
/
sdny-jxpt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ariesy 增加redisson集群配置

Browse Source
release
yefei 2 years ago
parent 374a93297e
commit 1812801da7
2 changed files with 243 additions and 141 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 154
      dxhy-core/src/main/java/com/dxhy/core/config/RedissionConfig.java
  2. 18
      dxhy-core/src/main/java/com/dxhy/core/job/service/impl/InvoiceInterfaceServiceImpl.java

154
dxhy-core/src/main/java/com/dxhy/core/config/RedissionConfig.java
Unescape View File

@ -1,33 +1,135 @@
package com.dxhy.core.config;
import org.springframework.context.annotation.Configuration;
import org.apache.commons.lang3.StringUtils;
import org.redisson.Redisson;
import org.redisson.api.RedissonClient;
import org.redisson.config.ClusterServersConfig;
import org.redisson.config.Config;
import org.springframework.beans.factory.annotation.Value;
import org.redisson.config.SentinelServersConfig;
import org.redisson.config.SingleServerConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.data.redis.RedisProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
//@Configuration
//public class RedissionConfig {
//
// @Value("${spring.redis.host}")
// private String host;
//
// @Value("${spring.redis.port}")
// private String port;
//
// @Value("${spring.redis.password}")
// private String redisPassword;
//
// @Bean
// public RedissonClient getRedisson(){
//
// Config config = new Config();
// //单机模式 依次设置redis地址和密码
// config.useSingleServer()
// .setAddress("redis://" + host + ":" + port)
// .setPassword(redisPassword);
// return Redisson.create(config);
// }
//}
//
import java.util.List;
import java.util.Objects;
@Configuration
public class RedissionConfig {
Logger log = LoggerFactory.getLogger(RedissionConfig.class);
//直接使用starter注入的redis配置信息
@Autowired
private RedisProperties redisProperties;
private int timeout = 3000;
private int connectionPoolSize = 64;
private int connectionMinimumIdleSize = 10;
private int pingConnectionInterval = 60000;
private static String ADDRESS_PREFIX = "redis://";
/**
* 单机模式
*/
@Bean
public RedissonClient initBean() {
// 哨兵模式
RedisProperties.Sentinel sentinel = redisProperties.getSentinel();
if (Objects.nonNull(sentinel)) {
log.info("redis is sentinel mode");
return redissonSentinel();
}
// 集群模式
RedisProperties.Cluster cluster = redisProperties.getCluster();
if (Objects.nonNull(cluster)) {
log.info("redis is cluster mode");
return redissonCluster();
}
// 单机模式
String host = redisProperties.getHost();
if (StringUtils.isNotBlank(host)) {
log.info("redis is single mode");
return redissonSingle();
}
log.error("redisson config can not support this redis mode");
return null;
}
/**
* 单机模式
*/
private RedissonClient redissonSingle() {
String host = redisProperties.getHost();
String password = redisProperties.getPassword();
int port = redisProperties.getPort();
// 声明一个配置类
Config config = new Config();
SingleServerConfig serverConfig = config.useSingleServer()
.setAddress(ADDRESS_PREFIX + host + ":" + port)
.setTimeout(timeout)
.setPingConnectionInterval(pingConnectionInterval)
.setConnectionPoolSize(this.connectionPoolSize)
.setConnectionMinimumIdleSize(this.connectionMinimumIdleSize);
// 判断密码
if (!StringUtils.isEmpty(password)) {
serverConfig.setPassword(password);
}
return Redisson.create(config);
}
/**
* 哨兵模式
*/
private RedissonClient redissonSentinel() {
// mymaster
String masterName = redisProperties.getSentinel().getMaster();
// 127.0.0.1:26389,127.0.0.1:26379
List<String> nodes = redisProperties.getSentinel().getNodes();
String password = redisProperties.getPassword();
// 声明一个配置类
Config config = new Config();
SentinelServersConfig sentinelServersConfig = config.useSentinelServers();
// 扫描间隔
sentinelServersConfig.setScanInterval(2000);
// 判断密码
if (!StringUtils.isEmpty(password)) {
sentinelServersConfig.setPassword(password);
}
sentinelServersConfig.setMasterName(masterName);
String[] nodeArr = nodes.toArray(new String[nodes.size()]);
for (int i = 0; i < nodeArr.length; i++) {
nodeArr[i] = ADDRESS_PREFIX + nodeArr[i];
}
// 添加redis节点
sentinelServersConfig.addSentinelAddress(nodeArr);
return Redisson.create(config);
}
/**
* 集群模式
*/
private RedissonClient redissonCluster() {
// 192.168.116.156:1901,192.168.116.156:1902
List<String> nodes = redisProperties.getCluster().getNodes();
String password = redisProperties.getPassword();
// 声明一个配置类
Config config = new Config();
ClusterServersConfig clusterServersConfig = config.useClusterServers();
// 扫描间隔
clusterServersConfig.setScanInterval(2000);
// 判断密码
if (!StringUtils.isEmpty(password)) {
clusterServersConfig.setPassword(password);
}
// 添加redis节点
for (String node : nodes) {
clusterServersConfig.addNodeAddress(ADDRESS_PREFIX + node);
}
return Redisson.create(config);
}
}

18
dxhy-core/src/main/java/com/dxhy/core/job/service/impl/InvoiceInterfaceServiceImpl.java
Unescape View File

@ -78,8 +78,8 @@ public class InvoiceInterfaceServiceImpl implements InvoiceInterfaceService {
@Resource
private StringRedisTemplate stringRedisTemplate;
// @Resource
// private RedissonClient redisson;
@Resource
private RedissonClient redisson;
private static final String REDIS_KEY = "collect_invoice_";
@ -658,8 +658,8 @@ public class InvoiceInterfaceServiceImpl implements InvoiceInterfaceService {
List<InvoiceLog> logList = new ArrayList<>();
for (InvoiceSelectInfo invoiceSelectInfo : invoicesList) {
//加分布式锁
// String lockKey = REDIS_KEY + invoiceSelectInfo.getUuid();
// RLock lock = redisson.getLock(lockKey);
String lockKey = REDIS_KEY + invoiceSelectInfo.getUuid();
RLock lock = redisson.getLock(lockKey);
invoiceSelectInfo.setUuid(invoiceSelectInfo.getInvoiceCode() + invoiceSelectInfo.getInvoiceNo());
if ("1".equals(invoiceSelectInfo.getLegalizeState())) {
//认证处理状态 0-未认证 1-已勾选未确认，2已确认 3 已发送认证 4 认证成功 5 认证失败
@ -668,11 +668,11 @@ public class InvoiceInterfaceServiceImpl implements InvoiceInterfaceService {
invoiceSelectInfo.setAuthStatus("0");
}
try {
// boolean isLock = lock.tryLock();
boolean isLock = lock.tryLock();
// if(!isLock){
// log.info("当前已有线程获取到锁");
// }else {
if(!isLock){
log.info("当前已有线程获取到锁");
}else {
// 判断库里是否已经存在，存在则只更新发票状态，状态更新时间，认证状态以及相关字段更新
DynamicContextHolder.push(db + DbConstant.BUSINESS_READ);
TDxRecordInvoiceJobEntity entity = tDxRecordInvoiceJobDao.findInvoiceByUUid(invoiceSelectInfo.getUuid());
@ -785,7 +785,7 @@ public class InvoiceInterfaceServiceImpl implements InvoiceInterfaceService {
invoiceLog.setCreateDate(new Date());
invoiceLog.setInputName("系统自动");
logList.add(invoiceLog);
// }
}
}catch (Exception e) {
e.printStackTrace();
}

Write Preview
Loading…
Cancel
Save