From daf95bb905bea58617fa84da84564c8235d2216d Mon Sep 17 00:00:00 2001
From: Yun <yun@yun.ink>
Date: Wed, 22 May 2024 21:37:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9redis=E7=9A=84=E4=BC=A0?=
 =?UTF-8?q?=E5=8F=82=EF=BC=8C=E6=8E=A5=E6=94=B6=E4=B8=89=E7=A7=8D=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8Fredis?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 go.mod        |  7 ++-----
 go.sum        |  2 --
 lockx.go      | 10 +++++-----
 lockx_test.go |  2 +-
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/go.mod b/go.mod
index 5babd6f..de94bc4 100644
--- a/go.mod
+++ b/go.mod
@@ -1,11 +1,8 @@
 module github.com/yuninks/lockx
 
-go 1.19
+go 1.20
 
-require (
-	code.yun.ink/open/timer v1.0.1
-	github.com/go-redis/redis/v8 v8.11.5
-)
+require github.com/go-redis/redis/v8 v8.11.5
 
 require (
 	github.com/cespare/xxhash/v2 v2.1.2 // indirect
diff --git a/go.sum b/go.sum
index cbe69a9..7342ff8 100644
--- a/go.sum
+++ b/go.sum
@@ -1,5 +1,3 @@
-code.yun.ink/open/timer v1.0.1 h1:ZWecU5K0rFB15p8DZubozTEwo1vrO4mUCRwEoD1tbEQ=
-code.yun.ink/open/timer v1.0.1/go.mod h1:i6+mEL5eUab+9ZDtxt9S5fMiJkwVLBRsNmfLj2qzN30=
 github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
 github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
diff --git a/lockx.go b/lockx.go
index bf70bc4..b1622cd 100644
--- a/lockx.go
+++ b/lockx.go
@@ -11,14 +11,14 @@ import (
 
 // 全局锁
 type globalLock struct {
-	redis     *redis.Client
+	redis     redis.UniversalClient
 	ctx       context.Context
 	cancel    context.CancelFunc
 	uniqueKey string
 	value     string
 }
 
-func NewGlobalLock(ctx context.Context, red *redis.Client, uniqueKey string) *globalLock {
+func NewGlobalLock(ctx context.Context, red redis.UniversalClient, uniqueKey string) *globalLock {
 	ctx, cancel := context.WithTimeout(ctx, opt.lockTimeout)
 	return &globalLock{
 		redis:     red,
@@ -44,7 +44,7 @@ func (g *globalLock) Lock() bool {
 	resp, err := g.redis.Eval(g.ctx, script, []string{g.uniqueKey}, g.value, 5).Result()
 	if resp != "OK" {
 		_ = err
-		log.Println("globalLock Lock", resp, err, g.uniqueKey, g.value)
+		log.Println("global Lock Lock", resp, err, g.uniqueKey, g.value)
 	}
 	if resp == "OK" {
 		g.refresh()
@@ -79,7 +79,7 @@ func (g *globalLock) Unlock() bool {
 
 	resp, err := g.redis.Eval(g.ctx, script, []string{g.uniqueKey}, g.value).Result()
 	if resp != "OK" {
-		log.Println("globalLock Unlock", resp, err, g.uniqueKey, g.value)
+		log.Println("global Lock Unlock", resp, err, g.uniqueKey, g.value)
 	}
 	g.cancel()
 	return true
@@ -114,7 +114,7 @@ func (g *globalLock) refreshExec() bool {
 
 	resp, err := g.redis.Eval(g.ctx, script, []string{g.uniqueKey}, g.value, 5).Result()
 	if resp != "OK" {
-		log.Println("globalLock refresh", resp, err, g.uniqueKey, g.value)
+		log.Println("global Lock refresh", resp, err, g.uniqueKey, g.value)
 	}
 	return resp == "OK"
 }
diff --git a/lockx_test.go b/lockx_test.go
index 9b36e9b..fde321d 100644
--- a/lockx_test.go
+++ b/lockx_test.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	"code.yun.ink/open/timer/lockx"
+	"github.com/yuninks/lockx"
 	"github.com/go-redis/redis/v8"
 )