From f4a0f2acc63d7785eab108419a4e16f5f688cb95 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 18 一月 2020 12:06:27 +0800
Subject: [PATCH] 用户注册信息

---
 fanli/src/main/java/com/yeshi/fanli/aspect/RequestSerializableServiceAspect.java |   25 +++++++------------------
 1 files changed, 7 insertions(+), 18 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 caef6ed..ffc756e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/aspect/RequestSerializableServiceAspect.java
+++ b/fanli/src/main/java/com/yeshi/fanli/aspect/RequestSerializableServiceAspect.java
@@ -17,13 +17,13 @@
 import org.springframework.expression.spel.support.StandardEvaluationContext;
 import org.springframework.stereotype.Component;
 
-import com.yeshi.fanli.log.LogHelper;
 import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.annotation.RequestSerializableByKeyService;
 
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisPool;
+import redis.clients.jedis.params.SetParams;
 
 @Component
 @Aspect
@@ -70,12 +70,12 @@
 						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 {
 										Thread.sleep(50);
 									} catch (InterruptedException e) {
@@ -85,34 +85,23 @@
 										Constant.waitingThreadSet.remove(Thread.currentThread().getId());
 										return null;
 									}
-								} else {
-									// 璁剧疆30绉掑鐞嗘椂闂�
-									jedis.expire(cacheKey, 30);
 								}
 							}
 
-							if (result > 0) {
+							if (!StringUtil.isNullOrEmpty(result)) {
 								try {
 									return joinPoint.proceed();
-								} catch (Throwable e) {
-									e.printStackTrace();
-									LogHelper.errorDetailInfo(e);
 								} finally {
 									jedis.del(cacheKey);
 									Constant.waitingThreadSet.remove(Thread.currentThread().getId());
 								}
 							}
 						} finally {
-							jedisPool.returnResource(jedis);
+							jedis.close();
 						}
 					}
 				} catch (Exception e) {// 鍘熷瓙鎬т繚鎶ゅ嚭閿�
-					try {
 						return joinPoint.proceed();
-					} catch (Throwable e1) {
-						e.printStackTrace();
-						LogHelper.errorDetailInfo(e1);
-					}
 				}
 			}
 		} catch (NoSuchMethodException e) {

--
Gitblit v1.8.0