From 92218d10ca3192e5ca53ff26d74b29a992d48962 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 十一月 2019 09:37:38 +0800
Subject: [PATCH] redis整改
---
fanli/src/main/java/com/yeshi/fanli/aspect/RequestSerializableAspect.java | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 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 c408baf..5e711b6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/aspect/RequestSerializableAspect.java
+++ b/fanli/src/main/java/com/yeshi/fanli/aspect/RequestSerializableAspect.java
@@ -30,6 +30,7 @@
import redis.clients.jedis.Jedis;
import redis.clients.jedis.JedisPool;
+import redis.clients.jedis.params.SetParams;
@Component
@Aspect
@@ -92,46 +93,55 @@
if (!StringUtil.isNullOrEmpty(cacheKey)) {
cacheKey = joinPoint.getTarget().getClass().getName() + "." + targetMethod.getName() + "-"
+ cacheKey;
+ String cacheAlias = cacheKey;
cacheKey = "rs-" + StringUtil.Md5(cacheKey);
// jiedis鍘熷瓙鎬у仛鎷︽埅
Jedis jedis = jedisPool.getResource();
+ long threadId= Thread.currentThread().getId();
+ LogHelper.test("杩涘叆鎷︽埅:"+cacheKey+"-"+threadId);
try {
- Constant.waitingThreadSet.add(Thread.currentThread().getId());
- long result = 0;
+ Constant.waitingThreadSet.add(threadId);
+ String result = null;
long startTime = System.currentTimeMillis();
// 绛夊緟鍝嶅簲
- while (result <= 0) {
- result = jedis.setnx(cacheKey, "1");
- if (result <= 0) {
+ 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) {
e.printStackTrace();
}
- if (System.currentTimeMillis() - startTime > 1000 * 60L) {
+ if (System.currentTimeMillis() - startTime > 1000 * 30L) {
Constant.waitingThreadSet.remove(Thread.currentThread().getId());
out.print(JsonUtil.loadFalseResult("杩炴帴瓒呮椂"));
return null;
}
} else {
- // 璁剧疆30绉掑鐞嗘椂闂�
- jedis.expire(cacheKey, 30);
+ LogHelper.test("鑾峰彇鍒伴攣:"+threadId);
+ break;
}
}
- if (result > 0) {
+ 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 {
- jedisPool.returnResource(jedis);
+ jedis.close();
}
}
} catch (Exception e) {// 鍘熷瓙鎬т繚鎶ゅ嚭閿�
--
Gitblit v1.8.0