From 055fb8d085efd7e120d69aba6c0fbb8db5867553 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 01 七月 2020 14:37:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java
index 5547825..cc5a520 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoExtraServiceImpl.java
@@ -27,7 +27,6 @@
import com.aliyun.openservices.ons.api.Message;
import com.aliyun.openservices.ons.api.Producer;
-import com.google.gson.Gson;
import com.yeshi.fanli.dao.mybatis.user.UserInfoExtraMapper;
import com.yeshi.fanli.dao.mybatis.user.UserRankRecordMapper;
import com.yeshi.fanli.dto.mq.user.UserTopicTagEnum;
@@ -56,6 +55,7 @@
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.user.msg.UserAccountMsgNotificationService;
import com.yeshi.fanli.service.inter.user.notify.UserActivedRecordService;
+import com.yeshi.fanli.service.manger.msg.RocketMQManager;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.FilePathEnum;
import com.yeshi.fanli.util.InviteCodeFilterUtil;
@@ -108,8 +108,8 @@
@Resource
private UserAccountMsgNotificationService userAccountMsgNotificationService;
- @Resource(name = "producer")
- private Producer producer;
+ @Resource
+ private RocketMQManager rocketMQManager;
@Override
public UserInfoExtraVO getRankInfo(Long uid) throws UserInfoExtraException, Exception {
@@ -589,11 +589,11 @@
userActivedRecordService.add(new UserActivedRecord(uid));
-// if (!Constant.IS_TEST) { // 鍙戦�佹縺娲绘垚鍔熸秷鎭�
+ if (!Constant.IS_TEST) { // 鍙戦�佹縺娲绘垚鍔熸秷鎭�
Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.inviteCodeActive,
new InviteCodeActiveMQMsg(uid, new Date()));
- producer.send(message);
-// }
+ rocketMQManager.sendNormalMsg(message, null);
+ }
return inviteCode;
}
@@ -798,10 +798,6 @@
return inviter;
}
- @Override
- public void updateAutoExtract(Integer days) {
- userInfoExtraMapper.updateAutoExtract(days);
- }
@Transactional(rollbackFor = Exception.class)
@Override
@@ -843,7 +839,7 @@
Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.userInfoUpdate,
new UserInfoUpdateMQMsg(uid, UserInfoUpdateTypeEnum.inviteCode, inviteCodeVip,
new Date()));
- producer.send(message);
+ rocketMQManager.sendNormalMsg(message, null);
}
// 娑堟伅
--
Gitblit v1.8.0