diff --git a/const.go b/const.go index bcd36fc..754eb14 100644 --- a/const.go +++ b/const.go @@ -1,6 +1,6 @@ package gojobs const ( - Version = "1.0.108" + Version = "1.0.109" SpecifyIpNull = "0.0.0.0" ) diff --git a/go.mod b/go.mod index add541a..0f3fca4 100644 --- a/go.mod +++ b/go.mod @@ -7,9 +7,9 @@ require ( github.com/jasonlvhit/gocron v0.0.1 github.com/robfig/cron/v3 v3.0.1 github.com/shirou/gopsutil v3.21.11+incompatible - go.dtapp.net/dorm v1.0.45 + go.dtapp.net/dorm v1.0.50 go.dtapp.net/goip v1.0.38 - go.dtapp.net/golog v1.0.99 + go.dtapp.net/golog v1.0.100 go.dtapp.net/gostring v1.0.10 go.dtapp.net/gotime v1.0.5 go.dtapp.net/gotrace_id v1.0.6 @@ -44,7 +44,7 @@ require ( github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.15.10 // indirect + github.com/klauspost/compress v1.15.11 // indirect github.com/leodido/go-urn v1.2.1 // indirect github.com/lib/pq v1.10.7 // indirect github.com/mattn/go-isatty v0.0.16 // indirect @@ -85,11 +85,11 @@ require ( go.uber.org/atomic v1.10.0 // indirect go.uber.org/multierr v1.8.0 // indirect go.uber.org/zap v1.23.0 // indirect - golang.org/x/crypto v0.0.0-20220924013350-4ba4fb4dd9e7 // indirect + golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be // indirect golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect - golang.org/x/net v0.0.0-20220923203811-8be639271d50 // indirect - golang.org/x/sync v0.0.0-20220923202941-7f9b1623fab7 // indirect - golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 // indirect + golang.org/x/net v0.0.0-20220927171203-f486391704dc // indirect + golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0 // indirect + golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec // indirect golang.org/x/text v0.3.7 // indirect google.golang.org/protobuf v1.28.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/go.sum b/go.sum index 702d0dc..64f369d 100644 --- a/go.sum +++ b/go.sum @@ -273,8 +273,8 @@ github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:C github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= -github.com/klauspost/compress v1.15.10 h1:Ai8UzuomSCDw90e1qNMtb15msBXsNpH6gzkkENQNcJo= -github.com/klauspost/compress v1.15.10/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= +github.com/klauspost/compress v1.15.11 h1:Lcadnb3RKGin4FYM/orgq0qde+nc15E5Cbqg4B9Sx9c= +github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= @@ -514,12 +514,12 @@ github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPR github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= 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.45 h1:qnApATCf0XgTFxmhc+WAie01i0kntr1cL4D1DMNGKgo= -go.dtapp.net/dorm v1.0.45/go.mod h1:1uI6NmF7yjklhVqCg42/rMmGYvjsphbZhMtFS3NLRnY= +go.dtapp.net/dorm v1.0.50 h1:Jcg4PMau2toE/0ORlvzGI1Tu0m2DEMDaLgk0Xn5Cca4= +go.dtapp.net/dorm v1.0.50/go.mod h1:x/qtG0a80HuM7Lnls0m5U5RyMPO5jUS1/xSBa2ATApc= go.dtapp.net/goip v1.0.38 h1:WHIqXV0qWUM9XDtRaMIMyCKWyd9dWfSvSRdDr7vF7xU= go.dtapp.net/goip v1.0.38/go.mod h1:N2YFFr2OO+5VQwMqyKtg7c4MVrDJOoog/QmIvYUfi1c= -go.dtapp.net/golog v1.0.99 h1:W5Xh9YNXi4CuFybc99W7h/bW3D6d20PkYwvEqKBHcQE= -go.dtapp.net/golog v1.0.99/go.mod h1:f0NzpXdeKJP2yi62YSuI1WDvuiDi3GIFevIbMq9kVRY= +go.dtapp.net/golog v1.0.100 h1:/7A3rEl9zn6wTqFimQwltYnfT7FEcvxgSJvAWjc/h9k= +go.dtapp.net/golog v1.0.100/go.mod h1:GVVjzjmL7vZ1C2/4MABjz6hb7xcr788N7R7gt9x/2q0= 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.31 h1:r/OoU5Y00TbJjkQtpvwjsb/pllqO0UQQjFRY1veZYZc= @@ -579,8 +579,8 @@ golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0 golang.org/x/crypto v0.0.0-20220307211146-efcb8507fb70/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20220924013350-4ba4fb4dd9e7 h1:WJywXQVIb56P2kAvXeMGTIgQ1ZHQxR60+F9dLsodECc= -golang.org/x/crypto v0.0.0-20220924013350-4ba4fb4dd9e7/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be h1:fmw3UbQh+nxngCAHrDCCztao/kbYFnWjoqop8dHx05A= +golang.org/x/crypto v0.0.0-20220926161630-eccd6366d1be/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20181106170214-d68db9428509/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -613,8 +613,8 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220923203811-8be639271d50 h1:vKyz8L3zkd+xrMeIaBsQ/MNVPVFSffdaU3ZyYlBGFnI= -golang.org/x/net v0.0.0-20220923203811-8be639271d50/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= +golang.org/x/net v0.0.0-20220927171203-f486391704dc h1:FxpXZdoBqT8RjqTy6i1E8nXHhW21wK7ptQ/EPIGxzPQ= +golang.org/x/net v0.0.0-20220927171203-f486391704dc/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -625,8 +625,8 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220923202941-7f9b1623fab7 h1:ZrnxWX62AgTKOSagEqxvb3ffipvEDX2pl7E1TdqLqIc= -golang.org/x/sync v0.0.0-20220923202941-7f9b1623fab7/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0 h1:cu5kTvlzcw1Q5S9f5ip1/cpiB4nXvw1XYzFPGgzLUOY= +golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -664,8 +664,8 @@ golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8 h1:h+EGohizhe9XlX18rfpa8k8RAc5XyaeamM+0VHRd4lc= -golang.org/x/sys v0.0.0-20220919091848-fb04ddd9f9c8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec h1:BkDtF2Ih9xZ7le9ndzTA7KJow28VbQW3odyk/8drmuI= +golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/model_task_log.go b/model_task_log.go index 2087121..6eedf13 100644 --- a/model_task_log.go +++ b/model_task_log.go @@ -17,27 +17,27 @@ type TaskLog struct { LogId primitive.ObjectID `json:"log_id,omitempty" bson:"_id,omitempty"` //【记录】编号 LogTime primitive.DateTime `json:"log_time,omitempty" bson:"log_time"` //【记录】时间 Task struct { - Id uint `json:"id" bson:"id"` //【任务】编号 - RunId string `json:"run_id" bson:"run_id"` //【任务】执行编号 - ResultCode int `json:"result_code" bson:"result_code"` //【任务】执行状态码 - ResultDesc string `json:"result_desc" bson:"result_desc"` //【任务】执行结果 - ResultTime dorm.BsonTime `json:"result_time" bson:"result_time"` //【任务】执行时间 - } `json:"task" bson:"task"` //【任务】信息 + Id uint `json:"id" bson:"id"` //【任务】编号 + RunId string `json:"run_id" bson:"run_id"` //【任务】执行编号 + ResultCode int `json:"result_code" bson:"result_code"` //【任务】执行状态码 + ResultDesc string `json:"result_desc" bson:"result_desc"` //【任务】执行结果 + ResultTime string `json:"result_time" bson:"result_time"` //【任务】执行时间 + } `json:"task,omitempty" bson:"task,omitempty"` //【任务】信息 System struct { - Hostname string `json:"hostname" bson:"hostname"` //【系统】主机名 - Os string `json:"os" bson:"os"` //【系统】系统类型 - Version string `json:"version" bson:"version"` //【系统】系统版本 - Kernel string `json:"kernel" bson:"kernel"` //【系统】系统内核 - KernelVersion string `json:"kernel_version" bson:"kernel_version"` //【系统】系统内核版本 - BootTime dorm.BsonTime `json:"boot_time" bson:"boot_time"` //【系统】系统开机时间 - CpuCores int `json:"cpu_cores,omitempty" bson:"cpu_cores,omitempty"` //【系统】CPU核数 - CpuModelName string `json:"cpu_model_name,omitempty" bson:"cpu_model_name,omitempty"` //【系统】CPU型号名称 - CpuMhz float64 `json:"cpu_mhz,omitempty" bson:"cpu_mhz,omitempty"` //【系统】CPU兆赫 - InsideIp string `json:"inside_ip" bson:"inside_ip"` //【系统】内网ip - OutsideIp string `json:"outside_ip" bson:"outside_ip"` //【系统】外网ip - GoVersion string `json:"go_version" bson:"go_version"` //【系统】go版本 - SdkVersion string `json:"sdk_version" bson:"sdk_version"` //【系统】sdk版本 - } `json:"system" bson:"system"` //【系统】信息 + Hostname string `json:"hostname" bson:"hostname"` //【系统】主机名 + Os string `json:"os" bson:"os"` //【系统】系统类型 + Version string `json:"version" bson:"version"` //【系统】系统版本 + Kernel string `json:"kernel" bson:"kernel"` //【系统】系统内核 + KernelVersion string `json:"kernel_version" bson:"kernel_version"` //【系统】系统内核版本 + BootTime string `json:"boot_time" bson:"boot_time"` //【系统】系统开机时间 + CpuCores int `json:"cpu_cores,omitempty" bson:"cpu_cores,omitempty"` //【系统】CPU核数 + CpuModelName string `json:"cpu_model_name,omitempty" bson:"cpu_model_name,omitempty"` //【系统】CPU型号名称 + CpuMhz float64 `json:"cpu_mhz,omitempty" bson:"cpu_mhz,omitempty"` //【系统】CPU兆赫 + InsideIp string `json:"inside_ip" bson:"inside_ip"` //【系统】内网ip + OutsideIp string `json:"outside_ip" bson:"outside_ip"` //【系统】外网ip + GoVersion string `json:"go_version" bson:"go_version"` //【系统】go版本 + SdkVersion string `json:"sdk_version" bson:"sdk_version"` //【系统】sdk版本 + } `json:"system,omitempty" bson:"system,omitempty"` //【系统】信息 } func (TaskLog) CollectionName() string { @@ -77,21 +77,21 @@ func (c *Client) MongoTaskLogRecord(ctx context.Context, task jobs_gorm_model.Ta taskLog.Task.RunId = runId taskLog.Task.ResultCode = taskResultCode taskLog.Task.ResultDesc = taskResultDesc - taskLog.Task.ResultTime = dorm.NewBsonTimeCurrent() + taskLog.Task.ResultTime = gotime.Current().Format() - taskLog.System.Hostname = c.config.systemHostname //【系统】主机名 - taskLog.System.Os = c.config.systemOs //【系统】系统类型 - taskLog.System.Version = c.config.systemVersion //【系统】系统版本 - taskLog.System.Kernel = c.config.systemKernel //【系统】系统内核 - taskLog.System.KernelVersion = c.config.systemKernelVersion //【系统】系统内核版本 - taskLog.System.BootTime = dorm.NewBsonTimeFromTime(gotime.SetCurrentUnix(int64(c.config.systemBootTime)).Time) //【系统】系统开机时间 - taskLog.System.CpuCores = c.config.cpuCores //【系统】CPU核数 - taskLog.System.CpuModelName = c.config.cpuModelName //【程序】CPU型号名称 - taskLog.System.CpuMhz = c.config.cpuMhz //【系统】CPU兆赫 - taskLog.System.InsideIp = c.config.systemInsideIp //【系统】内网ip - taskLog.System.OutsideIp = c.config.systemOutsideIp //【系统】外网ip - taskLog.System.GoVersion = c.config.goVersion //【系统】Go版本 - taskLog.System.SdkVersion = c.config.sdkVersion //【系统】Sdk版本 + taskLog.System.Hostname = c.config.systemHostname //【系统】主机名 + taskLog.System.Os = c.config.systemOs //【系统】系统类型 + taskLog.System.Version = c.config.systemVersion //【系统】系统版本 + taskLog.System.Kernel = c.config.systemKernel //【系统】系统内核 + taskLog.System.KernelVersion = c.config.systemKernelVersion //【系统】系统内核版本 + taskLog.System.BootTime = gotime.SetCurrent(gotime.SetCurrentUnix(int64(c.config.systemBootTime)).Time).Format() //【系统】系统开机时间 + taskLog.System.CpuCores = c.config.cpuCores //【系统】CPU核数 + taskLog.System.CpuModelName = c.config.cpuModelName //【程序】CPU型号名称 + taskLog.System.CpuMhz = c.config.cpuMhz //【系统】CPU兆赫 + taskLog.System.InsideIp = c.config.systemInsideIp //【系统】内网ip + taskLog.System.OutsideIp = c.config.systemOutsideIp //【系统】外网ip + taskLog.System.GoVersion = c.config.goVersion //【系统】Go版本 + taskLog.System.SdkVersion = c.config.sdkVersion //【系统】Sdk版本 _, err := c.mongoClient.Database(c.mongoConfig.databaseName).Collection(TaskLog{}.CollectionName()).InsertOne(ctx, taskLog) if err != nil {