From 45b678b37404e8575d0a5d45141eb7db379daefb Mon Sep 17 00:00:00 2001 From: lwnmengjing Date: Fri, 30 Aug 2024 09:23:56 +0800 Subject: [PATCH 1/2] :bug: fix: only add default task to mss-boot task --- models/task.go | 1 + 1 file changed, 1 insertion(+) diff --git a/models/task.go b/models/task.go index 136492a..ad9bf89 100644 --- a/models/task.go +++ b/models/task.go @@ -230,6 +230,7 @@ func (t *Task) Run() { } err := gormdb.DB.Model(&Task{}). Where("id = ?", t.ID). + Where("provider = ?", TaskProviderDefault). Update("checked_at", t.CheckedAt.Time).Error if err != nil { slog.Error("task run update task error", slog.Any("err", err)) From 294237efe5529e684dde7951078baeaf19a1751a Mon Sep 17 00:00:00 2001 From: lwnmengjing Date: Fri, 30 Aug 2024 11:11:34 +0800 Subject: [PATCH 2/2] :bug: fix: task params error --- go.mod | 34 ++++++++++++++++----------------- go.sum | 34 +++++++++++++++++++++++++++++++++ models/task.go | 52 +++++++++++++++++++++++--------------------------- models/type.go | 19 ++++++++++++++++++ 4 files changed, 94 insertions(+), 45 deletions(-) diff --git a/go.mod b/go.mod index bb64f98..4730661 100644 --- a/go.mod +++ b/go.mod @@ -9,9 +9,9 @@ require ( github.com/appleboy/gin-jwt/v2 v2.9.2 github.com/aws/aws-msk-iam-sasl-signer-go v1.0.0 github.com/aws/aws-sdk-go-v2 v1.30.4 - github.com/aws/aws-sdk-go-v2/config v1.27.30 + github.com/aws/aws-sdk-go-v2/config v1.27.31 github.com/aws/aws-sdk-go-v2/service/eks v1.48.2 - github.com/aws/aws-sdk-go-v2/service/s3 v1.60.1 + github.com/aws/aws-sdk-go-v2/service/s3 v1.61.0 github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.32.6 github.com/bsm/redislock v0.9.4 github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be @@ -23,7 +23,7 @@ require ( github.com/gorilla/websocket v1.5.3 github.com/grafana/pyroscope-go v1.1.2 github.com/larksuite/oapi-sdk-go/v3 v3.3.2 - github.com/mss-boot-io/mss-boot v0.2.7 + github.com/mss-boot-io/mss-boot v0.2.8-0.20240830030606-ddef90cf4b65 github.com/mss-boot-io/redisqueue/v2 v2.0.0-20240222064111-d36e396df7f9 github.com/nsqio/go-nsq v1.1.0 github.com/redis/go-redis/v9 v9.6.1 @@ -38,7 +38,7 @@ require ( github.com/zealic/xignore v0.3.3 golang.org/x/net v0.28.0 golang.org/x/oauth2 v0.22.0 - google.golang.org/grpc v1.65.0 + google.golang.org/grpc v1.66.0 gorm.io/gorm v1.25.11 k8s.io/api v0.31.0 k8s.io/apimachinery v0.31.0 @@ -51,15 +51,15 @@ require ( github.com/AlecAivazis/survey/v2 v2.3.7 // indirect github.com/KyleBanks/depth v1.2.1 // indirect github.com/Masterminds/goutils v1.1.1 // indirect - github.com/Masterminds/semver/v3 v3.2.1 // indirect - github.com/Masterminds/sprig/v3 v3.2.3 // indirect + github.com/Masterminds/semver/v3 v3.3.0 // indirect + github.com/Masterminds/sprig/v3 v3.3.0 // indirect github.com/Microsoft/go-winio v0.6.2 // indirect github.com/ProtonMail/go-crypto v1.0.0 // indirect github.com/alecthomas/units v0.0.0-20240626203959-61d1e3462e30 // indirect github.com/andygrunwald/go-jira v1.16.0 // indirect github.com/armon/go-metrics v0.4.1 // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.4 // indirect - github.com/aws/aws-sdk-go-v2/credentials v1.17.29 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.17.30 // indirect github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.12 // indirect github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.16 // indirect github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.16 // indirect @@ -75,7 +75,7 @@ require ( github.com/aws/aws-sdk-go-v2/service/sts v1.30.5 // indirect github.com/aws/smithy-go v1.20.4 // indirect github.com/beorn7/perks v1.0.1 // indirect - github.com/bytedance/sonic v1.12.1 // indirect + github.com/bytedance/sonic v1.12.2 // indirect github.com/bytedance/sonic/loader v0.2.0 // indirect github.com/c2h5oh/datasize v0.0.0-20231215233829-aa82cc1e6500 // indirect github.com/casbin/casbin/v2 v2.98.0 // indirect @@ -146,16 +146,16 @@ require ( github.com/google/go-querystring v1.1.0 // indirect github.com/google/gofuzz v1.2.0 // indirect github.com/gorilla/mux v1.8.1 // indirect - github.com/grafana/dskit v0.0.0-20240826073544-47b1b6311db3 // indirect + github.com/grafana/dskit v0.0.0-20240829123714-e455adb7444a // indirect github.com/grafana/gomemcache v0.0.0-20240805133030-fdaf6a95408e // indirect github.com/grafana/jsonparser v0.0.0-20240425183733-ea80629e1a32 // indirect - github.com/grafana/loki/pkg/push v0.0.0-20240822152437-246a1dfbe24a // indirect + github.com/grafana/loki/pkg/push v0.0.0-20240829163656-ab1caea12325 // indirect github.com/grafana/loki/v3 v3.1.1 // indirect github.com/grafana/pyroscope-go/godeltaprof v0.1.8 // indirect github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1 // indirect github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0 // indirect - github.com/hashicorp/consul/api v1.29.3 // indirect + github.com/hashicorp/consul/api v1.29.4 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect github.com/hashicorp/go-hclog v1.6.3 // indirect @@ -225,10 +225,10 @@ require ( github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect github.com/prometheus/client_golang v1.20.2 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/common v0.57.0 // indirect github.com/prometheus/exporter-toolkit v0.11.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect - github.com/prometheus/prometheus v0.54.0 // indirect + github.com/prometheus/prometheus v0.54.1 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect @@ -282,8 +282,8 @@ require ( golang.org/x/text v0.17.0 // indirect golang.org/x/time v0.6.0 // indirect golang.org/x/tools v0.24.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240823204242-4ba0660f739c // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240823204242-4ba0660f739c // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20240827150818-7e3bb234dfed // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240827150818-7e3bb234dfed // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect @@ -294,9 +294,9 @@ require ( gorm.io/driver/sqlserver v1.5.3 // indirect gorm.io/plugin/dbresolver v1.5.2 // indirect k8s.io/klog/v2 v2.130.1 // indirect - k8s.io/kube-openapi v0.0.0-20240822171749-76de80e0abd9 // indirect + k8s.io/kube-openapi v0.0.0-20240827152857-f7e401e7b4c2 // indirect k8s.io/utils v0.0.0-20240821151609-f90d01438635 // indirect - modernc.org/libc v1.59.9 // indirect + modernc.org/libc v1.60.0 // indirect modernc.org/mathutil v1.6.0 // indirect modernc.org/memory v1.8.0 // indirect modernc.org/sqlite v1.32.0 // indirect diff --git a/go.sum b/go.sum index da8769e..1186531 100644 --- a/go.sum +++ b/go.sum @@ -40,8 +40,12 @@ github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy86 github.com/Masterminds/semver/v3 v3.2.0/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ= github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0rYXWg0= github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ= +github.com/Masterminds/semver/v3 v3.3.0 h1:B8LGeaivUe71a5qox1ICM/JLl0NqZSW5CHyL+hmvYS0= +github.com/Masterminds/semver/v3 v3.3.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM= github.com/Masterminds/sprig/v3 v3.2.3 h1:eL2fZNezLomi0uOLqjQoN6BfsDD+fyLtgbJMAj9n6YA= github.com/Masterminds/sprig/v3 v3.2.3/go.mod h1:rXcFaZ2zZbLRJv/xSysmlgIM1u11eBaRMhvYXJNkGuM= +github.com/Masterminds/sprig/v3 v3.3.0 h1:mQh0Yrg1XPo6vjYXgtf5OtijNAKJRNcTdOOGZe3tPhs= +github.com/Masterminds/sprig/v3 v3.3.0/go.mod h1:Zy1iXRYNqNLUolqCpL4uhk6SHUMAOSCzdgBfDb35Lz0= github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY= github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= @@ -92,10 +96,14 @@ github.com/aws/aws-sdk-go-v2/config v1.27.28 h1:OTxWGW/91C61QlneCtnD62NLb4W616/N github.com/aws/aws-sdk-go-v2/config v1.27.28/go.mod h1:uzVRVtJSU5EFv6Fu82AoVFKozJi2ZCY6WRCXj06rbvs= github.com/aws/aws-sdk-go-v2/config v1.27.30 h1:AQF3/+rOgeJBQP3iI4vojlPib5X6eeOYoa/af7OxAYg= github.com/aws/aws-sdk-go-v2/config v1.27.30/go.mod h1:yxqvuubha9Vw8stEgNiStO+yZpP68Wm9hLmcm+R/Qk4= +github.com/aws/aws-sdk-go-v2/config v1.27.31 h1:kxBoRsjhT3pq0cKthgj6RU6bXTm/2SgdoUMyrVw0rAI= +github.com/aws/aws-sdk-go-v2/config v1.27.31/go.mod h1:z04nZdSWFPaDwK3DdJOG2r+scLQzMYuJeW0CujEm9FM= github.com/aws/aws-sdk-go-v2/credentials v1.17.28 h1:m8+AHY/ND8CMHJnPoH7PJIRakWGa4gbfbxuY9TGTUXM= github.com/aws/aws-sdk-go-v2/credentials v1.17.28/go.mod h1:6TF7dSc78ehD1SL6KpRIPKMA1GyyWflIkjqg+qmf4+c= github.com/aws/aws-sdk-go-v2/credentials v1.17.29 h1:CwGsupsXIlAFYuDVHv1nnK0wnxO0wZ/g1L8DSK/xiIw= github.com/aws/aws-sdk-go-v2/credentials v1.17.29/go.mod h1:BPJ/yXV92ZVq6G8uYvbU0gSl8q94UB63nMT5ctNO38g= +github.com/aws/aws-sdk-go-v2/credentials v1.17.30 h1:aau/oYFtibVovr2rDt8FHlU17BTicFEMAi29V1U+L5Q= +github.com/aws/aws-sdk-go-v2/credentials v1.17.30/go.mod h1:BPJ/yXV92ZVq6G8uYvbU0gSl8q94UB63nMT5ctNO38g= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.12 h1:yjwoSyDZF8Jth+mUk5lSPJCkMC0lMy6FaCD51jm6ayE= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.12/go.mod h1:fuR57fAgMk7ot3WcNQfb6rSEn+SUffl7ri+aa8uKysI= github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.16 h1:TNyt/+X43KJ9IJJMjKfa3bNTiZbUP7DeCxfbTROESwY= @@ -124,6 +132,8 @@ github.com/aws/aws-sdk-go-v2/service/s3 v1.60.0 h1:2QXGJvG19QwqXUvgcdoCOZPyLuvZf github.com/aws/aws-sdk-go-v2/service/s3 v1.60.0/go.mod h1:BSPI0EfnYUuNHPS0uqIo5VrRwzie+Fp+YhQOUs16sKI= github.com/aws/aws-sdk-go-v2/service/s3 v1.60.1 h1:mx2ucgtv+MWzJesJY9Ig/8AFHgoE5FwLXwUVgW/FGdI= github.com/aws/aws-sdk-go-v2/service/s3 v1.60.1/go.mod h1:BSPI0EfnYUuNHPS0uqIo5VrRwzie+Fp+YhQOUs16sKI= +github.com/aws/aws-sdk-go-v2/service/s3 v1.61.0 h1:Wb544Wh+xfSXqJ/j3R4aX9wrKUoZsJNmilBYZb3mKQ4= +github.com/aws/aws-sdk-go-v2/service/s3 v1.61.0/go.mod h1:BSPI0EfnYUuNHPS0uqIo5VrRwzie+Fp+YhQOUs16sKI= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.32.5 h1:UDXu9dqpCZYonj7poM4kFISjzTdWI0v3WUusM+w+Gfc= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.32.5/go.mod h1:5NPkI3RsTOhwz1CuG7VVSgJCm3CINKkoIaUbUZWQ67w= github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.32.6 h1:3TZlWvCC813uhS1Z4fVTmBhg41OYUrgSlvXqIDDkurw= @@ -154,6 +164,8 @@ github.com/bsm/redislock v0.9.4/go.mod h1:Epf7AJLiSFwLCiZcfi6pWFO/8eAYrYpQXFxEDP github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= github.com/bytedance/sonic v1.12.1 h1:jWl5Qz1fy7X1ioY74WqO0KjAMtAGQs4sYnjiEBiyX24= github.com/bytedance/sonic v1.12.1/go.mod h1:B8Gt/XvtZ3Fqj+iSKMypzymZxw/FVwgIGKzMzT9r/rk= +github.com/bytedance/sonic v1.12.2 h1:oaMFuRTpMHYLpCntGca65YWt5ny+wAceDERTkT2L9lg= +github.com/bytedance/sonic v1.12.2/go.mod h1:B8Gt/XvtZ3Fqj+iSKMypzymZxw/FVwgIGKzMzT9r/rk= github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU= github.com/bytedance/sonic/loader v0.2.0 h1:zNprn+lsIP06C/IqCHs3gPQIvnvpKbbxyXQP1iU4kWM= github.com/bytedance/sonic/loader v0.2.0/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU= @@ -382,6 +394,8 @@ github.com/grafana/dskit v0.0.0-20240820081259-f96e399400b1 h1:D5AcH0HuwL2qQRoJZ github.com/grafana/dskit v0.0.0-20240820081259-f96e399400b1/go.mod h1:c4ASJAo1QFmXGydDzNed2o0+Fncx+x4YmQ1r9HfYU3c= github.com/grafana/dskit v0.0.0-20240826073544-47b1b6311db3 h1:fc4ORkqFiLzuCRD2wGmMXsyDTOLkcl3QUqQwjtAlKcE= github.com/grafana/dskit v0.0.0-20240826073544-47b1b6311db3/go.mod h1:wJbJeQ2ygiGuBKsur7BPPNe+3pSyHEDPtKa7IU3I8ZA= +github.com/grafana/dskit v0.0.0-20240829123714-e455adb7444a h1:6ZCntjsewoGYfHK+ThEIVeCduaF1njbIu0nTC/G3K10= +github.com/grafana/dskit v0.0.0-20240829123714-e455adb7444a/go.mod h1:XoznwASUB2n11UlII8bK7zYd3n6EbR7MPWNJTpc6ADs= github.com/grafana/gomemcache v0.0.0-20240805133030-fdaf6a95408e h1:UlEET0InuoFautfaFp8lDrNF7rPHYXuBMrzwWx9XqFY= github.com/grafana/gomemcache v0.0.0-20240805133030-fdaf6a95408e/go.mod h1:IGRj8oOoxwJbHBYl1+OhS9UjQR0dv6SQOep7HqmtyFU= github.com/grafana/jsonparser v0.0.0-20240425183733-ea80629e1a32 h1:NznuPwItog+rwdVg8hAuGKP29ndRSzJAwhxKldkP8oQ= @@ -390,6 +404,8 @@ github.com/grafana/loki/pkg/push v0.0.0-20240821155943-d43b2de1b4e0 h1:5Rsy2pqoL github.com/grafana/loki/pkg/push v0.0.0-20240821155943-d43b2de1b4e0/go.mod h1:lJEF/Wh5MYlmBem6tOYAFObkLsuikfrEf8Iy9AdMPiQ= github.com/grafana/loki/pkg/push v0.0.0-20240822152437-246a1dfbe24a h1:jZ527OP6YyoxbdGzKcsgr1/EKhMMuv70qdG/fTbsl58= github.com/grafana/loki/pkg/push v0.0.0-20240822152437-246a1dfbe24a/go.mod h1:lJEF/Wh5MYlmBem6tOYAFObkLsuikfrEf8Iy9AdMPiQ= +github.com/grafana/loki/pkg/push v0.0.0-20240829163656-ab1caea12325 h1:/Y/ah6awrcV7omMRmgUPQhoE9Wj/237pLolTcfU8gYk= +github.com/grafana/loki/pkg/push v0.0.0-20240829163656-ab1caea12325/go.mod h1:lJEF/Wh5MYlmBem6tOYAFObkLsuikfrEf8Iy9AdMPiQ= github.com/grafana/loki/v3 v3.1.1 h1:qTVih7srptLmQQnWGD+pp93sYDnONy5S9sSt3mnZBa4= github.com/grafana/loki/v3 v3.1.1/go.mod h1:K/xPywBSTmi4laPLMg7FTFOhljjKxoT2oB0y5j8MNCQ= github.com/grafana/pyroscope-go v1.1.2 h1:7vCfdORYQMCxIzI3NlYAs3FcBP760+gWuYWOyiVyYx8= @@ -406,6 +422,8 @@ github.com/hashicorp/consul/api v1.29.2 h1:aYyRn8EdE2mSfG14S1+L9Qkjtz8RzmaWh6AcN github.com/hashicorp/consul/api v1.29.2/go.mod h1:0YObcaLNDSbtlgzIRtmRXI1ZkeuK0trCBxwZQ4MYnIk= github.com/hashicorp/consul/api v1.29.3 h1:G5y7X38cKYoVkWCDhjPq3x0KjGpuykk6Rus00DHPDo4= github.com/hashicorp/consul/api v1.29.3/go.mod h1:0YObcaLNDSbtlgzIRtmRXI1ZkeuK0trCBxwZQ4MYnIk= +github.com/hashicorp/consul/api v1.29.4 h1:P6slzxDLBOxUSj3fWo2o65VuKtbtOXFi7TSSgtXutuE= +github.com/hashicorp/consul/api v1.29.4/go.mod h1:HUlfw+l2Zy68ceJavv2zAyArl2fqhGWnMycyt56sBgg= github.com/hashicorp/consul/proto-public v0.6.2 h1:+DA/3g/IiKlJZb88NBn0ZgXrxJp2NlvCZdEyl+qxvL0= github.com/hashicorp/consul/proto-public v0.6.2/go.mod h1:cXXbOg74KBNGajC+o8RlA502Esf0R9prcoJgiOX/2Tg= github.com/hashicorp/consul/sdk v0.16.1 h1:V8TxTnImoPD5cj0U9Spl0TUxcytjcbbJeADFF07KdHg= @@ -600,6 +618,8 @@ github.com/montanaflynn/stats v0.7.1 h1:etflOAAHORrCC44V+aR6Ftzort912ZU+YLiSTuV8 github.com/montanaflynn/stats v0.7.1/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow= github.com/mss-boot-io/mss-boot v0.2.7 h1:RnV1G3lMLLu5HwXGIkqRb+p8aGUZyVF+p8tIhK2GnA0= github.com/mss-boot-io/mss-boot v0.2.7/go.mod h1:iPaoDAZQSTesMHEkOHel4svRiB/axBB1+j+unoD+fHY= +github.com/mss-boot-io/mss-boot v0.2.8-0.20240830030606-ddef90cf4b65 h1:e7zpZX5DgG5JxqD9QYTJun8EvnI7zqcUhPlPrI2Klwg= +github.com/mss-boot-io/mss-boot v0.2.8-0.20240830030606-ddef90cf4b65/go.mod h1:8ztwd5TroN8K0Dk36gaocsb8+5YiqCOJhNbbhESqjdM= github.com/mss-boot-io/redisqueue/v2 v2.0.0-20240222064111-d36e396df7f9 h1:/YgpHiqgrxz/0+mKoETXu21c6/fyDt7/j9bdD3UkbdU= github.com/mss-boot-io/redisqueue/v2 v2.0.0-20240222064111-d36e396df7f9/go.mod h1:f/sISkwvecPq37zygQzWNj5ntJoP/jcoK0kPIjFTWFI= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= @@ -673,6 +693,8 @@ github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y8 github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/common v0.57.0 h1:Ro/rKjwdq9mZn1K5QPctzh+MA4Lp0BuYk5ZZEVhoNcY= +github.com/prometheus/common v0.57.0/go.mod h1:7uRPFSUTbfZWsJ7MHY56sqt7hLQu3bxXHDnNhl8E9qI= github.com/prometheus/common/sigv4 v0.1.0 h1:qoVebwtwwEhS85Czm2dSROY5fTo2PAPEVdDeppTwGX4= github.com/prometheus/common/sigv4 v0.1.0/go.mod h1:2Jkxxk9yYvCkE5G1sQT7GuEXm57JrvHu9k5YwTjsNtI= github.com/prometheus/exporter-toolkit v0.11.0 h1:yNTsuZ0aNCNFQ3aFTD2uhPOvr4iD7fdBvKPAEGkNf+g= @@ -684,6 +706,8 @@ github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0leargg github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= github.com/prometheus/prometheus v0.54.0 h1:6+VmEkohHcofl3W5LyRlhw1Lfm575w/aX6ZFyVAmzM0= github.com/prometheus/prometheus v0.54.0/go.mod h1:xlLByHhk2g3ycakQGrMaU8K7OySZx98BzeCR99991NY= +github.com/prometheus/prometheus v0.54.1 h1:vKuwQNjnYN2/mDoWfHXDhAsz/68q/dQDb+YbcEqU7MQ= +github.com/prometheus/prometheus v0.54.1/go.mod h1:xlLByHhk2g3ycakQGrMaU8K7OySZx98BzeCR99991NY= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/redis/go-redis/v9 v9.6.1 h1:HHDteefn6ZkTtY5fGUE8tj8uy85AHk6zP7CpzIAM0y4= @@ -1012,13 +1036,19 @@ google.golang.org/genproto/googleapis/api v0.0.0-20240820151423-278611b39280 h1: google.golang.org/genproto/googleapis/api v0.0.0-20240820151423-278611b39280/go.mod h1:fO8wJzT2zbQbAjbIoos1285VfEIYKDDY+Dt+WpTkh6g= google.golang.org/genproto/googleapis/api v0.0.0-20240823204242-4ba0660f739c h1:e0zB268kOca6FbuJkYUGxfwG4DKFZG/8DLyv9Zv66cE= google.golang.org/genproto/googleapis/api v0.0.0-20240823204242-4ba0660f739c/go.mod h1:fO8wJzT2zbQbAjbIoos1285VfEIYKDDY+Dt+WpTkh6g= +google.golang.org/genproto/googleapis/api v0.0.0-20240827150818-7e3bb234dfed h1:3RgNmBoI9MZhsj3QxC+AP/qQhNwpCLOvYDYYsFrhFt0= +google.golang.org/genproto/googleapis/api v0.0.0-20240827150818-7e3bb234dfed/go.mod h1:OCdP9MfskevB/rbYvHTsXTtKC+3bHWajPdoKgjcYkfo= google.golang.org/genproto/googleapis/rpc v0.0.0-20240820151423-278611b39280 h1:XQMA2e105XNlEZ8NRF0HqnUOZzP14sUSsgL09kpdNnU= google.golang.org/genproto/googleapis/rpc v0.0.0-20240820151423-278611b39280/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= google.golang.org/genproto/googleapis/rpc v0.0.0-20240823204242-4ba0660f739c h1:Kqjm4WpoWvwhMPcrAczoTyMySQmYa9Wy2iL6Con4zn8= google.golang.org/genproto/googleapis/rpc v0.0.0-20240823204242-4ba0660f739c/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240827150818-7e3bb234dfed h1:J6izYgfBXAI3xTKLgxzTmUltdYaLsuBxFCgDHWJ/eXg= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240827150818-7e3bb234dfed/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= google.golang.org/grpc v1.12.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= +google.golang.org/grpc v1.66.0 h1:DibZuoBznOxbDQxRINckZcUvnCEvrW9pcWIE2yF9r1c= +google.golang.org/grpc v1.66.0/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y= google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= @@ -1070,6 +1100,8 @@ k8s.io/kube-openapi v0.0.0-20240816214639-573285566f34 h1:/amS69DLm09mtbFtN3+Lyy k8s.io/kube-openapi v0.0.0-20240816214639-573285566f34/go.mod h1:G0W3eI9gG219NHRq3h5uQaRBl4pj4ZpwzRP5ti8y770= k8s.io/kube-openapi v0.0.0-20240822171749-76de80e0abd9 h1:y+4z/s0h3R97P/o/098DSjlpyNpHzGirNPlTL+GHdqY= k8s.io/kube-openapi v0.0.0-20240822171749-76de80e0abd9/go.mod h1:s4yb9FXajAVNRnxSB5Ckpr/oq2LP4mKSMWeZDVppd30= +k8s.io/kube-openapi v0.0.0-20240827152857-f7e401e7b4c2 h1:GKE9U8BH16uynoxQii0auTjmmmuZ3O0LFMN6S0lPPhI= +k8s.io/kube-openapi v0.0.0-20240827152857-f7e401e7b4c2/go.mod h1:coRQXBK9NxO98XUv3ZD6AK3xzHCxV6+b7lrquKwaKzA= k8s.io/utils v0.0.0-20240821151609-f90d01438635 h1:2wThSvJoW/Ncn9TmQEYXRnevZXi2duqHWf5OX9S3zjI= k8s.io/utils v0.0.0-20240821151609-f90d01438635/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= modernc.org/cc/v4 v4.21.4 h1:3Be/Rdo1fpr8GrQ7IVw9OHtplU4gWbb+wNgeoBMmGLQ= @@ -1082,6 +1114,8 @@ modernc.org/gc/v2 v2.5.0 h1:bJ9ChznK1L1mUtAQtxi0wi5AtAs5jQuw4PrPHO5pb6M= modernc.org/gc/v2 v2.5.0/go.mod h1:wzN5dK1AzVGoH6XOzc3YZ+ey/jPgYHLuVckd62P0GYU= modernc.org/libc v1.59.9 h1:k+nNDDakwipimgmJ1D9H466LhFeSkaPPycAs1OZiDmY= modernc.org/libc v1.59.9/go.mod h1:EY/egGEU7Ju66eU6SBqCNYaFUDuc4npICkMWnU5EE3A= +modernc.org/libc v1.60.0 h1:XeRF1gXky7JE5E8IErtYAdKj+ykZPdYUsgJNQ8RFWIA= +modernc.org/libc v1.60.0/go.mod h1:xJuobKuNxKH3RUatS7GjR+suWj+5c2K7bi4m/S5arOY= modernc.org/mathutil v1.6.0 h1:fRe9+AmYlaej+64JsEEhoWuAYBkOtQiMEU7n/XgfYi4= modernc.org/mathutil v1.6.0/go.mod h1:Ui5Q9q1TR2gFm0AQRqQUaBWFLAhQpCwNcuhBOSedWPo= modernc.org/memory v1.8.0 h1:IqGTL6eFMaDZZhEWwcREgeMXYwmW83LYW8cROZYkg+E= diff --git a/models/task.go b/models/task.go index ad9bf89..ca85a9a 100644 --- a/models/task.go +++ b/models/task.go @@ -40,31 +40,31 @@ const ( type Task struct { ModelGormTenant ModelCreator - Name string `json:"name" gorm:"type:varchar(255);not null;comment:任务名称"` - Namespace string `json:"namespace" gorm:"type:varchar(255);not null;comment:命名空间"` - Cluster string `json:"cluster" gorm:"type:varchar(50);comment:集群"` - Provider TaskProvider `json:"provider" gorm:"type:varchar(255);not null;comment:提供者"` - Image string `json:"image" gorm:"type:varchar(255);not null;default:default;comment:镜像"` - EntryID int `json:"entryID" gorm:"size:10;comment:任务ID"` - Spec string `json:"spec" gorm:"type:varchar(255);not null;comment:任务规则"` - Command string `json:"command" gorm:"type:varchar(255);not null;comment:命令"` - Args string `json:"args" gorm:"type:text"` - Once bool `json:"once" gorm:"-"` - Protocol string `json:"protocol" gorm:"size:10"` - Endpoint string `json:"endpoint" gorm:"type:varchar(255);not null;comment:地址"` - Body string `json:"body" gorm:"type:bytes"` - Status enum.Status `json:"status" gorm:"size:10"` - Remark string `json:"remark" gorm:"type:text"` - CheckedAtR *time.Time `gorm:"-" json:"checkedAt"` - CheckedAt sql.NullTime `gorm:"index" swaggertype:"string" json:"-"` - Timeout int `json:"timeout"` - Method string `gorm:"size:10" json:"method"` - Python string `json:"python"` - Metadata string `json:"metadata" gorm:"type:bytes"` + Name string `json:"name" gorm:"type:varchar(255);not null;comment:任务名称"` + Namespace string `json:"namespace" gorm:"type:varchar(255);not null;comment:命名空间"` + Cluster string `json:"cluster" gorm:"type:varchar(50);comment:集群"` + Provider TaskProvider `json:"provider" gorm:"type:varchar(255);not null;comment:提供者"` + Image string `json:"image" gorm:"type:varchar(255);not null;default:default;comment:镜像"` + EntryID int `json:"entryID" gorm:"size:10;comment:任务ID"` + Spec string `json:"spec" gorm:"type:varchar(255);not null;comment:任务规则"` + Command JsonRawMessage `json:"command" gorm:"type:varchar(255);not null;comment:命令"` + Args JsonRawMessage `json:"args" gorm:"type:text"` + Once bool `json:"once" gorm:"-"` + Protocol string `json:"protocol" gorm:"size:10"` + Endpoint string `json:"endpoint" gorm:"type:varchar(255);not null;comment:地址"` + Body string `json:"body" gorm:"type:bytes"` + Status enum.Status `json:"status" gorm:"size:10"` + Remark string `json:"remark" gorm:"type:text"` + CheckedAtR *time.Time `gorm:"-" json:"checkedAt"` + CheckedAt sql.NullTime `gorm:"index" swaggertype:"string" json:"-"` + Timeout int `json:"timeout"` + Method string `gorm:"size:10" json:"method"` + Python string `json:"python"` + Metadata string `json:"metadata" gorm:"type:bytes"` } func (t *Task) GetArgs() []string { - if t.Args == "" { + if len(t.Args) == 0 { return nil } args := make([]string, 0) @@ -76,7 +76,7 @@ func (t *Task) GetArgs() []string { } func (t *Task) GetCommand() []string { - if t.Command == "" { + if len(t.Command) == 0 { return nil } commands := make([]string, 0) @@ -101,10 +101,6 @@ func (t *Task) AfterCreate(tx *gorm.DB) error { return fmt.Errorf("cluster %s not found", t.Cluster) } var limitCount int32 = 10 - command := make([]string, 0) - if t.Command != "" { - command = append(command, t.Command) - } if t.Namespace == "" { t.Namespace = "default" } @@ -251,7 +247,7 @@ func (t *Task) Run() { Name: t.Name, Endpoint: fmt.Sprintf("%s://%s", t.Protocol, t.Endpoint), Method: t.Method, - Command: t.Command, + Command: t.GetCommand()[0], Body: bytes.NewBuffer([]byte(t.Body)), Args: t.GetArgs(), Python: t.Python, diff --git a/models/type.go b/models/type.go index 1968a81..37d37b0 100644 --- a/models/type.go +++ b/models/type.go @@ -9,6 +9,7 @@ import ( "github.com/gin-gonic/gin" "github.com/mss-boot-io/mss-boot-admin/center" "github.com/mss-boot-io/mss-boot/pkg/response/actions" + "github.com/spf13/cast" "gorm.io/gorm" ) @@ -19,6 +20,24 @@ import ( * @Last Modified time: 2023/12/5 23:09:49 */ +type JsonRawMessage string + +func (j *JsonRawMessage) Scan(val any) error { + if val == nil { + return nil + } + s := cast.ToString(val) + *j = JsonRawMessage(s) + return nil +} + +func (j *JsonRawMessage) Value() (driver.Value, error) { + if len(*j) == 0 { + return nil, nil + } + return json.RawMessage(*j), nil +} + type ArrayString []string func (a *ArrayString) Scan(val any) error {