Merge remote-tracking branch 'origin/div' into div

yujian

2019-11-20 0f9a0a76b170bceac867dd5cd009e518ac6646e4

 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

@@ -100,14 +101,15 @@
                  LogHelper.test("进入拦截:"+cacheKey+"-"+threadId);

                  try {

                     Constant.waitingThreadSet.add(threadId);

                     long result = 0;

                     String result = null;

                     long startTime = System.currentTimeMillis();

                     // 等待响应

                     while (result <= 0) {

                        result = jedis.setnx(cacheKey, "1");

                     while (StringUtil.isNullOrEmpty(result)) {

								
                        result = jedis.set(cacheKey, "1", new SetParams().nx().ex(30));

                        LogHelper.error("触发并发锁:" + cacheAlias);

                        LogHelper.error("redis键:" + cacheKey);

                        if (result <= 0) {

                        if (StringUtil.isNullOrEmpty(result)) {

                           LogHelper.test("等待:"+threadId);

                           try {

                              Thread.sleep(50);

@@ -120,14 +122,12 @@
                              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) {

@@ -141,7 +141,7 @@
                        }

                     }

                  } finally {

                     jedisPool.returnResource(jedis);

                     jedis.close();

                  }

               }

            } catch (Exception e) {// 原子性保护出错