Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/SuperSaveDr...

puzhibing

2023-07-26 709a4a10be56952ead6340e4822fce41a66e47cd

 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/util/RedisUtil.java

@@ -203,6 +203,33 @@

    /**
     * 获取redis锁
     * @return
     */
    public boolean lock(){
        boolean b = lock(5);
        if(!b){
            int num1 = 1;
            while (num1 <= 10){
                try {
                    Thread.sleep(3000);//等待3秒
                } catch (InterruptedException e) {
                    e.printStackTrace();
                }
                b = lock(5);
                if(b){
                    return true;
                }else{
                    num1++;
                }
            }
            return false;
        }
        return b;
    }


    /**
     * 获取redis锁
     * @param time
     * @return
     */
@@ -211,6 +238,18 @@
        return lock("redis", uuid, time);
    }

    /**
     * 获取redis锁
     * @param key
     * @param time
     * @return
     */
    public boolean lock(String key, int time){
        String uuid = UUID.randomUUID().toString();
        return lock(key, uuid, time);
    }



    /**
     * redis释放锁