From 626d711cb15896055c13fe344eb7fcc824589715 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 19 十二月 2019 15:38:42 +0800
Subject: [PATCH] 帮助中心
---
fanli/src/main/java/com/yeshi/fanli/aspect/RequestSerializableServiceAspect.java | 22 +++++++---------------
1 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/aspect/RequestSerializableServiceAspect.java b/fanli/src/main/java/com/yeshi/fanli/aspect/RequestSerializableServiceAspect.java
index 99bf3b7..cd36493 100644
--- a/fanli/src/main/java/com/yeshi/fanli/aspect/RequestSerializableServiceAspect.java
+++ b/fanli/src/main/java/com/yeshi/fanli/aspect/RequestSerializableServiceAspect.java
@@ -24,6 +24,7 @@
import redis.clients.jedis.Jedis;
import redis.clients.jedis.JedisPool;
+import redis.clients.jedis.params.SetParams;
@Component
@Aspect
@@ -70,32 +71,26 @@
Jedis jedis = jedisPool.getResource();
try {
Constant.waitingThreadSet.add(Thread.currentThread().getId());
- long result = 0;
+ 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));
+ if (StringUtil.isNullOrEmpty(result)) {
try {
- System.out.println("__________宸叉湁绾跨▼鍦ㄦ墽琛�");
Thread.sleep(50);
} catch (InterruptedException e) {
e.printStackTrace();
}
if (System.currentTimeMillis() - startTime > 1000 * 60L) {
Constant.waitingThreadSet.remove(Thread.currentThread().getId());
- System.out.println("__________鍒犻櫎绾跨▼");
return null;
}
- } else {
- // 璁剧疆30绉掑鐞嗘椂闂�
- jedis.expire(cacheKey, 30);
}
}
- if (result > 0) {
+ if (!StringUtil.isNullOrEmpty(result)) {
try {
- System.out.println("__________鏀捐鎵ц");
return joinPoint.proceed();
} catch (Throwable e) {
e.printStackTrace();
@@ -106,7 +101,7 @@
}
}
} finally {
- jedisPool.returnResource(jedis);
+ jedis.close();
}
}
} catch (Exception e) {// 鍘熷瓙鎬т繚鎶ゅ嚭閿�
@@ -123,9 +118,6 @@
} catch (SecurityException e) {
e.printStackTrace();
}
-
return joinPoint.proceed();
-
}
-
}
--
Gitblit v1.8.0