From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/aspect/ActiveUserAspect.java | 147 ++++++++++++++++++++++++++----------------------
1 files changed, 79 insertions(+), 68 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 08f1d3e..fc389d2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/aspect/ActiveUserAspect.java
+++ b/fanli/src/main/java/com/yeshi/fanli/aspect/ActiveUserAspect.java
@@ -1,24 +1,34 @@
package com.yeshi.fanli.aspect;
-import java.io.IOException;
+import java.lang.reflect.Method;
import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.Signature;
import org.aspectj.lang.annotation.Aspect;
-import org.springframework.core.annotation.Order;
+import org.aspectj.lang.annotation.Before;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.core.DefaultParameterNameDiscoverer;
+import org.springframework.expression.EvaluationContext;
+import org.springframework.expression.Expression;
+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.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
+import org.yeshi.utils.NumberUtil;
-import com.yeshi.fanli.entity.accept.AcceptData;
-import com.yeshi.fanli.log.LogHelper;
-import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
-import com.yeshi.fanli.util.Constant;
-import com.yeshi.fanli.util.RedisManager;
+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;
/**
* 娲昏穬鐢ㄦ埛澶勭悊
@@ -26,77 +36,78 @@
* @author Administrator
*
*/
-//@Component
-//@Aspect
-//@Order(6)
+@Component
+@Aspect
public class ActiveUserAspect {
+ @Resource
+ private JedisPool jedisPool;
@Resource
- private RedisManager redisManager;
+ private UserInfoModifyRecordService userInfoModifyRecordService;
@Resource
- private UserSystemCouponService userSystemCouponService;
+ private UserInfoExtraService userInfoExtraService;
- public static final String EDP = "execution(* com.yeshi.fanli.controller.client.*.*(..))";
+ @Resource
+ private IntegralGetService integralGetService;
- @Around(EDP)
- public Object activeAround(ProceedingJoinPoint joinPoint) throws Throwable {
+ private ExpressionParser parser = new SpelExpressionParser();
+ private DefaultParameterNameDiscoverer nameDiscoverer = new DefaultParameterNameDiscoverer();
+
+ public String generateKeyBySpEL(String spELString, JoinPoint joinPoint) {
+ MethodSignature methodSignature = (MethodSignature) joinPoint.getSignature();
+ String[] paramNames = nameDiscoverer.getParameterNames(methodSignature.getMethod());
+ Expression expression = parser.parseExpression(spELString);
+ EvaluationContext context = new StandardEvaluationContext();
Object[] args = joinPoint.getArgs();
- if (!Constant.IS_OUTNET) {
- return joinPoint.proceed(args); // 澶栫綉鐜
+ for (int i = 0; i < args.length; i++) {
+ context.setVariable(paramNames[i], args[i]);
}
+ return expression.getValue(context).toString();
+ }
+ public static final String EDP = "execution(* com.yeshi.fanli.controller.client.*.*.*(..))";
+
+ @Before(EDP)
+ public void activeBefore(JoinPoint joinPoint) {
try {
-
- System.out.println("----------娲昏穬楠岃瘉---------------");
-
- ServletRequestAttributes servletContainer = (ServletRequestAttributes) RequestContextHolder
- .getRequestAttributes();
-
- HttpServletRequest request = servletContainer.getRequest();
-
- String strUid = request.getParameter("uid");
- if (strUid == null || strUid.trim().length() == 0) {
- return joinPoint.proceed(args);
- }
-
- Long uid = Long.parseLong(strUid);
-
- String key = "activeUid_" + uid;
-
- String cacheValue = redisManager.getCommonString(key);
- if (cacheValue != null && cacheValue.trim().length() > 0) {
- return joinPoint.proceed(args);
- }
-
- // 鍔犲叆缂撳瓨
- redisManager.cacheCommonString("activeUid_" + uid, strUid, 60);
-
- AcceptData acceptData = null;
- for (Object argsobj : args) {
- if (argsobj instanceof AcceptData) {
- acceptData = (AcceptData) argsobj;
+ Signature signature = joinPoint.getSignature();
+ MethodSignature methodSignature = (MethodSignature) signature;
+ Method targetMethod = methodSignature.getMethod();
+ Method realMethod = joinPoint.getTarget().getClass().getDeclaredMethod(joinPoint.getSignature().getName(),
+ targetMethod.getParameterTypes());
+ if (realMethod.isAnnotationPresent(UserActive.class)) {
+ UserActive rs = realMethod.getAnnotation(UserActive.class);
+ String uidStr = generateKeyBySpEL(rs.uid(), joinPoint);
+ if (!StringUtil.isNullOrEmpty(uidStr) && NumberUtil.isNumeric(uidStr)) {
+ ThreadUtil.run(new Runnable() {
+ @Override
+ public void run() {
+ String key = "useractive-" + uidStr;
+ Jedis jedis = jedisPool.getResource();
+ try {
+ 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 {
+ jedis.close();
+ }
+ }
+ });
}
}
-
- if (acceptData == null) {
- return joinPoint.proceed(args);
- }
-
- int platformType = 0;
- String platform = acceptData.getPlatform();
- if ("android".equals(platform)) {
- platformType = 1;
- } else if ("ios".equals(platform)) {
- platformType = 2;
- }
- userSystemCouponService.copyLotteryPrize(uid, platformType, acceptData.getDevice());
} catch (Exception e) {
- e.printStackTrace();
- }
-
- return joinPoint.proceed(args);
+
+ }
}
}
--
Gitblit v1.8.0