diff --git a/const.go b/const.go index 73ce8e4..915227d 100644 --- a/const.go +++ b/const.go @@ -1,6 +1,6 @@ package gojobs const ( - Version = "1.0.102" + Version = "1.0.103" SpecifyIpNull = "0.0.0.0" ) diff --git a/go.mod b/go.mod index ff70752..5de5ac3 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/jasonlvhit/gocron v0.0.1 github.com/robfig/cron/v3 v3.0.1 go.dtapp.net/dorm v1.0.42 - go.dtapp.net/goip v1.0.36 + go.dtapp.net/goip v1.0.37 go.dtapp.net/golog v1.0.90 go.dtapp.net/gostring v1.0.10 go.dtapp.net/gotime v1.0.5 diff --git a/go.sum b/go.sum index a04201a..8cced7b 100644 --- a/go.sum +++ b/go.sum @@ -505,8 +505,8 @@ github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxt github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0= go.dtapp.net/dorm v1.0.42 h1:bugzTYBr5goLDf9s8vft6xG/fAiinLm1jo+9uFD7JRM= go.dtapp.net/dorm v1.0.42/go.mod h1:LCy6tqg7uClOhMb8zgF9x9mTFoVd9Ud40g9a2Z6bbwM= -go.dtapp.net/goip v1.0.36 h1:+wexFCMnP3f+6jPYXjBLMyjnP+DfQrslWvXifndxkdc= -go.dtapp.net/goip v1.0.36/go.mod h1:9/Oo1HVM4EVUsvAebdV6CaBAK4S6qQMQWT3LcJfH6jM= +go.dtapp.net/goip v1.0.37 h1:QwdBxnEhB6Vm+Ma2X1PQb/1Sm96dJFGgnOkC4Dr1oxk= +go.dtapp.net/goip v1.0.37/go.mod h1:N2YFFr2OO+5VQwMqyKtg7c4MVrDJOoog/QmIvYUfi1c= go.dtapp.net/golog v1.0.90 h1:sDmpZZ9/gEy9HWxpPQO4gjK1JC7R876w4DzKWHIak6I= go.dtapp.net/golog v1.0.90/go.mod h1:6kSMLr7RSDONS1+2xYWK1f8X3YHrElmHg2Ti/IlFKAU= go.dtapp.net/gorandom v1.0.1 h1:IWfMClh1ECPvyUjlqD7MwLq4mZdUusD1qAwAdsvEJBs= diff --git a/redis_get.go b/redis_get.go index 37b2b4b..16e10d2 100644 --- a/redis_get.go +++ b/redis_get.go @@ -4,6 +4,7 @@ import ( "context" "errors" "fmt" + "go.dtapp.net/goip" "go.dtapp.net/gojobs/jobs_gorm_model" "go.dtapp.net/gostring" "math/rand" @@ -22,6 +23,10 @@ func (c *Client) GetIssueAddress(ctx context.Context, workers []string, v *jobs_ appointIpStatus = false // 指定Ip状态 ) + if v.SpecifyIp != "" { + v.SpecifyIp = goip.IsIp(v.SpecifyIp) + } + // 赋值ip if v.SpecifyIp != "" && v.SpecifyIp != SpecifyIpNull { currentIp = v.SpecifyIp