diff --git a/README.En.md b/README.En.md index 1dc7799b..5384c70d 100644 --- a/README.En.md +++ b/README.En.md @@ -5,10 +5,10 @@ **English** | [中文](./README.md) --- -[![Go-Zero](https://img.shields.io/badge/Go--Zero-v1.7.3-brightgreen.svg)](https://go-zero.dev/) +[![Go-Zero](https://img.shields.io/badge/Go--Zero-v1.7.4-brightgreen.svg)](https://go-zero.dev/) [![Ent](https://img.shields.io/badge/Ent-v0.14.1-blue.svg)](https://entgo.io/) [![Casbin](https://img.shields.io/badge/Casbin-v2.99.0-orange.svg)](https://github.com/casbin/casbin) -[![Release](https://img.shields.io/badge/Release-v1.5.8-green.svg)](https://github.com/suyuan32/simple-admin-core/releases) +[![Release](https://img.shields.io/badge/Release-v1.6.0-green.svg)](https://github.com/suyuan32/simple-admin-core/releases) [![License: Apache2.0](https://img.shields.io/badge/License-Apache2.0-yellow.svg)](https://opensource.org/licenses/MIT) ![公众号](https://img.shields.io/badge/%E5%85%AC%E4%BC%97%E5%8F%B7-%E5%87%A0%E9%A2%97%E9%85%A5-blue) ![注意](https://img.shields.io/badge/%E6%B3%A8%E6%84%8F-%E5%85%B3%E6%B3%A8%E5%85%AC%E4%BC%97%E5%8F%B7%E5%8A%A0%E5%85%A5%E5%BE%AE%E4%BF%A1%E7%BE%A4-blue) diff --git a/README.md b/README.md index 6f662b59..04274c46 100644 --- a/README.md +++ b/README.md @@ -5,10 +5,10 @@ **中文** | [English](./README.En.md) --- -[![Go-Zero](https://img.shields.io/badge/Go--Zero-v1.7.3-brightgreen.svg)](https://go-zero.dev/) +[![Go-Zero](https://img.shields.io/badge/Go--Zero-v1.7.4-brightgreen.svg)](https://go-zero.dev/) [![Ent](https://img.shields.io/badge/Ent-v0.14.1-blue.svg)](https://entgo.io/) [![Casbin](https://img.shields.io/badge/Casbin-v2.99.0-orange.svg)](https://github.com/casbin/casbin) -[![Release](https://img.shields.io/badge/Release-v1.5.8-green.svg)](https://github.com/suyuan32/simple-admin-core/releases) +[![Release](https://img.shields.io/badge/Release-v1.6.0-green.svg)](https://github.com/suyuan32/simple-admin-core/releases) [![License: Apache2.0](https://img.shields.io/badge/License-Apache2.0-yellow.svg)](https://opensource.org/licenses/MIT) ![公众号](https://img.shields.io/badge/%E5%85%AC%E4%BC%97%E5%8F%B7-%E5%87%A0%E9%A2%97%E9%85%A5-blue) ![注意](https://img.shields.io/badge/%E6%B3%A8%E6%84%8F-%E5%85%B3%E6%B3%A8%E5%85%AC%E4%BC%97%E5%8F%B7%E5%8A%A0%E5%85%A5%E5%BE%AE%E4%BF%A1%E7%BE%A4-blue) diff --git a/api/core.go b/api/core.go index dfe8d65e..b3363f31 100644 --- a/api/core.go +++ b/api/core.go @@ -5,7 +5,7 @@ // Schemes: http, https // Host: localhost:9100 // BasePath: / -// Version: 1.5.8 +// Version: 1.6.0 // Contact: yuansu.china.work@gmail.com // SecurityDefinitions: // Token: diff --git a/core.json b/core.json index 0d29469e..69d0f859 100644 --- a/core.json +++ b/core.json @@ -16,7 +16,7 @@ "contact": { "email": "yuansu.china.work@gmail.com" }, - "version": "1.5.8" + "version": "1.6.0" }, "host": "localhost:9100", "basePath": "/", diff --git a/deploy/docker-compose/all_in_one/mysql/docker-compose-cn.yaml b/deploy/docker-compose/all_in_one/mysql/docker-compose-cn.yaml index 7bf07a5e..df57b14b 100644 --- a/deploy/docker-compose/all_in_one/mysql/docker-compose-cn.yaml +++ b/deploy/docker-compose/all_in_one/mysql/docker-compose-cn.yaml @@ -57,7 +57,7 @@ services: memory: 200M core-rpc: - image: registry.cn-hangzhou.aliyuncs.com/simple_admin/core-rpc-docker:v1.5.8 + image: registry.cn-hangzhou.aliyuncs.com/simple_admin/core-rpc-docker:v1.6.0 container_name: core-rpc restart: always ports: @@ -82,7 +82,7 @@ services: memory: 200M job-rpc: - image: registry.cn-hangzhou.aliyuncs.com/simple_admin/job-rpc-docker:v1.5.8 + image: registry.cn-hangzhou.aliyuncs.com/simple_admin/job-rpc-docker:v1.6.0 container_name: job-rpc restart: always ports: @@ -107,7 +107,7 @@ services: memory: 200M core-api: - image: registry.cn-hangzhou.aliyuncs.com/simple_admin/core-api-docker:v1.5.8 + image: registry.cn-hangzhou.aliyuncs.com/simple_admin/core-api-docker:v1.6.0 container_name: core-api restart: always environment: @@ -134,7 +134,7 @@ services: memory: 200M backend-ui: - image: registry.cn-hangzhou.aliyuncs.com/simple_admin/backend-ui-docker:v1.5.8 + image: registry.cn-hangzhou.aliyuncs.com/simple_admin/backend-ui-vben5:v1.6.0-rc.2 container_name: backend-ui restart: always ports: @@ -153,7 +153,7 @@ services: memory: 200M fms-api: - image: registry.cn-hangzhou.aliyuncs.com/simple_admin/fms-api-docker:v1.5.8 + image: registry.cn-hangzhou.aliyuncs.com/simple_admin/fms-api-docker:v1.6.0 container_name: fms-api restart: always # environment: @@ -184,7 +184,7 @@ services: memory: 200M mcms-rpc: - image: registry.cn-hangzhou.aliyuncs.com/simple_admin/mcms-rpc-docker:v1.5.8 + image: registry.cn-hangzhou.aliyuncs.com/simple_admin/mcms-rpc-docker:v1.6.0 container_name: mcms-rpc restart: always environment: diff --git a/deploy/docker-compose/all_in_one/mysql/docker-compose.yaml b/deploy/docker-compose/all_in_one/mysql/docker-compose.yaml index f9d9be8e..185c2a54 100644 --- a/deploy/docker-compose/all_in_one/mysql/docker-compose.yaml +++ b/deploy/docker-compose/all_in_one/mysql/docker-compose.yaml @@ -57,7 +57,7 @@ services: memory: 200M core-rpc: - image: ryanpower/core-rpc-docker:v1.5.8 + image: ryanpower/core-rpc-docker:v1.6.0 container_name: core-rpc restart: always ports: @@ -82,7 +82,7 @@ services: memory: 200M job-rpc: - image: ryanpower/job-rpc-docker:v1.5.8 + image: ryanpower/job-rpc-docker:v1.6.0 container_name: job-rpc restart: always ports: @@ -107,7 +107,7 @@ services: memory: 200M core-api: - image: ryanpower/core-api-docker:v1.5.8 + image: ryanpower/core-api-docker:v1.6.0 container_name: core-api restart: always environment: @@ -134,7 +134,7 @@ services: memory: 200M backend-ui: - image: ryanpower/backend-ui-docker:v1.5.8 + image: ryanpower/backend-ui-vben5:v1.6.0-rc.2 container_name: backend-ui restart: always ports: @@ -153,7 +153,7 @@ services: memory: 200M fms-api: - image: ryanpower/fms-api-docker:v1.5.8 + image: ryanpower/fms-api-docker:v1.6.0 container_name: fms-api restart: always # environment: @@ -184,7 +184,7 @@ services: memory: 200M mcms-rpc: - image: ryanpower/mcms-rpc-docker:v1.5.8 + image: ryanpower/mcms-rpc-docker:v1.6.0 container_name: mcms-rpc restart: always environment: diff --git a/deploy/docker-compose/all_in_one/postgresql/docker-compose-cn.yaml b/deploy/docker-compose/all_in_one/postgresql/docker-compose-cn.yaml index 85549ded..c251e41f 100644 --- a/deploy/docker-compose/all_in_one/postgresql/docker-compose-cn.yaml +++ b/deploy/docker-compose/all_in_one/postgresql/docker-compose-cn.yaml @@ -56,7 +56,7 @@ services: memory: 200M core-rpc: - image: registry.cn-hangzhou.aliyuncs.com/simple_admin/core-rpc-docker:v1.5.8 + image: registry.cn-hangzhou.aliyuncs.com/simple_admin/core-rpc-docker:v1.6.0 container_name: core-rpc restart: always # ports: @@ -75,7 +75,7 @@ services: memory: 200M job-rpc: - image: registry.cn-hangzhou.aliyuncs.com/simple_admin/job-rpc-docker:v1.5.8 + image: registry.cn-hangzhou.aliyuncs.com/simple_admin/job-rpc-docker:v1.6.0 container_name: job-rpc restart: always # ports: @@ -94,7 +94,7 @@ services: memory: 200M core-api: - image: registry.cn-hangzhou.aliyuncs.com/simple_admin/core-api-docker:v1.5.8 + image: registry.cn-hangzhou.aliyuncs.com/simple_admin/core-api-docker:v1.6.0 container_name: core-api restart: always # environment: @@ -116,7 +116,7 @@ services: memory: 200M backend-ui: - image: registry.cn-hangzhou.aliyuncs.com/simple_admin/backend-ui-docker:v1.5.8 + image: registry.cn-hangzhou.aliyuncs.com/simple_admin/backend-ui-vben5:v1.6.0-rc.2 container_name: backend-ui restart: always ports: @@ -135,7 +135,7 @@ services: memory: 200M fms-api: - image: registry.cn-hangzhou.aliyuncs.com/simple_admin/fms-api-docker:v1.5.8 + image: registry.cn-hangzhou.aliyuncs.com/simple_admin/fms-api-docker:v1.6.0 container_name: fms-api restart: always # environment: @@ -160,7 +160,7 @@ services: memory: 200M mcms-rpc: - image: registry.cn-hangzhou.aliyuncs.com/simple_admin/mcms-rpc-docker:v1.5.8 + image: registry.cn-hangzhou.aliyuncs.com/simple_admin/mcms-rpc-docker:v1.6.0 container_name: mcms-rpc restart: always # environment: diff --git a/deploy/docker-compose/all_in_one/postgresql/docker-compose.yaml b/deploy/docker-compose/all_in_one/postgresql/docker-compose.yaml index b4ca9c52..a2bff630 100644 --- a/deploy/docker-compose/all_in_one/postgresql/docker-compose.yaml +++ b/deploy/docker-compose/all_in_one/postgresql/docker-compose.yaml @@ -56,7 +56,7 @@ services: memory: 200M core-rpc: - image: ryanpower/core-rpc-docker:v1.5.8 + image: ryanpower/core-rpc-docker:v1.6.0 container_name: core-rpc restart: always # ports: @@ -75,7 +75,7 @@ services: memory: 200M job-rpc: - image: ryanpower/job-rpc-docker:v1.5.8 + image: ryanpower/job-rpc-docker:v1.6.0 container_name: job-rpc restart: always # ports: @@ -94,7 +94,7 @@ services: memory: 200M core-api: - image: ryanpower/core-api-docker:v1.5.8 + image: ryanpower/core-api-docker:v1.6.0 container_name: core-api restart: always # environment: @@ -116,7 +116,7 @@ services: memory: 200M backend-ui: - image: ryanpower/backend-ui-docker:v1.5.8 + image: ryanpower/backend-ui-vben5:v1.6.0-rc.2 container_name: backend-ui restart: always ports: @@ -135,7 +135,7 @@ services: memory: 200M fms-api: - image: ryanpower/fms-api-docker:v1.5.8 + image: ryanpower/fms-api-docker:v1.6.0 container_name: fms-api restart: always # environment: @@ -160,7 +160,7 @@ services: memory: 200M mcms-rpc: - image: ryanpower/mcms-rpc-docker:v1.5.8 + image: ryanpower/mcms-rpc-docker:v1.6.0 container_name: mcms-rpc restart: always # environment: diff --git a/deploy/docker-compose/core-only/docker-compose-cn.yaml b/deploy/docker-compose/core-only/docker-compose-cn.yaml index 7851a848..a1074083 100644 --- a/deploy/docker-compose/core-only/docker-compose-cn.yaml +++ b/deploy/docker-compose/core-only/docker-compose-cn.yaml @@ -55,7 +55,7 @@ services: memory: 200M core-rpc: - image: registry.cn-hangzhou.aliyuncs.com/simple_admin/core-rpc-docker:v1.5.8 + image: registry.cn-hangzhou.aliyuncs.com/simple_admin/core-rpc-docker:v1.6.0 container_name: core-rpc restart: always ports: @@ -74,7 +74,7 @@ services: memory: 200M core-api: - image: registry.cn-hangzhou.aliyuncs.com/simple_admin/core-api-docker:v1.5.8 + image: registry.cn-hangzhou.aliyuncs.com/simple_admin/core-api-docker:v1.6.0 container_name: core-api restart: always # environment: diff --git a/deploy/docker-compose/core-only/docker-compose.yaml b/deploy/docker-compose/core-only/docker-compose.yaml index 0c28d6f8..87b19965 100644 --- a/deploy/docker-compose/core-only/docker-compose.yaml +++ b/deploy/docker-compose/core-only/docker-compose.yaml @@ -55,7 +55,7 @@ services: memory: 200M core-rpc: - image: ryanpower/core-rpc-docker:v1.5.8 + image: ryanpower/core-rpc-docker:v1.6.0 container_name: core-rpc restart: always ports: @@ -74,7 +74,7 @@ services: memory: 200M core-api: - image: ryanpower/core-api-docker:v1.5.8 + image: ryanpower/core-api-docker:v1.6.0 container_name: core-api restart: always # environment: diff --git a/go.mod b/go.mod index e2a8f0fd..2f49452c 100644 --- a/go.mod +++ b/go.mod @@ -5,16 +5,16 @@ go 1.23.0 require ( entgo.io/ent v0.14.1 github.com/bsm/redislock v0.9.4 - github.com/casbin/casbin/v2 v2.100.0 + github.com/casbin/casbin/v2 v2.101.0 github.com/duke-git/lancet/v2 v2.3.3 github.com/gofrs/uuid/v5 v5.3.0 github.com/larksuite/oapi-sdk-go/v3 v3.3.7 github.com/mojocn/base64Captcha v1.3.6 github.com/redis/go-redis/v9 v9.7.0 - github.com/suyuan32/simple-admin-common v1.5.8 - github.com/suyuan32/simple-admin-job v1.5.8 - github.com/suyuan32/simple-admin-message-center v1.5.8 - github.com/zeromicro/go-zero v1.7.3 + github.com/suyuan32/simple-admin-common v1.6.0 + github.com/suyuan32/simple-admin-job v1.6.0 + github.com/suyuan32/simple-admin-message-center v1.6.0 + github.com/zeromicro/go-zero v1.7.4 golang.org/x/oauth2 v0.24.0 google.golang.org/grpc v1.68.0 google.golang.org/protobuf v1.35.2 @@ -41,7 +41,7 @@ require ( github.com/emicklei/go-restful/v3 v3.12.1 // indirect github.com/fatih/color v1.18.0 // indirect github.com/fxamacker/cbor/v2 v2.7.0 // indirect - github.com/gabriel-vasile/mimetype v1.4.6 // indirect + github.com/gabriel-vasile/mimetype v1.4.7 // indirect github.com/go-logr/logr v1.4.2 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-openapi/inflect v0.21.0 // indirect @@ -50,7 +50,7 @@ require ( github.com/go-openapi/swag v0.23.0 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect - github.com/go-playground/validator/v10 v10.22.1 // indirect + github.com/go-playground/validator/v10 v10.23.0 // indirect github.com/go-sql-driver/mysql v1.8.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt/v5 v5.2.1 // indirect @@ -61,8 +61,8 @@ require ( github.com/google/go-cmp v0.6.0 // indirect github.com/google/gofuzz v1.2.0 // indirect github.com/google/uuid v1.6.0 // indirect - github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0 // indirect - github.com/hashicorp/hcl/v2 v2.22.0 // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 // indirect + github.com/hashicorp/hcl/v2 v2.23.0 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect github.com/jackc/pgx/v5 v5.7.1 // indirect @@ -118,14 +118,14 @@ require ( golang.org/x/text v0.20.0 // indirect golang.org/x/time v0.8.0 // indirect golang.org/x/tools v0.27.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20241113202542-65e8d215514f // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20241113202542-65e8d215514f // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20241118233622-e639e219e697 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20241118233622-e639e219e697 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/api v0.31.2 // indirect - k8s.io/apimachinery v0.31.2 // indirect - k8s.io/client-go v0.31.2 // indirect + k8s.io/api v0.31.3 // indirect + k8s.io/apimachinery v0.31.3 // indirect + k8s.io/client-go v0.31.3 // indirect k8s.io/klog/v2 v2.130.1 // indirect k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect k8s.io/utils v0.0.0-20241104163129-6fe5fd82f078 // indirect @@ -134,6 +134,6 @@ require ( sigs.k8s.io/yaml v1.4.0 // indirect ) -replace github.com/zeromicro/go-zero v1.7.3 => github.com/suyuan32/simple-admin-tools v1.7.3 +replace github.com/zeromicro/go-zero v1.7.4 => github.com/suyuan32/simple-admin-tools v1.7.4 replace github.com/mojocn/base64Captcha v1.3.6 => github.com/suyuan32/base64Captcha v1.3.7 diff --git a/go.sum b/go.sum index 086ba57e..df84bc69 100644 --- a/go.sum +++ b/go.sum @@ -29,8 +29,8 @@ github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA= github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0= github.com/bsm/redislock v0.9.4 h1:X/Wse1DPpiQgHbVYRE9zv6m070UcKoOGekgvpNhiSvw= github.com/bsm/redislock v0.9.4/go.mod h1:Epf7AJLiSFwLCiZcfi6pWFO/8eAYrYpQXFxEDPoDeAk= -github.com/casbin/casbin/v2 v2.100.0 h1:aeugSNjjHfCrgA22nHkVvw2xsscboHv5r0a13ljQKGQ= -github.com/casbin/casbin/v2 v2.100.0/go.mod h1:LO7YPez4dX3LgoTCqSQAleQDo0S0BeZBDxYnPUl95Ng= +github.com/casbin/casbin/v2 v2.101.0 h1:y8qZRXcgv5omd3k/7kpaP03Hov82sXzCC5FAfm17lkw= +github.com/casbin/casbin/v2 v2.101.0/go.mod h1:LO7YPez4dX3LgoTCqSQAleQDo0S0BeZBDxYnPUl95Ng= github.com/casbin/ent-adapter v0.4.0 h1:6oI5WM9381jQHD8FHniwt2YVFBDSfhiGm8WSRxHvf2k= github.com/casbin/ent-adapter v0.4.0/go.mod h1:KB4oWisGpwobTH8Yx70UDo7D24/BcKQfdmaBWsGEid0= github.com/casbin/govaluate v1.2.0 h1:wXCXFmqyY+1RwiKfYo3jMKyrtZmOL3kHwaqDyCPOYak= @@ -59,8 +59,8 @@ github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM= github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU= github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E= github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ= -github.com/gabriel-vasile/mimetype v1.4.6 h1:3+PzJTKLkvgjeTbts6msPJt4DixhT4YtFNf1gtGe3zc= -github.com/gabriel-vasile/mimetype v1.4.6/go.mod h1:JX1qVKqZd40hUPpAfiNTe0Sne7hdfKSbOqqmkq8GCXc= +github.com/gabriel-vasile/mimetype v1.4.7 h1:SKFKl7kD0RiPdbht0s7hFtjl489WcQ1VyPW8ZzUMYCA= +github.com/gabriel-vasile/mimetype v1.4.7/go.mod h1:GDlAgAyIRT27BhFl53XNAFtfjzOkLaF35JdEG0P7LtU= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= @@ -80,8 +80,8 @@ github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/o github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= -github.com/go-playground/validator/v10 v10.22.1 h1:40JcKH+bBNGFczGuoBYgX4I6m/i27HYW8P9FDk5PbgA= -github.com/go-playground/validator/v10 v10.22.1/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= +github.com/go-playground/validator/v10 v10.23.0 h1:/PwmTwZhS0dPkav3cdK9kV1FsAmrL8sThn8IHr/sO+o= +github.com/go-playground/validator/v10 v10.23.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y= github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= @@ -116,12 +116,12 @@ github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8/go.mod h1:K1liHPHnj73 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0 h1:ad0vkEBuk23VJzZR9nkLVG0YAoN9coASF1GusYX6AlU= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0/go.mod h1:igFoXX2ELCW06bol23DWPB5BEWfZISOzSP5K2sbLea0= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 h1:TmHmbvxPmaegwhDubVz0lICL0J5Ka2vwTzhoePEXsGE= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0/go.mod h1:qztMSjm835F2bXf+5HKAPIS5qsmQDqZna/PgVt4rWtI= github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542 h1:2VTzZjLZBgl62/EtslCrtky5vbi9dd7HrQPQIx6wqiw= github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542/go.mod h1:Ow0tF8D4Kplbc8s8sSb3V2oUCygFHVp8gC3Dn6U4MNI= -github.com/hashicorp/hcl/v2 v2.22.0 h1:hkZ3nCtqeJsDhPRFz5EA9iwcG1hNWGePOTw6oyul12M= -github.com/hashicorp/hcl/v2 v2.22.0/go.mod h1:62ZYHrXgPoX8xBnzl8QzbWq4dyDsDtfCRgIq1rbJEvA= +github.com/hashicorp/hcl/v2 v2.23.0 h1:Fphj1/gCylPxHutVSEOf2fBOh1VE4AuLV7+kbJf3qos= +github.com/hashicorp/hcl/v2 v2.23.0/go.mod h1:62ZYHrXgPoX8xBnzl8QzbWq4dyDsDtfCRgIq1rbJEvA= github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo= @@ -206,18 +206,18 @@ github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= -github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/suyuan32/base64Captcha v1.3.7 h1:B5+ArqVlnzdO+5oyHzvz1nKSipUcicaHEBMFZb7hpv4= github.com/suyuan32/base64Captcha v1.3.7/go.mod h1:XXuqS4lYf+ANu15oTrA2Z47hv8R2h9nVVH5IJRmxLZQ= -github.com/suyuan32/simple-admin-common v1.5.8 h1:JR9WR2tx8HrIM+uASemm/avibQaZqDC5pHfpBAJu64g= -github.com/suyuan32/simple-admin-common v1.5.8/go.mod h1:/SraAzKRK/PyMI9ErZa5F4G1s7KMYZODgZ+/regbfsY= -github.com/suyuan32/simple-admin-job v1.5.8 h1:F133F+kLibXe/zJqJMgfXp9AIZAp/DLhosL+urzYk88= -github.com/suyuan32/simple-admin-job v1.5.8/go.mod h1:By+lUNa0rmnX+0BexfBtKhy3B/9/csF+xlxqsnKa6L4= -github.com/suyuan32/simple-admin-message-center v1.5.8 h1:NN27QNS+q6qc7Rl1fVW3keKdhtS2QBPgHCcw7v/WCCU= -github.com/suyuan32/simple-admin-message-center v1.5.8/go.mod h1:2PKZXd7dbe0Vxs7H3SnlWEDs5EhIwli2uPIn0YKb/lI= -github.com/suyuan32/simple-admin-tools v1.7.3 h1:OCdhJHD2d2iV1/M9Cscm7EKxW6ijbz9ZTiCW/1ocJfI= -github.com/suyuan32/simple-admin-tools v1.7.3/go.mod h1:idMLZbmSlcy7ZUld/t5VUA/rP/DUDtzj7BxDQZQ5jlM= +github.com/suyuan32/simple-admin-common v1.6.0 h1:lTjTSQWO/HvGLEcBdewi+WY6Di6aZD05UhNmjLPKfbw= +github.com/suyuan32/simple-admin-common v1.6.0/go.mod h1:ofRX+rp7/KnuW0h3T09ao1HnOOrN4owf3fmzkZcOBuc= +github.com/suyuan32/simple-admin-job v1.6.0 h1:a6nlP7RchJlQg7tHdxXP2LR/IG/NoHlGE7r/9Q1158I= +github.com/suyuan32/simple-admin-job v1.6.0/go.mod h1:XFzIWlcbnxBizGlz6S2U5Kb6O7SIsH82TsHxCv2G198= +github.com/suyuan32/simple-admin-message-center v1.6.0 h1:7i9IQzhG3mL8BALrPLk29UQXeAOWbucLbfIIsFRQG6U= +github.com/suyuan32/simple-admin-message-center v1.6.0/go.mod h1:/CsN3tRvtmcOKNubF6GvSx6aZkiRiNW/stsrWOA5LEQ= +github.com/suyuan32/simple-admin-tools v1.7.4 h1:uWHLIsm6ecGxJUEWTCrAkWrXlIszPAVDpvFYPz8u+rw= +github.com/suyuan32/simple-admin-tools v1.7.4/go.mod h1:SWvzB0kgUd1bsWP/qFLSnRBh7YRWBA0YCZqLyKVSsQ8= github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -324,10 +324,10 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/api v0.0.0-20241113202542-65e8d215514f h1:M65LEviCfuZTfrfzwwEoxVtgvfkFkBUbFnRbxCXuXhU= -google.golang.org/genproto/googleapis/api v0.0.0-20241113202542-65e8d215514f/go.mod h1:Yo94eF2nj7igQt+TiJ49KxjIH8ndLYPZMIRSiRcEbg0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241113202542-65e8d215514f h1:C1QccEa9kUwvMgEUORqQD9S17QesQijxjZ84sO82mfo= -google.golang.org/genproto/googleapis/rpc v0.0.0-20241113202542-65e8d215514f/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI= +google.golang.org/genproto/googleapis/api v0.0.0-20241118233622-e639e219e697 h1:pgr/4QbFyktUv9CtQ/Fq4gzEE6/Xs7iCXbktaGzLHbQ= +google.golang.org/genproto/googleapis/api v0.0.0-20241118233622-e639e219e697/go.mod h1:+D9ySVjN8nY8YCVjc5O7PZDIdZporIDY3KaGfJunh88= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241118233622-e639e219e697 h1:LWZqQOEjDyONlF1H6afSWpAL/znlREo2tHfLoe+8LMA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241118233622-e639e219e697/go.mod h1:5uTbfoYQed2U9p3KIj2/Zzm02PYhndfdmML0qC3q3FU= google.golang.org/grpc v1.68.0 h1:aHQeeJbo8zAkAa3pRzrVjZlbz6uSfeOXlJNQM0RAbz0= google.golang.org/grpc v1.68.0/go.mod h1:fmSPC5AsjSBCK54MyHRx48kpOti1/jRfOlwEWywNjWA= google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io= @@ -344,12 +344,12 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/api v0.31.2 h1:3wLBbL5Uom/8Zy98GRPXpJ254nEFpl+hwndmk9RwmL0= -k8s.io/api v0.31.2/go.mod h1:bWmGvrGPssSK1ljmLzd3pwCQ9MgoTsRCuK35u6SygUk= -k8s.io/apimachinery v0.31.2 h1:i4vUt2hPK56W6mlT7Ry+AO8eEsyxMD1U44NR22CLTYw= -k8s.io/apimachinery v0.31.2/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= -k8s.io/client-go v0.31.2 h1:Y2F4dxU5d3AQj+ybwSMqQnpZH9F30//1ObxOKlTI9yc= -k8s.io/client-go v0.31.2/go.mod h1:NPa74jSVR/+eez2dFsEIHNa+3o09vtNaWwWwb1qSxSs= +k8s.io/api v0.31.3 h1:umzm5o8lFbdN/hIXbrK9oRpOproJO62CV1zqxXrLgk8= +k8s.io/api v0.31.3/go.mod h1:UJrkIp9pnMOI9K2nlL6vwpxRzzEX5sWgn8kGQe92kCE= +k8s.io/apimachinery v0.31.3 h1:6l0WhcYgasZ/wk9ktLq5vLaoXJJr5ts6lkaQzgeYPq4= +k8s.io/apimachinery v0.31.3/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= +k8s.io/client-go v0.31.3 h1:CAlZuM+PH2cm+86LOBemaJI/lQ5linJ6UFxKX/SoG+4= +k8s.io/client-go v0.31.3/go.mod h1:2CgjPUTpv3fE5dNygAr2NcM8nhHzXvxB8KL5gYc3kJs= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJJ4JRdzg3+O6e8I+e+8T5Y= diff --git a/rpc/types/core/core.pb.go b/rpc/types/core/core.pb.go index f94cb964..d9def125 100644 --- a/rpc/types/core/core.pb.go +++ b/rpc/types/core/core.pb.go @@ -7,11 +7,10 @@ package core import ( - reflect "reflect" - sync "sync" - protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( diff --git a/rpc/types/core/core_grpc.pb.go b/rpc/types/core/core_grpc.pb.go index c02634fe..4d48f315 100644 --- a/rpc/types/core/core_grpc.pb.go +++ b/rpc/types/core/core_grpc.pb.go @@ -8,7 +8,6 @@ package core import ( context "context" - grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status"