From aa66729ef758105dc1ced739ffe88e253affc37a Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 16 七月 2019 15:49:28 +0800
Subject: [PATCH] Merge branch 'master-bug'
---
fanli/src/main/java/com/yeshi/fanli/aspect/ActiveUserAspect.java | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 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 2dd362a..6167436 100644
--- a/fanli/src/main/java/com/yeshi/fanli/aspect/ActiveUserAspect.java
+++ b/fanli/src/main/java/com/yeshi/fanli/aspect/ActiveUserAspect.java
@@ -13,6 +13,7 @@
import org.springframework.web.context.request.ServletRequestAttributes;
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
+import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.RedisManager;
/**
@@ -38,43 +39,45 @@
public static final String EDP = "execution(* com.yeshi.fanli.controller.client.*.*(..))";
-// @Around(EDP)
+ @Around(EDP)
public Object activeAround(ProceedingJoinPoint joinPoint) throws Throwable {
+ Long uid = null;
+
ServletRequestAttributes servletContainer = (ServletRequestAttributes) RequestContextHolder
.getRequestAttributes();
+ HttpServletRequest request = servletContainer.getRequest();
- Object[] args = joinPoint.getArgs();
-
- Long uid = null;
- HttpServletRequest request = servletContainer.getRequest();
String str_uid = request.getParameter("uid");
if (str_uid != null && str_uid.trim().length() > 0) {
uid = Long.parseLong(str_uid);
}
- System.out.println("uid: "+ uid);
final Long uuid = uid;
executor.execute(new Runnable() {
@Override
public void run() {
+
if (uuid == null) {
return;
}
- // 鎺ユ敹鍒�
- try {
- userSystemCouponService.receivedCoupon(uuid);
- } catch (Exception e) {
- e.printStackTrace();
+ if (Constant.IS_OUTNET) {
+ String key = "activeUid_" + uuid;
+ // 缂撳瓨涓槸鍚﹀瓨鍦╱id
+ String cacheValue = redisManager.getCommonString(key);
+ if (cacheValue != null && cacheValue.trim().length() > 0) {
+ return;
+ }
+ // 鍔犲叆缂撳瓨 20鍒嗛挓
+ redisManager.cacheCommonString(key, uuid.toString(), 60 * 20);
}
}
});
- return joinPoint.proceed(args);
+ return joinPoint.proceed(joinPoint.getArgs());
}
-
}
--
Gitblit v1.8.0