From aa552facf6d833acab0d3e3e29bda2a0fb826ffe Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期一, 25 十一月 2019 16:14:13 +0800 Subject: [PATCH] 品牌缓存生效 --- fanli/src/main/java/com/yeshi/fanli/aspect/RequestSerializableAspect.java | 23 +++++++++++++---------- 1 files changed, 13 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..49a3058 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,34 +93,36 @@ 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(); 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)); + if (StringUtil.isNullOrEmpty(result)) { 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); + break; } } - if (result > 0) { + if (!StringUtil.isNullOrEmpty(result)) { try { return joinPoint.proceed(); } catch (Throwable e) { @@ -131,7 +134,7 @@ } } } finally { - jedisPool.returnResource(jedis); + jedis.close(); } } } catch (Exception e) {// 鍘熷瓙鎬т繚鎶ゅ嚭閿� -- Gitblit v1.8.0