- update redis get

const.go

@@ -1,3 +1,3 @@
 package gojobs
 
-const Version = "1.0.62"
+const Version = "1.0.63"

go.mod

@@ -6,16 +6,16 @@ require (
 	github.com/go-redis/redis/v9 v9.0.0-beta.2
 	github.com/jasonlvhit/gocron v0.0.1
 	github.com/robfig/cron/v3 v3.0.1
-	go.dtapp.net/dorm v1.0.27
+	go.dtapp.net/dorm v1.0.28
 	go.dtapp.net/goarray v1.0.1
 	go.dtapp.net/goip v1.0.25
-	go.dtapp.net/golog v1.0.29
+	go.dtapp.net/golog v1.0.30
 	go.dtapp.net/gostring v1.0.6
 	go.dtapp.net/gotime v1.0.5
+	go.dtapp.net/gotrace_id v1.0.6
 	google.golang.org/grpc v1.48.0
 	google.golang.org/protobuf v1.28.1
 	gorm.io/gorm v1.23.8
-	xorm.io/xorm v1.3.1
 )
 
 require (
@@ -77,7 +77,6 @@ require (
 	go.dtapp.net/gojson v1.0.1 // indirect
 	go.dtapp.net/gorandom v1.0.1 // indirect
 	go.dtapp.net/gorequest v1.0.27 // indirect
-	go.dtapp.net/gotrace_id v1.0.5 // indirect
 	go.dtapp.net/gourl v1.0.0 // indirect
 	go.dtapp.net/goxml v1.0.1 // indirect
 	go.mongodb.org/mongo-driver v1.10.1 // indirect
@@ -98,4 +97,5 @@ require (
 	mellium.im/sasl v0.3.0 // indirect
 	modernc.org/ccgo/v3 v3.16.8 // indirect
 	xorm.io/builder v0.3.12 // indirect
+	xorm.io/xorm v1.3.1 // indirect
 )

go.sum

@@ -544,16 +544,16 @@ github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a/go.mod h1:ul22v+Nro/
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
 github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0=
-go.dtapp.net/dorm v1.0.27 h1:TnRWVfYYjfvZ1Zi2cyb41ZmsbytB4+5fN/FVnodd2NQ=
-go.dtapp.net/dorm v1.0.27/go.mod h1:bHG7BmgeLaAlc56myYF63lwZAIuMeWRAqHBb/L84dLM=
+go.dtapp.net/dorm v1.0.28 h1:Igd/K1Hj0IbKLN4lZUxRWXViLtlYjYKVvHcuHscFYuM=
+go.dtapp.net/dorm v1.0.28/go.mod h1:bHG7BmgeLaAlc56myYF63lwZAIuMeWRAqHBb/L84dLM=
 go.dtapp.net/goarray v1.0.1 h1:cHNHaJ2MFcuJPA1WKU2PM1EUZShS1vQqEH7n6YXsQVU=
 go.dtapp.net/goarray v1.0.1/go.mod h1:/MPhlFCAhQyeNV1M0v1PAOOX33Sg705fVjUgMO12IBQ=
 go.dtapp.net/goip v1.0.25 h1:GSgQkR7dc28TX8E1mF3wAy+EEGZ++tgqc8Q85OKZPEY=
 go.dtapp.net/goip v1.0.25/go.mod h1:dKeNuWJttH4AvvYVHV0FagB6BVvFM1HGDKFxLKr+hkQ=
 go.dtapp.net/gojson v1.0.1 h1:MHeSGlq1KxzL7rCkm18fhwW4GNORHohdDMmxY5PupKY=
 go.dtapp.net/gojson v1.0.1/go.mod h1:TkkpTNxHBKxul0e7gC5MrL1K4ICFB9mQ7wHzjBah3/k=
-go.dtapp.net/golog v1.0.29 h1:tkNZ2KENquglBVaim5ISj0yOeXxwmuPxgQTeUd3I75c=
-go.dtapp.net/golog v1.0.29/go.mod h1:W0fqSbKfiTLZjF92TbUp6v0TlqGpKKOIvLy/O3hQXcU=
+go.dtapp.net/golog v1.0.30 h1:p9FBj9A52KNoeJiPxUguOxBxSHDQwL0GCwvqe2Tareo=
+go.dtapp.net/golog v1.0.30/go.mod h1:KjpAABVvi+jZK8vpO7k5Csaf7/SE+WfJGFhh9kZOzVc=
 go.dtapp.net/gorandom v1.0.1 h1:IWfMClh1ECPvyUjlqD7MwLq4mZdUusD1qAwAdsvEJBs=
 go.dtapp.net/gorandom v1.0.1/go.mod h1:ZPdgalKpvFV/ATQqR0k4ns/F/IpITAZpx6WkWirr5Y8=
 go.dtapp.net/gorequest v1.0.27 h1:Hip1mfSZJDNcmE2iZgB3PYa0C/7BAMEJLsCaMd6t9iE=
@@ -562,8 +562,8 @@ go.dtapp.net/gostring v1.0.6 h1:XqNaThEfHpweLofru5sBqm1UUzc9JWsXyB/M/rTk29w=
 go.dtapp.net/gostring v1.0.6/go.mod h1:AMnnLjyNxH+cphxyASJGYCzWpVrkP5RncuVo8xL8s3E=
 go.dtapp.net/gotime v1.0.5 h1:12aNgB2ULpP6QgQHEUkLilZ4ASvhpFxMFQkBwn0par8=
 go.dtapp.net/gotime v1.0.5/go.mod h1:Gq7eNLr2iMLP18UNWONRq4V3Uhf/ADp4bIrS+Tc6ktY=
-go.dtapp.net/gotrace_id v1.0.5 h1:znUwvMcX7ADQn8f750yIb5xJa9tJ4P0fHb5tSo7EFeg=
-go.dtapp.net/gotrace_id v1.0.5/go.mod h1:476T5KMJw9c6DM/rJn7y6d28hcNDv4+wew4sd+powes=
+go.dtapp.net/gotrace_id v1.0.6 h1:q6s8jy50vt1820b69JKQaFqbhGS5yJGMVtocwOGOPO0=
+go.dtapp.net/gotrace_id v1.0.6/go.mod h1:o5kSzNK4s3GrrKpkRKXtAhArtBG1e5N5O5KGPlBlWG4=
 go.dtapp.net/gourl v1.0.0 h1:Zbe0GiMFyyRy2+bjbVsYulakH5d58w3CDZkUPonlMoQ=
 go.dtapp.net/gourl v1.0.0/go.mod h1:x9A/pJ3iKDTb6Gu2RtJy2iHg56IowXIcIGQdogqpGjs=
 go.dtapp.net/goxml v1.0.1 h1:WODsjNpmHTtoeLsXgOjC81qRbu4aXZ3LKBHApNGaPjY=

jobs_gorm_redis_get.go

@@ -6,6 +6,8 @@ import (
 	"fmt"
 	"go.dtapp.net/gojobs/jobs_gorm_model"
 	"go.dtapp.net/gostring"
+	"go.dtapp.net/gotrace_id"
+	"log"
 	"math/rand"
 	"time"
 )
@@ -16,10 +18,11 @@ import (
 // ---
 // address 下发地址
 // err 错误信息
-func (j *JobsGorm) GetIssueAddress(workers []string, v *jobs_gorm_model.Task) (string, error) {
+func (j *JobsGorm) GetIssueAddress(ctx context.Context, workers []string, v *jobs_gorm_model.Task) (string, error) {
 	var (
 		currentIp       = ""    // 当前Ip
 		appointIpStatus = false // 指定Ip状态
+		traceId         = gotrace_id.GetTraceIdContext(ctx)
 	)
 
 	// 赋值ip
@@ -33,6 +36,7 @@ func (j *JobsGorm) GetIssueAddress(workers []string, v *jobs_gorm_model.Task) (s
 		if appointIpStatus == true {
 			// 判断是否指定某ip执行
 			if gostring.Contains(workers[0], currentIp) == true {
+				log.Println("[jobs.GetIssueAddress]只有一个客户端在线，指定某ip执行", traceId, workers[0], currentIp)
 				return workers[0], nil
 			}
 			return "", errors.New(fmt.Sprintf("需要执行的[%s]客户端不在线", currentIp))
@@ -44,6 +48,7 @@ func (j *JobsGorm) GetIssueAddress(workers []string, v *jobs_gorm_model.Task) (s
 	if appointIpStatus == true {
 		for wk, wv := range workers {
 			if gostring.Contains(wv, currentIp) == true {
+				log.Println("[jobs.GetIssueAddress]优先处理指定某ip执行", traceId, workers[wk], currentIp)
 				return workers[wk], nil
 			}
 		}
@@ -54,6 +59,7 @@ func (j *JobsGorm) GetIssueAddress(workers []string, v *jobs_gorm_model.Task) (s
 		if address == "" {
 			return address, errors.New("获取执行的客户端异常")
 		}
+		log.Println("[jobs.GetIssueAddress]随机返回一个", traceId, address, currentIp)
 		return address, nil
 	}
 }

jobs_xorm.go

@@ -1,21 +0,0 @@
-package gojobs
-
-import "xorm.io/xorm"
-
-// Xorm数据库驱动
-type jobsXorm struct {
-	db *xorm.Engine
-}
-
-// NewJobsXorm 初始化
-func NewJobsXorm(db *xorm.Engine) *jobsXorm {
-	var (
-		j = &jobsXorm{}
-	)
-	j.db = db
-	return j
-}
-
-func (j *jobsXorm) Run() {
-
-}