From 24a8d17e007545f7426c48352109aa1a9c6587ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 06 五月 2020 12:02:09 +0800
Subject: [PATCH] IOS上线隐藏我的界面的banner与超级会员升级信息
---
fanli/src/main/java/com/yeshi/fanli/aspect/RequestSerializableAspect.java | 29 ++++++++---------------------
1 files changed, 8 insertions(+), 21 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/aspect/RequestSerializableAspect.java b/fanli/src/main/java/com/yeshi/fanli/aspect/RequestSerializableAspect.java
index 5e711b6..ca188f2 100644
--- a/fanli/src/main/java/com/yeshi/fanli/aspect/RequestSerializableAspect.java
+++ b/fanli/src/main/java/com/yeshi/fanli/aspect/RequestSerializableAspect.java
@@ -1,6 +1,5 @@
package com.yeshi.fanli.aspect;
-import java.io.IOException;
import java.io.PrintWriter;
import java.lang.reflect.Method;
import java.util.HashMap;
@@ -63,7 +62,7 @@
}
@Around("execution(public * com.yeshi.fanli.controller.client.*.*.*(..))")
- public Object requestSerializable(ProceedingJoinPoint joinPoint) throws IOException {
+ public Object requestSerializable(ProceedingJoinPoint joinPoint) throws Throwable {
Signature signature = joinPoint.getSignature();
MethodSignature methodSignature = (MethodSignature) signature;
Method targetMethod = methodSignature.getMethod();
@@ -97,20 +96,16 @@
cacheKey = "rs-" + StringUtil.Md5(cacheKey);
// jiedis鍘熷瓙鎬у仛鎷︽埅
Jedis jedis = jedisPool.getResource();
- long threadId= Thread.currentThread().getId();
- LogHelper.test("杩涘叆鎷︽埅:"+cacheKey+"-"+threadId);
+ long threadId = Thread.currentThread().getId();
try {
Constant.waitingThreadSet.add(threadId);
String result = null;
long startTime = System.currentTimeMillis();
// 绛夊緟鍝嶅簲
while (StringUtil.isNullOrEmpty(result)) {
-
+
result = jedis.set(cacheKey, "1", new SetParams().nx().ex(30));
- LogHelper.error("瑙﹀彂骞跺彂閿�:" + cacheAlias);
- LogHelper.error("redis閿�:" + cacheKey);
if (StringUtil.isNullOrEmpty(result)) {
- LogHelper.test("绛夊緟:"+threadId);
try {
Thread.sleep(50);
} catch (InterruptedException e) {
@@ -122,7 +117,6 @@
return null;
}
} else {
- LogHelper.test("鑾峰彇鍒伴攣:"+threadId);
break;
}
}
@@ -130,14 +124,9 @@
if (!StringUtil.isNullOrEmpty(result)) {
try {
return joinPoint.proceed();
- } catch (Throwable e) {
- e.printStackTrace();
- LogHelper.errorDetailInfo(e);
} finally {
- LogHelper.test("鏂规硶鎵ц瀹屾瘯:"+threadId);
jedis.del(cacheKey);
Constant.waitingThreadSet.remove(Thread.currentThread().getId());
- LogHelper.test("閲婃斁閿�:"+threadId);
}
}
} finally {
@@ -145,12 +134,7 @@
}
}
} catch (Exception e) {// 鍘熷瓙鎬т繚鎶ゅ嚭閿�
- try {
- return joinPoint.proceed();
- } catch (Throwable e1) {
- e.printStackTrace();
- LogHelper.errorDetailInfo(e1);
- }
+ return joinPoint.proceed();
}
}
@@ -164,7 +148,10 @@
return joinPoint.proceed();
} catch (Throwable e) {
e.printStackTrace();
- LogHelper.errorDetailInfo(e);
+ if (!Constant.IS_TEST)
+ LogHelper.errorDetailInfo(e);
+ else
+ throw e;
} finally {
}
return null;
--
Gitblit v1.8.0