From 2ba431be9c12a79783e0f9ef249292b7fa95f2a1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 25 一月 2021 19:13:58 +0800
Subject: [PATCH] 拼多多备案调整
---
fanli/src/main/java/com/yeshi/fanli/aspect/RequestSerializableAspect.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 b206d41..eb0f67f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/aspect/RequestSerializableAspect.java
+++ b/fanli/src/main/java/com/yeshi/fanli/aspect/RequestSerializableAspect.java
@@ -7,6 +7,7 @@
import javax.annotation.Resource;
+import com.yeshi.fanli.util.RedisManager;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.Signature;
import org.aspectj.lang.annotation.Around;
@@ -36,7 +37,7 @@
@Order(4)
public class RequestSerializableAspect {
@Resource
- private JedisPool jedisPool;
+ private RedisManager redisManager;
private ExpressionParser parser = new SpelExpressionParser();
@@ -95,7 +96,7 @@
String cacheAlias = cacheKey;
cacheKey = "rs-" + StringUtil.Md5(cacheKey);
// jiedis鍘熷瓙鎬у仛鎷︽埅
- Jedis jedis = jedisPool.getResource();
+ Jedis jedis = redisManager.getJedis();
long threadId = Thread.currentThread().getId();
try {
Constant.waitingThreadSet.add(threadId);
@@ -148,7 +149,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