记得上下班打卡 | git大法好，push需谨慎

Skip to content

L
liquidnet-bus-v1
Commit e6f6b6d4 authored by 张国柄's avatar 张国柄
Browse files
Options

~config:consumer-order.redis;

parent a10da690
Show whitespace changes
Inline Side-by-side
Showing with 38 additions and 43 deletions
liquidnet-bus-config/liquidnet-config/liquidnet-service-consumer-order.yml
View file @ e6f6b6d4
......@@ -58,17 +58,7 @@ spring:
profiles:
include: common-service #这里加载management相关公共配置
redis:
queue:
database: ${liquidnet.redis.queue.database}
port: ${liquidnet.redis.queue.port}
host: ${liquidnet.redis.queue.host}
password: ${liquidnet.redis.queue.password}
lettuce:
pool:
max-active: 8
max-wait: -1
max-idle: 8
min-idle: 0
kylin:
database: ${liquidnet.redis.kylin.database}
dbs: ${liquidnet.redis.kylin.dbs}
port: ${liquidnet.redis.kylin.port}
......@@ -76,10 +66,20 @@ spring:
password: ${liquidnet.redis.kylin.password}
lettuce:
pool:
max-active: 20
max-active: 8
max-wait: -1
max-idle: 8
min-idle: 0
database: ${liquidnet.redis.queue.database}
port: ${liquidnet.redis.queue.port}
host: ${liquidnet.redis.queue.host}
password: ${liquidnet.redis.queue.password}
lettuce:
pool:
max-active: 60
max-wait: -1
max-idle: 50
min-idle: 0
data:
mongodb:
uri: mongodb://${liquidnet.mongodb.user}:${liquidnet.mongodb.pwd}@${liquidnet.mongodb.host}/?authSource=admin&maxPoolSize=200&waitQueueMultiple=100
......
liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-order/src/main/java/com/liquidnet/service/consumer/order/config/ConsumerOrderCloseRedisStreamConfig.java
View file @ e6f6b6d4
package com.liquidnet.service.consumer.order.config;
import com.liquidnet.common.cache.redis.config.RedisStreamConfig;
import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
import com.liquidnet.service.base.constant.MQConst;
import com.liquidnet.service.consumer.order.receiver.*;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -21,10 +20,8 @@ import java.util.List;
@Configuration
public class ConsumerOrderCloseRedisStreamConfig extends RedisStreamConfig {
// @Autowired
// StringRedisTemplate stringRedisTemplate;
@Autowired
RedisDataSourceUtil redisDataSourceUtil;
StringRedisTemplate stringRedisTemplate;
@Autowired
ConsumerOrderClose0RdsReceiver consumerOrderClose0RdsReceiver;
@Autowired
......@@ -50,7 +47,7 @@ public class ConsumerOrderCloseRedisStreamConfig extends RedisStreamConfig {
public List<Subscription> subscriptionBizOrderClose0(RedisConnectionFactory factory) {
List<Subscription> subscriptionList = new ArrayList<>();
MQConst.GoblinQueue stream = MQConst.GoblinQueue.GOBLIN_UN_PAY_0;
this.initStream(redisDataSourceUtil.getRedisQueueUtil().getStringRedisTemplate(), stream.getKey(), stream.getGroup());
this.initStream(stringRedisTemplate, stream.getKey(), stream.getGroup());
for (int i = 0; i < 5; i++) {
StreamMessageListenerContainer<String, MapRecord<String, String, String>> listenerContainer = this.buildStreamMessageListenerContainer(factory);
subscriptionList.add(listenerContainer.receiveAutoAck(
......@@ -66,7 +63,7 @@ public class ConsumerOrderCloseRedisStreamConfig extends RedisStreamConfig {
public List<Subscription> subscriptionBizOrderClose1(RedisConnectionFactory factory) {
List<Subscription> subscriptionList = new ArrayList<>();
MQConst.GoblinQueue stream = MQConst.GoblinQueue.GOBLIN_UN_PAY_1;
this.initStream(redisDataSourceUtil.getRedisQueueUtil().getStringRedisTemplate(), stream.getKey(), stream.getGroup());
this.initStream(stringRedisTemplate, stream.getKey(), stream.getGroup());
for (int i = 0; i < 5; i++) {
StreamMessageListenerContainer<String, MapRecord<String, String, String>> listenerContainer = this.buildStreamMessageListenerContainer(factory);
subscriptionList.add(listenerContainer.receiveAutoAck(
......@@ -82,7 +79,7 @@ public class ConsumerOrderCloseRedisStreamConfig extends RedisStreamConfig {
public List<Subscription> subscriptionBizOrderClose2(RedisConnectionFactory factory) {
List<Subscription> subscriptionList = new ArrayList<>();
MQConst.GoblinQueue stream = MQConst.GoblinQueue.GOBLIN_UN_PAY_2;
this.initStream(redisDataSourceUtil.getRedisQueueUtil().getStringRedisTemplate(), stream.getKey(), stream.getGroup());
this.initStream(stringRedisTemplate, stream.getKey(), stream.getGroup());
for (int i = 0; i < 5; i++) {
StreamMessageListenerContainer<String, MapRecord<String, String, String>> listenerContainer = this.buildStreamMessageListenerContainer(factory);
subscriptionList.add(listenerContainer.receiveAutoAck(
......@@ -98,7 +95,7 @@ public class ConsumerOrderCloseRedisStreamConfig extends RedisStreamConfig {
public List<Subscription> subscriptionBizOrderClose3(RedisConnectionFactory factory) {
List<Subscription> subscriptionList = new ArrayList<>();
MQConst.GoblinQueue stream = MQConst.GoblinQueue.GOBLIN_UN_PAY_3;
this.initStream(redisDataSourceUtil.getRedisQueueUtil().getStringRedisTemplate(), stream.getKey(), stream.getGroup());
this.initStream(stringRedisTemplate, stream.getKey(), stream.getGroup());
for (int i = 0; i < 5; i++) {
StreamMessageListenerContainer<String, MapRecord<String, String, String>> listenerContainer = this.buildStreamMessageListenerContainer(factory);
subscriptionList.add(listenerContainer.receiveAutoAck(
......@@ -114,7 +111,7 @@ public class ConsumerOrderCloseRedisStreamConfig extends RedisStreamConfig {
public List<Subscription> subscriptionBizOrderClose4(RedisConnectionFactory factory) {
List<Subscription> subscriptionList = new ArrayList<>();
MQConst.GoblinQueue stream = MQConst.GoblinQueue.GOBLIN_UN_PAY_4;
this.initStream(redisDataSourceUtil.getRedisQueueUtil().getStringRedisTemplate(), stream.getKey(), stream.getGroup());
this.initStream(stringRedisTemplate, stream.getKey(), stream.getGroup());
for (int i = 0; i < 5; i++) {
StreamMessageListenerContainer<String, MapRecord<String, String, String>> listenerContainer = this.buildStreamMessageListenerContainer(factory);
subscriptionList.add(listenerContainer.receiveAutoAck(
......@@ -130,7 +127,7 @@ public class ConsumerOrderCloseRedisStreamConfig extends RedisStreamConfig {
public List<Subscription> subscriptionBizOrderClose5(RedisConnectionFactory factory) {
List<Subscription> subscriptionList = new ArrayList<>();
MQConst.GoblinQueue stream = MQConst.GoblinQueue.GOBLIN_UN_PAY_5;
this.initStream(redisDataSourceUtil.getRedisQueueUtil().getStringRedisTemplate(), stream.getKey(), stream.getGroup());
this.initStream(stringRedisTemplate, stream.getKey(), stream.getGroup());
for (int i = 0; i < 5; i++) {
StreamMessageListenerContainer<String, MapRecord<String, String, String>> listenerContainer = this.buildStreamMessageListenerContainer(factory);
subscriptionList.add(listenerContainer.receiveAutoAck(
......@@ -146,7 +143,7 @@ public class ConsumerOrderCloseRedisStreamConfig extends RedisStreamConfig {
public List<Subscription> subscriptionBizOrderClose6(RedisConnectionFactory factory) {
List<Subscription> subscriptionList = new ArrayList<>();
MQConst.GoblinQueue stream = MQConst.GoblinQueue.GOBLIN_UN_PAY_6;
this.initStream(redisDataSourceUtil.getRedisQueueUtil().getStringRedisTemplate(), stream.getKey(), stream.getGroup());
this.initStream(stringRedisTemplate, stream.getKey(), stream.getGroup());
for (int i = 0; i < 5; i++) {
StreamMessageListenerContainer<String, MapRecord<String, String, String>> listenerContainer = this.buildStreamMessageListenerContainer(factory);
subscriptionList.add(listenerContainer.receiveAutoAck(
......@@ -162,7 +159,7 @@ public class ConsumerOrderCloseRedisStreamConfig extends RedisStreamConfig {
public List<Subscription> subscriptionBizOrderClose7(RedisConnectionFactory factory) {
List<Subscription> subscriptionList = new ArrayList<>();
MQConst.GoblinQueue stream = MQConst.GoblinQueue.GOBLIN_UN_PAY_7;
this.initStream(redisDataSourceUtil.getRedisQueueUtil().getStringRedisTemplate(), stream.getKey(), stream.getGroup());
this.initStream(stringRedisTemplate, stream.getKey(), stream.getGroup());
for (int i = 0; i < 5; i++) {
StreamMessageListenerContainer<String, MapRecord<String, String, String>> listenerContainer = this.buildStreamMessageListenerContainer(factory);
subscriptionList.add(listenerContainer.receiveAutoAck(
......@@ -178,7 +175,7 @@ public class ConsumerOrderCloseRedisStreamConfig extends RedisStreamConfig {
public List<Subscription> subscriptionBizOrderClose8(RedisConnectionFactory factory) {
List<Subscription> subscriptionList = new ArrayList<>();
MQConst.GoblinQueue stream = MQConst.GoblinQueue.GOBLIN_UN_PAY_8;
this.initStream(redisDataSourceUtil.getRedisQueueUtil().getStringRedisTemplate(), stream.getKey(), stream.getGroup());
this.initStream(stringRedisTemplate, stream.getKey(), stream.getGroup());
for (int i = 0; i < 5; i++) {
StreamMessageListenerContainer<String, MapRecord<String, String, String>> listenerContainer = this.buildStreamMessageListenerContainer(factory);
subscriptionList.add(listenerContainer.receiveAutoAck(
......@@ -194,7 +191,7 @@ public class ConsumerOrderCloseRedisStreamConfig extends RedisStreamConfig {
public List<Subscription> subscriptionBizOrderClose9(RedisConnectionFactory factory) {
List<Subscription> subscriptionList = new ArrayList<>();
MQConst.GoblinQueue stream = MQConst.GoblinQueue.GOBLIN_UN_PAY_9;
this.initStream(redisDataSourceUtil.getRedisQueueUtil().getStringRedisTemplate(), stream.getKey(), stream.getGroup());
this.initStream(stringRedisTemplate, stream.getKey(), stream.getGroup());
for (int i = 0; i < 5; i++) {
StreamMessageListenerContainer<String, MapRecord<String, String, String>> listenerContainer = this.buildStreamMessageListenerContainer(factory);
subscriptionList.add(listenerContainer.receiveAutoAck(
......
liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-order/src/main/java/com/liquidnet/service/consumer/order/receiver/AbstractOrderCloseReceiver.java
View file @ e6f6b6d4
......@@ -3,7 +3,6 @@ package com.liquidnet.service.consumer.order.receiver;
import com.alibaba.fastjson.JSON;
import com.fasterxml.jackson.core.type.TypeReference;
import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
import com.liquidnet.common.cache.redis.util.RedisUtil;
import com.liquidnet.commons.lang.util.CollectionUtil;
import com.liquidnet.commons.lang.util.DateUtil;
import com.liquidnet.commons.lang.util.HttpUtil;
......@@ -45,12 +44,12 @@ import java.util.*;
@Slf4j
public abstract class AbstractOrderCloseReceiver implements StreamListener<String, MapRecord<String, String, String>> {
// @Autowired
// StringRedisTemplate stringRedisTemplate;
@Autowired
RedisDataSourceUtil redisDataSourceUtil;
StringRedisTemplate stringRedisTemplate;
@Autowired
private RedisUtil redisUtil;
RedisDataSourceUtil redisDataSourceUtil;
// @Autowired
// private RedisUtil redisUtil;
@Autowired
private KylinOrderUtils kylinOrderUtils;
@Autowired
......@@ -69,7 +68,6 @@ public abstract class AbstractOrderCloseReceiver implements StreamListener<Strin
boolean result = this.consumerMessageHandler(message.getValue());
log.info("CONSUMER MSG RESULT:{} ==> [{}]MESSAGE_ID:{}", result, redisStreamKey, message.getId());
StringRedisTemplate stringRedisTemplate = redisDataSourceUtil.getRedisQueueUtil().getStringRedisTemplate();
try {
stringRedisTemplate.opsForStream().acknowledge(getRedisStreamGroup(), message);
} catch (Exception e) {
......@@ -111,7 +109,7 @@ public abstract class AbstractOrderCloseReceiver implements StreamListener<Strin
} catch (Exception e) {
String redisStreamKey = this.getRedisStreamKey();
log.error("CONSUMER MSG EX_HANDLE ==> [{}]:{}", redisStreamKey, messageMap, e);
redisDataSourceUtil.getRedisQueueUtil().getStringRedisTemplate().opsForStream().add(StreamRecords.mapBacked(messageMap).withStreamKey(redisStreamKey));
stringRedisTemplate.opsForStream().add(StreamRecords.mapBacked(messageMap).withStreamKey(redisStreamKey));
return false;
}
}
......@@ -320,7 +318,7 @@ public abstract class AbstractOrderCloseReceiver implements StreamListener<Strin
public String[] getMasterCode(String masterCode) {
String redisKey = GoblinRedisConst.REDIS_GOBLIN_ORDER_MASTER.concat(masterCode);
Object obj = redisUtil.get(redisKey);
Object obj = redisDataSourceUtil.getRedisKylinUtil().get(redisKey);
if (obj == null) {
return null;
} else {
......@@ -331,7 +329,7 @@ public abstract class AbstractOrderCloseReceiver implements StreamListener<Strin
// 获取 订单相关vo
public GoblinStoreOrderVo getGoblinOrder(String orderId) {
String redisKey = GoblinRedisConst.REDIS_GOBLIN_ORDER.concat(orderId);
Object obj = redisUtil.get(redisKey);
Object obj = redisDataSourceUtil.getRedisKylinUtil().get(redisKey);
if (obj == null) {
return null;
} else {
......@@ -342,7 +340,7 @@ public abstract class AbstractOrderCloseReceiver implements StreamListener<Strin
// 获取 订单相关Skuvo
public GoblinOrderSkuVo getGoblinOrderSkuVo(String orderSkuId) {
String redisKey = GoblinRedisConst.REDIS_GOBLIN_ORDER_SKU.concat(orderSkuId);
Object obj = redisUtil.get(redisKey);
Object obj = redisDataSourceUtil.getRedisKylinUtil().get(redisKey);
if (obj == null) {
return null;
} else {
......@@ -353,7 +351,7 @@ public abstract class AbstractOrderCloseReceiver implements StreamListener<Strin
// 赋值 订单相关Skuvo
public void setGoblinOrderSku(String orderSkuId, GoblinOrderSkuVo vo) {
String redisKey = GoblinRedisConst.REDIS_GOBLIN_ORDER_SKU.concat(orderSkuId);
redisUtil.set(redisKey, vo);
redisDataSourceUtil.getRedisKylinUtil().set(redisKey, vo);
}
public int incrSkuStock(String marketPre, String skuId, Integer stock) {
......@@ -362,25 +360,25 @@ public abstract class AbstractOrderCloseReceiver implements StreamListener<Strin
rk = rk.concat(marketPre + ":");
}
rk = rk.concat(skuId);
return (int) redisUtil.incr(rk, stock);
return (int) redisDataSourceUtil.getRedisKylinUtil().incr(rk, stock);
}
// 减少 用户sku购买个数
public int decrSkuCountByUid(String uid, String skuId, int number) {
String redisKey = GoblinRedisConst.REDIS_GOBLIN_BUY_COUNT.concat(uid + ":skuId:" + skuId);
return (int) redisUtil.decr(redisKey, number);
return (int) redisDataSourceUtil.getRedisKylinUtil().decr(redisKey, number);
}
// 赋值 订单相关vo
public void setGoblinOrder(String orderId, GoblinStoreOrderVo vo) {
String redisKey = GoblinRedisConst.REDIS_GOBLIN_ORDER.concat(orderId);
redisUtil.set(redisKey, vo);
redisDataSourceUtil.getRedisKylinUtil().set(redisKey, vo);
}
public void sendMsgByRedis(String streamKey, String jsonMsg) {
HashMap<String, String> map = CollectionUtil.mapStringString();
map.put("message", jsonMsg);
redisDataSourceUtil.getRedisQueueUtil().getStringRedisTemplate().opsForStream().add(StreamRecords.mapBacked(map).withStreamKey(streamKey));
stringRedisTemplate.opsForStream().add(StreamRecords.mapBacked(map).withStreamKey(streamKey));
}
public Boolean backStoreCoupon(BackCouponParam params) {
......@@ -425,7 +423,7 @@ public abstract class AbstractOrderCloseReceiver implements StreamListener<Strin
public List<GoblinUserCouponVo> getUserCouponVos(String uid) {
String rk = GoblinRedisConst.USER_COUPON.concat(uid);
String valStr = (String) redisUtil.get(rk);
String valStr = (String) redisDataSourceUtil.getRedisKylinUtil().get(rk);
List<GoblinUserCouponVo> vos;
if (org.springframework.util.StringUtils.isEmpty(valStr)) {
return getGoblinUserCouponVo();
......@@ -444,7 +442,7 @@ public abstract class AbstractOrderCloseReceiver implements StreamListener<Strin
}
public boolean setUserCouponVos(String uid, List<GoblinUserCouponVo> vos) {
return redisUtil.set(GoblinRedisConst.USER_COUPON.concat(uid), JsonUtils.toJson(vos));
return redisDataSourceUtil.getRedisKylinUtil().set(GoblinRedisConst.USER_COUPON.concat(uid), JsonUtils.toJson(vos));
}
private static final BasicDBObject basicDBObject = new BasicDBObject();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment