From 6598b47440f5be4adc1c793bbfc9f187be50a179 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 19 八月 2025 17:01:48 +0800
Subject: [PATCH] 合并代码
---
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/RedisUtil.java | 52 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 43 insertions(+), 9 deletions(-)
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/RedisUtil.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/RedisUtil.java
index f5b5231..0354893 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/RedisUtil.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/util/RedisUtil.java
@@ -1,17 +1,10 @@
package com.supersavedriving.user.modular.system.util;
-import com.supersavedriving.user.core.util.ToolUtil;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;
-import org.springframework.util.StringUtils;
-import redis.clients.jedis.Jedis;
-import redis.clients.jedis.JedisPool;
-import redis.clients.jedis.Pipeline;
import javax.annotation.Resource;
-import java.io.IOException;
-import java.util.*;
+import java.util.UUID;
import java.util.concurrent.TimeUnit;
@@ -103,7 +96,7 @@
int num1 = 1;
while (num1 <= 10){
try {
- Thread.sleep(3000);//等待3秒
+ Thread.sleep(1000);//等待3秒
} catch (InterruptedException e) {
e.printStackTrace();
}
@@ -125,6 +118,47 @@
}
+ public boolean lock(String key){
+ try {
+ boolean b = lock(key,5);
+ if(!b){
+ int num1 = 1;
+ while (num1 <= 10){
+ try {
+ Thread.sleep(1000);//等待1秒
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ b = lock(5);
+ if(b){
+ return true;
+ }else{
+ num1++;
+ }
+ }
+ return false;
+ }
+ return b;
+ }catch (Exception e){
+ e.printStackTrace();
+ unlock();
+ }
+ return false;
+ }
+
+
+ /**
+ * 获取redis锁
+ * @param time
+ * @return
+ */
+ public boolean lock(String key, int time){
+ String uuid = UUID.randomUUID().toString();
+ return lock(key, uuid, time);
+ }
+
+
+
/**
* 获取redis锁
* @param time
--
Gitblit v1.7.1