From 2f5935ed11672046c37f733d855214f6147b4b58 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期一, 28 三月 2022 11:33:19 +0800 Subject: [PATCH] TDMQ兼容 --- fanli/src/main/java/com/yeshi/fanli/util/mq/cmq/PushCMQManager.java | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/util/mq/cmq/PushCMQManager.java b/fanli/src/main/java/com/yeshi/fanli/util/mq/cmq/PushCMQManager.java index 735e565..cb59777 100644 --- a/fanli/src/main/java/com/yeshi/fanli/util/mq/cmq/PushCMQManager.java +++ b/fanli/src/main/java/com/yeshi/fanli/util/mq/cmq/PushCMQManager.java @@ -2,12 +2,8 @@ import com.google.gson.Gson; import com.qcloud.cmq.Message; -import com.yeshi.fanli.dto.money.UserMoneyChangeDTO; import com.yeshi.fanli.dto.push.PushContentDetailDTO; -import com.yeshi.fanli.log.LogHelper; import com.yeshi.fanli.util.Constant; -import com.yeshi.fanli.util.StringUtil; -import com.yeshi.fanli.util.mq.cmq.order.JDOrderCMQManager; import org.yeshi.utils.CMQUtil; import java.util.HashMap; @@ -25,8 +21,10 @@ static { cmqUtil = CMQUtil.getInstance(secretId, secretKey); + TDMQUtil.getInstance().init(secretId, secretKey, Constant.TDMQ_PUBLIC); + PUSH_HW += "-" + Constant.systemCommonConfig.getProjectName(); - cmqUtil.createQueue(PUSH_HW); + TDMQUtil.getInstance().createQueue(PUSH_HW); } public static PushCMQManager getInstance() { @@ -42,7 +40,7 @@ if (dto == null) return; String json = new Gson().toJson(dto); - cmqUtil.sendMsg(PUSH_HW, json); + TDMQUtil.getInstance().sendMsg(PUSH_HW, json); } /** @@ -52,7 +50,7 @@ * @return */ public Map<String, PushContentDetailDTO> consumeHWPush(int count) { - List<Message> list = cmqUtil.recieveMsg(count, PUSH_HW); + List<Message> list = Constant.TDMQ_CONSUMER ? TDMQUtil.getInstance().recieveMsg(count, PUSH_HW) : cmqUtil.recieveMsg(count, PUSH_HW); Map<String, PushContentDetailDTO> map = new HashMap<>(); if (list != null) for (Message msg : list) { @@ -69,6 +67,10 @@ * @param receiptHandle */ public void deleteHWPush(String receiptHandle) { - cmqUtil.deleteMsg(PUSH_HW, receiptHandle); + if (Constant.TDMQ_CONSUMER) { + TDMQUtil.getInstance().deleteMsg(PUSH_HW, receiptHandle); + } else { + cmqUtil.deleteMsg(PUSH_HW, receiptHandle); + } } } -- Gitblit v1.8.0