From f4a0f2acc63d7785eab108419a4e16f5f688cb95 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 18 一月 2020 12:06:27 +0800
Subject: [PATCH] 用户注册信息
---
fanli/src/main/java/com/yeshi/fanli/aspect/ActiveUserAspect.java | 40 ++++++++++++++++++++++++++++------------
1 files changed, 28 insertions(+), 12 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 660e2f9..fc389d2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/aspect/ActiveUserAspect.java
+++ b/fanli/src/main/java/com/yeshi/fanli/aspect/ActiveUserAspect.java
@@ -4,8 +4,9 @@
import javax.annotation.Resource;
-import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.Signature;
+import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Before;
import org.aspectj.lang.reflect.MethodSignature;
import org.springframework.core.DefaultParameterNameDiscoverer;
@@ -14,14 +15,20 @@
import org.springframework.expression.ExpressionParser;
import org.springframework.expression.spel.standard.SpelExpressionParser;
import org.springframework.expression.spel.support.StandardEvaluationContext;
+import org.springframework.stereotype.Component;
import org.yeshi.utils.NumberUtil;
+import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
+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.StringUtil;
import com.yeshi.fanli.util.ThreadUtil;
import com.yeshi.fanli.util.annotation.UserActive;
import redis.clients.jedis.Jedis;
import redis.clients.jedis.JedisPool;
+import redis.clients.jedis.params.SetParams;
/**
* 娲昏穬鐢ㄦ埛澶勭悊
@@ -29,19 +36,26 @@
* @author Administrator
*
*/
-// @Component
-// @Aspect
-// @Order(6)
+@Component
+@Aspect
public class ActiveUserAspect {
-
@Resource
private JedisPool jedisPool;
+
+ @Resource
+ private UserInfoModifyRecordService userInfoModifyRecordService;
+
+ @Resource
+ private UserInfoExtraService userInfoExtraService;
+
+ @Resource
+ private IntegralGetService integralGetService;
private ExpressionParser parser = new SpelExpressionParser();
private DefaultParameterNameDiscoverer nameDiscoverer = new DefaultParameterNameDiscoverer();
- public String generateKeyBySpEL(String spELString, ProceedingJoinPoint joinPoint) {
+ public String generateKeyBySpEL(String spELString, JoinPoint joinPoint) {
MethodSignature methodSignature = (MethodSignature) joinPoint.getSignature();
String[] paramNames = nameDiscoverer.getParameterNames(methodSignature.getMethod());
Expression expression = parser.parseExpression(spELString);
@@ -56,7 +70,7 @@
public static final String EDP = "execution(* com.yeshi.fanli.controller.client.*.*.*(..))";
@Before(EDP)
- public void activeBefore(ProceedingJoinPoint joinPoint) {
+ public void activeBefore(JoinPoint joinPoint) {
try {
Signature signature = joinPoint.getSignature();
MethodSignature methodSignature = (MethodSignature) signature;
@@ -73,17 +87,19 @@
String key = "useractive-" + uidStr;
Jedis jedis = jedisPool.getResource();
try {
-
- if (jedis.setnx(key, "1") > 0) {
- jedis.expire(key, 60);// 60s鍐呬笉澶勭悊
+ if (!StringUtil.isNullOrEmpty(jedis.set(key, "1", new SetParams().nx().ex(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);
} catch (Exception e) {
}
}
} finally {
- jedisPool.returnResource(jedis);
+ jedis.close();
}
}
});
--
Gitblit v1.8.0