From 8f84f110e635237eace24f0077e9ab8f6b53d480 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期日, 26 四月 2020 17:33:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/aspect/ActiveUserAspect.java | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/aspect/ActiveUserAspect.java b/fanli/src/main/java/com/yeshi/fanli/aspect/ActiveUserAspect.java
index fc389d2..7f629e9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/aspect/ActiveUserAspect.java
+++ b/fanli/src/main/java/com/yeshi/fanli/aspect/ActiveUserAspect.java
@@ -1,6 +1,7 @@
package com.yeshi.fanli.aspect;
import java.lang.reflect.Method;
+import java.util.Date;
import javax.annotation.Resource;
@@ -18,13 +19,19 @@
import org.springframework.stereotype.Component;
import org.yeshi.utils.NumberUtil;
-import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
+import com.aliyun.openservices.ons.api.Message;
+import com.aliyun.openservices.ons.api.Producer;
+import com.yeshi.fanli.dto.mq.user.UserTopicTagEnum;
+import com.yeshi.fanli.dto.mq.user.body.UserActiveMQMsg;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoModifyRecordService;
import com.yeshi.fanli.service.inter.user.integral.IntegralGetService;
+import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.ThreadUtil;
import com.yeshi.fanli.util.annotation.UserActive;
+import com.yeshi.fanli.util.rocketmq.MQMsgBodyFactory;
+import com.yeshi.fanli.util.rocketmq.MQTopicName;
import redis.clients.jedis.Jedis;
import redis.clients.jedis.JedisPool;
@@ -50,6 +57,10 @@
@Resource
private IntegralGetService integralGetService;
+
+ @Resource(name = "producer")
+ private Producer producer;
+
private ExpressionParser parser = new SpelExpressionParser();
@@ -87,15 +98,16 @@
String key = "useractive-" + uidStr;
Jedis jedis = jedisPool.getResource();
try {
- if (!StringUtil.isNullOrEmpty(jedis.set(key, "1", new SetParams().nx().ex(300)))) {
+ if (!StringUtil.isNullOrEmpty(jedis.set(key, "1", new SetParams().nx().ex(Constant.IS_TEST?10:300)))) {
try {
- // TODO 鐢ㄦ埛娲昏穬澶勭悊
Long uid = Long.parseLong(uidStr);
- userInfoModifyRecordService.syncBeforeInfo(uid);
- UserInfoExtra extra = userInfoExtraService.getUserInfoExtra(uid);
- if (extra != null && !StringUtil.isNullOrEmpty(extra.getInviteCode()))
- integralGetService.addInviteActivate(uid);
+// if (!Constant.IS_TEST) { // 娲昏穬閫氱煡
+ UserActiveMQMsg msg = new UserActiveMQMsg(uid, new Date());
+ Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.userActve, msg);
+ producer.send(message);
+// }
} catch (Exception e) {
+
}
}
} finally {
--
Gitblit v1.8.0