diff --git a/utils/golock/redis.go b/utils/golock/redis.go index c15c064a..906083da 100644 --- a/utils/golock/redis.go +++ b/utils/golock/redis.go @@ -1,7 +1,7 @@ package golock import ( - "go.dtapp.net/library/utils/goredis" + "go.dtapp.net/library/utils/dorm" "time" ) @@ -13,10 +13,10 @@ type ConfigLockRedis struct { type LockRedis struct { config ConfigLockRedis - db goredis.App + db *dorm.RedisClient } -func NewLockRedis(db goredis.App) *LockRedis { +func NewLockRedis(db *dorm.RedisClient) *LockRedis { return &LockRedis{db: db} } @@ -26,7 +26,7 @@ func (lockRedis *LockRedis) Lock() bool { if judgeCache != "" { return true } - lockRedis.db.NewStringOperation().Set(lockRedis.config.Key, lockRedis.config.KeyContent, goredis.WithExpire(lockRedis.config.ExpirationTime)) + lockRedis.db.NewStringOperation().Set(lockRedis.config.Key, lockRedis.config.KeyContent, dorm.WithExpire(lockRedis.config.ExpirationTime)) return true } diff --git a/utils/jobs/jobs.go b/utils/jobs/jobs.go index 122a2e38..e1b93677 100644 --- a/utils/jobs/jobs.go +++ b/utils/jobs/jobs.go @@ -1,8 +1,8 @@ package jobs import ( + "go.dtapp.net/library/utils/dorm" "go.dtapp.net/library/utils/gojson" - "go.dtapp.net/library/utils/goredis" "go.dtapp.net/library/utils/gotime" "go.dtapp.net/library/utils/gouuid" "gorm.io/gorm" @@ -10,17 +10,17 @@ import ( ) type App struct { - RunVersion int `json:"run_version"` // 运行版本 - Os string `json:"os"` // 系统类型 - Arch string `json:"arch"` // 系统架构 - MaxProCs int `json:"max_pro_cs"` // CPU核数 - Version string `json:"version"` // GO版本 - MacAddrS string `json:"mac_addr_s"` // Mac地址 - InsideIp string `json:"inside_ip"` // 内网ip - OutsideIp string `json:"outside_ip"` // 外网ip - MainService int `json:"main_service"` // 主要服务 - Db *gorm.DB // 数据库 - Redis goredis.App // 缓存数据库服务 + RunVersion int `json:"run_version"` // 运行版本 + Os string `json:"os"` // 系统类型 + Arch string `json:"arch"` // 系统架构 + MaxProCs int `json:"max_pro_cs"` // CPU核数 + Version string `json:"version"` // GO版本 + MacAddrS string `json:"mac_addr_s"` // Mac地址 + InsideIp string `json:"inside_ip"` // 内网ip + OutsideIp string `json:"outside_ip"` // 外网ip + MainService int `json:"main_service"` // 主要服务 + Db *gorm.DB // 数据库 + Redis *dorm.RedisClient // 缓存数据库服务 } // Add 添加任务 diff --git a/utils/jobs/lock.go b/utils/jobs/lock.go index 9919b880..f39c5638 100644 --- a/utils/jobs/lock.go +++ b/utils/jobs/lock.go @@ -2,7 +2,7 @@ package jobs import ( "fmt" - "go.dtapp.net/library/utils/goredis" + "go.dtapp.net/library/utils/dorm" "time" ) @@ -13,7 +13,7 @@ func (app *App) Lock(info Task, id any) string { if judgeCache != "" { return judgeCache } - app.Redis.NewStringOperation().Set(cacheName, fmt.Sprintf("已在%v机器上锁成功", app.OutsideIp), goredis.WithExpire(time.Millisecond*time.Duration(info.Frequency)*3)) + app.Redis.NewStringOperation().Set(cacheName, fmt.Sprintf("已在%v机器上锁成功", app.OutsideIp), dorm.WithExpire(time.Millisecond*time.Duration(info.Frequency)*3)) return "" }