diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..cd86c9a --- /dev/null +++ b/.gitignore @@ -0,0 +1,36 @@ +# Build artifacts +/builds/ +/dist/ +*.test +*.out +coverage.txt +coverage.html + +# Runtime data +*.log +*.pid +*.seed + +# Local environment and secrets +.env +.env.* +!.env.example + +# Temporary files +*.tmp +*.temp +*.swp +*.swo +*~ +/.tmp/ +/tmp/ + +# Editors and IDEs +/.idea/ +/.vscode/ +*.code-workspace + +# Operating system metadata +.DS_Store +Thumbs.db +Desktop.ini diff --git a/README.md b/README.md index 706a670..e202304 100644 --- a/README.md +++ b/README.md @@ -6,21 +6,21 @@ BSM 后端服务的 Go workspace，包含基础能力、电商、财务、社交 | 目录 | 服务 | | --- | --- | -| `apps/base` | ads、cloud、cms、feedback、fts、initial、logs、mgt、passport、sender | -| `apps/ec` | address、delivery、mall、market、order | -| `apps/finance` | wallet | -| `apps/social` | feed、group、relation | +| `module/base` | ads、cloud、cms、feedback、fts、initial、logs、mgt、passport、sender | +| `module/ec` | address、delivery、mall、market、order | +| `module/finance` | wallet | +| `module/social` | feed、group、relation | | `cmd` | 聚合上述服务的单体启动器 | | `go.work` | 20 个 Go 模块的 workspace 定义 | -各服务的接口、配置和部署细节见对应 `apps/**/README.md`。 +各服务的接口、配置和部署细节见对应 `module/**/README.md`。 ## 环境要求 - Go 1.26.5 - Git - 按所运行服务准备 PostgreSQL、Redis、etcd、MQ 或对象存储等外部依赖 -- 重新生成 protobuf 时，按服务目录中的 `buf.yaml`、`buf.gen.yaml` 和脚本安装相应生成器 +- 重新生成 protobuf 时，按服务目录中的生成脚本或团队约定的 `protoc` 命令安装相应生成器 确认工具链： @@ -29,6 +29,22 @@ go version go work sync ``` +更新所有 workspace 模块的依赖： + +```bash +bash scripts/update-all.sh +``` + +脚本会为每个模块执行 `go get -u ./...` 和 `go mod tidy`，最后运行 `go work sync`；它不会自动提交或推送 Git 变更。 + +编译全部 19 个独立服务： + +```bash +bash scripts/build-all-linux.sh +``` + +脚本固定交叉编译 Linux x86-64（`GOOS=linux`、`GOARCH=amd64`、`CGO_ENABLED=0`），产物写入 `builds/<领域>-<模块>`。`builds/` 已加入 `.gitignore`，聚合入口 `cmd` 不包含在批量构建中。 + ## 配置 每个服务的 `etc/` 目录包含 `*_dev.yaml`、`*_test.yaml` 和 `*_prod.yaml` 示例。提交到仓库的配置只能包含占位值；请在本地副本或部署系统的密钥管理中注入真实凭据，不要提交数据库密码、访问密钥、令牌或私钥。 @@ -40,7 +56,7 @@ go work sync 运行单个服务时，进入其模块目录。例如： ```bash -cd apps/base/passport +cd module/base/passport go run ./cmd/main ``` @@ -104,7 +120,7 @@ go test ./... ## 开发约定 - Go 版本声明、Docker 构建镜像和 CI 构建镜像统一为 `1.26.5`。 -- 新模块必须加入 `go.work`，并确保本地 `replace` 使用当前 `apps/...` 目录结构。 +- 新模块必须加入 `go.work`，并确保本地 `replace` 使用当前 `module/...` 目录结构。 - protobuf 描述符必须包含服务命名空间，避免多个服务聚合到同一进程时发生全局文件名冲突。 - 外部依赖测试使用 `//go:build integration`，不得让默认测试依赖网络或已启动服务。 - 配置和测试数据中不得包含真实凭据或个人信息。 diff --git a/apps/base/ads/buf.gen.yaml b/apps/base/ads/buf.gen.yaml deleted file mode 100644 index e2c02d1..0000000 --- a/apps/base/ads/buf.gen.yaml +++ /dev/null @@ -1,50 +0,0 @@ -version: v2 -plugins: - - local: protoc-gen-go - out: pb - opt: - - paths=source_relative - - - local: protoc-gen-go - out: ../../bsm-sdk/client/golang/ads - opt: - - paths=source_relative - - - local: protoc-gen-go-grpc - out: pb - opt: - - paths=source_relative - - - local: protoc-gen-go-grpc - out: ../../bsm-sdk/client/golang/ads - opt: - - paths=source_relative - - - local: protoc-gen-grpc-gateway - out: pb - opt: - - paths=source_relative - - generate_unbound_methods=True - - - local: protoc-gen-slc - out: ./ - - - local: protoc-gen-ts - out: ../../bsm-sdk/client/typescript - - - - local: protoc-gen-dart - out: ../../bsm-sdk/client/dart/ads - opt: - - grpc - - - local: protoc-gen-openapiv2 - out: swagger - opt: allow_merge=true,merge_file_name=ads - - - local: protoc-gen-openapiv2 - out: ../../bsm-sdk/client/docs/ads - opt: allow_merge=true,merge_file_name=ads - - - local: protoc-gen-markdown - out: ../../bsm-sdk/client/docs/ads \ No newline at end of file diff --git a/apps/base/ads/buf.yaml b/apps/base/ads/buf.yaml deleted file mode 100644 index dcbcda2..0000000 --- a/apps/base/ads/buf.yaml +++ /dev/null @@ -1,10 +0,0 @@ -# For details on buf.yaml configuration, visit https://buf.build/docs/configuration/v2/buf-yaml -version: v2 -lint: - use: - - STANDARD -modules: - - path: proto -breaking: - use: - - FILE diff --git a/apps/base/ads/scripts/proto_gen.sh b/apps/base/ads/scripts/proto_gen.sh deleted file mode 100644 index edc103d..0000000 --- a/apps/base/ads/scripts/proto_gen.sh +++ /dev/null @@ -1,10 +0,0 @@ -# 由于goctl 不能编译多个proto文件，所以先要安装合并工具： -# go install git.apinb.com/bsm-tools/proto-merge@v0.0.3 - -# 1. 先合并 -proto-merge ./proto/*.proto ./proto/passport.mproto - -# 2. goctl 生成代码至/gen -goctl rpc protoc ./proto/passport.mproto --go_out=./pb --go-grpc_out=./pb --zrpc_out=./gen/ -m --style go_zero - -#protoc --go_out=./pb/ --go_opt=paths=source_relative --go-grpc_out=./pb/ --go-grpc_opt=require_unimplemented_servers=false --go-grpc_opt=paths=source_relative ./proto/*.proto --proto_path=./proto/ diff --git a/apps/base/ads/scripts/update.sh b/apps/base/ads/scripts/update.sh deleted file mode 100644 index f6ec2de..0000000 --- a/apps/base/ads/scripts/update.sh +++ /dev/null @@ -1,7 +0,0 @@ -git pull -go get all -go get -u ./... -go mod tidy -git add . -git commit -m 'run ./script/update.sh' -git push \ No newline at end of file diff --git a/apps/base/ads/test/lint/gosec b/apps/base/ads/test/lint/gosec deleted file mode 100644 index 2f47f4b..0000000 --- a/apps/base/ads/test/lint/gosec +++ /dev/null @@ -1,11 +0,0 @@ -{ - "Golang errors": {}, - "Issues": [], - "Stats": { - "files": 24, - "lines": 2377, - "nosec": 0, - "found": 0 - }, - "GosecVersion": "dev" -} \ No newline at end of file diff --git a/apps/base/cloud/buf.gen.yaml b/apps/base/cloud/buf.gen.yaml deleted file mode 100644 index c86b478..0000000 --- a/apps/base/cloud/buf.gen.yaml +++ /dev/null @@ -1,50 +0,0 @@ -version: v2 -plugins: - - local: protoc-gen-go - out: pb - opt: - - paths=source_relative - - - local: protoc-gen-go - out: ../../bsm-sdk/client/golang/cloud - opt: - - paths=source_relative - - - local: protoc-gen-go-grpc - out: pb - opt: - - paths=source_relative - - - local: protoc-gen-go-grpc - out: ../../bsm-sdk/client/golang/cloud - opt: - - paths=source_relative - - - local: protoc-gen-grpc-gateway - out: pb - opt: - - paths=source_relative - - generate_unbound_methods=True - - - local: protoc-gen-slc - out: ./ - - - local: protoc-gen-ts - out: ../../bsm-sdk/client/typescript - - - - local: protoc-gen-dart - out: ../../bsm-sdk/client/dart/cloud - opt: - - grpc - - - local: protoc-gen-openapiv2 - out: swagger - opt: allow_merge=true,merge_file_name=cloud - - - local: protoc-gen-openapiv2 - out: ../../bsm-sdk/client/docs/cloud - opt: allow_merge=true,merge_file_name=cloud - - - local: protoc-gen-markdown - out: ../../bsm-sdk/client/docs/cloud \ No newline at end of file diff --git a/apps/base/cloud/buf.yaml b/apps/base/cloud/buf.yaml deleted file mode 100644 index dcbcda2..0000000 --- a/apps/base/cloud/buf.yaml +++ /dev/null @@ -1,10 +0,0 @@ -# For details on buf.yaml configuration, visit https://buf.build/docs/configuration/v2/buf-yaml -version: v2 -lint: - use: - - STANDARD -modules: - - path: proto -breaking: - use: - - FILE diff --git a/apps/base/cloud/scripts/build.sh b/apps/base/cloud/scripts/build.sh deleted file mode 100644 index d9b7dcc..0000000 --- a/apps/base/cloud/scripts/build.sh +++ /dev/null @@ -1,3 +0,0 @@ - -#go build -go build -ldflags "-X git.apinb.com/blocks-sdk/engine/vars.VERSION=1.2.2 -X 'git.apinb.com/blocks-sdk/engine/vars.BUILD_TIME=2024-02-02 12:33:55' -X 'git.apinb.com/blocks-sdk/engine/vars.GO_VERSION=1.26.5'" -o /build/cloud ../cmd/main.go diff --git a/apps/base/cloud/scripts/update.sh b/apps/base/cloud/scripts/update.sh deleted file mode 100644 index f6ec2de..0000000 --- a/apps/base/cloud/scripts/update.sh +++ /dev/null @@ -1,7 +0,0 @@ -git pull -go get all -go get -u ./... -go mod tidy -git add . -git commit -m 'run ./script/update.sh' -git push \ No newline at end of file diff --git a/apps/base/cloud/test/lint/gosec b/apps/base/cloud/test/lint/gosec deleted file mode 100644 index 2f47f4b..0000000 --- a/apps/base/cloud/test/lint/gosec +++ /dev/null @@ -1,11 +0,0 @@ -{ - "Golang errors": {}, - "Issues": [], - "Stats": { - "files": 24, - "lines": 2377, - "nosec": 0, - "found": 0 - }, - "GosecVersion": "dev" -} \ No newline at end of file diff --git a/apps/base/cms/buf.gen.yaml b/apps/base/cms/buf.gen.yaml deleted file mode 100644 index 99bfd33..0000000 --- a/apps/base/cms/buf.gen.yaml +++ /dev/null @@ -1,50 +0,0 @@ -version: v2 -plugins: - - local: protoc-gen-go - out: pb - opt: - - paths=source_relative - - - local: protoc-gen-go - out: ../../bsm-sdk/client/golang/cms - opt: - - paths=source_relative - - - local: protoc-gen-go-grpc - out: pb - opt: - - paths=source_relative - - - local: protoc-gen-go-grpc - out: ../../bsm-sdk/client/golang/cms - opt: - - paths=source_relative - - - local: protoc-gen-grpc-gateway - out: pb - opt: - - paths=source_relative - - generate_unbound_methods=True - - - local: protoc-gen-slc - out: ./ - - - local: protoc-gen-ts - out: ../../bsm-sdk/client/typescript - - - - local: protoc-gen-dart - out: ../../bsm-sdk/client/dart/cms - opt: - - grpc - - - local: protoc-gen-openapiv2 - out: swagger - opt: allow_merge=true,merge_file_name=cms - - - local: protoc-gen-openapiv2 - out: ../../bsm-sdk/client/docs/cms - opt: allow_merge=true,merge_file_name=cms - - - local: protoc-gen-markdown - out: ../../bsm-sdk/client/docs/cms \ No newline at end of file diff --git a/apps/base/cms/buf.yaml b/apps/base/cms/buf.yaml deleted file mode 100644 index dcbcda2..0000000 --- a/apps/base/cms/buf.yaml +++ /dev/null @@ -1,10 +0,0 @@ -# For details on buf.yaml configuration, visit https://buf.build/docs/configuration/v2/buf-yaml -version: v2 -lint: - use: - - STANDARD -modules: - - path: proto -breaking: - use: - - FILE diff --git a/apps/base/cms/scripts/update.sh b/apps/base/cms/scripts/update.sh deleted file mode 100644 index f6ec2de..0000000 --- a/apps/base/cms/scripts/update.sh +++ /dev/null @@ -1,7 +0,0 @@ -git pull -go get all -go get -u ./... -go mod tidy -git add . -git commit -m 'run ./script/update.sh' -git push \ No newline at end of file diff --git a/apps/base/feedback/buf.gen.yaml b/apps/base/feedback/buf.gen.yaml deleted file mode 100644 index 58eb7fc..0000000 --- a/apps/base/feedback/buf.gen.yaml +++ /dev/null @@ -1,50 +0,0 @@ -version: v2 -plugins: - - local: protoc-gen-go - out: pb - opt: - - paths=source_relative - - - local: protoc-gen-go - out: ../../bsm-sdk/client/golang/feedback - opt: - - paths=source_relative - - - local: protoc-gen-go-grpc - out: pb - opt: - - paths=source_relative - - - local: protoc-gen-go-grpc - out: ../../bsm-sdk/client/golang/feedback - opt: - - paths=source_relative - - - local: protoc-gen-grpc-gateway - out: pb - opt: - - paths=source_relative - - generate_unbound_methods=True - - - local: protoc-gen-slc - out: ./ - - - local: protoc-gen-ts - out: ../../bsm-sdk/client/typescript - - - - local: protoc-gen-dart - out: ../../bsm-sdk/client/dart/feedback - opt: - - grpc - - - local: protoc-gen-openapiv2 - out: swagger - opt: allow_merge=true,merge_file_name=feedback - - - local: protoc-gen-openapiv2 - out: ../../bsm-sdk/client/docs/feedback - opt: allow_merge=true,merge_file_name=feedback - - - local: protoc-gen-markdown - out: ../../bsm-sdk/client/docs/feedback \ No newline at end of file diff --git a/apps/base/feedback/buf.yaml b/apps/base/feedback/buf.yaml deleted file mode 100644 index dcbcda2..0000000 --- a/apps/base/feedback/buf.yaml +++ /dev/null @@ -1,10 +0,0 @@ -# For details on buf.yaml configuration, visit https://buf.build/docs/configuration/v2/buf-yaml -version: v2 -lint: - use: - - STANDARD -modules: - - path: proto -breaking: - use: - - FILE diff --git a/apps/base/feedback/scripts/build.sh b/apps/base/feedback/scripts/build.sh deleted file mode 100644 index 95036b3..0000000 --- a/apps/base/feedback/scripts/build.sh +++ /dev/null @@ -1,3 +0,0 @@ - -#go build -go build -ldflags "-X git.apinb.com/blocks-sdk/engine/vars.VERSION=1.2.2 -X 'git.apinb.com/blocks-sdk/engine/vars.BUILD_TIME=2024-02-02 12:33:55' -X 'git.apinb.com/blocks-sdk/engine/vars.GO_VERSION=1.26.5'" -o /build/feedback ../cmd/main.go diff --git a/apps/base/feedback/scripts/proto_gen.sh b/apps/base/feedback/scripts/proto_gen.sh deleted file mode 100644 index 7bc6fab..0000000 --- a/apps/base/feedback/scripts/proto_gen.sh +++ /dev/null @@ -1,10 +0,0 @@ -# 由于goctl 不能编译多个proto文件，所以先要安装合并工具： -# go install git.apinb.com/bsm-tools/proto-merge@v0.0.3 - -# 1. 先合并 -proto-merge ./proto/*.proto ./proto/feedback.proto - -# 2. goctl 生成代码至/gen -goctl rpc protoc ./proto/feedback.proto --go_out=./pb --go-grpc_out=./pb --zrpc_out=./gen/ -m --style go_zero - -#protoc --go_out=./pb/ --go_opt=paths=source_relative --go-grpc_out=./pb/ --go-grpc_opt=require_unimplemented_servers=false --go-grpc_opt=paths=source_relative ./proto/*.proto --proto_path=./proto/ diff --git a/apps/base/feedback/test/lint/gosec b/apps/base/feedback/test/lint/gosec deleted file mode 100644 index 2f47f4b..0000000 --- a/apps/base/feedback/test/lint/gosec +++ /dev/null @@ -1,11 +0,0 @@ -{ - "Golang errors": {}, - "Issues": [], - "Stats": { - "files": 24, - "lines": 2377, - "nosec": 0, - "found": 0 - }, - "GosecVersion": "dev" -} \ No newline at end of file diff --git a/apps/base/fts/scripts/update.sh b/apps/base/fts/scripts/update.sh deleted file mode 100644 index f6ec2de..0000000 --- a/apps/base/fts/scripts/update.sh +++ /dev/null @@ -1,7 +0,0 @@ -git pull -go get all -go get -u ./... -go mod tidy -git add . -git commit -m 'run ./script/update.sh' -git push \ No newline at end of file diff --git a/apps/base/initial/README.md b/apps/base/initial/README.md deleted file mode 100644 index 41b9656..0000000 Binary files a/apps/base/initial/README.md and /dev/null differ diff --git a/apps/base/initial/buf.gen.yaml b/apps/base/initial/buf.gen.yaml deleted file mode 100644 index 93838a2..0000000 --- a/apps/base/initial/buf.gen.yaml +++ /dev/null @@ -1,50 +0,0 @@ -version: v2 -plugins: - - local: protoc-gen-go - out: pb - opt: - - paths=source_relative - - - local: protoc-gen-go - out: ../../bsm-sdk/client/golang/initial - opt: - - paths=source_relative - - - local: protoc-gen-go-grpc - out: pb - opt: - - paths=source_relative - - - local: protoc-gen-go-grpc - out: ../../bsm-sdk/client/golang/initial - opt: - - paths=source_relative - - - local: protoc-gen-grpc-gateway - out: pb - opt: - - paths=source_relative - - generate_unbound_methods=True - - - local: protoc-gen-slc - out: ./ - - - local: protoc-gen-ts - out: ../../bsm-sdk/client/typescript - - - - local: protoc-gen-dart - out: ../../bsm-sdk/client/dart/initial - opt: - - grpc - - - local: protoc-gen-openapiv2 - out: swagger - opt: allow_merge=true,merge_file_name=initial - - - local: protoc-gen-openapiv2 - out: ../../bsm-sdk/client/docs/initial - opt: allow_merge=true,merge_file_name=initial - - - local: protoc-gen-markdown - out: ../../bsm-sdk/client/docs/initial \ No newline at end of file diff --git a/apps/base/initial/buf.yaml b/apps/base/initial/buf.yaml deleted file mode 100644 index dcbcda2..0000000 --- a/apps/base/initial/buf.yaml +++ /dev/null @@ -1,10 +0,0 @@ -# For details on buf.yaml configuration, visit https://buf.build/docs/configuration/v2/buf-yaml -version: v2 -lint: - use: - - STANDARD -modules: - - path: proto -breaking: - use: - - FILE diff --git a/apps/base/initial/logs/initial_2025-10-04.log b/apps/base/initial/logs/initial_2025-10-04.log deleted file mode 100644 index e69de29..0000000 diff --git a/apps/base/initial/scripts/update.sh b/apps/base/initial/scripts/update.sh deleted file mode 100644 index f6ec2de..0000000 --- a/apps/base/initial/scripts/update.sh +++ /dev/null @@ -1,7 +0,0 @@ -git pull -go get all -go get -u ./... -go mod tidy -git add . -git commit -m 'run ./script/update.sh' -git push \ No newline at end of file diff --git a/apps/base/logs/scripts/update.sh b/apps/base/logs/scripts/update.sh deleted file mode 100644 index f6ec2de..0000000 --- a/apps/base/logs/scripts/update.sh +++ /dev/null @@ -1,7 +0,0 @@ -git pull -go get all -go get -u ./... -go mod tidy -git add . -git commit -m 'run ./script/update.sh' -git push \ No newline at end of file diff --git a/apps/base/passport/buf.gen.yaml b/apps/base/passport/buf.gen.yaml deleted file mode 100644 index 6554c8d..0000000 --- a/apps/base/passport/buf.gen.yaml +++ /dev/null @@ -1,41 +0,0 @@ -version: v2 -plugins: - - local: protoc-gen-go - out: pb - opt: - - paths=source_relative - - - local: protoc-gen-go - out: ../../bsm-sdk/client/golang/passport - opt: - - paths=source_relative - - - local: protoc-gen-go-grpc - out: pb - opt: - - paths=source_relative - - - local: protoc-gen-go-grpc - out: ../../bsm-sdk/client/golang/passport - opt: - - paths=source_relative - - - local: protoc-gen-grpc-gateway - out: pb - opt: - - paths=source_relative - - generate_unbound_methods=True - - - local: protoc-gen-slc - out: ./ - - - local: protoc-gen-ts - out: ../../bsm-sdk/client/typescript - - - local: protoc-gen-dart - out: ../../bsm-sdk/client/dart/passport - opt: - - grpc - - - local: protoc-gen-markdown - out: ../../bsm-sdk/client/docs/passport \ No newline at end of file diff --git a/apps/base/passport/buf.yaml b/apps/base/passport/buf.yaml deleted file mode 100644 index dcbcda2..0000000 --- a/apps/base/passport/buf.yaml +++ /dev/null @@ -1,10 +0,0 @@ -# For details on buf.yaml configuration, visit https://buf.build/docs/configuration/v2/buf-yaml -version: v2 -lint: - use: - - STANDARD -modules: - - path: proto -breaking: - use: - - FILE diff --git a/apps/base/passport/go.mod b/apps/base/passport/go.mod deleted file mode 100644 index 6ff9ac1..0000000 --- a/apps/base/passport/go.mod +++ /dev/null @@ -1,73 +0,0 @@ -module git.apinb.com/bsm-apps/passport - -go 1.26.5 - -tool ( - git.apinb.com/bsm-tools/protoc-gen-markdown - git.apinb.com/bsm-tools/protoc-gen-slc - git.apinb.com/bsm-tools/protoc-gen-ts - github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway - github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2 - github.com/pepabo/protoc-gen-go-client - google.golang.org/grpc/cmd/protoc-gen-go-grpc - google.golang.org/protobuf/cmd/protoc-gen-go -) - -require ( - github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 - github.com/patrickmn/go-cache v2.1.0+incompatible -) - -require ( - filippo.io/edwards25519 v1.2.0 // indirect - git.apinb.com/bsm-tools/protoc-gen-markdown v0.0.0-20250907131213-6c1694ce6bcb // indirect - git.apinb.com/bsm-tools/protoc-gen-slc v0.0.13 // indirect - git.apinb.com/bsm-tools/protoc-gen-ts v0.0.2 // indirect - github.com/coreos/go-semver v0.3.1 // indirect - github.com/coreos/go-systemd/v22 v22.7.0 // indirect - github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect - github.com/ditashi/jsbeautifier-go v0.0.0-20141206144643-2520a8026a9c // indirect - github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang-jwt/jwt/v5 v5.3.1 // indirect - github.com/golang/protobuf v1.5.4 // indirect - github.com/pepabo/protoc-gen-go-client v0.3.0 // indirect - github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect - go.etcd.io/etcd/api/v3 v3.6.12 // indirect - go.uber.org/atomic v1.11.0 // indirect - go.uber.org/multierr v1.11.0 // indirect - go.uber.org/zap v1.28.0 // indirect - go.yaml.in/yaml/v3 v3.0.4 // indirect - golang.org/x/mod v0.36.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa // indirect - google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.2 // indirect - gorm.io/driver/mysql v1.6.0 // indirect -) - -require ( - git.apinb.com/bsm-sdk/core v0.2.0 - github.com/cespare/xxhash/v2 v2.3.0 // indirect - github.com/go-sql-driver/mysql v1.10.0 // indirect - github.com/google/uuid v1.6.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.10.0 // indirect - github.com/jackc/puddle/v2 v2.2.2 // indirect - github.com/jinzhu/inflection v1.0.0 // indirect - github.com/jinzhu/now v1.1.5 // indirect - github.com/oklog/ulid/v2 v2.1.1 // indirect - github.com/redis/go-redis/v9 v9.20.0 // indirect - go.etcd.io/etcd/client/pkg/v3 v3.6.12 // indirect - go.etcd.io/etcd/client/v3 v3.6.12 - golang.org/x/crypto v0.52.0 - golang.org/x/net v0.55.0 // indirect - golang.org/x/sync v0.20.0 // indirect - golang.org/x/sys v0.45.0 // indirect - golang.org/x/text v0.37.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa // indirect - google.golang.org/grpc v1.81.1 - google.golang.org/protobuf v1.36.11 - gopkg.in/yaml.v3 v3.0.1 // indirect - gorm.io/driver/postgres v1.6.0 // indirect - gorm.io/gorm v1.31.1 -) diff --git a/apps/base/passport/scripts/build.sh b/apps/base/passport/scripts/build.sh deleted file mode 100644 index d25c112..0000000 --- a/apps/base/passport/scripts/build.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -GOEXPERIMENT=jsonv2 GOOS=linux GOARCH=amd64 go build -o ./.builds/bsm-passport ./cmd/main \ No newline at end of file diff --git a/apps/base/passport/scripts/update.sh b/apps/base/passport/scripts/update.sh deleted file mode 100644 index f28c665..0000000 --- a/apps/base/passport/scripts/update.sh +++ /dev/null @@ -1,7 +0,0 @@ -git pull -go get all -go get -u ./... -go mod tidy -git add . -git commit -m 'run ./script/update.sh to update' -git push \ No newline at end of file diff --git a/apps/base/sender/buf.gen.yaml b/apps/base/sender/buf.gen.yaml deleted file mode 100644 index aec8d5d..0000000 --- a/apps/base/sender/buf.gen.yaml +++ /dev/null @@ -1,50 +0,0 @@ -version: v2 -plugins: - - local: protoc-gen-go - out: pb - opt: - - paths=source_relative - - - local: protoc-gen-go - out: ../../bsm-sdk/client/golang/sender - opt: - - paths=source_relative - - - local: protoc-gen-go-grpc - out: pb - opt: - - paths=source_relative - - - local: protoc-gen-go-grpc - out: ../../bsm-sdk/client/golang/sender - opt: - - paths=source_relative - - - local: protoc-gen-grpc-gateway - out: pb - opt: - - paths=source_relative - - generate_unbound_methods=True - - - local: protoc-gen-slc - out: ./ - - - local: protoc-gen-ts - out: ../../bsm-sdk/client/typescript - - - - local: protoc-gen-dart - out: ../../bsm-sdk/client/dart/sender - opt: - - grpc - - - local: protoc-gen-openapiv2 - out: swagger - opt: allow_merge=true,merge_file_name=sender - - - local: protoc-gen-openapiv2 - out: ../../bsm-sdk/client/docs/sender - opt: allow_merge=true,merge_file_name=sender - - - local: protoc-gen-markdown - out: ../../bsm-sdk/client/docs/sender \ No newline at end of file diff --git a/apps/base/sender/buf.yaml b/apps/base/sender/buf.yaml deleted file mode 100644 index dcbcda2..0000000 --- a/apps/base/sender/buf.yaml +++ /dev/null @@ -1,10 +0,0 @@ -# For details on buf.yaml configuration, visit https://buf.build/docs/configuration/v2/buf-yaml -version: v2 -lint: - use: - - STANDARD -modules: - - path: proto -breaking: - use: - - FILE diff --git a/apps/base/sender/scripts/update.sh b/apps/base/sender/scripts/update.sh deleted file mode 100644 index 048d972..0000000 --- a/apps/base/sender/scripts/update.sh +++ /dev/null @@ -1,7 +0,0 @@ -git pull -go get all -go get -u ./... -go mod tidy -git add . -git commit -m 'run update.sh' -git push \ No newline at end of file diff --git a/apps/ec/address/buf.gen.yaml b/apps/ec/address/buf.gen.yaml deleted file mode 100644 index f0d2b00..0000000 --- a/apps/ec/address/buf.gen.yaml +++ /dev/null @@ -1,27 +0,0 @@ -version: v2 -plugins: - - local: protoc-gen-go - out: pb - opt: - - paths=source_relative - - - local: protoc-gen-go-grpc - out: pb - opt: - - paths=source_relative - - - local: protoc-gen-grpc-gateway - out: pb - opt: - - paths=source_relative - - generate_unbound_methods=True - - - local: protoc-gen-slc - out: pb - - - local: protoc-gen-ts - out: sdk/typescript - - - local: protoc-gen-openapiv2 - out: swagger - opt: allow_merge=true,merge_file_name=sample \ No newline at end of file diff --git a/apps/ec/address/buf.yaml b/apps/ec/address/buf.yaml deleted file mode 100644 index dcbcda2..0000000 --- a/apps/ec/address/buf.yaml +++ /dev/null @@ -1,10 +0,0 @@ -# For details on buf.yaml configuration, visit https://buf.build/docs/configuration/v2/buf-yaml -version: v2 -lint: - use: - - STANDARD -modules: - - path: proto -breaking: - use: - - FILE diff --git a/apps/ec/address/scripts/build.sh b/apps/ec/address/scripts/build.sh deleted file mode 100644 index 2fc6833..0000000 --- a/apps/ec/address/scripts/build.sh +++ /dev/null @@ -1,3 +0,0 @@ - -#go build -go build -ldflags "-X git.apinb.com/blocks-sdk/engine/vars.VERSION=1.2.2 -X 'git.apinb.com/blocks-sdk/engine/vars.BUILD_TIME=2024-02-02 12:33:55' -X 'git.apinb.com/blocks-sdk/engine/vars.GO_VERSION=1.26.5'" -o /build/address ../cmd/main.go diff --git a/apps/ec/address/scripts/proto_gen.sh b/apps/ec/address/scripts/proto_gen.sh deleted file mode 100644 index 18d5b74..0000000 --- a/apps/ec/address/scripts/proto_gen.sh +++ /dev/null @@ -1,10 +0,0 @@ -# 由于goctl 不能编译多个proto文件，所以先要安装合并工具： -# go install git.apinb.com/bsm-tools/proto-merge@v0.0.3 - -# 1. 先合并 -proto-merge ./proto/*.proto ./proto/address.mproto - -# 2. goctl 生成代码至/gen -goctl rpc protoc ./proto/address.proto --go_out=./external/pb --go-grpc_out=./external/pb --zrpc_out=./ -m --style go_zero - -#protoc --go_out=./pb/ --go_opt=paths=source_relative --go-grpc_out=./pb/ --go-grpc_opt=require_unimplemented_servers=false --go-grpc_opt=paths=source_relative ./proto/*.proto --proto_path=./proto/ \ No newline at end of file diff --git a/apps/ec/address/test/lint/gosec b/apps/ec/address/test/lint/gosec deleted file mode 100644 index 2f47f4b..0000000 --- a/apps/ec/address/test/lint/gosec +++ /dev/null @@ -1,11 +0,0 @@ -{ - "Golang errors": {}, - "Issues": [], - "Stats": { - "files": 24, - "lines": 2377, - "nosec": 0, - "found": 0 - }, - "GosecVersion": "dev" -} \ No newline at end of file diff --git a/apps/ec/delivery/scripts/proto_gen.sh b/apps/ec/delivery/scripts/proto_gen.sh deleted file mode 100644 index 6d6ad53..0000000 --- a/apps/ec/delivery/scripts/proto_gen.sh +++ /dev/null @@ -1,14 +0,0 @@ -# 由于goctl 不能编译多个proto文件，所以先要安装合并工具： -# go install git.apinb.com/bsm-tools/proto-merge@v0.0.3 - -# 1. 先合并 -proto-merge ./proto/*.proto ./proto/delivery.proto - -# 2. goctl 生成代码至/gen -goctl rpc protoc ./proto/delivery.proto --go_out=./external/pb --go-grpc_out=./external/pb --zrpc_out=./ -m --style go_zero - -# 3. 清理无用文件 -rm ./proto/delivery.proto -mv ./client ./external/ -rm delivery.go -rm ./etc/delivery.yaml \ No newline at end of file diff --git a/apps/ec/delivery/test/lint/gosec b/apps/ec/delivery/test/lint/gosec deleted file mode 100644 index 2f47f4b..0000000 --- a/apps/ec/delivery/test/lint/gosec +++ /dev/null @@ -1,11 +0,0 @@ -{ - "Golang errors": {}, - "Issues": [], - "Stats": { - "files": 24, - "lines": 2377, - "nosec": 0, - "found": 0 - }, - "GosecVersion": "dev" -} \ No newline at end of file diff --git a/apps/ec/mall/buf.gen.yaml b/apps/ec/mall/buf.gen.yaml deleted file mode 100644 index f0d2b00..0000000 --- a/apps/ec/mall/buf.gen.yaml +++ /dev/null @@ -1,27 +0,0 @@ -version: v2 -plugins: - - local: protoc-gen-go - out: pb - opt: - - paths=source_relative - - - local: protoc-gen-go-grpc - out: pb - opt: - - paths=source_relative - - - local: protoc-gen-grpc-gateway - out: pb - opt: - - paths=source_relative - - generate_unbound_methods=True - - - local: protoc-gen-slc - out: pb - - - local: protoc-gen-ts - out: sdk/typescript - - - local: protoc-gen-openapiv2 - out: swagger - opt: allow_merge=true,merge_file_name=sample \ No newline at end of file diff --git a/apps/ec/mall/buf.yaml b/apps/ec/mall/buf.yaml deleted file mode 100644 index dcbcda2..0000000 --- a/apps/ec/mall/buf.yaml +++ /dev/null @@ -1,10 +0,0 @@ -# For details on buf.yaml configuration, visit https://buf.build/docs/configuration/v2/buf-yaml -version: v2 -lint: - use: - - STANDARD -modules: - - path: proto -breaking: - use: - - FILE diff --git a/apps/ec/market/buf.gen.yaml b/apps/ec/market/buf.gen.yaml deleted file mode 100644 index 488fcf9..0000000 --- a/apps/ec/market/buf.gen.yaml +++ /dev/null @@ -1,27 +0,0 @@ -version: v2 -plugins: - - local: protoc-gen-go - out: pb - opt: - - paths=source_relative - - - local: protoc-gen-go-grpc - out: pb - opt: - - paths=source_relative - - - local: protoc-gen-grpc-gateway - out: pb - opt: - - paths=source_relative - - generate_unbound_methods=True - - - local: protoc-gen-slc - out: pb - - - local: protoc-gen-ts - out: sdk/typescript - - - local: protoc-gen-openapiv2 - out: swagger - opt: allow_merge=true,merge_file_name=market \ No newline at end of file diff --git a/apps/ec/market/buf.yaml b/apps/ec/market/buf.yaml deleted file mode 100644 index dcbcda2..0000000 --- a/apps/ec/market/buf.yaml +++ /dev/null @@ -1,10 +0,0 @@ -# For details on buf.yaml configuration, visit https://buf.build/docs/configuration/v2/buf-yaml -version: v2 -lint: - use: - - STANDARD -modules: - - path: proto -breaking: - use: - - FILE diff --git a/apps/ec/order/buf.gen.yaml b/apps/ec/order/buf.gen.yaml deleted file mode 100644 index f0d2b00..0000000 --- a/apps/ec/order/buf.gen.yaml +++ /dev/null @@ -1,27 +0,0 @@ -version: v2 -plugins: - - local: protoc-gen-go - out: pb - opt: - - paths=source_relative - - - local: protoc-gen-go-grpc - out: pb - opt: - - paths=source_relative - - - local: protoc-gen-grpc-gateway - out: pb - opt: - - paths=source_relative - - generate_unbound_methods=True - - - local: protoc-gen-slc - out: pb - - - local: protoc-gen-ts - out: sdk/typescript - - - local: protoc-gen-openapiv2 - out: swagger - opt: allow_merge=true,merge_file_name=sample \ No newline at end of file diff --git a/apps/ec/order/buf.yaml b/apps/ec/order/buf.yaml deleted file mode 100644 index dcbcda2..0000000 --- a/apps/ec/order/buf.yaml +++ /dev/null @@ -1,10 +0,0 @@ -# For details on buf.yaml configuration, visit https://buf.build/docs/configuration/v2/buf-yaml -version: v2 -lint: - use: - - STANDARD -modules: - - path: proto -breaking: - use: - - FILE diff --git a/apps/ec/order/test/lint/gosec b/apps/ec/order/test/lint/gosec deleted file mode 100644 index 2f47f4b..0000000 --- a/apps/ec/order/test/lint/gosec +++ /dev/null @@ -1,11 +0,0 @@ -{ - "Golang errors": {}, - "Issues": [], - "Stats": { - "files": 24, - "lines": 2377, - "nosec": 0, - "found": 0 - }, - "GosecVersion": "dev" -} \ No newline at end of file diff --git a/apps/finance/wallet/buf.gen.yaml b/apps/finance/wallet/buf.gen.yaml deleted file mode 100644 index 18e82c8..0000000 --- a/apps/finance/wallet/buf.gen.yaml +++ /dev/null @@ -1,52 +0,0 @@ -version: v2 -plugins: - - local: protoc-gen-go - out: pb - opt: - - paths=source_relative - - - local: protoc-gen-go - out: ../../bsm-sdk/client/golang/wallet - opt: - - paths=source_relative - - - local: protoc-gen-go-grpc - out: pb - opt: - - paths=source_relative - - - local: protoc-gen-go-grpc - out: ../../bsm-sdk/client/golang/wallet - opt: - - paths=source_relative - - - local: protoc-gen-grpc-gateway - out: pb - opt: - - paths=source_relative - - generate_unbound_methods=True - - - local: protoc-gen-slc - out: ./ - - - local: protoc-gen-ts - out: ../../bsm-sdk/client/typescript - - - local: protoc-gen-dart - out: ../../bsm-sdk/client/dart/wallet - opt: - - grpc - - - local: protoc-gen-openapiv2 - out: ./swagger - opt: allow_merge=true,merge_file_name=wallet - - - local: protoc-gen-doc - out: ./swagger - - - local: protoc-gen-openapiv2 - out: ../../bsm-sdk/client/docs/wallet - opt: allow_merge=true,merge_file_name=wallet - - - local: protoc-gen-doc - out: ../../bsm-sdk/client/docs/wallet \ No newline at end of file diff --git a/apps/finance/wallet/buf.yaml b/apps/finance/wallet/buf.yaml deleted file mode 100644 index dcbcda2..0000000 --- a/apps/finance/wallet/buf.yaml +++ /dev/null @@ -1,10 +0,0 @@ -# For details on buf.yaml configuration, visit https://buf.build/docs/configuration/v2/buf-yaml -version: v2 -lint: - use: - - STANDARD -modules: - - path: proto -breaking: - use: - - FILE diff --git a/apps/finance/wallet/scripts/buf.sh b/apps/finance/wallet/scripts/buf.sh deleted file mode 100644 index e69de29..0000000 diff --git a/apps/social/feed/buf.gen.yaml b/apps/social/feed/buf.gen.yaml deleted file mode 100644 index 522b5e3..0000000 --- a/apps/social/feed/buf.gen.yaml +++ /dev/null @@ -1,49 +0,0 @@ -version: v2 -plugins: - - local: protoc-gen-go - out: pb - opt: - - paths=source_relative - - - local: protoc-gen-go - out: ../../bsm-sdk/client/golang/feed - opt: - - paths=source_relative - - - local: protoc-gen-go-grpc - out: pb - opt: - - paths=source_relative - - - local: protoc-gen-go-grpc - out: ../../bsm-sdk/client/golang/feed - opt: - - paths=source_relative - - - local: protoc-gen-grpc-gateway - out: pb - opt: - - paths=source_relative - - generate_unbound_methods=True - - - local: protoc-gen-slc - out: ./ - - - local: protoc-gen-ts - out: ../../bsm-sdk/client/typescript - - - local: protoc-gen-dart - out: ../../bsm-sdk/client/dart/feed - opt: - - grpc - - - local: protoc-gen-openapiv2 - out: ./swagger - opt: allow_merge=true,merge_file_name=feed - - - local: protoc-gen-openapiv2 - out: ../../bsm-sdk/client/docs/feed - opt: allow_merge=true,merge_file_name=feed - - - local: protoc-gen-markdown - out: ../../bsm-sdk/client/docs/feed \ No newline at end of file diff --git a/apps/social/feed/buf.yaml b/apps/social/feed/buf.yaml deleted file mode 100644 index dcbcda2..0000000 --- a/apps/social/feed/buf.yaml +++ /dev/null @@ -1,10 +0,0 @@ -# For details on buf.yaml configuration, visit https://buf.build/docs/configuration/v2/buf-yaml -version: v2 -lint: - use: - - STANDARD -modules: - - path: proto -breaking: - use: - - FILE diff --git a/apps/social/feed/scripts/proto_gen.sh b/apps/social/feed/scripts/proto_gen.sh deleted file mode 100644 index c49478e..0000000 --- a/apps/social/feed/scripts/proto_gen.sh +++ /dev/null @@ -1,14 +0,0 @@ -# 由于goctl 不能编译多个proto文件，所以先要安装合并工具： -# go install git.apinb.com/bsm-tools/proto-merge@v0.0.3 - -# 1. 先合并 -proto-merge ./proto/*.proto ./proto/feeds.proto - -# 2. goctl 生成代码至/gen -goctl rpc protoc ./proto/feeds.proto --go_out=./external/pb --go-grpc_out=./external/pb --zrpc_out=./ -m --style go_zero - -# 3. 清理无用文件 -rm ./proto/feeds.proto -mv ./client ./external/ -rm feeds.go -rm ./etc/feeds.yaml \ No newline at end of file diff --git a/apps/social/feed/test/lint/gosec b/apps/social/feed/test/lint/gosec deleted file mode 100644 index 2f47f4b..0000000 --- a/apps/social/feed/test/lint/gosec +++ /dev/null @@ -1,11 +0,0 @@ -{ - "Golang errors": {}, - "Issues": [], - "Stats": { - "files": 24, - "lines": 2377, - "nosec": 0, - "found": 0 - }, - "GosecVersion": "dev" -} \ No newline at end of file diff --git a/apps/social/group/buf.gen.yaml b/apps/social/group/buf.gen.yaml deleted file mode 100644 index ff47632..0000000 --- a/apps/social/group/buf.gen.yaml +++ /dev/null @@ -1,49 +0,0 @@ -version: v2 -plugins: - - local: protoc-gen-go - out: pb - opt: - - paths=source_relative - - - local: protoc-gen-go - out: ../../bsm-sdk/client/golang/passport - opt: - - paths=source_relative - - - local: protoc-gen-go-grpc - out: pb - opt: - - paths=source_relative - - - local: protoc-gen-go-grpc - out: ../../bsm-sdk/client/golang/passport - opt: - - paths=source_relative - - - local: protoc-gen-grpc-gateway - out: pb - opt: - - paths=source_relative - - generate_unbound_methods=True - - - local: protoc-gen-slc - out: ./ - - - local: protoc-gen-ts - out: ../../bsm-sdk/client/typescript - - - local: protoc-gen-dart - out: ../../bsm-sdk/client/dart/passport - opt: - - grpc - - - local: protoc-gen-openapiv2 - out: ./swagger - opt: allow_merge=true,merge_file_name=passport - - - local: protoc-gen-openapiv2 - out: ../../bsm-sdk/client/docs/passport - opt: allow_merge=true,merge_file_name=passport - - - local: protoc-gen-markdown - out: ../../bsm-sdk/client/docs/passport \ No newline at end of file diff --git a/apps/social/group/buf.yaml b/apps/social/group/buf.yaml deleted file mode 100644 index dcbcda2..0000000 --- a/apps/social/group/buf.yaml +++ /dev/null @@ -1,10 +0,0 @@ -# For details on buf.yaml configuration, visit https://buf.build/docs/configuration/v2/buf-yaml -version: v2 -lint: - use: - - STANDARD -modules: - - path: proto -breaking: - use: - - FILE diff --git a/apps/social/group/scripts/proto_gen.sh b/apps/social/group/scripts/proto_gen.sh deleted file mode 100644 index 59493c3..0000000 --- a/apps/social/group/scripts/proto_gen.sh +++ /dev/null @@ -1,14 +0,0 @@ -# 由于goctl 不能编译多个proto文件，所以先要安装合并工具： -# go install git.apinb.com/bsm-tools/proto-merge@v0.0.3 - -# 1. 先合并 -proto-merge ./proto/*.proto ./proto/group1.proto - -# 2. goctl 生成代码至/gen -goctl rpc protoc ./proto/group1.proto --go_out=./external/pb --go-grpc_out=./external/pb --zrpc_out=./ -m --style go_zero - -# 3. 清理无用文件 -rm ./proto/group1.proto -mv ./client ./external/ -rm group1.go -rm ./etc/group1.yaml \ No newline at end of file diff --git a/apps/social/group/test/lint/gosec b/apps/social/group/test/lint/gosec deleted file mode 100644 index 2f47f4b..0000000 --- a/apps/social/group/test/lint/gosec +++ /dev/null @@ -1,11 +0,0 @@ -{ - "Golang errors": {}, - "Issues": [], - "Stats": { - "files": 24, - "lines": 2377, - "nosec": 0, - "found": 0 - }, - "GosecVersion": "dev" -} \ No newline at end of file diff --git a/apps/social/relation/buf.gen.yaml b/apps/social/relation/buf.gen.yaml deleted file mode 100644 index 651df9d..0000000 --- a/apps/social/relation/buf.gen.yaml +++ /dev/null @@ -1,49 +0,0 @@ -version: v2 -plugins: - - local: protoc-gen-go - out: pb - opt: - - paths=source_relative - - - local: protoc-gen-go - out: ../../bsm-sdk/client/golang/relation - opt: - - paths=source_relative - - - local: protoc-gen-go-grpc - out: pb - opt: - - paths=source_relative - - - local: protoc-gen-go-grpc - out: ../../bsm-sdk/client/golang/relation - opt: - - paths=source_relative - - - local: protoc-gen-grpc-gateway - out: pb - opt: - - paths=source_relative - - generate_unbound_methods=True - - - local: protoc-gen-slc - out: ./ - - - local: protoc-gen-ts - out: ../../bsm-sdk/client/typescript - - - local: protoc-gen-dart - out: ../../bsm-sdk/client/dart/relation - opt: - - grpc - - - local: protoc-gen-openapiv2 - out: ./swagger - opt: allow_merge=true,merge_file_name=relation - - - local: protoc-gen-openapiv2 - out: ../../bsm-sdk/client/docs/relation - opt: allow_merge=true,merge_file_name=relation - - - local: protoc-gen-markdown - out: ../../bsm-sdk/client/docs/relation \ No newline at end of file diff --git a/apps/social/relation/buf.yaml b/apps/social/relation/buf.yaml deleted file mode 100644 index dcbcda2..0000000 --- a/apps/social/relation/buf.yaml +++ /dev/null @@ -1,10 +0,0 @@ -# For details on buf.yaml configuration, visit https://buf.build/docs/configuration/v2/buf-yaml -version: v2 -lint: - use: - - STANDARD -modules: - - path: proto -breaking: - use: - - FILE diff --git a/apps/social/relation/internal/impl/impl.go b/apps/social/relation/internal/impl/impl.go deleted file mode 100644 index 3d90080..0000000 --- a/apps/social/relation/internal/impl/impl.go +++ /dev/null @@ -1,25 +0,0 @@ -package impl - -import ( - "git.apinb.com/bsm-sdk/core/cache/redis" - "git.apinb.com/bsm-sdk/core/with" - "git.apinb.com/bsm-social/relation/internal/config" - cache "github.com/patrickmn/go-cache" - clientv3 "go.etcd.io/etcd/client/v3" - "gorm.io/gorm" -) - -var ( - RedisService *redis.RedisClient - EtcdService *clientv3.Client - DBService *gorm.DB - MemorySerice *cache.Cache -) - -func NewImpl() { - // with activating - MemorySerice = with.Memory(nil) - RedisService = with.RedisCache(config.Spec.Cache) // redis cache - DBService = with.Databases(config.Spec.Databases, nil) // model - EtcdService = with.Etcd(config.Spec.Etcd) // etcd -} diff --git a/apps/social/relation/scripts/proto_gen.sh b/apps/social/relation/scripts/proto_gen.sh deleted file mode 100644 index 3960144..0000000 --- a/apps/social/relation/scripts/proto_gen.sh +++ /dev/null @@ -1,14 +0,0 @@ -# 由于goctl 不能编译多个proto文件，所以先要安装合并工具： -# go install git.apinb.com/bsm-tools/proto-merge@v0.0.3 - -# 1. 先合并 -proto-merge ./proto/*.proto ./proto/relation.proto - -# 2. goctl 生成代码至/gen -goctl rpc protoc ./proto/relation.proto --go_out=./external/pb --go-grpc_out=./external/pb --zrpc_out=./ -m --style go_zero - -# 3. 清理无用文件 -rm ./proto/relation.proto -mv ./client ./external/ -rm relation.go -rm ./etc/relation.yaml \ No newline at end of file diff --git a/apps/social/relation/test/lint/gosec b/apps/social/relation/test/lint/gosec deleted file mode 100644 index 2f47f4b..0000000 --- a/apps/social/relation/test/lint/gosec +++ /dev/null @@ -1,11 +0,0 @@ -{ - "Golang errors": {}, - "Issues": [], - "Stats": { - "files": 24, - "lines": 2377, - "nosec": 0, - "found": 0 - }, - "GosecVersion": "dev" -} \ No newline at end of file diff --git a/cmd/go.mod b/cmd/go.mod index a800ad3..7683a67 100644 --- a/cmd/go.mod +++ b/cmd/go.mod @@ -1,24 +1,24 @@ -module git.apinb.com/bsm-monolith +module bsm/full/cmd go 1.26.5 require ( - git.apinb.com/bsm-apps/ads v0.0.0 - git.apinb.com/bsm-apps/cloud v0.0.0 - git.apinb.com/bsm-apps/cms v0.0.0 - git.apinb.com/bsm-apps/feedback v0.0.0 - git.apinb.com/bsm-apps/fts v0.0.0 - git.apinb.com/bsm-apps/initial v0.0.0 - git.apinb.com/bsm-apps/logs v0.0.0 - git.apinb.com/bsm-apps/mgt v0.0.0 - git.apinb.com/bsm-apps/passport v0.0.0 - git.apinb.com/bsm-apps/sender v0.0.0 - git.apinb.com/bsm-ec/address v0.0.0 - git.apinb.com/bsm-ec/mall v0.0.0 - git.apinb.com/bsm-ec/market v0.0.0 - git.apinb.com/bsm-ec/order v0.0.0 - git.apinb.com/bsm-finance/wallet v0.0.0 - git.apinb.com/bsm-service-ec/delivery v0.0.0 + bsm/full/module/base/ads v0.0.0 + bsm/full/module/base/cloud v0.0.0 + bsm/full/module/base/cms v0.0.0 + bsm/full/module/base/feedback v0.0.0 + bsm/full/module/base/fts v0.0.0 + bsm/full/module/base/initial v0.0.0 + bsm/full/module/base/logs v0.0.0 + bsm/full/module/base/mgt v0.0.0 + bsm/full/module/base/passport v0.0.0 + bsm/full/module/base/sender v0.0.0 + bsm/full/module/ec/address v0.0.0 + bsm/full/module/ec/delivery v0.0.0 + bsm/full/module/ec/mall v0.0.0 + bsm/full/module/ec/market v0.0.0 + bsm/full/module/ec/order v0.0.0 + bsm/full/module/finance/wallet v0.0.0 ) require ( @@ -44,7 +44,7 @@ require ( github.com/bits-and-blooms/bitset v1.14.3 // indirect github.com/bytedance/gopkg v0.1.4 // indirect github.com/bytedance/sonic v1.15.2 // indirect - github.com/bytedance/sonic/loader v0.5.1 // indirect + github.com/bytedance/sonic/loader v0.5.2 // indirect github.com/cenkalti/backoff/v4 v4.3.0 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/clbanning/mxj/v2 v2.7.0 // indirect @@ -58,26 +58,30 @@ require ( github.com/emicklei/go-restful/v3 v3.12.1 // indirect github.com/fatih/color v1.17.0 // indirect github.com/fxamacker/cbor/v2 v2.7.0 // indirect - github.com/gabriel-vasile/mimetype v1.4.13 // indirect + github.com/gabriel-vasile/mimetype v1.4.15 // indirect github.com/gin-contrib/cors v1.7.7 // indirect github.com/gin-contrib/sessions v1.1.0 // indirect github.com/gin-contrib/sse v1.1.1 // indirect github.com/gin-gonic/gin v1.12.0 // indirect github.com/go-ini/ini v1.67.0 // indirect github.com/go-jose/go-jose/v4 v4.1.4 // indirect - github.com/go-logr/logr v1.4.3 // indirect + github.com/go-logr/logr v1.4.4 // indirect github.com/go-logr/stdr v1.2.2 // indirect - github.com/go-openapi/jsonpointer v0.22.1 // indirect - github.com/go-openapi/jsonreference v0.21.2 // indirect - github.com/go-openapi/spec v0.22.0 // indirect - github.com/go-openapi/swag v0.23.0 // indirect - github.com/go-openapi/swag/conv v0.25.1 // indirect - github.com/go-openapi/swag/jsonname v0.25.1 // indirect - github.com/go-openapi/swag/jsonutils v0.25.1 // indirect - github.com/go-openapi/swag/loading v0.25.1 // indirect - github.com/go-openapi/swag/stringutils v0.25.1 // indirect - github.com/go-openapi/swag/typeutils v0.25.1 // indirect - github.com/go-openapi/swag/yamlutils v0.25.1 // indirect + github.com/go-openapi/jsonpointer v1.0.0 // indirect + github.com/go-openapi/jsonreference v1.0.0 // indirect + github.com/go-openapi/spec v0.22.9 // indirect + github.com/go-openapi/swag v0.28.0 // indirect + github.com/go-openapi/swag/cmdutils v0.28.0 // indirect + github.com/go-openapi/swag/conv v0.28.0 // indirect + github.com/go-openapi/swag/fileutils v0.28.0 // indirect + github.com/go-openapi/swag/jsonutils v0.28.0 // indirect + github.com/go-openapi/swag/loading v0.28.0 // indirect + github.com/go-openapi/swag/mangling v0.28.0 // indirect + github.com/go-openapi/swag/netutils v0.28.0 // indirect + github.com/go-openapi/swag/pools v0.28.0 // indirect + github.com/go-openapi/swag/stringutils v0.28.0 // indirect + github.com/go-openapi/swag/typeutils v0.28.0 // indirect + github.com/go-openapi/swag/yamlutils v0.28.0 // indirect github.com/go-pay/crypto v0.0.1 // indirect github.com/go-pay/errgroup v0.0.3 // indirect github.com/go-pay/gopay v1.5.114 // indirect @@ -104,7 +108,7 @@ require ( github.com/gorilla/context v1.1.2 // indirect github.com/gorilla/securecookie v1.1.2 // indirect github.com/gorilla/sessions v1.4.0 // indirect - github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0 // indirect github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect github.com/hamba/avro/v2 v2.26.0 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect @@ -115,14 +119,12 @@ require ( github.com/jackc/puddle/v2 v2.2.2 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect - github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.18.5 // indirect - github.com/klauspost/cpuid/v2 v2.3.0 // indirect - github.com/leodido/go-urn v1.4.0 // indirect - github.com/mailru/easyjson v0.7.7 // indirect + github.com/klauspost/compress v1.19.2 // indirect + github.com/klauspost/cpuid/v2 v2.4.0 // indirect + github.com/leodido/go-urn v1.5.0 // indirect github.com/mattn/go-colorable v0.1.13 // indirect - github.com/mattn/go-isatty v0.0.22 // indirect + github.com/mattn/go-isatty v0.0.24 // indirect github.com/minio/crc64nvme v1.1.1 // indirect github.com/minio/md5-simd v1.1.2 // indirect github.com/minio/minio-go/v7 v7.0.95 // indirect @@ -131,20 +133,20 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/mtibben/percent v0.2.1 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect - github.com/oklog/ulid/v2 v2.1.1 // indirect + github.com/oklog/ulid/v2 v2.1.2 // indirect github.com/openzipkin/zipkin-go v0.4.3 // indirect github.com/patrickmn/go-cache v2.1.0+incompatible // indirect - github.com/pelletier/go-toml/v2 v2.3.1 // indirect + github.com/pelletier/go-toml/v2 v2.4.3 // indirect github.com/philhofer/fwd v1.2.0 // indirect github.com/pierrec/lz4 v2.6.1+incompatible // indirect github.com/pkg/errors v0.9.1 // indirect - github.com/prometheus/client_golang v1.20.5 // indirect + github.com/prometheus/client_golang v1.23.2 // indirect github.com/prometheus/client_model v0.6.2 // indirect - github.com/prometheus/common v0.62.0 // indirect - github.com/prometheus/procfs v0.15.1 // indirect + github.com/prometheus/common v0.67.5 // indirect + github.com/prometheus/procfs v0.16.1 // indirect github.com/quic-go/qpack v0.6.0 // indirect - github.com/quic-go/quic-go v0.59.1 // indirect - github.com/redis/go-redis/v9 v9.20.0 // indirect + github.com/quic-go/quic-go v0.61.0 // indirect + github.com/redis/go-redis/v9 v9.22.0 // indirect github.com/rs/xid v1.6.0 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect @@ -158,52 +160,53 @@ require ( github.com/tinylib/msgp v1.4.0 // indirect github.com/tjfoc/gmsm v1.4.1 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect - github.com/ugorji/go/codec v1.3.1 // indirect + github.com/ugorji/go/codec v1.3.2 // indirect github.com/x448/float16 v0.8.4 // indirect github.com/zeromicro/go-zero v1.7.2 // indirect - go.etcd.io/etcd/api/v3 v3.6.12 // indirect - go.etcd.io/etcd/client/pkg/v3 v3.6.12 // indirect - go.etcd.io/etcd/client/v3 v3.6.12 // indirect - go.mongodb.org/mongo-driver/v2 v2.6.0 // indirect + go.etcd.io/etcd/api/v3 v3.7.1 // indirect + go.etcd.io/etcd/client/pkg/v3 v3.7.1 // indirect + go.etcd.io/etcd/client/v3 v3.7.1 // indirect + go.mongodb.org/mongo-driver/v2 v2.8.0 // indirect go.opentelemetry.io/auto/sdk v1.2.1 // indirect - go.opentelemetry.io/otel v1.43.0 // indirect + go.opentelemetry.io/otel v1.45.0 // indirect go.opentelemetry.io/otel/exporters/jaeger v1.17.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.30.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.30.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.30.0 // indirect - go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.30.0 // indirect + go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.45.0 // indirect go.opentelemetry.io/otel/exporters/zipkin v1.30.0 // indirect - go.opentelemetry.io/otel/metric v1.43.0 // indirect - go.opentelemetry.io/otel/sdk v1.43.0 // indirect - go.opentelemetry.io/otel/trace v1.43.0 // indirect + go.opentelemetry.io/otel/metric v1.45.0 // indirect + go.opentelemetry.io/otel/sdk v1.45.0 // indirect + go.opentelemetry.io/otel/trace v1.45.0 // indirect go.opentelemetry.io/proto/otlp v1.9.0 // indirect go.uber.org/atomic v1.11.0 // indirect go.uber.org/automaxprocs v1.6.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.28.0 // indirect - go.yaml.in/yaml/v3 v3.0.4 // indirect - golang.org/x/arch v0.27.0 // indirect - golang.org/x/crypto v0.52.0 // indirect - golang.org/x/mod v0.36.0 // indirect - golang.org/x/net v0.55.0 // indirect + go.yaml.in/yaml/v2 v2.4.3 // indirect + go.yaml.in/yaml/v3 v3.0.5 // indirect + golang.org/x/arch v0.30.0 // indirect + golang.org/x/crypto v0.54.0 // indirect + golang.org/x/mod v0.37.0 // indirect + golang.org/x/net v0.57.0 // indirect golang.org/x/oauth2 v0.36.0 // indirect - golang.org/x/sync v0.20.0 // indirect - golang.org/x/sys v0.45.0 // indirect - golang.org/x/term v0.43.0 // indirect - golang.org/x/text v0.37.0 // indirect + golang.org/x/sync v0.22.0 // indirect + golang.org/x/sys v0.47.0 // indirect + golang.org/x/term v0.45.0 // indirect + golang.org/x/text v0.40.0 // indirect golang.org/x/time v0.7.0 // indirect - golang.org/x/tools v0.44.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa // indirect - google.golang.org/grpc v1.81.1 // indirect + golang.org/x/tools v0.47.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea // indirect + google.golang.org/grpc v1.83.0 // indirect google.golang.org/protobuf v1.36.11 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect gorm.io/driver/mysql v1.6.0 // indirect - gorm.io/driver/postgres v1.6.0 // indirect - gorm.io/gorm v1.31.1 // indirect + gorm.io/driver/postgres v1.6.2 // indirect + gorm.io/gorm v1.31.2 // indirect k8s.io/api v0.31.1 // indirect k8s.io/apimachinery v0.31.1 // indirect k8s.io/client-go v0.31.1 // indirect @@ -212,24 +215,26 @@ require ( k8s.io/utils v0.0.0-20240921022957-49e7df575cb6 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect - sigs.k8s.io/yaml v1.4.0 // indirect + sigs.k8s.io/yaml v1.6.0 // indirect ) replace ( - git.apinb.com/bsm-apps/ads => ../apps/base/ads - git.apinb.com/bsm-apps/cloud => ../apps/base/cloud - git.apinb.com/bsm-apps/cms => ../apps/base/cms - git.apinb.com/bsm-apps/feedback => ../apps/base/feedback - git.apinb.com/bsm-apps/fts => ../apps/base/fts - git.apinb.com/bsm-apps/initial => ../apps/base/initial - git.apinb.com/bsm-apps/logs => ../apps/base/logs - git.apinb.com/bsm-apps/mgt => ../apps/base/mgt - git.apinb.com/bsm-apps/passport => ../apps/base/passport - git.apinb.com/bsm-apps/sender => ../apps/base/sender - git.apinb.com/bsm-ec/address => ../apps/ec/address - git.apinb.com/bsm-ec/mall => ../apps/ec/mall - git.apinb.com/bsm-ec/market => ../apps/ec/market - git.apinb.com/bsm-ec/order => ../apps/ec/order - git.apinb.com/bsm-finance/wallet => ../apps/finance/wallet - git.apinb.com/bsm-service-ec/delivery => ../apps/ec/delivery + bsm/full/module/base/ads => ../module/base/ads + bsm/full/module/base/cloud => ../module/base/cloud + bsm/full/module/base/cms => ../module/base/cms + bsm/full/module/base/feedback => ../module/base/feedback + bsm/full/module/base/fts => ../module/base/fts + bsm/full/module/base/initial => ../module/base/initial + bsm/full/module/base/logs => ../module/base/logs + bsm/full/module/base/mgt => ../module/base/mgt + bsm/full/module/base/passport => ../module/base/passport + bsm/full/module/base/sender => ../module/base/sender + bsm/full/module/ec/address => ../module/ec/address + bsm/full/module/ec/delivery => ../module/ec/delivery + bsm/full/module/ec/mall => ../module/ec/mall + bsm/full/module/ec/market => ../module/ec/market + bsm/full/module/ec/order => ../module/ec/order + bsm/full/module/finance/wallet => ../module/finance/wallet ) + +replace git.apinb.com/bsm-sdk/core => D:/work/bsm-sdk/core diff --git a/cmd/go.sum b/cmd/go.sum index 7f99bb8..891873b 100644 --- a/cmd/go.sum +++ b/cmd/go.sum @@ -3,8 +3,6 @@ dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= filippo.io/edwards25519 v1.2.0 h1:crnVqOiS4jqYleHd9vaKZ+HKtHfllngJIiOpNpoJsjo= filippo.io/edwards25519 v1.2.0/go.mod h1:xzAOLCNug/yB62zG1bQ8uziwrIqIuxhctzJT18Q77mc= -git.apinb.com/bsm-sdk/core v0.2.0 h1:/e9yqpsbKBrRgMiGpS3KX2O4qDLxo5V5GpPSLNGxEKw= -git.apinb.com/bsm-sdk/core v0.2.0/go.mod h1:E9T6Eboo/0Zb36BjkKbIgvFzq4fQ2Q8P/7y5zmYTI6Y= git.apinb.com/bsm-sdk/engine v1.3.2 h1:QJ20jveUIHcn3Tu0ktrkZI9zGRaPuJRZ+YTbSa1Zj1w= git.apinb.com/bsm-sdk/engine v1.3.2/go.mod h1:OXRlO6Cdidqagw+LJjCngvpuuX1rwhxDwZlL/MhwiKQ= github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 h1:/vQbFIOMbk2FiG/kXiLl8BRyzTWDw7gX/Hz7Dd5eDMs= @@ -97,8 +95,8 @@ github.com/bytedance/gopkg v0.1.4 h1:oZnQwnX82KAIWb7033bEwtxvTqXcYMxDBaQxo5JJHWM github.com/bytedance/gopkg v0.1.4/go.mod h1:v1zWfPm21Fb+OsyXN2VAHdL6TBb2L88anLQgdyje6R4= github.com/bytedance/sonic v1.15.2 h1:90H+rcF/FwLXwfB1cudOLq/je83n683Utf4Cbp0xHCo= github.com/bytedance/sonic v1.15.2/go.mod h1:mT2NbXunuaEbnZ+mRIX/vYqKISmgEuHFDI4UzmKx2SA= -github.com/bytedance/sonic/loader v0.5.1 h1:Ygpfa9zwRCCKSlrp5bBP/b/Xzc3VxsAW+5NIYXrOOpI= -github.com/bytedance/sonic/loader v0.5.1/go.mod h1:AR4NYCk5DdzZizZ5djGqQ92eEhCCcdf5x77udYiSJRo= +github.com/bytedance/sonic/loader v0.5.2 h1:0QtP1gevc1OZ6/H8Lb9BRZiCXd1Ftjd3OKuj1T1lBIo= +github.com/bytedance/sonic/loader v0.5.2/go.mod h1:AR4NYCk5DdzZizZ5djGqQ92eEhCCcdf5x77udYiSJRo= github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= @@ -149,16 +147,16 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/fatih/color v1.17.0 h1:GlRw1BRJxkpqUCBKzKOw098ed57fEsKeNjpTe3cSjK4= github.com/fatih/color v1.17.0/go.mod h1:YZ7TlrGPkiz6ku9fK3TLD/pl3CpsiFyu8N92HLgmosI= -github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= -github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/felixge/httpsnoop v1.1.0 h1:3YtUj32ZZkqZtt3sZZsClsymw/QDuVfpNhoA31zeORc= +github.com/felixge/httpsnoop v1.1.0/go.mod h1:Zqxgdd+1Rkcz8euOqdr7lqgCRJztwr5hp9vDSi5UZCE= github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= 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.13 h1:46nXokslUBsAJE/wMsp5gtO500a4F3Nkz9Ufpk2AcUM= -github.com/gabriel-vasile/mimetype v1.4.13/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s= +github.com/gabriel-vasile/mimetype v1.4.15 h1:05iP/CYtZ/w455R/KZM6rZ5ieAdh99UPtd+d3YzLmaI= +github.com/gabriel-vasile/mimetype v1.4.15/go.mod h1:azpTcoLcDZRNgFou5j+APrqQx9HqVPWa6ijYQIIVswQ= github.com/gin-contrib/cors v1.7.7 h1:Oh9joP463x7Mw72vhvJ61YQm8ODh9b04YR7vsOErD0Q= github.com/gin-contrib/cors v1.7.7/go.mod h1:K5tW0RkzJtWSiOdikXloy8VEZlgdVNpHNw8FpjUPNrE= github.com/gin-contrib/gzip v0.0.6 h1:NjcunTcGAj5CO1gn4N8jHOSIeRFHIbn51z6K+xaN4d4= @@ -174,36 +172,48 @@ github.com/go-ini/ini v1.67.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3I github.com/go-jose/go-jose/v4 v4.1.4 h1:moDMcTHmvE6Groj34emNPLs/qtYXRVcd6S7NHbHz3kA= github.com/go-jose/go-jose/v4 v4.1.4/go.mod h1:x4oUasVrzR7071A4TnHLGSPpNOm2a21K9Kf04k1rs08= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= -github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.4 h1:tG4xh9yMsRCAiodLVTxyrkzSZ9+o0L1Kg/+cPVcbP/8= +github.com/go-logr/logr v1.4.4/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE= github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78= -github.com/go-openapi/jsonpointer v0.22.1 h1:sHYI1He3b9NqJ4wXLoJDKmUmHkWy/L7rtEo92JUxBNk= -github.com/go-openapi/jsonpointer v0.22.1/go.mod h1:pQT9OsLkfz1yWoMgYFy4x3U5GY5nUlsOn1qSBH5MkCM= -github.com/go-openapi/jsonreference v0.21.2 h1:Wxjda4M/BBQllegefXrY/9aq1fxBA8sI5M/lFU6tSWU= -github.com/go-openapi/jsonreference v0.21.2/go.mod h1:pp3PEjIsJ9CZDGCNOyXIQxsNuroxm8FAJ/+quA0yKzQ= -github.com/go-openapi/spec v0.22.0 h1:xT/EsX4frL3U09QviRIZXvkh80yibxQmtoEvyqug0Tw= -github.com/go-openapi/spec v0.22.0/go.mod h1:K0FhKxkez8YNS94XzF8YKEMULbFrRw4m15i2YUht4L0= -github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE= -github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ= -github.com/go-openapi/swag/conv v0.25.1 h1:+9o8YUg6QuqqBM5X6rYL/p1dpWeZRhoIt9x7CCP+he0= -github.com/go-openapi/swag/conv v0.25.1/go.mod h1:Z1mFEGPfyIKPu0806khI3zF+/EUXde+fdeksUl2NiDs= -github.com/go-openapi/swag/jsonname v0.25.1 h1:Sgx+qbwa4ej6AomWC6pEfXrA6uP2RkaNjA9BR8a1RJU= -github.com/go-openapi/swag/jsonname v0.25.1/go.mod h1:71Tekow6UOLBD3wS7XhdT98g5J5GR13NOTQ9/6Q11Zo= -github.com/go-openapi/swag/jsonutils v0.25.1 h1:AihLHaD0brrkJoMqEZOBNzTLnk81Kg9cWr+SPtxtgl8= -github.com/go-openapi/swag/jsonutils v0.25.1/go.mod h1:JpEkAjxQXpiaHmRO04N1zE4qbUEg3b7Udll7AMGTNOo= -github.com/go-openapi/swag/jsonutils/fixtures_test v0.25.1 h1:DSQGcdB6G0N9c/KhtpYc71PzzGEIc/fZ1no35x4/XBY= -github.com/go-openapi/swag/jsonutils/fixtures_test v0.25.1/go.mod h1:kjmweouyPwRUEYMSrbAidoLMGeJ5p6zdHi9BgZiqmsg= -github.com/go-openapi/swag/loading v0.25.1 h1:6OruqzjWoJyanZOim58iG2vj934TysYVptyaoXS24kw= -github.com/go-openapi/swag/loading v0.25.1/go.mod h1:xoIe2EG32NOYYbqxvXgPzne989bWvSNoWoyQVWEZicc= -github.com/go-openapi/swag/stringutils v0.25.1 h1:Xasqgjvk30eUe8VKdmyzKtjkVjeiXx1Iz0zDfMNpPbw= -github.com/go-openapi/swag/stringutils v0.25.1/go.mod h1:JLdSAq5169HaiDUbTvArA2yQxmgn4D6h4A+4HqVvAYg= -github.com/go-openapi/swag/typeutils v0.25.1 h1:rD/9HsEQieewNt6/k+JBwkxuAHktFtH3I3ysiFZqukA= -github.com/go-openapi/swag/typeutils v0.25.1/go.mod h1:9McMC/oCdS4BKwk2shEB7x17P6HmMmA6dQRtAkSnNb8= -github.com/go-openapi/swag/yamlutils v0.25.1 h1:mry5ez8joJwzvMbaTGLhw8pXUnhDK91oSJLDPF1bmGk= -github.com/go-openapi/swag/yamlutils v0.25.1/go.mod h1:cm9ywbzncy3y6uPm/97ysW8+wZ09qsks+9RS8fLWKqg= +github.com/go-openapi/jsonpointer v1.0.0 h1:kR9tHqY0CtZaOPVFm622dPVNhrvYpwr4uCxgL3h1H8s= +github.com/go-openapi/jsonpointer v1.0.0/go.mod h1:Z3rw7dWu1p9IgitXCFamSlA5lmDiklEB6vkaxcNZW5Y= +github.com/go-openapi/jsonreference v1.0.0 h1:jlmTr6torcd1YgDQvSfNmRtKzYDO4FGBkrAdlAVWnpY= +github.com/go-openapi/jsonreference v1.0.0/go.mod h1:jtwdyGbJk0Xhe5Y+rwtglQP6Sb1WZST4rT32LWB+sv0= +github.com/go-openapi/spec v0.22.9 h1:/vKIFDcGKp0ktZWGbym/tJEWbk6/XOEmAVU0kqKMH+w= +github.com/go-openapi/spec v0.22.9/go.mod h1:b/mNUYIOQOyIiUzUzXEE8xzyZqf93KvM9hQGP91yfl0= +github.com/go-openapi/swag v0.28.0 h1:xkgbOSKj6DZziNpyqRRAOt3GJGtgjgsd2RoyT30VWuw= +github.com/go-openapi/swag v0.28.0/go.mod h1:4qYnT3Cqr1p1VknOdPo70evN4rgQnAg6jwApHyxSGIg= +github.com/go-openapi/swag/cmdutils v0.28.0 h1:7TOeNtkYru1SG8Y34tDh9WBbLsMqGnptuxWiHREPZ4Q= +github.com/go-openapi/swag/cmdutils v0.28.0/go.mod h1:Sm1MVFMkF6guJJ+pQqHnQA3N0j9qALV3NxzDSv6bETM= +github.com/go-openapi/swag/conv v0.28.0 h1:GtqqbyFe7vR5Y7ehxG9W6/OvrSFdf1OLeTGp40TqxH8= +github.com/go-openapi/swag/conv v0.28.0/go.mod h1:mbUE+mzctnhxi864m0Q07SpN8OowD9JhxmxuYvZZD/k= +github.com/go-openapi/swag/fileutils v0.28.0 h1:Z04XWQD7R8Eq+7GnOrjovBxPPmZzsS4gt2H2GPGIViU= +github.com/go-openapi/swag/fileutils v0.28.0/go.mod h1:VvJFZLTZS0AI854gEQz5tk7dBESdLjiNUMSZ/th2ry8= +github.com/go-openapi/swag/jsonutils v0.28.0 h1:YIch6FwO7RXzeAnbO8Tu7dWBZeUEH+4nA0HXltVTnv4= +github.com/go-openapi/swag/jsonutils v0.28.0/go.mod h1:CYM3WlTUcagR2ZoHdz54di/cbBqt82tuxuXgAjxw+mg= +github.com/go-openapi/swag/jsonutils/fixtures_test v0.28.0 h1:qV+VVUAx5Oro8WjVWpZeql7YReTKhT4smR4zhcOQZr0= +github.com/go-openapi/swag/jsonutils/fixtures_test v0.28.0/go.mod h1:mofwUWx70wvskwESqRJ//k/9kURmCgyJl5m5Ppoh5kY= +github.com/go-openapi/swag/loading v0.28.0 h1:td8QZdZC9MIYGGSnSPKShKiK22I2tU5UQvuUhIBPRLU= +github.com/go-openapi/swag/loading v0.28.0/go.mod h1:rXB0QiQX5mMveXEA7ouM4KiiM9jVJe4K6BVbwhD1M4k= +github.com/go-openapi/swag/mangling v0.28.0 h1:pH8eyeNO9SLYsTMWJrurnNfKmDa28XrlA+HePVD53VM= +github.com/go-openapi/swag/mangling v0.28.0/go.mod h1:jtBE2+V+3pILxOR7Vgce+Cwp6A2PgZbvVqfNntbVs0w= +github.com/go-openapi/swag/netutils v0.28.0 h1:YXN6TALEi2pzts8/8GNm6T61HTAZsieukGZidap989k= +github.com/go-openapi/swag/netutils v0.28.0/go.mod h1:J+WYyFMLtvtCGqa6jLv+YNUmIKI3ZRQRrvfNDMoQoEQ= +github.com/go-openapi/swag/pools v0.28.0 h1:HPMZWSAfce3rdVTFcjFiCIBtDg9h4x2QlRrHipwhxeU= +github.com/go-openapi/swag/pools v0.28.0/go.mod h1:kVQefhSK5RWuRe7BXsL8htgBPAMpN7HDGpGEknqugeE= +github.com/go-openapi/swag/stringutils v0.28.0 h1:ixsc9iYgDPubHL/8nSkbnryEHpD2VRlBMLKpQyPXcDU= +github.com/go-openapi/swag/stringutils v0.28.0/go.mod h1:lzRN95CxXmA03XcDWHLOb6nOMcxCqR5rGY0lOgsfRoM= +github.com/go-openapi/swag/typeutils v0.28.0 h1:nRBKSBXjDgf01VDPB3fWeD9nQuhCOVeIYAkUx2tbkyY= +github.com/go-openapi/swag/typeutils v0.28.0/go.mod h1:Srm0xFNRZ1Y+vCxJclo5qzx8aj+1pAKda/YfFPrG0dQ= +github.com/go-openapi/swag/yamlutils v0.28.0 h1:TV3JXH6DS46KUroDtMLAYHGkdWf5VDq3wVWFirmzROY= +github.com/go-openapi/swag/yamlutils v0.28.0/go.mod h1:x0q/yndZHEgk9Rx3DyDqzFUmHy55KTvIZldvF2dTJXs= +github.com/go-openapi/testify/enable/yaml/v2 v2.6.0 h1:gGHwAJ0R/5jU8BEGDbfRNR3hL68dAVi84WuOApp29B0= +github.com/go-openapi/testify/enable/yaml/v2 v2.6.0/go.mod h1:tY+St1SGq4NFl0QIqdTY4aEdbChAHxhyB77XQi9iJCo= +github.com/go-openapi/testify/v2 v2.6.0 h1:5PKH2HE7YJ/LuRPQGvSxBRlFXNQhSetBLlGAgUEu3ug= +github.com/go-openapi/testify/v2 v2.6.0/go.mod h1:SgsVHtfooshd0tublTtJ50FPKhujf47YRqauXXOUxfw= github.com/go-pay/crypto v0.0.1 h1:B6InT8CLfSLc6nGRVx9VMJRBBazFMjr293+jl0lLXUY= github.com/go-pay/crypto v0.0.1/go.mod h1:41oEIvHMKbNcYlWUlRWtsnC6+ASgh7u29z0gJXe5bes= github.com/go-pay/errgroup v0.0.3 h1:DB4s8e8oWYDyETKQ1y1riMJ7y29zE1uIsMCSjEOFSbU= @@ -283,8 +293,8 @@ github.com/gorilla/securecookie v1.1.2 h1:YCIWL56dvtr73r6715mJs5ZvhtnY73hBvEF8kX github.com/gorilla/securecookie v1.1.2/go.mod h1:NfCASbcHqRSY+3a8tlWJwsQap2VX5pwzwo4h3eOamfo= github.com/gorilla/sessions v1.4.0 h1:kpIYOp/oi6MG/p5PgxApU8srsSw9tuFbt46Lt7auzqQ= github.com/gorilla/sessions v1.4.0/go.mod h1:FLWm50oby91+hl7p/wRxDth9bWSuk0qVL2emc7lT5ik= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 h1:5VipnvEpbqr2gA2VbM+nYVbkIF28c5ZQfqCBQ5g2xfk= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0/go.mod h1:Hyl3n6Twe1hvtd9XUXDec4pTvgMSEixRuQKPTMH2bNs= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0 h1:/Tnpcb2E0Pz/tN9s3bfEY2Q8ePCEX9iuS+cneUwncnw= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0/go.mod h1:zOBXOsUaBSjKgmH4OGzV1esUpR3oUSCPYVd2cUBjKYY= github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c h1:6rhixN/i8ZofjG1Y75iExal34USq5p+wiN1tpie8IrU= github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c/go.mod h1:NMPJylDgVpX0MLRlPy15sqSwOFv/U1GZ2m21JhFfek0= github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542 h1:2VTzZjLZBgl62/EtslCrtky5vbi9dd7HrQPQIx6wqiw= @@ -308,19 +318,17 @@ github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= -github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= -github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.18.5 h1:/h1gH5Ce+VWNLSWqPzOVn6XBO+vJbCNGvjoaGBFW2IE= -github.com/klauspost/compress v1.18.5/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ= +github.com/klauspost/compress v1.19.2 h1:hMRETovs/pu/dVWN7zIT1PGG8t509MwT6bO7XSi26R8= +github.com/klauspost/compress v1.19.2/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ= github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= -github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y= -github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0= +github.com/klauspost/cpuid/v2 v2.4.0 h1:S6Hrbc7+ywsr0r+RLapfGBHfyefhCTwEh3A0tV913Dw= +github.com/klauspost/cpuid/v2 v2.4.0/go.mod h1:19jmZ9mjzoF//ddRSUsv0zfBTJWh3QJh9FNxZTMrGxU= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= @@ -329,19 +337,19 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= -github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= -github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= +github.com/leodido/go-urn v1.5.0 h1:pLqT2kq1zpHW/1D18QMjMpdtX7cekxqtJJjg5ANyWw0= +github.com/leodido/go-urn v1.5.0/go.mod h1:9BORnCDhdPBJNDEX+w1bJisa8yOKYi116VeO96s4ifE= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= -github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= -github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-isatty v0.0.22 h1:j8l17JJ9i6VGPUFUYoTUKPSgKe/83EYU2zBC7YNKMw4= -github.com/mattn/go-isatty v0.0.22/go.mod h1:ZXfXG4SQHsB/w3ZeOYbR0PrPwLy+n6xiMrJlRFqopa4= +github.com/mattn/go-isatty v0.0.24 h1:tGZZoVgT/KiqK1c8ocVLeDS8BSWMRd47J3Lbz7vsReI= +github.com/mattn/go-isatty v0.0.24/go.mod h1:nMCL3Zebbrt45jsMDgnfIwz6ydEQApk5oEI3HqDio6A= +github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= +github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= github.com/minio/crc64nvme v1.1.1 h1:8dwx/Pz49suywbO+auHCBpCtlW1OfpcLN7wYgVR6wAI= github.com/minio/crc64nvme v1.1.1/go.mod h1:eVfm2fAzLlxMdUGc0EEBGSMmPwmXD5XiNRpnu9J3bvg= github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34= @@ -376,8 +384,8 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8m github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= -github.com/oklog/ulid/v2 v2.1.1 h1:suPZ4ARWLOJLegGFiZZ1dFAkqzhMjL3J1TzI+5wHz8s= -github.com/oklog/ulid/v2 v2.1.1/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ= +github.com/oklog/ulid/v2 v2.1.2 h1:IEclFb9JNvzYA6MW2SCxbLzcHTVsfqm3PrqGQJH5zec= +github.com/oklog/ulid/v2 v2.1.2/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA= @@ -393,8 +401,8 @@ github.com/openzipkin/zipkin-go v0.4.3/go.mod h1:M9wCJZFWCo2RiY+o1eBCEMe0Dp2S5LD github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= github.com/pborman/getopt v0.0.0-20170112200414-7148bc3a4c30/go.mod h1:85jBQOZwpVEaDAr341tbn15RS4fCAsIst0qp7i8ex1o= -github.com/pelletier/go-toml/v2 v2.3.1 h1:MYEvvGnQjeNkRF1qUuGolNtNExTDwct51yp7olPtrEc= -github.com/pelletier/go-toml/v2 v2.3.1/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY= +github.com/pelletier/go-toml/v2 v2.4.3 h1:GTRvJQutkOSftxIFD5xw9aepkYNuPWmVJpffdDPYVpY= +github.com/pelletier/go-toml/v2 v2.4.3/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY= github.com/philhofer/fwd v1.2.0 h1:e6DnBTl7vGY+Gz322/ASL4Gyp1FspeMvx1RNDoToZuM= github.com/philhofer/fwd v1.2.0/go.mod h1:RqIHx9QI14HlwKwm98g9Re5prTQ6LdeRQn+gXJFxsJM= github.com/pierrec/lz4 v2.6.1+incompatible h1:9UY3+iC23yxF0UfGaYrGplQ+79Rg+h/q9FV9ix19jjM= @@ -408,21 +416,23 @@ github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g= github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U= -github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y= -github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= +github.com/prometheus/client_golang v1.23.2 h1:Je96obch5RDVy3FDMndoUsjAhG5Edi49h0RJWRi/o0o= +github.com/prometheus/client_golang v1.23.2/go.mod h1:Tb1a6LWHB3/SPIzCoaDXI4I8UHKeFTEQ1YCr+0Gyqmg= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk= github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE= -github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io= -github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I= -github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= -github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= +github.com/prometheus/common v0.67.5 h1:pIgK94WWlQt1WLwAC5j2ynLaBRDiinoAb86HZHTUGI4= +github.com/prometheus/common v0.67.5/go.mod h1:SjE/0MzDEEAyrdr5Gqc6G+sXI67maCxzaT3A2+HqjUw= +github.com/prometheus/procfs v0.16.1 h1:hZ15bTNuirocR6u0JZ6BAHHmwS1p8B4P6MRqxtzMyRg= +github.com/prometheus/procfs v0.16.1/go.mod h1:teAbpZRB1iIAJYREa1LsoWUXykVXA1KlTmWl8x/U+Is= +github.com/quic-go/go-ossfuzz-seeds v0.1.0 h1:APacT+iIaNF6fd8AGEiN3bT/Jtkd2jz4v4TzM7MFjy0= +github.com/quic-go/go-ossfuzz-seeds v0.1.0/go.mod h1:3IOHRbJIc+L6YKMwfDtJAM9Vj9k0YY4muhuyUYk5tbk= github.com/quic-go/qpack v0.6.0 h1:g7W+BMYynC1LbYLSqRt8PBg5Tgwxn214ZZR34VIOjz8= github.com/quic-go/qpack v0.6.0/go.mod h1:lUpLKChi8njB4ty2bFLX2x4gzDqXwUpaO1DP9qMDZII= -github.com/quic-go/quic-go v0.59.1 h1:0Gmua0HW1Tv7ANR7hUYwRyD0MG5OJfgvYSZasGZzBic= -github.com/quic-go/quic-go v0.59.1/go.mod h1:upnsH4Ju1YkqpLXC305eW3yDZ4NfnNbmQRCMWS58IKU= -github.com/redis/go-redis/v9 v9.20.0 h1:WnQYxLkgO2xiXTCJY0ldIiI8dNqCDlQAG+AtaH7a2a0= -github.com/redis/go-redis/v9 v9.20.0/go.mod h1:v/M13XI1PVCDcm01VtPFOADfZtHf8YW3baQf57KlIkA= +github.com/quic-go/quic-go v0.61.0 h1:ui88A53s8MSVYLC56en0KQ17HARk+9986Dn0SBfKNvA= +github.com/quic-go/quic-go v0.61.0/go.mod h1:9So2anK4Tp22URSQq00k+Vo2PNkle96ycDPDHL4s9vs= +github.com/redis/go-redis/v9 v9.22.0 h1:laDvpYXTJtZLloinw1fA5Kqd6HAEH2XKxOkG/PDq2F0= +github.com/redis/go-redis/v9 v9.22.0/go.mod h1:y2g0Wj8rQvuK0ELM+oxSudcLtC09JScs98I/X9gRWY4= github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= github.com/rs/xid v1.6.0 h1:fV591PaemRlL6JfRxGDEPl69wICngIQ3shQtzfy2gxU= @@ -484,8 +494,8 @@ github.com/tklauser/numcpus v0.12.0 h1:NR85qdvHA9pFse3x3weVZ0r0ST8R6l5RHbZrlRaqo github.com/tklauser/numcpus v0.12.0/go.mod h1:ABHeXzJnr/qqwguhClkZKT1/8VABcYrsyUiUGobwWJg= github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= -github.com/ugorji/go/codec v1.3.1 h1:waO7eEiFDwidsBN6agj1vJQ4AG7lh2yqXyOXqhgQuyY= -github.com/ugorji/go/codec v1.3.1/go.mod h1:pRBVtBSKl77K30Bv8R2P+cLSGaTtex6fsA2Wjqmfxj4= +github.com/ugorji/go/codec v1.3.2 h1:zkEASHHyEClGeURfgNT9PJZVfAbs9oEX9QXggwWNJbc= +github.com/ugorji/go/codec v1.3.2/go.mod h1:pRBVtBSKl77K30Bv8R2P+cLSGaTtex6fsA2Wjqmfxj4= 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= @@ -501,20 +511,20 @@ github.com/zeebo/xxh3 v1.1.0 h1:s7DLGDK45Dyfg7++yxI0khrfwq9661w9EN78eP/UZVs= github.com/zeebo/xxh3 v1.1.0/go.mod h1:IisAie1LELR4xhVinxWS5+zf1lA4p0MW4T+w+W07F5s= github.com/zeromicro/go-zero v1.7.2 h1:a8lyVOG3KXG4LrAy6ZmtJTJtisX4Ostc4Pst4fE704I= github.com/zeromicro/go-zero v1.7.2/go.mod h1:WFXfF92Exw0O7WECifS6r99JSzv4KEN49x9RhAfgkMc= -go.etcd.io/etcd/api/v3 v3.6.12 h1:OLOZUKEuAA36TR48F0cIaa8FdzrWygjyfrJxXg4iDgs= -go.etcd.io/etcd/api/v3 v3.6.12/go.mod h1:p14EIQXHbuOQbVvL/WEes5uqKnxP9AgKJgpjbMVvzvE= -go.etcd.io/etcd/client/pkg/v3 v3.6.12 h1:36zzB+pQOdHbhN+kH2iJz/K8bJn0ZLtLfPPO7jozTDo= -go.etcd.io/etcd/client/pkg/v3 v3.6.12/go.mod h1:hh2+ZXtfLzs3o6mn92ntgNPBrTJJOvXqICM5g3L3DMY= -go.etcd.io/etcd/client/v3 v3.6.12 h1:kMSP6JcPZMqSJiX+TXdUIBU/4eXEZWBAaui4VihMbIc= -go.etcd.io/etcd/client/v3 v3.6.12/go.mod h1:CMs6fJWYiZQk4ytFjd4lE1diOvvRMmtbbn/alZXd3dQ= -go.mongodb.org/mongo-driver/v2 v2.6.0 h1:b9sJOYrkmt4l8bY43ZenFBcPlhYIjaOfYHLtbB/5qi8= -go.mongodb.org/mongo-driver/v2 v2.6.0/go.mod h1:yOI9kBsufol30iFsl1slpdq1I0eHPzybRWdyYUs8K/0= +go.etcd.io/etcd/api/v3 v3.7.1 h1:KJG0/DcWGfe3Y1otDf/fsBf0TSSgpxZ5RO/L8SFt73E= +go.etcd.io/etcd/api/v3 v3.7.1/go.mod h1:8bXIpCMeV7E3/XL0Ix123ATn3dB+0V7d9zklHbB0m78= +go.etcd.io/etcd/client/pkg/v3 v3.7.1 h1:rKYsj3pRkR0eK3yjT3XOgrhqfmIfj9pzNgxjh7mfFv4= +go.etcd.io/etcd/client/pkg/v3 v3.7.1/go.mod h1:cnzZGIUzSfjEwLC6UBVsSXlEK1eepS/JUD7wE6PLRT0= +go.etcd.io/etcd/client/v3 v3.7.1 h1:0PEMMC0KuZmVIN+RAbdqfkZ45pYTgKVtmBEbRCvZFUg= +go.etcd.io/etcd/client/v3 v3.7.1/go.mod h1:ffNqALa8tRCYhYo1F9oR489y23K39Gz+BSR3ApAGYq0= +go.mongodb.org/mongo-driver/v2 v2.8.0 h1:CxWDGQYY8QQwNjAl/aq2sfWakdnWZynnqJ9F4DhHbP8= +go.mongodb.org/mongo-driver/v2 v2.8.0/go.mod h1:yOI9kBsufol30iFsl1slpdq1I0eHPzybRWdyYUs8K/0= go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64= go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 h1:TT4fX+nBOA/+LUkobKGW1ydGcn+G3vRw9+g5HwCphpk= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0/go.mod h1:L7UH0GbB0p47T4Rri3uHjbpCFYrVrwc1I25QhNPiGK8= -go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I= -go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.70.0 h1:LMuyCAyfalSjDyjdC65nK6N0zoTT63+E/u95X0JovZI= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.70.0/go.mod h1:085m8qbm4hgc8rZWGDEa4vmyyo2c3nPxUslYUKUIU04= +go.opentelemetry.io/otel v1.45.0 h1:pdrWmLHofpubmArBv1LgFSv1Z0Ie/ppdZzu+kUN5EeU= +go.opentelemetry.io/otel v1.45.0/go.mod h1:XZxIqPapzEYnhNSScF5DIqXhm/rYi0FzCe2XddAwZfQ= go.opentelemetry.io/otel/exporters/jaeger v1.17.0 h1:D7UpUy2Xc2wsi1Ras6V40q806WM07rqoCWzXu7Sqy+4= go.opentelemetry.io/otel/exporters/jaeger v1.17.0/go.mod h1:nPCqOnEH9rNLKqH/+rrUjiMzHJdV1BlpKcTwRTyKkKI= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.30.0 h1:lsInsfvhVIfOI6qHVyysXMNDnjO9Npvl7tlDPJFBVd4= @@ -523,18 +533,18 @@ go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.30.0 h1:m0yTi go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.30.0/go.mod h1:wBQbT4UekBfegL2nx0Xk1vBcnzyBPsIVm9hRG4fYcr4= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.30.0 h1:umZgi92IyxfXd/l4kaDhnKgY8rnN/cZcF1LKc6I8OQ8= go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.30.0/go.mod h1:4lVs6obhSVRb1EW5FhOuBTyiQhtRtAnnva9vD3yRfq8= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.30.0 h1:kn1BudCgwtE7PxLqcZkErpD8GKqLZ6BSzeW9QihQJeM= -go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.30.0/go.mod h1:ljkUDtAMdleoi9tIG1R6dJUpVwDcYjw3J2Q6Q/SuiC0= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.45.0 h1:lsA/S1bxgdbyFGkTj+3meEdJ6ADVU7QoFstV6MXgE68= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.45.0/go.mod h1:L7u+MirGoB1bjeLH66+xDykF4RC8C3RN7lIFpBiewUo= go.opentelemetry.io/otel/exporters/zipkin v1.30.0 h1:1uYaSfxiCLdJATlGEtYjQe4jZYfqCjVwxeSTMXe8VF4= go.opentelemetry.io/otel/exporters/zipkin v1.30.0/go.mod h1:r/4BhMc3kiKxD61wGh9J3NVQ3/cZ45F2NHkQgVnql48= -go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM= -go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY= -go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg= -go.opentelemetry.io/otel/sdk v1.43.0/go.mod h1:P+IkVU3iWukmiit/Yf9AWvpyRDlUeBaRg6Y+C58QHzg= -go.opentelemetry.io/otel/sdk/metric v1.43.0 h1:S88dyqXjJkuBNLeMcVPRFXpRw2fuwdvfCGLEo89fDkw= -go.opentelemetry.io/otel/sdk/metric v1.43.0/go.mod h1:C/RJtwSEJ5hzTiUz5pXF1kILHStzb9zFlIEe85bhj6A= -go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A= -go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0= +go.opentelemetry.io/otel/metric v1.45.0 h1:7Eg1uH7CJ5cXv9is6tnBe1FI6rj1nwUdbFypRm3br/M= +go.opentelemetry.io/otel/metric v1.45.0/go.mod h1:HAPbm1nd3p1PmFH7v2dR+6BjXxw+Lq4a2+pndMAm08s= +go.opentelemetry.io/otel/sdk v1.45.0 h1:4VVSMgQ83dUgW2aoX5f6JgLvHwIvzcuLnF9lUdCSpCw= +go.opentelemetry.io/otel/sdk v1.45.0/go.mod h1:Sr40LgXV7DsKMMJMKOhUWOgMWTfAaqvm2kF0g7ilwuA= +go.opentelemetry.io/otel/sdk/metric v1.45.0 h1:oVFszMfyj1Am6s24Vtc7wBb8BKLcwepJjNEYILuiE3o= +go.opentelemetry.io/otel/sdk/metric v1.45.0/go.mod h1:vUWUxDZvu1WVRj8JA8S0AdhsPrZoDpA2DdZauIh4mDA= +go.opentelemetry.io/otel/trace v1.45.0 h1:l/mP6Uv7oNO7/TblbhpbgMidxhq1uO/rPsikOyVhxag= +go.opentelemetry.io/otel/trace v1.45.0/go.mod h1:qoJJA2xNMnxRrdISU/kLtfUH2wNeQbiv+jhs/CxI8bc= go.opentelemetry.io/proto/otlp v1.9.0 h1:l706jCMITVouPOqEnii2fIAuO3IVGBRPV5ICjceRb/A= go.opentelemetry.io/proto/otlp v1.9.0/go.mod h1:xE+Cx5E/eEHw+ISFkwPLwCZefwVjY+pqKg1qcK03+/4= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= @@ -549,10 +559,12 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.28.0 h1:IZzaP1Fv73/T/pBMLk4VutPl36uNC+OSUh3JLG3FIjo= go.uber.org/zap v1.28.0/go.mod h1:rDLpOi171uODNm/mxFcuYWxDsqWSAVkFdX4XojSKg/Q= -go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= -go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= -golang.org/x/arch v0.27.0 h1:0WNVcR8u9yFz8j5FvdHpgwNp3FS5U4guYdzHwEiGjoU= -golang.org/x/arch v0.27.0/go.mod h1:0X+GdSIP+kL5wPmpK7sdkEVTt2XoYP0cSjQSbZBwOi8= +go.yaml.in/yaml/v2 v2.4.3 h1:6gvOSjQoTB3vt1l+CU+tSyi/HOjfOjRLJ4YwYZGwRO0= +go.yaml.in/yaml/v2 v2.4.3/go.mod h1:zSxWcmIDjOzPXpjlTTbAsKokqkDNAVtZO0WOMiT90s8= +go.yaml.in/yaml/v3 v3.0.5 h1:N6y/pJk8buWs9NY5ERU2HSMfm+IuD/OtfdAnq6kESPw= +go.yaml.in/yaml/v3 v3.0.5/go.mod h1:HVTZu1O7/Vkt2N+BFy8Zza+lnLsABggaTM2ZpNIGuKg= +golang.org/x/arch v0.30.0 h1:sB9h+1gRGa2+LauFSV0tm8bK1J2yo1bx6/Uyi/P6DTU= +golang.org/x/arch v0.30.0/go.mod h1:0X+GdSIP+kL5wPmpK7sdkEVTt2XoYP0cSjQSbZBwOi8= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191219195013-becbf705a915/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= @@ -567,8 +579,8 @@ golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDf golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM= -golang.org/x/crypto v0.52.0 h1:RMs7fP2rXdep0CftQlK8Uf+kibLm7qkCcradZWYz988= -golang.org/x/crypto v0.52.0/go.mod h1:1QgfPxDqh0T2M/elOJtp9RvuR95kVjir0e6/BvEmGbc= +golang.org/x/crypto v0.54.0 h1:YLIA59K4fiNzHzjnZt2tUJQjQtUWfWbeHBqKtk3eScw= +golang.org/x/crypto v0.54.0/go.mod h1:KWL8ny2AZdGR2cWmzeHrp2azQPGogOv+HeQaVEXC2dk= 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= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= @@ -581,8 +593,8 @@ golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= -golang.org/x/mod v0.36.0 h1:JJjpVx6myfUsUdAzZuOSTTmRE0PfZeNWzzvKrP7amb4= -golang.org/x/mod v0.36.0/go.mod h1:moc6ELqsWcOw5Ef3xVprK5ul/MvtVvkIXLziUOICjUQ= +golang.org/x/mod v0.37.0 h1:vF1DjpVEshcIqoEaauuHebaLk1O1forxjxBaVn884JQ= +golang.org/x/mod v0.37.0/go.mod h1:m8S8VeM9r4dzDwjrKO0a1sZP3YjeMamRRlD+fmR2Q/0= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -606,8 +618,8 @@ golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= -golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8= -golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww= +golang.org/x/net v0.57.0 h1:K5+3DljvIuDG9/Jv9rvyMywYNFCQ9RSUY6OOTTkT+tE= +golang.org/x/net v0.57.0/go.mod h1:KpXc8iv+r3XplLAG/f7Jsf9RPszJzdR0f58q9vGOuEU= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs= golang.org/x/oauth2 v0.36.0/go.mod h1:YDBUJMTkDnJS+A4BP4eZBjCqtokkg1hODuPjwiGPO7Q= @@ -623,8 +635,8 @@ golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4= -golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= +golang.org/x/sync v0.22.0 h1:SZjpbeLmrCk4xhRSZFNZW5gFUeCeFgjekvI/+gfScek= +golang.org/x/sync v0.22.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -648,8 +660,8 @@ golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY= -golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs= +golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -662,8 +674,8 @@ golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0= -golang.org/x/term v0.43.0 h1:S4RLU2sB31O/NCl+zFN9Aru9A/Cq2aqKpTZJ6B+DwT4= -golang.org/x/term v0.43.0/go.mod h1:lrhlHNdQJHO+1qVYiHfFKVuVioJIheAc3fBSMFYEIsk= +golang.org/x/term v0.45.0 h1:NwWyBmoJCbfTHpxrWoZ9C6/VxOf7ic219I8xZZFdrf0= +golang.org/x/term v0.45.0/go.mod h1:9aqxs0blBcrm/n0L9QW0aRVD+ktan8ssZromtqJC43w= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -674,8 +686,8 @@ golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= -golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc= -golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38= +golang.org/x/text v0.40.0 h1:Ub2Z6/xjgF1WrYQz2nuITOEegKFtiIy+rieRJ5lHZKs= +golang.org/x/text v0.40.0/go.mod h1:hpnzDAfGV753zIKo+wk3u1bVKCGPbrnF7+7LBF/UHVY= golang.org/x/time v0.7.0 h1:ntUhktv3OPE6TgYxXWv9vKvUSJyIFJlyohwbkEwPrKQ= golang.org/x/time v0.7.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -693,8 +705,8 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= -golang.org/x/tools v0.44.0 h1:UP4ajHPIcuMjT1GqzDWRlalUEoY+uzoZKnhOjbIPD2c= -golang.org/x/tools v0.44.0/go.mod h1:KA0AfVErSdxRZIsOVipbv3rQhVXTnlU6UhKxHd1seDI= +golang.org/x/tools v0.47.0 h1:7Kn5x/d1svx/PzryTsqeoZN4TZwqeH5pGWjefhLi/1Q= +golang.org/x/tools v0.47.0/go.mod h1:dFHnyTvFWY212G+h7ZY4Vsp/K3U4/7W9TyVaAul8uCA= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= 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= @@ -705,16 +717,16 @@ google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9Ywl google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa h1:Kjn0N0tCrDgiAFW+lGO4JZ3ck44CehvJQMAwj9QF0G8= -google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:q4lMZS6kskjT5HvCPrnnypcDPVJqT/f4nfxmkE7gryY= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa h1:mZHHdPZl0dbGHCflZgAq/Q468DWVFcU2whhB2KAo8fk= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= +google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea h1:Jifw/kjs/r3B0uszvls/m3c3tmZs2YHGM9C+rvxP9gY= +google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea/go.mod h1:K/+WGbmBY7aNW1HDw1fJnKYo10i0DkAX6pows00dLig= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea h1:kVhQEPTpKQahD5+JSBTfBB19wcgQTTjAIn45MBqnyHk= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.81.1 h1:VnnIIZ88UzOOKLukQi+ImGz8O1Wdp8nAGGnvOfEIWQQ= -google.golang.org/grpc v1.81.1/go.mod h1:xGH9GfzOyMTGIOXBJmXt+BX/V0kcdQbdcuwQ/zNw42I= +google.golang.org/grpc v1.83.0 h1:JeNZEKJFbQxArAMl+hiytHauacDNqJUllNfmIMmpqnQ= +google.golang.org/grpc v1.83.0/go.mod h1:kDyl6SKsiHKt0uylY5gtn5cEjkrIOhQOGDgIc4JGwzQ= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -746,10 +758,12 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gorm.io/driver/mysql v1.6.0 h1:eNbLmNTpPpTOVZi8MMxCi2aaIm0ZpInbORNXDwyLGvg= gorm.io/driver/mysql v1.6.0/go.mod h1:D/oCC2GWK3M/dqoLxnOlaNKmXz8WNTfcS9y5ovaSqKo= -gorm.io/driver/postgres v1.6.0 h1:2dxzU8xJ+ivvqTRph34QX+WrRaJlmfyPqXmoGVjMBa4= -gorm.io/driver/postgres v1.6.0/go.mod h1:vUw0mrGgrTK+uPHEhAdV4sfFELrByKVGnaVRkXDhtWo= -gorm.io/gorm v1.31.1 h1:7CA8FTFz/gRfgqgpeKIBcervUn3xSyPUmr6B2WXJ7kg= -gorm.io/gorm v1.31.1/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs= +gorm.io/driver/postgres v1.6.2 h1:BvXQ/cNUg63q5TFNg672DmDcowZSFrNLkkA3Xe6GXq4= +gorm.io/driver/postgres v1.6.2/go.mod h1:0c4fQA44XhOklXDkgtuKqysHCycTa5i9e3EIpDGCwXk= +gorm.io/driver/sqlite v1.6.0 h1:WHRRrIiulaPiPFmDcod6prc4l2VGVWHz80KspNsxSfQ= +gorm.io/driver/sqlite v1.6.0/go.mod h1:AO9V1qIQddBESngQUKWL9yoH93HIeA1X6V633rBwyT8= +gorm.io/gorm v1.31.2 h1:3o8FXNo9v9S858gil+3LlZA1LkCOzgb4g5BL64FgaCo= +gorm.io/gorm v1.31.2/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= k8s.io/api v0.31.1 h1:Xe1hX/fPW3PXYYv8BlozYqw63ytA92snr96zMW9gWTU= @@ -768,5 +782,5 @@ sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMm sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08= -sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= -sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= +sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs= +sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4= diff --git a/cmd/main/main.go b/cmd/main/main.go index b24410f..ee95b96 100644 --- a/cmd/main/main.go +++ b/cmd/main/main.go @@ -8,22 +8,22 @@ import ( "strings" "syscall" - ads "git.apinb.com/bsm-apps/ads/cmd/main" - cloud "git.apinb.com/bsm-apps/cloud/cmd/main" - cms "git.apinb.com/bsm-apps/cms/cmd/main" - feedback "git.apinb.com/bsm-apps/feedback/cmd/main" - fts "git.apinb.com/bsm-apps/fts/cmd/main" - initial "git.apinb.com/bsm-apps/initial/cmd/main" - logs "git.apinb.com/bsm-apps/logs/cmd/main" - mgt "git.apinb.com/bsm-apps/mgt/cmd/main" - passport "git.apinb.com/bsm-apps/passport/cmd/main" - sender "git.apinb.com/bsm-apps/sender/cmd/main" - address "git.apinb.com/bsm-ec/address/cmd/main" - mall "git.apinb.com/bsm-ec/mall/cmd/main" - market "git.apinb.com/bsm-ec/market/cmd/main" - order "git.apinb.com/bsm-ec/order/cmd/main" - wallet "git.apinb.com/bsm-finance/wallet/cmd/main" - delivery "git.apinb.com/bsm-service-ec/delivery/cmd" + ads "bsm/full/module/base/ads/cmd/main" + cloud "bsm/full/module/base/cloud/cmd/main" + cms "bsm/full/module/base/cms/cmd/main" + feedback "bsm/full/module/base/feedback/cmd/main" + fts "bsm/full/module/base/fts/cmd/main" + initial "bsm/full/module/base/initial/cmd/main" + logs "bsm/full/module/base/logs/cmd/main" + mgt "bsm/full/module/base/mgt/cmd/main" + passport "bsm/full/module/base/passport/cmd/main" + sender "bsm/full/module/base/sender/cmd/main" + address "bsm/full/module/ec/address/cmd/main" + delivery "bsm/full/module/ec/delivery/cmd" + mall "bsm/full/module/ec/mall/cmd/main" + market "bsm/full/module/ec/market/cmd/main" + order "bsm/full/module/ec/order/cmd/main" + wallet "bsm/full/module/finance/wallet/cmd/main" ) type component struct { diff --git a/go.work b/go.work index e8fa418..ba31f27 100644 --- a/go.work +++ b/go.work @@ -1,24 +1,24 @@ go 1.26.5 use ( - ./apps/base/ads - ./apps/base/cloud - ./apps/base/cms - ./apps/base/feedback - ./apps/base/fts - ./apps/base/initial - ./apps/base/logs - ./apps/base/mgt - ./apps/base/passport - ./apps/base/sender - ./apps/ec/address - ./apps/ec/delivery - ./apps/ec/mall - ./apps/ec/market - ./apps/ec/order - ./apps/finance/wallet - ./apps/social/feed - ./apps/social/group - ./apps/social/relation ./cmd + ./module/base/ads + ./module/base/cloud + ./module/base/cms + ./module/base/feedback + ./module/base/fts + ./module/base/initial + ./module/base/logs + ./module/base/mgt + ./module/base/passport + ./module/base/sender + ./module/ec/address + ./module/ec/delivery + ./module/ec/mall + ./module/ec/market + ./module/ec/order + ./module/finance/wallet + ./module/social/feed + ./module/social/group + ./module/social/relation ) diff --git a/go.work.sum b/go.work.sum index 9712a83..806ad9d 100644 --- a/go.work.sum +++ b/go.work.sum @@ -1,6 +1,8 @@ buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.31.0-20230802163732-1c33ebd9ecfa.1/go.mod h1:xafc+XIsTxTy76GJQ1TKgvJWsSugFBqMaN27WhUblew= cel.dev/expr v0.25.1/go.mod h1:hrXvqGP6G6gyx8UAHSHJ5RGk//1Oj5nXQ2NI02Nrsg4= +cel.dev/expr v0.25.2/go.mod h1:hrXvqGP6G6gyx8UAHSHJ5RGk//1Oj5nXQ2NI02Nrsg4= cloud.google.com/go/auth v0.9.3/go.mod h1:7z6VY+7h3KUdRov5F1i8NDP5ZzWKYmEPO842BgCsmTk= +cloud.google.com/go/auth v0.18.2/go.mod h1:xD+oY7gcahcu7G2SG2DsBerfFxgPAJz17zz2joOFF3M= cloud.google.com/go/auth/oauth2adapt v0.2.4/go.mod h1:jC/jOpwFP6JBxhB3P5Rr0a9HLMC/Pe3eaL4NmdvqPtc= cloud.google.com/go/compute v1.23.4/go.mod h1:/EJMj55asU6kAFnuZET8zqgwgJ9FvXWXOkkfQZa4ioI= cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k= @@ -10,26 +12,27 @@ cloud.google.com/go/secretmanager v1.14.1/go.mod h1:L+gO+u2JA9CCyXpSR8gDH0o8EV7i codeberg.org/go-fonts/liberation v0.5.0/go.mod h1:zS/2e1354/mJ4pGzIIaEtm/59VFCFnYC7YV6YdGl5GU= codeberg.org/go-latex/latex v0.1.0/go.mod h1:LA0q/AyWIYrqVd+A9Upkgsb+IqPcmSTKc9Dny04MHMw= codeberg.org/go-pdf/fpdf v0.10.0/go.mod h1:Y0DGRAdZ0OmnZPvjbMp/1bYxmIPxm0ws4tfoPOc4LjU= -dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= git.sr.ht/~sbinet/gg v0.6.0/go.mod h1:uucygbfC9wVPQIfrmwM2et0imr8L7KQWywX0xpFMm94= -github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU= github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.31.0/go.mod h1:P4WPRUkOhJC13W//jWpyfJNDAIpvRbAUIYLX/4jtlE0= +github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.33.0/go.mod h1:pJTkW8hEUIIi3Pf65lPZOnn4Y81yCllX6IWk2jNXdkM= github.com/IBM/sarama v1.43.1/go.mod h1:GG5q1RURtDNPz8xxJs3mgX6Ytak8Z9eLhAkJPObe2xE= -github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= -github.com/Microsoft/hcsshim v0.11.5/go.mod h1:MV8xMfmECjl5HdO7U/3/hFVnkmSBjAjmA09d4bExKcU= github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c= github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= +github.com/RaveNoX/go-jsoncommentstrip v1.0.0/go.mod h1:78ihd09MekBnJnxpICcwzCMzGrKSKYe4AqU6PDYYpjk= github.com/ajstarks/svgo v0.0.0-20211024235047-1546f124cd8b/go.mod h1:1KcenG0jGWcpt8ov532z81sp/kMMUG485J2InIOyADM= github.com/alecthomas/kingpin/v2 v2.4.0/go.mod h1:0gyi0zQnjuFk8xrkNKamJoyUo382HRL7ATRpFZCw6tE= github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE= +github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b/go.mod h1:fvzegU4vN3H1qMT+8wDmzjAcDONcgo2/SZ/TyfdUOFs= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230512164433-5d1fd1a340c9/go.mod h1:pSwJ0fSY5KhvocuWSx4fz3BA8OrA1bQn+K1Eli3BRwM= github.com/antonlindstrom/pgstore v0.0.0-20220421113606-e3a6e3fed12a/go.mod h1:Sdr/tmSOLEnncCuXS5TwZRxuk7deH1WXVY8cve3eVBM= +github.com/apapsch/go-jsonmerge/v2 v2.0.0/go.mod h1:lvDnEdqiQrp0O42VQGgmlKpxL1AP2+08jFMw88y4klk= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/aws/aws-sdk-go v1.55.5/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= +github.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvFv1sNto9p6w= github.com/bmizerany/perks v0.0.0-20141205001514-d9a9656a3a4b/go.mod h1:ac9efd0D1fsDb3EJvhqgXRbFx7bs2wqZ10HQPeU8U/Q= github.com/boj/redistore v1.4.1/go.mod h1:c0Tvw6aMjslog4jHIAcNv6EtJM849YoOAhMY7JBbWpI= github.com/bradfitz/gomemcache v0.0.0-20250403215159-8d39553ac7cf/go.mod h1:r5xuitiExdLAJ09PR7vBVENGvp4ZuTBeWTGtxuX3K+c= @@ -40,18 +43,12 @@ github.com/bytedance/sonic v1.15.0/go.mod h1:tFkWrPz0/CUCLEF4ri4UkHekCIcdnkqXw9V github.com/bytedance/sonic/loader v0.5.0/go.mod h1:AR4NYCk5DdzZizZ5djGqQ92eEhCCcdf5x77udYiSJRo= github.com/campoy/embedmd v1.0.0/go.mod h1:oxyr9RCiSXg0M3VJ3ks0UGfp98BpSSGr0kpiX3MzVl8= github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= +github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/census-instrumentation/opencensus-proto v0.4.1/go.mod h1:4T9NM4+4Vw91VeyqjLS6ao50K5bOcLKN6Q42XnYaRYw= github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk= github.com/cncf/xds/go v0.0.0-20260202195803-dba9d589def2/go.mod h1:qwXFYgsP6T7XnJtbKlf1HP8AjxZZyzxMmc+Lq5GjlU4= -github.com/containerd/containerd v1.7.18/go.mod h1:IYEk9/IO6wAPUz2bCMVUbsfXjzw5UNP5fLz4PsUygQ4= -github.com/containerd/errdefs v0.1.0/go.mod h1:YgWiiHtLmSeBrvpw+UfPijzbLaB77mEG1WwJTDETIV0= -github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo= -github.com/cpuguy83/dockercfg v0.3.1/go.mod h1:sugsbF4//dDlL/i+S+rtpIWp+5h0BHJHfjj5/jFyUJc= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= -github.com/docker/docker v27.1.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc= -github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= +github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= github.com/eapache/go-resiliency v1.6.0/go.mod h1:5yPzW0MIvSe0JDsv0v+DvcjEv2FyD6iZYSs1ZI+iQho= github.com/eapache/go-xerial-snappy v0.0.0-20230731223053-c322873962e3/go.mod h1:YvSRo5mw33fLEx1+DlK6L2VV43tJt5Eyel9n9XBcR+0= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= @@ -63,22 +60,36 @@ github.com/envoyproxy/go-control-plane/envoy v1.37.0/go.mod h1:DReE9MMrmecPy+YvQ github.com/envoyproxy/go-control-plane/ratelimit v0.1.0/go.mod h1:Wk+tMFAFbCXaJPzVVHnPgRKdUdwW/KdbRt94AzgRee4= github.com/envoyproxy/protoc-gen-validate v1.3.3/go.mod h1:TsndJ/ngyIdQRhMcVVGDDHINPLWB7C82oDArY51KfB0= github.com/ettle/strcase v0.2.0/go.mod h1:DajmHElDSaX76ITe3/VHVyMin4LWSJN5Z909Wp+ED1A= -github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/francoispqt/gojay v1.2.13/go.mod h1:ehT5mTG4ua4581f1++1WLG0vPdaA9HaiDsoyrBGkyDY= -github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= github.com/fullstorydev/grpcurl v1.9.1/go.mod h1:i8gKLIC6s93WdU3LSmkE5vtsCxyRmihUj5FK1cNW5EM= github.com/gabriel-vasile/mimetype v1.4.12/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s= github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q= -github.com/go-jose/go-jose/v4 v4.1.4/go.mod h1:x4oUasVrzR7071A4TnHLGSPpNOm2a21K9Kf04k1rs08= github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= +github.com/go-openapi/analysis v0.25.5/go.mod h1:d3UGtQC5uq5Kqqqis2VH09Km/v3vwsWrYkbp4gdm+Rc= +github.com/go-openapi/errors v0.22.8/go.mod h1:BuUoHcYrU6E7V9gfj1I5wLQqgtIHnup/alXZ8KdgQ0w= +github.com/go-openapi/loads v0.25.0/go.mod h1:JFBw4SIB9+PTIFHDfcXuSSy5h6aWzjtUCrPYyx3qWU8= +github.com/go-openapi/runtime v0.33.0/go.mod h1:+rsupH3+TFKqmFysqkmgBOTxpVJV8eV+j9myvvea2Xw= +github.com/go-openapi/runtime/server-middleware v0.30.0/go.mod h1:OYNT/TxNvB/VK5oe4htM2jDTwlEXuejVJmu0DVZfAMs= +github.com/go-openapi/strfmt v0.27.0/go.mod h1:s/qhDqfY72irigXUGJmtgid2Rm+3tnz3k8hZaRmvWYc= +github.com/go-openapi/swag/conv v0.27.3/go.mod h1:nPRmN6jgNme99hpf+nM0auDZGALWIqlwhisKPK/bQhQ= +github.com/go-openapi/swag/jsonutils v0.27.3/go.mod h1:qiDCoQvzkMxrV3G8FLEdIU5L+EFYc0zcDOHWT3Yofvo= +github.com/go-openapi/swag/loading v0.27.3/go.mod h1:rJ0NeaKsF4CVPnMGjPQl7JlSHzvD0bc2DKXLss1hiuE= +github.com/go-openapi/swag/pools v0.27.3/go.mod h1:kVQefhSK5RWuRe7BXsL8htgBPAMpN7HDGpGEknqugeE= +github.com/go-openapi/swag/stringutils v0.27.3/go.mod h1:lzRN95CxXmA03XcDWHLOb6nOMcxCqR5rGY0lOgsfRoM= +github.com/go-openapi/swag/typeutils v0.27.3/go.mod h1:Srm0xFNRZ1Y+vCxJclo5qzx8aj+1pAKda/YfFPrG0dQ= +github.com/go-openapi/swag/yamlutils v0.27.3/go.mod h1:6JYBGj8sw/NawMllyZY+cTA8Mzk2etS3ZBASdcyPsiU= +github.com/go-openapi/validate v0.26.1/go.mod h1:B8UMgXiQiwwQWIbmuROlwJZDPGlikPuh7iHV1vPX9Oo= github.com/go-playground/validator/v10 v10.30.1/go.mod h1:oSuBIQzuJxL//3MelwSLD5hc2Tu889bF0Idm9Dg26cM= 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/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= +github.com/go-viper/mapstructure/v2 v2.5.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= github.com/goccmack/gocc v1.0.2/go.mod h1:LXX2tFVUggS/Zgx/ICPOr3MLyusuM7EcbfkPvNsjdO8= github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= +github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= +github.com/golang-jwt/jwt/v5 v5.3.0/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/glog v1.2.5/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -88,15 +99,19 @@ github.com/gomodule/redigo v1.9.2/go.mod h1:KsU3hiK/Ay8U42qpaJk+kuNa3C+spxapWpM+ github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= github.com/google/cel-go v0.17.1/go.mod h1:HXZKzB0LXqer5lHHgfWAnlYwJaQBDKMjxjulNQzhwhY= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo= github.com/google/s2a-go v0.1.8/go.mod h1:6iNWHTpQ+nfNRN5E00MSdfDwVesa8hhS32PhPO8deJA= +github.com/google/s2a-go v0.1.9/go.mod h1:YA0Ei2ZQL3acow2O62kdp9UlnvMmU7kA6Eutn0dXayM= github.com/googleapis/enterprise-certificate-proxy v0.3.3/go.mod h1:YKe7cfqYXjKGpGvmSg28/fFvhNzinZQm8DGnaburhGA= +github.com/googleapis/enterprise-certificate-proxy v0.3.11/go.mod h1:RFV7MUdlb7AgEq2v7FmMCfeSMCllAzWxFgRdusoGks8= github.com/googleapis/gax-go/v2 v2.13.0/go.mod h1:Z/fvTZXF8/uw7Xu5GuslPw+bplx6SS338j1Is2S+B7A= +github.com/googleapis/gax-go/v2 v2.17.0/go.mod h1:mzaqghpQp4JDh3HvADwrat+6M3MOIDp5YKHhb9PAgDY= github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1/go.mod h1:lXGCsh6c22WGtjr+qGHj1otzZpV/1kwTMAqkwZsnWRU= +github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0/go.mod h1:hM2alZsMUni80N33RBe6J0e423LB+odMj7d3EMP9l20= github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0/go.mod h1:XKMd7iuf/RGPSMJ/U4HP0zS2Z9Fh8Ps9a+6X26m/tmI= +github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.3/go.mod h1:NbCUVmiS4foBGBHOYlCT25+YmGpJ32dZPi75pGEUpj4= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2/go.mod h1:pkJQ2tZHJ0aFOVEEot6oZmaVEZcRme73eIFmhiVuRWs= @@ -105,6 +120,7 @@ github.com/iancoleman/strcase v0.3.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47 github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/jackc/pgx/v5 v5.6.0/go.mod h1:DNZ/vlrUnhWCoFGxHAG8U2ljioxukquj7utPDgtQdTw= +github.com/jawher/mow.cli v1.2.0/go.mod h1:y+pcA3jBAdo/GIZx/0rFjw/K2bVEODP9rfZOfaiq8Ko= github.com/jcmturner/aescts/v2 v2.0.0/go.mod h1:AiaICIRyfYg35RUkr8yESTqvSy7csK90qZ5xfvvsoNs= github.com/jcmturner/dnsutils/v2 v2.0.0/go.mod h1:b0TnjGOvI/n42bZa+hmXL+kFJZsFT7G4t3HTlQ184QM= github.com/jcmturner/gofork v1.7.6/go.mod h1:1622LH6i/EZqLloHfE7IeZ0uEJwMSUyQ/nDd82IeqRo= @@ -114,51 +130,42 @@ github.com/jhump/protoreflect v1.16.0/go.mod h1:oYPd7nPvcBw/5wlDfm/AVmU9zH9BgqGC github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jordanlewis/gcassert v0.0.0-20250430164644-389ef753e22e/go.mod h1:ZybsQk6DWyN5t7An1MuPm1gtSZ1xDaTXS9ZjIOxvQrk= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= +github.com/juju/gnuflag v0.0.0-20171113085948-2ce1bb71843d/go.mod h1:2PavIy+JPciBPrBUjwbNvtwB6RQlve+hkpll6QSNmOE= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/kidstuff/mongostore v0.0.0-20181113001930-e650cd85ee4b/go.mod h1:g2nVr8KZVXJSS97Jo8pJ0jgq29P6H7dG0oplUA86MQw= github.com/klauspost/compress v1.17.6/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= -github.com/klauspost/compress v1.18.5/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ= +github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ= github.com/klauspost/cpuid/v2 v2.2.9/go.mod h1:rqkxqrZ1EhYM9G+hXH7YdowN5R5RGN6NK4QwQ3WMXF8= github.com/klauspost/cpuid/v2 v2.2.10/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= github.com/laziness-coders/mongostore v0.0.14/go.mod h1:Rh+yJax2Vxc2QY62clIM/kRnLk+TxivgSLHOXENXPtk= github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= -github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= github.com/lyft/protoc-gen-star/v2 v2.0.4/go.mod h1:amey7yeodaJhXSbf/TlLvWiqQfLOSpEk//mLlc+axEk= -github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= +github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE= +github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= -github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/memcachier/mc v2.0.1+incompatible/go.mod h1:7bkvFE61leUBvXz+yxsOnGBQSZpBSPIMUQSmmSHvuXc= github.com/memcachier/mc/v3 v3.0.3/go.mod h1:GzjocBahcXPxt2cmqzknrgqCOmMxiSzhVKPOe90Tpug= -github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo= -github.com/moby/patternmatcher v0.6.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc= github.com/moby/spdystream v0.4.0/go.mod h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVOwrfMgdI= -github.com/moby/sys/sequential v0.5.0/go.mod h1:tH2cOOs5V9MlPiXcQzRC+eEyab644PWKGRYaaV5ZZlo= -github.com/moby/sys/user v0.1.0/go.mod h1:fKJhFOnsCN6xZ5gSfbM6zaHGgDJMrqt9/reuj4T7MmU= -github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y= github.com/montanaflynn/stats v0.7.1/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow= -github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= github.com/nats-io/nats.go v1.52.0/go.mod h1:26HypzazeOkyO3/mqd1zZd53STJN0EjCYF9Uy2ZOBno= github.com/nats-io/nkeys v0.4.15/go.mod h1:CpMchTXC9fxA5zrMo4KpySxNjiDVvr8ANOSZdiNfUrs= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= +github.com/oapi-codegen/runtime v1.6.0/go.mod h1:GwV7hC2hviaMzj+ITfHVRESK5J2W/GefVwIND/bMGvU= github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= -github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= -github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= -github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM= github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= -github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8= -github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= -github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= -github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE= +github.com/prometheus/client_golang v1.20.4/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= -github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I= +github.com/prometheus/common v0.66.1/go.mod h1:gcaUsgf3KfRSwHY4dIMXLPV0K/Wg1oZ8+SbZk/HH/dA= github.com/quasoft/memstore v0.0.0-20191010062613-2bce066d2b0b/go.mod h1:wTPjTepVu7uJBYgZ0SdWHQlIas582j6cn2jgk4DDdlg= github.com/quic-go/quic-go v0.59.0/go.mod h1:upnsH4Ju1YkqpLXC305eW3yDZ4NfnNbmQRCMWS58IKU= github.com/rabbitmq/amqp091-go v1.9.0/go.mod h1:+jPrT9iY2eLjRaMSRHUhc3z14E/l85kv/f+6luSD3pc= @@ -167,21 +174,19 @@ github.com/redis/go-redis/v9 v9.19.0/go.mod h1:v/M13XI1PVCDcm01VtPFOADfZtHf8YW3b github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= -github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/shirou/gopsutil/v3 v3.23.12/go.mod h1:1FrWgea594Jp7qmjHUUPlJDTPgcsb9mGnXDxavtikzM= -github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/spf13/afero v1.15.0/go.mod h1:NC2ByUVxtQs4b3sIUphxK0NioZnmxgyCrfzeuq8lxMg= github.com/spf13/cobra v1.6.1/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY= github.com/spiffe/go-spiffe/v2 v2.6.0/go.mod h1:gm2SeUoMZEtpnzPNs2Csc0D/gX33k1xIx7lEzqblHEs= +github.com/spiffe/go-spiffe/v2 v2.7.0/go.mod h1:47Q0Q9/AqGha8QLHp+kxpH4Wca7X7EnOtlIJy3mxZ3U= +github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad/go.mod h1:qLr4V1qq6nMqFKkMo8ZTx3f+BZEkzsRUY10Xsm2mwU0= github.com/stoewer/go-strcase v1.3.0/go.mod h1:fAH5hQ5pehh+j3nZfvwdk2RgEgQjAoM8wodgtPmh1xo= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/testcontainers/testcontainers-go v0.32.0/go.mod h1:CRHrzHLQhlXUsa5gXjTOfqIEJcrK5+xMDmBr/WMI88E= -github.com/tklauser/go-sysconf v0.4.0/go.mod h1:8mTNWyog7H+MpKijp4VmKJAd2bbYQ2zuUwkYRbUArPI= -github.com/tklauser/numcpus v0.12.0/go.mod h1:ABHeXzJnr/qqwguhClkZKT1/8VABcYrsyUiUGobwWJg= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= github.com/wader/gormstore/v2 v2.0.3/go.mod h1:sr3N3a8F1+PBc3fHoKaphFqDXLRJ9Oe6Yow0HxKFbbg= github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= @@ -199,14 +204,24 @@ go.mongodb.org/mongo-driver v1.17.3/go.mod h1:Hy04i7O2kC4RS06ZrhPRqj/u4DTYkFDAAc go.mongodb.org/mongo-driver/v2 v2.5.0/go.mod h1:yOI9kBsufol30iFsl1slpdq1I0eHPzybRWdyYUs8K/0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= go.opentelemetry.io/contrib/detectors/gcp v1.42.0/go.mod h1:W9zQ439utxymRrXsUOzZbFX4JhLxXU4+ZnCt8GG7yA8= +go.opentelemetry.io/contrib/detectors/gcp v1.44.0/go.mod h1:tNAsgd8avTGke1+MndXlU5Cru4PQ9Ai/cCNWQv/ZJ/s= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0/go.mod h1:B9yO6b04uB80CzjedvewuqDhxJxi11s7/GtiGa8bAjI= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0/go.mod h1:L7UH0GbB0p47T4Rri3uHjbpCFYrVrwc1I25QhNPiGK8= -go.opentelemetry.io/proto/otlp v1.9.0/go.mod h1:xE+Cx5E/eEHw+ISFkwPLwCZefwVjY+pqKg1qcK03+/4= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.70.0/go.mod h1:DqEFwLumhzMBDQv9PcWbyoDxHI/4lAk6CM4nJBH39sc= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0/go.mod h1:UHB22Z8QsdRDrnAtX4PntOl36ajSxcdUMt1sF7Y6E7Q= +go.opentelemetry.io/otel v1.44.0/go.mod h1:BMgjTHL9WPRlRjL2oZCBTL4whCGtXch2H4BhOPIAyYc= +go.opentelemetry.io/otel/metric v1.44.0/go.mod h1:8O7hanEPBNgEMmybD3s2VBKcgWOCsA6tzHBPODAiquo= +go.opentelemetry.io/otel/metric/x v0.67.0/go.mod h1:FBjCWZe6wgcqxcMtjdGiClDKXb2YxxXii0CXftE4QtI= +go.opentelemetry.io/otel/sdk v1.44.0/go.mod h1:Osuydd3Se74nqjAKxid74N5eC+jfEqfTegHRnq58oK0= +go.opentelemetry.io/otel/trace v1.44.0/go.mod h1:oLl1jrMQAVo6v3GAggN+1VH9VIz9iUSvW53sW1Q8PIE= go.uber.org/mock v0.5.2/go.mod h1:wLlUxC2vVTPTaE3UD51E0BGOAElKrILxhVSDYQLld5o= go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= +go.uber.org/zap v1.27.1/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= +go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU= +go.yaml.in/yaml/v3 v3.0.3/go.mod h1:tBHosrYAkRZjRAOREWbDnBXUf08JOwYq++0QNwQiWzI= golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= golang.org/x/arch v0.23.0/go.mod h1:dNHoOeKiyja7GTvF9NJS1l3Z2yntpQNzgrjh1cU103A= golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= +golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M= golang.org/x/crypto v0.41.0/go.mod h1:pO5AFd7FA68rFak7rOAGVuygIISepHftHnr8dr6+sUc= golang.org/x/crypto v0.48.0/go.mod h1:r0kV5h3qnFPlQnBSrULhlsRfryS2pmewsg+XfMgkVos= golang.org/x/crypto v0.49.0/go.mod h1:ErX4dUh2UM+CFYiXZRTcMpEcN8b/1gxEuv3nODoYtCA= @@ -214,6 +229,7 @@ golang.org/x/crypto v0.51.0/go.mod h1:8AdwkbraGNABw2kOX6YFPs3WM22XqI4EXEd8g+x7Oc golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w= golang.org/x/image v0.25.0/go.mod h1:tCAmOEGthTtkalusGp1g3xa2gke8J6c2N565dTyl9Rs= golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/mod v0.27.0/go.mod h1:rWI627Fq0DEoudcK+MBkNkCe0EetEaDSwJJkCcjpazc= golang.org/x/mod v0.35.0/go.mod h1:+GwiRhIInF8wPm+4AoT6L0FA1QWAad3OMdTRx4tFYlU= golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= @@ -224,65 +240,88 @@ golang.org/x/net v0.49.0/go.mod h1:/ysNB2EvaqvesRkuLAyjI1ycPZlQHM3q01F02UY/MV8= golang.org/x/net v0.52.0/go.mod h1:R1MAz7uMZxVMualyPXb+VaqGSa3LIaUqk0eEt3w36Sw= golang.org/x/net v0.53.0/go.mod h1:JvMuJH7rrdiCfbeHoo3fCQU24Lf5JJwT9W3sJFulfgs= golang.org/x/net v0.54.0/go.mod h1:Sj4oj8jK6XmHpBZU/zWHw3BV3abl4Kvi+Ut7cQcY+cQ= +golang.org/x/net v0.56.0/go.mod h1:D3Ku6r+V6JROoZK144D2XfMHFcMq/0zSfLelVTCFKec= golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= -golang.org/x/oauth2 v0.36.0/go.mod h1:YDBUJMTkDnJS+A4BP4eZBjCqtokkg1hODuPjwiGPO7Q= +golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU= +golang.org/x/oauth2 v0.34.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA= golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= +golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= +golang.org/x/sync v0.21.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= golang.org/x/sys v0.44.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +golang.org/x/sys v0.46.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= golang.org/x/telemetry v0.0.0-20260409153401-be6f6cb8b1fa/go.mod h1:kHjTxDEnAu6/Nl9lDkzjWpR+bmKfxeiRuSDlsMb70gE= golang.org/x/telemetry v0.0.0-20260508192327-42602be52be6/go.mod h1:Eqhaxk/wZsWEH8CRxLwj6xzEJbz7k1EFGqx7nyCoabE= -golang.org/x/term v0.43.0/go.mod h1:lrhlHNdQJHO+1qVYiHfFKVuVioJIheAc3fBSMFYEIsk= +golang.org/x/telemetry v0.0.0-20260625142307-59b4966ccb57/go.mod h1:3AWMyWHS+caVoiEXpiq6+tzKA40J4vQT3MYr80ZtQpc= golang.org/x/term v0.44.0 h1:0rLvDRCtNj0gZkyIXhCyOb2OAzEhLVqc4B+hrsBhrmc= golang.org/x/term v0.44.0/go.mod h1:7ze4MdzUzLXpSAoFP1H0bOI9aXDqveSvatT5vKcFh2Y= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4= golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= +golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY= golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU= +golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4= golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY= golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA= golang.org/x/text v0.36.0/go.mod h1:NIdBknypM8iqVmPiuco0Dh6P5Jcdk8lJL0CUebqK164= +golang.org/x/time v0.14.0 h1:MRx4UaLrDotUKUdCIqzPC48t1Y9hANFKIRpNx+Te8PI= +golang.org/x/time v0.14.0/go.mod h1:eL/Oa2bBBK0TkX57Fyni+NgnyQQN4LitPmob2Hjnqw4= golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps= golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0= golang.org/x/tools v0.36.0/go.mod h1:WBDiHKJK8YgLHlcQPYQzNCkUxUypCaa5ZegCVutKm+s= -golang.org/x/tools v0.44.0/go.mod h1:KA0AfVErSdxRZIsOVipbv3rQhVXTnlU6UhKxHd1seDI= golang.org/x/tools v0.45.0 h1:18qN3FAooORvApf5XjCXgsuayZOEtXf6JK18I3+ONa8= golang.org/x/tools v0.45.0/go.mod h1:LuUGqqaXcXMEFEruIVJVm5mgDD8vww/z/SR1gQ4uE/0= gonum.org/v1/plot v0.15.2/go.mod h1:DX+x+DWso3LTha+AdkJEv5Txvi+Tql3KAGkehP0/Ubg= gonum.org/v1/tools v0.0.0-20200318103217-c168b003ce8c/go.mod h1:fy6Otjqbk477ELp8IXTpw1cObQtLbRCBVonY+bTTfcM= google.golang.org/api v0.196.0/go.mod h1:g9IL21uGkYgvQ5BZg6BAtoGJQIm8r6EgaAbpNey5wBE= +google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds= google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1 h1:BulPr26Jqjnd4eYDVe+YvyR7Yc2vJGkO5/0UxD0/jZU= google.golang.org/genproto v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:hL97c3SYopEHblzpxRL4lSs523++l8DYxGM1FQiYmb4= +google.golang.org/genproto v0.0.0-20260128011058-8636f8732409 h1:VQZ/yAbAtjkHgH80teYd2em3xtIkkHd7ZhqfH2N9CsM= google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5/go.mod h1:j3QtIyytwqGr1JUDtYXwtMXWPKsEa5LtzIFN1Wn5WvE= google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217/go.mod h1:+rXWjjaukWZun3mLfjmVnQi18E1AsFbDN9QdJ5YXLto= google.golang.org/genproto/googleapis/api v0.0.0-20260414002931-afd174a4e478/go.mod h1:C6ADNqOxbgdUUeRTU+LCHDPB9ttAMCTff6auwCVa4uc= +google.golang.org/genproto/googleapis/api v0.0.0-20260803160001-6ac0973c030d/go.mod h1:K/+WGbmBY7aNW1HDw1fJnKYo10i0DkAX6pows00dLig= google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5/go.mod h1:M4/wBTSeyLxupu3W3tJtOgB14jILAS/XWPSSa3TAlJc= google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk= google.golang.org/genproto/googleapis/rpc v0.0.0-20260414002931-afd174a4e478/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= google.golang.org/genproto/googleapis/rpc v0.0.0-20260523011958-0a33c5d7ca68/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= google.golang.org/genproto/googleapis/rpc v0.0.0-20260610212136-7ab31c22f7ad/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260729162451-8efbd57d26e0/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260803160001-6ac0973c030d/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= google.golang.org/grpc v1.79.3/go.mod h1:KmT0Kjez+0dde/v2j9vzwoAScgEPx/Bw1CYChhHLrHQ= google.golang.org/grpc v1.80.0/go.mod h1:ho/dLnxwi3EDJA4Zghp7k2Ec1+c2jqup0bFkw07bwF4= google.golang.org/grpc v1.81.0/go.mod h1:xGH9GfzOyMTGIOXBJmXt+BX/V0kcdQbdcuwQ/zNw42I= +google.golang.org/grpc v1.82.1/go.mod h1:yzTZ1TB1Z3SG+LIYaI+WiE8D5+PZ3ArnrSp8zF3+/ZA= google.golang.org/grpc/examples v0.0.0-20250407062114-b368379ef8f6/go.mod h1:6ytKWczdvnpnO+m+JiG9NjEDzR1FJfsnmJdG7B8QVZ8= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.36.8/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/cheggaaa/pb.v1 v1.0.28/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/evanphx/json-patch.v4 v4.12.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M= gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc= -gorm.io/driver/sqlite v1.6.0/go.mod h1:AO9V1qIQddBESngQUKWL9yoH93HIeA1X6V633rBwyT8= gorm.io/gorm v1.30.0/go.mod h1:8Z33v652h4//uMA76KjeDH8mJXPm1QNCYrMeatR0DOE= inet.af/peercred v0.0.0-20210906144145-0893ea02156a/go.mod h1:FjawnflS/udxX+SvpsMgZfdqx2aykOlkISeAsADi5IU= k8s.io/gengo/v2 v2.0.0-20240826214909-a7b603a56eb7/go.mod h1:EJykeLsmFC60UQbYJezXkEsG2FLrt0GPNkU5iK5GWxU= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= +sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY= diff --git a/apps/base/ads/README.md b/module/base/ads/README.md similarity index 98% rename from apps/base/ads/README.md rename to module/base/ads/README.md index 18d283c..0781312 100644 --- a/apps/base/ads/README.md +++ b/module/base/ads/README.md @@ -2,7 +2,7 @@ [![Go Version](https://img.shields.io/badge/Go-1.25.1-blue.svg)](https://golang.org/) [![License](https://img.shields.io/badge/License-Internal-red.svg)](LICENSE) -[![Build Status](https://img.shields.io/badge/Build-Passing-green.svg)](https://git.apinb.com/bsm-apps/ads) +[![Build Status](https://img.shields.io/badge/Build-Passing-green.svg)](https://bsm/full/module/base/ads) 一个高性能、可扩展的广告管理微服务，基于 gRPC 和 HTTP Gateway 架构，提供广告位管理、广告内容分发等核心功能。 @@ -42,7 +42,7 @@ ```bash # 克隆项目 -git clone git.apinb.com/bsm-apps/ads.git +git clone bsm/full/module/base/ads.git cd ads # 安装依赖 @@ -506,13 +506,13 @@ type(scope): description - **作者**: David Yan (david.yan@qq.com) - **维护者**: BSM 开发团队 -- **项目地址**: [git.apinb.com/bsm-apps/ads](https://git.apinb.com/bsm-apps/ads) +- **项目地址**: [bsm/full/module/base/ads](https://bsm/full/module/base/ads) ## 🔗 相关链接 - [BSM SDK](https://git.apinb.com/bsm-sdk) - [API 文档](https://docs.apinb.com/ads) -- [问题反馈](https://git.apinb.com/bsm-apps/ads/issues) +- [问题反馈](https://bsm/full/module/base/ads/issues) --- diff --git a/apps/base/ads/cmd/cli/main.go b/module/base/ads/cmd/cli/main.go similarity index 100% rename from apps/base/ads/cmd/cli/main.go rename to module/base/ads/cmd/cli/main.go diff --git a/apps/base/ads/cmd/main/main.go b/module/base/ads/cmd/main/main.go similarity index 86% rename from apps/base/ads/cmd/main/main.go rename to module/base/ads/cmd/main/main.go index ef8bba9..002c016 100644 --- a/apps/base/ads/cmd/main/main.go +++ b/module/base/ads/cmd/main/main.go @@ -6,9 +6,9 @@ package service import ( - "git.apinb.com/bsm-apps/ads/internal/config" - "git.apinb.com/bsm-apps/ads/internal/impl" - "git.apinb.com/bsm-apps/ads/internal/server" + "bsm/full/module/base/ads/internal/config" + "bsm/full/module/base/ads/internal/impl" + "bsm/full/module/base/ads/internal/server" "git.apinb.com/bsm-sdk/core/service" ) @@ -44,3 +44,7 @@ func Run() { // 启动服务 srv.Start() } + +func main() { + Run() +} diff --git a/apps/base/ads/etc/ads_dev.yaml b/module/base/ads/etc/ads_dev.yaml similarity index 100% rename from apps/base/ads/etc/ads_dev.yaml rename to module/base/ads/etc/ads_dev.yaml diff --git a/apps/base/ads/etc/ads_prod.yaml b/module/base/ads/etc/ads_prod.yaml similarity index 100% rename from apps/base/ads/etc/ads_prod.yaml rename to module/base/ads/etc/ads_prod.yaml diff --git a/apps/base/ads/etc/ads_test.yaml b/module/base/ads/etc/ads_test.yaml similarity index 100% rename from apps/base/ads/etc/ads_test.yaml rename to module/base/ads/etc/ads_test.yaml diff --git a/apps/base/ads/etc/supervisor.bsm-apps-ads.conf b/module/base/ads/etc/supervisor.bsm-apps-ads.conf similarity index 100% rename from apps/base/ads/etc/supervisor.bsm-apps-ads.conf rename to module/base/ads/etc/supervisor.bsm-apps-ads.conf diff --git a/apps/base/ads/go.mod b/module/base/ads/go.mod similarity index 65% rename from apps/base/ads/go.mod rename to module/base/ads/go.mod index 24126e0..551b4d3 100644 --- a/apps/base/ads/go.mod +++ b/module/base/ads/go.mod @@ -1,4 +1,4 @@ -module git.apinb.com/bsm-apps/ads +module bsm/full/module/base/ads go 1.26.5 @@ -16,12 +16,12 @@ tool ( require ( git.apinb.com/bsm-sdk/core v0.2.0 git.apinb.com/bsm-sdk/engine v1.3.2 - github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 + github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0 github.com/patrickmn/go-cache v2.1.0+incompatible - go.etcd.io/etcd/client/v3 v3.6.12 - google.golang.org/grpc v1.81.1 + go.etcd.io/etcd/client/v3 v3.7.1 + google.golang.org/grpc v1.83.0 google.golang.org/protobuf v1.36.11 - gorm.io/gorm v1.31.1 + gorm.io/gorm v1.31.2 ) require ( @@ -32,10 +32,8 @@ require ( github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/coreos/go-semver v0.3.1 // indirect github.com/coreos/go-systemd/v22 v22.7.0 // indirect - github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/ditashi/jsbeautifier-go v0.0.0-20141206144643-2520a8026a9c // indirect github.com/go-sql-driver/mysql v1.10.0 // indirect - github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt/v5 v5.3.1 // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/google/uuid v1.6.0 // indirect @@ -45,26 +43,27 @@ require ( github.com/jackc/puddle/v2 v2.2.2 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect - github.com/oklog/ulid/v2 v2.1.1 // indirect + github.com/oklog/ulid/v2 v2.1.2 // indirect github.com/pepabo/protoc-gen-go-client v0.3.0 // indirect - github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - github.com/redis/go-redis/v9 v9.20.0 // indirect + github.com/redis/go-redis/v9 v9.22.0 // indirect github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect - go.etcd.io/etcd/api/v3 v3.6.12 // indirect - go.etcd.io/etcd/client/pkg/v3 v3.6.12 // indirect + go.etcd.io/etcd/api/v3 v3.7.1 // indirect + go.etcd.io/etcd/client/pkg/v3 v3.7.1 // indirect go.uber.org/atomic v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.28.0 // indirect - go.yaml.in/yaml/v3 v3.0.4 // indirect - golang.org/x/mod v0.36.0 // indirect - golang.org/x/net v0.55.0 // indirect - golang.org/x/sync v0.20.0 // indirect - golang.org/x/sys v0.45.0 // indirect - golang.org/x/text v0.37.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa // indirect + go.yaml.in/yaml/v3 v3.0.5 // indirect + golang.org/x/mod v0.37.0 // indirect + golang.org/x/net v0.57.0 // indirect + golang.org/x/sync v0.22.0 // indirect + golang.org/x/sys v0.47.0 // indirect + golang.org/x/text v0.40.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea // indirect google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect gorm.io/driver/mysql v1.6.0 // indirect - gorm.io/driver/postgres v1.6.0 // indirect + gorm.io/driver/postgres v1.6.2 // indirect ) + +replace git.apinb.com/bsm-sdk/core => D:/work/bsm-sdk/core diff --git a/apps/base/ads/go.sum b/module/base/ads/go.sum similarity index 54% rename from apps/base/ads/go.sum rename to module/base/ads/go.sum index 3c3497d..a2eb5b2 100644 --- a/apps/base/ads/go.sum +++ b/module/base/ads/go.sum @@ -1,7 +1,5 @@ filippo.io/edwards25519 v1.2.0 h1:crnVqOiS4jqYleHd9vaKZ+HKtHfllngJIiOpNpoJsjo= filippo.io/edwards25519 v1.2.0/go.mod h1:xzAOLCNug/yB62zG1bQ8uziwrIqIuxhctzJT18Q77mc= -git.apinb.com/bsm-sdk/core v0.2.0 h1:/e9yqpsbKBrRgMiGpS3KX2O4qDLxo5V5GpPSLNGxEKw= -git.apinb.com/bsm-sdk/core v0.2.0/go.mod h1:E9T6Eboo/0Zb36BjkKbIgvFzq4fQ2Q8P/7y5zmYTI6Y= git.apinb.com/bsm-sdk/engine v1.3.2 h1:QJ20jveUIHcn3Tu0ktrkZI9zGRaPuJRZ+YTbSa1Zj1w= git.apinb.com/bsm-sdk/engine v1.3.2/go.mod h1:OXRlO6Cdidqagw+LJjCngvpuuX1rwhxDwZlL/MhwiKQ= git.apinb.com/bsm-tools/protoc-gen-markdown v0.0.0-20250907131213-6c1694ce6bcb h1:GoXhkGzI5vZ9JMXCVsSRw/AGsJY0tM2aEv76YaUg2wM= @@ -25,14 +23,12 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/ditashi/jsbeautifier-go v0.0.0-20141206144643-2520a8026a9c h1:+Zo5Ca9GH0RoeVZQKzFJcTLoAixx5s5Gq3pTIS+n354= github.com/ditashi/jsbeautifier-go v0.0.0-20141206144643-2520a8026a9c/go.mod h1:HJGU9ULdREjOcVGZVPB5s6zYmHi1RxzT71l2wQyLmnE= -github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= -github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.4 h1:tG4xh9yMsRCAiodLVTxyrkzSZ9+o0L1Kg/+cPVcbP/8= +github.com/go-logr/logr v1.4.4/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-sql-driver/mysql v1.10.0 h1:Q+1LV8DkHJvSYAdR83XzuhDaTykuDx0l6fkXxoWCWfw= github.com/go-sql-driver/mysql v1.10.0/go.mod h1:M+cqaI7+xxXGG9swrdeUIoPG3Y3KCkF0pZej+SK+nWk= -github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= -github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt/v5 v5.3.1 h1:kYf81DTWFe7t+1VvL7eS+jKFVWaUnK9cB1qbwn63YCY= github.com/golang-jwt/jwt/v5 v5.3.1/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= @@ -41,8 +37,8 @@ github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= 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/grpc-ecosystem/grpc-gateway/v2 v2.29.0 h1:5VipnvEpbqr2gA2VbM+nYVbkIF28c5ZQfqCBQ5g2xfk= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0/go.mod h1:Hyl3n6Twe1hvtd9XUXDec4pTvgMSEixRuQKPTMH2bNs= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0 h1:/Tnpcb2E0Pz/tN9s3bfEY2Q8ePCEX9iuS+cneUwncnw= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0/go.mod h1:zOBXOsUaBSjKgmH4OGzV1esUpR3oUSCPYVd2cUBjKYY= 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= @@ -55,16 +51,16 @@ github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= -github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= -github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y= -github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0= +github.com/klauspost/cpuid/v2 v2.4.0 h1:S6Hrbc7+ywsr0r+RLapfGBHfyefhCTwEh3A0tV913Dw= +github.com/klauspost/cpuid/v2 v2.4.0/go.mod h1:19jmZ9mjzoF//ddRSUsv0zfBTJWh3QJh9FNxZTMrGxU= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/oklog/ulid/v2 v2.1.1 h1:suPZ4ARWLOJLegGFiZZ1dFAkqzhMjL3J1TzI+5wHz8s= -github.com/oklog/ulid/v2 v2.1.1/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ= +github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= +github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= +github.com/oklog/ulid/v2 v2.1.2 h1:IEclFb9JNvzYA6MW2SCxbLzcHTVsfqm3PrqGQJH5zec= +github.com/oklog/ulid/v2 v2.1.2/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ= github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= github.com/pborman/getopt v0.0.0-20170112200414-7148bc3a4c30/go.mod h1:85jBQOZwpVEaDAr341tbn15RS4fCAsIst0qp7i8ex1o= @@ -73,8 +69,8 @@ github.com/pepabo/protoc-gen-go-client v0.3.0/go.mod h1:NvHW7/gsmZUK2UxafqzUzWD8 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/redis/go-redis/v9 v9.20.0 h1:WnQYxLkgO2xiXTCJY0ldIiI8dNqCDlQAG+AtaH7a2a0= -github.com/redis/go-redis/v9 v9.20.0/go.mod h1:v/M13XI1PVCDcm01VtPFOADfZtHf8YW3baQf57KlIkA= +github.com/redis/go-redis/v9 v9.22.0 h1:laDvpYXTJtZLloinw1fA5Kqd6HAEH2XKxOkG/PDq2F0= +github.com/redis/go-redis/v9 v9.22.0/go.mod h1:y2g0Wj8rQvuK0ELM+oxSudcLtC09JScs98I/X9gRWY4= github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0= @@ -84,28 +80,26 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= -github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/zeebo/xxh3 v1.1.0 h1:s7DLGDK45Dyfg7++yxI0khrfwq9661w9EN78eP/UZVs= github.com/zeebo/xxh3 v1.1.0/go.mod h1:IisAie1LELR4xhVinxWS5+zf1lA4p0MW4T+w+W07F5s= -go.etcd.io/etcd/api/v3 v3.6.12 h1:OLOZUKEuAA36TR48F0cIaa8FdzrWygjyfrJxXg4iDgs= -go.etcd.io/etcd/api/v3 v3.6.12/go.mod h1:p14EIQXHbuOQbVvL/WEes5uqKnxP9AgKJgpjbMVvzvE= -go.etcd.io/etcd/client/pkg/v3 v3.6.12 h1:36zzB+pQOdHbhN+kH2iJz/K8bJn0ZLtLfPPO7jozTDo= -go.etcd.io/etcd/client/pkg/v3 v3.6.12/go.mod h1:hh2+ZXtfLzs3o6mn92ntgNPBrTJJOvXqICM5g3L3DMY= -go.etcd.io/etcd/client/v3 v3.6.12 h1:kMSP6JcPZMqSJiX+TXdUIBU/4eXEZWBAaui4VihMbIc= -go.etcd.io/etcd/client/v3 v3.6.12/go.mod h1:CMs6fJWYiZQk4ytFjd4lE1diOvvRMmtbbn/alZXd3dQ= +go.etcd.io/etcd/api/v3 v3.7.1 h1:KJG0/DcWGfe3Y1otDf/fsBf0TSSgpxZ5RO/L8SFt73E= +go.etcd.io/etcd/api/v3 v3.7.1/go.mod h1:8bXIpCMeV7E3/XL0Ix123ATn3dB+0V7d9zklHbB0m78= +go.etcd.io/etcd/client/pkg/v3 v3.7.1 h1:rKYsj3pRkR0eK3yjT3XOgrhqfmIfj9pzNgxjh7mfFv4= +go.etcd.io/etcd/client/pkg/v3 v3.7.1/go.mod h1:cnzZGIUzSfjEwLC6UBVsSXlEK1eepS/JUD7wE6PLRT0= +go.etcd.io/etcd/client/v3 v3.7.1 h1:0PEMMC0KuZmVIN+RAbdqfkZ45pYTgKVtmBEbRCvZFUg= +go.etcd.io/etcd/client/v3 v3.7.1/go.mod h1:ffNqALa8tRCYhYo1F9oR489y23K39Gz+BSR3ApAGYq0= go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64= go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y= -go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I= -go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0= -go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM= -go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY= -go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg= -go.opentelemetry.io/otel/sdk v1.43.0/go.mod h1:P+IkVU3iWukmiit/Yf9AWvpyRDlUeBaRg6Y+C58QHzg= -go.opentelemetry.io/otel/sdk/metric v1.43.0 h1:S88dyqXjJkuBNLeMcVPRFXpRw2fuwdvfCGLEo89fDkw= -go.opentelemetry.io/otel/sdk/metric v1.43.0/go.mod h1:C/RJtwSEJ5hzTiUz5pXF1kILHStzb9zFlIEe85bhj6A= -go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A= -go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0= +go.opentelemetry.io/otel v1.45.0 h1:pdrWmLHofpubmArBv1LgFSv1Z0Ie/ppdZzu+kUN5EeU= +go.opentelemetry.io/otel v1.45.0/go.mod h1:XZxIqPapzEYnhNSScF5DIqXhm/rYi0FzCe2XddAwZfQ= +go.opentelemetry.io/otel/metric v1.45.0 h1:7Eg1uH7CJ5cXv9is6tnBe1FI6rj1nwUdbFypRm3br/M= +go.opentelemetry.io/otel/metric v1.45.0/go.mod h1:HAPbm1nd3p1PmFH7v2dR+6BjXxw+Lq4a2+pndMAm08s= +go.opentelemetry.io/otel/sdk v1.45.0 h1:4VVSMgQ83dUgW2aoX5f6JgLvHwIvzcuLnF9lUdCSpCw= +go.opentelemetry.io/otel/sdk v1.45.0/go.mod h1:Sr40LgXV7DsKMMJMKOhUWOgMWTfAaqvm2kF0g7ilwuA= +go.opentelemetry.io/otel/sdk/metric v1.44.0 h1:3LlKgI+VjbVsjNRFZJZAJ30WjXC5VkNRks6si09iEfI= +go.opentelemetry.io/otel/sdk/metric v1.44.0/go.mod h1:5B5pMARnXxKhltooO4xUuCBorl65a4EpnTalObqOigA= +go.opentelemetry.io/otel/trace v1.45.0 h1:l/mP6Uv7oNO7/TblbhpbgMidxhq1uO/rPsikOyVhxag= +go.opentelemetry.io/otel/trace v1.45.0/go.mod h1:qoJJA2xNMnxRrdISU/kLtfUH2wNeQbiv+jhs/CxI8bc= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= @@ -114,51 +108,26 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.28.0 h1:IZzaP1Fv73/T/pBMLk4VutPl36uNC+OSUh3JLG3FIjo= go.uber.org/zap v1.28.0/go.mod h1:rDLpOi171uODNm/mxFcuYWxDsqWSAVkFdX4XojSKg/Q= -go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= -go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.36.0 h1:JJjpVx6myfUsUdAzZuOSTTmRE0PfZeNWzzvKrP7amb4= -golang.org/x/mod v0.36.0/go.mod h1:moc6ELqsWcOw5Ef3xVprK5ul/MvtVvkIXLziUOICjUQ= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8= -golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -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.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4= -golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY= -golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc= -golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -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= +go.yaml.in/yaml/v3 v3.0.5 h1:N6y/pJk8buWs9NY5ERU2HSMfm+IuD/OtfdAnq6kESPw= +go.yaml.in/yaml/v3 v3.0.5/go.mod h1:HVTZu1O7/Vkt2N+BFy8Zza+lnLsABggaTM2ZpNIGuKg= +golang.org/x/mod v0.37.0 h1:vF1DjpVEshcIqoEaauuHebaLk1O1forxjxBaVn884JQ= +golang.org/x/mod v0.37.0/go.mod h1:m8S8VeM9r4dzDwjrKO0a1sZP3YjeMamRRlD+fmR2Q/0= +golang.org/x/net v0.57.0 h1:K5+3DljvIuDG9/Jv9rvyMywYNFCQ9RSUY6OOTTkT+tE= +golang.org/x/net v0.57.0/go.mod h1:KpXc8iv+r3XplLAG/f7Jsf9RPszJzdR0f58q9vGOuEU= +golang.org/x/sync v0.22.0 h1:SZjpbeLmrCk4xhRSZFNZW5gFUeCeFgjekvI/+gfScek= +golang.org/x/sync v0.22.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= +golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs= +golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +golang.org/x/text v0.40.0 h1:Ub2Z6/xjgF1WrYQz2nuITOEegKFtiIy+rieRJ5lHZKs= +golang.org/x/text v0.40.0/go.mod h1:hpnzDAfGV753zIKo+wk3u1bVKCGPbrnF7+7LBF/UHVY= gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4= gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E= -google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa h1:Kjn0N0tCrDgiAFW+lGO4JZ3ck44CehvJQMAwj9QF0G8= -google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:q4lMZS6kskjT5HvCPrnnypcDPVJqT/f4nfxmkE7gryY= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa h1:mZHHdPZl0dbGHCflZgAq/Q468DWVFcU2whhB2KAo8fk= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= -google.golang.org/grpc v1.81.1 h1:VnnIIZ88UzOOKLukQi+ImGz8O1Wdp8nAGGnvOfEIWQQ= -google.golang.org/grpc v1.81.1/go.mod h1:xGH9GfzOyMTGIOXBJmXt+BX/V0kcdQbdcuwQ/zNw42I= +google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea h1:Jifw/kjs/r3B0uszvls/m3c3tmZs2YHGM9C+rvxP9gY= +google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea/go.mod h1:K/+WGbmBY7aNW1HDw1fJnKYo10i0DkAX6pows00dLig= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea h1:kVhQEPTpKQahD5+JSBTfBB19wcgQTTjAIn45MBqnyHk= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= +google.golang.org/grpc v1.83.0 h1:JeNZEKJFbQxArAMl+hiytHauacDNqJUllNfmIMmpqnQ= +google.golang.org/grpc v1.83.0/go.mod h1:kDyl6SKsiHKt0uylY5gtn5cEjkrIOhQOGDgIc4JGwzQ= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.2 h1:rgSNvqscFZ1JgV/4wH5GOsZFSFkR2Eua9As3KIr2LlM= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.2/go.mod h1:iMEtFwDlAhjDU9L5mY6U1XLwlIId/G3h+QcBHDIvrJ8= google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE= @@ -171,9 +140,11 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gorm.io/driver/mysql v1.6.0 h1:eNbLmNTpPpTOVZi8MMxCi2aaIm0ZpInbORNXDwyLGvg= gorm.io/driver/mysql v1.6.0/go.mod h1:D/oCC2GWK3M/dqoLxnOlaNKmXz8WNTfcS9y5ovaSqKo= -gorm.io/driver/postgres v1.6.0 h1:2dxzU8xJ+ivvqTRph34QX+WrRaJlmfyPqXmoGVjMBa4= -gorm.io/driver/postgres v1.6.0/go.mod h1:vUw0mrGgrTK+uPHEhAdV4sfFELrByKVGnaVRkXDhtWo= -gorm.io/gorm v1.31.1 h1:7CA8FTFz/gRfgqgpeKIBcervUn3xSyPUmr6B2WXJ7kg= -gorm.io/gorm v1.31.1/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs= +gorm.io/driver/postgres v1.6.2 h1:BvXQ/cNUg63q5TFNg672DmDcowZSFrNLkkA3Xe6GXq4= +gorm.io/driver/postgres v1.6.2/go.mod h1:0c4fQA44XhOklXDkgtuKqysHCycTa5i9e3EIpDGCwXk= +gorm.io/driver/sqlite v1.6.0 h1:WHRRrIiulaPiPFmDcod6prc4l2VGVWHz80KspNsxSfQ= +gorm.io/driver/sqlite v1.6.0/go.mod h1:AO9V1qIQddBESngQUKWL9yoH93HIeA1X6V633rBwyT8= +gorm.io/gorm v1.31.2 h1:3o8FXNo9v9S858gil+3LlZA1LkCOzgb4g5BL64FgaCo= +gorm.io/gorm v1.31.2/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs= gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU= gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU= diff --git a/apps/base/ads/internal/config/config.go b/module/base/ads/internal/config/config.go similarity index 100% rename from apps/base/ads/internal/config/config.go rename to module/base/ads/internal/config/config.go diff --git a/apps/base/ads/internal/impl/impl.go b/module/base/ads/internal/impl/impl.go similarity index 94% rename from apps/base/ads/internal/impl/impl.go rename to module/base/ads/internal/impl/impl.go index 6e9b47f..3a17ccd 100644 --- a/apps/base/ads/internal/impl/impl.go +++ b/module/base/ads/internal/impl/impl.go @@ -1,7 +1,7 @@ package impl import ( - "git.apinb.com/bsm-apps/ads/internal/config" + "bsm/full/module/base/ads/internal/config" "git.apinb.com/bsm-sdk/core/cache/redis" "git.apinb.com/bsm-sdk/core/with" cache "github.com/patrickmn/go-cache" diff --git a/apps/base/ads/internal/logic/fetch/by_pos.go b/module/base/ads/internal/logic/fetch/by_pos.go similarity index 87% rename from apps/base/ads/internal/logic/fetch/by_pos.go rename to module/base/ads/internal/logic/fetch/by_pos.go index e2ab45d..084780c 100644 --- a/apps/base/ads/internal/logic/fetch/by_pos.go +++ b/module/base/ads/internal/logic/fetch/by_pos.go @@ -3,9 +3,9 @@ package fetch import ( "context" - "git.apinb.com/bsm-apps/ads/internal/impl" - "git.apinb.com/bsm-apps/ads/internal/models" - pb "git.apinb.com/bsm-apps/ads/pb" + "bsm/full/module/base/ads/internal/impl" + "bsm/full/module/base/ads/internal/models" + pb "bsm/full/module/base/ads/pb" "git.apinb.com/bsm-sdk/core/errcode" ) diff --git a/apps/base/ads/internal/models/ads_item.go b/module/base/ads/internal/models/ads_item.go similarity index 100% rename from apps/base/ads/internal/models/ads_item.go rename to module/base/ads/internal/models/ads_item.go diff --git a/apps/base/ads/internal/models/ads_pos.go b/module/base/ads/internal/models/ads_pos.go similarity index 100% rename from apps/base/ads/internal/models/ads_pos.go rename to module/base/ads/internal/models/ads_pos.go diff --git a/apps/base/ads/internal/server/fetch_server.go b/module/base/ads/internal/server/fetch_server.go similarity index 81% rename from apps/base/ads/internal/server/fetch_server.go rename to module/base/ads/internal/server/fetch_server.go index 3498264..646177c 100644 --- a/apps/base/ads/internal/server/fetch_server.go +++ b/module/base/ads/internal/server/fetch_server.go @@ -3,8 +3,8 @@ package server import ( "context" - "git.apinb.com/bsm-apps/ads/internal/logic/fetch" - pb "git.apinb.com/bsm-apps/ads/pb" + "bsm/full/module/base/ads/internal/logic/fetch" + pb "bsm/full/module/base/ads/pb" ) type FetchServer struct { diff --git a/apps/base/ads/internal/server/new.go b/module/base/ads/internal/server/new.go similarity index 98% rename from apps/base/ads/internal/server/new.go rename to module/base/ads/internal/server/new.go index ee67471..511a709 100644 --- a/apps/base/ads/internal/server/new.go +++ b/module/base/ads/internal/server/new.go @@ -3,7 +3,7 @@ package server import ( "context" - pb "git.apinb.com/bsm-apps/ads/pb" + pb "bsm/full/module/base/ads/pb" "git.apinb.com/bsm-sdk/core/vars" gwRuntime "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "google.golang.org/grpc" diff --git a/apps/base/ads/pb/ads.pb.go b/module/base/ads/pb/ads.pb.go similarity index 100% rename from apps/base/ads/pb/ads.pb.go rename to module/base/ads/pb/ads.pb.go diff --git a/apps/base/ads/pb/ads.pb.gw.go b/module/base/ads/pb/ads.pb.gw.go similarity index 100% rename from apps/base/ads/pb/ads.pb.gw.go rename to module/base/ads/pb/ads.pb.gw.go diff --git a/apps/base/ads/pb/ads_grpc.pb.go b/module/base/ads/pb/ads_grpc.pb.go similarity index 100% rename from apps/base/ads/pb/ads_grpc.pb.go rename to module/base/ads/pb/ads_grpc.pb.go diff --git a/apps/base/ads/proto/ads.proto b/module/base/ads/proto/ads.proto similarity index 100% rename from apps/base/ads/proto/ads.proto rename to module/base/ads/proto/ads.proto diff --git a/apps/base/ads/scripts/filebeat.yaml b/module/base/ads/scripts/filebeat.yaml similarity index 100% rename from apps/base/ads/scripts/filebeat.yaml rename to module/base/ads/scripts/filebeat.yaml diff --git a/apps/base/ads/scripts/lint.sh b/module/base/ads/scripts/lint.sh similarity index 100% rename from apps/base/ads/scripts/lint.sh rename to module/base/ads/scripts/lint.sh diff --git a/apps/base/ads/swagger/ads.swagger.json b/module/base/ads/swagger/ads.swagger.json similarity index 100% rename from apps/base/ads/swagger/ads.swagger.json rename to module/base/ads/swagger/ads.swagger.json diff --git a/apps/base/ads/test/rpc/rpc.go b/module/base/ads/test/rpc/rpc.go similarity index 100% rename from apps/base/ads/test/rpc/rpc.go rename to module/base/ads/test/rpc/rpc.go diff --git a/apps/base/cloud/README.md b/module/base/cloud/README.md similarity index 98% rename from apps/base/cloud/README.md rename to module/base/cloud/README.md index ab761b5..9af68f6 100644 --- a/apps/base/cloud/README.md +++ b/module/base/cloud/README.md @@ -41,7 +41,7 @@ ```bash # 克隆项目 -git clone git.apinb.com/bsm-apps/cloud.git +git clone bsm/full/module/base/cloud.git cd cloud # 安装依赖 @@ -662,13 +662,13 @@ type(scope): description - **作者**: David Yan (david.yan@qq.com) - **维护者**: BSM 开发团队 -- **项目地址**: [git.apinb.com/bsm-apps/cloud](https://git.apinb.com/bsm-apps/cloud) +- **项目地址**: [bsm/full/module/base/cloud](https://bsm/full/module/base/cloud) ## 🔗 相关链接 - [BSM SDK](https://git.apinb.com/bsm-sdk) - [API 文档](https://docs.apinb.com/cloud) -- [问题反馈](https://git.apinb.com/bsm-apps/cloud/issues) +- [问题反馈](https://bsm/full/module/base/cloud/issues) --- diff --git a/apps/base/cloud/cmd/cli/main.go b/module/base/cloud/cmd/cli/main.go similarity index 100% rename from apps/base/cloud/cmd/cli/main.go rename to module/base/cloud/cmd/cli/main.go diff --git a/apps/base/cloud/cmd/main/main.go b/module/base/cloud/cmd/main/main.go similarity index 79% rename from apps/base/cloud/cmd/main/main.go rename to module/base/cloud/cmd/main/main.go index 18ebea0..471b771 100644 --- a/apps/base/cloud/cmd/main/main.go +++ b/module/base/cloud/cmd/main/main.go @@ -5,9 +5,9 @@ package service import ( - "git.apinb.com/bsm-apps/cloud/internal/config" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/server" + "bsm/full/module/base/cloud/internal/config" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/server" "git.apinb.com/bsm-sdk/core/service" ) @@ -39,3 +39,7 @@ func Run() { // 启动服务 srv.Start() } + +func main() { + Run() +} diff --git a/apps/base/cloud/etc/cloud_dev.yaml b/module/base/cloud/etc/cloud_dev.yaml similarity index 100% rename from apps/base/cloud/etc/cloud_dev.yaml rename to module/base/cloud/etc/cloud_dev.yaml diff --git a/apps/base/cloud/etc/cloud_prod.yaml b/module/base/cloud/etc/cloud_prod.yaml similarity index 100% rename from apps/base/cloud/etc/cloud_prod.yaml rename to module/base/cloud/etc/cloud_prod.yaml diff --git a/apps/base/cloud/etc/cloud_test.yaml b/module/base/cloud/etc/cloud_test.yaml similarity index 100% rename from apps/base/cloud/etc/cloud_test.yaml rename to module/base/cloud/etc/cloud_test.yaml diff --git a/apps/base/cloud/go.mod b/module/base/cloud/go.mod similarity index 65% rename from apps/base/cloud/go.mod rename to module/base/cloud/go.mod index bbd4bea..e6add3f 100644 --- a/apps/base/cloud/go.mod +++ b/module/base/cloud/go.mod @@ -1,4 +1,4 @@ -module git.apinb.com/bsm-apps/cloud +module bsm/full/module/base/cloud go 1.26.5 @@ -16,12 +16,12 @@ tool ( require ( git.apinb.com/bsm-sdk/core v0.2.0 git.apinb.com/bsm-sdk/engine v1.3.2 - github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 + github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0 github.com/patrickmn/go-cache v2.1.0+incompatible - go.etcd.io/etcd/client/v3 v3.6.12 - google.golang.org/grpc v1.81.1 + go.etcd.io/etcd/client/v3 v3.7.1 + google.golang.org/grpc v1.83.0 google.golang.org/protobuf v1.36.11 - gorm.io/gorm v1.31.1 + gorm.io/gorm v1.31.2 ) require ( @@ -32,10 +32,8 @@ require ( github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/coreos/go-semver v0.3.1 // indirect github.com/coreos/go-systemd/v22 v22.7.0 // indirect - github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/ditashi/jsbeautifier-go v0.0.0-20141206144643-2520a8026a9c // indirect github.com/go-sql-driver/mysql v1.10.0 // indirect - github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt/v5 v5.3.1 // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/google/uuid v1.6.0 // indirect @@ -45,26 +43,27 @@ require ( github.com/jackc/puddle/v2 v2.2.2 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect - github.com/oklog/ulid/v2 v2.1.1 // indirect + github.com/oklog/ulid/v2 v2.1.2 // indirect github.com/pepabo/protoc-gen-go-client v0.3.0 // indirect - github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - github.com/redis/go-redis/v9 v9.20.0 // indirect + github.com/redis/go-redis/v9 v9.22.0 // indirect github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect - go.etcd.io/etcd/api/v3 v3.6.12 // indirect - go.etcd.io/etcd/client/pkg/v3 v3.6.12 // indirect + go.etcd.io/etcd/api/v3 v3.7.1 // indirect + go.etcd.io/etcd/client/pkg/v3 v3.7.1 // indirect go.uber.org/atomic v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.28.0 // indirect - go.yaml.in/yaml/v3 v3.0.4 // indirect - golang.org/x/mod v0.36.0 // indirect - golang.org/x/net v0.55.0 // indirect - golang.org/x/sync v0.20.0 // indirect - golang.org/x/sys v0.45.0 // indirect - golang.org/x/text v0.37.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa // indirect + go.yaml.in/yaml/v3 v3.0.5 // indirect + golang.org/x/mod v0.37.0 // indirect + golang.org/x/net v0.57.0 // indirect + golang.org/x/sync v0.22.0 // indirect + golang.org/x/sys v0.47.0 // indirect + golang.org/x/text v0.40.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea // indirect google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect gorm.io/driver/mysql v1.6.0 // indirect - gorm.io/driver/postgres v1.6.0 // indirect + gorm.io/driver/postgres v1.6.2 // indirect ) + +replace git.apinb.com/bsm-sdk/core => D:/work/bsm-sdk/core diff --git a/apps/base/cloud/go.sum b/module/base/cloud/go.sum similarity index 54% rename from apps/base/cloud/go.sum rename to module/base/cloud/go.sum index 3c3497d..a2eb5b2 100644 --- a/apps/base/cloud/go.sum +++ b/module/base/cloud/go.sum @@ -1,7 +1,5 @@ filippo.io/edwards25519 v1.2.0 h1:crnVqOiS4jqYleHd9vaKZ+HKtHfllngJIiOpNpoJsjo= filippo.io/edwards25519 v1.2.0/go.mod h1:xzAOLCNug/yB62zG1bQ8uziwrIqIuxhctzJT18Q77mc= -git.apinb.com/bsm-sdk/core v0.2.0 h1:/e9yqpsbKBrRgMiGpS3KX2O4qDLxo5V5GpPSLNGxEKw= -git.apinb.com/bsm-sdk/core v0.2.0/go.mod h1:E9T6Eboo/0Zb36BjkKbIgvFzq4fQ2Q8P/7y5zmYTI6Y= git.apinb.com/bsm-sdk/engine v1.3.2 h1:QJ20jveUIHcn3Tu0ktrkZI9zGRaPuJRZ+YTbSa1Zj1w= git.apinb.com/bsm-sdk/engine v1.3.2/go.mod h1:OXRlO6Cdidqagw+LJjCngvpuuX1rwhxDwZlL/MhwiKQ= git.apinb.com/bsm-tools/protoc-gen-markdown v0.0.0-20250907131213-6c1694ce6bcb h1:GoXhkGzI5vZ9JMXCVsSRw/AGsJY0tM2aEv76YaUg2wM= @@ -25,14 +23,12 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/ditashi/jsbeautifier-go v0.0.0-20141206144643-2520a8026a9c h1:+Zo5Ca9GH0RoeVZQKzFJcTLoAixx5s5Gq3pTIS+n354= github.com/ditashi/jsbeautifier-go v0.0.0-20141206144643-2520a8026a9c/go.mod h1:HJGU9ULdREjOcVGZVPB5s6zYmHi1RxzT71l2wQyLmnE= -github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= -github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.4 h1:tG4xh9yMsRCAiodLVTxyrkzSZ9+o0L1Kg/+cPVcbP/8= +github.com/go-logr/logr v1.4.4/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-sql-driver/mysql v1.10.0 h1:Q+1LV8DkHJvSYAdR83XzuhDaTykuDx0l6fkXxoWCWfw= github.com/go-sql-driver/mysql v1.10.0/go.mod h1:M+cqaI7+xxXGG9swrdeUIoPG3Y3KCkF0pZej+SK+nWk= -github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= -github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt/v5 v5.3.1 h1:kYf81DTWFe7t+1VvL7eS+jKFVWaUnK9cB1qbwn63YCY= github.com/golang-jwt/jwt/v5 v5.3.1/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= @@ -41,8 +37,8 @@ github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= 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/grpc-ecosystem/grpc-gateway/v2 v2.29.0 h1:5VipnvEpbqr2gA2VbM+nYVbkIF28c5ZQfqCBQ5g2xfk= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0/go.mod h1:Hyl3n6Twe1hvtd9XUXDec4pTvgMSEixRuQKPTMH2bNs= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0 h1:/Tnpcb2E0Pz/tN9s3bfEY2Q8ePCEX9iuS+cneUwncnw= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0/go.mod h1:zOBXOsUaBSjKgmH4OGzV1esUpR3oUSCPYVd2cUBjKYY= 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= @@ -55,16 +51,16 @@ github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= -github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= -github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y= -github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0= +github.com/klauspost/cpuid/v2 v2.4.0 h1:S6Hrbc7+ywsr0r+RLapfGBHfyefhCTwEh3A0tV913Dw= +github.com/klauspost/cpuid/v2 v2.4.0/go.mod h1:19jmZ9mjzoF//ddRSUsv0zfBTJWh3QJh9FNxZTMrGxU= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/oklog/ulid/v2 v2.1.1 h1:suPZ4ARWLOJLegGFiZZ1dFAkqzhMjL3J1TzI+5wHz8s= -github.com/oklog/ulid/v2 v2.1.1/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ= +github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= +github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= +github.com/oklog/ulid/v2 v2.1.2 h1:IEclFb9JNvzYA6MW2SCxbLzcHTVsfqm3PrqGQJH5zec= +github.com/oklog/ulid/v2 v2.1.2/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ= github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= github.com/pborman/getopt v0.0.0-20170112200414-7148bc3a4c30/go.mod h1:85jBQOZwpVEaDAr341tbn15RS4fCAsIst0qp7i8ex1o= @@ -73,8 +69,8 @@ github.com/pepabo/protoc-gen-go-client v0.3.0/go.mod h1:NvHW7/gsmZUK2UxafqzUzWD8 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/redis/go-redis/v9 v9.20.0 h1:WnQYxLkgO2xiXTCJY0ldIiI8dNqCDlQAG+AtaH7a2a0= -github.com/redis/go-redis/v9 v9.20.0/go.mod h1:v/M13XI1PVCDcm01VtPFOADfZtHf8YW3baQf57KlIkA= +github.com/redis/go-redis/v9 v9.22.0 h1:laDvpYXTJtZLloinw1fA5Kqd6HAEH2XKxOkG/PDq2F0= +github.com/redis/go-redis/v9 v9.22.0/go.mod h1:y2g0Wj8rQvuK0ELM+oxSudcLtC09JScs98I/X9gRWY4= github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0= @@ -84,28 +80,26 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= -github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/zeebo/xxh3 v1.1.0 h1:s7DLGDK45Dyfg7++yxI0khrfwq9661w9EN78eP/UZVs= github.com/zeebo/xxh3 v1.1.0/go.mod h1:IisAie1LELR4xhVinxWS5+zf1lA4p0MW4T+w+W07F5s= -go.etcd.io/etcd/api/v3 v3.6.12 h1:OLOZUKEuAA36TR48F0cIaa8FdzrWygjyfrJxXg4iDgs= -go.etcd.io/etcd/api/v3 v3.6.12/go.mod h1:p14EIQXHbuOQbVvL/WEes5uqKnxP9AgKJgpjbMVvzvE= -go.etcd.io/etcd/client/pkg/v3 v3.6.12 h1:36zzB+pQOdHbhN+kH2iJz/K8bJn0ZLtLfPPO7jozTDo= -go.etcd.io/etcd/client/pkg/v3 v3.6.12/go.mod h1:hh2+ZXtfLzs3o6mn92ntgNPBrTJJOvXqICM5g3L3DMY= -go.etcd.io/etcd/client/v3 v3.6.12 h1:kMSP6JcPZMqSJiX+TXdUIBU/4eXEZWBAaui4VihMbIc= -go.etcd.io/etcd/client/v3 v3.6.12/go.mod h1:CMs6fJWYiZQk4ytFjd4lE1diOvvRMmtbbn/alZXd3dQ= +go.etcd.io/etcd/api/v3 v3.7.1 h1:KJG0/DcWGfe3Y1otDf/fsBf0TSSgpxZ5RO/L8SFt73E= +go.etcd.io/etcd/api/v3 v3.7.1/go.mod h1:8bXIpCMeV7E3/XL0Ix123ATn3dB+0V7d9zklHbB0m78= +go.etcd.io/etcd/client/pkg/v3 v3.7.1 h1:rKYsj3pRkR0eK3yjT3XOgrhqfmIfj9pzNgxjh7mfFv4= +go.etcd.io/etcd/client/pkg/v3 v3.7.1/go.mod h1:cnzZGIUzSfjEwLC6UBVsSXlEK1eepS/JUD7wE6PLRT0= +go.etcd.io/etcd/client/v3 v3.7.1 h1:0PEMMC0KuZmVIN+RAbdqfkZ45pYTgKVtmBEbRCvZFUg= +go.etcd.io/etcd/client/v3 v3.7.1/go.mod h1:ffNqALa8tRCYhYo1F9oR489y23K39Gz+BSR3ApAGYq0= go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64= go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y= -go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I= -go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0= -go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM= -go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY= -go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg= -go.opentelemetry.io/otel/sdk v1.43.0/go.mod h1:P+IkVU3iWukmiit/Yf9AWvpyRDlUeBaRg6Y+C58QHzg= -go.opentelemetry.io/otel/sdk/metric v1.43.0 h1:S88dyqXjJkuBNLeMcVPRFXpRw2fuwdvfCGLEo89fDkw= -go.opentelemetry.io/otel/sdk/metric v1.43.0/go.mod h1:C/RJtwSEJ5hzTiUz5pXF1kILHStzb9zFlIEe85bhj6A= -go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A= -go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0= +go.opentelemetry.io/otel v1.45.0 h1:pdrWmLHofpubmArBv1LgFSv1Z0Ie/ppdZzu+kUN5EeU= +go.opentelemetry.io/otel v1.45.0/go.mod h1:XZxIqPapzEYnhNSScF5DIqXhm/rYi0FzCe2XddAwZfQ= +go.opentelemetry.io/otel/metric v1.45.0 h1:7Eg1uH7CJ5cXv9is6tnBe1FI6rj1nwUdbFypRm3br/M= +go.opentelemetry.io/otel/metric v1.45.0/go.mod h1:HAPbm1nd3p1PmFH7v2dR+6BjXxw+Lq4a2+pndMAm08s= +go.opentelemetry.io/otel/sdk v1.45.0 h1:4VVSMgQ83dUgW2aoX5f6JgLvHwIvzcuLnF9lUdCSpCw= +go.opentelemetry.io/otel/sdk v1.45.0/go.mod h1:Sr40LgXV7DsKMMJMKOhUWOgMWTfAaqvm2kF0g7ilwuA= +go.opentelemetry.io/otel/sdk/metric v1.44.0 h1:3LlKgI+VjbVsjNRFZJZAJ30WjXC5VkNRks6si09iEfI= +go.opentelemetry.io/otel/sdk/metric v1.44.0/go.mod h1:5B5pMARnXxKhltooO4xUuCBorl65a4EpnTalObqOigA= +go.opentelemetry.io/otel/trace v1.45.0 h1:l/mP6Uv7oNO7/TblbhpbgMidxhq1uO/rPsikOyVhxag= +go.opentelemetry.io/otel/trace v1.45.0/go.mod h1:qoJJA2xNMnxRrdISU/kLtfUH2wNeQbiv+jhs/CxI8bc= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= @@ -114,51 +108,26 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.28.0 h1:IZzaP1Fv73/T/pBMLk4VutPl36uNC+OSUh3JLG3FIjo= go.uber.org/zap v1.28.0/go.mod h1:rDLpOi171uODNm/mxFcuYWxDsqWSAVkFdX4XojSKg/Q= -go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= -go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.36.0 h1:JJjpVx6myfUsUdAzZuOSTTmRE0PfZeNWzzvKrP7amb4= -golang.org/x/mod v0.36.0/go.mod h1:moc6ELqsWcOw5Ef3xVprK5ul/MvtVvkIXLziUOICjUQ= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8= -golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -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.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4= -golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY= -golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc= -golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -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= +go.yaml.in/yaml/v3 v3.0.5 h1:N6y/pJk8buWs9NY5ERU2HSMfm+IuD/OtfdAnq6kESPw= +go.yaml.in/yaml/v3 v3.0.5/go.mod h1:HVTZu1O7/Vkt2N+BFy8Zza+lnLsABggaTM2ZpNIGuKg= +golang.org/x/mod v0.37.0 h1:vF1DjpVEshcIqoEaauuHebaLk1O1forxjxBaVn884JQ= +golang.org/x/mod v0.37.0/go.mod h1:m8S8VeM9r4dzDwjrKO0a1sZP3YjeMamRRlD+fmR2Q/0= +golang.org/x/net v0.57.0 h1:K5+3DljvIuDG9/Jv9rvyMywYNFCQ9RSUY6OOTTkT+tE= +golang.org/x/net v0.57.0/go.mod h1:KpXc8iv+r3XplLAG/f7Jsf9RPszJzdR0f58q9vGOuEU= +golang.org/x/sync v0.22.0 h1:SZjpbeLmrCk4xhRSZFNZW5gFUeCeFgjekvI/+gfScek= +golang.org/x/sync v0.22.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= +golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs= +golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +golang.org/x/text v0.40.0 h1:Ub2Z6/xjgF1WrYQz2nuITOEegKFtiIy+rieRJ5lHZKs= +golang.org/x/text v0.40.0/go.mod h1:hpnzDAfGV753zIKo+wk3u1bVKCGPbrnF7+7LBF/UHVY= gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4= gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E= -google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa h1:Kjn0N0tCrDgiAFW+lGO4JZ3ck44CehvJQMAwj9QF0G8= -google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:q4lMZS6kskjT5HvCPrnnypcDPVJqT/f4nfxmkE7gryY= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa h1:mZHHdPZl0dbGHCflZgAq/Q468DWVFcU2whhB2KAo8fk= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= -google.golang.org/grpc v1.81.1 h1:VnnIIZ88UzOOKLukQi+ImGz8O1Wdp8nAGGnvOfEIWQQ= -google.golang.org/grpc v1.81.1/go.mod h1:xGH9GfzOyMTGIOXBJmXt+BX/V0kcdQbdcuwQ/zNw42I= +google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea h1:Jifw/kjs/r3B0uszvls/m3c3tmZs2YHGM9C+rvxP9gY= +google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea/go.mod h1:K/+WGbmBY7aNW1HDw1fJnKYo10i0DkAX6pows00dLig= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea h1:kVhQEPTpKQahD5+JSBTfBB19wcgQTTjAIn45MBqnyHk= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= +google.golang.org/grpc v1.83.0 h1:JeNZEKJFbQxArAMl+hiytHauacDNqJUllNfmIMmpqnQ= +google.golang.org/grpc v1.83.0/go.mod h1:kDyl6SKsiHKt0uylY5gtn5cEjkrIOhQOGDgIc4JGwzQ= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.2 h1:rgSNvqscFZ1JgV/4wH5GOsZFSFkR2Eua9As3KIr2LlM= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.2/go.mod h1:iMEtFwDlAhjDU9L5mY6U1XLwlIId/G3h+QcBHDIvrJ8= google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE= @@ -171,9 +140,11 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gorm.io/driver/mysql v1.6.0 h1:eNbLmNTpPpTOVZi8MMxCi2aaIm0ZpInbORNXDwyLGvg= gorm.io/driver/mysql v1.6.0/go.mod h1:D/oCC2GWK3M/dqoLxnOlaNKmXz8WNTfcS9y5ovaSqKo= -gorm.io/driver/postgres v1.6.0 h1:2dxzU8xJ+ivvqTRph34QX+WrRaJlmfyPqXmoGVjMBa4= -gorm.io/driver/postgres v1.6.0/go.mod h1:vUw0mrGgrTK+uPHEhAdV4sfFELrByKVGnaVRkXDhtWo= -gorm.io/gorm v1.31.1 h1:7CA8FTFz/gRfgqgpeKIBcervUn3xSyPUmr6B2WXJ7kg= -gorm.io/gorm v1.31.1/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs= +gorm.io/driver/postgres v1.6.2 h1:BvXQ/cNUg63q5TFNg672DmDcowZSFrNLkkA3Xe6GXq4= +gorm.io/driver/postgres v1.6.2/go.mod h1:0c4fQA44XhOklXDkgtuKqysHCycTa5i9e3EIpDGCwXk= +gorm.io/driver/sqlite v1.6.0 h1:WHRRrIiulaPiPFmDcod6prc4l2VGVWHz80KspNsxSfQ= +gorm.io/driver/sqlite v1.6.0/go.mod h1:AO9V1qIQddBESngQUKWL9yoH93HIeA1X6V633rBwyT8= +gorm.io/gorm v1.31.2 h1:3o8FXNo9v9S858gil+3LlZA1LkCOzgb4g5BL64FgaCo= +gorm.io/gorm v1.31.2/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs= gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU= gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU= diff --git a/apps/base/cloud/internal/config/config.go b/module/base/cloud/internal/config/config.go similarity index 100% rename from apps/base/cloud/internal/config/config.go rename to module/base/cloud/internal/config/config.go diff --git a/apps/base/fts/internal/impl/impl.go b/module/base/cloud/internal/impl/impl.go similarity index 92% rename from apps/base/fts/internal/impl/impl.go rename to module/base/cloud/internal/impl/impl.go index 6b9cd45..a233b4d 100644 --- a/apps/base/fts/internal/impl/impl.go +++ b/module/base/cloud/internal/impl/impl.go @@ -1,7 +1,7 @@ package impl import ( - "git.apinb.com/bsm-apps/fts/internal/config" + "bsm/full/module/base/cloud/internal/config" "git.apinb.com/bsm-sdk/core/cache/redis" "git.apinb.com/bsm-sdk/core/with" cache "github.com/patrickmn/go-cache" diff --git a/apps/base/cloud/internal/logic/album/create_album.go b/module/base/cloud/internal/logic/album/create_album.go similarity index 91% rename from apps/base/cloud/internal/logic/album/create_album.go rename to module/base/cloud/internal/logic/album/create_album.go index 88e658d..264606e 100644 --- a/apps/base/cloud/internal/logic/album/create_album.go +++ b/module/base/cloud/internal/logic/album/create_album.go @@ -5,9 +5,9 @@ import ( "strings" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/base/cloud/internal/logic/album/delete_album.go b/module/base/cloud/internal/logic/album/delete_album.go similarity index 91% rename from apps/base/cloud/internal/logic/album/delete_album.go rename to module/base/cloud/internal/logic/album/delete_album.go index 37ba4b1..abac00f 100644 --- a/apps/base/cloud/internal/logic/album/delete_album.go +++ b/module/base/cloud/internal/logic/album/delete_album.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/base/cloud/internal/logic/album/delete_photo.go b/module/base/cloud/internal/logic/album/delete_photo.go similarity index 90% rename from apps/base/cloud/internal/logic/album/delete_photo.go rename to module/base/cloud/internal/logic/album/delete_photo.go index 0070a3c..cb29c9a 100644 --- a/apps/base/cloud/internal/logic/album/delete_photo.go +++ b/module/base/cloud/internal/logic/album/delete_photo.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/base/cloud/internal/logic/album/get_album.go b/module/base/cloud/internal/logic/album/get_album.go similarity index 93% rename from apps/base/cloud/internal/logic/album/get_album.go rename to module/base/cloud/internal/logic/album/get_album.go index 6791e5b..64e830c 100644 --- a/apps/base/cloud/internal/logic/album/get_album.go +++ b/module/base/cloud/internal/logic/album/get_album.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/base/cloud/internal/logic/album/get_photo.go b/module/base/cloud/internal/logic/album/get_photo.go similarity index 93% rename from apps/base/cloud/internal/logic/album/get_photo.go rename to module/base/cloud/internal/logic/album/get_photo.go index 5271b07..0dd599c 100644 --- a/apps/base/cloud/internal/logic/album/get_photo.go +++ b/module/base/cloud/internal/logic/album/get_photo.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/base/cloud/internal/logic/album/list_albums.go b/module/base/cloud/internal/logic/album/list_albums.go similarity index 94% rename from apps/base/cloud/internal/logic/album/list_albums.go rename to module/base/cloud/internal/logic/album/list_albums.go index 58e157e..94490ae 100644 --- a/apps/base/cloud/internal/logic/album/list_albums.go +++ b/module/base/cloud/internal/logic/album/list_albums.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/base/cloud/internal/logic/album/list_photos.go b/module/base/cloud/internal/logic/album/list_photos.go similarity index 94% rename from apps/base/cloud/internal/logic/album/list_photos.go rename to module/base/cloud/internal/logic/album/list_photos.go index d9f0000..812d327 100644 --- a/apps/base/cloud/internal/logic/album/list_photos.go +++ b/module/base/cloud/internal/logic/album/list_photos.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/base/cloud/internal/logic/album/move_photo.go b/module/base/cloud/internal/logic/album/move_photo.go similarity index 92% rename from apps/base/cloud/internal/logic/album/move_photo.go rename to module/base/cloud/internal/logic/album/move_photo.go index 10f2d53..d5058b2 100644 --- a/apps/base/cloud/internal/logic/album/move_photo.go +++ b/module/base/cloud/internal/logic/album/move_photo.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/base/cloud/internal/logic/album/set_cover_photo.go b/module/base/cloud/internal/logic/album/set_cover_photo.go similarity index 91% rename from apps/base/cloud/internal/logic/album/set_cover_photo.go rename to module/base/cloud/internal/logic/album/set_cover_photo.go index ae0f1e5..a48a860 100644 --- a/apps/base/cloud/internal/logic/album/set_cover_photo.go +++ b/module/base/cloud/internal/logic/album/set_cover_photo.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/base/cloud/internal/logic/album/update_album.go b/module/base/cloud/internal/logic/album/update_album.go similarity index 91% rename from apps/base/cloud/internal/logic/album/update_album.go rename to module/base/cloud/internal/logic/album/update_album.go index 75b45c3..dabb5d2 100644 --- a/apps/base/cloud/internal/logic/album/update_album.go +++ b/module/base/cloud/internal/logic/album/update_album.go @@ -5,9 +5,9 @@ import ( "strings" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/base/cloud/internal/logic/album/update_photo.go b/module/base/cloud/internal/logic/album/update_photo.go similarity index 91% rename from apps/base/cloud/internal/logic/album/update_photo.go rename to module/base/cloud/internal/logic/album/update_photo.go index 30c8650..9404448 100644 --- a/apps/base/cloud/internal/logic/album/update_photo.go +++ b/module/base/cloud/internal/logic/album/update_photo.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/base/cloud/internal/logic/album/upload_photo.go b/module/base/cloud/internal/logic/album/upload_photo.go similarity index 93% rename from apps/base/cloud/internal/logic/album/upload_photo.go rename to module/base/cloud/internal/logic/album/upload_photo.go index 99e42a3..2a59c9b 100644 --- a/apps/base/cloud/internal/logic/album/upload_photo.go +++ b/module/base/cloud/internal/logic/album/upload_photo.go @@ -5,9 +5,9 @@ import ( "strings" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/base/cloud/internal/logic/bookmark/create_bookmark.go b/module/base/cloud/internal/logic/bookmark/create_bookmark.go similarity index 92% rename from apps/base/cloud/internal/logic/bookmark/create_bookmark.go rename to module/base/cloud/internal/logic/bookmark/create_bookmark.go index f7683c8..897116c 100644 --- a/apps/base/cloud/internal/logic/bookmark/create_bookmark.go +++ b/module/base/cloud/internal/logic/bookmark/create_bookmark.go @@ -5,9 +5,9 @@ import ( "strings" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/base/cloud/internal/logic/bookmark/delete_bookmark.go b/module/base/cloud/internal/logic/bookmark/delete_bookmark.go similarity index 88% rename from apps/base/cloud/internal/logic/bookmark/delete_bookmark.go rename to module/base/cloud/internal/logic/bookmark/delete_bookmark.go index c5fd3de..b3a60a5 100644 --- a/apps/base/cloud/internal/logic/bookmark/delete_bookmark.go +++ b/module/base/cloud/internal/logic/bookmark/delete_bookmark.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/base/cloud/internal/logic/bookmark/get_bookmark.go b/module/base/cloud/internal/logic/bookmark/get_bookmark.go similarity index 90% rename from apps/base/cloud/internal/logic/bookmark/get_bookmark.go rename to module/base/cloud/internal/logic/bookmark/get_bookmark.go index be56613..67fcc1f 100644 --- a/apps/base/cloud/internal/logic/bookmark/get_bookmark.go +++ b/module/base/cloud/internal/logic/bookmark/get_bookmark.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/base/cloud/internal/logic/bookmark/import_bookmarks.go b/module/base/cloud/internal/logic/bookmark/import_bookmarks.go similarity index 94% rename from apps/base/cloud/internal/logic/bookmark/import_bookmarks.go rename to module/base/cloud/internal/logic/bookmark/import_bookmarks.go index 6a459fc..65c657a 100644 --- a/apps/base/cloud/internal/logic/bookmark/import_bookmarks.go +++ b/module/base/cloud/internal/logic/bookmark/import_bookmarks.go @@ -6,9 +6,9 @@ import ( "strings" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/base/cloud/internal/logic/bookmark/list_bookmarks.go b/module/base/cloud/internal/logic/bookmark/list_bookmarks.go similarity index 92% rename from apps/base/cloud/internal/logic/bookmark/list_bookmarks.go rename to module/base/cloud/internal/logic/bookmark/list_bookmarks.go index b78ddb7..d1db86b 100644 --- a/apps/base/cloud/internal/logic/bookmark/list_bookmarks.go +++ b/module/base/cloud/internal/logic/bookmark/list_bookmarks.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/base/cloud/internal/logic/bookmark/update_bookmark.go b/module/base/cloud/internal/logic/bookmark/update_bookmark.go similarity index 92% rename from apps/base/cloud/internal/logic/bookmark/update_bookmark.go rename to module/base/cloud/internal/logic/bookmark/update_bookmark.go index 0518d8f..bd6c1ec 100644 --- a/apps/base/cloud/internal/logic/bookmark/update_bookmark.go +++ b/module/base/cloud/internal/logic/bookmark/update_bookmark.go @@ -5,9 +5,9 @@ import ( "strings" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/base/cloud/internal/logic/disk/copy_file.go b/module/base/cloud/internal/logic/disk/copy_file.go similarity index 94% rename from apps/base/cloud/internal/logic/disk/copy_file.go rename to module/base/cloud/internal/logic/disk/copy_file.go index 14d9924..55cbfe4 100644 --- a/apps/base/cloud/internal/logic/disk/copy_file.go +++ b/module/base/cloud/internal/logic/disk/copy_file.go @@ -5,9 +5,9 @@ import ( "strings" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/base/cloud/internal/logic/disk/create_dir.go b/module/base/cloud/internal/logic/disk/create_dir.go similarity index 93% rename from apps/base/cloud/internal/logic/disk/create_dir.go rename to module/base/cloud/internal/logic/disk/create_dir.go index f006e9d..a8ab5cc 100644 --- a/apps/base/cloud/internal/logic/disk/create_dir.go +++ b/module/base/cloud/internal/logic/disk/create_dir.go @@ -6,9 +6,9 @@ import ( "strings" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/base/cloud/internal/logic/disk/delete_dir.go b/module/base/cloud/internal/logic/disk/delete_dir.go similarity index 93% rename from apps/base/cloud/internal/logic/disk/delete_dir.go rename to module/base/cloud/internal/logic/disk/delete_dir.go index 1fb080d..9cacd74 100644 --- a/apps/base/cloud/internal/logic/disk/delete_dir.go +++ b/module/base/cloud/internal/logic/disk/delete_dir.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/base/cloud/internal/logic/disk/delete_file.go b/module/base/cloud/internal/logic/disk/delete_file.go similarity index 90% rename from apps/base/cloud/internal/logic/disk/delete_file.go rename to module/base/cloud/internal/logic/disk/delete_file.go index 832d344..1a4e3f5 100644 --- a/apps/base/cloud/internal/logic/disk/delete_file.go +++ b/module/base/cloud/internal/logic/disk/delete_file.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/base/cloud/internal/logic/disk/get_dir.go b/module/base/cloud/internal/logic/disk/get_dir.go similarity index 95% rename from apps/base/cloud/internal/logic/disk/get_dir.go rename to module/base/cloud/internal/logic/disk/get_dir.go index 9dacdfc..fc4cb3a 100644 --- a/apps/base/cloud/internal/logic/disk/get_dir.go +++ b/module/base/cloud/internal/logic/disk/get_dir.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/base/cloud/internal/logic/disk/get_dir_tree.go b/module/base/cloud/internal/logic/disk/get_dir_tree.go similarity index 95% rename from apps/base/cloud/internal/logic/disk/get_dir_tree.go rename to module/base/cloud/internal/logic/disk/get_dir_tree.go index 1e4ce1f..e30a119 100644 --- a/apps/base/cloud/internal/logic/disk/get_dir_tree.go +++ b/module/base/cloud/internal/logic/disk/get_dir_tree.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/base/cloud/internal/logic/disk/get_file.go b/module/base/cloud/internal/logic/disk/get_file.go similarity index 93% rename from apps/base/cloud/internal/logic/disk/get_file.go rename to module/base/cloud/internal/logic/disk/get_file.go index 1bfe4c3..48e58e9 100644 --- a/apps/base/cloud/internal/logic/disk/get_file.go +++ b/module/base/cloud/internal/logic/disk/get_file.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/base/cloud/internal/logic/disk/list_dirs.go b/module/base/cloud/internal/logic/disk/list_dirs.go similarity index 93% rename from apps/base/cloud/internal/logic/disk/list_dirs.go rename to module/base/cloud/internal/logic/disk/list_dirs.go index 7c4c4cf..c3d5600 100644 --- a/apps/base/cloud/internal/logic/disk/list_dirs.go +++ b/module/base/cloud/internal/logic/disk/list_dirs.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/base/cloud/internal/logic/disk/list_files.go b/module/base/cloud/internal/logic/disk/list_files.go similarity index 94% rename from apps/base/cloud/internal/logic/disk/list_files.go rename to module/base/cloud/internal/logic/disk/list_files.go index 3a3d031..ace9f12 100644 --- a/apps/base/cloud/internal/logic/disk/list_files.go +++ b/module/base/cloud/internal/logic/disk/list_files.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/base/cloud/internal/logic/disk/move_dir.go b/module/base/cloud/internal/logic/disk/move_dir.go similarity index 96% rename from apps/base/cloud/internal/logic/disk/move_dir.go rename to module/base/cloud/internal/logic/disk/move_dir.go index 07eaf1a..3960548 100644 --- a/apps/base/cloud/internal/logic/disk/move_dir.go +++ b/module/base/cloud/internal/logic/disk/move_dir.go @@ -6,9 +6,9 @@ import ( "strings" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/base/cloud/internal/logic/disk/move_file.go b/module/base/cloud/internal/logic/disk/move_file.go similarity index 93% rename from apps/base/cloud/internal/logic/disk/move_file.go rename to module/base/cloud/internal/logic/disk/move_file.go index 1a44624..c954caf 100644 --- a/apps/base/cloud/internal/logic/disk/move_file.go +++ b/module/base/cloud/internal/logic/disk/move_file.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/base/cloud/internal/logic/disk/search_files.go b/module/base/cloud/internal/logic/disk/search_files.go similarity index 94% rename from apps/base/cloud/internal/logic/disk/search_files.go rename to module/base/cloud/internal/logic/disk/search_files.go index fc836c4..c95d2d9 100644 --- a/apps/base/cloud/internal/logic/disk/search_files.go +++ b/module/base/cloud/internal/logic/disk/search_files.go @@ -5,9 +5,9 @@ import ( "strings" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/base/cloud/internal/logic/disk/update_dir.go b/module/base/cloud/internal/logic/disk/update_dir.go similarity index 94% rename from apps/base/cloud/internal/logic/disk/update_dir.go rename to module/base/cloud/internal/logic/disk/update_dir.go index cc1a988..c92b211 100644 --- a/apps/base/cloud/internal/logic/disk/update_dir.go +++ b/module/base/cloud/internal/logic/disk/update_dir.go @@ -6,9 +6,9 @@ import ( "strings" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/base/cloud/internal/logic/disk/update_file.go b/module/base/cloud/internal/logic/disk/update_file.go similarity index 93% rename from apps/base/cloud/internal/logic/disk/update_file.go rename to module/base/cloud/internal/logic/disk/update_file.go index 4042847..b38378e 100644 --- a/apps/base/cloud/internal/logic/disk/update_file.go +++ b/module/base/cloud/internal/logic/disk/update_file.go @@ -5,9 +5,9 @@ import ( "strings" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/base/cloud/internal/logic/disk/upload_file.go b/module/base/cloud/internal/logic/disk/upload_file.go similarity index 94% rename from apps/base/cloud/internal/logic/disk/upload_file.go rename to module/base/cloud/internal/logic/disk/upload_file.go index 16be6ab..34335bc 100644 --- a/apps/base/cloud/internal/logic/disk/upload_file.go +++ b/module/base/cloud/internal/logic/disk/upload_file.go @@ -5,9 +5,9 @@ import ( "strings" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/base/cloud/internal/logic/note/create_note.go b/module/base/cloud/internal/logic/note/create_note.go similarity index 91% rename from apps/base/cloud/internal/logic/note/create_note.go rename to module/base/cloud/internal/logic/note/create_note.go index a7541a9..0b7e14b 100644 --- a/apps/base/cloud/internal/logic/note/create_note.go +++ b/module/base/cloud/internal/logic/note/create_note.go @@ -5,9 +5,9 @@ import ( "strings" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/base/cloud/internal/logic/note/delete_attachment.go b/module/base/cloud/internal/logic/note/delete_attachment.go similarity index 91% rename from apps/base/cloud/internal/logic/note/delete_attachment.go rename to module/base/cloud/internal/logic/note/delete_attachment.go index 5d8d89b..c452b34 100644 --- a/apps/base/cloud/internal/logic/note/delete_attachment.go +++ b/module/base/cloud/internal/logic/note/delete_attachment.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/base/cloud/internal/logic/note/delete_note.go b/module/base/cloud/internal/logic/note/delete_note.go similarity index 91% rename from apps/base/cloud/internal/logic/note/delete_note.go rename to module/base/cloud/internal/logic/note/delete_note.go index 7a47a6e..39223cc 100644 --- a/apps/base/cloud/internal/logic/note/delete_note.go +++ b/module/base/cloud/internal/logic/note/delete_note.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/base/cloud/internal/logic/note/get_note.go b/module/base/cloud/internal/logic/note/get_note.go similarity index 93% rename from apps/base/cloud/internal/logic/note/get_note.go rename to module/base/cloud/internal/logic/note/get_note.go index 8131dec..da4da8c 100644 --- a/apps/base/cloud/internal/logic/note/get_note.go +++ b/module/base/cloud/internal/logic/note/get_note.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/base/cloud/internal/logic/note/increment_views.go b/module/base/cloud/internal/logic/note/increment_views.go similarity index 89% rename from apps/base/cloud/internal/logic/note/increment_views.go rename to module/base/cloud/internal/logic/note/increment_views.go index 4793445..33f8e2f 100644 --- a/apps/base/cloud/internal/logic/note/increment_views.go +++ b/module/base/cloud/internal/logic/note/increment_views.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/base/cloud/internal/logic/note/insert_attachment.go b/module/base/cloud/internal/logic/note/insert_attachment.go similarity index 91% rename from apps/base/cloud/internal/logic/note/insert_attachment.go rename to module/base/cloud/internal/logic/note/insert_attachment.go index 2fd232e..8199db3 100644 --- a/apps/base/cloud/internal/logic/note/insert_attachment.go +++ b/module/base/cloud/internal/logic/note/insert_attachment.go @@ -5,9 +5,9 @@ import ( "strings" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/base/cloud/internal/logic/note/list_notes.go b/module/base/cloud/internal/logic/note/list_notes.go similarity index 94% rename from apps/base/cloud/internal/logic/note/list_notes.go rename to module/base/cloud/internal/logic/note/list_notes.go index 7a68bca..605b840 100644 --- a/apps/base/cloud/internal/logic/note/list_notes.go +++ b/module/base/cloud/internal/logic/note/list_notes.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/base/cloud/internal/logic/note/search_notes.go b/module/base/cloud/internal/logic/note/search_notes.go similarity index 94% rename from apps/base/cloud/internal/logic/note/search_notes.go rename to module/base/cloud/internal/logic/note/search_notes.go index b3391f7..704bf40 100644 --- a/apps/base/cloud/internal/logic/note/search_notes.go +++ b/module/base/cloud/internal/logic/note/search_notes.go @@ -5,9 +5,9 @@ import ( "strings" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/base/cloud/internal/logic/note/toggle_pin.go b/module/base/cloud/internal/logic/note/toggle_pin.go similarity index 88% rename from apps/base/cloud/internal/logic/note/toggle_pin.go rename to module/base/cloud/internal/logic/note/toggle_pin.go index 489bbd3..22ba90e 100644 --- a/apps/base/cloud/internal/logic/note/toggle_pin.go +++ b/module/base/cloud/internal/logic/note/toggle_pin.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/base/cloud/internal/logic/note/update_note.go b/module/base/cloud/internal/logic/note/update_note.go similarity index 91% rename from apps/base/cloud/internal/logic/note/update_note.go rename to module/base/cloud/internal/logic/note/update_note.go index a5359c1..5b69321 100644 --- a/apps/base/cloud/internal/logic/note/update_note.go +++ b/module/base/cloud/internal/logic/note/update_note.go @@ -5,9 +5,9 @@ import ( "strings" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/base/cloud/internal/logic/private/create_private_data.go b/module/base/cloud/internal/logic/private/create_private_data.go similarity index 91% rename from apps/base/cloud/internal/logic/private/create_private_data.go rename to module/base/cloud/internal/logic/private/create_private_data.go index 4488fe5..50055f0 100644 --- a/apps/base/cloud/internal/logic/private/create_private_data.go +++ b/module/base/cloud/internal/logic/private/create_private_data.go @@ -5,9 +5,9 @@ import ( "strings" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/base/cloud/internal/logic/private/decrypt_data.go b/module/base/cloud/internal/logic/private/decrypt_data.go similarity index 97% rename from apps/base/cloud/internal/logic/private/decrypt_data.go rename to module/base/cloud/internal/logic/private/decrypt_data.go index 322bb05..a2a50bb 100644 --- a/apps/base/cloud/internal/logic/private/decrypt_data.go +++ b/module/base/cloud/internal/logic/private/decrypt_data.go @@ -8,7 +8,7 @@ import ( "strings" "time" - pb "git.apinb.com/bsm-apps/cloud/pb" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/base/cloud/internal/logic/private/delete_private_data.go b/module/base/cloud/internal/logic/private/delete_private_data.go similarity index 90% rename from apps/base/cloud/internal/logic/private/delete_private_data.go rename to module/base/cloud/internal/logic/private/delete_private_data.go index c5db156..97f1a16 100644 --- a/apps/base/cloud/internal/logic/private/delete_private_data.go +++ b/module/base/cloud/internal/logic/private/delete_private_data.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/base/cloud/internal/logic/private/encrypt_data.go b/module/base/cloud/internal/logic/private/encrypt_data.go similarity index 97% rename from apps/base/cloud/internal/logic/private/encrypt_data.go rename to module/base/cloud/internal/logic/private/encrypt_data.go index 6055413..c89ed45 100644 --- a/apps/base/cloud/internal/logic/private/encrypt_data.go +++ b/module/base/cloud/internal/logic/private/encrypt_data.go @@ -10,7 +10,7 @@ import ( "strings" "time" - pb "git.apinb.com/bsm-apps/cloud/pb" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/base/cloud/internal/logic/private/get_private_data.go b/module/base/cloud/internal/logic/private/get_private_data.go similarity index 91% rename from apps/base/cloud/internal/logic/private/get_private_data.go rename to module/base/cloud/internal/logic/private/get_private_data.go index aa6684e..89b0e3f 100644 --- a/apps/base/cloud/internal/logic/private/get_private_data.go +++ b/module/base/cloud/internal/logic/private/get_private_data.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/base/cloud/internal/logic/private/get_private_data_by_type.go b/module/base/cloud/internal/logic/private/get_private_data_by_type.go similarity index 93% rename from apps/base/cloud/internal/logic/private/get_private_data_by_type.go rename to module/base/cloud/internal/logic/private/get_private_data_by_type.go index f987e66..6bf18e1 100644 --- a/apps/base/cloud/internal/logic/private/get_private_data_by_type.go +++ b/module/base/cloud/internal/logic/private/get_private_data_by_type.go @@ -5,9 +5,9 @@ import ( "strings" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/base/cloud/internal/logic/private/list_private_data.go b/module/base/cloud/internal/logic/private/list_private_data.go similarity index 92% rename from apps/base/cloud/internal/logic/private/list_private_data.go rename to module/base/cloud/internal/logic/private/list_private_data.go index 01e5896..84871fb 100644 --- a/apps/base/cloud/internal/logic/private/list_private_data.go +++ b/module/base/cloud/internal/logic/private/list_private_data.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/base/cloud/internal/logic/private/search_private_data.go b/module/base/cloud/internal/logic/private/search_private_data.go similarity index 93% rename from apps/base/cloud/internal/logic/private/search_private_data.go rename to module/base/cloud/internal/logic/private/search_private_data.go index 5c3317d..836f2c4 100644 --- a/apps/base/cloud/internal/logic/private/search_private_data.go +++ b/module/base/cloud/internal/logic/private/search_private_data.go @@ -5,9 +5,9 @@ import ( "strings" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/base/cloud/internal/logic/private/update_private_data.go b/module/base/cloud/internal/logic/private/update_private_data.go similarity index 92% rename from apps/base/cloud/internal/logic/private/update_private_data.go rename to module/base/cloud/internal/logic/private/update_private_data.go index 4de68aa..7f760ef 100644 --- a/apps/base/cloud/internal/logic/private/update_private_data.go +++ b/module/base/cloud/internal/logic/private/update_private_data.go @@ -5,9 +5,9 @@ import ( "strings" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/base/cloud/internal/logic/share/create_share.go b/module/base/cloud/internal/logic/share/create_share.go similarity index 93% rename from apps/base/cloud/internal/logic/share/create_share.go rename to module/base/cloud/internal/logic/share/create_share.go index b39c823..96e3dff 100644 --- a/apps/base/cloud/internal/logic/share/create_share.go +++ b/module/base/cloud/internal/logic/share/create_share.go @@ -5,9 +5,9 @@ import ( "strings" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/base/cloud/internal/logic/share/delete_share.go b/module/base/cloud/internal/logic/share/delete_share.go similarity index 89% rename from apps/base/cloud/internal/logic/share/delete_share.go rename to module/base/cloud/internal/logic/share/delete_share.go index e250a3a..a79c902 100644 --- a/apps/base/cloud/internal/logic/share/delete_share.go +++ b/module/base/cloud/internal/logic/share/delete_share.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/base/cloud/internal/logic/share/get_share.go b/module/base/cloud/internal/logic/share/get_share.go similarity index 92% rename from apps/base/cloud/internal/logic/share/get_share.go rename to module/base/cloud/internal/logic/share/get_share.go index 370e109..718574f 100644 --- a/apps/base/cloud/internal/logic/share/get_share.go +++ b/module/base/cloud/internal/logic/share/get_share.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/base/cloud/internal/logic/share/list_shares.go b/module/base/cloud/internal/logic/share/list_shares.go similarity index 92% rename from apps/base/cloud/internal/logic/share/list_shares.go rename to module/base/cloud/internal/logic/share/list_shares.go index af58329..ad9c566 100644 --- a/apps/base/cloud/internal/logic/share/list_shares.go +++ b/module/base/cloud/internal/logic/share/list_shares.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/base/cloud/internal/logic/share/validate_share_password.go b/module/base/cloud/internal/logic/share/validate_share_password.go similarity index 91% rename from apps/base/cloud/internal/logic/share/validate_share_password.go rename to module/base/cloud/internal/logic/share/validate_share_password.go index 47d9821..6be0ac7 100644 --- a/apps/base/cloud/internal/logic/share/validate_share_password.go +++ b/module/base/cloud/internal/logic/share/validate_share_password.go @@ -5,9 +5,9 @@ import ( "strings" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/base/cloud/internal/logic/space/get.go b/module/base/cloud/internal/logic/space/get.go similarity index 96% rename from apps/base/cloud/internal/logic/space/get.go rename to module/base/cloud/internal/logic/space/get.go index f352336..a452004 100644 --- a/apps/base/cloud/internal/logic/space/get.go +++ b/module/base/cloud/internal/logic/space/get.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/engine/types" diff --git a/apps/base/cloud/internal/logic/space/get_by_key_identifier.go b/module/base/cloud/internal/logic/space/get_by_key_identifier.go similarity index 96% rename from apps/base/cloud/internal/logic/space/get_by_key_identifier.go rename to module/base/cloud/internal/logic/space/get_by_key_identifier.go index c0f6077..ea36275 100644 --- a/apps/base/cloud/internal/logic/space/get_by_key_identifier.go +++ b/module/base/cloud/internal/logic/space/get_by_key_identifier.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/cloud/internal/impl" - "git.apinb.com/bsm-apps/cloud/internal/models" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/impl" + "bsm/full/module/base/cloud/internal/models" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/base/cloud/internal/models/cloud_album.go b/module/base/cloud/internal/models/cloud_album.go similarity index 100% rename from apps/base/cloud/internal/models/cloud_album.go rename to module/base/cloud/internal/models/cloud_album.go diff --git a/apps/base/cloud/internal/models/cloud_bookmark.go b/module/base/cloud/internal/models/cloud_bookmark.go similarity index 100% rename from apps/base/cloud/internal/models/cloud_bookmark.go rename to module/base/cloud/internal/models/cloud_bookmark.go diff --git a/apps/base/cloud/internal/models/cloud_disk_dir.go b/module/base/cloud/internal/models/cloud_disk_dir.go similarity index 100% rename from apps/base/cloud/internal/models/cloud_disk_dir.go rename to module/base/cloud/internal/models/cloud_disk_dir.go diff --git a/apps/base/cloud/internal/models/cloud_disk_file.go b/module/base/cloud/internal/models/cloud_disk_file.go similarity index 100% rename from apps/base/cloud/internal/models/cloud_disk_file.go rename to module/base/cloud/internal/models/cloud_disk_file.go diff --git a/apps/base/cloud/internal/models/cloud_note.go b/module/base/cloud/internal/models/cloud_note.go similarity index 100% rename from apps/base/cloud/internal/models/cloud_note.go rename to module/base/cloud/internal/models/cloud_note.go diff --git a/apps/base/cloud/internal/models/cloud_note_attach.go b/module/base/cloud/internal/models/cloud_note_attach.go similarity index 100% rename from apps/base/cloud/internal/models/cloud_note_attach.go rename to module/base/cloud/internal/models/cloud_note_attach.go diff --git a/apps/base/cloud/internal/models/cloud_photo.go b/module/base/cloud/internal/models/cloud_photo.go similarity index 100% rename from apps/base/cloud/internal/models/cloud_photo.go rename to module/base/cloud/internal/models/cloud_photo.go diff --git a/apps/base/cloud/internal/models/cloud_private.go b/module/base/cloud/internal/models/cloud_private.go similarity index 100% rename from apps/base/cloud/internal/models/cloud_private.go rename to module/base/cloud/internal/models/cloud_private.go diff --git a/apps/base/cloud/internal/models/cloud_share.go b/module/base/cloud/internal/models/cloud_share.go similarity index 100% rename from apps/base/cloud/internal/models/cloud_share.go rename to module/base/cloud/internal/models/cloud_share.go diff --git a/apps/base/cloud/internal/models/cloud_space.go b/module/base/cloud/internal/models/cloud_space.go similarity index 100% rename from apps/base/cloud/internal/models/cloud_space.go rename to module/base/cloud/internal/models/cloud_space.go diff --git a/apps/base/cloud/internal/models/query.go b/module/base/cloud/internal/models/query.go similarity index 100% rename from apps/base/cloud/internal/models/query.go rename to module/base/cloud/internal/models/query.go diff --git a/apps/base/cloud/internal/server/album_server.go b/module/base/cloud/internal/server/album_server.go similarity index 95% rename from apps/base/cloud/internal/server/album_server.go rename to module/base/cloud/internal/server/album_server.go index c07a6cc..4447c5d 100644 --- a/apps/base/cloud/internal/server/album_server.go +++ b/module/base/cloud/internal/server/album_server.go @@ -3,8 +3,8 @@ package server import ( "context" - "git.apinb.com/bsm-apps/cloud/internal/logic/album" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/logic/album" + pb "bsm/full/module/base/cloud/pb" ) type AlbumServer struct { diff --git a/apps/base/cloud/internal/server/bookmark_server.go b/module/base/cloud/internal/server/bookmark_server.go similarity index 93% rename from apps/base/cloud/internal/server/bookmark_server.go rename to module/base/cloud/internal/server/bookmark_server.go index de0f38b..c33ac7e 100644 --- a/apps/base/cloud/internal/server/bookmark_server.go +++ b/module/base/cloud/internal/server/bookmark_server.go @@ -3,8 +3,8 @@ package server import ( "context" - "git.apinb.com/bsm-apps/cloud/internal/logic/bookmark" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/logic/bookmark" + pb "bsm/full/module/base/cloud/pb" ) type BookmarkServer struct { diff --git a/apps/base/cloud/internal/server/disk_server.go b/module/base/cloud/internal/server/disk_server.go similarity index 96% rename from apps/base/cloud/internal/server/disk_server.go rename to module/base/cloud/internal/server/disk_server.go index ec0e11c..91d4a26 100644 --- a/apps/base/cloud/internal/server/disk_server.go +++ b/module/base/cloud/internal/server/disk_server.go @@ -3,8 +3,8 @@ package server import ( "context" - "git.apinb.com/bsm-apps/cloud/internal/logic/disk" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/logic/disk" + pb "bsm/full/module/base/cloud/pb" ) type DiskServer struct { diff --git a/apps/base/cloud/internal/server/new.go b/module/base/cloud/internal/server/new.go similarity index 98% rename from apps/base/cloud/internal/server/new.go rename to module/base/cloud/internal/server/new.go index 56ec4f5..ffb7891 100644 --- a/apps/base/cloud/internal/server/new.go +++ b/module/base/cloud/internal/server/new.go @@ -3,7 +3,7 @@ package server import ( "context" - pb "git.apinb.com/bsm-apps/cloud/pb" + pb "bsm/full/module/base/cloud/pb" "git.apinb.com/bsm-sdk/core/vars" gwRuntime "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "google.golang.org/grpc" diff --git a/apps/base/cloud/internal/server/note_server.go b/module/base/cloud/internal/server/note_server.go similarity index 95% rename from apps/base/cloud/internal/server/note_server.go rename to module/base/cloud/internal/server/note_server.go index b170cc5..cb59e6a 100644 --- a/apps/base/cloud/internal/server/note_server.go +++ b/module/base/cloud/internal/server/note_server.go @@ -3,8 +3,8 @@ package server import ( "context" - "git.apinb.com/bsm-apps/cloud/internal/logic/note" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/logic/note" + pb "bsm/full/module/base/cloud/pb" ) type NoteServer struct { diff --git a/apps/base/cloud/internal/server/private_server.go b/module/base/cloud/internal/server/private_server.go similarity index 95% rename from apps/base/cloud/internal/server/private_server.go rename to module/base/cloud/internal/server/private_server.go index 74a84f4..99d5f8d 100644 --- a/apps/base/cloud/internal/server/private_server.go +++ b/module/base/cloud/internal/server/private_server.go @@ -3,8 +3,8 @@ package server import ( "context" - "git.apinb.com/bsm-apps/cloud/internal/logic/private" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/logic/private" + pb "bsm/full/module/base/cloud/pb" ) type PrivateServer struct { diff --git a/apps/base/cloud/internal/server/share_server.go b/module/base/cloud/internal/server/share_server.go similarity index 92% rename from apps/base/cloud/internal/server/share_server.go rename to module/base/cloud/internal/server/share_server.go index 31b5f7d..1f846f5 100644 --- a/apps/base/cloud/internal/server/share_server.go +++ b/module/base/cloud/internal/server/share_server.go @@ -3,8 +3,8 @@ package server import ( "context" - "git.apinb.com/bsm-apps/cloud/internal/logic/share" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/logic/share" + pb "bsm/full/module/base/cloud/pb" ) type ShareServer struct { diff --git a/apps/base/cloud/internal/server/space_server.go b/module/base/cloud/internal/server/space_server.go similarity index 85% rename from apps/base/cloud/internal/server/space_server.go rename to module/base/cloud/internal/server/space_server.go index 8c1f2f3..2a86b2f 100644 --- a/apps/base/cloud/internal/server/space_server.go +++ b/module/base/cloud/internal/server/space_server.go @@ -3,8 +3,8 @@ package server import ( "context" - "git.apinb.com/bsm-apps/cloud/internal/logic/space" - pb "git.apinb.com/bsm-apps/cloud/pb" + "bsm/full/module/base/cloud/internal/logic/space" + pb "bsm/full/module/base/cloud/pb" ) type SpaceServer struct { diff --git a/apps/base/cloud/pb/album.pb.go b/module/base/cloud/pb/album.pb.go similarity index 100% rename from apps/base/cloud/pb/album.pb.go rename to module/base/cloud/pb/album.pb.go diff --git a/apps/base/cloud/pb/album.pb.gw.go b/module/base/cloud/pb/album.pb.gw.go similarity index 100% rename from apps/base/cloud/pb/album.pb.gw.go rename to module/base/cloud/pb/album.pb.gw.go diff --git a/apps/base/cloud/pb/album_grpc.pb.go b/module/base/cloud/pb/album_grpc.pb.go similarity index 100% rename from apps/base/cloud/pb/album_grpc.pb.go rename to module/base/cloud/pb/album_grpc.pb.go diff --git a/apps/base/cloud/pb/blocks.pb.go b/module/base/cloud/pb/blocks.pb.go similarity index 100% rename from apps/base/cloud/pb/blocks.pb.go rename to module/base/cloud/pb/blocks.pb.go diff --git a/apps/base/cloud/pb/bookmark.pb.go b/module/base/cloud/pb/bookmark.pb.go similarity index 100% rename from apps/base/cloud/pb/bookmark.pb.go rename to module/base/cloud/pb/bookmark.pb.go diff --git a/apps/base/cloud/pb/bookmark.pb.gw.go b/module/base/cloud/pb/bookmark.pb.gw.go similarity index 100% rename from apps/base/cloud/pb/bookmark.pb.gw.go rename to module/base/cloud/pb/bookmark.pb.gw.go diff --git a/apps/base/cloud/pb/bookmark_grpc.pb.go b/module/base/cloud/pb/bookmark_grpc.pb.go similarity index 100% rename from apps/base/cloud/pb/bookmark_grpc.pb.go rename to module/base/cloud/pb/bookmark_grpc.pb.go diff --git a/apps/base/cloud/pb/disk.pb.go b/module/base/cloud/pb/disk.pb.go similarity index 100% rename from apps/base/cloud/pb/disk.pb.go rename to module/base/cloud/pb/disk.pb.go diff --git a/apps/base/cloud/pb/disk.pb.gw.go b/module/base/cloud/pb/disk.pb.gw.go similarity index 100% rename from apps/base/cloud/pb/disk.pb.gw.go rename to module/base/cloud/pb/disk.pb.gw.go diff --git a/apps/base/cloud/pb/disk_grpc.pb.go b/module/base/cloud/pb/disk_grpc.pb.go similarity index 100% rename from apps/base/cloud/pb/disk_grpc.pb.go rename to module/base/cloud/pb/disk_grpc.pb.go diff --git a/apps/base/cloud/pb/note.pb.go b/module/base/cloud/pb/note.pb.go similarity index 100% rename from apps/base/cloud/pb/note.pb.go rename to module/base/cloud/pb/note.pb.go diff --git a/apps/base/cloud/pb/note.pb.gw.go b/module/base/cloud/pb/note.pb.gw.go similarity index 100% rename from apps/base/cloud/pb/note.pb.gw.go rename to module/base/cloud/pb/note.pb.gw.go diff --git a/apps/base/cloud/pb/note_grpc.pb.go b/module/base/cloud/pb/note_grpc.pb.go similarity index 100% rename from apps/base/cloud/pb/note_grpc.pb.go rename to module/base/cloud/pb/note_grpc.pb.go diff --git a/apps/base/cloud/pb/private.pb.go b/module/base/cloud/pb/private.pb.go similarity index 100% rename from apps/base/cloud/pb/private.pb.go rename to module/base/cloud/pb/private.pb.go diff --git a/apps/base/cloud/pb/private.pb.gw.go b/module/base/cloud/pb/private.pb.gw.go similarity index 100% rename from apps/base/cloud/pb/private.pb.gw.go rename to module/base/cloud/pb/private.pb.gw.go diff --git a/apps/base/cloud/pb/private_grpc.pb.go b/module/base/cloud/pb/private_grpc.pb.go similarity index 100% rename from apps/base/cloud/pb/private_grpc.pb.go rename to module/base/cloud/pb/private_grpc.pb.go diff --git a/apps/base/cloud/pb/share.pb.go b/module/base/cloud/pb/share.pb.go similarity index 100% rename from apps/base/cloud/pb/share.pb.go rename to module/base/cloud/pb/share.pb.go diff --git a/apps/base/cloud/pb/share.pb.gw.go b/module/base/cloud/pb/share.pb.gw.go similarity index 100% rename from apps/base/cloud/pb/share.pb.gw.go rename to module/base/cloud/pb/share.pb.gw.go diff --git a/apps/base/cloud/pb/share_grpc.pb.go b/module/base/cloud/pb/share_grpc.pb.go similarity index 100% rename from apps/base/cloud/pb/share_grpc.pb.go rename to module/base/cloud/pb/share_grpc.pb.go diff --git a/apps/base/cloud/pb/space.pb.go b/module/base/cloud/pb/space.pb.go similarity index 100% rename from apps/base/cloud/pb/space.pb.go rename to module/base/cloud/pb/space.pb.go diff --git a/apps/base/cloud/pb/space.pb.gw.go b/module/base/cloud/pb/space.pb.gw.go similarity index 100% rename from apps/base/cloud/pb/space.pb.gw.go rename to module/base/cloud/pb/space.pb.gw.go diff --git a/apps/base/cloud/pb/space_grpc.pb.go b/module/base/cloud/pb/space_grpc.pb.go similarity index 100% rename from apps/base/cloud/pb/space_grpc.pb.go rename to module/base/cloud/pb/space_grpc.pb.go diff --git a/apps/base/cloud/proto/album.proto b/module/base/cloud/proto/album.proto similarity index 100% rename from apps/base/cloud/proto/album.proto rename to module/base/cloud/proto/album.proto diff --git a/apps/base/cloud/proto/blocks.proto b/module/base/cloud/proto/blocks.proto similarity index 100% rename from apps/base/cloud/proto/blocks.proto rename to module/base/cloud/proto/blocks.proto diff --git a/apps/base/cloud/proto/bookmark.proto b/module/base/cloud/proto/bookmark.proto similarity index 100% rename from apps/base/cloud/proto/bookmark.proto rename to module/base/cloud/proto/bookmark.proto diff --git a/apps/base/cloud/proto/disk.proto b/module/base/cloud/proto/disk.proto similarity index 100% rename from apps/base/cloud/proto/disk.proto rename to module/base/cloud/proto/disk.proto diff --git a/apps/base/cloud/proto/note.proto b/module/base/cloud/proto/note.proto similarity index 100% rename from apps/base/cloud/proto/note.proto rename to module/base/cloud/proto/note.proto diff --git a/apps/base/cloud/proto/private.proto b/module/base/cloud/proto/private.proto similarity index 100% rename from apps/base/cloud/proto/private.proto rename to module/base/cloud/proto/private.proto diff --git a/apps/base/cloud/proto/share.proto b/module/base/cloud/proto/share.proto similarity index 100% rename from apps/base/cloud/proto/share.proto rename to module/base/cloud/proto/share.proto diff --git a/apps/base/cloud/proto/space.proto b/module/base/cloud/proto/space.proto similarity index 100% rename from apps/base/cloud/proto/space.proto rename to module/base/cloud/proto/space.proto diff --git a/apps/base/cloud/scripts/filebeat.yaml b/module/base/cloud/scripts/filebeat.yaml similarity index 100% rename from apps/base/cloud/scripts/filebeat.yaml rename to module/base/cloud/scripts/filebeat.yaml diff --git a/apps/base/cloud/scripts/lint.sh b/module/base/cloud/scripts/lint.sh similarity index 100% rename from apps/base/cloud/scripts/lint.sh rename to module/base/cloud/scripts/lint.sh diff --git a/apps/base/cloud/swagger/cloud.swagger.json b/module/base/cloud/swagger/cloud.swagger.json similarity index 100% rename from apps/base/cloud/swagger/cloud.swagger.json rename to module/base/cloud/swagger/cloud.swagger.json diff --git a/apps/base/cloud/swagger/cloud/disk.md b/module/base/cloud/swagger/cloud/disk.md similarity index 100% rename from apps/base/cloud/swagger/cloud/disk.md rename to module/base/cloud/swagger/cloud/disk.md diff --git a/apps/base/cloud/swagger/disk.md b/module/base/cloud/swagger/disk.md similarity index 100% rename from apps/base/cloud/swagger/disk.md rename to module/base/cloud/swagger/disk.md diff --git a/apps/base/cloud/swagger/initial.swagger.json b/module/base/cloud/swagger/initial.swagger.json similarity index 100% rename from apps/base/cloud/swagger/initial.swagger.json rename to module/base/cloud/swagger/initial.swagger.json diff --git a/apps/base/cms/Makefile b/module/base/cms/Makefile similarity index 100% rename from apps/base/cms/Makefile rename to module/base/cms/Makefile diff --git a/apps/base/cms/README.md b/module/base/cms/README.md similarity index 98% rename from apps/base/cms/README.md rename to module/base/cms/README.md index 84fc2ff..df1da8b 100644 --- a/apps/base/cms/README.md +++ b/module/base/cms/README.md @@ -41,7 +41,7 @@ ```bash # 克隆项目 -git clone git.apinb.com/bsm-apps/cms.git +git clone bsm/full/module/base/cms.git cd cms # 安装依赖 @@ -660,13 +660,13 @@ type(scope): description - **作者**: David Yan (david.yan@qq.com) - **维护者**: BSM 开发团队 -- **项目地址**: [git.apinb.com/bsm-apps/cms](https://git.apinb.com/bsm-apps/cms) +- **项目地址**: [bsm/full/module/base/cms](https://bsm/full/module/base/cms) ## 🔗 相关链接 - [BSM SDK](https://git.apinb.com/bsm-sdk) - [API 文档](https://docs.apinb.com/cms) -- [问题反馈](https://git.apinb.com/bsm-apps/cms/issues) +- [问题反馈](https://bsm/full/module/base/cms/issues) --- diff --git a/apps/base/cms/cmd/cli/main.go b/module/base/cms/cmd/cli/main.go similarity index 100% rename from apps/base/cms/cmd/cli/main.go rename to module/base/cms/cmd/cli/main.go diff --git a/apps/base/cms/cmd/main/main.go b/module/base/cms/cmd/main/main.go similarity index 89% rename from apps/base/cms/cmd/main/main.go rename to module/base/cms/cmd/main/main.go index e61a559..0eb2807 100644 --- a/apps/base/cms/cmd/main/main.go +++ b/module/base/cms/cmd/main/main.go @@ -7,9 +7,9 @@ package service import ( - "git.apinb.com/bsm-apps/cms/internal/config" - "git.apinb.com/bsm-apps/cms/internal/impl" - "git.apinb.com/bsm-apps/cms/internal/server" + "bsm/full/module/base/cms/internal/config" + "bsm/full/module/base/cms/internal/impl" + "bsm/full/module/base/cms/internal/server" "git.apinb.com/bsm-sdk/core/service" ) @@ -49,3 +49,7 @@ func Run() { // 启动服务，开始监听和处理请求 srv.Start() } + +func main() { + Run() +} diff --git a/apps/base/cms/etc/cms_dev.yaml b/module/base/cms/etc/cms_dev.yaml similarity index 100% rename from apps/base/cms/etc/cms_dev.yaml rename to module/base/cms/etc/cms_dev.yaml diff --git a/apps/base/cms/etc/cms_prod.yaml b/module/base/cms/etc/cms_prod.yaml similarity index 100% rename from apps/base/cms/etc/cms_prod.yaml rename to module/base/cms/etc/cms_prod.yaml diff --git a/apps/base/cms/etc/cms_test.yaml b/module/base/cms/etc/cms_test.yaml similarity index 100% rename from apps/base/cms/etc/cms_test.yaml rename to module/base/cms/etc/cms_test.yaml diff --git a/apps/base/cms/etc/supervisor.bsm-apps-cms.conf b/module/base/cms/etc/supervisor.bsm-apps-cms.conf similarity index 100% rename from apps/base/cms/etc/supervisor.bsm-apps-cms.conf rename to module/base/cms/etc/supervisor.bsm-apps-cms.conf diff --git a/apps/base/cms/go.mod b/module/base/cms/go.mod similarity index 61% rename from apps/base/cms/go.mod rename to module/base/cms/go.mod index b3c3f33..6128cd7 100644 --- a/apps/base/cms/go.mod +++ b/module/base/cms/go.mod @@ -1,4 +1,4 @@ -module git.apinb.com/bsm-apps/cms +module bsm/full/module/base/cms go 1.26.5 @@ -12,7 +12,7 @@ tool ( ) require ( - github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 + github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0 github.com/patrickmn/go-cache v2.1.0+incompatible ) @@ -22,19 +22,16 @@ require ( git.apinb.com/bsm-tools/protoc-gen-ts v0.0.2 // indirect github.com/coreos/go-semver v0.3.1 // indirect github.com/coreos/go-systemd/v22 v22.7.0 // indirect - github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect - github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt/v5 v5.3.1 // indirect github.com/golang/protobuf v1.5.4 // indirect - github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect - go.etcd.io/etcd/api/v3 v3.6.12 // indirect + go.etcd.io/etcd/api/v3 v3.7.1 // indirect go.uber.org/atomic v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.28.0 // indirect - go.yaml.in/yaml/v3 v3.0.4 // indirect - golang.org/x/mod v0.36.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa // indirect + go.yaml.in/yaml/v3 v3.0.5 // indirect + golang.org/x/mod v0.37.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea // indirect google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.2 // indirect gorm.io/driver/mysql v1.6.0 // indirect ) @@ -50,18 +47,20 @@ require ( github.com/jackc/puddle/v2 v2.2.2 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect - github.com/oklog/ulid/v2 v2.1.1 // indirect - github.com/redis/go-redis/v9 v9.20.0 // indirect - go.etcd.io/etcd/client/pkg/v3 v3.6.12 // indirect - go.etcd.io/etcd/client/v3 v3.6.12 - golang.org/x/net v0.55.0 // indirect - golang.org/x/sync v0.20.0 // indirect - golang.org/x/sys v0.45.0 // indirect - golang.org/x/text v0.37.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa // indirect - google.golang.org/grpc v1.81.1 + github.com/oklog/ulid/v2 v2.1.2 // indirect + github.com/redis/go-redis/v9 v9.22.0 // indirect + go.etcd.io/etcd/client/pkg/v3 v3.7.1 // indirect + go.etcd.io/etcd/client/v3 v3.7.1 + golang.org/x/net v0.57.0 // indirect + golang.org/x/sync v0.22.0 // indirect + golang.org/x/sys v0.47.0 // indirect + golang.org/x/text v0.40.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea // indirect + google.golang.org/grpc v1.83.0 google.golang.org/protobuf v1.36.11 gopkg.in/yaml.v3 v3.0.1 // indirect - gorm.io/driver/postgres v1.6.0 // indirect - gorm.io/gorm v1.31.1 + gorm.io/driver/postgres v1.6.2 // indirect + gorm.io/gorm v1.31.2 ) + +replace git.apinb.com/bsm-sdk/core => D:/work/bsm-sdk/core diff --git a/apps/ec/mall/go.sum b/module/base/cms/go.sum similarity index 52% rename from apps/ec/mall/go.sum rename to module/base/cms/go.sum index b5e19f9..c790b74 100644 --- a/apps/ec/mall/go.sum +++ b/module/base/cms/go.sum @@ -1,7 +1,5 @@ filippo.io/edwards25519 v1.2.0 h1:crnVqOiS4jqYleHd9vaKZ+HKtHfllngJIiOpNpoJsjo= filippo.io/edwards25519 v1.2.0/go.mod h1:xzAOLCNug/yB62zG1bQ8uziwrIqIuxhctzJT18Q77mc= -git.apinb.com/bsm-sdk/core v0.2.0 h1:/e9yqpsbKBrRgMiGpS3KX2O4qDLxo5V5GpPSLNGxEKw= -git.apinb.com/bsm-sdk/core v0.2.0/go.mod h1:E9T6Eboo/0Zb36BjkKbIgvFzq4fQ2Q8P/7y5zmYTI6Y= git.apinb.com/bsm-tools/protoc-gen-slc v0.0.13 h1:RGg2R2kHz6IAD7scH6So2FlZYctFUDxqWR8i/+fMfOU= git.apinb.com/bsm-tools/protoc-gen-slc v0.0.13/go.mod h1:NpJaupVAxmyBleRMAug4mGS6BQV2E32rtuiqQzj1b+A= git.apinb.com/bsm-tools/protoc-gen-ts v0.0.2 h1:T9C1kY6iIHl5cZ7xyNgV2xlPNWxXmaWfTbD8AzpBB9M= @@ -19,14 +17,12 @@ github.com/coreos/go-systemd/v22 v22.7.0/go.mod h1:xNUYtjHu2EDXbsxz1i41wouACIwT7 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= -github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.4 h1:tG4xh9yMsRCAiodLVTxyrkzSZ9+o0L1Kg/+cPVcbP/8= +github.com/go-logr/logr v1.4.4/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-sql-driver/mysql v1.10.0 h1:Q+1LV8DkHJvSYAdR83XzuhDaTykuDx0l6fkXxoWCWfw= github.com/go-sql-driver/mysql v1.10.0/go.mod h1:M+cqaI7+xxXGG9swrdeUIoPG3Y3KCkF0pZej+SK+nWk= -github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= -github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt/v5 v5.3.1 h1:kYf81DTWFe7t+1VvL7eS+jKFVWaUnK9cB1qbwn63YCY= github.com/golang-jwt/jwt/v5 v5.3.1/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= @@ -35,8 +31,8 @@ github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= 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/grpc-ecosystem/grpc-gateway/v2 v2.29.0 h1:5VipnvEpbqr2gA2VbM+nYVbkIF28c5ZQfqCBQ5g2xfk= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0/go.mod h1:Hyl3n6Twe1hvtd9XUXDec4pTvgMSEixRuQKPTMH2bNs= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0 h1:/Tnpcb2E0Pz/tN9s3bfEY2Q8ePCEX9iuS+cneUwncnw= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0/go.mod h1:zOBXOsUaBSjKgmH4OGzV1esUpR3oUSCPYVd2cUBjKYY= 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= @@ -49,24 +45,24 @@ github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= -github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= -github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y= -github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0= +github.com/klauspost/cpuid/v2 v2.4.0 h1:S6Hrbc7+ywsr0r+RLapfGBHfyefhCTwEh3A0tV913Dw= +github.com/klauspost/cpuid/v2 v2.4.0/go.mod h1:19jmZ9mjzoF//ddRSUsv0zfBTJWh3QJh9FNxZTMrGxU= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/oklog/ulid/v2 v2.1.1 h1:suPZ4ARWLOJLegGFiZZ1dFAkqzhMjL3J1TzI+5wHz8s= -github.com/oklog/ulid/v2 v2.1.1/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ= +github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= +github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= +github.com/oklog/ulid/v2 v2.1.2 h1:IEclFb9JNvzYA6MW2SCxbLzcHTVsfqm3PrqGQJH5zec= +github.com/oklog/ulid/v2 v2.1.2/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ= github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= github.com/pborman/getopt v0.0.0-20170112200414-7148bc3a4c30/go.mod h1:85jBQOZwpVEaDAr341tbn15RS4fCAsIst0qp7i8ex1o= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/redis/go-redis/v9 v9.20.0 h1:WnQYxLkgO2xiXTCJY0ldIiI8dNqCDlQAG+AtaH7a2a0= -github.com/redis/go-redis/v9 v9.20.0/go.mod h1:v/M13XI1PVCDcm01VtPFOADfZtHf8YW3baQf57KlIkA= +github.com/redis/go-redis/v9 v9.22.0 h1:laDvpYXTJtZLloinw1fA5Kqd6HAEH2XKxOkG/PDq2F0= +github.com/redis/go-redis/v9 v9.22.0/go.mod h1:y2g0Wj8rQvuK0ELM+oxSudcLtC09JScs98I/X9gRWY4= github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0= @@ -76,28 +72,26 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= -github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/zeebo/xxh3 v1.1.0 h1:s7DLGDK45Dyfg7++yxI0khrfwq9661w9EN78eP/UZVs= github.com/zeebo/xxh3 v1.1.0/go.mod h1:IisAie1LELR4xhVinxWS5+zf1lA4p0MW4T+w+W07F5s= -go.etcd.io/etcd/api/v3 v3.6.12 h1:OLOZUKEuAA36TR48F0cIaa8FdzrWygjyfrJxXg4iDgs= -go.etcd.io/etcd/api/v3 v3.6.12/go.mod h1:p14EIQXHbuOQbVvL/WEes5uqKnxP9AgKJgpjbMVvzvE= -go.etcd.io/etcd/client/pkg/v3 v3.6.12 h1:36zzB+pQOdHbhN+kH2iJz/K8bJn0ZLtLfPPO7jozTDo= -go.etcd.io/etcd/client/pkg/v3 v3.6.12/go.mod h1:hh2+ZXtfLzs3o6mn92ntgNPBrTJJOvXqICM5g3L3DMY= -go.etcd.io/etcd/client/v3 v3.6.12 h1:kMSP6JcPZMqSJiX+TXdUIBU/4eXEZWBAaui4VihMbIc= -go.etcd.io/etcd/client/v3 v3.6.12/go.mod h1:CMs6fJWYiZQk4ytFjd4lE1diOvvRMmtbbn/alZXd3dQ= +go.etcd.io/etcd/api/v3 v3.7.1 h1:KJG0/DcWGfe3Y1otDf/fsBf0TSSgpxZ5RO/L8SFt73E= +go.etcd.io/etcd/api/v3 v3.7.1/go.mod h1:8bXIpCMeV7E3/XL0Ix123ATn3dB+0V7d9zklHbB0m78= +go.etcd.io/etcd/client/pkg/v3 v3.7.1 h1:rKYsj3pRkR0eK3yjT3XOgrhqfmIfj9pzNgxjh7mfFv4= +go.etcd.io/etcd/client/pkg/v3 v3.7.1/go.mod h1:cnzZGIUzSfjEwLC6UBVsSXlEK1eepS/JUD7wE6PLRT0= +go.etcd.io/etcd/client/v3 v3.7.1 h1:0PEMMC0KuZmVIN+RAbdqfkZ45pYTgKVtmBEbRCvZFUg= +go.etcd.io/etcd/client/v3 v3.7.1/go.mod h1:ffNqALa8tRCYhYo1F9oR489y23K39Gz+BSR3ApAGYq0= go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64= go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y= -go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I= -go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0= -go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM= -go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY= -go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg= -go.opentelemetry.io/otel/sdk v1.43.0/go.mod h1:P+IkVU3iWukmiit/Yf9AWvpyRDlUeBaRg6Y+C58QHzg= -go.opentelemetry.io/otel/sdk/metric v1.43.0 h1:S88dyqXjJkuBNLeMcVPRFXpRw2fuwdvfCGLEo89fDkw= -go.opentelemetry.io/otel/sdk/metric v1.43.0/go.mod h1:C/RJtwSEJ5hzTiUz5pXF1kILHStzb9zFlIEe85bhj6A= -go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A= -go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0= +go.opentelemetry.io/otel v1.45.0 h1:pdrWmLHofpubmArBv1LgFSv1Z0Ie/ppdZzu+kUN5EeU= +go.opentelemetry.io/otel v1.45.0/go.mod h1:XZxIqPapzEYnhNSScF5DIqXhm/rYi0FzCe2XddAwZfQ= +go.opentelemetry.io/otel/metric v1.45.0 h1:7Eg1uH7CJ5cXv9is6tnBe1FI6rj1nwUdbFypRm3br/M= +go.opentelemetry.io/otel/metric v1.45.0/go.mod h1:HAPbm1nd3p1PmFH7v2dR+6BjXxw+Lq4a2+pndMAm08s= +go.opentelemetry.io/otel/sdk v1.45.0 h1:4VVSMgQ83dUgW2aoX5f6JgLvHwIvzcuLnF9lUdCSpCw= +go.opentelemetry.io/otel/sdk v1.45.0/go.mod h1:Sr40LgXV7DsKMMJMKOhUWOgMWTfAaqvm2kF0g7ilwuA= +go.opentelemetry.io/otel/sdk/metric v1.44.0 h1:3LlKgI+VjbVsjNRFZJZAJ30WjXC5VkNRks6si09iEfI= +go.opentelemetry.io/otel/sdk/metric v1.44.0/go.mod h1:5B5pMARnXxKhltooO4xUuCBorl65a4EpnTalObqOigA= +go.opentelemetry.io/otel/trace v1.45.0 h1:l/mP6Uv7oNO7/TblbhpbgMidxhq1uO/rPsikOyVhxag= +go.opentelemetry.io/otel/trace v1.45.0/go.mod h1:qoJJA2xNMnxRrdISU/kLtfUH2wNeQbiv+jhs/CxI8bc= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= @@ -106,51 +100,26 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.28.0 h1:IZzaP1Fv73/T/pBMLk4VutPl36uNC+OSUh3JLG3FIjo= go.uber.org/zap v1.28.0/go.mod h1:rDLpOi171uODNm/mxFcuYWxDsqWSAVkFdX4XojSKg/Q= -go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= -go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.36.0 h1:JJjpVx6myfUsUdAzZuOSTTmRE0PfZeNWzzvKrP7amb4= -golang.org/x/mod v0.36.0/go.mod h1:moc6ELqsWcOw5Ef3xVprK5ul/MvtVvkIXLziUOICjUQ= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8= -golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -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.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4= -golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY= -golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc= -golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -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= +go.yaml.in/yaml/v3 v3.0.5 h1:N6y/pJk8buWs9NY5ERU2HSMfm+IuD/OtfdAnq6kESPw= +go.yaml.in/yaml/v3 v3.0.5/go.mod h1:HVTZu1O7/Vkt2N+BFy8Zza+lnLsABggaTM2ZpNIGuKg= +golang.org/x/mod v0.37.0 h1:vF1DjpVEshcIqoEaauuHebaLk1O1forxjxBaVn884JQ= +golang.org/x/mod v0.37.0/go.mod h1:m8S8VeM9r4dzDwjrKO0a1sZP3YjeMamRRlD+fmR2Q/0= +golang.org/x/net v0.57.0 h1:K5+3DljvIuDG9/Jv9rvyMywYNFCQ9RSUY6OOTTkT+tE= +golang.org/x/net v0.57.0/go.mod h1:KpXc8iv+r3XplLAG/f7Jsf9RPszJzdR0f58q9vGOuEU= +golang.org/x/sync v0.22.0 h1:SZjpbeLmrCk4xhRSZFNZW5gFUeCeFgjekvI/+gfScek= +golang.org/x/sync v0.22.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= +golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs= +golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +golang.org/x/text v0.40.0 h1:Ub2Z6/xjgF1WrYQz2nuITOEegKFtiIy+rieRJ5lHZKs= +golang.org/x/text v0.40.0/go.mod h1:hpnzDAfGV753zIKo+wk3u1bVKCGPbrnF7+7LBF/UHVY= gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4= gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E= -google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa h1:Kjn0N0tCrDgiAFW+lGO4JZ3ck44CehvJQMAwj9QF0G8= -google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:q4lMZS6kskjT5HvCPrnnypcDPVJqT/f4nfxmkE7gryY= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa h1:mZHHdPZl0dbGHCflZgAq/Q468DWVFcU2whhB2KAo8fk= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= -google.golang.org/grpc v1.81.1 h1:VnnIIZ88UzOOKLukQi+ImGz8O1Wdp8nAGGnvOfEIWQQ= -google.golang.org/grpc v1.81.1/go.mod h1:xGH9GfzOyMTGIOXBJmXt+BX/V0kcdQbdcuwQ/zNw42I= +google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea h1:Jifw/kjs/r3B0uszvls/m3c3tmZs2YHGM9C+rvxP9gY= +google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea/go.mod h1:K/+WGbmBY7aNW1HDw1fJnKYo10i0DkAX6pows00dLig= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea h1:kVhQEPTpKQahD5+JSBTfBB19wcgQTTjAIn45MBqnyHk= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= +google.golang.org/grpc v1.83.0 h1:JeNZEKJFbQxArAMl+hiytHauacDNqJUllNfmIMmpqnQ= +google.golang.org/grpc v1.83.0/go.mod h1:kDyl6SKsiHKt0uylY5gtn5cEjkrIOhQOGDgIc4JGwzQ= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.2 h1:rgSNvqscFZ1JgV/4wH5GOsZFSFkR2Eua9As3KIr2LlM= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.2/go.mod h1:iMEtFwDlAhjDU9L5mY6U1XLwlIId/G3h+QcBHDIvrJ8= google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE= @@ -163,9 +132,11 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gorm.io/driver/mysql v1.6.0 h1:eNbLmNTpPpTOVZi8MMxCi2aaIm0ZpInbORNXDwyLGvg= gorm.io/driver/mysql v1.6.0/go.mod h1:D/oCC2GWK3M/dqoLxnOlaNKmXz8WNTfcS9y5ovaSqKo= -gorm.io/driver/postgres v1.6.0 h1:2dxzU8xJ+ivvqTRph34QX+WrRaJlmfyPqXmoGVjMBa4= -gorm.io/driver/postgres v1.6.0/go.mod h1:vUw0mrGgrTK+uPHEhAdV4sfFELrByKVGnaVRkXDhtWo= -gorm.io/gorm v1.31.1 h1:7CA8FTFz/gRfgqgpeKIBcervUn3xSyPUmr6B2WXJ7kg= -gorm.io/gorm v1.31.1/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs= +gorm.io/driver/postgres v1.6.2 h1:BvXQ/cNUg63q5TFNg672DmDcowZSFrNLkkA3Xe6GXq4= +gorm.io/driver/postgres v1.6.2/go.mod h1:0c4fQA44XhOklXDkgtuKqysHCycTa5i9e3EIpDGCwXk= +gorm.io/driver/sqlite v1.6.0 h1:WHRRrIiulaPiPFmDcod6prc4l2VGVWHz80KspNsxSfQ= +gorm.io/driver/sqlite v1.6.0/go.mod h1:AO9V1qIQddBESngQUKWL9yoH93HIeA1X6V633rBwyT8= +gorm.io/gorm v1.31.2 h1:3o8FXNo9v9S858gil+3LlZA1LkCOzgb4g5BL64FgaCo= +gorm.io/gorm v1.31.2/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs= gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU= gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU= diff --git a/apps/base/cms/internal/config/config.go b/module/base/cms/internal/config/config.go similarity index 100% rename from apps/base/cms/internal/config/config.go rename to module/base/cms/internal/config/config.go diff --git a/apps/base/cms/internal/impl/impl.go b/module/base/cms/internal/impl/impl.go similarity index 96% rename from apps/base/cms/internal/impl/impl.go rename to module/base/cms/internal/impl/impl.go index 73b2608..dc66692 100644 --- a/apps/base/cms/internal/impl/impl.go +++ b/module/base/cms/internal/impl/impl.go @@ -3,7 +3,7 @@ package impl import ( - "git.apinb.com/bsm-apps/cms/internal/config" + "bsm/full/module/base/cms/internal/config" "git.apinb.com/bsm-sdk/core/cache/redis" "git.apinb.com/bsm-sdk/core/with" cache "github.com/patrickmn/go-cache" diff --git a/apps/base/cms/internal/logic/category/create.go b/module/base/cms/internal/logic/category/create.go similarity index 93% rename from apps/base/cms/internal/logic/category/create.go rename to module/base/cms/internal/logic/category/create.go index d67eb44..ca14ad7 100644 --- a/apps/base/cms/internal/logic/category/create.go +++ b/module/base/cms/internal/logic/category/create.go @@ -6,9 +6,9 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/cms/internal/impl" - "git.apinb.com/bsm-apps/cms/internal/models" - pb "git.apinb.com/bsm-apps/cms/pb" + "bsm/full/module/base/cms/internal/impl" + "bsm/full/module/base/cms/internal/models" + pb "bsm/full/module/base/cms/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/base/cms/internal/logic/category/delete.go b/module/base/cms/internal/logic/category/delete.go similarity index 89% rename from apps/base/cms/internal/logic/category/delete.go rename to module/base/cms/internal/logic/category/delete.go index b47b033..732dfaa 100644 --- a/apps/base/cms/internal/logic/category/delete.go +++ b/module/base/cms/internal/logic/category/delete.go @@ -4,8 +4,8 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/cms/internal/models" - pb "git.apinb.com/bsm-apps/cms/pb" + "bsm/full/module/base/cms/internal/models" + pb "bsm/full/module/base/cms/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/base/cms/internal/logic/category/fetch.go b/module/base/cms/internal/logic/category/fetch.go similarity index 91% rename from apps/base/cms/internal/logic/category/fetch.go rename to module/base/cms/internal/logic/category/fetch.go index 72e88f6..cc2532c 100644 --- a/apps/base/cms/internal/logic/category/fetch.go +++ b/module/base/cms/internal/logic/category/fetch.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "git.apinb.com/bsm-apps/cms/internal/impl" - "git.apinb.com/bsm-apps/cms/internal/models" - pb "git.apinb.com/bsm-apps/cms/pb" + "bsm/full/module/base/cms/internal/impl" + "bsm/full/module/base/cms/internal/models" + pb "bsm/full/module/base/cms/pb" "git.apinb.com/bsm-sdk/core/errcode" ) diff --git a/apps/base/cms/internal/logic/category/modify.go b/module/base/cms/internal/logic/category/modify.go similarity index 89% rename from apps/base/cms/internal/logic/category/modify.go rename to module/base/cms/internal/logic/category/modify.go index 1c890cb..18d52b9 100644 --- a/apps/base/cms/internal/logic/category/modify.go +++ b/module/base/cms/internal/logic/category/modify.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/cms/internal/impl" - "git.apinb.com/bsm-apps/cms/internal/models" - pb "git.apinb.com/bsm-apps/cms/pb" + "bsm/full/module/base/cms/internal/impl" + "bsm/full/module/base/cms/internal/models" + pb "bsm/full/module/base/cms/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/types" diff --git a/apps/base/cms/internal/logic/pages/create.go b/module/base/cms/internal/logic/pages/create.go similarity index 95% rename from apps/base/cms/internal/logic/pages/create.go rename to module/base/cms/internal/logic/pages/create.go index e1d6e04..3e22fcf 100644 --- a/apps/base/cms/internal/logic/pages/create.go +++ b/module/base/cms/internal/logic/pages/create.go @@ -6,10 +6,10 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/cms/internal/impl" - "git.apinb.com/bsm-apps/cms/internal/models" - "git.apinb.com/bsm-apps/cms/internal/utils" - pb "git.apinb.com/bsm-apps/cms/pb" + "bsm/full/module/base/cms/internal/impl" + "bsm/full/module/base/cms/internal/models" + "bsm/full/module/base/cms/internal/utils" + pb "bsm/full/module/base/cms/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/types" diff --git a/apps/base/cms/internal/logic/pages/delete.go b/module/base/cms/internal/logic/pages/delete.go similarity index 89% rename from apps/base/cms/internal/logic/pages/delete.go rename to module/base/cms/internal/logic/pages/delete.go index eba9121..75c0d02 100644 --- a/apps/base/cms/internal/logic/pages/delete.go +++ b/module/base/cms/internal/logic/pages/delete.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/cms/internal/impl" - "git.apinb.com/bsm-apps/cms/internal/models" - pb "git.apinb.com/bsm-apps/cms/pb" + "bsm/full/module/base/cms/internal/impl" + "bsm/full/module/base/cms/internal/models" + pb "bsm/full/module/base/cms/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/vars" diff --git a/apps/base/cms/internal/logic/pages/ext.go b/module/base/cms/internal/logic/pages/ext.go similarity index 100% rename from apps/base/cms/internal/logic/pages/ext.go rename to module/base/cms/internal/logic/pages/ext.go diff --git a/apps/base/cms/internal/logic/pages/fetch.go b/module/base/cms/internal/logic/pages/fetch.go similarity index 95% rename from apps/base/cms/internal/logic/pages/fetch.go rename to module/base/cms/internal/logic/pages/fetch.go index 8c66c85..7477838 100644 --- a/apps/base/cms/internal/logic/pages/fetch.go +++ b/module/base/cms/internal/logic/pages/fetch.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/cms/internal/impl" - "git.apinb.com/bsm-apps/cms/internal/models" - pb "git.apinb.com/bsm-apps/cms/pb" + "bsm/full/module/base/cms/internal/impl" + "bsm/full/module/base/cms/internal/models" + pb "bsm/full/module/base/cms/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" ) diff --git a/apps/base/cms/internal/logic/pages/get_by_identity.go b/module/base/cms/internal/logic/pages/get_by_identity.go similarity index 94% rename from apps/base/cms/internal/logic/pages/get_by_identity.go rename to module/base/cms/internal/logic/pages/get_by_identity.go index adfc82b..1ebad8e 100644 --- a/apps/base/cms/internal/logic/pages/get_by_identity.go +++ b/module/base/cms/internal/logic/pages/get_by_identity.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/cms/internal/impl" - "git.apinb.com/bsm-apps/cms/internal/models" - pb "git.apinb.com/bsm-apps/cms/pb" + "bsm/full/module/base/cms/internal/impl" + "bsm/full/module/base/cms/internal/models" + pb "bsm/full/module/base/cms/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "gorm.io/gorm" diff --git a/apps/base/cms/internal/logic/pages/get_by_key.go b/module/base/cms/internal/logic/pages/get_by_key.go similarity index 97% rename from apps/base/cms/internal/logic/pages/get_by_key.go rename to module/base/cms/internal/logic/pages/get_by_key.go index 9783f80..c065402 100644 --- a/apps/base/cms/internal/logic/pages/get_by_key.go +++ b/module/base/cms/internal/logic/pages/get_by_key.go @@ -4,7 +4,7 @@ import ( "context" "time" - pb "git.apinb.com/bsm-apps/cms/pb" + pb "bsm/full/module/base/cms/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" ) diff --git a/apps/base/cms/internal/logic/pages/modify.go b/module/base/cms/internal/logic/pages/modify.go similarity index 95% rename from apps/base/cms/internal/logic/pages/modify.go rename to module/base/cms/internal/logic/pages/modify.go index d01a572..4b9ad35 100644 --- a/apps/base/cms/internal/logic/pages/modify.go +++ b/module/base/cms/internal/logic/pages/modify.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/cms/internal/impl" - "git.apinb.com/bsm-apps/cms/internal/models" - pb "git.apinb.com/bsm-apps/cms/pb" + "bsm/full/module/base/cms/internal/impl" + "bsm/full/module/base/cms/internal/models" + pb "bsm/full/module/base/cms/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/types" diff --git a/apps/base/cms/internal/logic/post/add_comment.go b/module/base/cms/internal/logic/post/add_comment.go similarity index 90% rename from apps/base/cms/internal/logic/post/add_comment.go rename to module/base/cms/internal/logic/post/add_comment.go index e5fa0e2..cb9adb9 100644 --- a/apps/base/cms/internal/logic/post/add_comment.go +++ b/module/base/cms/internal/logic/post/add_comment.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/cms/internal/impl" - "git.apinb.com/bsm-apps/cms/internal/models" - pb "git.apinb.com/bsm-apps/cms/pb" + "bsm/full/module/base/cms/internal/impl" + "bsm/full/module/base/cms/internal/models" + pb "bsm/full/module/base/cms/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/base/cms/internal/logic/post/comment_list.go b/module/base/cms/internal/logic/post/comment_list.go similarity index 94% rename from apps/base/cms/internal/logic/post/comment_list.go rename to module/base/cms/internal/logic/post/comment_list.go index 62baa76..aaaa5ea 100644 --- a/apps/base/cms/internal/logic/post/comment_list.go +++ b/module/base/cms/internal/logic/post/comment_list.go @@ -5,9 +5,9 @@ import ( "fmt" "time" - "git.apinb.com/bsm-apps/cms/internal/impl" - "git.apinb.com/bsm-apps/cms/internal/models" - pb "git.apinb.com/bsm-apps/cms/pb" + "bsm/full/module/base/cms/internal/impl" + "bsm/full/module/base/cms/internal/models" + pb "bsm/full/module/base/cms/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" ) diff --git a/apps/base/cms/internal/logic/post/create.go b/module/base/cms/internal/logic/post/create.go similarity index 94% rename from apps/base/cms/internal/logic/post/create.go rename to module/base/cms/internal/logic/post/create.go index bc2d336..3e70ee6 100644 --- a/apps/base/cms/internal/logic/post/create.go +++ b/module/base/cms/internal/logic/post/create.go @@ -6,9 +6,9 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/cms/internal/models" - "git.apinb.com/bsm-apps/cms/internal/utils" - pb "git.apinb.com/bsm-apps/cms/pb" + "bsm/full/module/base/cms/internal/models" + "bsm/full/module/base/cms/internal/utils" + pb "bsm/full/module/base/cms/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/service" sdkUtils "git.apinb.com/bsm-sdk/core/utils" diff --git a/apps/base/cms/internal/logic/post/delete.go b/module/base/cms/internal/logic/post/delete.go similarity index 89% rename from apps/base/cms/internal/logic/post/delete.go rename to module/base/cms/internal/logic/post/delete.go index dbbcdae..b5b3284 100644 --- a/apps/base/cms/internal/logic/post/delete.go +++ b/module/base/cms/internal/logic/post/delete.go @@ -4,8 +4,8 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/cms/internal/models" - pb "git.apinb.com/bsm-apps/cms/pb" + "bsm/full/module/base/cms/internal/models" + pb "bsm/full/module/base/cms/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/base/cms/internal/logic/post/delete_comment.go b/module/base/cms/internal/logic/post/delete_comment.go similarity index 86% rename from apps/base/cms/internal/logic/post/delete_comment.go rename to module/base/cms/internal/logic/post/delete_comment.go index 2b0171b..3dbeadb 100644 --- a/apps/base/cms/internal/logic/post/delete_comment.go +++ b/module/base/cms/internal/logic/post/delete_comment.go @@ -7,8 +7,8 @@ import ( "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/service" - "git.apinb.com/bsm-apps/cms/internal/models" - pb "git.apinb.com/bsm-apps/cms/pb" + "bsm/full/module/base/cms/internal/models" + pb "bsm/full/module/base/cms/pb" ) // DeleteComment 删除评论 diff --git a/apps/base/cms/internal/logic/post/desc_comment_like.go b/module/base/cms/internal/logic/post/desc_comment_like.go similarity index 88% rename from apps/base/cms/internal/logic/post/desc_comment_like.go rename to module/base/cms/internal/logic/post/desc_comment_like.go index 43454ce..865fdfd 100644 --- a/apps/base/cms/internal/logic/post/desc_comment_like.go +++ b/module/base/cms/internal/logic/post/desc_comment_like.go @@ -6,8 +6,8 @@ import ( "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/service" - "git.apinb.com/bsm-apps/cms/internal/models" - pb "git.apinb.com/bsm-apps/cms/pb" + "bsm/full/module/base/cms/internal/models" + pb "bsm/full/module/base/cms/pb" ) // DescCommentLike 减少评论点赞数 diff --git a/apps/base/cms/internal/logic/post/desc_comment_unlike.go b/module/base/cms/internal/logic/post/desc_comment_unlike.go similarity index 88% rename from apps/base/cms/internal/logic/post/desc_comment_unlike.go rename to module/base/cms/internal/logic/post/desc_comment_unlike.go index bfc4db8..f3d0446 100644 --- a/apps/base/cms/internal/logic/post/desc_comment_unlike.go +++ b/module/base/cms/internal/logic/post/desc_comment_unlike.go @@ -6,8 +6,8 @@ import ( "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/service" - "git.apinb.com/bsm-apps/cms/internal/models" - pb "git.apinb.com/bsm-apps/cms/pb" + "bsm/full/module/base/cms/internal/models" + pb "bsm/full/module/base/cms/pb" ) // DescCommentUnlike 减少评论踩 diff --git a/apps/base/cms/internal/logic/post/desc_post_like.go b/module/base/cms/internal/logic/post/desc_post_like.go similarity index 89% rename from apps/base/cms/internal/logic/post/desc_post_like.go rename to module/base/cms/internal/logic/post/desc_post_like.go index f0c132a..a354dd1 100644 --- a/apps/base/cms/internal/logic/post/desc_post_like.go +++ b/module/base/cms/internal/logic/post/desc_post_like.go @@ -3,8 +3,8 @@ package post import ( "context" - "git.apinb.com/bsm-apps/cms/internal/models" - pb "git.apinb.com/bsm-apps/cms/pb" + "bsm/full/module/base/cms/internal/models" + pb "bsm/full/module/base/cms/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/base/cms/internal/logic/post/desc_post_unlike.go b/module/base/cms/internal/logic/post/desc_post_unlike.go similarity index 89% rename from apps/base/cms/internal/logic/post/desc_post_unlike.go rename to module/base/cms/internal/logic/post/desc_post_unlike.go index f897832..d93c9c6 100644 --- a/apps/base/cms/internal/logic/post/desc_post_unlike.go +++ b/module/base/cms/internal/logic/post/desc_post_unlike.go @@ -3,8 +3,8 @@ package post import ( "context" - "git.apinb.com/bsm-apps/cms/internal/models" - pb "git.apinb.com/bsm-apps/cms/pb" + "bsm/full/module/base/cms/internal/models" + pb "bsm/full/module/base/cms/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/base/cms/internal/logic/post/ext.go b/module/base/cms/internal/logic/post/ext.go similarity index 100% rename from apps/base/cms/internal/logic/post/ext.go rename to module/base/cms/internal/logic/post/ext.go diff --git a/apps/base/cms/internal/logic/post/fetch.go b/module/base/cms/internal/logic/post/fetch.go similarity index 97% rename from apps/base/cms/internal/logic/post/fetch.go rename to module/base/cms/internal/logic/post/fetch.go index 67ed93f..733788e 100644 --- a/apps/base/cms/internal/logic/post/fetch.go +++ b/module/base/cms/internal/logic/post/fetch.go @@ -4,8 +4,8 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/cms/internal/models" - pb "git.apinb.com/bsm-apps/cms/pb" + "bsm/full/module/base/cms/internal/models" + pb "bsm/full/module/base/cms/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" ) diff --git a/apps/base/cms/internal/logic/post/get_by_identity.go b/module/base/cms/internal/logic/post/get_by_identity.go similarity index 96% rename from apps/base/cms/internal/logic/post/get_by_identity.go rename to module/base/cms/internal/logic/post/get_by_identity.go index 5e9c2c4..d5a2c15 100644 --- a/apps/base/cms/internal/logic/post/get_by_identity.go +++ b/module/base/cms/internal/logic/post/get_by_identity.go @@ -4,8 +4,8 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/cms/internal/models" - pb "git.apinb.com/bsm-apps/cms/pb" + "bsm/full/module/base/cms/internal/models" + pb "bsm/full/module/base/cms/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" ) diff --git a/apps/base/cms/internal/logic/post/get_by_key.go b/module/base/cms/internal/logic/post/get_by_key.go similarity index 90% rename from apps/base/cms/internal/logic/post/get_by_key.go rename to module/base/cms/internal/logic/post/get_by_key.go index ebb81b1..bce4483 100644 --- a/apps/base/cms/internal/logic/post/get_by_key.go +++ b/module/base/cms/internal/logic/post/get_by_key.go @@ -3,9 +3,9 @@ package post import ( "context" - "git.apinb.com/bsm-apps/cms/internal/models" - "git.apinb.com/bsm-apps/cms/internal/utils" - pb "git.apinb.com/bsm-apps/cms/pb" + "bsm/full/module/base/cms/internal/models" + "bsm/full/module/base/cms/internal/utils" + pb "bsm/full/module/base/cms/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" ) diff --git a/apps/base/cms/internal/logic/post/incr_comment_like.go b/module/base/cms/internal/logic/post/incr_comment_like.go similarity index 87% rename from apps/base/cms/internal/logic/post/incr_comment_like.go rename to module/base/cms/internal/logic/post/incr_comment_like.go index e6c00d5..9d7e368 100644 --- a/apps/base/cms/internal/logic/post/incr_comment_like.go +++ b/module/base/cms/internal/logic/post/incr_comment_like.go @@ -3,13 +3,13 @@ package post import ( "context" - "git.apinb.com/bsm-apps/cms/internal/impl" - "git.apinb.com/bsm-apps/cms/internal/models" + "bsm/full/module/base/cms/internal/impl" + "bsm/full/module/base/cms/internal/models" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/utils" - pb "git.apinb.com/bsm-apps/cms/pb" + pb "bsm/full/module/base/cms/pb" ) // IncrCommentLike 评论点赞处理 diff --git a/apps/base/cms/internal/logic/post/incr_comment_unlike.go b/module/base/cms/internal/logic/post/incr_comment_unlike.go similarity index 86% rename from apps/base/cms/internal/logic/post/incr_comment_unlike.go rename to module/base/cms/internal/logic/post/incr_comment_unlike.go index adcd27e..46dd3c1 100644 --- a/apps/base/cms/internal/logic/post/incr_comment_unlike.go +++ b/module/base/cms/internal/logic/post/incr_comment_unlike.go @@ -3,13 +3,13 @@ package post import ( "context" - "git.apinb.com/bsm-apps/cms/internal/impl" - "git.apinb.com/bsm-apps/cms/internal/models" + "bsm/full/module/base/cms/internal/impl" + "bsm/full/module/base/cms/internal/models" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/utils" - pb "git.apinb.com/bsm-apps/cms/pb" + pb "bsm/full/module/base/cms/pb" ) // 评论点踩处理 diff --git a/apps/base/cms/internal/logic/post/incr_post_like.go b/module/base/cms/internal/logic/post/incr_post_like.go similarity index 93% rename from apps/base/cms/internal/logic/post/incr_post_like.go rename to module/base/cms/internal/logic/post/incr_post_like.go index 576b44d..42d894e 100644 --- a/apps/base/cms/internal/logic/post/incr_post_like.go +++ b/module/base/cms/internal/logic/post/incr_post_like.go @@ -6,8 +6,8 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/cms/internal/models" - pb "git.apinb.com/bsm-apps/cms/pb" + "bsm/full/module/base/cms/internal/models" + pb "bsm/full/module/base/cms/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/base/cms/internal/logic/post/incr_post_unlike.go b/module/base/cms/internal/logic/post/incr_post_unlike.go similarity index 88% rename from apps/base/cms/internal/logic/post/incr_post_unlike.go rename to module/base/cms/internal/logic/post/incr_post_unlike.go index 577a436..a23611f 100644 --- a/apps/base/cms/internal/logic/post/incr_post_unlike.go +++ b/module/base/cms/internal/logic/post/incr_post_unlike.go @@ -3,8 +3,8 @@ package post import ( "context" - "git.apinb.com/bsm-apps/cms/internal/models" - pb "git.apinb.com/bsm-apps/cms/pb" + "bsm/full/module/base/cms/internal/models" + pb "bsm/full/module/base/cms/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/base/cms/internal/logic/post/modify.go b/module/base/cms/internal/logic/post/modify.go similarity index 90% rename from apps/base/cms/internal/logic/post/modify.go rename to module/base/cms/internal/logic/post/modify.go index ad2a29b..b334722 100644 --- a/apps/base/cms/internal/logic/post/modify.go +++ b/module/base/cms/internal/logic/post/modify.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/cms/internal/models" - "git.apinb.com/bsm-apps/cms/internal/utils" - pb "git.apinb.com/bsm-apps/cms/pb" + "bsm/full/module/base/cms/internal/models" + "bsm/full/module/base/cms/internal/utils" + pb "bsm/full/module/base/cms/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/base/cms/internal/logic/post/modify_comment.go b/module/base/cms/internal/logic/post/modify_comment.go similarity index 86% rename from apps/base/cms/internal/logic/post/modify_comment.go rename to module/base/cms/internal/logic/post/modify_comment.go index b164b09..720d6b5 100644 --- a/apps/base/cms/internal/logic/post/modify_comment.go +++ b/module/base/cms/internal/logic/post/modify_comment.go @@ -3,13 +3,13 @@ package post import ( "context" - "git.apinb.com/bsm-apps/cms/internal/impl" - "git.apinb.com/bsm-apps/cms/internal/models" + "bsm/full/module/base/cms/internal/impl" + "bsm/full/module/base/cms/internal/models" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/types" - pb "git.apinb.com/bsm-apps/cms/pb" + pb "bsm/full/module/base/cms/pb" ) // 修改评论 diff --git a/apps/base/cms/internal/logic/post/search.go b/module/base/cms/internal/logic/post/search.go similarity index 93% rename from apps/base/cms/internal/logic/post/search.go rename to module/base/cms/internal/logic/post/search.go index 7b2175e..53d66ce 100644 --- a/apps/base/cms/internal/logic/post/search.go +++ b/module/base/cms/internal/logic/post/search.go @@ -3,9 +3,9 @@ package post import ( "context" - "git.apinb.com/bsm-apps/cms/internal/impl" - "git.apinb.com/bsm-apps/cms/internal/models" - pb "git.apinb.com/bsm-apps/cms/pb" + "bsm/full/module/base/cms/internal/impl" + "bsm/full/module/base/cms/internal/models" + pb "bsm/full/module/base/cms/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" ) diff --git a/apps/base/cms/internal/logic/site/create.go b/module/base/cms/internal/logic/site/create.go similarity index 93% rename from apps/base/cms/internal/logic/site/create.go rename to module/base/cms/internal/logic/site/create.go index 09caf8c..bde02b9 100644 --- a/apps/base/cms/internal/logic/site/create.go +++ b/module/base/cms/internal/logic/site/create.go @@ -3,7 +3,7 @@ package site import ( "context" - pb "git.apinb.com/bsm-apps/cms/pb" + pb "bsm/full/module/base/cms/pb" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/vars" "time" diff --git a/apps/base/cms/internal/logic/site/delete.go b/module/base/cms/internal/logic/site/delete.go similarity index 94% rename from apps/base/cms/internal/logic/site/delete.go rename to module/base/cms/internal/logic/site/delete.go index d9b7e4b..f503dae 100644 --- a/apps/base/cms/internal/logic/site/delete.go +++ b/module/base/cms/internal/logic/site/delete.go @@ -5,7 +5,7 @@ import ( "time" - pb "git.apinb.com/bsm-apps/cms/pb" + pb "bsm/full/module/base/cms/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/vars" diff --git a/apps/base/cms/internal/logic/site/fetch.go b/module/base/cms/internal/logic/site/fetch.go similarity index 91% rename from apps/base/cms/internal/logic/site/fetch.go rename to module/base/cms/internal/logic/site/fetch.go index 25f46d4..eb96a0e 100644 --- a/apps/base/cms/internal/logic/site/fetch.go +++ b/module/base/cms/internal/logic/site/fetch.go @@ -3,7 +3,7 @@ package site import ( "context" - pb "git.apinb.com/bsm-apps/cms/pb" + pb "bsm/full/module/base/cms/pb" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/base/cms/internal/logic/site/get.go b/module/base/cms/internal/logic/site/get.go similarity index 93% rename from apps/base/cms/internal/logic/site/get.go rename to module/base/cms/internal/logic/site/get.go index d84a6b6..f951488 100644 --- a/apps/base/cms/internal/logic/site/get.go +++ b/module/base/cms/internal/logic/site/get.go @@ -3,7 +3,7 @@ package site import ( "context" - pb "git.apinb.com/bsm-apps/cms/pb" + pb "bsm/full/module/base/cms/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/base/cms/internal/logic/site/modify.go b/module/base/cms/internal/logic/site/modify.go similarity index 93% rename from apps/base/cms/internal/logic/site/modify.go rename to module/base/cms/internal/logic/site/modify.go index f640826..49175c5 100644 --- a/apps/base/cms/internal/logic/site/modify.go +++ b/module/base/cms/internal/logic/site/modify.go @@ -5,7 +5,7 @@ import ( "time" - pb "git.apinb.com/bsm-apps/cms/pb" + pb "bsm/full/module/base/cms/pb" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/vars" ) diff --git a/apps/base/cms/internal/logic/tags/create.go b/module/base/cms/internal/logic/tags/create.go similarity index 90% rename from apps/base/cms/internal/logic/tags/create.go rename to module/base/cms/internal/logic/tags/create.go index 416f954..6326afb 100644 --- a/apps/base/cms/internal/logic/tags/create.go +++ b/module/base/cms/internal/logic/tags/create.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/cms/internal/impl" - "git.apinb.com/bsm-apps/cms/internal/models" - pb "git.apinb.com/bsm-apps/cms/pb" + "bsm/full/module/base/cms/internal/impl" + "bsm/full/module/base/cms/internal/models" + pb "bsm/full/module/base/cms/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/types" diff --git a/apps/base/cms/internal/logic/tags/delete.go b/module/base/cms/internal/logic/tags/delete.go similarity index 83% rename from apps/base/cms/internal/logic/tags/delete.go rename to module/base/cms/internal/logic/tags/delete.go index 55d63e4..d852909 100644 --- a/apps/base/cms/internal/logic/tags/delete.go +++ b/module/base/cms/internal/logic/tags/delete.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/cms/internal/impl" - "git.apinb.com/bsm-apps/cms/internal/models" - pb "git.apinb.com/bsm-apps/cms/pb" + "bsm/full/module/base/cms/internal/impl" + "bsm/full/module/base/cms/internal/models" + pb "bsm/full/module/base/cms/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/base/cms/internal/logic/tags/fetch.go b/module/base/cms/internal/logic/tags/fetch.go similarity index 85% rename from apps/base/cms/internal/logic/tags/fetch.go rename to module/base/cms/internal/logic/tags/fetch.go index 428ed9a..6cbe99a 100644 --- a/apps/base/cms/internal/logic/tags/fetch.go +++ b/module/base/cms/internal/logic/tags/fetch.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "git.apinb.com/bsm-apps/cms/internal/impl" - "git.apinb.com/bsm-apps/cms/internal/models" - pb "git.apinb.com/bsm-apps/cms/pb" + "bsm/full/module/base/cms/internal/impl" + "bsm/full/module/base/cms/internal/models" + pb "bsm/full/module/base/cms/pb" "git.apinb.com/bsm-sdk/core/errcode" ) diff --git a/apps/base/cms/internal/logic/tags/modify.go b/module/base/cms/internal/logic/tags/modify.go similarity index 87% rename from apps/base/cms/internal/logic/tags/modify.go rename to module/base/cms/internal/logic/tags/modify.go index dc53b21..c535e51 100644 --- a/apps/base/cms/internal/logic/tags/modify.go +++ b/module/base/cms/internal/logic/tags/modify.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/cms/internal/impl" - "git.apinb.com/bsm-apps/cms/internal/models" - pb "git.apinb.com/bsm-apps/cms/pb" + "bsm/full/module/base/cms/internal/impl" + "bsm/full/module/base/cms/internal/models" + pb "bsm/full/module/base/cms/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/types" diff --git a/apps/base/cms/internal/models/cms_accessory.go b/module/base/cms/internal/models/cms_accessory.go similarity index 100% rename from apps/base/cms/internal/models/cms_accessory.go rename to module/base/cms/internal/models/cms_accessory.go diff --git a/apps/base/cms/internal/models/cms_category.go b/module/base/cms/internal/models/cms_category.go similarity index 100% rename from apps/base/cms/internal/models/cms_category.go rename to module/base/cms/internal/models/cms_category.go diff --git a/apps/base/cms/internal/models/cms_comment.go b/module/base/cms/internal/models/cms_comment.go similarity index 100% rename from apps/base/cms/internal/models/cms_comment.go rename to module/base/cms/internal/models/cms_comment.go diff --git a/apps/base/cms/internal/models/cms_pages.go b/module/base/cms/internal/models/cms_pages.go similarity index 100% rename from apps/base/cms/internal/models/cms_pages.go rename to module/base/cms/internal/models/cms_pages.go diff --git a/apps/base/cms/internal/models/cms_post.go b/module/base/cms/internal/models/cms_post.go similarity index 100% rename from apps/base/cms/internal/models/cms_post.go rename to module/base/cms/internal/models/cms_post.go diff --git a/apps/base/cms/internal/models/cms_relate_category.go b/module/base/cms/internal/models/cms_relate_category.go similarity index 100% rename from apps/base/cms/internal/models/cms_relate_category.go rename to module/base/cms/internal/models/cms_relate_category.go diff --git a/apps/base/cms/internal/models/cms_relate_tags.go b/module/base/cms/internal/models/cms_relate_tags.go similarity index 100% rename from apps/base/cms/internal/models/cms_relate_tags.go rename to module/base/cms/internal/models/cms_relate_tags.go diff --git a/apps/base/cms/internal/models/cms_site.go b/module/base/cms/internal/models/cms_site.go similarity index 100% rename from apps/base/cms/internal/models/cms_site.go rename to module/base/cms/internal/models/cms_site.go diff --git a/apps/base/cms/internal/models/cms_tags.go b/module/base/cms/internal/models/cms_tags.go similarity index 100% rename from apps/base/cms/internal/models/cms_tags.go rename to module/base/cms/internal/models/cms_tags.go diff --git a/apps/base/cms/internal/models/query.go b/module/base/cms/internal/models/query.go similarity index 99% rename from apps/base/cms/internal/models/query.go rename to module/base/cms/internal/models/query.go index 4430d28..1e15016 100644 --- a/apps/base/cms/internal/models/query.go +++ b/module/base/cms/internal/models/query.go @@ -5,8 +5,8 @@ package models import ( "fmt" - "git.apinb.com/bsm-apps/cms/internal/impl" - pb "git.apinb.com/bsm-apps/cms/pb" + "bsm/full/module/base/cms/internal/impl" + pb "bsm/full/module/base/cms/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/types" "git.apinb.com/bsm-sdk/core/utils" diff --git a/apps/base/cms/internal/server/category_server.go b/module/base/cms/internal/server/category_server.go similarity index 90% rename from apps/base/cms/internal/server/category_server.go rename to module/base/cms/internal/server/category_server.go index acba6e1..1c011d5 100644 --- a/apps/base/cms/internal/server/category_server.go +++ b/module/base/cms/internal/server/category_server.go @@ -3,8 +3,8 @@ package server import ( "context" - "git.apinb.com/bsm-apps/cms/internal/logic/category" - pb "git.apinb.com/bsm-apps/cms/pb" + "bsm/full/module/base/cms/internal/logic/category" + pb "bsm/full/module/base/cms/pb" ) type CategoryServer struct { diff --git a/apps/base/cms/internal/server/new.go b/module/base/cms/internal/server/new.go similarity index 98% rename from apps/base/cms/internal/server/new.go rename to module/base/cms/internal/server/new.go index 8cf80b9..a9972b3 100644 --- a/apps/base/cms/internal/server/new.go +++ b/module/base/cms/internal/server/new.go @@ -3,7 +3,7 @@ package server import ( "context" - pb "git.apinb.com/bsm-apps/cms/pb" + pb "bsm/full/module/base/cms/pb" "git.apinb.com/bsm-sdk/core/vars" gwRuntime "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "google.golang.org/grpc" diff --git a/apps/base/cms/internal/server/pages_server.go b/module/base/cms/internal/server/pages_server.go similarity index 92% rename from apps/base/cms/internal/server/pages_server.go rename to module/base/cms/internal/server/pages_server.go index ae83c45..bb120b5 100644 --- a/apps/base/cms/internal/server/pages_server.go +++ b/module/base/cms/internal/server/pages_server.go @@ -3,8 +3,8 @@ package server import ( "context" - "git.apinb.com/bsm-apps/cms/internal/logic/pages" - pb "git.apinb.com/bsm-apps/cms/pb" + "bsm/full/module/base/cms/internal/logic/pages" + pb "bsm/full/module/base/cms/pb" ) type PagesServer struct { diff --git a/apps/base/cms/internal/server/post_server.go b/module/base/cms/internal/server/post_server.go similarity index 97% rename from apps/base/cms/internal/server/post_server.go rename to module/base/cms/internal/server/post_server.go index 9aa65d7..3326db0 100644 --- a/apps/base/cms/internal/server/post_server.go +++ b/module/base/cms/internal/server/post_server.go @@ -3,8 +3,8 @@ package server import ( "context" - "git.apinb.com/bsm-apps/cms/internal/logic/post" - pb "git.apinb.com/bsm-apps/cms/pb" + "bsm/full/module/base/cms/internal/logic/post" + pb "bsm/full/module/base/cms/pb" ) type PostServer struct { diff --git a/apps/base/cms/internal/server/site_server.go b/module/base/cms/internal/server/site_server.go similarity index 91% rename from apps/base/cms/internal/server/site_server.go rename to module/base/cms/internal/server/site_server.go index 3e6b479..6e06d66 100644 --- a/apps/base/cms/internal/server/site_server.go +++ b/module/base/cms/internal/server/site_server.go @@ -3,8 +3,8 @@ package server import ( "context" - "git.apinb.com/bsm-apps/cms/internal/logic/site" - pb "git.apinb.com/bsm-apps/cms/pb" + "bsm/full/module/base/cms/internal/logic/site" + pb "bsm/full/module/base/cms/pb" ) type SiteServer struct { diff --git a/apps/base/cms/internal/server/tags_server.go b/module/base/cms/internal/server/tags_server.go similarity index 90% rename from apps/base/cms/internal/server/tags_server.go rename to module/base/cms/internal/server/tags_server.go index 2a3b240..9183d60 100644 --- a/apps/base/cms/internal/server/tags_server.go +++ b/module/base/cms/internal/server/tags_server.go @@ -3,8 +3,8 @@ package server import ( "context" - "git.apinb.com/bsm-apps/cms/internal/logic/tags" - pb "git.apinb.com/bsm-apps/cms/pb" + "bsm/full/module/base/cms/internal/logic/tags" + pb "bsm/full/module/base/cms/pb" ) type TagsServer struct { diff --git a/apps/base/cms/internal/utils/string.go b/module/base/cms/internal/utils/string.go similarity index 100% rename from apps/base/cms/internal/utils/string.go rename to module/base/cms/internal/utils/string.go diff --git a/apps/base/cms/pb/blocks.pb.go b/module/base/cms/pb/blocks.pb.go similarity index 100% rename from apps/base/cms/pb/blocks.pb.go rename to module/base/cms/pb/blocks.pb.go diff --git a/apps/base/cms/pb/category.pb.go b/module/base/cms/pb/category.pb.go similarity index 100% rename from apps/base/cms/pb/category.pb.go rename to module/base/cms/pb/category.pb.go diff --git a/apps/base/cms/pb/category.pb.gw.go b/module/base/cms/pb/category.pb.gw.go similarity index 100% rename from apps/base/cms/pb/category.pb.gw.go rename to module/base/cms/pb/category.pb.gw.go diff --git a/apps/base/cms/pb/category_grpc.pb.go b/module/base/cms/pb/category_grpc.pb.go similarity index 100% rename from apps/base/cms/pb/category_grpc.pb.go rename to module/base/cms/pb/category_grpc.pb.go diff --git a/apps/base/cms/pb/pages.pb.go b/module/base/cms/pb/pages.pb.go similarity index 100% rename from apps/base/cms/pb/pages.pb.go rename to module/base/cms/pb/pages.pb.go diff --git a/apps/base/cms/pb/pages.pb.gw.go b/module/base/cms/pb/pages.pb.gw.go similarity index 100% rename from apps/base/cms/pb/pages.pb.gw.go rename to module/base/cms/pb/pages.pb.gw.go diff --git a/apps/base/cms/pb/pages_grpc.pb.go b/module/base/cms/pb/pages_grpc.pb.go similarity index 100% rename from apps/base/cms/pb/pages_grpc.pb.go rename to module/base/cms/pb/pages_grpc.pb.go diff --git a/apps/base/cms/pb/post.pb.go b/module/base/cms/pb/post.pb.go similarity index 100% rename from apps/base/cms/pb/post.pb.go rename to module/base/cms/pb/post.pb.go diff --git a/apps/base/cms/pb/post.pb.gw.go b/module/base/cms/pb/post.pb.gw.go similarity index 100% rename from apps/base/cms/pb/post.pb.gw.go rename to module/base/cms/pb/post.pb.gw.go diff --git a/apps/base/cms/pb/post_grpc.pb.go b/module/base/cms/pb/post_grpc.pb.go similarity index 100% rename from apps/base/cms/pb/post_grpc.pb.go rename to module/base/cms/pb/post_grpc.pb.go diff --git a/apps/base/cms/pb/site.pb.go b/module/base/cms/pb/site.pb.go similarity index 100% rename from apps/base/cms/pb/site.pb.go rename to module/base/cms/pb/site.pb.go diff --git a/apps/base/cms/pb/site.pb.gw.go b/module/base/cms/pb/site.pb.gw.go similarity index 100% rename from apps/base/cms/pb/site.pb.gw.go rename to module/base/cms/pb/site.pb.gw.go diff --git a/apps/base/cms/pb/site_grpc.pb.go b/module/base/cms/pb/site_grpc.pb.go similarity index 100% rename from apps/base/cms/pb/site_grpc.pb.go rename to module/base/cms/pb/site_grpc.pb.go diff --git a/apps/base/cms/pb/tags.pb.go b/module/base/cms/pb/tags.pb.go similarity index 100% rename from apps/base/cms/pb/tags.pb.go rename to module/base/cms/pb/tags.pb.go diff --git a/apps/base/cms/pb/tags.pb.gw.go b/module/base/cms/pb/tags.pb.gw.go similarity index 100% rename from apps/base/cms/pb/tags.pb.gw.go rename to module/base/cms/pb/tags.pb.gw.go diff --git a/apps/base/cms/pb/tags_grpc.pb.go b/module/base/cms/pb/tags_grpc.pb.go similarity index 100% rename from apps/base/cms/pb/tags_grpc.pb.go rename to module/base/cms/pb/tags_grpc.pb.go diff --git a/apps/base/cms/proto/blocks.proto b/module/base/cms/proto/blocks.proto similarity index 100% rename from apps/base/cms/proto/blocks.proto rename to module/base/cms/proto/blocks.proto diff --git a/apps/base/cms/proto/category.proto b/module/base/cms/proto/category.proto similarity index 100% rename from apps/base/cms/proto/category.proto rename to module/base/cms/proto/category.proto diff --git a/apps/base/cms/proto/pages.proto b/module/base/cms/proto/pages.proto similarity index 100% rename from apps/base/cms/proto/pages.proto rename to module/base/cms/proto/pages.proto diff --git a/apps/base/cms/proto/post.proto b/module/base/cms/proto/post.proto similarity index 100% rename from apps/base/cms/proto/post.proto rename to module/base/cms/proto/post.proto diff --git a/apps/base/cms/proto/site.proto b/module/base/cms/proto/site.proto similarity index 100% rename from apps/base/cms/proto/site.proto rename to module/base/cms/proto/site.proto diff --git a/apps/base/cms/proto/tags.proto b/module/base/cms/proto/tags.proto similarity index 100% rename from apps/base/cms/proto/tags.proto rename to module/base/cms/proto/tags.proto diff --git a/apps/base/cms/scripts/filebeat.yaml b/module/base/cms/scripts/filebeat.yaml similarity index 100% rename from apps/base/cms/scripts/filebeat.yaml rename to module/base/cms/scripts/filebeat.yaml diff --git a/apps/base/cms/scripts/lint.sh b/module/base/cms/scripts/lint.sh similarity index 100% rename from apps/base/cms/scripts/lint.sh rename to module/base/cms/scripts/lint.sh diff --git a/apps/base/cms/swagger/cms.swagger.json b/module/base/cms/swagger/cms.swagger.json similarity index 100% rename from apps/base/cms/swagger/cms.swagger.json rename to module/base/cms/swagger/cms.swagger.json diff --git a/apps/base/cms/test/category/category_add.http b/module/base/cms/test/category/category_add.http similarity index 100% rename from apps/base/cms/test/category/category_add.http rename to module/base/cms/test/category/category_add.http diff --git a/apps/base/cms/test/category/category_del.http b/module/base/cms/test/category/category_del.http similarity index 100% rename from apps/base/cms/test/category/category_del.http rename to module/base/cms/test/category/category_del.http diff --git a/apps/base/cms/test/category/category_list.http b/module/base/cms/test/category/category_list.http similarity index 100% rename from apps/base/cms/test/category/category_list.http rename to module/base/cms/test/category/category_list.http diff --git a/apps/base/cms/test/category/category_modify.http b/module/base/cms/test/category/category_modify.http similarity index 100% rename from apps/base/cms/test/category/category_modify.http rename to module/base/cms/test/category/category_modify.http diff --git a/apps/base/cms/test/comment/comment_add.http b/module/base/cms/test/comment/comment_add.http similarity index 100% rename from apps/base/cms/test/comment/comment_add.http rename to module/base/cms/test/comment/comment_add.http diff --git a/apps/base/cms/test/comment/comment_del.http b/module/base/cms/test/comment/comment_del.http similarity index 100% rename from apps/base/cms/test/comment/comment_del.http rename to module/base/cms/test/comment/comment_del.http diff --git a/apps/base/cms/test/comment/comment_list.http b/module/base/cms/test/comment/comment_list.http similarity index 100% rename from apps/base/cms/test/comment/comment_list.http rename to module/base/cms/test/comment/comment_list.http diff --git a/apps/base/cms/test/comment/comment_modify.http b/module/base/cms/test/comment/comment_modify.http similarity index 100% rename from apps/base/cms/test/comment/comment_modify.http rename to module/base/cms/test/comment/comment_modify.http diff --git a/apps/base/cms/test/comment/desc_comment_like.http b/module/base/cms/test/comment/desc_comment_like.http similarity index 100% rename from apps/base/cms/test/comment/desc_comment_like.http rename to module/base/cms/test/comment/desc_comment_like.http diff --git a/apps/base/cms/test/comment/desc_comment_unlike.http b/module/base/cms/test/comment/desc_comment_unlike.http similarity index 100% rename from apps/base/cms/test/comment/desc_comment_unlike.http rename to module/base/cms/test/comment/desc_comment_unlike.http diff --git a/apps/base/cms/test/comment/incr_comment_like.http b/module/base/cms/test/comment/incr_comment_like.http similarity index 100% rename from apps/base/cms/test/comment/incr_comment_like.http rename to module/base/cms/test/comment/incr_comment_like.http diff --git a/apps/base/cms/test/comment/incr_comment_unlike.http b/module/base/cms/test/comment/incr_comment_unlike.http similarity index 100% rename from apps/base/cms/test/comment/incr_comment_unlike.http rename to module/base/cms/test/comment/incr_comment_unlike.http diff --git a/apps/base/cms/test/pages/create.http b/module/base/cms/test/pages/create.http similarity index 100% rename from apps/base/cms/test/pages/create.http rename to module/base/cms/test/pages/create.http diff --git a/apps/base/cms/test/pages/delete.http b/module/base/cms/test/pages/delete.http similarity index 100% rename from apps/base/cms/test/pages/delete.http rename to module/base/cms/test/pages/delete.http diff --git a/apps/base/cms/test/pages/fetch.http b/module/base/cms/test/pages/fetch.http similarity index 100% rename from apps/base/cms/test/pages/fetch.http rename to module/base/cms/test/pages/fetch.http diff --git a/apps/base/cms/test/pages/get_by_identity.http b/module/base/cms/test/pages/get_by_identity.http similarity index 100% rename from apps/base/cms/test/pages/get_by_identity.http rename to module/base/cms/test/pages/get_by_identity.http diff --git a/apps/base/cms/test/pages/get_by_key.http b/module/base/cms/test/pages/get_by_key.http similarity index 100% rename from apps/base/cms/test/pages/get_by_key.http rename to module/base/cms/test/pages/get_by_key.http diff --git a/apps/base/cms/test/pages/modify.http b/module/base/cms/test/pages/modify.http similarity index 100% rename from apps/base/cms/test/pages/modify.http rename to module/base/cms/test/pages/modify.http diff --git a/apps/base/cms/test/pages/search.http b/module/base/cms/test/pages/search.http similarity index 100% rename from apps/base/cms/test/pages/search.http rename to module/base/cms/test/pages/search.http diff --git a/apps/base/cms/test/post/desc_post_like.http b/module/base/cms/test/post/desc_post_like.http similarity index 100% rename from apps/base/cms/test/post/desc_post_like.http rename to module/base/cms/test/post/desc_post_like.http diff --git a/apps/base/cms/test/post/desc_post_unlike.http b/module/base/cms/test/post/desc_post_unlike.http similarity index 100% rename from apps/base/cms/test/post/desc_post_unlike.http rename to module/base/cms/test/post/desc_post_unlike.http diff --git a/apps/base/cms/test/post/incr_post_like.http b/module/base/cms/test/post/incr_post_like.http similarity index 100% rename from apps/base/cms/test/post/incr_post_like.http rename to module/base/cms/test/post/incr_post_like.http diff --git a/apps/base/cms/test/post/incr_post_unlike.http b/module/base/cms/test/post/incr_post_unlike.http similarity index 100% rename from apps/base/cms/test/post/incr_post_unlike.http rename to module/base/cms/test/post/incr_post_unlike.http diff --git a/apps/base/cms/test/post/post_add.http b/module/base/cms/test/post/post_add.http similarity index 100% rename from apps/base/cms/test/post/post_add.http rename to module/base/cms/test/post/post_add.http diff --git a/apps/base/cms/test/post/post_del.http b/module/base/cms/test/post/post_del.http similarity index 100% rename from apps/base/cms/test/post/post_del.http rename to module/base/cms/test/post/post_del.http diff --git a/apps/base/cms/test/post/post_get.http b/module/base/cms/test/post/post_get.http similarity index 100% rename from apps/base/cms/test/post/post_get.http rename to module/base/cms/test/post/post_get.http diff --git a/apps/base/cms/test/post/post_list.http b/module/base/cms/test/post/post_list.http similarity index 100% rename from apps/base/cms/test/post/post_list.http rename to module/base/cms/test/post/post_list.http diff --git a/apps/base/cms/test/post/post_modify.http b/module/base/cms/test/post/post_modify.http similarity index 100% rename from apps/base/cms/test/post/post_modify.http rename to module/base/cms/test/post/post_modify.http diff --git a/apps/base/cms/test/tags/tags_List.http b/module/base/cms/test/tags/tags_List.http similarity index 100% rename from apps/base/cms/test/tags/tags_List.http rename to module/base/cms/test/tags/tags_List.http diff --git a/apps/base/cms/test/tags/tags_add.http b/module/base/cms/test/tags/tags_add.http similarity index 100% rename from apps/base/cms/test/tags/tags_add.http rename to module/base/cms/test/tags/tags_add.http diff --git a/apps/base/cms/test/tags/tags_del.http b/module/base/cms/test/tags/tags_del.http similarity index 100% rename from apps/base/cms/test/tags/tags_del.http rename to module/base/cms/test/tags/tags_del.http diff --git a/apps/base/cms/test/tags/tags_modify.http b/module/base/cms/test/tags/tags_modify.http similarity index 100% rename from apps/base/cms/test/tags/tags_modify.http rename to module/base/cms/test/tags/tags_modify.http diff --git a/apps/base/feedback/README.md b/module/base/feedback/README.md similarity index 97% rename from apps/base/feedback/README.md rename to module/base/feedback/README.md index ded2156..a6ffcfd 100644 --- a/apps/base/feedback/README.md +++ b/module/base/feedback/README.md @@ -2,7 +2,7 @@ [![Go Version](https://img.shields.io/badge/Go-1.25.1-blue.svg)](https://golang.org/) [![License](https://img.shields.io/badge/License-Internal-red.svg)](LICENSE) -[![Build Status](https://img.shields.io/badge/Build-Passing-green.svg)](https://git.apinb.com/bsm-apps/feedback) +[![Build Status](https://img.shields.io/badge/Build-Passing-green.svg)](https://bsm/full/module/base/feedback) 一个高性能、可扩展的微服务，基于 gRPC 和 HTTP Gateway 架构，提供用户反馈管理、问题跟踪、附件处理等完整的反馈系统功能。 @@ -43,7 +43,7 @@ ```bash # 克隆项目 -git clone git.apinb.com/bsm-apps/feedback.git +git clone bsm/full/module/base/feedback.git cd feedback # 安装依赖 @@ -523,13 +523,13 @@ type(scope): description - **作者**: David Yan (david.yan@qq.com) - **维护者**: BSM 开发团队 -- **项目地址**: [git.apinb.com/bsm-apps/feedback](https://git.apinb.com/bsm-apps/feedback) +- **项目地址**: [bsm/full/module/base/feedback](https://bsm/full/module/base/feedback) ## 🔗 相关链接 - [BSM SDK](https://git.apinb.com/bsm-sdk) - [API 文档](https://docs.apinb.com/feedback) -- [问题反馈](https://git.apinb.com/bsm-apps/feedback/issues) +- [问题反馈](https://bsm/full/module/base/feedback/issues) --- diff --git a/apps/base/feedback/cmd/cli/main.go b/module/base/feedback/cmd/cli/main.go similarity index 100% rename from apps/base/feedback/cmd/cli/main.go rename to module/base/feedback/cmd/cli/main.go diff --git a/apps/base/feedback/cmd/main/main.go b/module/base/feedback/cmd/main/main.go similarity index 85% rename from apps/base/feedback/cmd/main/main.go rename to module/base/feedback/cmd/main/main.go index 966224c..28b16dc 100644 --- a/apps/base/feedback/cmd/main/main.go +++ b/module/base/feedback/cmd/main/main.go @@ -6,9 +6,9 @@ package service import ( - "git.apinb.com/bsm-apps/feedback/internal/config" - "git.apinb.com/bsm-apps/feedback/internal/impl" - "git.apinb.com/bsm-apps/feedback/internal/server" + "bsm/full/module/base/feedback/internal/config" + "bsm/full/module/base/feedback/internal/impl" + "bsm/full/module/base/feedback/internal/server" "git.apinb.com/bsm-sdk/core/service" ) @@ -44,3 +44,7 @@ func Run() { // 启动服务 srv.Start() } + +func main() { + Run() +} diff --git a/apps/base/feedback/etc/feedback.yaml b/module/base/feedback/etc/feedback.yaml similarity index 100% rename from apps/base/feedback/etc/feedback.yaml rename to module/base/feedback/etc/feedback.yaml diff --git a/apps/base/feedback/etc/feedback_dev.yaml b/module/base/feedback/etc/feedback_dev.yaml similarity index 100% rename from apps/base/feedback/etc/feedback_dev.yaml rename to module/base/feedback/etc/feedback_dev.yaml diff --git a/apps/base/feedback/etc/feedback_prod.yaml b/module/base/feedback/etc/feedback_prod.yaml similarity index 100% rename from apps/base/feedback/etc/feedback_prod.yaml rename to module/base/feedback/etc/feedback_prod.yaml diff --git a/apps/base/feedback/etc/feedback_test.yaml b/module/base/feedback/etc/feedback_test.yaml similarity index 100% rename from apps/base/feedback/etc/feedback_test.yaml rename to module/base/feedback/etc/feedback_test.yaml diff --git a/apps/base/feedback/go.mod b/module/base/feedback/go.mod similarity index 65% rename from apps/base/feedback/go.mod rename to module/base/feedback/go.mod index 11d6be2..0c218e0 100644 --- a/apps/base/feedback/go.mod +++ b/module/base/feedback/go.mod @@ -1,4 +1,4 @@ -module git.apinb.com/bsm-apps/feedback +module bsm/full/module/base/feedback go 1.26.5 @@ -16,12 +16,12 @@ tool ( require ( git.apinb.com/bsm-sdk/core v0.2.0 git.apinb.com/bsm-sdk/engine v1.3.2 - github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 + github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0 github.com/patrickmn/go-cache v2.1.0+incompatible - go.etcd.io/etcd/client/v3 v3.6.12 - google.golang.org/grpc v1.81.1 + go.etcd.io/etcd/client/v3 v3.7.1 + google.golang.org/grpc v1.83.0 google.golang.org/protobuf v1.36.11 - gorm.io/gorm v1.31.1 + gorm.io/gorm v1.31.2 ) require ( @@ -32,10 +32,8 @@ require ( github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/coreos/go-semver v0.3.1 // indirect github.com/coreos/go-systemd/v22 v22.7.0 // indirect - github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/ditashi/jsbeautifier-go v0.0.0-20141206144643-2520a8026a9c // indirect github.com/go-sql-driver/mysql v1.10.0 // indirect - github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt/v5 v5.3.1 // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/google/uuid v1.6.0 // indirect @@ -45,26 +43,27 @@ require ( github.com/jackc/puddle/v2 v2.2.2 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect - github.com/oklog/ulid/v2 v2.1.1 // indirect + github.com/oklog/ulid/v2 v2.1.2 // indirect github.com/pepabo/protoc-gen-go-client v0.3.0 // indirect - github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - github.com/redis/go-redis/v9 v9.20.0 // indirect + github.com/redis/go-redis/v9 v9.22.0 // indirect github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect - go.etcd.io/etcd/api/v3 v3.6.12 // indirect - go.etcd.io/etcd/client/pkg/v3 v3.6.12 // indirect + go.etcd.io/etcd/api/v3 v3.7.1 // indirect + go.etcd.io/etcd/client/pkg/v3 v3.7.1 // indirect go.uber.org/atomic v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.28.0 // indirect - go.yaml.in/yaml/v3 v3.0.4 // indirect - golang.org/x/mod v0.36.0 // indirect - golang.org/x/net v0.55.0 // indirect - golang.org/x/sync v0.20.0 // indirect - golang.org/x/sys v0.45.0 // indirect - golang.org/x/text v0.37.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa // indirect + go.yaml.in/yaml/v3 v3.0.5 // indirect + golang.org/x/mod v0.37.0 // indirect + golang.org/x/net v0.57.0 // indirect + golang.org/x/sync v0.22.0 // indirect + golang.org/x/sys v0.47.0 // indirect + golang.org/x/text v0.40.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea // indirect google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect gorm.io/driver/mysql v1.6.0 // indirect - gorm.io/driver/postgres v1.6.0 // indirect + gorm.io/driver/postgres v1.6.2 // indirect ) + +replace git.apinb.com/bsm-sdk/core => D:/work/bsm-sdk/core diff --git a/apps/base/feedback/go.sum b/module/base/feedback/go.sum similarity index 54% rename from apps/base/feedback/go.sum rename to module/base/feedback/go.sum index 3c3497d..a2eb5b2 100644 --- a/apps/base/feedback/go.sum +++ b/module/base/feedback/go.sum @@ -1,7 +1,5 @@ filippo.io/edwards25519 v1.2.0 h1:crnVqOiS4jqYleHd9vaKZ+HKtHfllngJIiOpNpoJsjo= filippo.io/edwards25519 v1.2.0/go.mod h1:xzAOLCNug/yB62zG1bQ8uziwrIqIuxhctzJT18Q77mc= -git.apinb.com/bsm-sdk/core v0.2.0 h1:/e9yqpsbKBrRgMiGpS3KX2O4qDLxo5V5GpPSLNGxEKw= -git.apinb.com/bsm-sdk/core v0.2.0/go.mod h1:E9T6Eboo/0Zb36BjkKbIgvFzq4fQ2Q8P/7y5zmYTI6Y= git.apinb.com/bsm-sdk/engine v1.3.2 h1:QJ20jveUIHcn3Tu0ktrkZI9zGRaPuJRZ+YTbSa1Zj1w= git.apinb.com/bsm-sdk/engine v1.3.2/go.mod h1:OXRlO6Cdidqagw+LJjCngvpuuX1rwhxDwZlL/MhwiKQ= git.apinb.com/bsm-tools/protoc-gen-markdown v0.0.0-20250907131213-6c1694ce6bcb h1:GoXhkGzI5vZ9JMXCVsSRw/AGsJY0tM2aEv76YaUg2wM= @@ -25,14 +23,12 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/ditashi/jsbeautifier-go v0.0.0-20141206144643-2520a8026a9c h1:+Zo5Ca9GH0RoeVZQKzFJcTLoAixx5s5Gq3pTIS+n354= github.com/ditashi/jsbeautifier-go v0.0.0-20141206144643-2520a8026a9c/go.mod h1:HJGU9ULdREjOcVGZVPB5s6zYmHi1RxzT71l2wQyLmnE= -github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= -github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.4 h1:tG4xh9yMsRCAiodLVTxyrkzSZ9+o0L1Kg/+cPVcbP/8= +github.com/go-logr/logr v1.4.4/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-sql-driver/mysql v1.10.0 h1:Q+1LV8DkHJvSYAdR83XzuhDaTykuDx0l6fkXxoWCWfw= github.com/go-sql-driver/mysql v1.10.0/go.mod h1:M+cqaI7+xxXGG9swrdeUIoPG3Y3KCkF0pZej+SK+nWk= -github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= -github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt/v5 v5.3.1 h1:kYf81DTWFe7t+1VvL7eS+jKFVWaUnK9cB1qbwn63YCY= github.com/golang-jwt/jwt/v5 v5.3.1/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= @@ -41,8 +37,8 @@ github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= 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/grpc-ecosystem/grpc-gateway/v2 v2.29.0 h1:5VipnvEpbqr2gA2VbM+nYVbkIF28c5ZQfqCBQ5g2xfk= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0/go.mod h1:Hyl3n6Twe1hvtd9XUXDec4pTvgMSEixRuQKPTMH2bNs= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0 h1:/Tnpcb2E0Pz/tN9s3bfEY2Q8ePCEX9iuS+cneUwncnw= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0/go.mod h1:zOBXOsUaBSjKgmH4OGzV1esUpR3oUSCPYVd2cUBjKYY= 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= @@ -55,16 +51,16 @@ github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= -github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= -github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y= -github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0= +github.com/klauspost/cpuid/v2 v2.4.0 h1:S6Hrbc7+ywsr0r+RLapfGBHfyefhCTwEh3A0tV913Dw= +github.com/klauspost/cpuid/v2 v2.4.0/go.mod h1:19jmZ9mjzoF//ddRSUsv0zfBTJWh3QJh9FNxZTMrGxU= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/oklog/ulid/v2 v2.1.1 h1:suPZ4ARWLOJLegGFiZZ1dFAkqzhMjL3J1TzI+5wHz8s= -github.com/oklog/ulid/v2 v2.1.1/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ= +github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= +github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= +github.com/oklog/ulid/v2 v2.1.2 h1:IEclFb9JNvzYA6MW2SCxbLzcHTVsfqm3PrqGQJH5zec= +github.com/oklog/ulid/v2 v2.1.2/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ= github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= github.com/pborman/getopt v0.0.0-20170112200414-7148bc3a4c30/go.mod h1:85jBQOZwpVEaDAr341tbn15RS4fCAsIst0qp7i8ex1o= @@ -73,8 +69,8 @@ github.com/pepabo/protoc-gen-go-client v0.3.0/go.mod h1:NvHW7/gsmZUK2UxafqzUzWD8 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/redis/go-redis/v9 v9.20.0 h1:WnQYxLkgO2xiXTCJY0ldIiI8dNqCDlQAG+AtaH7a2a0= -github.com/redis/go-redis/v9 v9.20.0/go.mod h1:v/M13XI1PVCDcm01VtPFOADfZtHf8YW3baQf57KlIkA= +github.com/redis/go-redis/v9 v9.22.0 h1:laDvpYXTJtZLloinw1fA5Kqd6HAEH2XKxOkG/PDq2F0= +github.com/redis/go-redis/v9 v9.22.0/go.mod h1:y2g0Wj8rQvuK0ELM+oxSudcLtC09JScs98I/X9gRWY4= github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0= @@ -84,28 +80,26 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= -github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/zeebo/xxh3 v1.1.0 h1:s7DLGDK45Dyfg7++yxI0khrfwq9661w9EN78eP/UZVs= github.com/zeebo/xxh3 v1.1.0/go.mod h1:IisAie1LELR4xhVinxWS5+zf1lA4p0MW4T+w+W07F5s= -go.etcd.io/etcd/api/v3 v3.6.12 h1:OLOZUKEuAA36TR48F0cIaa8FdzrWygjyfrJxXg4iDgs= -go.etcd.io/etcd/api/v3 v3.6.12/go.mod h1:p14EIQXHbuOQbVvL/WEes5uqKnxP9AgKJgpjbMVvzvE= -go.etcd.io/etcd/client/pkg/v3 v3.6.12 h1:36zzB+pQOdHbhN+kH2iJz/K8bJn0ZLtLfPPO7jozTDo= -go.etcd.io/etcd/client/pkg/v3 v3.6.12/go.mod h1:hh2+ZXtfLzs3o6mn92ntgNPBrTJJOvXqICM5g3L3DMY= -go.etcd.io/etcd/client/v3 v3.6.12 h1:kMSP6JcPZMqSJiX+TXdUIBU/4eXEZWBAaui4VihMbIc= -go.etcd.io/etcd/client/v3 v3.6.12/go.mod h1:CMs6fJWYiZQk4ytFjd4lE1diOvvRMmtbbn/alZXd3dQ= +go.etcd.io/etcd/api/v3 v3.7.1 h1:KJG0/DcWGfe3Y1otDf/fsBf0TSSgpxZ5RO/L8SFt73E= +go.etcd.io/etcd/api/v3 v3.7.1/go.mod h1:8bXIpCMeV7E3/XL0Ix123ATn3dB+0V7d9zklHbB0m78= +go.etcd.io/etcd/client/pkg/v3 v3.7.1 h1:rKYsj3pRkR0eK3yjT3XOgrhqfmIfj9pzNgxjh7mfFv4= +go.etcd.io/etcd/client/pkg/v3 v3.7.1/go.mod h1:cnzZGIUzSfjEwLC6UBVsSXlEK1eepS/JUD7wE6PLRT0= +go.etcd.io/etcd/client/v3 v3.7.1 h1:0PEMMC0KuZmVIN+RAbdqfkZ45pYTgKVtmBEbRCvZFUg= +go.etcd.io/etcd/client/v3 v3.7.1/go.mod h1:ffNqALa8tRCYhYo1F9oR489y23K39Gz+BSR3ApAGYq0= go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64= go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y= -go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I= -go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0= -go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM= -go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY= -go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg= -go.opentelemetry.io/otel/sdk v1.43.0/go.mod h1:P+IkVU3iWukmiit/Yf9AWvpyRDlUeBaRg6Y+C58QHzg= -go.opentelemetry.io/otel/sdk/metric v1.43.0 h1:S88dyqXjJkuBNLeMcVPRFXpRw2fuwdvfCGLEo89fDkw= -go.opentelemetry.io/otel/sdk/metric v1.43.0/go.mod h1:C/RJtwSEJ5hzTiUz5pXF1kILHStzb9zFlIEe85bhj6A= -go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A= -go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0= +go.opentelemetry.io/otel v1.45.0 h1:pdrWmLHofpubmArBv1LgFSv1Z0Ie/ppdZzu+kUN5EeU= +go.opentelemetry.io/otel v1.45.0/go.mod h1:XZxIqPapzEYnhNSScF5DIqXhm/rYi0FzCe2XddAwZfQ= +go.opentelemetry.io/otel/metric v1.45.0 h1:7Eg1uH7CJ5cXv9is6tnBe1FI6rj1nwUdbFypRm3br/M= +go.opentelemetry.io/otel/metric v1.45.0/go.mod h1:HAPbm1nd3p1PmFH7v2dR+6BjXxw+Lq4a2+pndMAm08s= +go.opentelemetry.io/otel/sdk v1.45.0 h1:4VVSMgQ83dUgW2aoX5f6JgLvHwIvzcuLnF9lUdCSpCw= +go.opentelemetry.io/otel/sdk v1.45.0/go.mod h1:Sr40LgXV7DsKMMJMKOhUWOgMWTfAaqvm2kF0g7ilwuA= +go.opentelemetry.io/otel/sdk/metric v1.44.0 h1:3LlKgI+VjbVsjNRFZJZAJ30WjXC5VkNRks6si09iEfI= +go.opentelemetry.io/otel/sdk/metric v1.44.0/go.mod h1:5B5pMARnXxKhltooO4xUuCBorl65a4EpnTalObqOigA= +go.opentelemetry.io/otel/trace v1.45.0 h1:l/mP6Uv7oNO7/TblbhpbgMidxhq1uO/rPsikOyVhxag= +go.opentelemetry.io/otel/trace v1.45.0/go.mod h1:qoJJA2xNMnxRrdISU/kLtfUH2wNeQbiv+jhs/CxI8bc= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= @@ -114,51 +108,26 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.28.0 h1:IZzaP1Fv73/T/pBMLk4VutPl36uNC+OSUh3JLG3FIjo= go.uber.org/zap v1.28.0/go.mod h1:rDLpOi171uODNm/mxFcuYWxDsqWSAVkFdX4XojSKg/Q= -go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= -go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.36.0 h1:JJjpVx6myfUsUdAzZuOSTTmRE0PfZeNWzzvKrP7amb4= -golang.org/x/mod v0.36.0/go.mod h1:moc6ELqsWcOw5Ef3xVprK5ul/MvtVvkIXLziUOICjUQ= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8= -golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -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.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4= -golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY= -golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc= -golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -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= +go.yaml.in/yaml/v3 v3.0.5 h1:N6y/pJk8buWs9NY5ERU2HSMfm+IuD/OtfdAnq6kESPw= +go.yaml.in/yaml/v3 v3.0.5/go.mod h1:HVTZu1O7/Vkt2N+BFy8Zza+lnLsABggaTM2ZpNIGuKg= +golang.org/x/mod v0.37.0 h1:vF1DjpVEshcIqoEaauuHebaLk1O1forxjxBaVn884JQ= +golang.org/x/mod v0.37.0/go.mod h1:m8S8VeM9r4dzDwjrKO0a1sZP3YjeMamRRlD+fmR2Q/0= +golang.org/x/net v0.57.0 h1:K5+3DljvIuDG9/Jv9rvyMywYNFCQ9RSUY6OOTTkT+tE= +golang.org/x/net v0.57.0/go.mod h1:KpXc8iv+r3XplLAG/f7Jsf9RPszJzdR0f58q9vGOuEU= +golang.org/x/sync v0.22.0 h1:SZjpbeLmrCk4xhRSZFNZW5gFUeCeFgjekvI/+gfScek= +golang.org/x/sync v0.22.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= +golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs= +golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +golang.org/x/text v0.40.0 h1:Ub2Z6/xjgF1WrYQz2nuITOEegKFtiIy+rieRJ5lHZKs= +golang.org/x/text v0.40.0/go.mod h1:hpnzDAfGV753zIKo+wk3u1bVKCGPbrnF7+7LBF/UHVY= gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4= gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E= -google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa h1:Kjn0N0tCrDgiAFW+lGO4JZ3ck44CehvJQMAwj9QF0G8= -google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:q4lMZS6kskjT5HvCPrnnypcDPVJqT/f4nfxmkE7gryY= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa h1:mZHHdPZl0dbGHCflZgAq/Q468DWVFcU2whhB2KAo8fk= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= -google.golang.org/grpc v1.81.1 h1:VnnIIZ88UzOOKLukQi+ImGz8O1Wdp8nAGGnvOfEIWQQ= -google.golang.org/grpc v1.81.1/go.mod h1:xGH9GfzOyMTGIOXBJmXt+BX/V0kcdQbdcuwQ/zNw42I= +google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea h1:Jifw/kjs/r3B0uszvls/m3c3tmZs2YHGM9C+rvxP9gY= +google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea/go.mod h1:K/+WGbmBY7aNW1HDw1fJnKYo10i0DkAX6pows00dLig= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea h1:kVhQEPTpKQahD5+JSBTfBB19wcgQTTjAIn45MBqnyHk= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= +google.golang.org/grpc v1.83.0 h1:JeNZEKJFbQxArAMl+hiytHauacDNqJUllNfmIMmpqnQ= +google.golang.org/grpc v1.83.0/go.mod h1:kDyl6SKsiHKt0uylY5gtn5cEjkrIOhQOGDgIc4JGwzQ= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.2 h1:rgSNvqscFZ1JgV/4wH5GOsZFSFkR2Eua9As3KIr2LlM= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.2/go.mod h1:iMEtFwDlAhjDU9L5mY6U1XLwlIId/G3h+QcBHDIvrJ8= google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE= @@ -171,9 +140,11 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gorm.io/driver/mysql v1.6.0 h1:eNbLmNTpPpTOVZi8MMxCi2aaIm0ZpInbORNXDwyLGvg= gorm.io/driver/mysql v1.6.0/go.mod h1:D/oCC2GWK3M/dqoLxnOlaNKmXz8WNTfcS9y5ovaSqKo= -gorm.io/driver/postgres v1.6.0 h1:2dxzU8xJ+ivvqTRph34QX+WrRaJlmfyPqXmoGVjMBa4= -gorm.io/driver/postgres v1.6.0/go.mod h1:vUw0mrGgrTK+uPHEhAdV4sfFELrByKVGnaVRkXDhtWo= -gorm.io/gorm v1.31.1 h1:7CA8FTFz/gRfgqgpeKIBcervUn3xSyPUmr6B2WXJ7kg= -gorm.io/gorm v1.31.1/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs= +gorm.io/driver/postgres v1.6.2 h1:BvXQ/cNUg63q5TFNg672DmDcowZSFrNLkkA3Xe6GXq4= +gorm.io/driver/postgres v1.6.2/go.mod h1:0c4fQA44XhOklXDkgtuKqysHCycTa5i9e3EIpDGCwXk= +gorm.io/driver/sqlite v1.6.0 h1:WHRRrIiulaPiPFmDcod6prc4l2VGVWHz80KspNsxSfQ= +gorm.io/driver/sqlite v1.6.0/go.mod h1:AO9V1qIQddBESngQUKWL9yoH93HIeA1X6V633rBwyT8= +gorm.io/gorm v1.31.2 h1:3o8FXNo9v9S858gil+3LlZA1LkCOzgb4g5BL64FgaCo= +gorm.io/gorm v1.31.2/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs= gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU= gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU= diff --git a/apps/base/feedback/internal/config/config.go b/module/base/feedback/internal/config/config.go similarity index 100% rename from apps/base/feedback/internal/config/config.go rename to module/base/feedback/internal/config/config.go diff --git a/apps/base/feedback/internal/impl/impl.go b/module/base/feedback/internal/impl/impl.go similarity index 94% rename from apps/base/feedback/internal/impl/impl.go rename to module/base/feedback/internal/impl/impl.go index a410e77..2c14caa 100644 --- a/apps/base/feedback/internal/impl/impl.go +++ b/module/base/feedback/internal/impl/impl.go @@ -2,7 +2,7 @@ package impl import ( - "git.apinb.com/bsm-apps/feedback/internal/config" + "bsm/full/module/base/feedback/internal/config" "git.apinb.com/bsm-sdk/core/cache/redis" "git.apinb.com/bsm-sdk/core/with" cache "github.com/patrickmn/go-cache" diff --git a/apps/base/feedback/internal/logic/method/add.go b/module/base/feedback/internal/logic/method/add.go similarity index 94% rename from apps/base/feedback/internal/logic/method/add.go rename to module/base/feedback/internal/logic/method/add.go index ceaf011..0dbdc9e 100644 --- a/apps/base/feedback/internal/logic/method/add.go +++ b/module/base/feedback/internal/logic/method/add.go @@ -4,9 +4,9 @@ package method import ( "context" - "git.apinb.com/bsm-apps/feedback/internal/impl" - "git.apinb.com/bsm-apps/feedback/internal/models" - pb "git.apinb.com/bsm-apps/feedback/pb" + "bsm/full/module/base/feedback/internal/impl" + "bsm/full/module/base/feedback/internal/models" + pb "bsm/full/module/base/feedback/pb" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/types" "git.apinb.com/bsm-sdk/core/utils" diff --git a/apps/base/feedback/internal/logic/method/delete.go b/module/base/feedback/internal/logic/method/delete.go similarity index 85% rename from apps/base/feedback/internal/logic/method/delete.go rename to module/base/feedback/internal/logic/method/delete.go index 290e166..6b468e5 100644 --- a/apps/base/feedback/internal/logic/method/delete.go +++ b/module/base/feedback/internal/logic/method/delete.go @@ -5,9 +5,9 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/feedback/internal/impl" - "git.apinb.com/bsm-apps/feedback/internal/models" - pb "git.apinb.com/bsm-apps/feedback/pb" + "bsm/full/module/base/feedback/internal/impl" + "bsm/full/module/base/feedback/internal/models" + pb "bsm/full/module/base/feedback/pb" "git.apinb.com/bsm-sdk/core/vars" "git.apinb.com/bsm-sdk/engine/exception" ) diff --git a/apps/base/feedback/internal/logic/method/get.go b/module/base/feedback/internal/logic/method/get.go similarity index 87% rename from apps/base/feedback/internal/logic/method/get.go rename to module/base/feedback/internal/logic/method/get.go index 4276b90..68db46a 100644 --- a/apps/base/feedback/internal/logic/method/get.go +++ b/module/base/feedback/internal/logic/method/get.go @@ -5,9 +5,9 @@ import ( "context" "errors" - "git.apinb.com/bsm-apps/feedback/internal/impl" - "git.apinb.com/bsm-apps/feedback/internal/models" - pb "git.apinb.com/bsm-apps/feedback/pb" + "bsm/full/module/base/feedback/internal/impl" + "bsm/full/module/base/feedback/internal/models" + pb "bsm/full/module/base/feedback/pb" "git.apinb.com/bsm-sdk/engine/exception" "gorm.io/gorm" ) diff --git a/apps/base/feedback/internal/logic/method/list.go b/module/base/feedback/internal/logic/method/list.go similarity index 93% rename from apps/base/feedback/internal/logic/method/list.go rename to module/base/feedback/internal/logic/method/list.go index cb57942..a96f06c 100644 --- a/apps/base/feedback/internal/logic/method/list.go +++ b/module/base/feedback/internal/logic/method/list.go @@ -4,9 +4,9 @@ package method import ( "context" - "git.apinb.com/bsm-apps/feedback/internal/impl" - "git.apinb.com/bsm-apps/feedback/internal/models" - pb "git.apinb.com/bsm-apps/feedback/pb" + "bsm/full/module/base/feedback/internal/impl" + "bsm/full/module/base/feedback/internal/models" + pb "bsm/full/module/base/feedback/pb" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/base/feedback/internal/logic/method/modify.go b/module/base/feedback/internal/logic/method/modify.go similarity index 96% rename from apps/base/feedback/internal/logic/method/modify.go rename to module/base/feedback/internal/logic/method/modify.go index 8e3d953..23ae332 100644 --- a/apps/base/feedback/internal/logic/method/modify.go +++ b/module/base/feedback/internal/logic/method/modify.go @@ -5,9 +5,9 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/feedback/internal/impl" - "git.apinb.com/bsm-apps/feedback/internal/models" - pb "git.apinb.com/bsm-apps/feedback/pb" + "bsm/full/module/base/feedback/internal/impl" + "bsm/full/module/base/feedback/internal/models" + pb "bsm/full/module/base/feedback/pb" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/types" "git.apinb.com/bsm-sdk/core/utils" diff --git a/apps/base/feedback/internal/logic/method/ref.go b/module/base/feedback/internal/logic/method/ref.go similarity index 95% rename from apps/base/feedback/internal/logic/method/ref.go rename to module/base/feedback/internal/logic/method/ref.go index 6778430..def2881 100644 --- a/apps/base/feedback/internal/logic/method/ref.go +++ b/module/base/feedback/internal/logic/method/ref.go @@ -2,8 +2,8 @@ package method import ( - "git.apinb.com/bsm-apps/feedback/internal/models" - pb "git.apinb.com/bsm-apps/feedback/pb" + "bsm/full/module/base/feedback/internal/models" + pb "bsm/full/module/base/feedback/pb" "git.apinb.com/bsm-sdk/core/vars" ) diff --git a/apps/base/feedback/internal/logic/method/remark.go b/module/base/feedback/internal/logic/method/remark.go similarity index 86% rename from apps/base/feedback/internal/logic/method/remark.go rename to module/base/feedback/internal/logic/method/remark.go index bafee77..814f7c9 100644 --- a/apps/base/feedback/internal/logic/method/remark.go +++ b/module/base/feedback/internal/logic/method/remark.go @@ -5,9 +5,9 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/feedback/internal/impl" - "git.apinb.com/bsm-apps/feedback/internal/models" - pb "git.apinb.com/bsm-apps/feedback/pb" + "bsm/full/module/base/feedback/internal/impl" + "bsm/full/module/base/feedback/internal/models" + pb "bsm/full/module/base/feedback/pb" "git.apinb.com/bsm-sdk/core/vars" "git.apinb.com/bsm-sdk/engine/exception" ) diff --git a/apps/base/feedback/internal/models/feedback_accessory.go b/module/base/feedback/internal/models/feedback_accessory.go similarity index 100% rename from apps/base/feedback/internal/models/feedback_accessory.go rename to module/base/feedback/internal/models/feedback_accessory.go diff --git a/apps/base/feedback/internal/models/feedback_images.go b/module/base/feedback/internal/models/feedback_images.go similarity index 100% rename from apps/base/feedback/internal/models/feedback_images.go rename to module/base/feedback/internal/models/feedback_images.go diff --git a/apps/base/feedback/internal/models/feedback_item.go b/module/base/feedback/internal/models/feedback_item.go similarity index 100% rename from apps/base/feedback/internal/models/feedback_item.go rename to module/base/feedback/internal/models/feedback_item.go diff --git a/apps/base/feedback/internal/server/method_server.go b/module/base/feedback/internal/server/method_server.go similarity index 90% rename from apps/base/feedback/internal/server/method_server.go rename to module/base/feedback/internal/server/method_server.go index b6d2afe..7591e1c 100644 --- a/apps/base/feedback/internal/server/method_server.go +++ b/module/base/feedback/internal/server/method_server.go @@ -3,8 +3,8 @@ package server import ( "context" - "git.apinb.com/bsm-apps/feedback/internal/logic/method" - pb "git.apinb.com/bsm-apps/feedback/pb" + "bsm/full/module/base/feedback/internal/logic/method" + pb "bsm/full/module/base/feedback/pb" ) type MethodServer struct { diff --git a/apps/base/feedback/internal/server/new.go b/module/base/feedback/internal/server/new.go similarity index 98% rename from apps/base/feedback/internal/server/new.go rename to module/base/feedback/internal/server/new.go index f93ddaf..3758b39 100644 --- a/apps/base/feedback/internal/server/new.go +++ b/module/base/feedback/internal/server/new.go @@ -3,7 +3,7 @@ package server import ( "context" - pb "git.apinb.com/bsm-apps/feedback/pb" + pb "bsm/full/module/base/feedback/pb" "git.apinb.com/bsm-sdk/core/vars" gwRuntime "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "google.golang.org/grpc" diff --git a/apps/base/feedback/pb/feedback.pb.go b/module/base/feedback/pb/feedback.pb.go similarity index 100% rename from apps/base/feedback/pb/feedback.pb.go rename to module/base/feedback/pb/feedback.pb.go diff --git a/apps/base/feedback/pb/feedback.pb.gw.go b/module/base/feedback/pb/feedback.pb.gw.go similarity index 100% rename from apps/base/feedback/pb/feedback.pb.gw.go rename to module/base/feedback/pb/feedback.pb.gw.go diff --git a/apps/base/feedback/pb/feedback_grpc.pb.go b/module/base/feedback/pb/feedback_grpc.pb.go similarity index 100% rename from apps/base/feedback/pb/feedback_grpc.pb.go rename to module/base/feedback/pb/feedback_grpc.pb.go diff --git a/apps/base/feedback/proto/feedback.proto b/module/base/feedback/proto/feedback.proto similarity index 100% rename from apps/base/feedback/proto/feedback.proto rename to module/base/feedback/proto/feedback.proto diff --git a/apps/base/feedback/scripts/blocks.yaml b/module/base/feedback/scripts/blocks.yaml similarity index 100% rename from apps/base/feedback/scripts/blocks.yaml rename to module/base/feedback/scripts/blocks.yaml diff --git a/apps/base/feedback/scripts/filebeat.yaml b/module/base/feedback/scripts/filebeat.yaml similarity index 100% rename from apps/base/feedback/scripts/filebeat.yaml rename to module/base/feedback/scripts/filebeat.yaml diff --git a/apps/base/feedback/scripts/lint.sh b/module/base/feedback/scripts/lint.sh similarity index 100% rename from apps/base/feedback/scripts/lint.sh rename to module/base/feedback/scripts/lint.sh diff --git a/apps/base/feedback/swagger/feedback.swagger.json b/module/base/feedback/swagger/feedback.swagger.json similarity index 100% rename from apps/base/feedback/swagger/feedback.swagger.json rename to module/base/feedback/swagger/feedback.swagger.json diff --git a/apps/base/feedback/test/add.http b/module/base/feedback/test/add.http similarity index 100% rename from apps/base/feedback/test/add.http rename to module/base/feedback/test/add.http diff --git a/apps/base/feedback/test/rpc/rpc.go b/module/base/feedback/test/rpc/rpc.go similarity index 100% rename from apps/base/feedback/test/rpc/rpc.go rename to module/base/feedback/test/rpc/rpc.go diff --git a/apps/base/fts/CHANGELOG.md b/module/base/fts/CHANGELOG.md similarity index 100% rename from apps/base/fts/CHANGELOG.md rename to module/base/fts/CHANGELOG.md diff --git a/apps/base/fts/Dockerfile b/module/base/fts/Dockerfile similarity index 100% rename from apps/base/fts/Dockerfile rename to module/base/fts/Dockerfile diff --git a/apps/base/fts/Makefile b/module/base/fts/Makefile similarity index 100% rename from apps/base/fts/Makefile rename to module/base/fts/Makefile diff --git a/apps/base/fts/README.md b/module/base/fts/README.md similarity index 100% rename from apps/base/fts/README.md rename to module/base/fts/README.md diff --git a/apps/base/fts/cmd/cli/main.go b/module/base/fts/cmd/cli/main.go similarity index 100% rename from apps/base/fts/cmd/cli/main.go rename to module/base/fts/cmd/cli/main.go diff --git a/apps/base/fts/cmd/main/main.go b/module/base/fts/cmd/main/main.go similarity index 82% rename from apps/base/fts/cmd/main/main.go rename to module/base/fts/cmd/main/main.go index 57ba81d..c362b21 100644 --- a/apps/base/fts/cmd/main/main.go +++ b/module/base/fts/cmd/main/main.go @@ -3,9 +3,9 @@ package service import ( "fmt" - "git.apinb.com/bsm-apps/fts/internal/config" - "git.apinb.com/bsm-apps/fts/internal/impl" - "git.apinb.com/bsm-apps/fts/internal/routers" + "bsm/full/module/base/fts/internal/config" + "bsm/full/module/base/fts/internal/impl" + "bsm/full/module/base/fts/internal/routers" "git.apinb.com/bsm-sdk/core/infra" "git.apinb.com/bsm-sdk/core/middleware" "github.com/gin-gonic/gin" @@ -44,3 +44,7 @@ func Run() { panic(err) } } + +func main() { + Run() +} diff --git a/apps/base/fts/docker-compose.yml b/module/base/fts/docker-compose.yml similarity index 100% rename from apps/base/fts/docker-compose.yml rename to module/base/fts/docker-compose.yml diff --git a/apps/base/fts/etc/fts_dev.yaml b/module/base/fts/etc/fts_dev.yaml similarity index 100% rename from apps/base/fts/etc/fts_dev.yaml rename to module/base/fts/etc/fts_dev.yaml diff --git a/apps/base/fts/etc/fts_prod.yaml b/module/base/fts/etc/fts_prod.yaml similarity index 100% rename from apps/base/fts/etc/fts_prod.yaml rename to module/base/fts/etc/fts_prod.yaml diff --git a/apps/base/fts/etc/fts_test.yaml b/module/base/fts/etc/fts_test.yaml similarity index 100% rename from apps/base/fts/etc/fts_test.yaml rename to module/base/fts/etc/fts_test.yaml diff --git a/apps/base/fts/etc/supervisor.bsm-apps-fts.conf b/module/base/fts/etc/supervisor.bsm-apps-fts.conf similarity index 100% rename from apps/base/fts/etc/supervisor.bsm-apps-fts.conf rename to module/base/fts/etc/supervisor.bsm-apps-fts.conf diff --git a/apps/base/fts/go.mod b/module/base/fts/go.mod similarity index 55% rename from apps/base/fts/go.mod rename to module/base/fts/go.mod index f85002d..70f684f 100644 --- a/apps/base/fts/go.mod +++ b/module/base/fts/go.mod @@ -1,4 +1,4 @@ -module git.apinb.com/bsm-apps/fts +module bsm/full/module/base/fts go 1.26.5 @@ -7,57 +7,55 @@ require ( github.com/gin-gonic/gin v1.12.0 github.com/minio/minio-go/v7 v7.0.95 github.com/patrickmn/go-cache v2.1.0+incompatible - go.etcd.io/etcd/client/v3 v3.6.12 - gorm.io/gorm v1.31.1 + go.etcd.io/etcd/client/v3 v3.7.1 + gorm.io/gorm v1.31.2 ) require ( filippo.io/edwards25519 v1.2.0 // indirect github.com/KyleBanks/depth v1.2.1 // indirect github.com/bytedance/gopkg v0.1.4 // indirect - github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/dustin/go-humanize v1.0.1 // indirect - github.com/go-openapi/jsonpointer v0.22.1 // indirect - github.com/go-openapi/jsonreference v0.21.2 // indirect - github.com/go-openapi/spec v0.22.0 // indirect - github.com/go-openapi/swag/conv v0.25.1 // indirect - github.com/go-openapi/swag/jsonname v0.25.1 // indirect - github.com/go-openapi/swag/jsonutils v0.25.1 // indirect - github.com/go-openapi/swag/loading v0.25.1 // indirect - github.com/go-openapi/swag/stringutils v0.25.1 // indirect - github.com/go-openapi/swag/typeutils v0.25.1 // indirect - github.com/go-openapi/swag/yamlutils v0.25.1 // indirect + github.com/go-openapi/jsonpointer v1.0.0 // indirect + github.com/go-openapi/jsonreference v1.0.0 // indirect + github.com/go-openapi/spec v0.22.9 // indirect + github.com/go-openapi/swag/conv v0.28.0 // indirect + github.com/go-openapi/swag/jsonutils v0.28.0 // indirect + github.com/go-openapi/swag/loading v0.28.0 // indirect + github.com/go-openapi/swag/pools v0.28.0 // indirect + github.com/go-openapi/swag/stringutils v0.28.0 // indirect + github.com/go-openapi/swag/typeutils v0.28.0 // indirect + github.com/go-openapi/swag/yamlutils v0.28.0 // indirect github.com/go-sql-driver/mysql v1.10.0 // indirect github.com/goccy/go-yaml v1.19.2 // indirect github.com/golang-jwt/jwt/v5 v5.3.1 // indirect - github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 // indirect - github.com/klauspost/compress v1.18.5 // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0 // indirect + github.com/klauspost/compress v1.19.2 // indirect github.com/minio/crc64nvme v1.1.1 // indirect github.com/philhofer/fwd v1.2.0 // indirect - github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/quic-go/qpack v0.6.0 // indirect - github.com/quic-go/quic-go v0.59.1 // indirect + github.com/quic-go/quic-go v0.61.0 // indirect github.com/rs/xid v1.6.0 // indirect github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect github.com/swaggo/swag v1.16.6 // indirect github.com/tinylib/msgp v1.4.0 // indirect - go.etcd.io/etcd/client/pkg/v3 v3.6.12 // indirect - go.mongodb.org/mongo-driver/v2 v2.6.0 // indirect + go.etcd.io/etcd/client/pkg/v3 v3.7.1 // indirect + go.mongodb.org/mongo-driver/v2 v2.8.0 // indirect go.uber.org/atomic v1.11.0 // indirect - go.yaml.in/yaml/v3 v3.0.4 // indirect - golang.org/x/mod v0.36.0 // indirect - golang.org/x/tools v0.44.0 // indirect - google.golang.org/grpc v1.81.1 // indirect + go.yaml.in/yaml/v3 v3.0.5 // indirect + golang.org/x/mod v0.37.0 // indirect + golang.org/x/tools v0.47.0 // indirect + google.golang.org/grpc v1.83.0 // indirect ) require ( github.com/bytedance/sonic v1.15.2 // indirect - github.com/bytedance/sonic/loader v0.5.1 // indirect + github.com/bytedance/sonic/loader v0.5.2 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/cloudwego/base64x v0.1.7 // indirect github.com/coreos/go-semver v0.3.1 // indirect github.com/coreos/go-systemd/v22 v22.7.0 // indirect - github.com/gabriel-vasile/mimetype v1.4.13 // indirect + github.com/gabriel-vasile/mimetype v1.4.15 // indirect github.com/gin-contrib/cors v1.7.7 // indirect github.com/gin-contrib/sse v1.1.1 // indirect github.com/go-ini/ini v1.67.0 // indirect @@ -66,7 +64,6 @@ require ( github.com/go-playground/universal-translator v0.18.1 // indirect github.com/go-playground/validator/v10 v10.30.3 // indirect github.com/goccy/go-json v0.10.6 // indirect - github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/google/uuid v1.6.0 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect @@ -76,36 +73,38 @@ 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/cpuid/v2 v2.3.0 // indirect - github.com/leodido/go-urn v1.4.0 // indirect - github.com/mattn/go-isatty v0.0.22 // indirect + github.com/klauspost/cpuid/v2 v2.4.0 // indirect + github.com/leodido/go-urn v1.5.0 // indirect + github.com/mattn/go-isatty v0.0.24 // indirect github.com/minio/md5-simd v1.1.2 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/oklog/ulid/v2 v2.1.1 // indirect - github.com/pelletier/go-toml/v2 v2.3.1 // indirect - github.com/redis/go-redis/v9 v9.20.0 // indirect + github.com/oklog/ulid/v2 v2.1.2 // indirect + github.com/pelletier/go-toml/v2 v2.4.3 // indirect + github.com/redis/go-redis/v9 v9.22.0 // indirect github.com/shirou/gopsutil v3.21.11+incompatible // indirect github.com/swaggo/files v1.0.1 github.com/swaggo/gin-swagger v1.6.1 github.com/tklauser/go-sysconf v0.4.0 // indirect github.com/tklauser/numcpus v0.12.0 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect - github.com/ugorji/go/codec v1.3.1 // indirect + github.com/ugorji/go/codec v1.3.2 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect - go.etcd.io/etcd/api/v3 v3.6.12 // indirect + go.etcd.io/etcd/api/v3 v3.7.1 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.28.0 // indirect - golang.org/x/arch v0.27.0 // indirect - golang.org/x/crypto v0.52.0 // indirect - golang.org/x/net v0.55.0 // indirect - golang.org/x/sync v0.20.0 // indirect - golang.org/x/sys v0.45.0 // indirect - golang.org/x/text v0.37.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa // indirect + golang.org/x/arch v0.30.0 // indirect + golang.org/x/crypto v0.54.0 // indirect + golang.org/x/net v0.57.0 // indirect + golang.org/x/sync v0.22.0 // indirect + golang.org/x/sys v0.47.0 // indirect + golang.org/x/text v0.40.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea // indirect google.golang.org/protobuf v1.36.11 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect gorm.io/driver/mysql v1.6.0 // indirect - gorm.io/driver/postgres v1.6.0 // indirect + gorm.io/driver/postgres v1.6.2 // indirect ) + +replace git.apinb.com/bsm-sdk/core => D:/work/bsm-sdk/core diff --git a/apps/base/fts/go.sum b/module/base/fts/go.sum similarity index 62% rename from apps/base/fts/go.sum rename to module/base/fts/go.sum index fb5825a..fb96083 100644 --- a/apps/base/fts/go.sum +++ b/module/base/fts/go.sum @@ -1,7 +1,5 @@ filippo.io/edwards25519 v1.2.0 h1:crnVqOiS4jqYleHd9vaKZ+HKtHfllngJIiOpNpoJsjo= filippo.io/edwards25519 v1.2.0/go.mod h1:xzAOLCNug/yB62zG1bQ8uziwrIqIuxhctzJT18Q77mc= -git.apinb.com/bsm-sdk/core v0.2.0 h1:/e9yqpsbKBrRgMiGpS3KX2O4qDLxo5V5GpPSLNGxEKw= -git.apinb.com/bsm-sdk/core v0.2.0/go.mod h1:E9T6Eboo/0Zb36BjkKbIgvFzq4fQ2Q8P/7y5zmYTI6Y= github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc= github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE= github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs= @@ -12,8 +10,8 @@ github.com/bytedance/gopkg v0.1.4 h1:oZnQwnX82KAIWb7033bEwtxvTqXcYMxDBaQxo5JJHWM github.com/bytedance/gopkg v0.1.4/go.mod h1:v1zWfPm21Fb+OsyXN2VAHdL6TBb2L88anLQgdyje6R4= github.com/bytedance/sonic v1.15.2 h1:90H+rcF/FwLXwfB1cudOLq/je83n683Utf4Cbp0xHCo= github.com/bytedance/sonic v1.15.2/go.mod h1:mT2NbXunuaEbnZ+mRIX/vYqKISmgEuHFDI4UzmKx2SA= -github.com/bytedance/sonic/loader v0.5.1 h1:Ygpfa9zwRCCKSlrp5bBP/b/Xzc3VxsAW+5NIYXrOOpI= -github.com/bytedance/sonic/loader v0.5.1/go.mod h1:AR4NYCk5DdzZizZ5djGqQ92eEhCCcdf5x77udYiSJRo= +github.com/bytedance/sonic/loader v0.5.2 h1:0QtP1gevc1OZ6/H8Lb9BRZiCXd1Ftjd3OKuj1T1lBIo= +github.com/bytedance/sonic/loader v0.5.2/go.mod h1:AR4NYCk5DdzZizZ5djGqQ92eEhCCcdf5x77udYiSJRo= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cloudwego/base64x v0.1.7 h1:NppS+Fgzg5ovhn4NkUXaDT3x9jldgH5ToMCqzBSi2zI= @@ -28,8 +26,8 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= -github.com/gabriel-vasile/mimetype v1.4.13 h1:46nXokslUBsAJE/wMsp5gtO500a4F3Nkz9Ufpk2AcUM= -github.com/gabriel-vasile/mimetype v1.4.13/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s= +github.com/gabriel-vasile/mimetype v1.4.15 h1:05iP/CYtZ/w455R/KZM6rZ5ieAdh99UPtd+d3YzLmaI= +github.com/gabriel-vasile/mimetype v1.4.15/go.mod h1:azpTcoLcDZRNgFou5j+APrqQx9HqVPWa6ijYQIIVswQ= github.com/gin-contrib/cors v1.7.7 h1:Oh9joP463x7Mw72vhvJ61YQm8ODh9b04YR7vsOErD0Q= github.com/gin-contrib/cors v1.7.7/go.mod h1:K5tW0RkzJtWSiOdikXloy8VEZlgdVNpHNw8FpjUPNrE= github.com/gin-contrib/gzip v0.0.6 h1:NjcunTcGAj5CO1gn4N8jHOSIeRFHIbn51z6K+xaN4d4= @@ -40,36 +38,40 @@ github.com/gin-gonic/gin v1.12.0 h1:b3YAbrZtnf8N//yjKeU2+MQsh2mY5htkZidOM7O0wG8= github.com/gin-gonic/gin v1.12.0/go.mod h1:VxccKfsSllpKshkBWgVgRniFFAzFb9csfngsqANjnLc= github.com/go-ini/ini v1.67.0 h1:z6ZrTEZqSWOTyH2FlglNbNgARyHG8oLW9gMELqKr06A= github.com/go-ini/ini v1.67.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8= -github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= -github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.4 h1:tG4xh9yMsRCAiodLVTxyrkzSZ9+o0L1Kg/+cPVcbP/8= +github.com/go-logr/logr v1.4.4/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE= github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78= -github.com/go-openapi/jsonpointer v0.22.1 h1:sHYI1He3b9NqJ4wXLoJDKmUmHkWy/L7rtEo92JUxBNk= -github.com/go-openapi/jsonpointer v0.22.1/go.mod h1:pQT9OsLkfz1yWoMgYFy4x3U5GY5nUlsOn1qSBH5MkCM= -github.com/go-openapi/jsonreference v0.21.2 h1:Wxjda4M/BBQllegefXrY/9aq1fxBA8sI5M/lFU6tSWU= -github.com/go-openapi/jsonreference v0.21.2/go.mod h1:pp3PEjIsJ9CZDGCNOyXIQxsNuroxm8FAJ/+quA0yKzQ= -github.com/go-openapi/spec v0.22.0 h1:xT/EsX4frL3U09QviRIZXvkh80yibxQmtoEvyqug0Tw= -github.com/go-openapi/spec v0.22.0/go.mod h1:K0FhKxkez8YNS94XzF8YKEMULbFrRw4m15i2YUht4L0= -github.com/go-openapi/swag v0.19.15 h1:D2NRCBzS9/pEY3gP9Nl8aDqGUcPFrwG2p+CNFrLyrCM= -github.com/go-openapi/swag/conv v0.25.1 h1:+9o8YUg6QuqqBM5X6rYL/p1dpWeZRhoIt9x7CCP+he0= -github.com/go-openapi/swag/conv v0.25.1/go.mod h1:Z1mFEGPfyIKPu0806khI3zF+/EUXde+fdeksUl2NiDs= -github.com/go-openapi/swag/jsonname v0.25.1 h1:Sgx+qbwa4ej6AomWC6pEfXrA6uP2RkaNjA9BR8a1RJU= -github.com/go-openapi/swag/jsonname v0.25.1/go.mod h1:71Tekow6UOLBD3wS7XhdT98g5J5GR13NOTQ9/6Q11Zo= -github.com/go-openapi/swag/jsonutils v0.25.1 h1:AihLHaD0brrkJoMqEZOBNzTLnk81Kg9cWr+SPtxtgl8= -github.com/go-openapi/swag/jsonutils v0.25.1/go.mod h1:JpEkAjxQXpiaHmRO04N1zE4qbUEg3b7Udll7AMGTNOo= -github.com/go-openapi/swag/jsonutils/fixtures_test v0.25.1 h1:DSQGcdB6G0N9c/KhtpYc71PzzGEIc/fZ1no35x4/XBY= -github.com/go-openapi/swag/jsonutils/fixtures_test v0.25.1/go.mod h1:kjmweouyPwRUEYMSrbAidoLMGeJ5p6zdHi9BgZiqmsg= -github.com/go-openapi/swag/loading v0.25.1 h1:6OruqzjWoJyanZOim58iG2vj934TysYVptyaoXS24kw= -github.com/go-openapi/swag/loading v0.25.1/go.mod h1:xoIe2EG32NOYYbqxvXgPzne989bWvSNoWoyQVWEZicc= -github.com/go-openapi/swag/stringutils v0.25.1 h1:Xasqgjvk30eUe8VKdmyzKtjkVjeiXx1Iz0zDfMNpPbw= -github.com/go-openapi/swag/stringutils v0.25.1/go.mod h1:JLdSAq5169HaiDUbTvArA2yQxmgn4D6h4A+4HqVvAYg= -github.com/go-openapi/swag/typeutils v0.25.1 h1:rD/9HsEQieewNt6/k+JBwkxuAHktFtH3I3ysiFZqukA= -github.com/go-openapi/swag/typeutils v0.25.1/go.mod h1:9McMC/oCdS4BKwk2shEB7x17P6HmMmA6dQRtAkSnNb8= -github.com/go-openapi/swag/yamlutils v0.25.1 h1:mry5ez8joJwzvMbaTGLhw8pXUnhDK91oSJLDPF1bmGk= -github.com/go-openapi/swag/yamlutils v0.25.1/go.mod h1:cm9ywbzncy3y6uPm/97ysW8+wZ09qsks+9RS8fLWKqg= +github.com/go-openapi/jsonpointer v1.0.0 h1:kR9tHqY0CtZaOPVFm622dPVNhrvYpwr4uCxgL3h1H8s= +github.com/go-openapi/jsonpointer v1.0.0/go.mod h1:Z3rw7dWu1p9IgitXCFamSlA5lmDiklEB6vkaxcNZW5Y= +github.com/go-openapi/jsonreference v1.0.0 h1:jlmTr6torcd1YgDQvSfNmRtKzYDO4FGBkrAdlAVWnpY= +github.com/go-openapi/jsonreference v1.0.0/go.mod h1:jtwdyGbJk0Xhe5Y+rwtglQP6Sb1WZST4rT32LWB+sv0= +github.com/go-openapi/spec v0.22.9 h1:/vKIFDcGKp0ktZWGbym/tJEWbk6/XOEmAVU0kqKMH+w= +github.com/go-openapi/spec v0.22.9/go.mod h1:b/mNUYIOQOyIiUzUzXEE8xzyZqf93KvM9hQGP91yfl0= +github.com/go-openapi/swag v0.28.0 h1:xkgbOSKj6DZziNpyqRRAOt3GJGtgjgsd2RoyT30VWuw= +github.com/go-openapi/swag/conv v0.28.0 h1:GtqqbyFe7vR5Y7ehxG9W6/OvrSFdf1OLeTGp40TqxH8= +github.com/go-openapi/swag/conv v0.28.0/go.mod h1:mbUE+mzctnhxi864m0Q07SpN8OowD9JhxmxuYvZZD/k= +github.com/go-openapi/swag/jsonutils v0.28.0 h1:YIch6FwO7RXzeAnbO8Tu7dWBZeUEH+4nA0HXltVTnv4= +github.com/go-openapi/swag/jsonutils v0.28.0/go.mod h1:CYM3WlTUcagR2ZoHdz54di/cbBqt82tuxuXgAjxw+mg= +github.com/go-openapi/swag/jsonutils/fixtures_test v0.28.0 h1:qV+VVUAx5Oro8WjVWpZeql7YReTKhT4smR4zhcOQZr0= +github.com/go-openapi/swag/jsonutils/fixtures_test v0.28.0/go.mod h1:mofwUWx70wvskwESqRJ//k/9kURmCgyJl5m5Ppoh5kY= +github.com/go-openapi/swag/loading v0.28.0 h1:td8QZdZC9MIYGGSnSPKShKiK22I2tU5UQvuUhIBPRLU= +github.com/go-openapi/swag/loading v0.28.0/go.mod h1:rXB0QiQX5mMveXEA7ouM4KiiM9jVJe4K6BVbwhD1M4k= +github.com/go-openapi/swag/pools v0.28.0 h1:HPMZWSAfce3rdVTFcjFiCIBtDg9h4x2QlRrHipwhxeU= +github.com/go-openapi/swag/pools v0.28.0/go.mod h1:kVQefhSK5RWuRe7BXsL8htgBPAMpN7HDGpGEknqugeE= +github.com/go-openapi/swag/stringutils v0.28.0 h1:ixsc9iYgDPubHL/8nSkbnryEHpD2VRlBMLKpQyPXcDU= +github.com/go-openapi/swag/stringutils v0.28.0/go.mod h1:lzRN95CxXmA03XcDWHLOb6nOMcxCqR5rGY0lOgsfRoM= +github.com/go-openapi/swag/typeutils v0.28.0 h1:nRBKSBXjDgf01VDPB3fWeD9nQuhCOVeIYAkUx2tbkyY= +github.com/go-openapi/swag/typeutils v0.28.0/go.mod h1:Srm0xFNRZ1Y+vCxJclo5qzx8aj+1pAKda/YfFPrG0dQ= +github.com/go-openapi/swag/yamlutils v0.28.0 h1:TV3JXH6DS46KUroDtMLAYHGkdWf5VDq3wVWFirmzROY= +github.com/go-openapi/swag/yamlutils v0.28.0/go.mod h1:x0q/yndZHEgk9Rx3DyDqzFUmHy55KTvIZldvF2dTJXs= +github.com/go-openapi/testify/enable/yaml/v2 v2.6.0 h1:gGHwAJ0R/5jU8BEGDbfRNR3hL68dAVi84WuOApp29B0= +github.com/go-openapi/testify/enable/yaml/v2 v2.6.0/go.mod h1:tY+St1SGq4NFl0QIqdTY4aEdbChAHxhyB77XQi9iJCo= +github.com/go-openapi/testify/v2 v2.6.0 h1:5PKH2HE7YJ/LuRPQGvSxBRlFXNQhSetBLlGAgUEu3ug= +github.com/go-openapi/testify/v2 v2.6.0/go.mod h1:SgsVHtfooshd0tublTtJ50FPKhujf47YRqauXXOUxfw= github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= @@ -84,8 +86,6 @@ github.com/goccy/go-json v0.10.6 h1:p8HrPJzOakx/mn/bQtjgNjdTcN+/S6FcG2CTtQOrHVU= github.com/goccy/go-json v0.10.6/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= github.com/goccy/go-yaml v1.19.2 h1:PmFC1S6h8ljIz6gMRBopkjP1TVT7xuwrButHID66PoM= github.com/goccy/go-yaml v1.19.2/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA= -github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= -github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt/v5 v5.3.1 h1:kYf81DTWFe7t+1VvL7eS+jKFVWaUnK9cB1qbwn63YCY= github.com/golang-jwt/jwt/v5 v5.3.1/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= @@ -95,8 +95,8 @@ github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= 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/grpc-ecosystem/grpc-gateway/v2 v2.29.0 h1:5VipnvEpbqr2gA2VbM+nYVbkIF28c5ZQfqCBQ5g2xfk= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0/go.mod h1:Hyl3n6Twe1hvtd9XUXDec4pTvgMSEixRuQKPTMH2bNs= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0 h1:/Tnpcb2E0Pz/tN9s3bfEY2Q8ePCEX9iuS+cneUwncnw= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0/go.mod h1:zOBXOsUaBSjKgmH4OGzV1esUpR3oUSCPYVd2cUBjKYY= 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= @@ -111,21 +111,21 @@ github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= -github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= -github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.18.5 h1:/h1gH5Ce+VWNLSWqPzOVn6XBO+vJbCNGvjoaGBFW2IE= -github.com/klauspost/compress v1.18.5/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ= +github.com/klauspost/compress v1.19.2 h1:hMRETovs/pu/dVWN7zIT1PGG8t509MwT6bO7XSi26R8= +github.com/klauspost/compress v1.19.2/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ= github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= -github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y= -github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0= +github.com/klauspost/cpuid/v2 v2.4.0 h1:S6Hrbc7+ywsr0r+RLapfGBHfyefhCTwEh3A0tV913Dw= +github.com/klauspost/cpuid/v2 v2.4.0/go.mod h1:19jmZ9mjzoF//ddRSUsv0zfBTJWh3QJh9FNxZTMrGxU= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= -github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= -github.com/mattn/go-isatty v0.0.22 h1:j8l17JJ9i6VGPUFUYoTUKPSgKe/83EYU2zBC7YNKMw4= -github.com/mattn/go-isatty v0.0.22/go.mod h1:ZXfXG4SQHsB/w3ZeOYbR0PrPwLy+n6xiMrJlRFqopa4= +github.com/leodido/go-urn v1.5.0 h1:pLqT2kq1zpHW/1D18QMjMpdtX7cekxqtJJjg5ANyWw0= +github.com/leodido/go-urn v1.5.0/go.mod h1:9BORnCDhdPBJNDEX+w1bJisa8yOKYi116VeO96s4ifE= +github.com/mattn/go-isatty v0.0.24 h1:tGZZoVgT/KiqK1c8ocVLeDS8BSWMRd47J3Lbz7vsReI= +github.com/mattn/go-isatty v0.0.24/go.mod h1:nMCL3Zebbrt45jsMDgnfIwz6ydEQApk5oEI3HqDio6A= +github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= +github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= github.com/minio/crc64nvme v1.1.1 h1:8dwx/Pz49suywbO+auHCBpCtlW1OfpcLN7wYgVR6wAI= github.com/minio/crc64nvme v1.1.1/go.mod h1:eVfm2fAzLlxMdUGc0EEBGSMmPwmXD5XiNRpnu9J3bvg= github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34= @@ -137,24 +137,26 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/oklog/ulid/v2 v2.1.1 h1:suPZ4ARWLOJLegGFiZZ1dFAkqzhMjL3J1TzI+5wHz8s= -github.com/oklog/ulid/v2 v2.1.1/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ= +github.com/oklog/ulid/v2 v2.1.2 h1:IEclFb9JNvzYA6MW2SCxbLzcHTVsfqm3PrqGQJH5zec= +github.com/oklog/ulid/v2 v2.1.2/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ= github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= github.com/pborman/getopt v0.0.0-20170112200414-7148bc3a4c30/go.mod h1:85jBQOZwpVEaDAr341tbn15RS4fCAsIst0qp7i8ex1o= -github.com/pelletier/go-toml/v2 v2.3.1 h1:MYEvvGnQjeNkRF1qUuGolNtNExTDwct51yp7olPtrEc= -github.com/pelletier/go-toml/v2 v2.3.1/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY= +github.com/pelletier/go-toml/v2 v2.4.3 h1:GTRvJQutkOSftxIFD5xw9aepkYNuPWmVJpffdDPYVpY= +github.com/pelletier/go-toml/v2 v2.4.3/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY= github.com/philhofer/fwd v1.2.0 h1:e6DnBTl7vGY+Gz322/ASL4Gyp1FspeMvx1RNDoToZuM= github.com/philhofer/fwd v1.2.0/go.mod h1:RqIHx9QI14HlwKwm98g9Re5prTQ6LdeRQn+gXJFxsJM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/quic-go/go-ossfuzz-seeds v0.1.0 h1:APacT+iIaNF6fd8AGEiN3bT/Jtkd2jz4v4TzM7MFjy0= +github.com/quic-go/go-ossfuzz-seeds v0.1.0/go.mod h1:3IOHRbJIc+L6YKMwfDtJAM9Vj9k0YY4muhuyUYk5tbk= github.com/quic-go/qpack v0.6.0 h1:g7W+BMYynC1LbYLSqRt8PBg5Tgwxn214ZZR34VIOjz8= github.com/quic-go/qpack v0.6.0/go.mod h1:lUpLKChi8njB4ty2bFLX2x4gzDqXwUpaO1DP9qMDZII= -github.com/quic-go/quic-go v0.59.1 h1:0Gmua0HW1Tv7ANR7hUYwRyD0MG5OJfgvYSZasGZzBic= -github.com/quic-go/quic-go v0.59.1/go.mod h1:upnsH4Ju1YkqpLXC305eW3yDZ4NfnNbmQRCMWS58IKU= -github.com/redis/go-redis/v9 v9.20.0 h1:WnQYxLkgO2xiXTCJY0ldIiI8dNqCDlQAG+AtaH7a2a0= -github.com/redis/go-redis/v9 v9.20.0/go.mod h1:v/M13XI1PVCDcm01VtPFOADfZtHf8YW3baQf57KlIkA= +github.com/quic-go/quic-go v0.61.0 h1:ui88A53s8MSVYLC56en0KQ17HARk+9986Dn0SBfKNvA= +github.com/quic-go/quic-go v0.61.0/go.mod h1:9So2anK4Tp22URSQq00k+Vo2PNkle96ycDPDHL4s9vs= +github.com/redis/go-redis/v9 v9.22.0 h1:laDvpYXTJtZLloinw1fA5Kqd6HAEH2XKxOkG/PDq2F0= +github.com/redis/go-redis/v9 v9.22.0/go.mod h1:y2g0Wj8rQvuK0ELM+oxSudcLtC09JScs98I/X9gRWY4= github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= github.com/rs/xid v1.6.0 h1:fV591PaemRlL6JfRxGDEPl69wICngIQ3shQtzfy2gxU= @@ -189,35 +191,33 @@ github.com/tklauser/numcpus v0.12.0 h1:NR85qdvHA9pFse3x3weVZ0r0ST8R6l5RHbZrlRaqo github.com/tklauser/numcpus v0.12.0/go.mod h1:ABHeXzJnr/qqwguhClkZKT1/8VABcYrsyUiUGobwWJg= github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= -github.com/ugorji/go/codec v1.3.1 h1:waO7eEiFDwidsBN6agj1vJQ4AG7lh2yqXyOXqhgQuyY= -github.com/ugorji/go/codec v1.3.1/go.mod h1:pRBVtBSKl77K30Bv8R2P+cLSGaTtex6fsA2Wjqmfxj4= -github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/ugorji/go/codec v1.3.2 h1:zkEASHHyEClGeURfgNT9PJZVfAbs9oEX9QXggwWNJbc= +github.com/ugorji/go/codec v1.3.2/go.mod h1:pRBVtBSKl77K30Bv8R2P+cLSGaTtex6fsA2Wjqmfxj4= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= github.com/zeebo/xxh3 v1.1.0 h1:s7DLGDK45Dyfg7++yxI0khrfwq9661w9EN78eP/UZVs= github.com/zeebo/xxh3 v1.1.0/go.mod h1:IisAie1LELR4xhVinxWS5+zf1lA4p0MW4T+w+W07F5s= -go.etcd.io/etcd/api/v3 v3.6.12 h1:OLOZUKEuAA36TR48F0cIaa8FdzrWygjyfrJxXg4iDgs= -go.etcd.io/etcd/api/v3 v3.6.12/go.mod h1:p14EIQXHbuOQbVvL/WEes5uqKnxP9AgKJgpjbMVvzvE= -go.etcd.io/etcd/client/pkg/v3 v3.6.12 h1:36zzB+pQOdHbhN+kH2iJz/K8bJn0ZLtLfPPO7jozTDo= -go.etcd.io/etcd/client/pkg/v3 v3.6.12/go.mod h1:hh2+ZXtfLzs3o6mn92ntgNPBrTJJOvXqICM5g3L3DMY= -go.etcd.io/etcd/client/v3 v3.6.12 h1:kMSP6JcPZMqSJiX+TXdUIBU/4eXEZWBAaui4VihMbIc= -go.etcd.io/etcd/client/v3 v3.6.12/go.mod h1:CMs6fJWYiZQk4ytFjd4lE1diOvvRMmtbbn/alZXd3dQ= -go.mongodb.org/mongo-driver/v2 v2.6.0 h1:b9sJOYrkmt4l8bY43ZenFBcPlhYIjaOfYHLtbB/5qi8= -go.mongodb.org/mongo-driver/v2 v2.6.0/go.mod h1:yOI9kBsufol30iFsl1slpdq1I0eHPzybRWdyYUs8K/0= +go.etcd.io/etcd/api/v3 v3.7.1 h1:KJG0/DcWGfe3Y1otDf/fsBf0TSSgpxZ5RO/L8SFt73E= +go.etcd.io/etcd/api/v3 v3.7.1/go.mod h1:8bXIpCMeV7E3/XL0Ix123ATn3dB+0V7d9zklHbB0m78= +go.etcd.io/etcd/client/pkg/v3 v3.7.1 h1:rKYsj3pRkR0eK3yjT3XOgrhqfmIfj9pzNgxjh7mfFv4= +go.etcd.io/etcd/client/pkg/v3 v3.7.1/go.mod h1:cnzZGIUzSfjEwLC6UBVsSXlEK1eepS/JUD7wE6PLRT0= +go.etcd.io/etcd/client/v3 v3.7.1 h1:0PEMMC0KuZmVIN+RAbdqfkZ45pYTgKVtmBEbRCvZFUg= +go.etcd.io/etcd/client/v3 v3.7.1/go.mod h1:ffNqALa8tRCYhYo1F9oR489y23K39Gz+BSR3ApAGYq0= +go.mongodb.org/mongo-driver/v2 v2.8.0 h1:CxWDGQYY8QQwNjAl/aq2sfWakdnWZynnqJ9F4DhHbP8= +go.mongodb.org/mongo-driver/v2 v2.8.0/go.mod h1:yOI9kBsufol30iFsl1slpdq1I0eHPzybRWdyYUs8K/0= go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64= go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y= -go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I= -go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0= -go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM= -go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY= -go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg= -go.opentelemetry.io/otel/sdk v1.43.0/go.mod h1:P+IkVU3iWukmiit/Yf9AWvpyRDlUeBaRg6Y+C58QHzg= -go.opentelemetry.io/otel/sdk/metric v1.43.0 h1:S88dyqXjJkuBNLeMcVPRFXpRw2fuwdvfCGLEo89fDkw= -go.opentelemetry.io/otel/sdk/metric v1.43.0/go.mod h1:C/RJtwSEJ5hzTiUz5pXF1kILHStzb9zFlIEe85bhj6A= -go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A= -go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0= +go.opentelemetry.io/otel v1.45.0 h1:pdrWmLHofpubmArBv1LgFSv1Z0Ie/ppdZzu+kUN5EeU= +go.opentelemetry.io/otel v1.45.0/go.mod h1:XZxIqPapzEYnhNSScF5DIqXhm/rYi0FzCe2XddAwZfQ= +go.opentelemetry.io/otel/metric v1.45.0 h1:7Eg1uH7CJ5cXv9is6tnBe1FI6rj1nwUdbFypRm3br/M= +go.opentelemetry.io/otel/metric v1.45.0/go.mod h1:HAPbm1nd3p1PmFH7v2dR+6BjXxw+Lq4a2+pndMAm08s= +go.opentelemetry.io/otel/sdk v1.45.0 h1:4VVSMgQ83dUgW2aoX5f6JgLvHwIvzcuLnF9lUdCSpCw= +go.opentelemetry.io/otel/sdk v1.45.0/go.mod h1:Sr40LgXV7DsKMMJMKOhUWOgMWTfAaqvm2kF0g7ilwuA= +go.opentelemetry.io/otel/sdk/metric v1.44.0 h1:3LlKgI+VjbVsjNRFZJZAJ30WjXC5VkNRks6si09iEfI= +go.opentelemetry.io/otel/sdk/metric v1.44.0/go.mod h1:5B5pMARnXxKhltooO4xUuCBorl65a4EpnTalObqOigA= +go.opentelemetry.io/otel/trace v1.45.0 h1:l/mP6Uv7oNO7/TblbhpbgMidxhq1uO/rPsikOyVhxag= +go.opentelemetry.io/otel/trace v1.45.0/go.mod h1:qoJJA2xNMnxRrdISU/kLtfUH2wNeQbiv+jhs/CxI8bc= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= @@ -228,48 +228,37 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.28.0 h1:IZzaP1Fv73/T/pBMLk4VutPl36uNC+OSUh3JLG3FIjo= go.uber.org/zap v1.28.0/go.mod h1:rDLpOi171uODNm/mxFcuYWxDsqWSAVkFdX4XojSKg/Q= -go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= -go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= -golang.org/x/arch v0.27.0 h1:0WNVcR8u9yFz8j5FvdHpgwNp3FS5U4guYdzHwEiGjoU= -golang.org/x/arch v0.27.0/go.mod h1:0X+GdSIP+kL5wPmpK7sdkEVTt2XoYP0cSjQSbZBwOi8= +go.yaml.in/yaml/v3 v3.0.5 h1:N6y/pJk8buWs9NY5ERU2HSMfm+IuD/OtfdAnq6kESPw= +go.yaml.in/yaml/v3 v3.0.5/go.mod h1:HVTZu1O7/Vkt2N+BFy8Zza+lnLsABggaTM2ZpNIGuKg= +golang.org/x/arch v0.30.0 h1:sB9h+1gRGa2+LauFSV0tm8bK1J2yo1bx6/Uyi/P6DTU= +golang.org/x/arch v0.30.0/go.mod h1:0X+GdSIP+kL5wPmpK7sdkEVTt2XoYP0cSjQSbZBwOi8= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.52.0 h1:RMs7fP2rXdep0CftQlK8Uf+kibLm7qkCcradZWYz988= -golang.org/x/crypto v0.52.0/go.mod h1:1QgfPxDqh0T2M/elOJtp9RvuR95kVjir0e6/BvEmGbc= -golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/crypto v0.54.0 h1:YLIA59K4fiNzHzjnZt2tUJQjQtUWfWbeHBqKtk3eScw= +golang.org/x/crypto v0.54.0/go.mod h1:KWL8ny2AZdGR2cWmzeHrp2azQPGogOv+HeQaVEXC2dk= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.36.0 h1:JJjpVx6myfUsUdAzZuOSTTmRE0PfZeNWzzvKrP7amb4= -golang.org/x/mod v0.36.0/go.mod h1:moc6ELqsWcOw5Ef3xVprK5ul/MvtVvkIXLziUOICjUQ= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/mod v0.37.0 h1:vF1DjpVEshcIqoEaauuHebaLk1O1forxjxBaVn884JQ= +golang.org/x/mod v0.37.0/go.mod h1:m8S8VeM9r4dzDwjrKO0a1sZP3YjeMamRRlD+fmR2Q/0= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -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-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8= -golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww= +golang.org/x/net v0.57.0 h1:K5+3DljvIuDG9/Jv9rvyMywYNFCQ9RSUY6OOTTkT+tE= +golang.org/x/net v0.57.0/go.mod h1:KpXc8iv+r3XplLAG/f7Jsf9RPszJzdR0f58q9vGOuEU= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -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-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4= -golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= +golang.org/x/sync v0.22.0 h1:SZjpbeLmrCk4xhRSZFNZW5gFUeCeFgjekvI/+gfScek= +golang.org/x/sync v0.22.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY= -golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs= +golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= @@ -277,27 +266,22 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc= -golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38= +golang.org/x/text v0.40.0 h1:Ub2Z6/xjgF1WrYQz2nuITOEegKFtiIy+rieRJ5lHZKs= +golang.org/x/text v0.40.0/go.mod h1:hpnzDAfGV753zIKo+wk3u1bVKCGPbrnF7+7LBF/UHVY= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.44.0 h1:UP4ajHPIcuMjT1GqzDWRlalUEoY+uzoZKnhOjbIPD2c= -golang.org/x/tools v0.44.0/go.mod h1:KA0AfVErSdxRZIsOVipbv3rQhVXTnlU6UhKxHd1seDI= +golang.org/x/tools v0.47.0 h1:7Kn5x/d1svx/PzryTsqeoZN4TZwqeH5pGWjefhLi/1Q= +golang.org/x/tools v0.47.0/go.mod h1:dFHnyTvFWY212G+h7ZY4Vsp/K3U4/7W9TyVaAul8uCA= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -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= gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4= gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E= -google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa h1:Kjn0N0tCrDgiAFW+lGO4JZ3ck44CehvJQMAwj9QF0G8= -google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:q4lMZS6kskjT5HvCPrnnypcDPVJqT/f4nfxmkE7gryY= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa h1:mZHHdPZl0dbGHCflZgAq/Q468DWVFcU2whhB2KAo8fk= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= -google.golang.org/grpc v1.81.1 h1:VnnIIZ88UzOOKLukQi+ImGz8O1Wdp8nAGGnvOfEIWQQ= -google.golang.org/grpc v1.81.1/go.mod h1:xGH9GfzOyMTGIOXBJmXt+BX/V0kcdQbdcuwQ/zNw42I= +google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea h1:Jifw/kjs/r3B0uszvls/m3c3tmZs2YHGM9C+rvxP9gY= +google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea/go.mod h1:K/+WGbmBY7aNW1HDw1fJnKYo10i0DkAX6pows00dLig= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea h1:kVhQEPTpKQahD5+JSBTfBB19wcgQTTjAIn45MBqnyHk= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= +google.golang.org/grpc v1.83.0 h1:JeNZEKJFbQxArAMl+hiytHauacDNqJUllNfmIMmpqnQ= +google.golang.org/grpc v1.83.0/go.mod h1:kDyl6SKsiHKt0uylY5gtn5cEjkrIOhQOGDgIc4JGwzQ= google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE= google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -308,7 +292,9 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gorm.io/driver/mysql v1.6.0 h1:eNbLmNTpPpTOVZi8MMxCi2aaIm0ZpInbORNXDwyLGvg= gorm.io/driver/mysql v1.6.0/go.mod h1:D/oCC2GWK3M/dqoLxnOlaNKmXz8WNTfcS9y5ovaSqKo= -gorm.io/driver/postgres v1.6.0 h1:2dxzU8xJ+ivvqTRph34QX+WrRaJlmfyPqXmoGVjMBa4= -gorm.io/driver/postgres v1.6.0/go.mod h1:vUw0mrGgrTK+uPHEhAdV4sfFELrByKVGnaVRkXDhtWo= -gorm.io/gorm v1.31.1 h1:7CA8FTFz/gRfgqgpeKIBcervUn3xSyPUmr6B2WXJ7kg= -gorm.io/gorm v1.31.1/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs= +gorm.io/driver/postgres v1.6.2 h1:BvXQ/cNUg63q5TFNg672DmDcowZSFrNLkkA3Xe6GXq4= +gorm.io/driver/postgres v1.6.2/go.mod h1:0c4fQA44XhOklXDkgtuKqysHCycTa5i9e3EIpDGCwXk= +gorm.io/driver/sqlite v1.6.0 h1:WHRRrIiulaPiPFmDcod6prc4l2VGVWHz80KspNsxSfQ= +gorm.io/driver/sqlite v1.6.0/go.mod h1:AO9V1qIQddBESngQUKWL9yoH93HIeA1X6V633rBwyT8= +gorm.io/gorm v1.31.2 h1:3o8FXNo9v9S858gil+3LlZA1LkCOzgb4g5BL64FgaCo= +gorm.io/gorm v1.31.2/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs= diff --git a/apps/base/fts/internal/config/config.go b/module/base/fts/internal/config/config.go similarity index 100% rename from apps/base/fts/internal/config/config.go rename to module/base/fts/internal/config/config.go diff --git a/apps/base/fts/internal/errors/errors.go b/module/base/fts/internal/errors/errors.go similarity index 100% rename from apps/base/fts/internal/errors/errors.go rename to module/base/fts/internal/errors/errors.go diff --git a/apps/base/cloud/internal/impl/impl.go b/module/base/fts/internal/impl/impl.go similarity index 92% rename from apps/base/cloud/internal/impl/impl.go rename to module/base/fts/internal/impl/impl.go index fdfcf0b..9e74f49 100644 --- a/apps/base/cloud/internal/impl/impl.go +++ b/module/base/fts/internal/impl/impl.go @@ -1,7 +1,7 @@ package impl import ( - "git.apinb.com/bsm-apps/cloud/internal/config" + "bsm/full/module/base/fts/internal/config" "git.apinb.com/bsm-sdk/core/cache/redis" "git.apinb.com/bsm-sdk/core/with" cache "github.com/patrickmn/go-cache" diff --git a/apps/base/fts/internal/logic/config.go b/module/base/fts/internal/logic/config.go similarity index 79% rename from apps/base/fts/internal/logic/config.go rename to module/base/fts/internal/logic/config.go index dd7265c..a284a40 100644 --- a/apps/base/fts/internal/logic/config.go +++ b/module/base/fts/internal/logic/config.go @@ -1,7 +1,7 @@ package logic import ( - "git.apinb.com/bsm-apps/fts/internal/config" + "bsm/full/module/base/fts/internal/config" "git.apinb.com/bsm-sdk/core/infra" "github.com/gin-gonic/gin" ) diff --git a/apps/base/fts/internal/logic/fetch.go b/module/base/fts/internal/logic/fetch.go similarity index 81% rename from apps/base/fts/internal/logic/fetch.go rename to module/base/fts/internal/logic/fetch.go index 2a738a5..22894dd 100644 --- a/apps/base/fts/internal/logic/fetch.go +++ b/module/base/fts/internal/logic/fetch.go @@ -4,9 +4,9 @@ package logic // "context" // "net/http" -// "git.apinb.com/bsm-apps/fts/internal/models" -// "git.apinb.com/bsm-apps/fts/internal/svc" -// "git.apinb.com/bsm-apps/fts/internal/types" +// "bsm/full/module/base/fts/internal/models" +// "bsm/full/module/base/fts/internal/svc" +// "bsm/full/module/base/fts/internal/types" // "git.apinb.com/bsm-sdk/core/exception" // "github.com/zeromicro/go-zero/core/logx" diff --git a/apps/base/fts/internal/logic/handler.go b/module/base/fts/internal/logic/handler.go similarity index 95% rename from apps/base/fts/internal/logic/handler.go rename to module/base/fts/internal/logic/handler.go index 0953b2f..2f2dd28 100644 --- a/apps/base/fts/internal/logic/handler.go +++ b/module/base/fts/internal/logic/handler.go @@ -9,9 +9,9 @@ import ( "path/filepath" "strings" - "git.apinb.com/bsm-apps/fts/internal/config" - "git.apinb.com/bsm-apps/fts/internal/impl" - "git.apinb.com/bsm-apps/fts/internal/models" + "bsm/full/module/base/fts/internal/config" + "bsm/full/module/base/fts/internal/impl" + "bsm/full/module/base/fts/internal/models" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/infra" "git.apinb.com/bsm-sdk/core/middleware" diff --git a/apps/base/fts/internal/logic/ping.go b/module/base/fts/internal/logic/ping.go similarity index 100% rename from apps/base/fts/internal/logic/ping.go rename to module/base/fts/internal/logic/ping.go diff --git a/apps/base/fts/internal/logic/provider.go b/module/base/fts/internal/logic/provider.go similarity index 97% rename from apps/base/fts/internal/logic/provider.go rename to module/base/fts/internal/logic/provider.go index d41b50c..567e999 100644 --- a/apps/base/fts/internal/logic/provider.go +++ b/module/base/fts/internal/logic/provider.go @@ -11,8 +11,8 @@ import ( "path/filepath" "time" - "git.apinb.com/bsm-apps/fts/internal/config" - "git.apinb.com/bsm-apps/fts/internal/models" + "bsm/full/module/base/fts/internal/config" + "bsm/full/module/base/fts/internal/models" "git.apinb.com/bsm-sdk/core/infra" "git.apinb.com/bsm-sdk/core/utils" "github.com/gin-gonic/gin" diff --git a/apps/base/fts/internal/models/fts_record.go b/module/base/fts/internal/models/fts_record.go similarity index 100% rename from apps/base/fts/internal/models/fts_record.go rename to module/base/fts/internal/models/fts_record.go diff --git a/apps/base/fts/internal/models/query.go b/module/base/fts/internal/models/query.go similarity index 100% rename from apps/base/fts/internal/models/query.go rename to module/base/fts/internal/models/query.go diff --git a/apps/base/fts/internal/response/response.go b/module/base/fts/internal/response/response.go similarity index 98% rename from apps/base/fts/internal/response/response.go rename to module/base/fts/internal/response/response.go index 6e01eba..bed389b 100644 --- a/apps/base/fts/internal/response/response.go +++ b/module/base/fts/internal/response/response.go @@ -8,7 +8,7 @@ package response import ( "net/http" - "git.apinb.com/bsm-apps/fts/internal/errors" + "bsm/full/module/base/fts/internal/errors" "github.com/gin-gonic/gin" ) diff --git a/apps/base/fts/internal/routers/register.go b/module/base/fts/internal/routers/register.go similarity index 93% rename from apps/base/fts/internal/routers/register.go rename to module/base/fts/internal/routers/register.go index 44b7c51..a176917 100644 --- a/apps/base/fts/internal/routers/register.go +++ b/module/base/fts/internal/routers/register.go @@ -3,7 +3,7 @@ package routers import ( "fmt" - "git.apinb.com/bsm-apps/fts/internal/logic" + "bsm/full/module/base/fts/internal/logic" "github.com/gin-gonic/gin" swaggerfiles "github.com/swaggo/files" ginSwagger "github.com/swaggo/gin-swagger" diff --git a/apps/base/fts/internal/routers/uploader.go b/module/base/fts/internal/routers/uploader.go similarity index 86% rename from apps/base/fts/internal/routers/uploader.go rename to module/base/fts/internal/routers/uploader.go index a487e18..20a4370 100644 --- a/apps/base/fts/internal/routers/uploader.go +++ b/module/base/fts/internal/routers/uploader.go @@ -1,7 +1,7 @@ package routers import ( - "git.apinb.com/bsm-apps/fts/internal/logic" + "bsm/full/module/base/fts/internal/logic" "git.apinb.com/bsm-sdk/core/middleware" "github.com/gin-gonic/gin" ) diff --git a/apps/base/fts/scripts/filebeat.yaml b/module/base/fts/scripts/filebeat.yaml similarity index 100% rename from apps/base/fts/scripts/filebeat.yaml rename to module/base/fts/scripts/filebeat.yaml diff --git a/apps/base/fts/scripts/pack.sh b/module/base/fts/scripts/pack.sh similarity index 100% rename from apps/base/fts/scripts/pack.sh rename to module/base/fts/scripts/pack.sh diff --git a/apps/base/fts/test/fts_test.go b/module/base/fts/test/fts_test.go similarity index 100% rename from apps/base/fts/test/fts_test.go rename to module/base/fts/test/fts_test.go diff --git a/apps/base/fts/test/oss_provider_req.http b/module/base/fts/test/oss_provider_req.http similarity index 100% rename from apps/base/fts/test/oss_provider_req.http rename to module/base/fts/test/oss_provider_req.http diff --git a/apps/base/initial/CHANGELOG.md b/module/base/initial/CHANGELOG.md similarity index 100% rename from apps/base/initial/CHANGELOG.md rename to module/base/initial/CHANGELOG.md diff --git a/apps/base/initial/Dockerfile b/module/base/initial/Dockerfile similarity index 100% rename from apps/base/initial/Dockerfile rename to module/base/initial/Dockerfile diff --git a/apps/base/initial/Makefile b/module/base/initial/Makefile similarity index 100% rename from apps/base/initial/Makefile rename to module/base/initial/Makefile diff --git a/module/base/initial/README.md b/module/base/initial/README.md new file mode 100644 index 0000000..1b27e77 --- /dev/null +++ b/module/base/initial/README.md @@ -0,0 +1,558 @@ +# Initial Service + +[![Go Version](https://img.shields.io/badge/Go-1.25.1-blue.svg)](https://golang.org/) +[![License](https://img.shields.io/badge/License-Internal-red.svg)](LICENSE) +[![Build Status](https://img.shields.io/badge/Build-Passing-green.svg)](https://bsm/full/module/base/initial) + +一个高性能、可扩展的微服务，基于 gRPC 和 HTTP Gateway 架构，提供应用配置管理、版本更新检查、国家地区数据等基础服务功能。 + +## 🚀 特性 + +- **🔧 配置管理**: 多应用、多平台配置参数管理 +- **📱 版本控制**: 智能应用版本更新检查 +- **🌍 地理数据**: 完整的全球国家和地区层级数据 +- **🏷️ 系统数据**: 灵活的系统标签和分类管理 +- **⚡ 高性能**: Redis缓存 + 数据库优化 +- **🐳 容器化**: 完整的Docker支持 +- **📊 监控**: 健康检查和APM集成 +- **🔒 安全**: 完善的错误处理和输入验证 + +## 📋 目录 + +- [快速开始](#-快速开始) +- [项目结构](#-项目结构) +- [核心功能](#-核心功能) +- [API文档](#-api文档) +- [开发指南](#-开发指南) +- [部署说明](#-部署说明) +- [性能优化](#-性能优化) +- [故障排除](#-故障排除) + +## 🚀 快速开始 + +### 环境要求 + +- **Go**: 1.25.1+ +- **PostgreSQL**: 12+ +- **Redis**: 6+ +- **Docker**: 20.10+ (可选) +- **Protocol Buffers**: 3.15+ (开发需要) + +### 快速安装 + +```bash +# 克隆项目 +git clone bsm/full/module/base/initial.git +cd initial + +# 安装依赖 +make deps + +# 生成代码 +make proto + +# 构建应用 +make build + +# 运行服务 +make run +``` + +### Docker 快速启动 + +```bash +# 启动完整服务栈 +docker-compose up -d + +# 查看服务状态 +docker-compose ps + +# 查看日志 +docker-compose logs -f initial-service +``` + +## 📁 项目结构 + +``` +initial/ +├── 📁 cmd/ # 应用程序入口 +│ ├── 📁 main/ # 主服务入口 +│ └── 📁 cli/ # 命令行工具 +├── 📁 internal/ # 内部包 +│ ├── 📁 cache/ # 缓存服务 +│ ├── 📁 config/ # 配置管理 +│ ├── 📁 excode/ # 错误码定义 +│ ├── 📁 impl/ # 实现层 +│ ├── 📁 logic/ # 业务逻辑 +│ │ ├── 📁 check/ # 检查相关逻辑 +│ │ └── 📁 data/ # 数据相关逻辑 +│ ├── 📁 models/ # 数据模型 +│ └── 📁 server/ # 服务器实现 +├── 📁 pb/ # Protocol Buffers 生成代码 +├── 📁 proto/ # Protocol Buffers 定义文件 +├── 📁 swagger/ # API 文档 +├── 📁 scripts/ # 脚本和SQL文件 +├── 📁 test/ # 测试文件 +├── 📁 etc/ # 配置文件 +├── 🐳 Dockerfile # Docker 镜像构建 +├── 🐳 docker-compose.yml # Docker 编排 +├── 🔧 Makefile # 构建脚本 +└── 📖 README.md # 项目文档 +``` + +## 🔧 核心功能 + +### 1. 检查服务 (Check Service) + +#### 🏥 健康检查 (Hello) +```protobuf +rpc Hello(Crc) returns (StatusReply) +``` +- **功能**: 服务健康状态检查 +- **特性**: 输入验证、状态监控 +- **用途**: 负载均衡器健康检查、服务发现 + +#### ⚙️ 配置管理 (Config) +```protobuf +rpc Config(ConfigRequest) returns (ConfigReply) +``` +- **功能**: 多应用配置参数管理 +- **特性**: + - 支持多操作系统配置 + - 配置优先级处理 + - 自动去重机制 + - Redis缓存加速 + +#### 🔄 版本更新 (Updates) +```protobuf +rpc Updates(CheckForUpdatesRequest) returns (CheckForUpdatesReply) +``` +- **功能**: 智能版本更新检查 +- **特性**: + - 多平台支持 (Windows/Linux/macOS) + - 架构区分 (amd64/arm64) + - 版本比较算法 + - 更新文件管理 + +### 2. 数据服务 (Data Service) + +#### 🌍 国家数据 (Country) +```protobuf +rpc Country(Empty) returns (CountryReply) +``` +- **数据**: ISO代码、货币、时区、电话区号 +- **特性**: 启用状态过滤、排序优化 +- **缓存**: 24小时长期缓存 + +#### 🗺️ 地区数据 (Areas) +```protobuf +rpc Areas(AreasRequest) returns (AreasReply) +``` +- **功能**: 层级地区数据查询 +- **层级**: 国家 → 省/州 → 市 → 区/县 → 乡镇 +- **特性**: + - 按国家筛选 + - 层级深度控制 + - 拼音支持 + +#### 🏷️ 系统数据 (Datas) +```protobuf +rpc Datas(Empty) returns (DatasReply) +``` +- **功能**: 系统标签和分类管理 +- **用途**: 下拉选项、分类标签、系统配置 + +## 📚 API文档 + +### gRPC 服务 + +| 服务 | 方法 | 描述 | 端口 | +|------|------|------|------| +| Check | Hello | 健康检查 | 12101 | +| Check | Config | 配置获取 | 12101 | +| Check | Updates | 更新检查 | 12101 | +| Data | Country | 国家数据 | 12101 | +| Data | Areas | 地区数据 | 12101 | +| Data | Datas | 系统数据 | 12101 | + +### HTTP Gateway + +| 端点 | 方法 | 描述 | +|------|------|------| +| `/initial.Check/Hello` | POST | 健康检查 | +| `/initial.Check/Config` | POST | 获取配置 | +| `/initial.Check/Updates` | POST | 检查更新 | +| `/initial.Data/Country` | POST | 国家列表 | +| `/initial.Data/Areas` | POST | 地区数据 | +| `/initial.Data/Datas` | POST | 系统数据 | + +### Swagger 文档 + +- **本地**: http://localhost:12102/initial.swagger.json +- **在线**: 通过 HTTP Gateway 访问完整的 API 文档 + +## 🛠️ 开发指南 + +### 开发环境设置 + +```bash +# 安装开发工具 +make install-tools + +# 设置Git钩子 +git config core.hooksPath .githooks + +# 启动开发模式 +make dev +``` + +### 代码生成 + +```bash +# 生成 protobuf 代码 +make proto + +# 生成 Swagger 文档 +make swagger +``` + +### 测试 + +```bash +# 运行所有测试 +make test + +# 测试覆盖率 +make test-coverage + +# gRPC 功能测试 +make test-grpc + +# 代码检查 +make lint + +# 安全扫描 +make security +``` + +### 数据库管理 + +```bash +# 初始化数据库 +make init-db + +# 备份数据库 +make backup-db +``` + +## 🚀 部署说明 + +### Docker 部署 + +```bash +# 构建镜像 +make docker-build + +# 启动服务栈 +make docker-compose-up + +# 查看日志 +make docker-compose-logs + +# 停止服务 +make docker-compose-down +``` + +### 生产环境部署 + +1. **环境准备** + ```bash + # 创建生产配置 + cp etc/initial_dev.yaml etc/initial_prod.yaml + # 编辑生产配置... + ``` + +2. **数据库初始化** + ```bash + # 执行SQL脚本 + psql -h your-db-host -U postgres -d initial_db -f scripts/initial_country_202509081640.sql + psql -h your-db-host -U postgres -d initial_db -f scripts/initial_areas_202509081640.sql + ``` + +3. **服务启动** + ```bash + # 构建生产版本 + make build-linux + + # 启动服务 + ./build/initial-linux-amd64 + ``` + +### Kubernetes 部署 + +```yaml +# k8s-deployment.yaml +apiVersion: apps/v1 +kind: Deployment +metadata: + name: initial-service +spec: + replicas: 3 + selector: + matchLabels: + app: initial-service + template: + metadata: + labels: + app: initial-service + spec: + containers: + - name: initial-service + image: initial:latest + ports: + - containerPort: 12101 + - containerPort: 12102 + env: + - name: SERVICE_ENV + value: "production" +``` + +## ⚡ 性能优化 + +### 缓存策略 + +| 数据类型 | 缓存时间 | 策略 | +|----------|----------|------| +| 配置数据 | 10分钟 | 按应用+OS缓存 | +| 国家数据 | 24小时 | 全量缓存 | +| 地区数据 | 12小时 | 按国家缓存 | +| 系统数据 | 6小时 | 全量缓存 | + +### 数据库优化 + +- **索引优化**: 关键字段建立复合索引 +- **查询优化**: 使用 CASE WHEN 进行优先级排序 +- **连接池**: 配置合适的连接池大小 +- **读写分离**: 支持主从数据库配置 + +### 监控指标 + +```bash +# 服务健康检查 +curl http://localhost:12102/health + +# 性能指标 +curl http://localhost:12102/metrics +``` + +## 🔧 配置说明 + +### 环境配置文件 + +```yaml +# etc/initial_prod.yaml +Service: initial +Port: 12101 + +# 数据库配置 +Databases: + Driver: postgres + Source: + - host=db-host user=postgres password=*** dbname=initial_db port=5432 sslmode=require + +# 缓存配置 +Cache: redis://username:password@redis-host:6379/0 + +# 网关配置 +Gateway: + Enable: true + Port: 12102 + +# 微服务配置 +MicroService: + Enable: true + Registry: etcd://etcd-cluster:2379 + +# APM监控 +APM: + Platform: elasticAPM + Endpoint: http://apm-server:8200 +``` + +### 环境变量 + +| 变量名 | 描述 | 默认值 | +|--------|------|--------| +| `SERVICE_ENV` | 运行环境 | `development` | +| `CONFIG_FILE` | 配置文件路径 | `etc/initial_dev.yaml` | +| `LOG_LEVEL` | 日志级别 | `info` | +| `TZ` | 时区设置 | `Asia/Shanghai` | + +## 🐛 故障排除 + +### 常见问题 + +1. **服务启动失败** + ```bash + # 检查端口占用 + netstat -tlnp | grep :12101 + + # 检查配置文件 + make lint + ``` + +2. **数据库连接失败** + ```bash + # 测试数据库连接 + psql -h your-db-host -U postgres -d initial_db -c "SELECT 1;" + ``` + +3. **Redis连接失败** + ```bash + # 测试Redis连接 + redis-cli -h your-redis-host ping + ``` + +### 日志分析 + +```bash +# 查看服务日志 +tail -f logs/initial.log + +# 查看错误日志 +grep ERROR logs/initial.log + +# 查看性能日志 +grep "slow query" logs/initial.log +``` + +### 性能调优 + +1. **内存优化** + ```bash + # 监控内存使用 + go tool pprof http://localhost:6060/debug/pprof/heap + ``` + +2. **CPU优化** + ```bash + # CPU性能分析 + go tool pprof http://localhost:6060/debug/pprof/profile + ``` + +## 📊 数据模型 + +### 核心表结构 + +#### initial_config - 配置表 +```sql +CREATE TABLE initial_config ( + id SERIAL PRIMARY KEY, + identity VARCHAR(255) NOT NULL, + app VARCHAR(255) NOT NULL, + os VARCHAR(255) DEFAULT '', + key TEXT DEFAULT '', + value TEXT DEFAULT '', + version BIGINT DEFAULT 0, + created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP +); +``` + +#### initial_apps - 应用版本表 +```sql +CREATE TABLE initial_apps ( + id SERIAL PRIMARY KEY, + identity VARCHAR(255) NOT NULL, + version VARCHAR(255) DEFAULT '', + app VARCHAR(255) DEFAULT '', + os VARCHAR(255) DEFAULT '', + arch VARCHAR(255) DEFAULT '', + summary TEXT DEFAULT '', + files TEXT DEFAULT '', + pubdate TIMESTAMP, + created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP +); +``` + +#### initial_country - 国家表 +```sql +CREATE TABLE initial_country ( + id SERIAL PRIMARY KEY, + iso2 VARCHAR(2) UNIQUE NOT NULL, + iso3 VARCHAR(3) UNIQUE NOT NULL, + num_code VARCHAR(3), + phone_code VARCHAR(10), + currency VARCHAR(24) NOT NULL, + currency_symbol VARCHAR(24) NOT NULL, + region VARCHAR(24) NOT NULL, + name VARCHAR(255) NOT NULL, + local_name VARCHAR(255) NOT NULL, + timezones TEXT, + translations TEXT, + enabled BOOLEAN DEFAULT true, + sort_order INTEGER DEFAULT 0 +); +``` + +## 🤝 贡献指南 + +### 开发流程 + +1. **Fork 项目** +2. **创建特性分支**: `git checkout -b feature/amazing-feature` +3. **提交更改**: `git commit -m 'Add amazing feature'` +4. **推送分支**: `git push origin feature/amazing-feature` +5. **创建 Pull Request** + +### 代码规范 + +- 遵循 Go 官方代码规范 +- 使用 `gofmt` 格式化代码 +- 添加必要的注释和文档 +- 编写单元测试 + +### 提交规范 + +``` +type(scope): description + +[optional body] + +[optional footer] +``` + +类型: +- `feat`: 新功能 +- `fix`: 修复bug +- `docs`: 文档更新 +- `style`: 代码格式 +- `refactor`: 重构 +- `test`: 测试 +- `chore`: 构建过程或辅助工具的变动 + +## 📄 许可证 + +本项目采用内部许可证，仅供 BSM 内部使用。 + +## 👥 团队 + +- **作者**: David Yan (david.yan@qq.com) +- **维护者**: BSM 开发团队 +- **项目地址**: [bsm/full/module/base/initial](https://bsm/full/module/base/initial) + +## 🔗 相关链接 + +- [BSM SDK](https://git.apinb.com/bsm-sdk) +- [API 文档](https://docs.apinb.com/initial) +- [问题反馈](https://bsm/full/module/base/initial/issues) + +--- + +
+ +**⭐ 如果这个项目对你有帮助，请给它一个星标！** + +Made with ❤️ by BSM Team + +
diff --git a/apps/base/initial/cmd/cli/main.go b/module/base/initial/cmd/cli/main.go similarity index 100% rename from apps/base/initial/cmd/cli/main.go rename to module/base/initial/cmd/cli/main.go diff --git a/apps/base/initial/cmd/main/main.go b/module/base/initial/cmd/main/main.go similarity index 85% rename from apps/base/initial/cmd/main/main.go rename to module/base/initial/cmd/main/main.go index 6a6fa3f..83e2710 100644 --- a/apps/base/initial/cmd/main/main.go +++ b/module/base/initial/cmd/main/main.go @@ -5,9 +5,9 @@ package service import ( - "git.apinb.com/bsm-apps/initial/internal/config" - "git.apinb.com/bsm-apps/initial/internal/impl" - "git.apinb.com/bsm-apps/initial/internal/server" + "bsm/full/module/base/initial/internal/config" + "bsm/full/module/base/initial/internal/impl" + "bsm/full/module/base/initial/internal/server" "git.apinb.com/bsm-sdk/core/service" ) @@ -42,3 +42,7 @@ func Run() { // 启动服务，开始监听请求 srv.Start() } + +func main() { + Run() +} diff --git a/apps/base/initial/docker-compose.yml b/module/base/initial/docker-compose.yml similarity index 100% rename from apps/base/initial/docker-compose.yml rename to module/base/initial/docker-compose.yml diff --git a/apps/base/initial/etc/initial_dev.yaml b/module/base/initial/etc/initial_dev.yaml similarity index 100% rename from apps/base/initial/etc/initial_dev.yaml rename to module/base/initial/etc/initial_dev.yaml diff --git a/apps/base/initial/etc/initial_prod.yaml b/module/base/initial/etc/initial_prod.yaml similarity index 100% rename from apps/base/initial/etc/initial_prod.yaml rename to module/base/initial/etc/initial_prod.yaml diff --git a/apps/base/initial/etc/initial_test.yaml b/module/base/initial/etc/initial_test.yaml similarity index 100% rename from apps/base/initial/etc/initial_test.yaml rename to module/base/initial/etc/initial_test.yaml diff --git a/apps/base/initial/etc/supervisor.bsm-apps-initial.conf b/module/base/initial/etc/supervisor.bsm-apps-initial.conf similarity index 100% rename from apps/base/initial/etc/supervisor.bsm-apps-initial.conf rename to module/base/initial/etc/supervisor.bsm-apps-initial.conf diff --git a/apps/base/initial/go.mod b/module/base/initial/go.mod similarity index 65% rename from apps/base/initial/go.mod rename to module/base/initial/go.mod index 70f2445..1103689 100644 --- a/apps/base/initial/go.mod +++ b/module/base/initial/go.mod @@ -1,4 +1,4 @@ -module git.apinb.com/bsm-apps/initial +module bsm/full/module/base/initial go 1.26.5 @@ -14,7 +14,7 @@ tool ( ) require ( - github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 + github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0 github.com/patrickmn/go-cache v2.1.0+incompatible ) @@ -25,21 +25,18 @@ require ( git.apinb.com/bsm-tools/protoc-gen-ts v0.0.2 // indirect github.com/coreos/go-semver v0.3.1 // indirect github.com/coreos/go-systemd/v22 v22.7.0 // indirect - github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/ditashi/jsbeautifier-go v0.0.0-20141206144643-2520a8026a9c // indirect - github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt/v5 v5.3.1 // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/pepabo/protoc-gen-go-client v0.3.0 // indirect - github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect - go.etcd.io/etcd/api/v3 v3.6.12 // indirect + go.etcd.io/etcd/api/v3 v3.7.1 // indirect go.uber.org/atomic v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.28.0 // indirect - go.yaml.in/yaml/v3 v3.0.4 // indirect - golang.org/x/mod v0.36.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa // indirect + go.yaml.in/yaml/v3 v3.0.5 // indirect + golang.org/x/mod v0.37.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea // indirect google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.2 // indirect gorm.io/driver/mysql v1.6.0 // indirect ) @@ -55,18 +52,20 @@ require ( github.com/jackc/puddle/v2 v2.2.2 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect - github.com/oklog/ulid/v2 v2.1.1 // indirect - github.com/redis/go-redis/v9 v9.20.0 // indirect - go.etcd.io/etcd/client/pkg/v3 v3.6.12 // indirect - go.etcd.io/etcd/client/v3 v3.6.12 - golang.org/x/net v0.55.0 // indirect - golang.org/x/sync v0.20.0 // indirect - golang.org/x/sys v0.45.0 // indirect - golang.org/x/text v0.37.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa // indirect - google.golang.org/grpc v1.81.1 + github.com/oklog/ulid/v2 v2.1.2 // indirect + github.com/redis/go-redis/v9 v9.22.0 // indirect + go.etcd.io/etcd/client/pkg/v3 v3.7.1 // indirect + go.etcd.io/etcd/client/v3 v3.7.1 + golang.org/x/net v0.57.0 // indirect + golang.org/x/sync v0.22.0 // indirect + golang.org/x/sys v0.47.0 // indirect + golang.org/x/text v0.40.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea // indirect + google.golang.org/grpc v1.83.0 google.golang.org/protobuf v1.36.11 gopkg.in/yaml.v3 v3.0.1 // indirect - gorm.io/driver/postgres v1.6.0 // indirect - gorm.io/gorm v1.31.1 + gorm.io/driver/postgres v1.6.2 // indirect + gorm.io/gorm v1.31.2 ) + +replace git.apinb.com/bsm-sdk/core => D:/work/bsm-sdk/core diff --git a/apps/social/relation/go.sum b/module/base/initial/go.sum similarity index 54% rename from apps/social/relation/go.sum rename to module/base/initial/go.sum index d6663d0..09a9a51 100644 --- a/apps/social/relation/go.sum +++ b/module/base/initial/go.sum @@ -1,7 +1,5 @@ filippo.io/edwards25519 v1.2.0 h1:crnVqOiS4jqYleHd9vaKZ+HKtHfllngJIiOpNpoJsjo= filippo.io/edwards25519 v1.2.0/go.mod h1:xzAOLCNug/yB62zG1bQ8uziwrIqIuxhctzJT18Q77mc= -git.apinb.com/bsm-sdk/core v0.2.0 h1:/e9yqpsbKBrRgMiGpS3KX2O4qDLxo5V5GpPSLNGxEKw= -git.apinb.com/bsm-sdk/core v0.2.0/go.mod h1:E9T6Eboo/0Zb36BjkKbIgvFzq4fQ2Q8P/7y5zmYTI6Y= git.apinb.com/bsm-tools/protoc-gen-markdown v0.0.0-20250907131213-6c1694ce6bcb h1:GoXhkGzI5vZ9JMXCVsSRw/AGsJY0tM2aEv76YaUg2wM= git.apinb.com/bsm-tools/protoc-gen-markdown v0.0.0-20250907131213-6c1694ce6bcb/go.mod h1:l+84zWPM4F40Ppar+jLapgjRNt6XWDsr+l0vN4Jjlm4= git.apinb.com/bsm-tools/protoc-gen-slc v0.0.13 h1:RGg2R2kHz6IAD7scH6So2FlZYctFUDxqWR8i/+fMfOU= @@ -23,14 +21,12 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/ditashi/jsbeautifier-go v0.0.0-20141206144643-2520a8026a9c h1:+Zo5Ca9GH0RoeVZQKzFJcTLoAixx5s5Gq3pTIS+n354= github.com/ditashi/jsbeautifier-go v0.0.0-20141206144643-2520a8026a9c/go.mod h1:HJGU9ULdREjOcVGZVPB5s6zYmHi1RxzT71l2wQyLmnE= -github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= -github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.4 h1:tG4xh9yMsRCAiodLVTxyrkzSZ9+o0L1Kg/+cPVcbP/8= +github.com/go-logr/logr v1.4.4/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-sql-driver/mysql v1.10.0 h1:Q+1LV8DkHJvSYAdR83XzuhDaTykuDx0l6fkXxoWCWfw= github.com/go-sql-driver/mysql v1.10.0/go.mod h1:M+cqaI7+xxXGG9swrdeUIoPG3Y3KCkF0pZej+SK+nWk= -github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= -github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt/v5 v5.3.1 h1:kYf81DTWFe7t+1VvL7eS+jKFVWaUnK9cB1qbwn63YCY= github.com/golang-jwt/jwt/v5 v5.3.1/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= @@ -39,8 +35,8 @@ github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= 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/grpc-ecosystem/grpc-gateway/v2 v2.29.0 h1:5VipnvEpbqr2gA2VbM+nYVbkIF28c5ZQfqCBQ5g2xfk= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0/go.mod h1:Hyl3n6Twe1hvtd9XUXDec4pTvgMSEixRuQKPTMH2bNs= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0 h1:/Tnpcb2E0Pz/tN9s3bfEY2Q8ePCEX9iuS+cneUwncnw= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0/go.mod h1:zOBXOsUaBSjKgmH4OGzV1esUpR3oUSCPYVd2cUBjKYY= 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= @@ -53,16 +49,16 @@ github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= -github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= -github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y= -github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0= +github.com/klauspost/cpuid/v2 v2.4.0 h1:S6Hrbc7+ywsr0r+RLapfGBHfyefhCTwEh3A0tV913Dw= +github.com/klauspost/cpuid/v2 v2.4.0/go.mod h1:19jmZ9mjzoF//ddRSUsv0zfBTJWh3QJh9FNxZTMrGxU= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/oklog/ulid/v2 v2.1.1 h1:suPZ4ARWLOJLegGFiZZ1dFAkqzhMjL3J1TzI+5wHz8s= -github.com/oklog/ulid/v2 v2.1.1/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ= +github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= +github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= +github.com/oklog/ulid/v2 v2.1.2 h1:IEclFb9JNvzYA6MW2SCxbLzcHTVsfqm3PrqGQJH5zec= +github.com/oklog/ulid/v2 v2.1.2/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ= github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= github.com/pborman/getopt v0.0.0-20170112200414-7148bc3a4c30/go.mod h1:85jBQOZwpVEaDAr341tbn15RS4fCAsIst0qp7i8ex1o= @@ -71,8 +67,8 @@ github.com/pepabo/protoc-gen-go-client v0.3.0/go.mod h1:NvHW7/gsmZUK2UxafqzUzWD8 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/redis/go-redis/v9 v9.20.0 h1:WnQYxLkgO2xiXTCJY0ldIiI8dNqCDlQAG+AtaH7a2a0= -github.com/redis/go-redis/v9 v9.20.0/go.mod h1:v/M13XI1PVCDcm01VtPFOADfZtHf8YW3baQf57KlIkA= +github.com/redis/go-redis/v9 v9.22.0 h1:laDvpYXTJtZLloinw1fA5Kqd6HAEH2XKxOkG/PDq2F0= +github.com/redis/go-redis/v9 v9.22.0/go.mod h1:y2g0Wj8rQvuK0ELM+oxSudcLtC09JScs98I/X9gRWY4= github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0= @@ -82,28 +78,26 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= -github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/zeebo/xxh3 v1.1.0 h1:s7DLGDK45Dyfg7++yxI0khrfwq9661w9EN78eP/UZVs= github.com/zeebo/xxh3 v1.1.0/go.mod h1:IisAie1LELR4xhVinxWS5+zf1lA4p0MW4T+w+W07F5s= -go.etcd.io/etcd/api/v3 v3.6.12 h1:OLOZUKEuAA36TR48F0cIaa8FdzrWygjyfrJxXg4iDgs= -go.etcd.io/etcd/api/v3 v3.6.12/go.mod h1:p14EIQXHbuOQbVvL/WEes5uqKnxP9AgKJgpjbMVvzvE= -go.etcd.io/etcd/client/pkg/v3 v3.6.12 h1:36zzB+pQOdHbhN+kH2iJz/K8bJn0ZLtLfPPO7jozTDo= -go.etcd.io/etcd/client/pkg/v3 v3.6.12/go.mod h1:hh2+ZXtfLzs3o6mn92ntgNPBrTJJOvXqICM5g3L3DMY= -go.etcd.io/etcd/client/v3 v3.6.12 h1:kMSP6JcPZMqSJiX+TXdUIBU/4eXEZWBAaui4VihMbIc= -go.etcd.io/etcd/client/v3 v3.6.12/go.mod h1:CMs6fJWYiZQk4ytFjd4lE1diOvvRMmtbbn/alZXd3dQ= +go.etcd.io/etcd/api/v3 v3.7.1 h1:KJG0/DcWGfe3Y1otDf/fsBf0TSSgpxZ5RO/L8SFt73E= +go.etcd.io/etcd/api/v3 v3.7.1/go.mod h1:8bXIpCMeV7E3/XL0Ix123ATn3dB+0V7d9zklHbB0m78= +go.etcd.io/etcd/client/pkg/v3 v3.7.1 h1:rKYsj3pRkR0eK3yjT3XOgrhqfmIfj9pzNgxjh7mfFv4= +go.etcd.io/etcd/client/pkg/v3 v3.7.1/go.mod h1:cnzZGIUzSfjEwLC6UBVsSXlEK1eepS/JUD7wE6PLRT0= +go.etcd.io/etcd/client/v3 v3.7.1 h1:0PEMMC0KuZmVIN+RAbdqfkZ45pYTgKVtmBEbRCvZFUg= +go.etcd.io/etcd/client/v3 v3.7.1/go.mod h1:ffNqALa8tRCYhYo1F9oR489y23K39Gz+BSR3ApAGYq0= go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64= go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y= -go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I= -go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0= -go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM= -go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY= -go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg= -go.opentelemetry.io/otel/sdk v1.43.0/go.mod h1:P+IkVU3iWukmiit/Yf9AWvpyRDlUeBaRg6Y+C58QHzg= -go.opentelemetry.io/otel/sdk/metric v1.43.0 h1:S88dyqXjJkuBNLeMcVPRFXpRw2fuwdvfCGLEo89fDkw= -go.opentelemetry.io/otel/sdk/metric v1.43.0/go.mod h1:C/RJtwSEJ5hzTiUz5pXF1kILHStzb9zFlIEe85bhj6A= -go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A= -go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0= +go.opentelemetry.io/otel v1.45.0 h1:pdrWmLHofpubmArBv1LgFSv1Z0Ie/ppdZzu+kUN5EeU= +go.opentelemetry.io/otel v1.45.0/go.mod h1:XZxIqPapzEYnhNSScF5DIqXhm/rYi0FzCe2XddAwZfQ= +go.opentelemetry.io/otel/metric v1.45.0 h1:7Eg1uH7CJ5cXv9is6tnBe1FI6rj1nwUdbFypRm3br/M= +go.opentelemetry.io/otel/metric v1.45.0/go.mod h1:HAPbm1nd3p1PmFH7v2dR+6BjXxw+Lq4a2+pndMAm08s= +go.opentelemetry.io/otel/sdk v1.45.0 h1:4VVSMgQ83dUgW2aoX5f6JgLvHwIvzcuLnF9lUdCSpCw= +go.opentelemetry.io/otel/sdk v1.45.0/go.mod h1:Sr40LgXV7DsKMMJMKOhUWOgMWTfAaqvm2kF0g7ilwuA= +go.opentelemetry.io/otel/sdk/metric v1.44.0 h1:3LlKgI+VjbVsjNRFZJZAJ30WjXC5VkNRks6si09iEfI= +go.opentelemetry.io/otel/sdk/metric v1.44.0/go.mod h1:5B5pMARnXxKhltooO4xUuCBorl65a4EpnTalObqOigA= +go.opentelemetry.io/otel/trace v1.45.0 h1:l/mP6Uv7oNO7/TblbhpbgMidxhq1uO/rPsikOyVhxag= +go.opentelemetry.io/otel/trace v1.45.0/go.mod h1:qoJJA2xNMnxRrdISU/kLtfUH2wNeQbiv+jhs/CxI8bc= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= @@ -112,51 +106,26 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.28.0 h1:IZzaP1Fv73/T/pBMLk4VutPl36uNC+OSUh3JLG3FIjo= go.uber.org/zap v1.28.0/go.mod h1:rDLpOi171uODNm/mxFcuYWxDsqWSAVkFdX4XojSKg/Q= -go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= -go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.36.0 h1:JJjpVx6myfUsUdAzZuOSTTmRE0PfZeNWzzvKrP7amb4= -golang.org/x/mod v0.36.0/go.mod h1:moc6ELqsWcOw5Ef3xVprK5ul/MvtVvkIXLziUOICjUQ= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8= -golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -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.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4= -golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY= -golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc= -golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -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= +go.yaml.in/yaml/v3 v3.0.5 h1:N6y/pJk8buWs9NY5ERU2HSMfm+IuD/OtfdAnq6kESPw= +go.yaml.in/yaml/v3 v3.0.5/go.mod h1:HVTZu1O7/Vkt2N+BFy8Zza+lnLsABggaTM2ZpNIGuKg= +golang.org/x/mod v0.37.0 h1:vF1DjpVEshcIqoEaauuHebaLk1O1forxjxBaVn884JQ= +golang.org/x/mod v0.37.0/go.mod h1:m8S8VeM9r4dzDwjrKO0a1sZP3YjeMamRRlD+fmR2Q/0= +golang.org/x/net v0.57.0 h1:K5+3DljvIuDG9/Jv9rvyMywYNFCQ9RSUY6OOTTkT+tE= +golang.org/x/net v0.57.0/go.mod h1:KpXc8iv+r3XplLAG/f7Jsf9RPszJzdR0f58q9vGOuEU= +golang.org/x/sync v0.22.0 h1:SZjpbeLmrCk4xhRSZFNZW5gFUeCeFgjekvI/+gfScek= +golang.org/x/sync v0.22.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= +golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs= +golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +golang.org/x/text v0.40.0 h1:Ub2Z6/xjgF1WrYQz2nuITOEegKFtiIy+rieRJ5lHZKs= +golang.org/x/text v0.40.0/go.mod h1:hpnzDAfGV753zIKo+wk3u1bVKCGPbrnF7+7LBF/UHVY= gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4= gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E= -google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa h1:Kjn0N0tCrDgiAFW+lGO4JZ3ck44CehvJQMAwj9QF0G8= -google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:q4lMZS6kskjT5HvCPrnnypcDPVJqT/f4nfxmkE7gryY= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa h1:mZHHdPZl0dbGHCflZgAq/Q468DWVFcU2whhB2KAo8fk= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= -google.golang.org/grpc v1.81.1 h1:VnnIIZ88UzOOKLukQi+ImGz8O1Wdp8nAGGnvOfEIWQQ= -google.golang.org/grpc v1.81.1/go.mod h1:xGH9GfzOyMTGIOXBJmXt+BX/V0kcdQbdcuwQ/zNw42I= +google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea h1:Jifw/kjs/r3B0uszvls/m3c3tmZs2YHGM9C+rvxP9gY= +google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea/go.mod h1:K/+WGbmBY7aNW1HDw1fJnKYo10i0DkAX6pows00dLig= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea h1:kVhQEPTpKQahD5+JSBTfBB19wcgQTTjAIn45MBqnyHk= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= +google.golang.org/grpc v1.83.0 h1:JeNZEKJFbQxArAMl+hiytHauacDNqJUllNfmIMmpqnQ= +google.golang.org/grpc v1.83.0/go.mod h1:kDyl6SKsiHKt0uylY5gtn5cEjkrIOhQOGDgIc4JGwzQ= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.2 h1:rgSNvqscFZ1JgV/4wH5GOsZFSFkR2Eua9As3KIr2LlM= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.2/go.mod h1:iMEtFwDlAhjDU9L5mY6U1XLwlIId/G3h+QcBHDIvrJ8= google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE= @@ -169,9 +138,11 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gorm.io/driver/mysql v1.6.0 h1:eNbLmNTpPpTOVZi8MMxCi2aaIm0ZpInbORNXDwyLGvg= gorm.io/driver/mysql v1.6.0/go.mod h1:D/oCC2GWK3M/dqoLxnOlaNKmXz8WNTfcS9y5ovaSqKo= -gorm.io/driver/postgres v1.6.0 h1:2dxzU8xJ+ivvqTRph34QX+WrRaJlmfyPqXmoGVjMBa4= -gorm.io/driver/postgres v1.6.0/go.mod h1:vUw0mrGgrTK+uPHEhAdV4sfFELrByKVGnaVRkXDhtWo= -gorm.io/gorm v1.31.1 h1:7CA8FTFz/gRfgqgpeKIBcervUn3xSyPUmr6B2WXJ7kg= -gorm.io/gorm v1.31.1/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs= +gorm.io/driver/postgres v1.6.2 h1:BvXQ/cNUg63q5TFNg672DmDcowZSFrNLkkA3Xe6GXq4= +gorm.io/driver/postgres v1.6.2/go.mod h1:0c4fQA44XhOklXDkgtuKqysHCycTa5i9e3EIpDGCwXk= +gorm.io/driver/sqlite v1.6.0 h1:WHRRrIiulaPiPFmDcod6prc4l2VGVWHz80KspNsxSfQ= +gorm.io/driver/sqlite v1.6.0/go.mod h1:AO9V1qIQddBESngQUKWL9yoH93HIeA1X6V633rBwyT8= +gorm.io/gorm v1.31.2 h1:3o8FXNo9v9S858gil+3LlZA1LkCOzgb4g5BL64FgaCo= +gorm.io/gorm v1.31.2/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs= gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU= gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU= diff --git a/apps/base/initial/internal/config/config.go b/module/base/initial/internal/config/config.go similarity index 100% rename from apps/base/initial/internal/config/config.go rename to module/base/initial/internal/config/config.go diff --git a/apps/base/initial/internal/excode/ex.go b/module/base/initial/internal/excode/ex.go similarity index 100% rename from apps/base/initial/internal/excode/ex.go rename to module/base/initial/internal/excode/ex.go diff --git a/apps/base/initial/internal/impl/impl.go b/module/base/initial/internal/impl/impl.go similarity index 93% rename from apps/base/initial/internal/impl/impl.go rename to module/base/initial/internal/impl/impl.go index a38ec79..29cb0f0 100644 --- a/apps/base/initial/internal/impl/impl.go +++ b/module/base/initial/internal/impl/impl.go @@ -1,7 +1,7 @@ package impl import ( - "git.apinb.com/bsm-apps/initial/internal/config" + "bsm/full/module/base/initial/internal/config" "git.apinb.com/bsm-sdk/core/cache/redis" "git.apinb.com/bsm-sdk/core/with" cache "github.com/patrickmn/go-cache" diff --git a/apps/base/initial/internal/logic/check/config.go b/module/base/initial/internal/logic/check/config.go similarity index 93% rename from apps/base/initial/internal/logic/check/config.go rename to module/base/initial/internal/logic/check/config.go index da77d80..89f57d7 100644 --- a/apps/base/initial/internal/logic/check/config.go +++ b/module/base/initial/internal/logic/check/config.go @@ -3,8 +3,8 @@ package check import ( "context" - "git.apinb.com/bsm-apps/initial/internal/models" - pb "git.apinb.com/bsm-apps/initial/pb" + "bsm/full/module/base/initial/internal/models" + pb "bsm/full/module/base/initial/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" ) diff --git a/apps/base/initial/internal/logic/check/config_cache.go b/module/base/initial/internal/logic/check/config_cache.go similarity index 86% rename from apps/base/initial/internal/logic/check/config_cache.go rename to module/base/initial/internal/logic/check/config_cache.go index 8fe2e65..b5d6027 100644 --- a/apps/base/initial/internal/logic/check/config_cache.go +++ b/module/base/initial/internal/logic/check/config_cache.go @@ -1,8 +1,8 @@ package check import ( - "git.apinb.com/bsm-apps/initial/internal/impl" - "git.apinb.com/bsm-apps/initial/internal/models" + "bsm/full/module/base/initial/internal/impl" + "bsm/full/module/base/initial/internal/models" "git.apinb.com/bsm-sdk/core/vars" ) diff --git a/apps/base/initial/internal/logic/check/hello.go b/module/base/initial/internal/logic/check/hello.go similarity index 93% rename from apps/base/initial/internal/logic/check/hello.go rename to module/base/initial/internal/logic/check/hello.go index 2733a15..9aaf68f 100644 --- a/apps/base/initial/internal/logic/check/hello.go +++ b/module/base/initial/internal/logic/check/hello.go @@ -4,7 +4,7 @@ import ( "context" "time" - pb "git.apinb.com/bsm-apps/initial/pb" + pb "bsm/full/module/base/initial/pb" "git.apinb.com/bsm-sdk/core/vars" ) diff --git a/apps/base/initial/internal/logic/check/updates.go b/module/base/initial/internal/logic/check/updates.go similarity index 89% rename from apps/base/initial/internal/logic/check/updates.go rename to module/base/initial/internal/logic/check/updates.go index 7760dc6..131628a 100644 --- a/apps/base/initial/internal/logic/check/updates.go +++ b/module/base/initial/internal/logic/check/updates.go @@ -3,9 +3,9 @@ package check import ( "context" - "git.apinb.com/bsm-apps/initial/internal/impl" - "git.apinb.com/bsm-apps/initial/internal/models" - pb "git.apinb.com/bsm-apps/initial/pb" + "bsm/full/module/base/initial/internal/impl" + "bsm/full/module/base/initial/internal/models" + pb "bsm/full/module/base/initial/pb" "git.apinb.com/bsm-sdk/core/errcode" "gorm.io/gorm" ) diff --git a/apps/base/initial/internal/logic/data/areas.go b/module/base/initial/internal/logic/data/areas.go similarity index 96% rename from apps/base/initial/internal/logic/data/areas.go rename to module/base/initial/internal/logic/data/areas.go index 7a3b351..4deae51 100644 --- a/apps/base/initial/internal/logic/data/areas.go +++ b/module/base/initial/internal/logic/data/areas.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - pb "git.apinb.com/bsm-apps/initial/pb" + pb "bsm/full/module/base/initial/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" ) diff --git a/apps/base/initial/internal/logic/data/areas_cache.go b/module/base/initial/internal/logic/data/areas_cache.go similarity index 85% rename from apps/base/initial/internal/logic/data/areas_cache.go rename to module/base/initial/internal/logic/data/areas_cache.go index 1ee7d6f..32352c4 100644 --- a/apps/base/initial/internal/logic/data/areas_cache.go +++ b/module/base/initial/internal/logic/data/areas_cache.go @@ -1,9 +1,9 @@ package data import ( - "git.apinb.com/bsm-apps/initial/internal/impl" - "git.apinb.com/bsm-apps/initial/internal/models" - pb "git.apinb.com/bsm-apps/initial/pb" + "bsm/full/module/base/initial/internal/impl" + "bsm/full/module/base/initial/internal/models" + pb "bsm/full/module/base/initial/pb" "git.apinb.com/bsm-sdk/core/vars" ) diff --git a/apps/base/initial/internal/logic/data/country.go b/module/base/initial/internal/logic/data/country.go similarity index 96% rename from apps/base/initial/internal/logic/data/country.go rename to module/base/initial/internal/logic/data/country.go index 2a19d20..649b2b4 100644 --- a/apps/base/initial/internal/logic/data/country.go +++ b/module/base/initial/internal/logic/data/country.go @@ -3,7 +3,7 @@ package data import ( "context" - pb "git.apinb.com/bsm-apps/initial/pb" + pb "bsm/full/module/base/initial/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" ) diff --git a/apps/base/initial/internal/logic/data/country_cache.go b/module/base/initial/internal/logic/data/country_cache.go similarity index 83% rename from apps/base/initial/internal/logic/data/country_cache.go rename to module/base/initial/internal/logic/data/country_cache.go index 45db98a..cf41e3e 100644 --- a/apps/base/initial/internal/logic/data/country_cache.go +++ b/module/base/initial/internal/logic/data/country_cache.go @@ -1,8 +1,8 @@ package data import ( - "git.apinb.com/bsm-apps/initial/internal/impl" - "git.apinb.com/bsm-apps/initial/internal/models" + "bsm/full/module/base/initial/internal/impl" + "bsm/full/module/base/initial/internal/models" "git.apinb.com/bsm-sdk/core/vars" ) diff --git a/apps/base/initial/internal/logic/data/datas.go b/module/base/initial/internal/logic/data/datas.go similarity index 96% rename from apps/base/initial/internal/logic/data/datas.go rename to module/base/initial/internal/logic/data/datas.go index 3975452..9626f93 100644 --- a/apps/base/initial/internal/logic/data/datas.go +++ b/module/base/initial/internal/logic/data/datas.go @@ -3,7 +3,7 @@ package data import ( "context" - pb "git.apinb.com/bsm-apps/initial/pb" + pb "bsm/full/module/base/initial/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" ) diff --git a/apps/base/initial/internal/logic/data/datas_cache.go b/module/base/initial/internal/logic/data/datas_cache.go similarity index 85% rename from apps/base/initial/internal/logic/data/datas_cache.go rename to module/base/initial/internal/logic/data/datas_cache.go index a7fc41a..b920507 100644 --- a/apps/base/initial/internal/logic/data/datas_cache.go +++ b/module/base/initial/internal/logic/data/datas_cache.go @@ -1,8 +1,8 @@ package data import ( - "git.apinb.com/bsm-apps/initial/internal/impl" - "git.apinb.com/bsm-apps/initial/internal/models" + "bsm/full/module/base/initial/internal/impl" + "bsm/full/module/base/initial/internal/models" "gorm.io/gorm" "git.apinb.com/bsm-sdk/core/errcode" diff --git a/apps/base/initial/internal/models/initial_apps.go b/module/base/initial/internal/models/initial_apps.go similarity index 100% rename from apps/base/initial/internal/models/initial_apps.go rename to module/base/initial/internal/models/initial_apps.go diff --git a/apps/base/initial/internal/models/initial_areas.go b/module/base/initial/internal/models/initial_areas.go similarity index 100% rename from apps/base/initial/internal/models/initial_areas.go rename to module/base/initial/internal/models/initial_areas.go diff --git a/apps/base/initial/internal/models/initial_config.go b/module/base/initial/internal/models/initial_config.go similarity index 100% rename from apps/base/initial/internal/models/initial_config.go rename to module/base/initial/internal/models/initial_config.go diff --git a/apps/base/initial/internal/models/initial_country.go b/module/base/initial/internal/models/initial_country.go similarity index 100% rename from apps/base/initial/internal/models/initial_country.go rename to module/base/initial/internal/models/initial_country.go diff --git a/apps/base/initial/internal/models/initial_datas.go b/module/base/initial/internal/models/initial_datas.go similarity index 100% rename from apps/base/initial/internal/models/initial_datas.go rename to module/base/initial/internal/models/initial_datas.go diff --git a/apps/base/initial/internal/models/query.go b/module/base/initial/internal/models/query.go similarity index 100% rename from apps/base/initial/internal/models/query.go rename to module/base/initial/internal/models/query.go diff --git a/apps/base/initial/internal/server/check_server.go b/module/base/initial/internal/server/check_server.go similarity index 87% rename from apps/base/initial/internal/server/check_server.go rename to module/base/initial/internal/server/check_server.go index 3d76141..de3bb62 100644 --- a/apps/base/initial/internal/server/check_server.go +++ b/module/base/initial/internal/server/check_server.go @@ -3,8 +3,8 @@ package server import ( "context" - "git.apinb.com/bsm-apps/initial/internal/logic/check" - pb "git.apinb.com/bsm-apps/initial/pb" + "bsm/full/module/base/initial/internal/logic/check" + pb "bsm/full/module/base/initial/pb" ) type CheckServer struct { diff --git a/apps/base/initial/internal/server/data_server.go b/module/base/initial/internal/server/data_server.go similarity index 87% rename from apps/base/initial/internal/server/data_server.go rename to module/base/initial/internal/server/data_server.go index 7e92605..5e84133 100644 --- a/apps/base/initial/internal/server/data_server.go +++ b/module/base/initial/internal/server/data_server.go @@ -3,8 +3,8 @@ package server import ( "context" - "git.apinb.com/bsm-apps/initial/internal/logic/data" - pb "git.apinb.com/bsm-apps/initial/pb" + "bsm/full/module/base/initial/internal/logic/data" + pb "bsm/full/module/base/initial/pb" ) type DataServer struct { diff --git a/apps/base/initial/internal/server/new.go b/module/base/initial/internal/server/new.go similarity index 98% rename from apps/base/initial/internal/server/new.go rename to module/base/initial/internal/server/new.go index 3f6d641..3fb11f5 100644 --- a/apps/base/initial/internal/server/new.go +++ b/module/base/initial/internal/server/new.go @@ -3,7 +3,7 @@ package server import ( "context" - pb "git.apinb.com/bsm-apps/initial/pb" + pb "bsm/full/module/base/initial/pb" "git.apinb.com/bsm-sdk/core/vars" gwRuntime "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "google.golang.org/grpc" diff --git a/apps/base/initial/pb/check.pb.go b/module/base/initial/pb/check.pb.go similarity index 100% rename from apps/base/initial/pb/check.pb.go rename to module/base/initial/pb/check.pb.go diff --git a/apps/base/initial/pb/check.pb.gw.go b/module/base/initial/pb/check.pb.gw.go similarity index 100% rename from apps/base/initial/pb/check.pb.gw.go rename to module/base/initial/pb/check.pb.gw.go diff --git a/apps/base/initial/pb/check_grpc.pb.go b/module/base/initial/pb/check_grpc.pb.go similarity index 100% rename from apps/base/initial/pb/check_grpc.pb.go rename to module/base/initial/pb/check_grpc.pb.go diff --git a/apps/base/initial/pb/data.pb.go b/module/base/initial/pb/data.pb.go similarity index 100% rename from apps/base/initial/pb/data.pb.go rename to module/base/initial/pb/data.pb.go diff --git a/apps/base/initial/pb/data.pb.gw.go b/module/base/initial/pb/data.pb.gw.go similarity index 100% rename from apps/base/initial/pb/data.pb.gw.go rename to module/base/initial/pb/data.pb.gw.go diff --git a/apps/base/initial/pb/data_grpc.pb.go b/module/base/initial/pb/data_grpc.pb.go similarity index 100% rename from apps/base/initial/pb/data_grpc.pb.go rename to module/base/initial/pb/data_grpc.pb.go diff --git a/apps/base/initial/proto/check.proto b/module/base/initial/proto/check.proto similarity index 100% rename from apps/base/initial/proto/check.proto rename to module/base/initial/proto/check.proto diff --git a/apps/base/initial/proto/data.proto b/module/base/initial/proto/data.proto similarity index 100% rename from apps/base/initial/proto/data.proto rename to module/base/initial/proto/data.proto diff --git a/apps/base/initial/scripts/filebeat.yaml b/module/base/initial/scripts/filebeat.yaml similarity index 100% rename from apps/base/initial/scripts/filebeat.yaml rename to module/base/initial/scripts/filebeat.yaml diff --git a/apps/base/initial/scripts/initial_areas_202509081640.sql b/module/base/initial/scripts/initial_areas_202509081640.sql similarity index 100% rename from apps/base/initial/scripts/initial_areas_202509081640.sql rename to module/base/initial/scripts/initial_areas_202509081640.sql diff --git a/apps/base/initial/scripts/initial_country_202509081640.sql b/module/base/initial/scripts/initial_country_202509081640.sql similarity index 100% rename from apps/base/initial/scripts/initial_country_202509081640.sql rename to module/base/initial/scripts/initial_country_202509081640.sql diff --git a/apps/base/initial/scripts/lint.sh b/module/base/initial/scripts/lint.sh similarity index 100% rename from apps/base/initial/scripts/lint.sh rename to module/base/initial/scripts/lint.sh diff --git a/apps/base/initial/swagger/check.md b/module/base/initial/swagger/check.md similarity index 100% rename from apps/base/initial/swagger/check.md rename to module/base/initial/swagger/check.md diff --git a/apps/base/initial/swagger/data.md b/module/base/initial/swagger/data.md similarity index 100% rename from apps/base/initial/swagger/data.md rename to module/base/initial/swagger/data.md diff --git a/apps/base/initial/swagger/initial.swagger.json b/module/base/initial/swagger/initial.swagger.json similarity index 100% rename from apps/base/initial/swagger/initial.swagger.json rename to module/base/initial/swagger/initial.swagger.json diff --git a/apps/base/initial/test/grpc/main.go b/module/base/initial/test/grpc/main.go similarity index 99% rename from apps/base/initial/test/grpc/main.go rename to module/base/initial/test/grpc/main.go index 598bd4c..988196d 100644 --- a/apps/base/initial/test/grpc/main.go +++ b/module/base/initial/test/grpc/main.go @@ -6,7 +6,7 @@ import ( "log" "time" - pb "git.apinb.com/bsm-apps/initial/pb" + pb "bsm/full/module/base/initial/pb" "git.apinb.com/bsm-sdk/core/utils" "google.golang.org/grpc" "google.golang.org/grpc/credentials" diff --git a/apps/base/initial/test/http/check.hello.http b/module/base/initial/test/http/check.hello.http similarity index 100% rename from apps/base/initial/test/http/check.hello.http rename to module/base/initial/test/http/check.hello.http diff --git a/apps/base/initial/test/http/data.country.http b/module/base/initial/test/http/data.country.http similarity index 100% rename from apps/base/initial/test/http/data.country.http rename to module/base/initial/test/http/data.country.http diff --git a/apps/base/initial/test/readme.md b/module/base/initial/test/readme.md similarity index 100% rename from apps/base/initial/test/readme.md rename to module/base/initial/test/readme.md diff --git a/apps/base/logs/README.md b/module/base/logs/README.md similarity index 100% rename from apps/base/logs/README.md rename to module/base/logs/README.md diff --git a/apps/base/logs/cmd/cli/main.go b/module/base/logs/cmd/cli/main.go similarity index 100% rename from apps/base/logs/cmd/cli/main.go rename to module/base/logs/cmd/cli/main.go diff --git a/apps/base/logs/cmd/main/main.go b/module/base/logs/cmd/main/main.go similarity index 81% rename from apps/base/logs/cmd/main/main.go rename to module/base/logs/cmd/main/main.go index 171ae3d..4cf6ebf 100644 --- a/apps/base/logs/cmd/main/main.go +++ b/module/base/logs/cmd/main/main.go @@ -3,9 +3,9 @@ package service import ( "fmt" - "git.apinb.com/bsm-apps/logs/internal/config" - "git.apinb.com/bsm-apps/logs/internal/impl" - "git.apinb.com/bsm-apps/logs/internal/routers" + "bsm/full/module/base/logs/internal/config" + "bsm/full/module/base/logs/internal/impl" + "bsm/full/module/base/logs/internal/routers" "github.com/gin-gonic/gin" @@ -47,3 +47,7 @@ func Run() { panic(err) } } + +func main() { + Run() +} diff --git a/apps/base/logs/etc/logs_dev.yaml b/module/base/logs/etc/logs_dev.yaml similarity index 100% rename from apps/base/logs/etc/logs_dev.yaml rename to module/base/logs/etc/logs_dev.yaml diff --git a/apps/base/logs/etc/logs_prod.yaml b/module/base/logs/etc/logs_prod.yaml similarity index 100% rename from apps/base/logs/etc/logs_prod.yaml rename to module/base/logs/etc/logs_prod.yaml diff --git a/apps/base/logs/etc/logs_test.yaml b/module/base/logs/etc/logs_test.yaml similarity index 100% rename from apps/base/logs/etc/logs_test.yaml rename to module/base/logs/etc/logs_test.yaml diff --git a/apps/base/logs/etc/supervisor.pro-oplogs.conf b/module/base/logs/etc/supervisor.pro-oplogs.conf similarity index 100% rename from apps/base/logs/etc/supervisor.pro-oplogs.conf rename to module/base/logs/etc/supervisor.pro-oplogs.conf diff --git a/apps/base/logs/go.mod b/module/base/logs/go.mod similarity index 55% rename from apps/base/logs/go.mod rename to module/base/logs/go.mod index 81b24e8..8e924da 100644 --- a/apps/base/logs/go.mod +++ b/module/base/logs/go.mod @@ -1,25 +1,24 @@ -module git.apinb.com/bsm-apps/logs +module bsm/full/module/base/logs go 1.26.5 require ( git.apinb.com/bsm-sdk/core v0.2.0 github.com/gin-gonic/gin v1.12.0 - go.etcd.io/etcd/client/v3 v3.6.12 - gorm.io/gorm v1.31.1 + go.etcd.io/etcd/client/v3 v3.7.1 + gorm.io/gorm v1.31.2 ) require ( filippo.io/edwards25519 v1.2.0 // indirect github.com/bytedance/gopkg v0.1.4 // indirect github.com/bytedance/sonic v1.15.2 // indirect - github.com/bytedance/sonic/loader v0.5.1 // indirect + github.com/bytedance/sonic/loader v0.5.2 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/cloudwego/base64x v0.1.7 // indirect github.com/coreos/go-semver v0.3.1 // indirect github.com/coreos/go-systemd/v22 v22.7.0 // indirect - github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect - github.com/gabriel-vasile/mimetype v1.4.13 // indirect + github.com/gabriel-vasile/mimetype v1.4.15 // indirect github.com/gin-contrib/sse v1.1.1 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect @@ -27,10 +26,9 @@ require ( github.com/go-sql-driver/mysql v1.10.0 // indirect github.com/goccy/go-json v0.10.6 // indirect github.com/goccy/go-yaml v1.19.2 // indirect - github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/google/uuid v1.6.0 // indirect - github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.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.10.0 // indirect @@ -38,38 +36,39 @@ 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/cpuid/v2 v2.3.0 // indirect - github.com/leodido/go-urn v1.4.0 // indirect - github.com/mattn/go-isatty v0.0.22 // indirect + github.com/klauspost/cpuid/v2 v2.4.0 // indirect + github.com/leodido/go-urn v1.5.0 // indirect + github.com/mattn/go-isatty v0.0.24 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/oklog/ulid/v2 v2.1.1 // indirect + github.com/oklog/ulid/v2 v2.1.2 // indirect github.com/patrickmn/go-cache v2.1.0+incompatible // indirect - github.com/pelletier/go-toml/v2 v2.3.1 // indirect - github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect + github.com/pelletier/go-toml/v2 v2.4.3 // indirect github.com/quic-go/qpack v0.6.0 // indirect - github.com/quic-go/quic-go v0.59.1 // indirect - github.com/redis/go-redis/v9 v9.20.0 // indirect + github.com/quic-go/quic-go v0.61.0 // indirect + github.com/redis/go-redis/v9 v9.22.0 // indirect github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect - github.com/ugorji/go/codec v1.3.1 // indirect - go.etcd.io/etcd/api/v3 v3.6.12 // indirect - go.etcd.io/etcd/client/pkg/v3 v3.6.12 // indirect - go.mongodb.org/mongo-driver/v2 v2.6.0 // indirect + github.com/ugorji/go/codec v1.3.2 // indirect + go.etcd.io/etcd/api/v3 v3.7.1 // indirect + go.etcd.io/etcd/client/pkg/v3 v3.7.1 // indirect + go.mongodb.org/mongo-driver/v2 v2.8.0 // indirect go.uber.org/atomic v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.28.0 // indirect - golang.org/x/arch v0.27.0 // indirect - golang.org/x/crypto v0.52.0 // indirect - golang.org/x/net v0.55.0 // indirect - golang.org/x/sync v0.20.0 // indirect - golang.org/x/sys v0.45.0 // indirect - golang.org/x/text v0.37.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa // indirect - google.golang.org/grpc v1.81.1 // indirect + golang.org/x/arch v0.30.0 // indirect + golang.org/x/crypto v0.54.0 // indirect + golang.org/x/net v0.57.0 // indirect + golang.org/x/sync v0.22.0 // indirect + golang.org/x/sys v0.47.0 // indirect + golang.org/x/text v0.40.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea // indirect + google.golang.org/grpc v1.83.0 // indirect google.golang.org/protobuf v1.36.11 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect gorm.io/driver/mysql v1.6.0 // indirect - gorm.io/driver/postgres v1.6.0 // indirect + gorm.io/driver/postgres v1.6.2 // indirect ) + +replace git.apinb.com/bsm-sdk/core => D:/work/bsm-sdk/core diff --git a/apps/base/logs/go.sum b/module/base/logs/go.sum similarity index 56% rename from apps/base/logs/go.sum rename to module/base/logs/go.sum index 12eb081..2c657d4 100644 --- a/apps/base/logs/go.sum +++ b/module/base/logs/go.sum @@ -1,7 +1,5 @@ filippo.io/edwards25519 v1.2.0 h1:crnVqOiS4jqYleHd9vaKZ+HKtHfllngJIiOpNpoJsjo= filippo.io/edwards25519 v1.2.0/go.mod h1:xzAOLCNug/yB62zG1bQ8uziwrIqIuxhctzJT18Q77mc= -git.apinb.com/bsm-sdk/core v0.2.0 h1:/e9yqpsbKBrRgMiGpS3KX2O4qDLxo5V5GpPSLNGxEKw= -git.apinb.com/bsm-sdk/core v0.2.0/go.mod h1:E9T6Eboo/0Zb36BjkKbIgvFzq4fQ2Q8P/7y5zmYTI6Y= github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs= github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c= github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA= @@ -10,8 +8,8 @@ github.com/bytedance/gopkg v0.1.4 h1:oZnQwnX82KAIWb7033bEwtxvTqXcYMxDBaQxo5JJHWM github.com/bytedance/gopkg v0.1.4/go.mod h1:v1zWfPm21Fb+OsyXN2VAHdL6TBb2L88anLQgdyje6R4= github.com/bytedance/sonic v1.15.2 h1:90H+rcF/FwLXwfB1cudOLq/je83n683Utf4Cbp0xHCo= github.com/bytedance/sonic v1.15.2/go.mod h1:mT2NbXunuaEbnZ+mRIX/vYqKISmgEuHFDI4UzmKx2SA= -github.com/bytedance/sonic/loader v0.5.1 h1:Ygpfa9zwRCCKSlrp5bBP/b/Xzc3VxsAW+5NIYXrOOpI= -github.com/bytedance/sonic/loader v0.5.1/go.mod h1:AR4NYCk5DdzZizZ5djGqQ92eEhCCcdf5x77udYiSJRo= +github.com/bytedance/sonic/loader v0.5.2 h1:0QtP1gevc1OZ6/H8Lb9BRZiCXd1Ftjd3OKuj1T1lBIo= +github.com/bytedance/sonic/loader v0.5.2/go.mod h1:AR4NYCk5DdzZizZ5djGqQ92eEhCCcdf5x77udYiSJRo= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cloudwego/base64x v0.1.7 h1:NppS+Fgzg5ovhn4NkUXaDT3x9jldgH5ToMCqzBSi2zI= @@ -24,14 +22,14 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/gabriel-vasile/mimetype v1.4.13 h1:46nXokslUBsAJE/wMsp5gtO500a4F3Nkz9Ufpk2AcUM= -github.com/gabriel-vasile/mimetype v1.4.13/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s= +github.com/gabriel-vasile/mimetype v1.4.15 h1:05iP/CYtZ/w455R/KZM6rZ5ieAdh99UPtd+d3YzLmaI= +github.com/gabriel-vasile/mimetype v1.4.15/go.mod h1:azpTcoLcDZRNgFou5j+APrqQx9HqVPWa6ijYQIIVswQ= github.com/gin-contrib/sse v1.1.1 h1:uGYpNwTacv5R68bSGMapo62iLTRa9l5zxGCps4hK6ko= github.com/gin-contrib/sse v1.1.1/go.mod h1:QXzuVkA0YO7o/gun03UI1Q+FTI8ZV/n5t03kIQAI89s= github.com/gin-gonic/gin v1.12.0 h1:b3YAbrZtnf8N//yjKeU2+MQsh2mY5htkZidOM7O0wG8= github.com/gin-gonic/gin v1.12.0/go.mod h1:VxccKfsSllpKshkBWgVgRniFFAzFb9csfngsqANjnLc= -github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= -github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.4 h1:tG4xh9yMsRCAiodLVTxyrkzSZ9+o0L1Kg/+cPVcbP/8= +github.com/go-logr/logr v1.4.4/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= @@ -48,8 +46,6 @@ github.com/goccy/go-json v0.10.6 h1:p8HrPJzOakx/mn/bQtjgNjdTcN+/S6FcG2CTtQOrHVU= github.com/goccy/go-json v0.10.6/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= github.com/goccy/go-yaml v1.19.2 h1:PmFC1S6h8ljIz6gMRBopkjP1TVT7xuwrButHID66PoM= github.com/goccy/go-yaml v1.19.2/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA= -github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= -github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= @@ -57,8 +53,8 @@ github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= 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/grpc-ecosystem/grpc-gateway/v2 v2.29.0 h1:5VipnvEpbqr2gA2VbM+nYVbkIF28c5ZQfqCBQ5g2xfk= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0/go.mod h1:Hyl3n6Twe1hvtd9XUXDec4pTvgMSEixRuQKPTMH2bNs= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0 h1:/Tnpcb2E0Pz/tN9s3bfEY2Q8ePCEX9iuS+cneUwncnw= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0/go.mod h1:zOBXOsUaBSjKgmH4OGzV1esUpR3oUSCPYVd2cUBjKYY= 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= @@ -73,39 +69,41 @@ github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= -github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= -github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y= -github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0= +github.com/klauspost/cpuid/v2 v2.4.0 h1:S6Hrbc7+ywsr0r+RLapfGBHfyefhCTwEh3A0tV913Dw= +github.com/klauspost/cpuid/v2 v2.4.0/go.mod h1:19jmZ9mjzoF//ddRSUsv0zfBTJWh3QJh9FNxZTMrGxU= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= -github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= -github.com/mattn/go-isatty v0.0.22 h1:j8l17JJ9i6VGPUFUYoTUKPSgKe/83EYU2zBC7YNKMw4= -github.com/mattn/go-isatty v0.0.22/go.mod h1:ZXfXG4SQHsB/w3ZeOYbR0PrPwLy+n6xiMrJlRFqopa4= +github.com/leodido/go-urn v1.5.0 h1:pLqT2kq1zpHW/1D18QMjMpdtX7cekxqtJJjg5ANyWw0= +github.com/leodido/go-urn v1.5.0/go.mod h1:9BORnCDhdPBJNDEX+w1bJisa8yOKYi116VeO96s4ifE= +github.com/mattn/go-isatty v0.0.24 h1:tGZZoVgT/KiqK1c8ocVLeDS8BSWMRd47J3Lbz7vsReI= +github.com/mattn/go-isatty v0.0.24/go.mod h1:nMCL3Zebbrt45jsMDgnfIwz6ydEQApk5oEI3HqDio6A= +github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= +github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/oklog/ulid/v2 v2.1.1 h1:suPZ4ARWLOJLegGFiZZ1dFAkqzhMjL3J1TzI+5wHz8s= -github.com/oklog/ulid/v2 v2.1.1/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ= +github.com/oklog/ulid/v2 v2.1.2 h1:IEclFb9JNvzYA6MW2SCxbLzcHTVsfqm3PrqGQJH5zec= +github.com/oklog/ulid/v2 v2.1.2/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ= github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= github.com/pborman/getopt v0.0.0-20170112200414-7148bc3a4c30/go.mod h1:85jBQOZwpVEaDAr341tbn15RS4fCAsIst0qp7i8ex1o= -github.com/pelletier/go-toml/v2 v2.3.1 h1:MYEvvGnQjeNkRF1qUuGolNtNExTDwct51yp7olPtrEc= -github.com/pelletier/go-toml/v2 v2.3.1/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY= +github.com/pelletier/go-toml/v2 v2.4.3 h1:GTRvJQutkOSftxIFD5xw9aepkYNuPWmVJpffdDPYVpY= +github.com/pelletier/go-toml/v2 v2.4.3/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/quic-go/go-ossfuzz-seeds v0.1.0 h1:APacT+iIaNF6fd8AGEiN3bT/Jtkd2jz4v4TzM7MFjy0= +github.com/quic-go/go-ossfuzz-seeds v0.1.0/go.mod h1:3IOHRbJIc+L6YKMwfDtJAM9Vj9k0YY4muhuyUYk5tbk= github.com/quic-go/qpack v0.6.0 h1:g7W+BMYynC1LbYLSqRt8PBg5Tgwxn214ZZR34VIOjz8= github.com/quic-go/qpack v0.6.0/go.mod h1:lUpLKChi8njB4ty2bFLX2x4gzDqXwUpaO1DP9qMDZII= -github.com/quic-go/quic-go v0.59.1 h1:0Gmua0HW1Tv7ANR7hUYwRyD0MG5OJfgvYSZasGZzBic= -github.com/quic-go/quic-go v0.59.1/go.mod h1:upnsH4Ju1YkqpLXC305eW3yDZ4NfnNbmQRCMWS58IKU= -github.com/redis/go-redis/v9 v9.20.0 h1:WnQYxLkgO2xiXTCJY0ldIiI8dNqCDlQAG+AtaH7a2a0= -github.com/redis/go-redis/v9 v9.20.0/go.mod h1:v/M13XI1PVCDcm01VtPFOADfZtHf8YW3baQf57KlIkA= +github.com/quic-go/quic-go v0.61.0 h1:ui88A53s8MSVYLC56en0KQ17HARk+9986Dn0SBfKNvA= +github.com/quic-go/quic-go v0.61.0/go.mod h1:9So2anK4Tp22URSQq00k+Vo2PNkle96ycDPDHL4s9vs= +github.com/redis/go-redis/v9 v9.22.0 h1:laDvpYXTJtZLloinw1fA5Kqd6HAEH2XKxOkG/PDq2F0= +github.com/redis/go-redis/v9 v9.22.0/go.mod h1:y2g0Wj8rQvuK0ELM+oxSudcLtC09JScs98I/X9gRWY4= github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0= @@ -124,32 +122,30 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= -github.com/ugorji/go/codec v1.3.1 h1:waO7eEiFDwidsBN6agj1vJQ4AG7lh2yqXyOXqhgQuyY= -github.com/ugorji/go/codec v1.3.1/go.mod h1:pRBVtBSKl77K30Bv8R2P+cLSGaTtex6fsA2Wjqmfxj4= -github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/ugorji/go/codec v1.3.2 h1:zkEASHHyEClGeURfgNT9PJZVfAbs9oEX9QXggwWNJbc= +github.com/ugorji/go/codec v1.3.2/go.mod h1:pRBVtBSKl77K30Bv8R2P+cLSGaTtex6fsA2Wjqmfxj4= github.com/zeebo/xxh3 v1.1.0 h1:s7DLGDK45Dyfg7++yxI0khrfwq9661w9EN78eP/UZVs= github.com/zeebo/xxh3 v1.1.0/go.mod h1:IisAie1LELR4xhVinxWS5+zf1lA4p0MW4T+w+W07F5s= -go.etcd.io/etcd/api/v3 v3.6.12 h1:OLOZUKEuAA36TR48F0cIaa8FdzrWygjyfrJxXg4iDgs= -go.etcd.io/etcd/api/v3 v3.6.12/go.mod h1:p14EIQXHbuOQbVvL/WEes5uqKnxP9AgKJgpjbMVvzvE= -go.etcd.io/etcd/client/pkg/v3 v3.6.12 h1:36zzB+pQOdHbhN+kH2iJz/K8bJn0ZLtLfPPO7jozTDo= -go.etcd.io/etcd/client/pkg/v3 v3.6.12/go.mod h1:hh2+ZXtfLzs3o6mn92ntgNPBrTJJOvXqICM5g3L3DMY= -go.etcd.io/etcd/client/v3 v3.6.12 h1:kMSP6JcPZMqSJiX+TXdUIBU/4eXEZWBAaui4VihMbIc= -go.etcd.io/etcd/client/v3 v3.6.12/go.mod h1:CMs6fJWYiZQk4ytFjd4lE1diOvvRMmtbbn/alZXd3dQ= -go.mongodb.org/mongo-driver/v2 v2.6.0 h1:b9sJOYrkmt4l8bY43ZenFBcPlhYIjaOfYHLtbB/5qi8= -go.mongodb.org/mongo-driver/v2 v2.6.0/go.mod h1:yOI9kBsufol30iFsl1slpdq1I0eHPzybRWdyYUs8K/0= +go.etcd.io/etcd/api/v3 v3.7.1 h1:KJG0/DcWGfe3Y1otDf/fsBf0TSSgpxZ5RO/L8SFt73E= +go.etcd.io/etcd/api/v3 v3.7.1/go.mod h1:8bXIpCMeV7E3/XL0Ix123ATn3dB+0V7d9zklHbB0m78= +go.etcd.io/etcd/client/pkg/v3 v3.7.1 h1:rKYsj3pRkR0eK3yjT3XOgrhqfmIfj9pzNgxjh7mfFv4= +go.etcd.io/etcd/client/pkg/v3 v3.7.1/go.mod h1:cnzZGIUzSfjEwLC6UBVsSXlEK1eepS/JUD7wE6PLRT0= +go.etcd.io/etcd/client/v3 v3.7.1 h1:0PEMMC0KuZmVIN+RAbdqfkZ45pYTgKVtmBEbRCvZFUg= +go.etcd.io/etcd/client/v3 v3.7.1/go.mod h1:ffNqALa8tRCYhYo1F9oR489y23K39Gz+BSR3ApAGYq0= +go.mongodb.org/mongo-driver/v2 v2.8.0 h1:CxWDGQYY8QQwNjAl/aq2sfWakdnWZynnqJ9F4DhHbP8= +go.mongodb.org/mongo-driver/v2 v2.8.0/go.mod h1:yOI9kBsufol30iFsl1slpdq1I0eHPzybRWdyYUs8K/0= go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64= go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y= -go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I= -go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0= -go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM= -go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY= -go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg= -go.opentelemetry.io/otel/sdk v1.43.0/go.mod h1:P+IkVU3iWukmiit/Yf9AWvpyRDlUeBaRg6Y+C58QHzg= -go.opentelemetry.io/otel/sdk/metric v1.43.0 h1:S88dyqXjJkuBNLeMcVPRFXpRw2fuwdvfCGLEo89fDkw= -go.opentelemetry.io/otel/sdk/metric v1.43.0/go.mod h1:C/RJtwSEJ5hzTiUz5pXF1kILHStzb9zFlIEe85bhj6A= -go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A= -go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0= +go.opentelemetry.io/otel v1.45.0 h1:pdrWmLHofpubmArBv1LgFSv1Z0Ie/ppdZzu+kUN5EeU= +go.opentelemetry.io/otel v1.45.0/go.mod h1:XZxIqPapzEYnhNSScF5DIqXhm/rYi0FzCe2XddAwZfQ= +go.opentelemetry.io/otel/metric v1.45.0 h1:7Eg1uH7CJ5cXv9is6tnBe1FI6rj1nwUdbFypRm3br/M= +go.opentelemetry.io/otel/metric v1.45.0/go.mod h1:HAPbm1nd3p1PmFH7v2dR+6BjXxw+Lq4a2+pndMAm08s= +go.opentelemetry.io/otel/sdk v1.45.0 h1:4VVSMgQ83dUgW2aoX5f6JgLvHwIvzcuLnF9lUdCSpCw= +go.opentelemetry.io/otel/sdk v1.45.0/go.mod h1:Sr40LgXV7DsKMMJMKOhUWOgMWTfAaqvm2kF0g7ilwuA= +go.opentelemetry.io/otel/sdk/metric v1.44.0 h1:3LlKgI+VjbVsjNRFZJZAJ30WjXC5VkNRks6si09iEfI= +go.opentelemetry.io/otel/sdk/metric v1.44.0/go.mod h1:5B5pMARnXxKhltooO4xUuCBorl65a4EpnTalObqOigA= +go.opentelemetry.io/otel/trace v1.45.0 h1:l/mP6Uv7oNO7/TblbhpbgMidxhq1uO/rPsikOyVhxag= +go.opentelemetry.io/otel/trace v1.45.0/go.mod h1:qoJJA2xNMnxRrdISU/kLtfUH2wNeQbiv+jhs/CxI8bc= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= @@ -160,53 +156,28 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.28.0 h1:IZzaP1Fv73/T/pBMLk4VutPl36uNC+OSUh3JLG3FIjo= go.uber.org/zap v1.28.0/go.mod h1:rDLpOi171uODNm/mxFcuYWxDsqWSAVkFdX4XojSKg/Q= -go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= -go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= -golang.org/x/arch v0.27.0 h1:0WNVcR8u9yFz8j5FvdHpgwNp3FS5U4guYdzHwEiGjoU= -golang.org/x/arch v0.27.0/go.mod h1:0X+GdSIP+kL5wPmpK7sdkEVTt2XoYP0cSjQSbZBwOi8= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.52.0 h1:RMs7fP2rXdep0CftQlK8Uf+kibLm7qkCcradZWYz988= -golang.org/x/crypto v0.52.0/go.mod h1:1QgfPxDqh0T2M/elOJtp9RvuR95kVjir0e6/BvEmGbc= -golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8= -golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -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.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4= -golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY= -golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc= -golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -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= +go.yaml.in/yaml/v3 v3.0.5 h1:N6y/pJk8buWs9NY5ERU2HSMfm+IuD/OtfdAnq6kESPw= +go.yaml.in/yaml/v3 v3.0.5/go.mod h1:HVTZu1O7/Vkt2N+BFy8Zza+lnLsABggaTM2ZpNIGuKg= +golang.org/x/arch v0.30.0 h1:sB9h+1gRGa2+LauFSV0tm8bK1J2yo1bx6/Uyi/P6DTU= +golang.org/x/arch v0.30.0/go.mod h1:0X+GdSIP+kL5wPmpK7sdkEVTt2XoYP0cSjQSbZBwOi8= +golang.org/x/crypto v0.54.0 h1:YLIA59K4fiNzHzjnZt2tUJQjQtUWfWbeHBqKtk3eScw= +golang.org/x/crypto v0.54.0/go.mod h1:KWL8ny2AZdGR2cWmzeHrp2azQPGogOv+HeQaVEXC2dk= +golang.org/x/net v0.57.0 h1:K5+3DljvIuDG9/Jv9rvyMywYNFCQ9RSUY6OOTTkT+tE= +golang.org/x/net v0.57.0/go.mod h1:KpXc8iv+r3XplLAG/f7Jsf9RPszJzdR0f58q9vGOuEU= +golang.org/x/sync v0.22.0 h1:SZjpbeLmrCk4xhRSZFNZW5gFUeCeFgjekvI/+gfScek= +golang.org/x/sync v0.22.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= +golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs= +golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +golang.org/x/text v0.40.0 h1:Ub2Z6/xjgF1WrYQz2nuITOEegKFtiIy+rieRJ5lHZKs= +golang.org/x/text v0.40.0/go.mod h1:hpnzDAfGV753zIKo+wk3u1bVKCGPbrnF7+7LBF/UHVY= gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4= gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E= -google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa h1:Kjn0N0tCrDgiAFW+lGO4JZ3ck44CehvJQMAwj9QF0G8= -google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:q4lMZS6kskjT5HvCPrnnypcDPVJqT/f4nfxmkE7gryY= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa h1:mZHHdPZl0dbGHCflZgAq/Q468DWVFcU2whhB2KAo8fk= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= -google.golang.org/grpc v1.81.1 h1:VnnIIZ88UzOOKLukQi+ImGz8O1Wdp8nAGGnvOfEIWQQ= -google.golang.org/grpc v1.81.1/go.mod h1:xGH9GfzOyMTGIOXBJmXt+BX/V0kcdQbdcuwQ/zNw42I= +google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea h1:Jifw/kjs/r3B0uszvls/m3c3tmZs2YHGM9C+rvxP9gY= +google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea/go.mod h1:K/+WGbmBY7aNW1HDw1fJnKYo10i0DkAX6pows00dLig= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea h1:kVhQEPTpKQahD5+JSBTfBB19wcgQTTjAIn45MBqnyHk= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= +google.golang.org/grpc v1.83.0 h1:JeNZEKJFbQxArAMl+hiytHauacDNqJUllNfmIMmpqnQ= +google.golang.org/grpc v1.83.0/go.mod h1:kDyl6SKsiHKt0uylY5gtn5cEjkrIOhQOGDgIc4JGwzQ= google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE= google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -217,7 +188,9 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gorm.io/driver/mysql v1.6.0 h1:eNbLmNTpPpTOVZi8MMxCi2aaIm0ZpInbORNXDwyLGvg= gorm.io/driver/mysql v1.6.0/go.mod h1:D/oCC2GWK3M/dqoLxnOlaNKmXz8WNTfcS9y5ovaSqKo= -gorm.io/driver/postgres v1.6.0 h1:2dxzU8xJ+ivvqTRph34QX+WrRaJlmfyPqXmoGVjMBa4= -gorm.io/driver/postgres v1.6.0/go.mod h1:vUw0mrGgrTK+uPHEhAdV4sfFELrByKVGnaVRkXDhtWo= -gorm.io/gorm v1.31.1 h1:7CA8FTFz/gRfgqgpeKIBcervUn3xSyPUmr6B2WXJ7kg= -gorm.io/gorm v1.31.1/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs= +gorm.io/driver/postgres v1.6.2 h1:BvXQ/cNUg63q5TFNg672DmDcowZSFrNLkkA3Xe6GXq4= +gorm.io/driver/postgres v1.6.2/go.mod h1:0c4fQA44XhOklXDkgtuKqysHCycTa5i9e3EIpDGCwXk= +gorm.io/driver/sqlite v1.6.0 h1:WHRRrIiulaPiPFmDcod6prc4l2VGVWHz80KspNsxSfQ= +gorm.io/driver/sqlite v1.6.0/go.mod h1:AO9V1qIQddBESngQUKWL9yoH93HIeA1X6V633rBwyT8= +gorm.io/gorm v1.31.2 h1:3o8FXNo9v9S858gil+3LlZA1LkCOzgb4g5BL64FgaCo= +gorm.io/gorm v1.31.2/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs= diff --git a/apps/base/logs/internal/config/config.go b/module/base/logs/internal/config/config.go similarity index 100% rename from apps/base/logs/internal/config/config.go rename to module/base/logs/internal/config/config.go diff --git a/apps/base/logs/internal/impl/impl.go b/module/base/logs/internal/impl/impl.go similarity index 95% rename from apps/base/logs/internal/impl/impl.go rename to module/base/logs/internal/impl/impl.go index 5396e99..41f08e9 100644 --- a/apps/base/logs/internal/impl/impl.go +++ b/module/base/logs/internal/impl/impl.go @@ -1,7 +1,7 @@ package impl import ( - "git.apinb.com/bsm-apps/logs/internal/config" + "bsm/full/module/base/logs/internal/config" "git.apinb.com/bsm-sdk/core/cache/redis" "git.apinb.com/bsm-sdk/core/types" "git.apinb.com/bsm-sdk/core/vars" diff --git a/apps/base/logs/internal/logic/hello/ping.go b/module/base/logs/internal/logic/hello/ping.go similarity index 100% rename from apps/base/logs/internal/logic/hello/ping.go rename to module/base/logs/internal/logic/hello/ping.go diff --git a/apps/base/logs/internal/logic/log/create.go b/module/base/logs/internal/logic/log/create.go similarity index 91% rename from apps/base/logs/internal/logic/log/create.go rename to module/base/logs/internal/logic/log/create.go index a0691a7..fd416b5 100644 --- a/apps/base/logs/internal/logic/log/create.go +++ b/module/base/logs/internal/logic/log/create.go @@ -5,8 +5,8 @@ import ( "log" "strings" - "git.apinb.com/bsm-apps/logs/internal/impl" - "git.apinb.com/bsm-apps/logs/internal/models" + "bsm/full/module/base/logs/internal/impl" + "bsm/full/module/base/logs/internal/models" "git.apinb.com/bsm-sdk/core/infra" "github.com/gin-gonic/gin" ) diff --git a/apps/base/logs/internal/logic/log/fetch.go b/module/base/logs/internal/logic/log/fetch.go similarity index 93% rename from apps/base/logs/internal/logic/log/fetch.go rename to module/base/logs/internal/logic/log/fetch.go index e0a29ca..b16dd45 100644 --- a/apps/base/logs/internal/logic/log/fetch.go +++ b/module/base/logs/internal/logic/log/fetch.go @@ -3,8 +3,8 @@ package log import ( "log" - "git.apinb.com/bsm-apps/logs/internal/impl" - "git.apinb.com/bsm-apps/logs/internal/models" + "bsm/full/module/base/logs/internal/impl" + "bsm/full/module/base/logs/internal/models" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/infra" "github.com/gin-gonic/gin" diff --git a/apps/base/logs/internal/logic/log/total.go b/module/base/logs/internal/logic/log/total.go similarity index 88% rename from apps/base/logs/internal/logic/log/total.go rename to module/base/logs/internal/logic/log/total.go index 22a7d86..7ec438b 100644 --- a/apps/base/logs/internal/logic/log/total.go +++ b/module/base/logs/internal/logic/log/total.go @@ -3,8 +3,8 @@ package log import ( "log" - "git.apinb.com/bsm-apps/logs/internal/impl" - "git.apinb.com/bsm-apps/logs/internal/models" + "bsm/full/module/base/logs/internal/impl" + "bsm/full/module/base/logs/internal/models" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/infra" "github.com/gin-gonic/gin" diff --git a/apps/base/logs/internal/models/log_data.go b/module/base/logs/internal/models/log_data.go similarity index 100% rename from apps/base/logs/internal/models/log_data.go rename to module/base/logs/internal/models/log_data.go diff --git a/apps/base/logs/internal/routers/register.go b/module/base/logs/internal/routers/register.go similarity index 85% rename from apps/base/logs/internal/routers/register.go rename to module/base/logs/internal/routers/register.go index 4ba862d..eccaafd 100644 --- a/apps/base/logs/internal/routers/register.go +++ b/module/base/logs/internal/routers/register.go @@ -3,8 +3,8 @@ package routers import ( "fmt" - "git.apinb.com/bsm-apps/logs/internal/logic/hello" - "git.apinb.com/bsm-apps/logs/internal/logic/log" + "bsm/full/module/base/logs/internal/logic/hello" + "bsm/full/module/base/logs/internal/logic/log" "github.com/gin-gonic/gin" ) diff --git a/apps/base/logs/scripts/deploy.sh b/module/base/logs/scripts/deploy.sh similarity index 100% rename from apps/base/logs/scripts/deploy.sh rename to module/base/logs/scripts/deploy.sh diff --git a/apps/base/logs/scripts/pack.sh b/module/base/logs/scripts/pack.sh similarity index 100% rename from apps/base/logs/scripts/pack.sh rename to module/base/logs/scripts/pack.sh diff --git a/apps/base/logs/test/cnt.http b/module/base/logs/test/cnt.http similarity index 100% rename from apps/base/logs/test/cnt.http rename to module/base/logs/test/cnt.http diff --git a/apps/base/logs/test/list.http b/module/base/logs/test/list.http similarity index 100% rename from apps/base/logs/test/list.http rename to module/base/logs/test/list.http diff --git a/apps/base/logs/test/log.http b/module/base/logs/test/log.http similarity index 100% rename from apps/base/logs/test/log.http rename to module/base/logs/test/log.http diff --git a/apps/base/mgt/README.md b/module/base/mgt/README.md similarity index 99% rename from apps/base/mgt/README.md rename to module/base/mgt/README.md index 07522dd..5215cd8 100644 --- a/apps/base/mgt/README.md +++ b/module/base/mgt/README.md @@ -189,7 +189,7 @@ go run scripts/init_ops_monitor_app.go #### 5. 编译项目 ```bash -go build -o mgt.exe git.apinb.com/bsm-apps/mgt/cmd/main +go build -o mgt.exe bsm/full/module/base/mgt/cmd/main ``` #### 6. 启动服务 @@ -363,7 +363,7 @@ Authorization: Bearer 运行参数验证工具函数的单元测试： ```bash -go test -v git.apinb.com/bsm-apps/mgt/internal/utils +go test -v bsm/full/module/base/mgt/internal/utils ``` **测试结果：** ✅ 19个测试用例全部通过 @@ -402,7 +402,7 @@ go test -v git.apinb.com/bsm-apps/mgt/internal/utils #### 参数验证 ```go -import "git.apinb.com/bsm-apps/mgt/internal/utils" +import "bsm/full/module/base/mgt/internal/utils" // 验证结构体 if err := libs.ValidateStruct(&request); err != nil { diff --git a/apps/base/mgt/cmd/main/main.go b/module/base/mgt/cmd/main/main.go similarity index 88% rename from apps/base/mgt/cmd/main/main.go rename to module/base/mgt/cmd/main/main.go index e8f1c77..e34d064 100644 --- a/apps/base/mgt/cmd/main/main.go +++ b/module/base/mgt/cmd/main/main.go @@ -9,9 +9,9 @@ import ( "syscall" "time" - "git.apinb.com/bsm-apps/mgt/internal/config" - "git.apinb.com/bsm-apps/mgt/internal/impl" - "git.apinb.com/bsm-apps/mgt/internal/routers" + "bsm/full/module/base/mgt/internal/config" + "bsm/full/module/base/mgt/internal/impl" + "bsm/full/module/base/mgt/internal/routers" "git.apinb.com/bsm-sdk/core/infra" "git.apinb.com/bsm-sdk/core/middleware" "git.apinb.com/bsm-sdk/core/printer" @@ -62,3 +62,7 @@ func Run() { panic(err) } } + +func main() { + Run() +} diff --git a/apps/base/mgt/doc/README.md b/module/base/mgt/doc/README.md similarity index 100% rename from apps/base/mgt/doc/README.md rename to module/base/mgt/doc/README.md diff --git a/apps/base/mgt/doc/app.md b/module/base/mgt/doc/app.md similarity index 100% rename from apps/base/mgt/doc/app.md rename to module/base/mgt/doc/app.md diff --git a/apps/base/mgt/doc/dpt.md b/module/base/mgt/doc/dpt.md similarity index 100% rename from apps/base/mgt/doc/dpt.md rename to module/base/mgt/doc/dpt.md diff --git a/apps/base/mgt/doc/pmn.md b/module/base/mgt/doc/pmn.md similarity index 100% rename from apps/base/mgt/doc/pmn.md rename to module/base/mgt/doc/pmn.md diff --git a/apps/base/mgt/doc/pub.md b/module/base/mgt/doc/pub.md similarity index 100% rename from apps/base/mgt/doc/pub.md rename to module/base/mgt/doc/pub.md diff --git a/apps/base/mgt/doc/role.md b/module/base/mgt/doc/role.md similarity index 100% rename from apps/base/mgt/doc/role.md rename to module/base/mgt/doc/role.md diff --git a/apps/base/mgt/doc/user.md b/module/base/mgt/doc/user.md similarity index 100% rename from apps/base/mgt/doc/user.md rename to module/base/mgt/doc/user.md diff --git a/apps/base/mgt/etc/bsm-mgt.service b/module/base/mgt/etc/bsm-mgt.service similarity index 100% rename from apps/base/mgt/etc/bsm-mgt.service rename to module/base/mgt/etc/bsm-mgt.service diff --git a/apps/base/mgt/etc/menu.json b/module/base/mgt/etc/menu.json similarity index 100% rename from apps/base/mgt/etc/menu.json rename to module/base/mgt/etc/menu.json diff --git a/apps/base/mgt/etc/mgt_dev.yaml b/module/base/mgt/etc/mgt_dev.yaml similarity index 100% rename from apps/base/mgt/etc/mgt_dev.yaml rename to module/base/mgt/etc/mgt_dev.yaml diff --git a/apps/base/mgt/etc/mgt_prod.yaml b/module/base/mgt/etc/mgt_prod.yaml similarity index 100% rename from apps/base/mgt/etc/mgt_prod.yaml rename to module/base/mgt/etc/mgt_prod.yaml diff --git a/apps/base/mgt/etc/mgt_test.yaml b/module/base/mgt/etc/mgt_test.yaml similarity index 100% rename from apps/base/mgt/etc/mgt_test.yaml rename to module/base/mgt/etc/mgt_test.yaml diff --git a/apps/base/mgt/go.mod b/module/base/mgt/go.mod similarity index 59% rename from apps/base/mgt/go.mod rename to module/base/mgt/go.mod index d1f8d12..68e5f7c 100644 --- a/apps/base/mgt/go.mod +++ b/module/base/mgt/go.mod @@ -1,4 +1,4 @@ -module git.apinb.com/bsm-apps/mgt +module bsm/full/module/base/mgt go 1.26.5 @@ -7,17 +7,15 @@ require ( github.com/gin-gonic/gin v1.12.0 github.com/go-playground/validator/v10 v10.30.3 github.com/patrickmn/go-cache v2.1.0+incompatible - go.etcd.io/etcd/client/v3 v3.6.12 - golang.org/x/crypto v0.52.0 + go.etcd.io/etcd/client/v3 v3.7.1 + golang.org/x/crypto v0.54.0 gorm.io/driver/mysql v1.6.0 - gorm.io/gorm v1.31.1 + gorm.io/gorm v1.31.2 ) require ( - github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect - github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect - google.golang.org/grpc v1.81.1 // indirect + google.golang.org/grpc v1.83.0 // indirect ) require ( @@ -25,12 +23,12 @@ require ( git.apinb.com/bsm-sdk/core v0.2.0 github.com/bytedance/gopkg v0.1.4 // indirect github.com/bytedance/sonic v1.15.2 // indirect - github.com/bytedance/sonic/loader v0.5.1 // indirect + github.com/bytedance/sonic/loader v0.5.2 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/cloudwego/base64x v0.1.7 // indirect github.com/coreos/go-semver v0.3.1 // indirect github.com/coreos/go-systemd/v22 v22.7.0 // indirect - github.com/gabriel-vasile/mimetype v1.4.13 // indirect + github.com/gabriel-vasile/mimetype v1.4.15 // indirect github.com/gin-contrib/cors v1.7.7 // indirect github.com/gin-contrib/sse v1.1.1 // indirect github.com/go-playground/locales v0.14.1 // indirect @@ -38,14 +36,13 @@ require ( github.com/go-sql-driver/mysql v1.10.0 // indirect github.com/goccy/go-json v0.10.6 // indirect github.com/goccy/go-yaml v1.19.2 // indirect - github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt/v5 v5.3.1 // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/google/uuid v1.6.0 // indirect github.com/gorilla/context v1.1.2 // indirect github.com/gorilla/securecookie v1.1.2 // indirect github.com/gorilla/sessions v1.4.0 // indirect - github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.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.10.0 // indirect @@ -53,32 +50,34 @@ 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/cpuid/v2 v2.3.0 // indirect - github.com/leodido/go-urn v1.4.0 // indirect - github.com/mattn/go-isatty v0.0.22 // indirect + github.com/klauspost/cpuid/v2 v2.4.0 // indirect + github.com/leodido/go-urn v1.5.0 // indirect + github.com/mattn/go-isatty v0.0.24 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/oklog/ulid/v2 v2.1.1 // indirect - github.com/pelletier/go-toml/v2 v2.3.1 // indirect + github.com/oklog/ulid/v2 v2.1.2 // indirect + github.com/pelletier/go-toml/v2 v2.4.3 // indirect github.com/quic-go/qpack v0.6.0 // indirect - github.com/quic-go/quic-go v0.59.1 // indirect - github.com/redis/go-redis/v9 v9.20.0 + github.com/quic-go/quic-go v0.61.0 // indirect + github.com/redis/go-redis/v9 v9.22.0 github.com/twitchyliquid64/golang-asm v0.15.1 // indirect - github.com/ugorji/go/codec v1.3.1 // indirect - go.etcd.io/etcd/api/v3 v3.6.12 // indirect - go.etcd.io/etcd/client/pkg/v3 v3.6.12 // indirect - go.mongodb.org/mongo-driver/v2 v2.6.0 // indirect + github.com/ugorji/go/codec v1.3.2 // indirect + go.etcd.io/etcd/api/v3 v3.7.1 // indirect + go.etcd.io/etcd/client/pkg/v3 v3.7.1 // indirect + go.mongodb.org/mongo-driver/v2 v2.8.0 // indirect go.uber.org/atomic v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.28.0 // indirect - golang.org/x/arch v0.27.0 // indirect - golang.org/x/net v0.55.0 // indirect - golang.org/x/sync v0.20.0 // indirect - golang.org/x/sys v0.45.0 // indirect - golang.org/x/text v0.37.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa // indirect + golang.org/x/arch v0.30.0 // indirect + golang.org/x/net v0.57.0 // indirect + golang.org/x/sync v0.22.0 // indirect + golang.org/x/sys v0.47.0 // indirect + golang.org/x/text v0.40.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea // indirect google.golang.org/protobuf v1.36.11 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - gorm.io/driver/postgres v1.6.0 // indirect + gorm.io/driver/postgres v1.6.2 // indirect ) + +replace git.apinb.com/bsm-sdk/core => D:/work/bsm-sdk/core diff --git a/apps/base/mgt/go.sum b/module/base/mgt/go.sum similarity index 58% rename from apps/base/mgt/go.sum rename to module/base/mgt/go.sum index 44a5ad4..f0e4f03 100644 --- a/apps/base/mgt/go.sum +++ b/module/base/mgt/go.sum @@ -1,7 +1,5 @@ filippo.io/edwards25519 v1.2.0 h1:crnVqOiS4jqYleHd9vaKZ+HKtHfllngJIiOpNpoJsjo= filippo.io/edwards25519 v1.2.0/go.mod h1:xzAOLCNug/yB62zG1bQ8uziwrIqIuxhctzJT18Q77mc= -git.apinb.com/bsm-sdk/core v0.2.0 h1:/e9yqpsbKBrRgMiGpS3KX2O4qDLxo5V5GpPSLNGxEKw= -git.apinb.com/bsm-sdk/core v0.2.0/go.mod h1:E9T6Eboo/0Zb36BjkKbIgvFzq4fQ2Q8P/7y5zmYTI6Y= github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs= github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c= github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA= @@ -10,8 +8,8 @@ github.com/bytedance/gopkg v0.1.4 h1:oZnQwnX82KAIWb7033bEwtxvTqXcYMxDBaQxo5JJHWM github.com/bytedance/gopkg v0.1.4/go.mod h1:v1zWfPm21Fb+OsyXN2VAHdL6TBb2L88anLQgdyje6R4= github.com/bytedance/sonic v1.15.2 h1:90H+rcF/FwLXwfB1cudOLq/je83n683Utf4Cbp0xHCo= github.com/bytedance/sonic v1.15.2/go.mod h1:mT2NbXunuaEbnZ+mRIX/vYqKISmgEuHFDI4UzmKx2SA= -github.com/bytedance/sonic/loader v0.5.1 h1:Ygpfa9zwRCCKSlrp5bBP/b/Xzc3VxsAW+5NIYXrOOpI= -github.com/bytedance/sonic/loader v0.5.1/go.mod h1:AR4NYCk5DdzZizZ5djGqQ92eEhCCcdf5x77udYiSJRo= +github.com/bytedance/sonic/loader v0.5.2 h1:0QtP1gevc1OZ6/H8Lb9BRZiCXd1Ftjd3OKuj1T1lBIo= +github.com/bytedance/sonic/loader v0.5.2/go.mod h1:AR4NYCk5DdzZizZ5djGqQ92eEhCCcdf5x77udYiSJRo= github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cloudwego/base64x v0.1.7 h1:NppS+Fgzg5ovhn4NkUXaDT3x9jldgH5ToMCqzBSi2zI= @@ -24,8 +22,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/gabriel-vasile/mimetype v1.4.13 h1:46nXokslUBsAJE/wMsp5gtO500a4F3Nkz9Ufpk2AcUM= -github.com/gabriel-vasile/mimetype v1.4.13/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s= +github.com/gabriel-vasile/mimetype v1.4.15 h1:05iP/CYtZ/w455R/KZM6rZ5ieAdh99UPtd+d3YzLmaI= +github.com/gabriel-vasile/mimetype v1.4.15/go.mod h1:azpTcoLcDZRNgFou5j+APrqQx9HqVPWa6ijYQIIVswQ= github.com/gin-contrib/cors v1.7.7 h1:Oh9joP463x7Mw72vhvJ61YQm8ODh9b04YR7vsOErD0Q= github.com/gin-contrib/cors v1.7.7/go.mod h1:K5tW0RkzJtWSiOdikXloy8VEZlgdVNpHNw8FpjUPNrE= github.com/gin-contrib/sessions v1.1.0 h1:00mhHfNEGF5sP2fwxa98aRqj1FOJdL6IkR86n2hOiBo= @@ -34,8 +32,8 @@ github.com/gin-contrib/sse v1.1.1 h1:uGYpNwTacv5R68bSGMapo62iLTRa9l5zxGCps4hK6ko github.com/gin-contrib/sse v1.1.1/go.mod h1:QXzuVkA0YO7o/gun03UI1Q+FTI8ZV/n5t03kIQAI89s= github.com/gin-gonic/gin v1.12.0 h1:b3YAbrZtnf8N//yjKeU2+MQsh2mY5htkZidOM7O0wG8= github.com/gin-gonic/gin v1.12.0/go.mod h1:VxccKfsSllpKshkBWgVgRniFFAzFb9csfngsqANjnLc= -github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= -github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.4 h1:tG4xh9yMsRCAiodLVTxyrkzSZ9+o0L1Kg/+cPVcbP/8= +github.com/go-logr/logr v1.4.4/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= @@ -52,8 +50,6 @@ github.com/goccy/go-json v0.10.6 h1:p8HrPJzOakx/mn/bQtjgNjdTcN+/S6FcG2CTtQOrHVU= github.com/goccy/go-json v0.10.6/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= github.com/goccy/go-yaml v1.19.2 h1:PmFC1S6h8ljIz6gMRBopkjP1TVT7xuwrButHID66PoM= github.com/goccy/go-yaml v1.19.2/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA= -github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= -github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt/v5 v5.3.1 h1:kYf81DTWFe7t+1VvL7eS+jKFVWaUnK9cB1qbwn63YCY= github.com/golang-jwt/jwt/v5 v5.3.1/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= @@ -71,8 +67,8 @@ github.com/gorilla/securecookie v1.1.2 h1:YCIWL56dvtr73r6715mJs5ZvhtnY73hBvEF8kX github.com/gorilla/securecookie v1.1.2/go.mod h1:NfCASbcHqRSY+3a8tlWJwsQap2VX5pwzwo4h3eOamfo= github.com/gorilla/sessions v1.4.0 h1:kpIYOp/oi6MG/p5PgxApU8srsSw9tuFbt46Lt7auzqQ= github.com/gorilla/sessions v1.4.0/go.mod h1:FLWm50oby91+hl7p/wRxDth9bWSuk0qVL2emc7lT5ik= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 h1:5VipnvEpbqr2gA2VbM+nYVbkIF28c5ZQfqCBQ5g2xfk= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0/go.mod h1:Hyl3n6Twe1hvtd9XUXDec4pTvgMSEixRuQKPTMH2bNs= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0 h1:/Tnpcb2E0Pz/tN9s3bfEY2Q8ePCEX9iuS+cneUwncnw= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0/go.mod h1:zOBXOsUaBSjKgmH4OGzV1esUpR3oUSCPYVd2cUBjKYY= 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= @@ -87,39 +83,41 @@ github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= -github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= -github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y= -github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0= +github.com/klauspost/cpuid/v2 v2.4.0 h1:S6Hrbc7+ywsr0r+RLapfGBHfyefhCTwEh3A0tV913Dw= +github.com/klauspost/cpuid/v2 v2.4.0/go.mod h1:19jmZ9mjzoF//ddRSUsv0zfBTJWh3QJh9FNxZTMrGxU= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= -github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= -github.com/mattn/go-isatty v0.0.22 h1:j8l17JJ9i6VGPUFUYoTUKPSgKe/83EYU2zBC7YNKMw4= -github.com/mattn/go-isatty v0.0.22/go.mod h1:ZXfXG4SQHsB/w3ZeOYbR0PrPwLy+n6xiMrJlRFqopa4= +github.com/leodido/go-urn v1.5.0 h1:pLqT2kq1zpHW/1D18QMjMpdtX7cekxqtJJjg5ANyWw0= +github.com/leodido/go-urn v1.5.0/go.mod h1:9BORnCDhdPBJNDEX+w1bJisa8yOKYi116VeO96s4ifE= +github.com/mattn/go-isatty v0.0.24 h1:tGZZoVgT/KiqK1c8ocVLeDS8BSWMRd47J3Lbz7vsReI= +github.com/mattn/go-isatty v0.0.24/go.mod h1:nMCL3Zebbrt45jsMDgnfIwz6ydEQApk5oEI3HqDio6A= +github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= +github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/oklog/ulid/v2 v2.1.1 h1:suPZ4ARWLOJLegGFiZZ1dFAkqzhMjL3J1TzI+5wHz8s= -github.com/oklog/ulid/v2 v2.1.1/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ= +github.com/oklog/ulid/v2 v2.1.2 h1:IEclFb9JNvzYA6MW2SCxbLzcHTVsfqm3PrqGQJH5zec= +github.com/oklog/ulid/v2 v2.1.2/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ= github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= github.com/pborman/getopt v0.0.0-20170112200414-7148bc3a4c30/go.mod h1:85jBQOZwpVEaDAr341tbn15RS4fCAsIst0qp7i8ex1o= -github.com/pelletier/go-toml/v2 v2.3.1 h1:MYEvvGnQjeNkRF1qUuGolNtNExTDwct51yp7olPtrEc= -github.com/pelletier/go-toml/v2 v2.3.1/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY= +github.com/pelletier/go-toml/v2 v2.4.3 h1:GTRvJQutkOSftxIFD5xw9aepkYNuPWmVJpffdDPYVpY= +github.com/pelletier/go-toml/v2 v2.4.3/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/quic-go/go-ossfuzz-seeds v0.1.0 h1:APacT+iIaNF6fd8AGEiN3bT/Jtkd2jz4v4TzM7MFjy0= +github.com/quic-go/go-ossfuzz-seeds v0.1.0/go.mod h1:3IOHRbJIc+L6YKMwfDtJAM9Vj9k0YY4muhuyUYk5tbk= github.com/quic-go/qpack v0.6.0 h1:g7W+BMYynC1LbYLSqRt8PBg5Tgwxn214ZZR34VIOjz8= github.com/quic-go/qpack v0.6.0/go.mod h1:lUpLKChi8njB4ty2bFLX2x4gzDqXwUpaO1DP9qMDZII= -github.com/quic-go/quic-go v0.59.1 h1:0Gmua0HW1Tv7ANR7hUYwRyD0MG5OJfgvYSZasGZzBic= -github.com/quic-go/quic-go v0.59.1/go.mod h1:upnsH4Ju1YkqpLXC305eW3yDZ4NfnNbmQRCMWS58IKU= -github.com/redis/go-redis/v9 v9.20.0 h1:WnQYxLkgO2xiXTCJY0ldIiI8dNqCDlQAG+AtaH7a2a0= -github.com/redis/go-redis/v9 v9.20.0/go.mod h1:v/M13XI1PVCDcm01VtPFOADfZtHf8YW3baQf57KlIkA= +github.com/quic-go/quic-go v0.61.0 h1:ui88A53s8MSVYLC56en0KQ17HARk+9986Dn0SBfKNvA= +github.com/quic-go/quic-go v0.61.0/go.mod h1:9So2anK4Tp22URSQq00k+Vo2PNkle96ycDPDHL4s9vs= +github.com/redis/go-redis/v9 v9.22.0 h1:laDvpYXTJtZLloinw1fA5Kqd6HAEH2XKxOkG/PDq2F0= +github.com/redis/go-redis/v9 v9.22.0/go.mod h1:y2g0Wj8rQvuK0ELM+oxSudcLtC09JScs98I/X9gRWY4= github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0= @@ -138,32 +136,30 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= -github.com/ugorji/go/codec v1.3.1 h1:waO7eEiFDwidsBN6agj1vJQ4AG7lh2yqXyOXqhgQuyY= -github.com/ugorji/go/codec v1.3.1/go.mod h1:pRBVtBSKl77K30Bv8R2P+cLSGaTtex6fsA2Wjqmfxj4= -github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/ugorji/go/codec v1.3.2 h1:zkEASHHyEClGeURfgNT9PJZVfAbs9oEX9QXggwWNJbc= +github.com/ugorji/go/codec v1.3.2/go.mod h1:pRBVtBSKl77K30Bv8R2P+cLSGaTtex6fsA2Wjqmfxj4= github.com/zeebo/xxh3 v1.1.0 h1:s7DLGDK45Dyfg7++yxI0khrfwq9661w9EN78eP/UZVs= github.com/zeebo/xxh3 v1.1.0/go.mod h1:IisAie1LELR4xhVinxWS5+zf1lA4p0MW4T+w+W07F5s= -go.etcd.io/etcd/api/v3 v3.6.12 h1:OLOZUKEuAA36TR48F0cIaa8FdzrWygjyfrJxXg4iDgs= -go.etcd.io/etcd/api/v3 v3.6.12/go.mod h1:p14EIQXHbuOQbVvL/WEes5uqKnxP9AgKJgpjbMVvzvE= -go.etcd.io/etcd/client/pkg/v3 v3.6.12 h1:36zzB+pQOdHbhN+kH2iJz/K8bJn0ZLtLfPPO7jozTDo= -go.etcd.io/etcd/client/pkg/v3 v3.6.12/go.mod h1:hh2+ZXtfLzs3o6mn92ntgNPBrTJJOvXqICM5g3L3DMY= -go.etcd.io/etcd/client/v3 v3.6.12 h1:kMSP6JcPZMqSJiX+TXdUIBU/4eXEZWBAaui4VihMbIc= -go.etcd.io/etcd/client/v3 v3.6.12/go.mod h1:CMs6fJWYiZQk4ytFjd4lE1diOvvRMmtbbn/alZXd3dQ= -go.mongodb.org/mongo-driver/v2 v2.6.0 h1:b9sJOYrkmt4l8bY43ZenFBcPlhYIjaOfYHLtbB/5qi8= -go.mongodb.org/mongo-driver/v2 v2.6.0/go.mod h1:yOI9kBsufol30iFsl1slpdq1I0eHPzybRWdyYUs8K/0= +go.etcd.io/etcd/api/v3 v3.7.1 h1:KJG0/DcWGfe3Y1otDf/fsBf0TSSgpxZ5RO/L8SFt73E= +go.etcd.io/etcd/api/v3 v3.7.1/go.mod h1:8bXIpCMeV7E3/XL0Ix123ATn3dB+0V7d9zklHbB0m78= +go.etcd.io/etcd/client/pkg/v3 v3.7.1 h1:rKYsj3pRkR0eK3yjT3XOgrhqfmIfj9pzNgxjh7mfFv4= +go.etcd.io/etcd/client/pkg/v3 v3.7.1/go.mod h1:cnzZGIUzSfjEwLC6UBVsSXlEK1eepS/JUD7wE6PLRT0= +go.etcd.io/etcd/client/v3 v3.7.1 h1:0PEMMC0KuZmVIN+RAbdqfkZ45pYTgKVtmBEbRCvZFUg= +go.etcd.io/etcd/client/v3 v3.7.1/go.mod h1:ffNqALa8tRCYhYo1F9oR489y23K39Gz+BSR3ApAGYq0= +go.mongodb.org/mongo-driver/v2 v2.8.0 h1:CxWDGQYY8QQwNjAl/aq2sfWakdnWZynnqJ9F4DhHbP8= +go.mongodb.org/mongo-driver/v2 v2.8.0/go.mod h1:yOI9kBsufol30iFsl1slpdq1I0eHPzybRWdyYUs8K/0= go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64= go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y= -go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I= -go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0= -go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM= -go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY= -go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg= -go.opentelemetry.io/otel/sdk v1.43.0/go.mod h1:P+IkVU3iWukmiit/Yf9AWvpyRDlUeBaRg6Y+C58QHzg= -go.opentelemetry.io/otel/sdk/metric v1.43.0 h1:S88dyqXjJkuBNLeMcVPRFXpRw2fuwdvfCGLEo89fDkw= -go.opentelemetry.io/otel/sdk/metric v1.43.0/go.mod h1:C/RJtwSEJ5hzTiUz5pXF1kILHStzb9zFlIEe85bhj6A= -go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A= -go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0= +go.opentelemetry.io/otel v1.45.0 h1:pdrWmLHofpubmArBv1LgFSv1Z0Ie/ppdZzu+kUN5EeU= +go.opentelemetry.io/otel v1.45.0/go.mod h1:XZxIqPapzEYnhNSScF5DIqXhm/rYi0FzCe2XddAwZfQ= +go.opentelemetry.io/otel/metric v1.45.0 h1:7Eg1uH7CJ5cXv9is6tnBe1FI6rj1nwUdbFypRm3br/M= +go.opentelemetry.io/otel/metric v1.45.0/go.mod h1:HAPbm1nd3p1PmFH7v2dR+6BjXxw+Lq4a2+pndMAm08s= +go.opentelemetry.io/otel/sdk v1.45.0 h1:4VVSMgQ83dUgW2aoX5f6JgLvHwIvzcuLnF9lUdCSpCw= +go.opentelemetry.io/otel/sdk v1.45.0/go.mod h1:Sr40LgXV7DsKMMJMKOhUWOgMWTfAaqvm2kF0g7ilwuA= +go.opentelemetry.io/otel/sdk/metric v1.44.0 h1:3LlKgI+VjbVsjNRFZJZAJ30WjXC5VkNRks6si09iEfI= +go.opentelemetry.io/otel/sdk/metric v1.44.0/go.mod h1:5B5pMARnXxKhltooO4xUuCBorl65a4EpnTalObqOigA= +go.opentelemetry.io/otel/trace v1.45.0 h1:l/mP6Uv7oNO7/TblbhpbgMidxhq1uO/rPsikOyVhxag= +go.opentelemetry.io/otel/trace v1.45.0/go.mod h1:qoJJA2xNMnxRrdISU/kLtfUH2wNeQbiv+jhs/CxI8bc= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= @@ -174,53 +170,28 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.28.0 h1:IZzaP1Fv73/T/pBMLk4VutPl36uNC+OSUh3JLG3FIjo= go.uber.org/zap v1.28.0/go.mod h1:rDLpOi171uODNm/mxFcuYWxDsqWSAVkFdX4XojSKg/Q= -go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= -go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= -golang.org/x/arch v0.27.0 h1:0WNVcR8u9yFz8j5FvdHpgwNp3FS5U4guYdzHwEiGjoU= -golang.org/x/arch v0.27.0/go.mod h1:0X+GdSIP+kL5wPmpK7sdkEVTt2XoYP0cSjQSbZBwOi8= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.52.0 h1:RMs7fP2rXdep0CftQlK8Uf+kibLm7qkCcradZWYz988= -golang.org/x/crypto v0.52.0/go.mod h1:1QgfPxDqh0T2M/elOJtp9RvuR95kVjir0e6/BvEmGbc= -golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8= -golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -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.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4= -golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY= -golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc= -golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -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= +go.yaml.in/yaml/v3 v3.0.5 h1:N6y/pJk8buWs9NY5ERU2HSMfm+IuD/OtfdAnq6kESPw= +go.yaml.in/yaml/v3 v3.0.5/go.mod h1:HVTZu1O7/Vkt2N+BFy8Zza+lnLsABggaTM2ZpNIGuKg= +golang.org/x/arch v0.30.0 h1:sB9h+1gRGa2+LauFSV0tm8bK1J2yo1bx6/Uyi/P6DTU= +golang.org/x/arch v0.30.0/go.mod h1:0X+GdSIP+kL5wPmpK7sdkEVTt2XoYP0cSjQSbZBwOi8= +golang.org/x/crypto v0.54.0 h1:YLIA59K4fiNzHzjnZt2tUJQjQtUWfWbeHBqKtk3eScw= +golang.org/x/crypto v0.54.0/go.mod h1:KWL8ny2AZdGR2cWmzeHrp2azQPGogOv+HeQaVEXC2dk= +golang.org/x/net v0.57.0 h1:K5+3DljvIuDG9/Jv9rvyMywYNFCQ9RSUY6OOTTkT+tE= +golang.org/x/net v0.57.0/go.mod h1:KpXc8iv+r3XplLAG/f7Jsf9RPszJzdR0f58q9vGOuEU= +golang.org/x/sync v0.22.0 h1:SZjpbeLmrCk4xhRSZFNZW5gFUeCeFgjekvI/+gfScek= +golang.org/x/sync v0.22.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= +golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs= +golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +golang.org/x/text v0.40.0 h1:Ub2Z6/xjgF1WrYQz2nuITOEegKFtiIy+rieRJ5lHZKs= +golang.org/x/text v0.40.0/go.mod h1:hpnzDAfGV753zIKo+wk3u1bVKCGPbrnF7+7LBF/UHVY= gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4= gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E= -google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa h1:Kjn0N0tCrDgiAFW+lGO4JZ3ck44CehvJQMAwj9QF0G8= -google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:q4lMZS6kskjT5HvCPrnnypcDPVJqT/f4nfxmkE7gryY= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa h1:mZHHdPZl0dbGHCflZgAq/Q468DWVFcU2whhB2KAo8fk= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= -google.golang.org/grpc v1.81.1 h1:VnnIIZ88UzOOKLukQi+ImGz8O1Wdp8nAGGnvOfEIWQQ= -google.golang.org/grpc v1.81.1/go.mod h1:xGH9GfzOyMTGIOXBJmXt+BX/V0kcdQbdcuwQ/zNw42I= +google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea h1:Jifw/kjs/r3B0uszvls/m3c3tmZs2YHGM9C+rvxP9gY= +google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea/go.mod h1:K/+WGbmBY7aNW1HDw1fJnKYo10i0DkAX6pows00dLig= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea h1:kVhQEPTpKQahD5+JSBTfBB19wcgQTTjAIn45MBqnyHk= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= +google.golang.org/grpc v1.83.0 h1:JeNZEKJFbQxArAMl+hiytHauacDNqJUllNfmIMmpqnQ= +google.golang.org/grpc v1.83.0/go.mod h1:kDyl6SKsiHKt0uylY5gtn5cEjkrIOhQOGDgIc4JGwzQ= google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE= google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -231,7 +202,9 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gorm.io/driver/mysql v1.6.0 h1:eNbLmNTpPpTOVZi8MMxCi2aaIm0ZpInbORNXDwyLGvg= gorm.io/driver/mysql v1.6.0/go.mod h1:D/oCC2GWK3M/dqoLxnOlaNKmXz8WNTfcS9y5ovaSqKo= -gorm.io/driver/postgres v1.6.0 h1:2dxzU8xJ+ivvqTRph34QX+WrRaJlmfyPqXmoGVjMBa4= -gorm.io/driver/postgres v1.6.0/go.mod h1:vUw0mrGgrTK+uPHEhAdV4sfFELrByKVGnaVRkXDhtWo= -gorm.io/gorm v1.31.1 h1:7CA8FTFz/gRfgqgpeKIBcervUn3xSyPUmr6B2WXJ7kg= -gorm.io/gorm v1.31.1/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs= +gorm.io/driver/postgres v1.6.2 h1:BvXQ/cNUg63q5TFNg672DmDcowZSFrNLkkA3Xe6GXq4= +gorm.io/driver/postgres v1.6.2/go.mod h1:0c4fQA44XhOklXDkgtuKqysHCycTa5i9e3EIpDGCwXk= +gorm.io/driver/sqlite v1.6.0 h1:WHRRrIiulaPiPFmDcod6prc4l2VGVWHz80KspNsxSfQ= +gorm.io/driver/sqlite v1.6.0/go.mod h1:AO9V1qIQddBESngQUKWL9yoH93HIeA1X6V633rBwyT8= +gorm.io/gorm v1.31.2 h1:3o8FXNo9v9S858gil+3LlZA1LkCOzgb4g5BL64FgaCo= +gorm.io/gorm v1.31.2/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs= diff --git a/apps/base/mgt/internal/config/config.go b/module/base/mgt/internal/config/config.go similarity index 100% rename from apps/base/mgt/internal/config/config.go rename to module/base/mgt/internal/config/config.go diff --git a/apps/base/mgt/internal/impl/impl.go b/module/base/mgt/internal/impl/impl.go similarity index 93% rename from apps/base/mgt/internal/impl/impl.go rename to module/base/mgt/internal/impl/impl.go index 6b32d33..fd61a17 100644 --- a/apps/base/mgt/internal/impl/impl.go +++ b/module/base/mgt/internal/impl/impl.go @@ -1,7 +1,7 @@ package impl import ( - "git.apinb.com/bsm-apps/mgt/internal/config" + "bsm/full/module/base/mgt/internal/config" "git.apinb.com/bsm-sdk/core/cache/redis" "git.apinb.com/bsm-sdk/core/with" cache "github.com/patrickmn/go-cache" diff --git a/apps/base/mgt/internal/impl/with.go b/module/base/mgt/internal/impl/with.go similarity index 92% rename from apps/base/mgt/internal/impl/with.go rename to module/base/mgt/internal/impl/with.go index a78a72f..93b5ba4 100644 --- a/apps/base/mgt/internal/impl/with.go +++ b/module/base/mgt/internal/impl/with.go @@ -1,7 +1,7 @@ package impl import ( - "git.apinb.com/bsm-apps/mgt/internal/models" + "bsm/full/module/base/mgt/internal/models" "git.apinb.com/bsm-sdk/core/conf" "git.apinb.com/bsm-sdk/core/printer" coreTypes "git.apinb.com/bsm-sdk/core/types" diff --git a/apps/base/mgt/internal/libs/validator.go b/module/base/mgt/internal/libs/validator.go similarity index 100% rename from apps/base/mgt/internal/libs/validator.go rename to module/base/mgt/internal/libs/validator.go diff --git a/apps/base/mgt/internal/logic/application/create.go b/module/base/mgt/internal/logic/application/create.go similarity index 95% rename from apps/base/mgt/internal/logic/application/create.go rename to module/base/mgt/internal/logic/application/create.go index 0a7a543..2f64f2d 100644 --- a/apps/base/mgt/internal/logic/application/create.go +++ b/module/base/mgt/internal/logic/application/create.go @@ -3,9 +3,9 @@ package application import ( "errors" - "git.apinb.com/bsm-apps/mgt/internal/libs" - "git.apinb.com/bsm-apps/mgt/internal/models" - "git.apinb.com/bsm-apps/mgt/internal/types" + "bsm/full/module/base/mgt/internal/libs" + "bsm/full/module/base/mgt/internal/models" + "bsm/full/module/base/mgt/internal/types" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/infra" "git.apinb.com/bsm-sdk/core/printer" diff --git a/apps/base/mgt/internal/logic/application/del.go b/module/base/mgt/internal/logic/application/del.go similarity index 94% rename from apps/base/mgt/internal/logic/application/del.go rename to module/base/mgt/internal/logic/application/del.go index 8bda21f..aac890f 100644 --- a/apps/base/mgt/internal/logic/application/del.go +++ b/module/base/mgt/internal/logic/application/del.go @@ -1,9 +1,9 @@ package application import ( - "git.apinb.com/bsm-apps/mgt/internal/libs" - "git.apinb.com/bsm-apps/mgt/internal/models" - "git.apinb.com/bsm-apps/mgt/internal/types" + "bsm/full/module/base/mgt/internal/libs" + "bsm/full/module/base/mgt/internal/models" + "bsm/full/module/base/mgt/internal/types" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/infra" "git.apinb.com/bsm-sdk/core/printer" diff --git a/apps/base/mgt/internal/logic/application/detail.go b/module/base/mgt/internal/logic/application/detail.go similarity index 88% rename from apps/base/mgt/internal/logic/application/detail.go rename to module/base/mgt/internal/logic/application/detail.go index 89cc299..2ea419b 100644 --- a/apps/base/mgt/internal/logic/application/detail.go +++ b/module/base/mgt/internal/logic/application/detail.go @@ -3,9 +3,9 @@ package application import ( "errors" - "git.apinb.com/bsm-apps/mgt/internal/libs" - "git.apinb.com/bsm-apps/mgt/internal/models" - "git.apinb.com/bsm-apps/mgt/internal/types" + "bsm/full/module/base/mgt/internal/libs" + "bsm/full/module/base/mgt/internal/models" + "bsm/full/module/base/mgt/internal/types" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/infra" "git.apinb.com/bsm-sdk/core/printer" diff --git a/apps/base/mgt/internal/logic/application/fetch.go b/module/base/mgt/internal/logic/application/fetch.go similarity index 86% rename from apps/base/mgt/internal/logic/application/fetch.go rename to module/base/mgt/internal/logic/application/fetch.go index 2e68275..e664531 100644 --- a/apps/base/mgt/internal/logic/application/fetch.go +++ b/module/base/mgt/internal/logic/application/fetch.go @@ -1,10 +1,10 @@ package application import ( - "git.apinb.com/bsm-apps/mgt/internal/libs" - "git.apinb.com/bsm-apps/mgt/internal/logic/tool" - "git.apinb.com/bsm-apps/mgt/internal/models" - "git.apinb.com/bsm-apps/mgt/internal/types" + "bsm/full/module/base/mgt/internal/libs" + "bsm/full/module/base/mgt/internal/logic/tool" + "bsm/full/module/base/mgt/internal/models" + "bsm/full/module/base/mgt/internal/types" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/infra" "github.com/gin-gonic/gin" diff --git a/apps/base/mgt/internal/logic/application/fetch_other.go b/module/base/mgt/internal/logic/application/fetch_other.go similarity index 95% rename from apps/base/mgt/internal/logic/application/fetch_other.go rename to module/base/mgt/internal/logic/application/fetch_other.go index 31d1dee..37a4094 100644 --- a/apps/base/mgt/internal/logic/application/fetch_other.go +++ b/module/base/mgt/internal/logic/application/fetch_other.go @@ -1,10 +1,10 @@ package application import ( - "git.apinb.com/bsm-apps/mgt/internal/libs" - "git.apinb.com/bsm-apps/mgt/internal/logic/tool" - "git.apinb.com/bsm-apps/mgt/internal/models" - "git.apinb.com/bsm-apps/mgt/internal/types" + "bsm/full/module/base/mgt/internal/libs" + "bsm/full/module/base/mgt/internal/logic/tool" + "bsm/full/module/base/mgt/internal/models" + "bsm/full/module/base/mgt/internal/types" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/infra" "git.apinb.com/bsm-sdk/core/printer" diff --git a/apps/base/mgt/internal/logic/application/modify.go b/module/base/mgt/internal/logic/application/modify.go similarity index 92% rename from apps/base/mgt/internal/logic/application/modify.go rename to module/base/mgt/internal/logic/application/modify.go index 8b4bd77..e985c97 100644 --- a/apps/base/mgt/internal/logic/application/modify.go +++ b/module/base/mgt/internal/logic/application/modify.go @@ -3,9 +3,9 @@ package application import ( "errors" - "git.apinb.com/bsm-apps/mgt/internal/libs" - "git.apinb.com/bsm-apps/mgt/internal/models" - "git.apinb.com/bsm-apps/mgt/internal/types" + "bsm/full/module/base/mgt/internal/libs" + "bsm/full/module/base/mgt/internal/models" + "bsm/full/module/base/mgt/internal/types" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/infra" "git.apinb.com/bsm-sdk/core/printer" diff --git a/apps/base/mgt/internal/logic/department/create.go b/module/base/mgt/internal/logic/department/create.go similarity index 95% rename from apps/base/mgt/internal/logic/department/create.go rename to module/base/mgt/internal/logic/department/create.go index ec55f06..d518c37 100644 --- a/apps/base/mgt/internal/logic/department/create.go +++ b/module/base/mgt/internal/logic/department/create.go @@ -3,9 +3,9 @@ package department import ( "errors" - "git.apinb.com/bsm-apps/mgt/internal/libs" - "git.apinb.com/bsm-apps/mgt/internal/models" - "git.apinb.com/bsm-apps/mgt/internal/types" + "bsm/full/module/base/mgt/internal/libs" + "bsm/full/module/base/mgt/internal/models" + "bsm/full/module/base/mgt/internal/types" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/infra" "git.apinb.com/bsm-sdk/core/printer" diff --git a/apps/base/mgt/internal/logic/department/del.go b/module/base/mgt/internal/logic/department/del.go similarity index 94% rename from apps/base/mgt/internal/logic/department/del.go rename to module/base/mgt/internal/logic/department/del.go index f41700c..0636823 100644 --- a/apps/base/mgt/internal/logic/department/del.go +++ b/module/base/mgt/internal/logic/department/del.go @@ -3,9 +3,9 @@ package department import ( "errors" - "git.apinb.com/bsm-apps/mgt/internal/libs" - "git.apinb.com/bsm-apps/mgt/internal/models" - "git.apinb.com/bsm-apps/mgt/internal/types" + "bsm/full/module/base/mgt/internal/libs" + "bsm/full/module/base/mgt/internal/models" + "bsm/full/module/base/mgt/internal/types" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/infra" "github.com/gin-gonic/gin" diff --git a/apps/base/mgt/internal/logic/department/detail.go b/module/base/mgt/internal/logic/department/detail.go similarity index 89% rename from apps/base/mgt/internal/logic/department/detail.go rename to module/base/mgt/internal/logic/department/detail.go index bc4cc97..c4b6d3a 100644 --- a/apps/base/mgt/internal/logic/department/detail.go +++ b/module/base/mgt/internal/logic/department/detail.go @@ -3,9 +3,9 @@ package department import ( "errors" - "git.apinb.com/bsm-apps/mgt/internal/libs" - "git.apinb.com/bsm-apps/mgt/internal/models" - "git.apinb.com/bsm-apps/mgt/internal/types" + "bsm/full/module/base/mgt/internal/libs" + "bsm/full/module/base/mgt/internal/models" + "bsm/full/module/base/mgt/internal/types" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/infra" "git.apinb.com/bsm-sdk/core/printer" diff --git a/apps/base/mgt/internal/logic/department/fetch.go b/module/base/mgt/internal/logic/department/fetch.go similarity index 90% rename from apps/base/mgt/internal/logic/department/fetch.go rename to module/base/mgt/internal/logic/department/fetch.go index ab275e1..e59b179 100644 --- a/apps/base/mgt/internal/logic/department/fetch.go +++ b/module/base/mgt/internal/logic/department/fetch.go @@ -1,10 +1,10 @@ package department import ( - "git.apinb.com/bsm-apps/mgt/internal/libs" - "git.apinb.com/bsm-apps/mgt/internal/logic/tool" - "git.apinb.com/bsm-apps/mgt/internal/models" - "git.apinb.com/bsm-apps/mgt/internal/types" + "bsm/full/module/base/mgt/internal/libs" + "bsm/full/module/base/mgt/internal/logic/tool" + "bsm/full/module/base/mgt/internal/models" + "bsm/full/module/base/mgt/internal/types" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/infra" "git.apinb.com/bsm-sdk/core/printer" diff --git a/apps/base/mgt/internal/logic/department/fetch_pmn.go b/module/base/mgt/internal/logic/department/fetch_pmn.go similarity index 95% rename from apps/base/mgt/internal/logic/department/fetch_pmn.go rename to module/base/mgt/internal/logic/department/fetch_pmn.go index b16b7af..d76f0ff 100644 --- a/apps/base/mgt/internal/logic/department/fetch_pmn.go +++ b/module/base/mgt/internal/logic/department/fetch_pmn.go @@ -1,9 +1,9 @@ package department import ( - "git.apinb.com/bsm-apps/mgt/internal/libs" - "git.apinb.com/bsm-apps/mgt/internal/models" - "git.apinb.com/bsm-apps/mgt/internal/types" + "bsm/full/module/base/mgt/internal/libs" + "bsm/full/module/base/mgt/internal/models" + "bsm/full/module/base/mgt/internal/types" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/infra" "git.apinb.com/bsm-sdk/core/printer" diff --git a/apps/base/mgt/internal/logic/department/fetch_pmn_tree.go b/module/base/mgt/internal/logic/department/fetch_pmn_tree.go similarity index 96% rename from apps/base/mgt/internal/logic/department/fetch_pmn_tree.go rename to module/base/mgt/internal/logic/department/fetch_pmn_tree.go index d118d79..5067d69 100644 --- a/apps/base/mgt/internal/logic/department/fetch_pmn_tree.go +++ b/module/base/mgt/internal/logic/department/fetch_pmn_tree.go @@ -1,9 +1,9 @@ package department import ( - "git.apinb.com/bsm-apps/mgt/internal/libs" - "git.apinb.com/bsm-apps/mgt/internal/models" - "git.apinb.com/bsm-apps/mgt/internal/types" + "bsm/full/module/base/mgt/internal/libs" + "bsm/full/module/base/mgt/internal/models" + "bsm/full/module/base/mgt/internal/types" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/infra" "git.apinb.com/bsm-sdk/core/printer" diff --git a/apps/base/mgt/internal/logic/department/fetch_tree.go b/module/base/mgt/internal/logic/department/fetch_tree.go similarity index 90% rename from apps/base/mgt/internal/logic/department/fetch_tree.go rename to module/base/mgt/internal/logic/department/fetch_tree.go index 40ce2bf..75043f8 100644 --- a/apps/base/mgt/internal/logic/department/fetch_tree.go +++ b/module/base/mgt/internal/logic/department/fetch_tree.go @@ -1,9 +1,9 @@ package department import ( - "git.apinb.com/bsm-apps/mgt/internal/libs" - "git.apinb.com/bsm-apps/mgt/internal/models" - "git.apinb.com/bsm-apps/mgt/internal/types" + "bsm/full/module/base/mgt/internal/libs" + "bsm/full/module/base/mgt/internal/models" + "bsm/full/module/base/mgt/internal/types" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/infra" "git.apinb.com/bsm-sdk/core/printer" diff --git a/apps/base/mgt/internal/logic/department/list.go b/module/base/mgt/internal/logic/department/list.go similarity index 94% rename from apps/base/mgt/internal/logic/department/list.go rename to module/base/mgt/internal/logic/department/list.go index a6c7aaf..09e7d42 100644 --- a/apps/base/mgt/internal/logic/department/list.go +++ b/module/base/mgt/internal/logic/department/list.go @@ -1,9 +1,9 @@ package department import ( - "git.apinb.com/bsm-apps/mgt/internal/libs" - "git.apinb.com/bsm-apps/mgt/internal/models" - "git.apinb.com/bsm-apps/mgt/internal/types" + "bsm/full/module/base/mgt/internal/libs" + "bsm/full/module/base/mgt/internal/models" + "bsm/full/module/base/mgt/internal/types" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/infra" "git.apinb.com/bsm-sdk/core/printer" diff --git a/apps/base/mgt/internal/logic/department/modify.go b/module/base/mgt/internal/logic/department/modify.go similarity index 95% rename from apps/base/mgt/internal/logic/department/modify.go rename to module/base/mgt/internal/logic/department/modify.go index db7c4bb..357c2a3 100644 --- a/apps/base/mgt/internal/logic/department/modify.go +++ b/module/base/mgt/internal/logic/department/modify.go @@ -3,9 +3,9 @@ package department import ( "errors" - "git.apinb.com/bsm-apps/mgt/internal/libs" - "git.apinb.com/bsm-apps/mgt/internal/models" - "git.apinb.com/bsm-apps/mgt/internal/types" + "bsm/full/module/base/mgt/internal/libs" + "bsm/full/module/base/mgt/internal/models" + "bsm/full/module/base/mgt/internal/types" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/infra" "git.apinb.com/bsm-sdk/core/printer" diff --git a/apps/base/mgt/internal/logic/department/set_pmn.go b/module/base/mgt/internal/logic/department/set_pmn.go similarity index 97% rename from apps/base/mgt/internal/logic/department/set_pmn.go rename to module/base/mgt/internal/logic/department/set_pmn.go index 32c125b..e79a38a 100644 --- a/apps/base/mgt/internal/logic/department/set_pmn.go +++ b/module/base/mgt/internal/logic/department/set_pmn.go @@ -3,9 +3,9 @@ package department import ( "errors" - "git.apinb.com/bsm-apps/mgt/internal/libs" - "git.apinb.com/bsm-apps/mgt/internal/models" - "git.apinb.com/bsm-apps/mgt/internal/types" + "bsm/full/module/base/mgt/internal/libs" + "bsm/full/module/base/mgt/internal/models" + "bsm/full/module/base/mgt/internal/types" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/infra" "git.apinb.com/bsm-sdk/core/printer" diff --git a/apps/base/mgt/internal/logic/department/user.go b/module/base/mgt/internal/logic/department/user.go similarity index 95% rename from apps/base/mgt/internal/logic/department/user.go rename to module/base/mgt/internal/logic/department/user.go index 52cbb50..2f21d23 100644 --- a/apps/base/mgt/internal/logic/department/user.go +++ b/module/base/mgt/internal/logic/department/user.go @@ -3,9 +3,9 @@ package department import ( "errors" - "git.apinb.com/bsm-apps/mgt/internal/libs" - "git.apinb.com/bsm-apps/mgt/internal/models" - "git.apinb.com/bsm-apps/mgt/internal/types" + "bsm/full/module/base/mgt/internal/libs" + "bsm/full/module/base/mgt/internal/models" + "bsm/full/module/base/mgt/internal/types" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/infra" "git.apinb.com/bsm-sdk/core/printer" diff --git a/apps/base/mgt/internal/logic/hello/ping.go b/module/base/mgt/internal/logic/hello/ping.go similarity index 100% rename from apps/base/mgt/internal/logic/hello/ping.go rename to module/base/mgt/internal/logic/hello/ping.go diff --git a/apps/base/mgt/internal/logic/permission/create.go b/module/base/mgt/internal/logic/permission/create.go similarity index 94% rename from apps/base/mgt/internal/logic/permission/create.go rename to module/base/mgt/internal/logic/permission/create.go index 79f2f99..bbd4983 100644 --- a/apps/base/mgt/internal/logic/permission/create.go +++ b/module/base/mgt/internal/logic/permission/create.go @@ -3,9 +3,9 @@ package permission import ( "errors" - "git.apinb.com/bsm-apps/mgt/internal/libs" - "git.apinb.com/bsm-apps/mgt/internal/models" - "git.apinb.com/bsm-apps/mgt/internal/types" + "bsm/full/module/base/mgt/internal/libs" + "bsm/full/module/base/mgt/internal/models" + "bsm/full/module/base/mgt/internal/types" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/infra" "git.apinb.com/bsm-sdk/core/printer" diff --git a/apps/base/mgt/internal/logic/permission/del.go b/module/base/mgt/internal/logic/permission/del.go similarity index 92% rename from apps/base/mgt/internal/logic/permission/del.go rename to module/base/mgt/internal/logic/permission/del.go index 141e38a..c160ff0 100644 --- a/apps/base/mgt/internal/logic/permission/del.go +++ b/module/base/mgt/internal/logic/permission/del.go @@ -1,9 +1,9 @@ package permission import ( - "git.apinb.com/bsm-apps/mgt/internal/libs" - "git.apinb.com/bsm-apps/mgt/internal/models" - "git.apinb.com/bsm-apps/mgt/internal/types" + "bsm/full/module/base/mgt/internal/libs" + "bsm/full/module/base/mgt/internal/models" + "bsm/full/module/base/mgt/internal/types" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/infra" "git.apinb.com/bsm-sdk/core/printer" diff --git a/apps/base/mgt/internal/logic/permission/detail.go b/module/base/mgt/internal/logic/permission/detail.go similarity index 88% rename from apps/base/mgt/internal/logic/permission/detail.go rename to module/base/mgt/internal/logic/permission/detail.go index 3477910..d186ee0 100644 --- a/apps/base/mgt/internal/logic/permission/detail.go +++ b/module/base/mgt/internal/logic/permission/detail.go @@ -3,9 +3,9 @@ package permission import ( "errors" - "git.apinb.com/bsm-apps/mgt/internal/libs" - "git.apinb.com/bsm-apps/mgt/internal/models" - "git.apinb.com/bsm-apps/mgt/internal/types" + "bsm/full/module/base/mgt/internal/libs" + "bsm/full/module/base/mgt/internal/models" + "bsm/full/module/base/mgt/internal/types" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/infra" "git.apinb.com/bsm-sdk/core/printer" diff --git a/apps/base/mgt/internal/logic/permission/fetch.go b/module/base/mgt/internal/logic/permission/fetch.go similarity index 90% rename from apps/base/mgt/internal/logic/permission/fetch.go rename to module/base/mgt/internal/logic/permission/fetch.go index 32a451b..c2f49fb 100644 --- a/apps/base/mgt/internal/logic/permission/fetch.go +++ b/module/base/mgt/internal/logic/permission/fetch.go @@ -1,10 +1,10 @@ package permission import ( - "git.apinb.com/bsm-apps/mgt/internal/libs" - "git.apinb.com/bsm-apps/mgt/internal/logic/tool" - "git.apinb.com/bsm-apps/mgt/internal/models" - "git.apinb.com/bsm-apps/mgt/internal/types" + "bsm/full/module/base/mgt/internal/libs" + "bsm/full/module/base/mgt/internal/logic/tool" + "bsm/full/module/base/mgt/internal/models" + "bsm/full/module/base/mgt/internal/types" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/infra" "git.apinb.com/bsm-sdk/core/printer" diff --git a/apps/base/mgt/internal/logic/permission/fetch_other.go b/module/base/mgt/internal/logic/permission/fetch_other.go similarity index 93% rename from apps/base/mgt/internal/logic/permission/fetch_other.go rename to module/base/mgt/internal/logic/permission/fetch_other.go index 516376e..826c8cc 100644 --- a/apps/base/mgt/internal/logic/permission/fetch_other.go +++ b/module/base/mgt/internal/logic/permission/fetch_other.go @@ -1,10 +1,10 @@ package permission import ( - "git.apinb.com/bsm-apps/mgt/internal/libs" - "git.apinb.com/bsm-apps/mgt/internal/logic/tool" - "git.apinb.com/bsm-apps/mgt/internal/models" - "git.apinb.com/bsm-apps/mgt/internal/types" + "bsm/full/module/base/mgt/internal/libs" + "bsm/full/module/base/mgt/internal/logic/tool" + "bsm/full/module/base/mgt/internal/models" + "bsm/full/module/base/mgt/internal/types" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/infra" "git.apinb.com/bsm-sdk/core/printer" diff --git a/apps/base/mgt/internal/logic/permission/modify.go b/module/base/mgt/internal/logic/permission/modify.go similarity index 97% rename from apps/base/mgt/internal/logic/permission/modify.go rename to module/base/mgt/internal/logic/permission/modify.go index fabc0b3..748def0 100644 --- a/apps/base/mgt/internal/logic/permission/modify.go +++ b/module/base/mgt/internal/logic/permission/modify.go @@ -3,9 +3,9 @@ package permission import ( "errors" - "git.apinb.com/bsm-apps/mgt/internal/libs" - "git.apinb.com/bsm-apps/mgt/internal/models" - "git.apinb.com/bsm-apps/mgt/internal/types" + "bsm/full/module/base/mgt/internal/libs" + "bsm/full/module/base/mgt/internal/models" + "bsm/full/module/base/mgt/internal/types" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/infra" "git.apinb.com/bsm-sdk/core/printer" diff --git a/apps/base/mgt/internal/logic/permission/sort.go b/module/base/mgt/internal/logic/permission/sort.go similarity index 90% rename from apps/base/mgt/internal/logic/permission/sort.go rename to module/base/mgt/internal/logic/permission/sort.go index 5569442..a9651ca 100644 --- a/apps/base/mgt/internal/logic/permission/sort.go +++ b/module/base/mgt/internal/logic/permission/sort.go @@ -1,9 +1,9 @@ package permission import ( - "git.apinb.com/bsm-apps/mgt/internal/libs" - "git.apinb.com/bsm-apps/mgt/internal/models" - "git.apinb.com/bsm-apps/mgt/internal/types" + "bsm/full/module/base/mgt/internal/libs" + "bsm/full/module/base/mgt/internal/models" + "bsm/full/module/base/mgt/internal/types" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/infra" "git.apinb.com/bsm-sdk/core/printer" diff --git a/apps/base/mgt/internal/logic/pub/forget.go b/module/base/mgt/internal/logic/pub/forget.go similarity index 94% rename from apps/base/mgt/internal/logic/pub/forget.go rename to module/base/mgt/internal/logic/pub/forget.go index 76af937..c43bc5f 100644 --- a/apps/base/mgt/internal/logic/pub/forget.go +++ b/module/base/mgt/internal/logic/pub/forget.go @@ -3,10 +3,10 @@ package pub import ( "errors" - "git.apinb.com/bsm-apps/mgt/internal/impl" - "git.apinb.com/bsm-apps/mgt/internal/libs" - "git.apinb.com/bsm-apps/mgt/internal/models" - "git.apinb.com/bsm-apps/mgt/internal/types" + "bsm/full/module/base/mgt/internal/impl" + "bsm/full/module/base/mgt/internal/libs" + "bsm/full/module/base/mgt/internal/models" + "bsm/full/module/base/mgt/internal/types" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/infra" "git.apinb.com/bsm-sdk/core/printer" diff --git a/apps/base/mgt/internal/logic/pub/login.go b/module/base/mgt/internal/logic/pub/login.go similarity index 97% rename from apps/base/mgt/internal/logic/pub/login.go rename to module/base/mgt/internal/logic/pub/login.go index 6abcf86..ca7ede4 100644 --- a/apps/base/mgt/internal/logic/pub/login.go +++ b/module/base/mgt/internal/logic/pub/login.go @@ -7,9 +7,9 @@ import ( "fmt" "strconv" - "git.apinb.com/bsm-apps/mgt/internal/impl" - "git.apinb.com/bsm-apps/mgt/internal/models" - "git.apinb.com/bsm-apps/mgt/internal/types" + "bsm/full/module/base/mgt/internal/impl" + "bsm/full/module/base/mgt/internal/models" + "bsm/full/module/base/mgt/internal/types" "git.apinb.com/bsm-sdk/core/crypto/token" "git.apinb.com/bsm-sdk/core/env" "git.apinb.com/bsm-sdk/core/errcode" diff --git a/apps/base/mgt/internal/logic/pub/refresh.go b/module/base/mgt/internal/logic/pub/refresh.go similarity index 100% rename from apps/base/mgt/internal/logic/pub/refresh.go rename to module/base/mgt/internal/logic/pub/refresh.go diff --git a/apps/base/mgt/internal/logic/role/create.go b/module/base/mgt/internal/logic/role/create.go similarity index 93% rename from apps/base/mgt/internal/logic/role/create.go rename to module/base/mgt/internal/logic/role/create.go index de27945..ce50717 100644 --- a/apps/base/mgt/internal/logic/role/create.go +++ b/module/base/mgt/internal/logic/role/create.go @@ -3,9 +3,9 @@ package role import ( "errors" - "git.apinb.com/bsm-apps/mgt/internal/libs" - "git.apinb.com/bsm-apps/mgt/internal/models" - "git.apinb.com/bsm-apps/mgt/internal/types" + "bsm/full/module/base/mgt/internal/libs" + "bsm/full/module/base/mgt/internal/models" + "bsm/full/module/base/mgt/internal/types" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/infra" "git.apinb.com/bsm-sdk/core/printer" diff --git a/apps/base/mgt/internal/logic/role/del.go b/module/base/mgt/internal/logic/role/del.go similarity index 94% rename from apps/base/mgt/internal/logic/role/del.go rename to module/base/mgt/internal/logic/role/del.go index c8dcd98..01a8dce 100644 --- a/apps/base/mgt/internal/logic/role/del.go +++ b/module/base/mgt/internal/logic/role/del.go @@ -1,9 +1,9 @@ package role import ( - "git.apinb.com/bsm-apps/mgt/internal/libs" - "git.apinb.com/bsm-apps/mgt/internal/models" - "git.apinb.com/bsm-apps/mgt/internal/types" + "bsm/full/module/base/mgt/internal/libs" + "bsm/full/module/base/mgt/internal/models" + "bsm/full/module/base/mgt/internal/types" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/infra" "git.apinb.com/bsm-sdk/core/printer" diff --git a/apps/base/mgt/internal/logic/role/detail.go b/module/base/mgt/internal/logic/role/detail.go similarity index 88% rename from apps/base/mgt/internal/logic/role/detail.go rename to module/base/mgt/internal/logic/role/detail.go index 37ee613..fe0814c 100644 --- a/apps/base/mgt/internal/logic/role/detail.go +++ b/module/base/mgt/internal/logic/role/detail.go @@ -3,9 +3,9 @@ package role import ( "errors" - "git.apinb.com/bsm-apps/mgt/internal/libs" - "git.apinb.com/bsm-apps/mgt/internal/models" - "git.apinb.com/bsm-apps/mgt/internal/types" + "bsm/full/module/base/mgt/internal/libs" + "bsm/full/module/base/mgt/internal/models" + "bsm/full/module/base/mgt/internal/types" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/infra" "git.apinb.com/bsm-sdk/core/printer" diff --git a/apps/base/mgt/internal/logic/role/fetch.go b/module/base/mgt/internal/logic/role/fetch.go similarity index 86% rename from apps/base/mgt/internal/logic/role/fetch.go rename to module/base/mgt/internal/logic/role/fetch.go index 908af8c..23fad34 100644 --- a/apps/base/mgt/internal/logic/role/fetch.go +++ b/module/base/mgt/internal/logic/role/fetch.go @@ -1,10 +1,10 @@ package role import ( - "git.apinb.com/bsm-apps/mgt/internal/libs" - "git.apinb.com/bsm-apps/mgt/internal/logic/tool" - "git.apinb.com/bsm-apps/mgt/internal/models" - "git.apinb.com/bsm-apps/mgt/internal/types" + "bsm/full/module/base/mgt/internal/libs" + "bsm/full/module/base/mgt/internal/logic/tool" + "bsm/full/module/base/mgt/internal/models" + "bsm/full/module/base/mgt/internal/types" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/infra" "github.com/gin-gonic/gin" diff --git a/apps/base/mgt/internal/logic/role/fetch_other.go b/module/base/mgt/internal/logic/role/fetch_other.go similarity index 96% rename from apps/base/mgt/internal/logic/role/fetch_other.go rename to module/base/mgt/internal/logic/role/fetch_other.go index 3beabe7..d49dada 100644 --- a/apps/base/mgt/internal/logic/role/fetch_other.go +++ b/module/base/mgt/internal/logic/role/fetch_other.go @@ -1,9 +1,9 @@ package role import ( - "git.apinb.com/bsm-apps/mgt/internal/libs" - "git.apinb.com/bsm-apps/mgt/internal/models" - "git.apinb.com/bsm-apps/mgt/internal/types" + "bsm/full/module/base/mgt/internal/libs" + "bsm/full/module/base/mgt/internal/models" + "bsm/full/module/base/mgt/internal/types" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/infra" "github.com/gin-gonic/gin" diff --git a/apps/base/mgt/internal/logic/role/modify.go b/module/base/mgt/internal/logic/role/modify.go similarity index 92% rename from apps/base/mgt/internal/logic/role/modify.go rename to module/base/mgt/internal/logic/role/modify.go index 87e3d3d..c989012 100644 --- a/apps/base/mgt/internal/logic/role/modify.go +++ b/module/base/mgt/internal/logic/role/modify.go @@ -3,9 +3,9 @@ package role import ( "errors" - "git.apinb.com/bsm-apps/mgt/internal/libs" - "git.apinb.com/bsm-apps/mgt/internal/models" - "git.apinb.com/bsm-apps/mgt/internal/types" + "bsm/full/module/base/mgt/internal/libs" + "bsm/full/module/base/mgt/internal/models" + "bsm/full/module/base/mgt/internal/types" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/infra" "git.apinb.com/bsm-sdk/core/printer" diff --git a/apps/base/mgt/internal/logic/role/set.go b/module/base/mgt/internal/logic/role/set.go similarity index 97% rename from apps/base/mgt/internal/logic/role/set.go rename to module/base/mgt/internal/logic/role/set.go index da2560f..9c1c9a4 100644 --- a/apps/base/mgt/internal/logic/role/set.go +++ b/module/base/mgt/internal/logic/role/set.go @@ -1,9 +1,9 @@ package role import ( - "git.apinb.com/bsm-apps/mgt/internal/libs" - "git.apinb.com/bsm-apps/mgt/internal/models" - "git.apinb.com/bsm-apps/mgt/internal/types" + "bsm/full/module/base/mgt/internal/libs" + "bsm/full/module/base/mgt/internal/models" + "bsm/full/module/base/mgt/internal/types" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/infra" "git.apinb.com/bsm-sdk/core/printer" diff --git a/apps/base/mgt/internal/logic/tool/tool.go b/module/base/mgt/internal/logic/tool/tool.go similarity index 77% rename from apps/base/mgt/internal/logic/tool/tool.go rename to module/base/mgt/internal/logic/tool/tool.go index ca64917..7e8c629 100644 --- a/apps/base/mgt/internal/logic/tool/tool.go +++ b/module/base/mgt/internal/logic/tool/tool.go @@ -1,6 +1,6 @@ package tool -import "git.apinb.com/bsm-apps/mgt/internal/types" +import "bsm/full/module/base/mgt/internal/types" func GetSizeAndPage(page, size int) (int, int) { if page <= 0 { diff --git a/apps/base/mgt/internal/logic/user/create.go b/module/base/mgt/internal/logic/user/create.go similarity index 96% rename from apps/base/mgt/internal/logic/user/create.go rename to module/base/mgt/internal/logic/user/create.go index 56938bd..90f60bd 100644 --- a/apps/base/mgt/internal/logic/user/create.go +++ b/module/base/mgt/internal/logic/user/create.go @@ -3,9 +3,9 @@ package user import ( "errors" - "git.apinb.com/bsm-apps/mgt/internal/libs" - "git.apinb.com/bsm-apps/mgt/internal/models" - "git.apinb.com/bsm-apps/mgt/internal/types" + "bsm/full/module/base/mgt/internal/libs" + "bsm/full/module/base/mgt/internal/models" + "bsm/full/module/base/mgt/internal/types" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/infra" "git.apinb.com/bsm-sdk/core/middleware" diff --git a/apps/base/mgt/internal/logic/user/del.go b/module/base/mgt/internal/logic/user/del.go similarity index 93% rename from apps/base/mgt/internal/logic/user/del.go rename to module/base/mgt/internal/logic/user/del.go index 80e6289..4e40c97 100644 --- a/apps/base/mgt/internal/logic/user/del.go +++ b/module/base/mgt/internal/logic/user/del.go @@ -1,9 +1,9 @@ package user import ( - "git.apinb.com/bsm-apps/mgt/internal/libs" - "git.apinb.com/bsm-apps/mgt/internal/models" - "git.apinb.com/bsm-apps/mgt/internal/types" + "bsm/full/module/base/mgt/internal/libs" + "bsm/full/module/base/mgt/internal/models" + "bsm/full/module/base/mgt/internal/types" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/infra" "git.apinb.com/bsm-sdk/core/printer" diff --git a/apps/base/mgt/internal/logic/user/detail.go b/module/base/mgt/internal/logic/user/detail.go similarity index 88% rename from apps/base/mgt/internal/logic/user/detail.go rename to module/base/mgt/internal/logic/user/detail.go index 482daae..256518b 100644 --- a/apps/base/mgt/internal/logic/user/detail.go +++ b/module/base/mgt/internal/logic/user/detail.go @@ -3,9 +3,9 @@ package user import ( "errors" - "git.apinb.com/bsm-apps/mgt/internal/libs" - "git.apinb.com/bsm-apps/mgt/internal/models" - "git.apinb.com/bsm-apps/mgt/internal/types" + "bsm/full/module/base/mgt/internal/libs" + "bsm/full/module/base/mgt/internal/models" + "bsm/full/module/base/mgt/internal/types" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/infra" "git.apinb.com/bsm-sdk/core/printer" diff --git a/apps/base/mgt/internal/logic/user/fetch.go b/module/base/mgt/internal/logic/user/fetch.go similarity index 86% rename from apps/base/mgt/internal/logic/user/fetch.go rename to module/base/mgt/internal/logic/user/fetch.go index d3763eb..5c7976a 100644 --- a/apps/base/mgt/internal/logic/user/fetch.go +++ b/module/base/mgt/internal/logic/user/fetch.go @@ -1,10 +1,10 @@ package user import ( - "git.apinb.com/bsm-apps/mgt/internal/libs" - "git.apinb.com/bsm-apps/mgt/internal/logic/tool" - "git.apinb.com/bsm-apps/mgt/internal/models" - "git.apinb.com/bsm-apps/mgt/internal/types" + "bsm/full/module/base/mgt/internal/libs" + "bsm/full/module/base/mgt/internal/logic/tool" + "bsm/full/module/base/mgt/internal/models" + "bsm/full/module/base/mgt/internal/types" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/infra" "github.com/gin-gonic/gin" diff --git a/apps/base/mgt/internal/logic/user/fetch_app.go b/module/base/mgt/internal/logic/user/fetch_app.go similarity index 84% rename from apps/base/mgt/internal/logic/user/fetch_app.go rename to module/base/mgt/internal/logic/user/fetch_app.go index 8c9d530..ae90f32 100644 --- a/apps/base/mgt/internal/logic/user/fetch_app.go +++ b/module/base/mgt/internal/logic/user/fetch_app.go @@ -1,10 +1,10 @@ package user import ( - "git.apinb.com/bsm-apps/mgt/internal/libs" - mgtmw "git.apinb.com/bsm-apps/mgt/internal/middleware" - "git.apinb.com/bsm-apps/mgt/internal/models" - "git.apinb.com/bsm-apps/mgt/internal/types" + "bsm/full/module/base/mgt/internal/libs" + mgtmw "bsm/full/module/base/mgt/internal/middleware" + "bsm/full/module/base/mgt/internal/models" + "bsm/full/module/base/mgt/internal/types" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/infra" "git.apinb.com/bsm-sdk/core/middleware" diff --git a/apps/base/mgt/internal/logic/user/fetch_pmn.go b/module/base/mgt/internal/logic/user/fetch_pmn.go similarity index 97% rename from apps/base/mgt/internal/logic/user/fetch_pmn.go rename to module/base/mgt/internal/logic/user/fetch_pmn.go index 7ee5339..422dc6b 100644 --- a/apps/base/mgt/internal/logic/user/fetch_pmn.go +++ b/module/base/mgt/internal/logic/user/fetch_pmn.go @@ -1,10 +1,10 @@ package user import ( - "git.apinb.com/bsm-apps/mgt/internal/libs" - mgtmw "git.apinb.com/bsm-apps/mgt/internal/middleware" - "git.apinb.com/bsm-apps/mgt/internal/models" - "git.apinb.com/bsm-apps/mgt/internal/types" + "bsm/full/module/base/mgt/internal/libs" + mgtmw "bsm/full/module/base/mgt/internal/middleware" + "bsm/full/module/base/mgt/internal/models" + "bsm/full/module/base/mgt/internal/types" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/infra" "git.apinb.com/bsm-sdk/core/middleware" diff --git a/apps/base/mgt/internal/logic/user/fetch_role.go b/module/base/mgt/internal/logic/user/fetch_role.go similarity index 85% rename from apps/base/mgt/internal/logic/user/fetch_role.go rename to module/base/mgt/internal/logic/user/fetch_role.go index 5b2a3ae..bc256b0 100644 --- a/apps/base/mgt/internal/logic/user/fetch_role.go +++ b/module/base/mgt/internal/logic/user/fetch_role.go @@ -1,10 +1,10 @@ package user import ( - "git.apinb.com/bsm-apps/mgt/internal/libs" - mgtmw "git.apinb.com/bsm-apps/mgt/internal/middleware" - "git.apinb.com/bsm-apps/mgt/internal/models" - "git.apinb.com/bsm-apps/mgt/internal/types" + "bsm/full/module/base/mgt/internal/libs" + mgtmw "bsm/full/module/base/mgt/internal/middleware" + "bsm/full/module/base/mgt/internal/models" + "bsm/full/module/base/mgt/internal/types" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/infra" "git.apinb.com/bsm-sdk/core/middleware" diff --git a/apps/base/mgt/internal/logic/user/list.go b/module/base/mgt/internal/logic/user/list.go similarity index 91% rename from apps/base/mgt/internal/logic/user/list.go rename to module/base/mgt/internal/logic/user/list.go index 28c9971..ee2a45c 100644 --- a/apps/base/mgt/internal/logic/user/list.go +++ b/module/base/mgt/internal/logic/user/list.go @@ -1,8 +1,8 @@ package user import ( - "git.apinb.com/bsm-apps/mgt/internal/models" - "git.apinb.com/bsm-apps/mgt/internal/types" + "bsm/full/module/base/mgt/internal/models" + "bsm/full/module/base/mgt/internal/types" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/infra" "github.com/gin-gonic/gin" diff --git a/apps/base/mgt/internal/logic/user/modify.go b/module/base/mgt/internal/logic/user/modify.go similarity index 93% rename from apps/base/mgt/internal/logic/user/modify.go rename to module/base/mgt/internal/logic/user/modify.go index 09f248d..d6eafd4 100644 --- a/apps/base/mgt/internal/logic/user/modify.go +++ b/module/base/mgt/internal/logic/user/modify.go @@ -3,9 +3,9 @@ package user import ( "errors" - "git.apinb.com/bsm-apps/mgt/internal/libs" - "git.apinb.com/bsm-apps/mgt/internal/models" - "git.apinb.com/bsm-apps/mgt/internal/types" + "bsm/full/module/base/mgt/internal/libs" + "bsm/full/module/base/mgt/internal/models" + "bsm/full/module/base/mgt/internal/types" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/infra" "git.apinb.com/bsm-sdk/core/printer" diff --git a/apps/base/mgt/internal/logic/user/set_pmn.go b/module/base/mgt/internal/logic/user/set_pmn.go similarity index 97% rename from apps/base/mgt/internal/logic/user/set_pmn.go rename to module/base/mgt/internal/logic/user/set_pmn.go index ba47cd7..72cf1d3 100644 --- a/apps/base/mgt/internal/logic/user/set_pmn.go +++ b/module/base/mgt/internal/logic/user/set_pmn.go @@ -1,9 +1,9 @@ package user import ( - "git.apinb.com/bsm-apps/mgt/internal/libs" - "git.apinb.com/bsm-apps/mgt/internal/models" - "git.apinb.com/bsm-apps/mgt/internal/types" + "bsm/full/module/base/mgt/internal/libs" + "bsm/full/module/base/mgt/internal/models" + "bsm/full/module/base/mgt/internal/types" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/infra" "git.apinb.com/bsm-sdk/core/printer" diff --git a/apps/base/mgt/internal/logic/user/set_role.go b/module/base/mgt/internal/logic/user/set_role.go similarity index 97% rename from apps/base/mgt/internal/logic/user/set_role.go rename to module/base/mgt/internal/logic/user/set_role.go index 71d1621..eb9f29d 100644 --- a/apps/base/mgt/internal/logic/user/set_role.go +++ b/module/base/mgt/internal/logic/user/set_role.go @@ -1,9 +1,9 @@ package user import ( - "git.apinb.com/bsm-apps/mgt/internal/libs" - "git.apinb.com/bsm-apps/mgt/internal/models" - "git.apinb.com/bsm-apps/mgt/internal/types" + "bsm/full/module/base/mgt/internal/libs" + "bsm/full/module/base/mgt/internal/models" + "bsm/full/module/base/mgt/internal/types" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/infra" "git.apinb.com/bsm-sdk/core/printer" diff --git a/apps/base/mgt/internal/middleware/rbac.go b/module/base/mgt/internal/middleware/rbac.go similarity index 97% rename from apps/base/mgt/internal/middleware/rbac.go rename to module/base/mgt/internal/middleware/rbac.go index fa953a1..99ac6da 100644 --- a/apps/base/mgt/internal/middleware/rbac.go +++ b/module/base/mgt/internal/middleware/rbac.go @@ -1,7 +1,7 @@ package middleware import ( - "git.apinb.com/bsm-apps/mgt/internal/models" + "bsm/full/module/base/mgt/internal/models" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/infra" coremw "git.apinb.com/bsm-sdk/core/middleware" diff --git a/apps/base/mgt/internal/models/application.go b/module/base/mgt/internal/models/application.go similarity index 100% rename from apps/base/mgt/internal/models/application.go rename to module/base/mgt/internal/models/application.go diff --git a/apps/base/mgt/internal/models/department.go b/module/base/mgt/internal/models/department.go similarity index 100% rename from apps/base/mgt/internal/models/department.go rename to module/base/mgt/internal/models/department.go diff --git a/apps/base/mgt/internal/models/impl.go b/module/base/mgt/internal/models/impl.go similarity index 98% rename from apps/base/mgt/internal/models/impl.go rename to module/base/mgt/internal/models/impl.go index a1625f7..9a7fd65 100644 --- a/apps/base/mgt/internal/models/impl.go +++ b/module/base/mgt/internal/models/impl.go @@ -5,7 +5,7 @@ import ( "log" "strings" - "git.apinb.com/bsm-apps/mgt/internal/config" + "bsm/full/module/base/mgt/internal/config" "git.apinb.com/bsm-sdk/core/database/sql" "git.apinb.com/bsm-sdk/core/types" "git.apinb.com/bsm-sdk/core/vars" diff --git a/apps/base/mgt/internal/models/init_db.go b/module/base/mgt/internal/models/init_db.go similarity index 100% rename from apps/base/mgt/internal/models/init_db.go rename to module/base/mgt/internal/models/init_db.go diff --git a/apps/base/mgt/internal/models/init_menu.go b/module/base/mgt/internal/models/init_menu.go similarity index 100% rename from apps/base/mgt/internal/models/init_menu.go rename to module/base/mgt/internal/models/init_menu.go diff --git a/apps/base/mgt/internal/models/link_dpt_pmn.go b/module/base/mgt/internal/models/link_dpt_pmn.go similarity index 100% rename from apps/base/mgt/internal/models/link_dpt_pmn.go rename to module/base/mgt/internal/models/link_dpt_pmn.go diff --git a/apps/base/mgt/internal/models/link_dpt_role.go b/module/base/mgt/internal/models/link_dpt_role.go similarity index 100% rename from apps/base/mgt/internal/models/link_dpt_role.go rename to module/base/mgt/internal/models/link_dpt_role.go diff --git a/apps/base/mgt/internal/models/link_dpt_user.go b/module/base/mgt/internal/models/link_dpt_user.go similarity index 100% rename from apps/base/mgt/internal/models/link_dpt_user.go rename to module/base/mgt/internal/models/link_dpt_user.go diff --git a/apps/base/mgt/internal/models/link_role_app.go b/module/base/mgt/internal/models/link_role_app.go similarity index 100% rename from apps/base/mgt/internal/models/link_role_app.go rename to module/base/mgt/internal/models/link_role_app.go diff --git a/apps/base/mgt/internal/models/link_role_pmn.go b/module/base/mgt/internal/models/link_role_pmn.go similarity index 100% rename from apps/base/mgt/internal/models/link_role_pmn.go rename to module/base/mgt/internal/models/link_role_pmn.go diff --git a/apps/base/mgt/internal/models/link_user_app.go b/module/base/mgt/internal/models/link_user_app.go similarity index 100% rename from apps/base/mgt/internal/models/link_user_app.go rename to module/base/mgt/internal/models/link_user_app.go diff --git a/apps/base/mgt/internal/models/link_user_pmn.go b/module/base/mgt/internal/models/link_user_pmn.go similarity index 100% rename from apps/base/mgt/internal/models/link_user_pmn.go rename to module/base/mgt/internal/models/link_user_pmn.go diff --git a/apps/base/mgt/internal/models/link_user_role.go b/module/base/mgt/internal/models/link_user_role.go similarity index 100% rename from apps/base/mgt/internal/models/link_user_role.go rename to module/base/mgt/internal/models/link_user_role.go diff --git a/apps/base/mgt/internal/models/permission.go b/module/base/mgt/internal/models/permission.go similarity index 100% rename from apps/base/mgt/internal/models/permission.go rename to module/base/mgt/internal/models/permission.go diff --git a/apps/base/mgt/internal/models/query.go b/module/base/mgt/internal/models/query.go similarity index 100% rename from apps/base/mgt/internal/models/query.go rename to module/base/mgt/internal/models/query.go diff --git a/apps/base/mgt/internal/models/role.go b/module/base/mgt/internal/models/role.go similarity index 100% rename from apps/base/mgt/internal/models/role.go rename to module/base/mgt/internal/models/role.go diff --git a/apps/base/mgt/internal/models/user.go b/module/base/mgt/internal/models/user.go similarity index 100% rename from apps/base/mgt/internal/models/user.go rename to module/base/mgt/internal/models/user.go diff --git a/apps/base/mgt/internal/routers/register.go b/module/base/mgt/internal/routers/register.go similarity index 90% rename from apps/base/mgt/internal/routers/register.go rename to module/base/mgt/internal/routers/register.go index 6451962..e3457c5 100644 --- a/apps/base/mgt/internal/routers/register.go +++ b/module/base/mgt/internal/routers/register.go @@ -1,14 +1,14 @@ package routers import ( - "git.apinb.com/bsm-apps/mgt/internal/logic/application" - "git.apinb.com/bsm-apps/mgt/internal/logic/department" - "git.apinb.com/bsm-apps/mgt/internal/logic/hello" - "git.apinb.com/bsm-apps/mgt/internal/logic/permission" - "git.apinb.com/bsm-apps/mgt/internal/logic/pub" - "git.apinb.com/bsm-apps/mgt/internal/logic/role" - "git.apinb.com/bsm-apps/mgt/internal/logic/user" - mgtmw "git.apinb.com/bsm-apps/mgt/internal/middleware" + "bsm/full/module/base/mgt/internal/logic/application" + "bsm/full/module/base/mgt/internal/logic/department" + "bsm/full/module/base/mgt/internal/logic/hello" + "bsm/full/module/base/mgt/internal/logic/permission" + "bsm/full/module/base/mgt/internal/logic/pub" + "bsm/full/module/base/mgt/internal/logic/role" + "bsm/full/module/base/mgt/internal/logic/user" + mgtmw "bsm/full/module/base/mgt/internal/middleware" "git.apinb.com/bsm-sdk/core/middleware" "github.com/gin-gonic/gin" ) diff --git a/apps/base/mgt/internal/types/req.go b/module/base/mgt/internal/types/req.go similarity index 100% rename from apps/base/mgt/internal/types/req.go rename to module/base/mgt/internal/types/req.go diff --git a/apps/base/mgt/internal/types/resp.go b/module/base/mgt/internal/types/resp.go similarity index 100% rename from apps/base/mgt/internal/types/resp.go rename to module/base/mgt/internal/types/resp.go diff --git a/apps/base/mgt/internal/types/types.go b/module/base/mgt/internal/types/types.go similarity index 100% rename from apps/base/mgt/internal/types/types.go rename to module/base/mgt/internal/types/types.go diff --git a/apps/base/mgt/internal/types/vars.go b/module/base/mgt/internal/types/vars.go similarity index 100% rename from apps/base/mgt/internal/types/vars.go rename to module/base/mgt/internal/types/vars.go diff --git a/apps/base/mgt/test/app_create.http b/module/base/mgt/test/app_create.http similarity index 100% rename from apps/base/mgt/test/app_create.http rename to module/base/mgt/test/app_create.http diff --git a/apps/base/mgt/test/app_del.http b/module/base/mgt/test/app_del.http similarity index 100% rename from apps/base/mgt/test/app_del.http rename to module/base/mgt/test/app_del.http diff --git a/apps/base/mgt/test/app_detail.http b/module/base/mgt/test/app_detail.http similarity index 100% rename from apps/base/mgt/test/app_detail.http rename to module/base/mgt/test/app_detail.http diff --git a/apps/base/mgt/test/app_fetch.http b/module/base/mgt/test/app_fetch.http similarity index 100% rename from apps/base/mgt/test/app_fetch.http rename to module/base/mgt/test/app_fetch.http diff --git a/apps/base/mgt/test/app_modify.http b/module/base/mgt/test/app_modify.http similarity index 100% rename from apps/base/mgt/test/app_modify.http rename to module/base/mgt/test/app_modify.http diff --git a/apps/base/mgt/test/app_pmn.http b/module/base/mgt/test/app_pmn.http similarity index 100% rename from apps/base/mgt/test/app_pmn.http rename to module/base/mgt/test/app_pmn.http diff --git a/apps/base/mgt/test/app_role.http b/module/base/mgt/test/app_role.http similarity index 100% rename from apps/base/mgt/test/app_role.http rename to module/base/mgt/test/app_role.http diff --git a/apps/base/mgt/test/app_user.http b/module/base/mgt/test/app_user.http similarity index 100% rename from apps/base/mgt/test/app_user.http rename to module/base/mgt/test/app_user.http diff --git a/apps/base/mgt/test/dpt_create.http b/module/base/mgt/test/dpt_create.http similarity index 100% rename from apps/base/mgt/test/dpt_create.http rename to module/base/mgt/test/dpt_create.http diff --git a/apps/base/mgt/test/dpt_del.http b/module/base/mgt/test/dpt_del.http similarity index 100% rename from apps/base/mgt/test/dpt_del.http rename to module/base/mgt/test/dpt_del.http diff --git a/apps/base/mgt/test/dpt_detail.http b/module/base/mgt/test/dpt_detail.http similarity index 100% rename from apps/base/mgt/test/dpt_detail.http rename to module/base/mgt/test/dpt_detail.http diff --git a/apps/base/mgt/test/dpt_fetch.http b/module/base/mgt/test/dpt_fetch.http similarity index 100% rename from apps/base/mgt/test/dpt_fetch.http rename to module/base/mgt/test/dpt_fetch.http diff --git a/apps/base/mgt/test/dpt_fetch_tree.http b/module/base/mgt/test/dpt_fetch_tree.http similarity index 100% rename from apps/base/mgt/test/dpt_fetch_tree.http rename to module/base/mgt/test/dpt_fetch_tree.http diff --git a/apps/base/mgt/test/dpt_modify.http b/module/base/mgt/test/dpt_modify.http similarity index 100% rename from apps/base/mgt/test/dpt_modify.http rename to module/base/mgt/test/dpt_modify.http diff --git a/apps/base/mgt/test/hello.http b/module/base/mgt/test/hello.http similarity index 100% rename from apps/base/mgt/test/hello.http rename to module/base/mgt/test/hello.http diff --git a/apps/base/mgt/test/login.http b/module/base/mgt/test/login.http similarity index 100% rename from apps/base/mgt/test/login.http rename to module/base/mgt/test/login.http diff --git a/apps/base/mgt/test/ping.http b/module/base/mgt/test/ping.http similarity index 100% rename from apps/base/mgt/test/ping.http rename to module/base/mgt/test/ping.http diff --git a/apps/base/mgt/test/pmn_create.http b/module/base/mgt/test/pmn_create.http similarity index 100% rename from apps/base/mgt/test/pmn_create.http rename to module/base/mgt/test/pmn_create.http diff --git a/apps/base/mgt/test/pmn_del.http b/module/base/mgt/test/pmn_del.http similarity index 100% rename from apps/base/mgt/test/pmn_del.http rename to module/base/mgt/test/pmn_del.http diff --git a/apps/base/mgt/test/pmn_detail.http b/module/base/mgt/test/pmn_detail.http similarity index 100% rename from apps/base/mgt/test/pmn_detail.http rename to module/base/mgt/test/pmn_detail.http diff --git a/apps/base/mgt/test/pmn_fetch.http b/module/base/mgt/test/pmn_fetch.http similarity index 100% rename from apps/base/mgt/test/pmn_fetch.http rename to module/base/mgt/test/pmn_fetch.http diff --git a/apps/base/mgt/test/pmn_modify.http b/module/base/mgt/test/pmn_modify.http similarity index 100% rename from apps/base/mgt/test/pmn_modify.http rename to module/base/mgt/test/pmn_modify.http diff --git a/apps/base/mgt/test/pmn_role.http b/module/base/mgt/test/pmn_role.http similarity index 100% rename from apps/base/mgt/test/pmn_role.http rename to module/base/mgt/test/pmn_role.http diff --git a/apps/base/mgt/test/pmn_sort.http b/module/base/mgt/test/pmn_sort.http similarity index 100% rename from apps/base/mgt/test/pmn_sort.http rename to module/base/mgt/test/pmn_sort.http diff --git a/apps/base/mgt/test/pmn_user.http b/module/base/mgt/test/pmn_user.http similarity index 100% rename from apps/base/mgt/test/pmn_user.http rename to module/base/mgt/test/pmn_user.http diff --git a/apps/base/mgt/test/refresh.http b/module/base/mgt/test/refresh.http similarity index 100% rename from apps/base/mgt/test/refresh.http rename to module/base/mgt/test/refresh.http diff --git a/apps/base/mgt/test/reset.http b/module/base/mgt/test/reset.http similarity index 100% rename from apps/base/mgt/test/reset.http rename to module/base/mgt/test/reset.http diff --git a/apps/base/mgt/test/role_app.http b/module/base/mgt/test/role_app.http similarity index 100% rename from apps/base/mgt/test/role_app.http rename to module/base/mgt/test/role_app.http diff --git a/apps/base/mgt/test/role_create.http b/module/base/mgt/test/role_create.http similarity index 100% rename from apps/base/mgt/test/role_create.http rename to module/base/mgt/test/role_create.http diff --git a/apps/base/mgt/test/role_del.http b/module/base/mgt/test/role_del.http similarity index 100% rename from apps/base/mgt/test/role_del.http rename to module/base/mgt/test/role_del.http diff --git a/apps/base/mgt/test/role_del_pmn.http b/module/base/mgt/test/role_del_pmn.http similarity index 100% rename from apps/base/mgt/test/role_del_pmn.http rename to module/base/mgt/test/role_del_pmn.http diff --git a/apps/base/mgt/test/role_detail.http b/module/base/mgt/test/role_detail.http similarity index 100% rename from apps/base/mgt/test/role_detail.http rename to module/base/mgt/test/role_detail.http diff --git a/apps/base/mgt/test/role_fetch.http b/module/base/mgt/test/role_fetch.http similarity index 100% rename from apps/base/mgt/test/role_fetch.http rename to module/base/mgt/test/role_fetch.http diff --git a/apps/base/mgt/test/role_modify.http b/module/base/mgt/test/role_modify.http similarity index 100% rename from apps/base/mgt/test/role_modify.http rename to module/base/mgt/test/role_modify.http diff --git a/apps/base/mgt/test/role_modify_pmn.http b/module/base/mgt/test/role_modify_pmn.http similarity index 100% rename from apps/base/mgt/test/role_modify_pmn.http rename to module/base/mgt/test/role_modify_pmn.http diff --git a/apps/base/mgt/test/role_pmn.http b/module/base/mgt/test/role_pmn.http similarity index 100% rename from apps/base/mgt/test/role_pmn.http rename to module/base/mgt/test/role_pmn.http diff --git a/apps/base/mgt/test/role_pmn_tree.http b/module/base/mgt/test/role_pmn_tree.http similarity index 100% rename from apps/base/mgt/test/role_pmn_tree.http rename to module/base/mgt/test/role_pmn_tree.http diff --git a/apps/base/mgt/test/role_set_pmn.http b/module/base/mgt/test/role_set_pmn.http similarity index 100% rename from apps/base/mgt/test/role_set_pmn.http rename to module/base/mgt/test/role_set_pmn.http diff --git a/apps/base/mgt/test/role_user.http b/module/base/mgt/test/role_user.http similarity index 100% rename from apps/base/mgt/test/role_user.http rename to module/base/mgt/test/role_user.http diff --git a/apps/base/mgt/test/session.http b/module/base/mgt/test/session.http similarity index 100% rename from apps/base/mgt/test/session.http rename to module/base/mgt/test/session.http diff --git a/apps/base/mgt/test/user_app.http b/module/base/mgt/test/user_app.http similarity index 100% rename from apps/base/mgt/test/user_app.http rename to module/base/mgt/test/user_app.http diff --git a/apps/base/mgt/test/user_create.http b/module/base/mgt/test/user_create.http similarity index 100% rename from apps/base/mgt/test/user_create.http rename to module/base/mgt/test/user_create.http diff --git a/apps/base/mgt/test/user_del.http b/module/base/mgt/test/user_del.http similarity index 100% rename from apps/base/mgt/test/user_del.http rename to module/base/mgt/test/user_del.http diff --git a/apps/base/mgt/test/user_del_pmn.http b/module/base/mgt/test/user_del_pmn.http similarity index 100% rename from apps/base/mgt/test/user_del_pmn.http rename to module/base/mgt/test/user_del_pmn.http diff --git a/apps/base/mgt/test/user_del_role.http b/module/base/mgt/test/user_del_role.http similarity index 100% rename from apps/base/mgt/test/user_del_role.http rename to module/base/mgt/test/user_del_role.http diff --git a/apps/base/mgt/test/user_detail.http b/module/base/mgt/test/user_detail.http similarity index 100% rename from apps/base/mgt/test/user_detail.http rename to module/base/mgt/test/user_detail.http diff --git a/apps/base/mgt/test/user_fetch.http b/module/base/mgt/test/user_fetch.http similarity index 100% rename from apps/base/mgt/test/user_fetch.http rename to module/base/mgt/test/user_fetch.http diff --git a/apps/base/mgt/test/user_modify.http b/module/base/mgt/test/user_modify.http similarity index 100% rename from apps/base/mgt/test/user_modify.http rename to module/base/mgt/test/user_modify.http diff --git a/apps/base/mgt/test/user_modify_pmn.http b/module/base/mgt/test/user_modify_pmn.http similarity index 100% rename from apps/base/mgt/test/user_modify_pmn.http rename to module/base/mgt/test/user_modify_pmn.http diff --git a/apps/base/mgt/test/user_pmn.http b/module/base/mgt/test/user_pmn.http similarity index 100% rename from apps/base/mgt/test/user_pmn.http rename to module/base/mgt/test/user_pmn.http diff --git a/apps/base/mgt/test/user_pmn_tree.http b/module/base/mgt/test/user_pmn_tree.http similarity index 100% rename from apps/base/mgt/test/user_pmn_tree.http rename to module/base/mgt/test/user_pmn_tree.http diff --git a/apps/base/mgt/test/user_role.http b/module/base/mgt/test/user_role.http similarity index 100% rename from apps/base/mgt/test/user_role.http rename to module/base/mgt/test/user_role.http diff --git a/apps/base/mgt/test/user_set_pmn.http b/module/base/mgt/test/user_set_pmn.http similarity index 100% rename from apps/base/mgt/test/user_set_pmn.http rename to module/base/mgt/test/user_set_pmn.http diff --git a/apps/base/mgt/test/user_set_role.http b/module/base/mgt/test/user_set_role.http similarity index 100% rename from apps/base/mgt/test/user_set_role.http rename to module/base/mgt/test/user_set_role.http diff --git a/apps/base/passport/CHANGELOG.md b/module/base/passport/CHANGELOG.md similarity index 100% rename from apps/base/passport/CHANGELOG.md rename to module/base/passport/CHANGELOG.md diff --git a/apps/base/passport/Dockerfile b/module/base/passport/Dockerfile similarity index 100% rename from apps/base/passport/Dockerfile rename to module/base/passport/Dockerfile diff --git a/apps/base/passport/Makefile b/module/base/passport/Makefile similarity index 100% rename from apps/base/passport/Makefile rename to module/base/passport/Makefile diff --git a/apps/base/passport/README.md b/module/base/passport/README.md similarity index 96% rename from apps/base/passport/README.md rename to module/base/passport/README.md index 3bbc9a6..028b8c8 100644 --- a/apps/base/passport/README.md +++ b/module/base/passport/README.md @@ -29,7 +29,7 @@ 1. **克隆仓库** ```bash - git clone git.apinb.com/bsm-apps/passport + git clone bsm/full/module/base/passport cd passport ``` @@ -48,7 +48,7 @@ 4. **生成 Protocol Buffer 文件** ```bash - buf generate + # Buf 配置已移除；请使用团队约定的 protoc 生成命令 ``` ## ⚙️ 配置说明 @@ -234,7 +234,7 @@ passport/ 2. **Generate Code** ```bash - buf generate + # Buf 配置已移除；请使用团队约定的 protoc 生成命令 ``` 3. **Implement Business Logic** @@ -266,13 +266,13 @@ go test ./internal/logic/login/ ```bash # Generate Protocol Buffer files -buf generate +# Buf 配置已移除；请使用团队约定的 protoc 生成命令 # Lint proto files -buf lint +# 使用团队约定的 proto lint 工具 # Format proto files -buf format -w +# 使用团队约定的 proto 格式化工具 ``` ## 🔒 Security Features @@ -358,4 +358,4 @@ For support and questions: --- -**Built with ❤️ by the BSM Development Team** \ No newline at end of file +**Built with ❤️ by the BSM Development Team** diff --git a/apps/base/passport/cmd/cli/main.go b/module/base/passport/cmd/cli/main.go similarity index 77% rename from apps/base/passport/cmd/cli/main.go rename to module/base/passport/cmd/cli/main.go index fcae5a3..c7c5235 100644 --- a/apps/base/passport/cmd/cli/main.go +++ b/module/base/passport/cmd/cli/main.go @@ -1,7 +1,7 @@ package main import ( - "git.apinb.com/bsm-apps/passport/internal/config" + "bsm/full/module/base/passport/internal/config" "git.apinb.com/bsm-sdk/core/printer" ) diff --git a/apps/base/passport/cmd/main/main.go b/module/base/passport/cmd/main/main.go similarity index 80% rename from apps/base/passport/cmd/main/main.go rename to module/base/passport/cmd/main/main.go index 60a34d7..964a952 100644 --- a/apps/base/passport/cmd/main/main.go +++ b/module/base/passport/cmd/main/main.go @@ -5,9 +5,9 @@ package service import ( - "git.apinb.com/bsm-apps/passport/internal/config" - "git.apinb.com/bsm-apps/passport/internal/impl" - "git.apinb.com/bsm-apps/passport/internal/server" + "bsm/full/module/base/passport/internal/config" + "bsm/full/module/base/passport/internal/impl" + "bsm/full/module/base/passport/internal/server" "git.apinb.com/bsm-sdk/core/service" ) @@ -42,3 +42,7 @@ func Run() { // 启动服务 srv.Start() } + +func main() { + Run() +} diff --git a/apps/base/passport/docker-compose.yml b/module/base/passport/docker-compose.yml similarity index 100% rename from apps/base/passport/docker-compose.yml rename to module/base/passport/docker-compose.yml diff --git a/apps/base/passport/etc/passport_dev.yaml b/module/base/passport/etc/passport_dev.yaml similarity index 100% rename from apps/base/passport/etc/passport_dev.yaml rename to module/base/passport/etc/passport_dev.yaml diff --git a/apps/base/passport/etc/passport_prod.yaml b/module/base/passport/etc/passport_prod.yaml similarity index 100% rename from apps/base/passport/etc/passport_prod.yaml rename to module/base/passport/etc/passport_prod.yaml diff --git a/apps/base/passport/etc/passport_test.yaml b/module/base/passport/etc/passport_test.yaml similarity index 100% rename from apps/base/passport/etc/passport_test.yaml rename to module/base/passport/etc/passport_test.yaml diff --git a/apps/base/passport/etc/supervisor.bsm-apps-passport.conf b/module/base/passport/etc/supervisor.bsm-apps-passport.conf similarity index 100% rename from apps/base/passport/etc/supervisor.bsm-apps-passport.conf rename to module/base/passport/etc/supervisor.bsm-apps-passport.conf diff --git a/apps/social/relation/go.mod b/module/base/passport/go.mod similarity index 65% rename from apps/social/relation/go.mod rename to module/base/passport/go.mod index 08f7d7a..cbeee84 100644 --- a/apps/social/relation/go.mod +++ b/module/base/passport/go.mod @@ -1,4 +1,4 @@ -module git.apinb.com/bsm-social/relation +module bsm/full/module/base/passport go 1.26.5 @@ -14,13 +14,8 @@ tool ( ) require ( - git.apinb.com/bsm-sdk/core v0.2.0 - github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 + github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0 github.com/patrickmn/go-cache v2.1.0+incompatible - go.etcd.io/etcd/client/v3 v3.6.12 - google.golang.org/grpc v1.81.1 - google.golang.org/protobuf v1.36.11 - gorm.io/gorm v1.31.1 ) require ( @@ -28,15 +23,28 @@ require ( git.apinb.com/bsm-tools/protoc-gen-markdown v0.0.0-20250907131213-6c1694ce6bcb // indirect git.apinb.com/bsm-tools/protoc-gen-slc v0.0.13 // indirect git.apinb.com/bsm-tools/protoc-gen-ts v0.0.2 // indirect - github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/coreos/go-semver v0.3.1 // indirect github.com/coreos/go-systemd/v22 v22.7.0 // indirect - github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/ditashi/jsbeautifier-go v0.0.0-20141206144643-2520a8026a9c // indirect - github.com/go-sql-driver/mysql v1.10.0 // indirect - github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt/v5 v5.3.1 // indirect github.com/golang/protobuf v1.5.4 // indirect + github.com/pepabo/protoc-gen-go-client v0.3.0 // indirect + github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect + go.etcd.io/etcd/api/v3 v3.7.1 // indirect + go.uber.org/atomic v1.11.0 // indirect + go.uber.org/multierr v1.11.0 // indirect + go.uber.org/zap v1.28.0 // indirect + go.yaml.in/yaml/v3 v3.0.5 // indirect + golang.org/x/mod v0.37.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea // indirect + google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.2 // indirect + gorm.io/driver/mysql v1.6.0 // indirect +) + +require ( + git.apinb.com/bsm-sdk/core v0.2.0 + github.com/cespare/xxhash/v2 v2.3.0 // indirect + github.com/go-sql-driver/mysql v1.10.0 // indirect github.com/google/uuid v1.6.0 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect @@ -44,26 +52,21 @@ require ( github.com/jackc/puddle/v2 v2.2.2 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect - github.com/oklog/ulid/v2 v2.1.1 // indirect - github.com/pepabo/protoc-gen-go-client v0.3.0 // indirect - github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - github.com/redis/go-redis/v9 v9.20.0 // indirect - github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect - go.etcd.io/etcd/api/v3 v3.6.12 // indirect - go.etcd.io/etcd/client/pkg/v3 v3.6.12 // indirect - go.uber.org/atomic v1.11.0 // indirect - go.uber.org/multierr v1.11.0 // indirect - go.uber.org/zap v1.28.0 // indirect - go.yaml.in/yaml/v3 v3.0.4 // indirect - golang.org/x/mod v0.36.0 // indirect - golang.org/x/net v0.55.0 // indirect - golang.org/x/sync v0.20.0 // indirect - golang.org/x/sys v0.45.0 // indirect - golang.org/x/text v0.37.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa // indirect - google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.2 // indirect + github.com/oklog/ulid/v2 v2.1.2 // indirect + github.com/redis/go-redis/v9 v9.22.0 // indirect + go.etcd.io/etcd/client/pkg/v3 v3.7.1 // indirect + go.etcd.io/etcd/client/v3 v3.7.1 + golang.org/x/crypto v0.54.0 + golang.org/x/net v0.57.0 // indirect + golang.org/x/sync v0.22.0 // indirect + golang.org/x/sys v0.47.0 // indirect + golang.org/x/text v0.40.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea // indirect + google.golang.org/grpc v1.83.0 + google.golang.org/protobuf v1.36.11 gopkg.in/yaml.v3 v3.0.1 // indirect - gorm.io/driver/mysql v1.6.0 // indirect - gorm.io/driver/postgres v1.6.0 // indirect + gorm.io/driver/postgres v1.6.2 // indirect + gorm.io/gorm v1.31.2 ) + +replace git.apinb.com/bsm-sdk/core => D:/work/bsm-sdk/core diff --git a/apps/base/initial/go.sum b/module/base/passport/go.sum similarity index 54% rename from apps/base/initial/go.sum rename to module/base/passport/go.sum index d6663d0..3b10eea 100644 --- a/apps/base/initial/go.sum +++ b/module/base/passport/go.sum @@ -1,7 +1,5 @@ filippo.io/edwards25519 v1.2.0 h1:crnVqOiS4jqYleHd9vaKZ+HKtHfllngJIiOpNpoJsjo= filippo.io/edwards25519 v1.2.0/go.mod h1:xzAOLCNug/yB62zG1bQ8uziwrIqIuxhctzJT18Q77mc= -git.apinb.com/bsm-sdk/core v0.2.0 h1:/e9yqpsbKBrRgMiGpS3KX2O4qDLxo5V5GpPSLNGxEKw= -git.apinb.com/bsm-sdk/core v0.2.0/go.mod h1:E9T6Eboo/0Zb36BjkKbIgvFzq4fQ2Q8P/7y5zmYTI6Y= git.apinb.com/bsm-tools/protoc-gen-markdown v0.0.0-20250907131213-6c1694ce6bcb h1:GoXhkGzI5vZ9JMXCVsSRw/AGsJY0tM2aEv76YaUg2wM= git.apinb.com/bsm-tools/protoc-gen-markdown v0.0.0-20250907131213-6c1694ce6bcb/go.mod h1:l+84zWPM4F40Ppar+jLapgjRNt6XWDsr+l0vN4Jjlm4= git.apinb.com/bsm-tools/protoc-gen-slc v0.0.13 h1:RGg2R2kHz6IAD7scH6So2FlZYctFUDxqWR8i/+fMfOU= @@ -23,14 +21,12 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/ditashi/jsbeautifier-go v0.0.0-20141206144643-2520a8026a9c h1:+Zo5Ca9GH0RoeVZQKzFJcTLoAixx5s5Gq3pTIS+n354= github.com/ditashi/jsbeautifier-go v0.0.0-20141206144643-2520a8026a9c/go.mod h1:HJGU9ULdREjOcVGZVPB5s6zYmHi1RxzT71l2wQyLmnE= -github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= -github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.4 h1:tG4xh9yMsRCAiodLVTxyrkzSZ9+o0L1Kg/+cPVcbP/8= +github.com/go-logr/logr v1.4.4/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-sql-driver/mysql v1.10.0 h1:Q+1LV8DkHJvSYAdR83XzuhDaTykuDx0l6fkXxoWCWfw= github.com/go-sql-driver/mysql v1.10.0/go.mod h1:M+cqaI7+xxXGG9swrdeUIoPG3Y3KCkF0pZej+SK+nWk= -github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= -github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt/v5 v5.3.1 h1:kYf81DTWFe7t+1VvL7eS+jKFVWaUnK9cB1qbwn63YCY= github.com/golang-jwt/jwt/v5 v5.3.1/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= @@ -39,8 +35,8 @@ github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= 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/grpc-ecosystem/grpc-gateway/v2 v2.29.0 h1:5VipnvEpbqr2gA2VbM+nYVbkIF28c5ZQfqCBQ5g2xfk= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0/go.mod h1:Hyl3n6Twe1hvtd9XUXDec4pTvgMSEixRuQKPTMH2bNs= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0 h1:/Tnpcb2E0Pz/tN9s3bfEY2Q8ePCEX9iuS+cneUwncnw= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0/go.mod h1:zOBXOsUaBSjKgmH4OGzV1esUpR3oUSCPYVd2cUBjKYY= 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= @@ -53,16 +49,16 @@ github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= -github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= -github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y= -github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0= +github.com/klauspost/cpuid/v2 v2.4.0 h1:S6Hrbc7+ywsr0r+RLapfGBHfyefhCTwEh3A0tV913Dw= +github.com/klauspost/cpuid/v2 v2.4.0/go.mod h1:19jmZ9mjzoF//ddRSUsv0zfBTJWh3QJh9FNxZTMrGxU= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/oklog/ulid/v2 v2.1.1 h1:suPZ4ARWLOJLegGFiZZ1dFAkqzhMjL3J1TzI+5wHz8s= -github.com/oklog/ulid/v2 v2.1.1/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ= +github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= +github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= +github.com/oklog/ulid/v2 v2.1.2 h1:IEclFb9JNvzYA6MW2SCxbLzcHTVsfqm3PrqGQJH5zec= +github.com/oklog/ulid/v2 v2.1.2/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ= github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= github.com/pborman/getopt v0.0.0-20170112200414-7148bc3a4c30/go.mod h1:85jBQOZwpVEaDAr341tbn15RS4fCAsIst0qp7i8ex1o= @@ -71,8 +67,8 @@ github.com/pepabo/protoc-gen-go-client v0.3.0/go.mod h1:NvHW7/gsmZUK2UxafqzUzWD8 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/redis/go-redis/v9 v9.20.0 h1:WnQYxLkgO2xiXTCJY0ldIiI8dNqCDlQAG+AtaH7a2a0= -github.com/redis/go-redis/v9 v9.20.0/go.mod h1:v/M13XI1PVCDcm01VtPFOADfZtHf8YW3baQf57KlIkA= +github.com/redis/go-redis/v9 v9.22.0 h1:laDvpYXTJtZLloinw1fA5Kqd6HAEH2XKxOkG/PDq2F0= +github.com/redis/go-redis/v9 v9.22.0/go.mod h1:y2g0Wj8rQvuK0ELM+oxSudcLtC09JScs98I/X9gRWY4= github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0= @@ -82,28 +78,26 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= -github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/zeebo/xxh3 v1.1.0 h1:s7DLGDK45Dyfg7++yxI0khrfwq9661w9EN78eP/UZVs= github.com/zeebo/xxh3 v1.1.0/go.mod h1:IisAie1LELR4xhVinxWS5+zf1lA4p0MW4T+w+W07F5s= -go.etcd.io/etcd/api/v3 v3.6.12 h1:OLOZUKEuAA36TR48F0cIaa8FdzrWygjyfrJxXg4iDgs= -go.etcd.io/etcd/api/v3 v3.6.12/go.mod h1:p14EIQXHbuOQbVvL/WEes5uqKnxP9AgKJgpjbMVvzvE= -go.etcd.io/etcd/client/pkg/v3 v3.6.12 h1:36zzB+pQOdHbhN+kH2iJz/K8bJn0ZLtLfPPO7jozTDo= -go.etcd.io/etcd/client/pkg/v3 v3.6.12/go.mod h1:hh2+ZXtfLzs3o6mn92ntgNPBrTJJOvXqICM5g3L3DMY= -go.etcd.io/etcd/client/v3 v3.6.12 h1:kMSP6JcPZMqSJiX+TXdUIBU/4eXEZWBAaui4VihMbIc= -go.etcd.io/etcd/client/v3 v3.6.12/go.mod h1:CMs6fJWYiZQk4ytFjd4lE1diOvvRMmtbbn/alZXd3dQ= +go.etcd.io/etcd/api/v3 v3.7.1 h1:KJG0/DcWGfe3Y1otDf/fsBf0TSSgpxZ5RO/L8SFt73E= +go.etcd.io/etcd/api/v3 v3.7.1/go.mod h1:8bXIpCMeV7E3/XL0Ix123ATn3dB+0V7d9zklHbB0m78= +go.etcd.io/etcd/client/pkg/v3 v3.7.1 h1:rKYsj3pRkR0eK3yjT3XOgrhqfmIfj9pzNgxjh7mfFv4= +go.etcd.io/etcd/client/pkg/v3 v3.7.1/go.mod h1:cnzZGIUzSfjEwLC6UBVsSXlEK1eepS/JUD7wE6PLRT0= +go.etcd.io/etcd/client/v3 v3.7.1 h1:0PEMMC0KuZmVIN+RAbdqfkZ45pYTgKVtmBEbRCvZFUg= +go.etcd.io/etcd/client/v3 v3.7.1/go.mod h1:ffNqALa8tRCYhYo1F9oR489y23K39Gz+BSR3ApAGYq0= go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64= go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y= -go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I= -go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0= -go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM= -go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY= -go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg= -go.opentelemetry.io/otel/sdk v1.43.0/go.mod h1:P+IkVU3iWukmiit/Yf9AWvpyRDlUeBaRg6Y+C58QHzg= -go.opentelemetry.io/otel/sdk/metric v1.43.0 h1:S88dyqXjJkuBNLeMcVPRFXpRw2fuwdvfCGLEo89fDkw= -go.opentelemetry.io/otel/sdk/metric v1.43.0/go.mod h1:C/RJtwSEJ5hzTiUz5pXF1kILHStzb9zFlIEe85bhj6A= -go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A= -go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0= +go.opentelemetry.io/otel v1.45.0 h1:pdrWmLHofpubmArBv1LgFSv1Z0Ie/ppdZzu+kUN5EeU= +go.opentelemetry.io/otel v1.45.0/go.mod h1:XZxIqPapzEYnhNSScF5DIqXhm/rYi0FzCe2XddAwZfQ= +go.opentelemetry.io/otel/metric v1.45.0 h1:7Eg1uH7CJ5cXv9is6tnBe1FI6rj1nwUdbFypRm3br/M= +go.opentelemetry.io/otel/metric v1.45.0/go.mod h1:HAPbm1nd3p1PmFH7v2dR+6BjXxw+Lq4a2+pndMAm08s= +go.opentelemetry.io/otel/sdk v1.45.0 h1:4VVSMgQ83dUgW2aoX5f6JgLvHwIvzcuLnF9lUdCSpCw= +go.opentelemetry.io/otel/sdk v1.45.0/go.mod h1:Sr40LgXV7DsKMMJMKOhUWOgMWTfAaqvm2kF0g7ilwuA= +go.opentelemetry.io/otel/sdk/metric v1.44.0 h1:3LlKgI+VjbVsjNRFZJZAJ30WjXC5VkNRks6si09iEfI= +go.opentelemetry.io/otel/sdk/metric v1.44.0/go.mod h1:5B5pMARnXxKhltooO4xUuCBorl65a4EpnTalObqOigA= +go.opentelemetry.io/otel/trace v1.45.0 h1:l/mP6Uv7oNO7/TblbhpbgMidxhq1uO/rPsikOyVhxag= +go.opentelemetry.io/otel/trace v1.45.0/go.mod h1:qoJJA2xNMnxRrdISU/kLtfUH2wNeQbiv+jhs/CxI8bc= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= @@ -112,51 +106,28 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.28.0 h1:IZzaP1Fv73/T/pBMLk4VutPl36uNC+OSUh3JLG3FIjo= go.uber.org/zap v1.28.0/go.mod h1:rDLpOi171uODNm/mxFcuYWxDsqWSAVkFdX4XojSKg/Q= -go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= -go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.36.0 h1:JJjpVx6myfUsUdAzZuOSTTmRE0PfZeNWzzvKrP7amb4= -golang.org/x/mod v0.36.0/go.mod h1:moc6ELqsWcOw5Ef3xVprK5ul/MvtVvkIXLziUOICjUQ= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8= -golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -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.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4= -golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY= -golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc= -golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -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= +go.yaml.in/yaml/v3 v3.0.5 h1:N6y/pJk8buWs9NY5ERU2HSMfm+IuD/OtfdAnq6kESPw= +go.yaml.in/yaml/v3 v3.0.5/go.mod h1:HVTZu1O7/Vkt2N+BFy8Zza+lnLsABggaTM2ZpNIGuKg= +golang.org/x/crypto v0.54.0 h1:YLIA59K4fiNzHzjnZt2tUJQjQtUWfWbeHBqKtk3eScw= +golang.org/x/crypto v0.54.0/go.mod h1:KWL8ny2AZdGR2cWmzeHrp2azQPGogOv+HeQaVEXC2dk= +golang.org/x/mod v0.37.0 h1:vF1DjpVEshcIqoEaauuHebaLk1O1forxjxBaVn884JQ= +golang.org/x/mod v0.37.0/go.mod h1:m8S8VeM9r4dzDwjrKO0a1sZP3YjeMamRRlD+fmR2Q/0= +golang.org/x/net v0.57.0 h1:K5+3DljvIuDG9/Jv9rvyMywYNFCQ9RSUY6OOTTkT+tE= +golang.org/x/net v0.57.0/go.mod h1:KpXc8iv+r3XplLAG/f7Jsf9RPszJzdR0f58q9vGOuEU= +golang.org/x/sync v0.22.0 h1:SZjpbeLmrCk4xhRSZFNZW5gFUeCeFgjekvI/+gfScek= +golang.org/x/sync v0.22.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= +golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs= +golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +golang.org/x/text v0.40.0 h1:Ub2Z6/xjgF1WrYQz2nuITOEegKFtiIy+rieRJ5lHZKs= +golang.org/x/text v0.40.0/go.mod h1:hpnzDAfGV753zIKo+wk3u1bVKCGPbrnF7+7LBF/UHVY= gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4= gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E= -google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa h1:Kjn0N0tCrDgiAFW+lGO4JZ3ck44CehvJQMAwj9QF0G8= -google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:q4lMZS6kskjT5HvCPrnnypcDPVJqT/f4nfxmkE7gryY= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa h1:mZHHdPZl0dbGHCflZgAq/Q468DWVFcU2whhB2KAo8fk= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= -google.golang.org/grpc v1.81.1 h1:VnnIIZ88UzOOKLukQi+ImGz8O1Wdp8nAGGnvOfEIWQQ= -google.golang.org/grpc v1.81.1/go.mod h1:xGH9GfzOyMTGIOXBJmXt+BX/V0kcdQbdcuwQ/zNw42I= +google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea h1:Jifw/kjs/r3B0uszvls/m3c3tmZs2YHGM9C+rvxP9gY= +google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea/go.mod h1:K/+WGbmBY7aNW1HDw1fJnKYo10i0DkAX6pows00dLig= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea h1:kVhQEPTpKQahD5+JSBTfBB19wcgQTTjAIn45MBqnyHk= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= +google.golang.org/grpc v1.83.0 h1:JeNZEKJFbQxArAMl+hiytHauacDNqJUllNfmIMmpqnQ= +google.golang.org/grpc v1.83.0/go.mod h1:kDyl6SKsiHKt0uylY5gtn5cEjkrIOhQOGDgIc4JGwzQ= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.2 h1:rgSNvqscFZ1JgV/4wH5GOsZFSFkR2Eua9As3KIr2LlM= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.2/go.mod h1:iMEtFwDlAhjDU9L5mY6U1XLwlIId/G3h+QcBHDIvrJ8= google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE= @@ -169,9 +140,11 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gorm.io/driver/mysql v1.6.0 h1:eNbLmNTpPpTOVZi8MMxCi2aaIm0ZpInbORNXDwyLGvg= gorm.io/driver/mysql v1.6.0/go.mod h1:D/oCC2GWK3M/dqoLxnOlaNKmXz8WNTfcS9y5ovaSqKo= -gorm.io/driver/postgres v1.6.0 h1:2dxzU8xJ+ivvqTRph34QX+WrRaJlmfyPqXmoGVjMBa4= -gorm.io/driver/postgres v1.6.0/go.mod h1:vUw0mrGgrTK+uPHEhAdV4sfFELrByKVGnaVRkXDhtWo= -gorm.io/gorm v1.31.1 h1:7CA8FTFz/gRfgqgpeKIBcervUn3xSyPUmr6B2WXJ7kg= -gorm.io/gorm v1.31.1/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs= +gorm.io/driver/postgres v1.6.2 h1:BvXQ/cNUg63q5TFNg672DmDcowZSFrNLkkA3Xe6GXq4= +gorm.io/driver/postgres v1.6.2/go.mod h1:0c4fQA44XhOklXDkgtuKqysHCycTa5i9e3EIpDGCwXk= +gorm.io/driver/sqlite v1.6.0 h1:WHRRrIiulaPiPFmDcod6prc4l2VGVWHz80KspNsxSfQ= +gorm.io/driver/sqlite v1.6.0/go.mod h1:AO9V1qIQddBESngQUKWL9yoH93HIeA1X6V633rBwyT8= +gorm.io/gorm v1.31.2 h1:3o8FXNo9v9S858gil+3LlZA1LkCOzgb4g5BL64FgaCo= +gorm.io/gorm v1.31.2/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs= gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU= gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU= diff --git a/apps/base/passport/internal/config/config.go b/module/base/passport/internal/config/config.go similarity index 100% rename from apps/base/passport/internal/config/config.go rename to module/base/passport/internal/config/config.go diff --git a/apps/base/passport/internal/excode/ex.go b/module/base/passport/internal/excode/ex.go similarity index 100% rename from apps/base/passport/internal/excode/ex.go rename to module/base/passport/internal/excode/ex.go diff --git a/apps/base/passport/internal/impl/impl.go b/module/base/passport/internal/impl/impl.go similarity index 92% rename from apps/base/passport/internal/impl/impl.go rename to module/base/passport/internal/impl/impl.go index 6111e01..ed0697a 100644 --- a/apps/base/passport/internal/impl/impl.go +++ b/module/base/passport/internal/impl/impl.go @@ -1,7 +1,7 @@ package impl import ( - "git.apinb.com/bsm-apps/passport/internal/config" + "bsm/full/module/base/passport/internal/config" "git.apinb.com/bsm-sdk/core/cache/redis" "git.apinb.com/bsm-sdk/core/with" cache "github.com/patrickmn/go-cache" diff --git a/apps/base/passport/internal/logic/account/get.go b/module/base/passport/internal/logic/account/get.go similarity index 92% rename from apps/base/passport/internal/logic/account/get.go rename to module/base/passport/internal/logic/account/get.go index 7a7415b..266bf40 100644 --- a/apps/base/passport/internal/logic/account/get.go +++ b/module/base/passport/internal/logic/account/get.go @@ -3,9 +3,9 @@ package account import ( "context" - "git.apinb.com/bsm-apps/passport/internal/impl" - "git.apinb.com/bsm-apps/passport/internal/models" - pb "git.apinb.com/bsm-apps/passport/pb" + "bsm/full/module/base/passport/internal/impl" + "bsm/full/module/base/passport/internal/models" + pb "bsm/full/module/base/passport/pb" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/base/passport/internal/logic/account/set_data.go b/module/base/passport/internal/logic/account/set_data.go similarity index 90% rename from apps/base/passport/internal/logic/account/set_data.go rename to module/base/passport/internal/logic/account/set_data.go index c530a76..b5dc06a 100644 --- a/apps/base/passport/internal/logic/account/set_data.go +++ b/module/base/passport/internal/logic/account/set_data.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/passport/internal/impl" - "git.apinb.com/bsm-apps/passport/internal/models" - pb "git.apinb.com/bsm-apps/passport/pb" + "bsm/full/module/base/passport/internal/impl" + "bsm/full/module/base/passport/internal/models" + pb "bsm/full/module/base/passport/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/base/passport/internal/logic/account/set_password.go b/module/base/passport/internal/logic/account/set_password.go similarity index 89% rename from apps/base/passport/internal/logic/account/set_password.go rename to module/base/passport/internal/logic/account/set_password.go index 417d04d..032375a 100644 --- a/apps/base/passport/internal/logic/account/set_password.go +++ b/module/base/passport/internal/logic/account/set_password.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/passport/internal/impl" - "git.apinb.com/bsm-apps/passport/internal/models" - pb "git.apinb.com/bsm-apps/passport/pb" + "bsm/full/module/base/passport/internal/impl" + "bsm/full/module/base/passport/internal/models" + pb "bsm/full/module/base/passport/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/base/passport/internal/logic/account/statistics.go b/module/base/passport/internal/logic/account/statistics.go similarity index 89% rename from apps/base/passport/internal/logic/account/statistics.go rename to module/base/passport/internal/logic/account/statistics.go index e73376e..35acc9b 100644 --- a/apps/base/passport/internal/logic/account/statistics.go +++ b/module/base/passport/internal/logic/account/statistics.go @@ -3,9 +3,9 @@ package account import ( "context" - "git.apinb.com/bsm-apps/passport/internal/impl" - "git.apinb.com/bsm-apps/passport/internal/models" - pb "git.apinb.com/bsm-apps/passport/pb" + "bsm/full/module/base/passport/internal/impl" + "bsm/full/module/base/passport/internal/models" + pb "bsm/full/module/base/passport/pb" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/base/passport/internal/logic/account/tag_create.go b/module/base/passport/internal/logic/account/tag_create.go similarity index 90% rename from apps/base/passport/internal/logic/account/tag_create.go rename to module/base/passport/internal/logic/account/tag_create.go index 0707bda..afe7e33 100644 --- a/apps/base/passport/internal/logic/account/tag_create.go +++ b/module/base/passport/internal/logic/account/tag_create.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/passport/internal/impl" - "git.apinb.com/bsm-apps/passport/internal/models" - pb "git.apinb.com/bsm-apps/passport/pb" + "bsm/full/module/base/passport/internal/impl" + "bsm/full/module/base/passport/internal/models" + pb "bsm/full/module/base/passport/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/utils" diff --git a/apps/base/passport/internal/logic/account/tag_remove.go b/module/base/passport/internal/logic/account/tag_remove.go similarity index 86% rename from apps/base/passport/internal/logic/account/tag_remove.go rename to module/base/passport/internal/logic/account/tag_remove.go index fd3134a..bfe3a92 100644 --- a/apps/base/passport/internal/logic/account/tag_remove.go +++ b/module/base/passport/internal/logic/account/tag_remove.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/passport/internal/impl" - "git.apinb.com/bsm-apps/passport/internal/models" - pb "git.apinb.com/bsm-apps/passport/pb" + "bsm/full/module/base/passport/internal/impl" + "bsm/full/module/base/passport/internal/models" + pb "bsm/full/module/base/passport/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/base/passport/internal/logic/common/token.go b/module/base/passport/internal/logic/common/token.go similarity index 100% rename from apps/base/passport/internal/logic/common/token.go rename to module/base/passport/internal/logic/common/token.go diff --git a/apps/base/passport/internal/logic/forget/reset.go b/module/base/passport/internal/logic/forget/reset.go similarity index 82% rename from apps/base/passport/internal/logic/forget/reset.go rename to module/base/passport/internal/logic/forget/reset.go index 7d5d61c..a3d4e96 100644 --- a/apps/base/passport/internal/logic/forget/reset.go +++ b/module/base/passport/internal/logic/forget/reset.go @@ -4,10 +4,10 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/passport/internal/impl" - "git.apinb.com/bsm-apps/passport/internal/models" - "git.apinb.com/bsm-apps/passport/internal/vars" - pb "git.apinb.com/bsm-apps/passport/pb" + "bsm/full/module/base/passport/internal/impl" + "bsm/full/module/base/passport/internal/models" + "bsm/full/module/base/passport/internal/vars" + pb "bsm/full/module/base/passport/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/utils" diff --git a/apps/base/passport/internal/logic/forget/verify.go b/module/base/passport/internal/logic/forget/verify.go similarity index 79% rename from apps/base/passport/internal/logic/forget/verify.go rename to module/base/passport/internal/logic/forget/verify.go index 38d0e1c..ec9b7c3 100644 --- a/apps/base/passport/internal/logic/forget/verify.go +++ b/module/base/passport/internal/logic/forget/verify.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/passport/internal/models" - "git.apinb.com/bsm-apps/passport/internal/vars" - pb "git.apinb.com/bsm-apps/passport/pb" + "bsm/full/module/base/passport/internal/models" + "bsm/full/module/base/passport/internal/vars" + pb "bsm/full/module/base/passport/pb" "git.apinb.com/bsm-sdk/core/errcode" ) diff --git a/apps/base/passport/internal/logic/login/code.go b/module/base/passport/internal/logic/login/code.go similarity index 85% rename from apps/base/passport/internal/logic/login/code.go rename to module/base/passport/internal/logic/login/code.go index c6f78b0..1eddb29 100644 --- a/apps/base/passport/internal/logic/login/code.go +++ b/module/base/passport/internal/logic/login/code.go @@ -3,11 +3,11 @@ package login import ( "context" - "git.apinb.com/bsm-apps/passport/internal/impl" - "git.apinb.com/bsm-apps/passport/internal/logic/common" - "git.apinb.com/bsm-apps/passport/internal/models" - "git.apinb.com/bsm-apps/passport/internal/vars" - pb "git.apinb.com/bsm-apps/passport/pb" + "bsm/full/module/base/passport/internal/impl" + "bsm/full/module/base/passport/internal/logic/common" + "bsm/full/module/base/passport/internal/models" + "bsm/full/module/base/passport/internal/vars" + pb "bsm/full/module/base/passport/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" ) diff --git a/apps/base/passport/internal/logic/login/pwd.go b/module/base/passport/internal/logic/login/pwd.go similarity index 87% rename from apps/base/passport/internal/logic/login/pwd.go rename to module/base/passport/internal/logic/login/pwd.go index 761b71c..0345148 100644 --- a/apps/base/passport/internal/logic/login/pwd.go +++ b/module/base/passport/internal/logic/login/pwd.go @@ -3,11 +3,11 @@ package login import ( "context" - "git.apinb.com/bsm-apps/passport/internal/impl" - "git.apinb.com/bsm-apps/passport/internal/logic/common" - "git.apinb.com/bsm-apps/passport/internal/models" - "git.apinb.com/bsm-apps/passport/internal/vars" - pb "git.apinb.com/bsm-apps/passport/pb" + "bsm/full/module/base/passport/internal/impl" + "bsm/full/module/base/passport/internal/logic/common" + "bsm/full/module/base/passport/internal/models" + "bsm/full/module/base/passport/internal/vars" + pb "bsm/full/module/base/passport/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" _vars "git.apinb.com/bsm-sdk/core/vars" diff --git a/apps/base/passport/internal/logic/login/quick.go b/module/base/passport/internal/logic/login/quick.go similarity index 90% rename from apps/base/passport/internal/logic/login/quick.go rename to module/base/passport/internal/logic/login/quick.go index eb61fda..809f352 100644 --- a/apps/base/passport/internal/logic/login/quick.go +++ b/module/base/passport/internal/logic/login/quick.go @@ -4,11 +4,11 @@ import ( "context" "errors" - "git.apinb.com/bsm-apps/passport/internal/impl" - "git.apinb.com/bsm-apps/passport/internal/logic/common" - "git.apinb.com/bsm-apps/passport/internal/models" - "git.apinb.com/bsm-apps/passport/internal/vars" - pb "git.apinb.com/bsm-apps/passport/pb" + "bsm/full/module/base/passport/internal/impl" + "bsm/full/module/base/passport/internal/logic/common" + "bsm/full/module/base/passport/internal/models" + "bsm/full/module/base/passport/internal/vars" + pb "bsm/full/module/base/passport/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/types" diff --git a/apps/base/passport/internal/logic/register/code.go b/module/base/passport/internal/logic/register/code.go similarity index 86% rename from apps/base/passport/internal/logic/register/code.go rename to module/base/passport/internal/logic/register/code.go index 9ab3018..1bf7e54 100644 --- a/apps/base/passport/internal/logic/register/code.go +++ b/module/base/passport/internal/logic/register/code.go @@ -4,8 +4,8 @@ import ( "context" "regexp" - "git.apinb.com/bsm-apps/passport/internal/models" - pb "git.apinb.com/bsm-apps/passport/pb" + "bsm/full/module/base/passport/internal/models" + pb "bsm/full/module/base/passport/pb" "git.apinb.com/bsm-sdk/core/errcode" ) diff --git a/apps/base/passport/internal/logic/register/do.go b/module/base/passport/internal/logic/register/do.go similarity index 89% rename from apps/base/passport/internal/logic/register/do.go rename to module/base/passport/internal/logic/register/do.go index b3dc2bd..92af08b 100644 --- a/apps/base/passport/internal/logic/register/do.go +++ b/module/base/passport/internal/logic/register/do.go @@ -8,12 +8,12 @@ package register import ( - "git.apinb.com/bsm-apps/passport/internal/config" - "git.apinb.com/bsm-apps/passport/internal/impl" - "git.apinb.com/bsm-apps/passport/internal/logic/common" - "git.apinb.com/bsm-apps/passport/internal/models" - "git.apinb.com/bsm-apps/passport/internal/vars" - pb "git.apinb.com/bsm-apps/passport/pb" + "bsm/full/module/base/passport/internal/config" + "bsm/full/module/base/passport/internal/impl" + "bsm/full/module/base/passport/internal/logic/common" + "bsm/full/module/base/passport/internal/models" + "bsm/full/module/base/passport/internal/vars" + pb "bsm/full/module/base/passport/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/types" diff --git a/apps/base/passport/internal/logic/register/pwd.go b/module/base/passport/internal/logic/register/pwd.go similarity index 82% rename from apps/base/passport/internal/logic/register/pwd.go rename to module/base/passport/internal/logic/register/pwd.go index d3fab77..40314e5 100644 --- a/apps/base/passport/internal/logic/register/pwd.go +++ b/module/base/passport/internal/logic/register/pwd.go @@ -3,8 +3,8 @@ package register import ( "context" - "git.apinb.com/bsm-apps/passport/internal/models" - pb "git.apinb.com/bsm-apps/passport/pb" + "bsm/full/module/base/passport/internal/models" + pb "bsm/full/module/base/passport/pb" "git.apinb.com/bsm-sdk/core/errcode" ) diff --git a/apps/base/passport/internal/logic/verify/jumio_callback.go b/module/base/passport/internal/logic/verify/jumio_callback.go similarity index 95% rename from apps/base/passport/internal/logic/verify/jumio_callback.go rename to module/base/passport/internal/logic/verify/jumio_callback.go index 358c807..8be3224 100644 --- a/apps/base/passport/internal/logic/verify/jumio_callback.go +++ b/module/base/passport/internal/logic/verify/jumio_callback.go @@ -5,7 +5,7 @@ import ( "time" - pb "git.apinb.com/bsm-apps/passport/pb" + pb "bsm/full/module/base/passport/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" ) diff --git a/apps/base/passport/internal/logic/verify/request.go b/module/base/passport/internal/logic/verify/request.go similarity index 93% rename from apps/base/passport/internal/logic/verify/request.go rename to module/base/passport/internal/logic/verify/request.go index 284bfc6..ce7b8b0 100644 --- a/apps/base/passport/internal/logic/verify/request.go +++ b/module/base/passport/internal/logic/verify/request.go @@ -10,11 +10,11 @@ import ( "strings" "time" - "git.apinb.com/bsm-apps/passport/internal/config" - "git.apinb.com/bsm-apps/passport/internal/impl" - "git.apinb.com/bsm-apps/passport/internal/logic/common" - "git.apinb.com/bsm-apps/passport/internal/models" - pb "git.apinb.com/bsm-apps/passport/pb" + "bsm/full/module/base/passport/internal/config" + "bsm/full/module/base/passport/internal/impl" + "bsm/full/module/base/passport/internal/logic/common" + "bsm/full/module/base/passport/internal/models" + pb "bsm/full/module/base/passport/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/base/passport/internal/models/cache.go b/module/base/passport/internal/models/cache.go similarity index 99% rename from apps/base/passport/internal/models/cache.go rename to module/base/passport/internal/models/cache.go index 2552cdb..30cc59b 100644 --- a/apps/base/passport/internal/models/cache.go +++ b/module/base/passport/internal/models/cache.go @@ -4,7 +4,7 @@ import ( "context" "time" - "git.apinb.com/bsm-apps/passport/internal/impl" + "bsm/full/module/base/passport/internal/impl" ) var ( diff --git a/apps/base/passport/internal/models/passport_account.go b/module/base/passport/internal/models/passport_account.go similarity index 95% rename from apps/base/passport/internal/models/passport_account.go rename to module/base/passport/internal/models/passport_account.go index c9e485c..ef610f4 100644 --- a/apps/base/passport/internal/models/passport_account.go +++ b/module/base/passport/internal/models/passport_account.go @@ -11,8 +11,8 @@ package models import ( "errors" - "git.apinb.com/bsm-apps/passport/internal/impl" - "git.apinb.com/bsm-apps/passport/internal/vars" + "bsm/full/module/base/passport/internal/impl" + "bsm/full/module/base/passport/internal/vars" "git.apinb.com/bsm-sdk/core/database" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/types" diff --git a/apps/base/passport/internal/models/passport_data.go b/module/base/passport/internal/models/passport_data.go similarity index 98% rename from apps/base/passport/internal/models/passport_data.go rename to module/base/passport/internal/models/passport_data.go index 0df50f1..0602dce 100644 --- a/apps/base/passport/internal/models/passport_data.go +++ b/module/base/passport/internal/models/passport_data.go @@ -5,7 +5,7 @@ import ( "errors" "time" - "git.apinb.com/bsm-apps/passport/internal/impl" + "bsm/full/module/base/passport/internal/impl" "git.apinb.com/bsm-sdk/core/database" "git.apinb.com/bsm-sdk/core/types" "gorm.io/gorm" diff --git a/apps/base/passport/internal/models/passport_notify.go b/module/base/passport/internal/models/passport_notify.go similarity index 100% rename from apps/base/passport/internal/models/passport_notify.go rename to module/base/passport/internal/models/passport_notify.go diff --git a/apps/base/passport/internal/models/passport_provider.go b/module/base/passport/internal/models/passport_provider.go similarity index 100% rename from apps/base/passport/internal/models/passport_provider.go rename to module/base/passport/internal/models/passport_provider.go diff --git a/apps/base/passport/internal/models/passport_rights_expiry.go b/module/base/passport/internal/models/passport_rights_expiry.go similarity index 100% rename from apps/base/passport/internal/models/passport_rights_expiry.go rename to module/base/passport/internal/models/passport_rights_expiry.go diff --git a/apps/base/passport/internal/models/passport_score.go b/module/base/passport/internal/models/passport_score.go similarity index 100% rename from apps/base/passport/internal/models/passport_score.go rename to module/base/passport/internal/models/passport_score.go diff --git a/apps/base/passport/internal/models/passport_statistics.go b/module/base/passport/internal/models/passport_statistics.go similarity index 100% rename from apps/base/passport/internal/models/passport_statistics.go rename to module/base/passport/internal/models/passport_statistics.go diff --git a/apps/base/passport/internal/models/passport_tags.go b/module/base/passport/internal/models/passport_tags.go similarity index 100% rename from apps/base/passport/internal/models/passport_tags.go rename to module/base/passport/internal/models/passport_tags.go diff --git a/apps/base/passport/internal/models/passport_verify.go b/module/base/passport/internal/models/passport_verify.go similarity index 100% rename from apps/base/passport/internal/models/passport_verify.go rename to module/base/passport/internal/models/passport_verify.go diff --git a/apps/base/passport/internal/models/query.go b/module/base/passport/internal/models/query.go similarity index 93% rename from apps/base/passport/internal/models/query.go rename to module/base/passport/internal/models/query.go index 8b377df..825e86d 100644 --- a/apps/base/passport/internal/models/query.go +++ b/module/base/passport/internal/models/query.go @@ -1,8 +1,8 @@ package models import ( - "git.apinb.com/bsm-apps/passport/internal/impl" - "git.apinb.com/bsm-apps/passport/internal/vars" + "bsm/full/module/base/passport/internal/impl" + "bsm/full/module/base/passport/internal/vars" "git.apinb.com/bsm-sdk/core/types" "git.apinb.com/bsm-sdk/core/utils" "golang.org/x/crypto/bcrypt" diff --git a/apps/base/passport/internal/server/account_server.go b/module/base/passport/internal/server/account_server.go similarity index 92% rename from apps/base/passport/internal/server/account_server.go rename to module/base/passport/internal/server/account_server.go index ecc2695..bce0fba 100644 --- a/apps/base/passport/internal/server/account_server.go +++ b/module/base/passport/internal/server/account_server.go @@ -3,8 +3,8 @@ package server import ( "context" - "git.apinb.com/bsm-apps/passport/internal/logic/account" - pb "git.apinb.com/bsm-apps/passport/pb" + "bsm/full/module/base/passport/internal/logic/account" + pb "bsm/full/module/base/passport/pb" ) type AccountServer struct { diff --git a/apps/base/passport/internal/server/forget_server.go b/module/base/passport/internal/server/forget_server.go similarity index 84% rename from apps/base/passport/internal/server/forget_server.go rename to module/base/passport/internal/server/forget_server.go index ebfec73..64c6a7e 100644 --- a/apps/base/passport/internal/server/forget_server.go +++ b/module/base/passport/internal/server/forget_server.go @@ -3,8 +3,8 @@ package server import ( "context" - "git.apinb.com/bsm-apps/passport/internal/logic/forget" - pb "git.apinb.com/bsm-apps/passport/pb" + "bsm/full/module/base/passport/internal/logic/forget" + pb "bsm/full/module/base/passport/pb" ) type ForgetServer struct { diff --git a/apps/base/passport/internal/server/login_server.go b/module/base/passport/internal/server/login_server.go similarity index 87% rename from apps/base/passport/internal/server/login_server.go rename to module/base/passport/internal/server/login_server.go index 504603d..76d9083 100644 --- a/apps/base/passport/internal/server/login_server.go +++ b/module/base/passport/internal/server/login_server.go @@ -3,8 +3,8 @@ package server import ( "context" - "git.apinb.com/bsm-apps/passport/internal/logic/login" - pb "git.apinb.com/bsm-apps/passport/pb" + "bsm/full/module/base/passport/internal/logic/login" + pb "bsm/full/module/base/passport/pb" ) type LoginServer struct { diff --git a/apps/base/passport/internal/server/new.go b/module/base/passport/internal/server/new.go similarity index 98% rename from apps/base/passport/internal/server/new.go rename to module/base/passport/internal/server/new.go index 70ad322..522399d 100644 --- a/apps/base/passport/internal/server/new.go +++ b/module/base/passport/internal/server/new.go @@ -3,7 +3,7 @@ package server import ( "context" - pb "git.apinb.com/bsm-apps/passport/pb" + pb "bsm/full/module/base/passport/pb" "git.apinb.com/bsm-sdk/core/vars" gwRuntime "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "google.golang.org/grpc" diff --git a/apps/base/passport/internal/server/register_server.go b/module/base/passport/internal/server/register_server.go similarity index 84% rename from apps/base/passport/internal/server/register_server.go rename to module/base/passport/internal/server/register_server.go index 2874a38..85478bb 100644 --- a/apps/base/passport/internal/server/register_server.go +++ b/module/base/passport/internal/server/register_server.go @@ -3,8 +3,8 @@ package server import ( "context" - "git.apinb.com/bsm-apps/passport/internal/logic/register" - pb "git.apinb.com/bsm-apps/passport/pb" + "bsm/full/module/base/passport/internal/logic/register" + pb "bsm/full/module/base/passport/pb" ) type RegisterServer struct { diff --git a/apps/base/passport/internal/server/verify_server.go b/module/base/passport/internal/server/verify_server.go similarity index 84% rename from apps/base/passport/internal/server/verify_server.go rename to module/base/passport/internal/server/verify_server.go index d5391b4..beac632 100644 --- a/apps/base/passport/internal/server/verify_server.go +++ b/module/base/passport/internal/server/verify_server.go @@ -3,8 +3,8 @@ package server import ( "context" - "git.apinb.com/bsm-apps/passport/internal/logic/verify" - pb "git.apinb.com/bsm-apps/passport/pb" + "bsm/full/module/base/passport/internal/logic/verify" + pb "bsm/full/module/base/passport/pb" ) type VerifyServer struct { diff --git a/apps/base/passport/internal/vars/provider.go b/module/base/passport/internal/vars/provider.go similarity index 100% rename from apps/base/passport/internal/vars/provider.go rename to module/base/passport/internal/vars/provider.go diff --git a/apps/base/passport/internal/vars/status.go b/module/base/passport/internal/vars/status.go similarity index 100% rename from apps/base/passport/internal/vars/status.go rename to module/base/passport/internal/vars/status.go diff --git a/apps/base/passport/internal/vars/token.go b/module/base/passport/internal/vars/token.go similarity index 100% rename from apps/base/passport/internal/vars/token.go rename to module/base/passport/internal/vars/token.go diff --git a/apps/base/passport/pb/account.pb.go b/module/base/passport/pb/account.pb.go similarity index 100% rename from apps/base/passport/pb/account.pb.go rename to module/base/passport/pb/account.pb.go diff --git a/apps/base/passport/pb/account.pb.gw.go b/module/base/passport/pb/account.pb.gw.go similarity index 100% rename from apps/base/passport/pb/account.pb.gw.go rename to module/base/passport/pb/account.pb.gw.go diff --git a/apps/base/passport/pb/account_grpc.pb.go b/module/base/passport/pb/account_grpc.pb.go similarity index 100% rename from apps/base/passport/pb/account_grpc.pb.go rename to module/base/passport/pb/account_grpc.pb.go diff --git a/apps/base/passport/pb/blocks.pb.go b/module/base/passport/pb/blocks.pb.go similarity index 100% rename from apps/base/passport/pb/blocks.pb.go rename to module/base/passport/pb/blocks.pb.go diff --git a/apps/base/passport/pb/forget.pb.go b/module/base/passport/pb/forget.pb.go similarity index 100% rename from apps/base/passport/pb/forget.pb.go rename to module/base/passport/pb/forget.pb.go diff --git a/apps/base/passport/pb/forget.pb.gw.go b/module/base/passport/pb/forget.pb.gw.go similarity index 100% rename from apps/base/passport/pb/forget.pb.gw.go rename to module/base/passport/pb/forget.pb.gw.go diff --git a/apps/base/passport/pb/forget_grpc.pb.go b/module/base/passport/pb/forget_grpc.pb.go similarity index 100% rename from apps/base/passport/pb/forget_grpc.pb.go rename to module/base/passport/pb/forget_grpc.pb.go diff --git a/apps/base/passport/pb/login.pb.go b/module/base/passport/pb/login.pb.go similarity index 100% rename from apps/base/passport/pb/login.pb.go rename to module/base/passport/pb/login.pb.go diff --git a/apps/base/passport/pb/login.pb.gw.go b/module/base/passport/pb/login.pb.gw.go similarity index 100% rename from apps/base/passport/pb/login.pb.gw.go rename to module/base/passport/pb/login.pb.gw.go diff --git a/apps/base/passport/pb/login_grpc.pb.go b/module/base/passport/pb/login_grpc.pb.go similarity index 100% rename from apps/base/passport/pb/login_grpc.pb.go rename to module/base/passport/pb/login_grpc.pb.go diff --git a/apps/base/passport/pb/register.pb.go b/module/base/passport/pb/register.pb.go similarity index 100% rename from apps/base/passport/pb/register.pb.go rename to module/base/passport/pb/register.pb.go diff --git a/apps/base/passport/pb/register.pb.gw.go b/module/base/passport/pb/register.pb.gw.go similarity index 100% rename from apps/base/passport/pb/register.pb.gw.go rename to module/base/passport/pb/register.pb.gw.go diff --git a/apps/base/passport/pb/register_grpc.pb.go b/module/base/passport/pb/register_grpc.pb.go similarity index 100% rename from apps/base/passport/pb/register_grpc.pb.go rename to module/base/passport/pb/register_grpc.pb.go diff --git a/apps/base/passport/pb/verify.pb.go b/module/base/passport/pb/verify.pb.go similarity index 100% rename from apps/base/passport/pb/verify.pb.go rename to module/base/passport/pb/verify.pb.go diff --git a/apps/base/passport/pb/verify.pb.gw.go b/module/base/passport/pb/verify.pb.gw.go similarity index 100% rename from apps/base/passport/pb/verify.pb.gw.go rename to module/base/passport/pb/verify.pb.gw.go diff --git a/apps/base/passport/pb/verify_grpc.pb.go b/module/base/passport/pb/verify_grpc.pb.go similarity index 100% rename from apps/base/passport/pb/verify_grpc.pb.go rename to module/base/passport/pb/verify_grpc.pb.go diff --git a/apps/base/passport/proto/account.proto b/module/base/passport/proto/account.proto similarity index 100% rename from apps/base/passport/proto/account.proto rename to module/base/passport/proto/account.proto diff --git a/apps/base/passport/proto/blocks.proto b/module/base/passport/proto/blocks.proto similarity index 100% rename from apps/base/passport/proto/blocks.proto rename to module/base/passport/proto/blocks.proto diff --git a/apps/base/passport/proto/forget.proto b/module/base/passport/proto/forget.proto similarity index 100% rename from apps/base/passport/proto/forget.proto rename to module/base/passport/proto/forget.proto diff --git a/apps/base/passport/proto/login.proto b/module/base/passport/proto/login.proto similarity index 100% rename from apps/base/passport/proto/login.proto rename to module/base/passport/proto/login.proto diff --git a/apps/base/passport/proto/register.proto b/module/base/passport/proto/register.proto similarity index 100% rename from apps/base/passport/proto/register.proto rename to module/base/passport/proto/register.proto diff --git a/apps/base/passport/proto/verify.proto b/module/base/passport/proto/verify.proto similarity index 100% rename from apps/base/passport/proto/verify.proto rename to module/base/passport/proto/verify.proto diff --git a/apps/base/passport/scripts/deploy.sh b/module/base/passport/scripts/deploy.sh similarity index 100% rename from apps/base/passport/scripts/deploy.sh rename to module/base/passport/scripts/deploy.sh diff --git a/apps/base/passport/scripts/filebeat.yaml b/module/base/passport/scripts/filebeat.yaml similarity index 100% rename from apps/base/passport/scripts/filebeat.yaml rename to module/base/passport/scripts/filebeat.yaml diff --git a/apps/base/passport/scripts/lint.sh b/module/base/passport/scripts/lint.sh similarity index 100% rename from apps/base/passport/scripts/lint.sh rename to module/base/passport/scripts/lint.sh diff --git a/apps/base/passport/scripts/run.sh b/module/base/passport/scripts/run.sh similarity index 100% rename from apps/base/passport/scripts/run.sh rename to module/base/passport/scripts/run.sh diff --git a/apps/base/passport/test/grpc/main.go b/module/base/passport/test/grpc/main.go similarity index 97% rename from apps/base/passport/test/grpc/main.go rename to module/base/passport/test/grpc/main.go index ed06635..34a0b0f 100644 --- a/apps/base/passport/test/grpc/main.go +++ b/module/base/passport/test/grpc/main.go @@ -5,7 +5,7 @@ import ( "log" "time" - pb "git.apinb.com/bsm-apps/passport/pb" + pb "bsm/full/module/base/passport/pb" "git.apinb.com/bsm-sdk/core/utils" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" diff --git a/apps/base/passport/test/login-pwd.http b/module/base/passport/test/login-pwd.http similarity index 100% rename from apps/base/passport/test/login-pwd.http rename to module/base/passport/test/login-pwd.http diff --git a/apps/base/passport/test/readme.md b/module/base/passport/test/readme.md similarity index 100% rename from apps/base/passport/test/readme.md rename to module/base/passport/test/readme.md diff --git a/apps/base/sender/CHANGELOG.md b/module/base/sender/CHANGELOG.md similarity index 100% rename from apps/base/sender/CHANGELOG.md rename to module/base/sender/CHANGELOG.md diff --git a/apps/base/sender/Dockerfile b/module/base/sender/Dockerfile similarity index 100% rename from apps/base/sender/Dockerfile rename to module/base/sender/Dockerfile diff --git a/apps/base/sender/Makefile b/module/base/sender/Makefile similarity index 100% rename from apps/base/sender/Makefile rename to module/base/sender/Makefile diff --git a/apps/base/sender/README.md b/module/base/sender/README.md similarity index 97% rename from apps/base/sender/README.md rename to module/base/sender/README.md index 27ecdd1..e2f5417 100644 --- a/apps/base/sender/README.md +++ b/module/base/sender/README.md @@ -43,7 +43,7 @@ ```bash # 克隆项目 -git clone git.apinb.com/bsm-apps/sender.git +git clone bsm/full/module/base/sender.git cd sender # 下载依赖 @@ -414,9 +414,9 @@ curl http://localhost:12202/health 如有问题或建议，请通过以下方式联系： -- 提交 [Issue](https://git.apinb.com/bsm-apps/sender/issues) +- 提交 [Issue](https://bsm/full/module/base/sender/issues) - 发送邮件至：david.yan@qq.com -- 查看 [Wiki](https://git.apinb.com/bsm-apps/sender/wiki) 获取更多文档 +- 查看 [Wiki](https://bsm/full/module/base/sender/wiki) 获取更多文档 --- diff --git a/apps/base/sender/UPGRADE_SUMMARY.md b/module/base/sender/UPGRADE_SUMMARY.md similarity index 100% rename from apps/base/sender/UPGRADE_SUMMARY.md rename to module/base/sender/UPGRADE_SUMMARY.md diff --git a/apps/base/sender/cmd/cli/main.go b/module/base/sender/cmd/cli/main.go similarity index 100% rename from apps/base/sender/cmd/cli/main.go rename to module/base/sender/cmd/cli/main.go diff --git a/apps/base/sender/cmd/main/main.go b/module/base/sender/cmd/main/main.go similarity index 87% rename from apps/base/sender/cmd/main/main.go rename to module/base/sender/cmd/main/main.go index edc5979..3e00510 100644 --- a/apps/base/sender/cmd/main/main.go +++ b/module/base/sender/cmd/main/main.go @@ -6,9 +6,9 @@ package service import ( - "git.apinb.com/bsm-apps/sender/internal/config" - "git.apinb.com/bsm-apps/sender/internal/impl" - "git.apinb.com/bsm-apps/sender/internal/server" + "bsm/full/module/base/sender/internal/config" + "bsm/full/module/base/sender/internal/impl" + "bsm/full/module/base/sender/internal/server" "git.apinb.com/bsm-sdk/core/service" ) @@ -47,3 +47,7 @@ func Run() { // 启动服务并开始监听请求 srv.Start() } + +func main() { + Run() +} diff --git a/apps/base/sender/docker-compose.yml b/module/base/sender/docker-compose.yml similarity index 100% rename from apps/base/sender/docker-compose.yml rename to module/base/sender/docker-compose.yml diff --git a/apps/base/sender/etc/sender_dev.yaml b/module/base/sender/etc/sender_dev.yaml similarity index 100% rename from apps/base/sender/etc/sender_dev.yaml rename to module/base/sender/etc/sender_dev.yaml diff --git a/apps/base/sender/etc/sender_prod.yaml b/module/base/sender/etc/sender_prod.yaml similarity index 100% rename from apps/base/sender/etc/sender_prod.yaml rename to module/base/sender/etc/sender_prod.yaml diff --git a/apps/base/sender/etc/sender_test.yaml b/module/base/sender/etc/sender_test.yaml similarity index 100% rename from apps/base/sender/etc/sender_test.yaml rename to module/base/sender/etc/sender_test.yaml diff --git a/apps/base/sender/etc/supervisor.bsm-apps-sender.conf b/module/base/sender/etc/supervisor.bsm-apps-sender.conf similarity index 100% rename from apps/base/sender/etc/supervisor.bsm-apps-sender.conf rename to module/base/sender/etc/supervisor.bsm-apps-sender.conf diff --git a/apps/base/sender/go.mod b/module/base/sender/go.mod similarity index 73% rename from apps/base/sender/go.mod rename to module/base/sender/go.mod index 6342113..477a6ed 100644 --- a/apps/base/sender/go.mod +++ b/module/base/sender/go.mod @@ -1,4 +1,4 @@ -module git.apinb.com/bsm-apps/sender +module bsm/full/module/base/sender go 1.26.5 @@ -14,10 +14,10 @@ tool ( ) require ( - github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 - google.golang.org/grpc v1.81.1 + github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0 + google.golang.org/grpc v1.83.0 google.golang.org/protobuf v1.36.11 - gorm.io/gorm v1.31.1 + gorm.io/gorm v1.31.2 ) require ( @@ -33,10 +33,8 @@ require ( github.com/clbanning/mxj/v2 v2.7.0 // indirect github.com/coreos/go-semver v0.3.1 // indirect github.com/coreos/go-systemd/v22 v22.7.0 // indirect - github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/ditashi/jsbeautifier-go v0.0.0-20141206144643-2520a8026a9c // indirect github.com/go-sql-driver/mysql v1.10.0 // indirect - github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt/v5 v5.3.1 // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/google/uuid v1.6.0 // indirect @@ -49,30 +47,29 @@ require ( github.com/json-iterator/go v1.1.12 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/oklog/ulid/v2 v2.1.1 // indirect + github.com/oklog/ulid/v2 v2.1.2 // indirect github.com/pepabo/protoc-gen-go-client v0.3.0 // indirect - github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - github.com/redis/go-redis/v9 v9.20.0 // indirect + github.com/redis/go-redis/v9 v9.22.0 // indirect github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect github.com/tjfoc/gmsm v1.4.1 // indirect - go.etcd.io/etcd/api/v3 v3.6.12 // indirect - go.etcd.io/etcd/client/pkg/v3 v3.6.12 // indirect + go.etcd.io/etcd/api/v3 v3.7.1 // indirect + go.etcd.io/etcd/client/pkg/v3 v3.7.1 // indirect go.uber.org/atomic v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.28.0 // indirect - go.yaml.in/yaml/v3 v3.0.4 // indirect - golang.org/x/mod v0.36.0 // indirect - golang.org/x/net v0.55.0 // indirect - golang.org/x/sync v0.20.0 // indirect - golang.org/x/sys v0.45.0 // indirect - golang.org/x/text v0.37.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa // indirect + go.yaml.in/yaml/v3 v3.0.5 // indirect + golang.org/x/mod v0.37.0 // indirect + golang.org/x/net v0.57.0 // indirect + golang.org/x/sync v0.22.0 // indirect + golang.org/x/sys v0.47.0 // indirect + golang.org/x/text v0.40.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea // indirect google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.2 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect gorm.io/driver/mysql v1.6.0 // indirect - gorm.io/driver/postgres v1.6.0 // indirect + gorm.io/driver/postgres v1.6.2 // indirect ) require ( @@ -85,5 +82,7 @@ require ( github.com/spf13/cast v1.10.0 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.1.39 github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/sms v1.1.0 - go.etcd.io/etcd/client/v3 v3.6.12 + go.etcd.io/etcd/client/v3 v3.7.1 ) + +replace git.apinb.com/bsm-sdk/core => D:/work/bsm-sdk/core diff --git a/apps/base/sender/go.sum b/module/base/sender/go.sum similarity index 86% rename from apps/base/sender/go.sum rename to module/base/sender/go.sum index fc9d84e..58536b6 100644 --- a/apps/base/sender/go.sum +++ b/module/base/sender/go.sum @@ -1,8 +1,6 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= filippo.io/edwards25519 v1.2.0 h1:crnVqOiS4jqYleHd9vaKZ+HKtHfllngJIiOpNpoJsjo= filippo.io/edwards25519 v1.2.0/go.mod h1:xzAOLCNug/yB62zG1bQ8uziwrIqIuxhctzJT18Q77mc= -git.apinb.com/bsm-sdk/core v0.2.0 h1:/e9yqpsbKBrRgMiGpS3KX2O4qDLxo5V5GpPSLNGxEKw= -git.apinb.com/bsm-sdk/core v0.2.0/go.mod h1:E9T6Eboo/0Zb36BjkKbIgvFzq4fQ2Q8P/7y5zmYTI6Y= git.apinb.com/bsm-tools/protoc-gen-markdown v0.0.0-20250907131213-6c1694ce6bcb h1:GoXhkGzI5vZ9JMXCVsSRw/AGsJY0tM2aEv76YaUg2wM= git.apinb.com/bsm-tools/protoc-gen-markdown v0.0.0-20250907131213-6c1694ce6bcb/go.mod h1:l+84zWPM4F40Ppar+jLapgjRNt6XWDsr+l0vN4Jjlm4= git.apinb.com/bsm-tools/protoc-gen-slc v0.0.13 h1:RGg2R2kHz6IAD7scH6So2FlZYctFUDxqWR8i/+fMfOU= @@ -87,14 +85,12 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= -github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= -github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.4 h1:tG4xh9yMsRCAiodLVTxyrkzSZ9+o0L1Kg/+cPVcbP/8= +github.com/go-logr/logr v1.4.4/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-sql-driver/mysql v1.10.0 h1:Q+1LV8DkHJvSYAdR83XzuhDaTykuDx0l6fkXxoWCWfw= github.com/go-sql-driver/mysql v1.10.0/go.mod h1:M+cqaI7+xxXGG9swrdeUIoPG3Y3KCkF0pZej+SK+nWk= -github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= -github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt/v5 v5.3.1 h1:kYf81DTWFe7t+1VvL7eS+jKFVWaUnK9cB1qbwn63YCY= github.com/golang-jwt/jwt/v5 v5.3.1/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -122,8 +118,8 @@ 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/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gopherjs/gopherjs v0.0.0-20200217142428-fce0ec30dd00/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 h1:5VipnvEpbqr2gA2VbM+nYVbkIF28c5ZQfqCBQ5g2xfk= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0/go.mod h1:Hyl3n6Twe1hvtd9XUXDec4pTvgMSEixRuQKPTMH2bNs= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0 h1:/Tnpcb2E0Pz/tN9s3bfEY2Q8ePCEX9iuS+cneUwncnw= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0/go.mod h1:zOBXOsUaBSjKgmH4OGzV1esUpR3oUSCPYVd2cUBjKYY= 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= @@ -140,16 +136,16 @@ github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= -github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= -github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y= -github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0= +github.com/klauspost/cpuid/v2 v2.4.0 h1:S6Hrbc7+ywsr0r+RLapfGBHfyefhCTwEh3A0tV913Dw= +github.com/klauspost/cpuid/v2 v2.4.0/go.mod h1:19jmZ9mjzoF//ddRSUsv0zfBTJWh3QJh9FNxZTMrGxU= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= +github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -158,8 +154,8 @@ github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3Rllmb github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/oklog/ulid/v2 v2.1.1 h1:suPZ4ARWLOJLegGFiZZ1dFAkqzhMjL3J1TzI+5wHz8s= -github.com/oklog/ulid/v2 v2.1.1/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ= +github.com/oklog/ulid/v2 v2.1.2 h1:IEclFb9JNvzYA6MW2SCxbLzcHTVsfqm3PrqGQJH5zec= +github.com/oklog/ulid/v2 v2.1.2/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ= github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= github.com/pborman/getopt v0.0.0-20170112200414-7148bc3a4c30/go.mod h1:85jBQOZwpVEaDAr341tbn15RS4fCAsIst0qp7i8ex1o= @@ -169,8 +165,8 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/redis/go-redis/v9 v9.20.0 h1:WnQYxLkgO2xiXTCJY0ldIiI8dNqCDlQAG+AtaH7a2a0= -github.com/redis/go-redis/v9 v9.20.0/go.mod h1:v/M13XI1PVCDcm01VtPFOADfZtHf8YW3baQf57KlIkA= +github.com/redis/go-redis/v9 v9.22.0 h1:laDvpYXTJtZLloinw1fA5Kqd6HAEH2XKxOkG/PDq2F0= +github.com/redis/go-redis/v9 v9.22.0/go.mod h1:y2g0Wj8rQvuK0ELM+oxSudcLtC09JScs98I/X9gRWY4= github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0= @@ -197,28 +193,27 @@ github.com/tjfoc/gmsm v1.4.1 h1:aMe1GlZb+0bLjn+cKTPEvvn9oUEBlJitaZiiBwsbgho= github.com/tjfoc/gmsm v1.4.1/go.mod h1:j4INPkHWMrhJb38G+J6W4Tw0AbuN8Thu3PbdVYhVcTE= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.30/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/zeebo/xxh3 v1.1.0 h1:s7DLGDK45Dyfg7++yxI0khrfwq9661w9EN78eP/UZVs= github.com/zeebo/xxh3 v1.1.0/go.mod h1:IisAie1LELR4xhVinxWS5+zf1lA4p0MW4T+w+W07F5s= -go.etcd.io/etcd/api/v3 v3.6.12 h1:OLOZUKEuAA36TR48F0cIaa8FdzrWygjyfrJxXg4iDgs= -go.etcd.io/etcd/api/v3 v3.6.12/go.mod h1:p14EIQXHbuOQbVvL/WEes5uqKnxP9AgKJgpjbMVvzvE= -go.etcd.io/etcd/client/pkg/v3 v3.6.12 h1:36zzB+pQOdHbhN+kH2iJz/K8bJn0ZLtLfPPO7jozTDo= -go.etcd.io/etcd/client/pkg/v3 v3.6.12/go.mod h1:hh2+ZXtfLzs3o6mn92ntgNPBrTJJOvXqICM5g3L3DMY= -go.etcd.io/etcd/client/v3 v3.6.12 h1:kMSP6JcPZMqSJiX+TXdUIBU/4eXEZWBAaui4VihMbIc= -go.etcd.io/etcd/client/v3 v3.6.12/go.mod h1:CMs6fJWYiZQk4ytFjd4lE1diOvvRMmtbbn/alZXd3dQ= +go.etcd.io/etcd/api/v3 v3.7.1 h1:KJG0/DcWGfe3Y1otDf/fsBf0TSSgpxZ5RO/L8SFt73E= +go.etcd.io/etcd/api/v3 v3.7.1/go.mod h1:8bXIpCMeV7E3/XL0Ix123ATn3dB+0V7d9zklHbB0m78= +go.etcd.io/etcd/client/pkg/v3 v3.7.1 h1:rKYsj3pRkR0eK3yjT3XOgrhqfmIfj9pzNgxjh7mfFv4= +go.etcd.io/etcd/client/pkg/v3 v3.7.1/go.mod h1:cnzZGIUzSfjEwLC6UBVsSXlEK1eepS/JUD7wE6PLRT0= +go.etcd.io/etcd/client/v3 v3.7.1 h1:0PEMMC0KuZmVIN+RAbdqfkZ45pYTgKVtmBEbRCvZFUg= +go.etcd.io/etcd/client/v3 v3.7.1/go.mod h1:ffNqALa8tRCYhYo1F9oR489y23K39Gz+BSR3ApAGYq0= go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64= go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y= -go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I= -go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0= -go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM= -go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY= -go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg= -go.opentelemetry.io/otel/sdk v1.43.0/go.mod h1:P+IkVU3iWukmiit/Yf9AWvpyRDlUeBaRg6Y+C58QHzg= -go.opentelemetry.io/otel/sdk/metric v1.43.0 h1:S88dyqXjJkuBNLeMcVPRFXpRw2fuwdvfCGLEo89fDkw= -go.opentelemetry.io/otel/sdk/metric v1.43.0/go.mod h1:C/RJtwSEJ5hzTiUz5pXF1kILHStzb9zFlIEe85bhj6A= -go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A= -go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0= +go.opentelemetry.io/otel v1.45.0 h1:pdrWmLHofpubmArBv1LgFSv1Z0Ie/ppdZzu+kUN5EeU= +go.opentelemetry.io/otel v1.45.0/go.mod h1:XZxIqPapzEYnhNSScF5DIqXhm/rYi0FzCe2XddAwZfQ= +go.opentelemetry.io/otel/metric v1.45.0 h1:7Eg1uH7CJ5cXv9is6tnBe1FI6rj1nwUdbFypRm3br/M= +go.opentelemetry.io/otel/metric v1.45.0/go.mod h1:HAPbm1nd3p1PmFH7v2dR+6BjXxw+Lq4a2+pndMAm08s= +go.opentelemetry.io/otel/sdk v1.45.0 h1:4VVSMgQ83dUgW2aoX5f6JgLvHwIvzcuLnF9lUdCSpCw= +go.opentelemetry.io/otel/sdk v1.45.0/go.mod h1:Sr40LgXV7DsKMMJMKOhUWOgMWTfAaqvm2kF0g7ilwuA= +go.opentelemetry.io/otel/sdk/metric v1.44.0 h1:3LlKgI+VjbVsjNRFZJZAJ30WjXC5VkNRks6si09iEfI= +go.opentelemetry.io/otel/sdk/metric v1.44.0/go.mod h1:5B5pMARnXxKhltooO4xUuCBorl65a4EpnTalObqOigA= +go.opentelemetry.io/otel/trace v1.45.0 h1:l/mP6Uv7oNO7/TblbhpbgMidxhq1uO/rPsikOyVhxag= +go.opentelemetry.io/otel/trace v1.45.0/go.mod h1:qoJJA2xNMnxRrdISU/kLtfUH2wNeQbiv+jhs/CxI8bc= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= @@ -227,8 +222,8 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.28.0 h1:IZzaP1Fv73/T/pBMLk4VutPl36uNC+OSUh3JLG3FIjo= go.uber.org/zap v1.28.0/go.mod h1:rDLpOi171uODNm/mxFcuYWxDsqWSAVkFdX4XojSKg/Q= -go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= -go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= +go.yaml.in/yaml/v3 v3.0.5 h1:N6y/pJk8buWs9NY5ERU2HSMfm+IuD/OtfdAnq6kESPw= +go.yaml.in/yaml/v3 v3.0.5/go.mod h1:HVTZu1O7/Vkt2N+BFy8Zza+lnLsABggaTM2ZpNIGuKg= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191219195013-becbf705a915/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= @@ -248,14 +243,13 @@ golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTk golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= -golang.org/x/mod v0.36.0 h1:JJjpVx6myfUsUdAzZuOSTTmRE0PfZeNWzzvKrP7amb4= -golang.org/x/mod v0.36.0/go.mod h1:moc6ELqsWcOw5Ef3xVprK5ul/MvtVvkIXLziUOICjUQ= +golang.org/x/mod v0.37.0 h1:vF1DjpVEshcIqoEaauuHebaLk1O1forxjxBaVn884JQ= +golang.org/x/mod v0.37.0/go.mod h1:m8S8VeM9r4dzDwjrKO0a1sZP3YjeMamRRlD+fmR2Q/0= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -265,7 +259,6 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -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-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= @@ -278,22 +271,21 @@ golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= -golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8= -golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww= +golang.org/x/net v0.57.0 h1:K5+3DljvIuDG9/Jv9rvyMywYNFCQ9RSUY6OOTTkT+tE= +golang.org/x/net v0.57.0/go.mod h1:KpXc8iv+r3XplLAG/f7Jsf9RPszJzdR0f58q9vGOuEU= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/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-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4= -golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= +golang.org/x/sync v0.22.0 h1:SZjpbeLmrCk4xhRSZFNZW5gFUeCeFgjekvI/+gfScek= +golang.org/x/sync v0.22.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -313,8 +305,8 @@ golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY= -golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs= +golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -337,8 +329,8 @@ golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= -golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc= -golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38= +golang.org/x/text v0.40.0 h1:Ub2Z6/xjgF1WrYQz2nuITOEegKFtiIy+rieRJ5lHZKs= +golang.org/x/text v0.40.0/go.mod h1:hpnzDAfGV753zIKo+wk3u1bVKCGPbrnF7+7LBF/UHVY= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= @@ -347,8 +339,6 @@ golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200509030707-2212a7e161a5/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= @@ -356,23 +346,22 @@ golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxb golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= 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= gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4= gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa h1:Kjn0N0tCrDgiAFW+lGO4JZ3ck44CehvJQMAwj9QF0G8= -google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:q4lMZS6kskjT5HvCPrnnypcDPVJqT/f4nfxmkE7gryY= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa h1:mZHHdPZl0dbGHCflZgAq/Q468DWVFcU2whhB2KAo8fk= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= +google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea h1:Jifw/kjs/r3B0uszvls/m3c3tmZs2YHGM9C+rvxP9gY= +google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea/go.mod h1:K/+WGbmBY7aNW1HDw1fJnKYo10i0DkAX6pows00dLig= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea h1:kVhQEPTpKQahD5+JSBTfBB19wcgQTTjAIn45MBqnyHk= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.81.1 h1:VnnIIZ88UzOOKLukQi+ImGz8O1Wdp8nAGGnvOfEIWQQ= -google.golang.org/grpc v1.81.1/go.mod h1:xGH9GfzOyMTGIOXBJmXt+BX/V0kcdQbdcuwQ/zNw42I= +google.golang.org/grpc v1.83.0 h1:JeNZEKJFbQxArAMl+hiytHauacDNqJUllNfmIMmpqnQ= +google.golang.org/grpc v1.83.0/go.mod h1:kDyl6SKsiHKt0uylY5gtn5cEjkrIOhQOGDgIc4JGwzQ= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.2 h1:rgSNvqscFZ1JgV/4wH5GOsZFSFkR2Eua9As3KIr2LlM= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.2/go.mod h1:iMEtFwDlAhjDU9L5mY6U1XLwlIId/G3h+QcBHDIvrJ8= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= @@ -397,10 +386,12 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gorm.io/driver/mysql v1.6.0 h1:eNbLmNTpPpTOVZi8MMxCi2aaIm0ZpInbORNXDwyLGvg= gorm.io/driver/mysql v1.6.0/go.mod h1:D/oCC2GWK3M/dqoLxnOlaNKmXz8WNTfcS9y5ovaSqKo= -gorm.io/driver/postgres v1.6.0 h1:2dxzU8xJ+ivvqTRph34QX+WrRaJlmfyPqXmoGVjMBa4= -gorm.io/driver/postgres v1.6.0/go.mod h1:vUw0mrGgrTK+uPHEhAdV4sfFELrByKVGnaVRkXDhtWo= -gorm.io/gorm v1.31.1 h1:7CA8FTFz/gRfgqgpeKIBcervUn3xSyPUmr6B2WXJ7kg= -gorm.io/gorm v1.31.1/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs= +gorm.io/driver/postgres v1.6.2 h1:BvXQ/cNUg63q5TFNg672DmDcowZSFrNLkkA3Xe6GXq4= +gorm.io/driver/postgres v1.6.2/go.mod h1:0c4fQA44XhOklXDkgtuKqysHCycTa5i9e3EIpDGCwXk= +gorm.io/driver/sqlite v1.6.0 h1:WHRRrIiulaPiPFmDcod6prc4l2VGVWHz80KspNsxSfQ= +gorm.io/driver/sqlite v1.6.0/go.mod h1:AO9V1qIQddBESngQUKWL9yoH93HIeA1X6V633rBwyT8= +gorm.io/gorm v1.31.2 h1:3o8FXNo9v9S858gil+3LlZA1LkCOzgb4g5BL64FgaCo= +gorm.io/gorm v1.31.2/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs= gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU= gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/apps/base/sender/internal/config/config.go b/module/base/sender/internal/config/config.go similarity index 100% rename from apps/base/sender/internal/config/config.go rename to module/base/sender/internal/config/config.go diff --git a/apps/base/sender/internal/excode/ex.go b/module/base/sender/internal/excode/ex.go similarity index 100% rename from apps/base/sender/internal/excode/ex.go rename to module/base/sender/internal/excode/ex.go diff --git a/apps/base/sender/internal/impl/impl.go b/module/base/sender/internal/impl/impl.go similarity index 94% rename from apps/base/sender/internal/impl/impl.go rename to module/base/sender/internal/impl/impl.go index a623f20..017275f 100644 --- a/apps/base/sender/internal/impl/impl.go +++ b/module/base/sender/internal/impl/impl.go @@ -1,7 +1,7 @@ package impl import ( - "git.apinb.com/bsm-apps/sender/internal/config" + "bsm/full/module/base/sender/internal/config" "git.apinb.com/bsm-sdk/core/cache/redis" "git.apinb.com/bsm-sdk/core/with" cache "github.com/patrickmn/go-cache" diff --git a/apps/base/sender/internal/impl/provider.go b/module/base/sender/internal/impl/provider.go similarity index 97% rename from apps/base/sender/internal/impl/provider.go rename to module/base/sender/internal/impl/provider.go index c5a46e8..21099f7 100644 --- a/apps/base/sender/internal/impl/provider.go +++ b/module/base/sender/internal/impl/provider.go @@ -4,7 +4,7 @@ import ( "net/smtp" "strings" - "git.apinb.com/bsm-apps/sender/internal/config" + "bsm/full/module/base/sender/internal/config" AliYunClient "github.com/alibabacloud-go/darabonba-openapi/v2/client" dysmsapi "github.com/alibabacloud-go/dysmsapi-20180501/v2/client" "github.com/aliyun/credentials-go/credentials" diff --git a/apps/base/sender/internal/logic/mail/send.go b/module/base/sender/internal/logic/mail/send.go similarity index 93% rename from apps/base/sender/internal/logic/mail/send.go rename to module/base/sender/internal/logic/mail/send.go index 460fbb1..3068a45 100644 --- a/apps/base/sender/internal/logic/mail/send.go +++ b/module/base/sender/internal/logic/mail/send.go @@ -10,11 +10,11 @@ import ( "net/smtp" "strings" - "git.apinb.com/bsm-apps/sender/internal/config" - "git.apinb.com/bsm-apps/sender/internal/excode" - "git.apinb.com/bsm-apps/sender/internal/impl" - "git.apinb.com/bsm-apps/sender/internal/models" - pb "git.apinb.com/bsm-apps/sender/pb" + "bsm/full/module/base/sender/internal/config" + "bsm/full/module/base/sender/internal/excode" + "bsm/full/module/base/sender/internal/impl" + "bsm/full/module/base/sender/internal/models" + pb "bsm/full/module/base/sender/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/vars" ) diff --git a/apps/base/sender/internal/logic/sms/const.go b/module/base/sender/internal/logic/sms/const.go similarity index 100% rename from apps/base/sender/internal/logic/sms/const.go rename to module/base/sender/internal/logic/sms/const.go diff --git a/apps/base/sender/internal/logic/sms/send.go b/module/base/sender/internal/logic/sms/send.go similarity index 96% rename from apps/base/sender/internal/logic/sms/send.go rename to module/base/sender/internal/logic/sms/send.go index 470da8b..fa9b48d 100644 --- a/apps/base/sender/internal/logic/sms/send.go +++ b/module/base/sender/internal/logic/sms/send.go @@ -10,10 +10,10 @@ import ( "strings" "time" - "git.apinb.com/bsm-apps/sender/internal/config" - "git.apinb.com/bsm-apps/sender/internal/excode" - "git.apinb.com/bsm-apps/sender/internal/impl" - pb "git.apinb.com/bsm-apps/sender/pb" + "bsm/full/module/base/sender/internal/config" + "bsm/full/module/base/sender/internal/excode" + "bsm/full/module/base/sender/internal/impl" + pb "bsm/full/module/base/sender/pb" "git.apinb.com/bsm-sdk/core/cache/redis" "git.apinb.com/bsm-sdk/core/errcode" AliYunClient "github.com/alibabacloud-go/darabonba-openapi/v2/client" diff --git a/apps/base/sender/internal/logic/sms/verify.go b/module/base/sender/internal/logic/sms/verify.go similarity index 84% rename from apps/base/sender/internal/logic/sms/verify.go rename to module/base/sender/internal/logic/sms/verify.go index 23193de..1a983b5 100644 --- a/apps/base/sender/internal/logic/sms/verify.go +++ b/module/base/sender/internal/logic/sms/verify.go @@ -3,9 +3,9 @@ package sms import ( "context" - "git.apinb.com/bsm-apps/sender/internal/excode" - "git.apinb.com/bsm-apps/sender/internal/impl" - pb "git.apinb.com/bsm-apps/sender/pb" + "bsm/full/module/base/sender/internal/excode" + "bsm/full/module/base/sender/internal/impl" + pb "bsm/full/module/base/sender/pb" "git.apinb.com/bsm-sdk/core/errcode" ) diff --git a/apps/base/sender/internal/models/sender_template.go b/module/base/sender/internal/models/sender_template.go similarity index 100% rename from apps/base/sender/internal/models/sender_template.go rename to module/base/sender/internal/models/sender_template.go diff --git a/apps/base/sender/internal/server/mail_server.go b/module/base/sender/internal/server/mail_server.go similarity index 78% rename from apps/base/sender/internal/server/mail_server.go rename to module/base/sender/internal/server/mail_server.go index 0b4ad59..a831a42 100644 --- a/apps/base/sender/internal/server/mail_server.go +++ b/module/base/sender/internal/server/mail_server.go @@ -3,8 +3,8 @@ package server import ( "context" - "git.apinb.com/bsm-apps/sender/internal/logic/mail" - pb "git.apinb.com/bsm-apps/sender/pb" + "bsm/full/module/base/sender/internal/logic/mail" + pb "bsm/full/module/base/sender/pb" ) type MailServer struct { diff --git a/apps/base/sender/internal/server/new.go b/module/base/sender/internal/server/new.go similarity index 98% rename from apps/base/sender/internal/server/new.go rename to module/base/sender/internal/server/new.go index da8ded9..bec4fbd 100644 --- a/apps/base/sender/internal/server/new.go +++ b/module/base/sender/internal/server/new.go @@ -3,7 +3,7 @@ package server import ( "context" - pb "git.apinb.com/bsm-apps/sender/pb" + pb "bsm/full/module/base/sender/pb" "git.apinb.com/bsm-sdk/core/vars" gwRuntime "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "google.golang.org/grpc" diff --git a/apps/base/sender/internal/server/sms_server.go b/module/base/sender/internal/server/sms_server.go similarity index 83% rename from apps/base/sender/internal/server/sms_server.go rename to module/base/sender/internal/server/sms_server.go index 9da5881..b24d929 100644 --- a/apps/base/sender/internal/server/sms_server.go +++ b/module/base/sender/internal/server/sms_server.go @@ -3,8 +3,8 @@ package server import ( "context" - "git.apinb.com/bsm-apps/sender/internal/logic/sms" - pb "git.apinb.com/bsm-apps/sender/pb" + "bsm/full/module/base/sender/internal/logic/sms" + pb "bsm/full/module/base/sender/pb" ) type SmsServer struct { diff --git a/apps/base/sender/pb/mail.pb.go b/module/base/sender/pb/mail.pb.go similarity index 100% rename from apps/base/sender/pb/mail.pb.go rename to module/base/sender/pb/mail.pb.go diff --git a/apps/base/sender/pb/mail.pb.gw.go b/module/base/sender/pb/mail.pb.gw.go similarity index 100% rename from apps/base/sender/pb/mail.pb.gw.go rename to module/base/sender/pb/mail.pb.gw.go diff --git a/apps/base/sender/pb/mail_grpc.pb.go b/module/base/sender/pb/mail_grpc.pb.go similarity index 100% rename from apps/base/sender/pb/mail_grpc.pb.go rename to module/base/sender/pb/mail_grpc.pb.go diff --git a/apps/base/sender/pb/push_xiaomi.pb.go b/module/base/sender/pb/push_xiaomi.pb.go similarity index 100% rename from apps/base/sender/pb/push_xiaomi.pb.go rename to module/base/sender/pb/push_xiaomi.pb.go diff --git a/apps/base/sender/pb/push_xiaomi.pb.gw.go b/module/base/sender/pb/push_xiaomi.pb.gw.go similarity index 100% rename from apps/base/sender/pb/push_xiaomi.pb.gw.go rename to module/base/sender/pb/push_xiaomi.pb.gw.go diff --git a/apps/base/sender/pb/push_xiaomi_grpc.pb.go b/module/base/sender/pb/push_xiaomi_grpc.pb.go similarity index 100% rename from apps/base/sender/pb/push_xiaomi_grpc.pb.go rename to module/base/sender/pb/push_xiaomi_grpc.pb.go diff --git a/apps/base/sender/pb/sms.pb.go b/module/base/sender/pb/sms.pb.go similarity index 100% rename from apps/base/sender/pb/sms.pb.go rename to module/base/sender/pb/sms.pb.go diff --git a/apps/base/sender/pb/sms.pb.gw.go b/module/base/sender/pb/sms.pb.gw.go similarity index 100% rename from apps/base/sender/pb/sms.pb.gw.go rename to module/base/sender/pb/sms.pb.gw.go diff --git a/apps/base/sender/pb/sms_grpc.pb.go b/module/base/sender/pb/sms_grpc.pb.go similarity index 100% rename from apps/base/sender/pb/sms_grpc.pb.go rename to module/base/sender/pb/sms_grpc.pb.go diff --git a/apps/base/sender/proto/mail.proto b/module/base/sender/proto/mail.proto similarity index 100% rename from apps/base/sender/proto/mail.proto rename to module/base/sender/proto/mail.proto diff --git a/apps/base/sender/proto/sms.proto b/module/base/sender/proto/sms.proto similarity index 100% rename from apps/base/sender/proto/sms.proto rename to module/base/sender/proto/sms.proto diff --git a/apps/base/sender/scripts/filebeat.yaml b/module/base/sender/scripts/filebeat.yaml similarity index 100% rename from apps/base/sender/scripts/filebeat.yaml rename to module/base/sender/scripts/filebeat.yaml diff --git a/apps/base/sender/scripts/lint.sh b/module/base/sender/scripts/lint.sh similarity index 100% rename from apps/base/sender/scripts/lint.sh rename to module/base/sender/scripts/lint.sh diff --git a/apps/base/sender/swagger/sender.swagger.json b/module/base/sender/swagger/sender.swagger.json similarity index 100% rename from apps/base/sender/swagger/sender.swagger.json rename to module/base/sender/swagger/sender.swagger.json diff --git a/apps/base/sender/test/grpc/mail_test.go b/module/base/sender/test/grpc/mail_test.go similarity index 96% rename from apps/base/sender/test/grpc/mail_test.go rename to module/base/sender/test/grpc/mail_test.go index 5575cd7..79248ce 100644 --- a/apps/base/sender/test/grpc/mail_test.go +++ b/module/base/sender/test/grpc/mail_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - pb "git.apinb.com/bsm-apps/sender/pb" + pb "bsm/full/module/base/sender/pb" "git.apinb.com/bsm-sdk/core/utils" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" diff --git a/apps/base/sender/test/grpc/sms_test.go b/module/base/sender/test/grpc/sms_test.go similarity index 95% rename from apps/base/sender/test/grpc/sms_test.go rename to module/base/sender/test/grpc/sms_test.go index ac4b9b5..7c5fba5 100644 --- a/apps/base/sender/test/grpc/sms_test.go +++ b/module/base/sender/test/grpc/sms_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - pb "git.apinb.com/bsm-apps/sender/pb" + pb "bsm/full/module/base/sender/pb" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/apps/base/sender/test/http/mail_send.http b/module/base/sender/test/http/mail_send.http similarity index 100% rename from apps/base/sender/test/http/mail_send.http rename to module/base/sender/test/http/mail_send.http diff --git a/apps/base/sender/test/http/sms_send.http b/module/base/sender/test/http/sms_send.http similarity index 100% rename from apps/base/sender/test/http/sms_send.http rename to module/base/sender/test/http/sms_send.http diff --git a/apps/base/sender/test/http/sms_verify.http b/module/base/sender/test/http/sms_verify.http similarity index 100% rename from apps/base/sender/test/http/sms_verify.http rename to module/base/sender/test/http/sms_verify.http diff --git a/apps/ec/address/README.md b/module/ec/address/README.md similarity index 100% rename from apps/ec/address/README.md rename to module/ec/address/README.md diff --git a/apps/ec/address/cmd/cli/main.go b/module/ec/address/cmd/cli/main.go similarity index 100% rename from apps/ec/address/cmd/cli/main.go rename to module/ec/address/cmd/cli/main.go diff --git a/apps/ec/address/cmd/main/main.go b/module/ec/address/cmd/main/main.go similarity index 78% rename from apps/ec/address/cmd/main/main.go rename to module/ec/address/cmd/main/main.go index 2b78353..4fdece9 100644 --- a/apps/ec/address/cmd/main/main.go +++ b/module/ec/address/cmd/main/main.go @@ -5,9 +5,9 @@ package service import ( - "git.apinb.com/bsm-ec/address/internal/config" - "git.apinb.com/bsm-ec/address/internal/impl" - "git.apinb.com/bsm-ec/address/internal/server" + "bsm/full/module/ec/address/internal/config" + "bsm/full/module/ec/address/internal/impl" + "bsm/full/module/ec/address/internal/server" "git.apinb.com/bsm-sdk/core/service" ) @@ -39,3 +39,7 @@ func Run() { // 启动服务 srv.Start() } + +func main() { + Run() +} diff --git a/apps/ec/address/etc/address_dev.yaml b/module/ec/address/etc/address_dev.yaml similarity index 100% rename from apps/ec/address/etc/address_dev.yaml rename to module/ec/address/etc/address_dev.yaml diff --git a/apps/ec/address/etc/address_prod.yaml b/module/ec/address/etc/address_prod.yaml similarity index 100% rename from apps/ec/address/etc/address_prod.yaml rename to module/ec/address/etc/address_prod.yaml diff --git a/apps/ec/address/etc/address_test.yaml b/module/ec/address/etc/address_test.yaml similarity index 100% rename from apps/ec/address/etc/address_test.yaml rename to module/ec/address/etc/address_test.yaml diff --git a/apps/ec/address/etc/supervisor.bsm-ec-address.conf b/module/ec/address/etc/supervisor.bsm-ec-address.conf similarity index 100% rename from apps/ec/address/etc/supervisor.bsm-ec-address.conf rename to module/ec/address/etc/supervisor.bsm-ec-address.conf diff --git a/apps/ec/market/go.mod b/module/ec/address/go.mod similarity index 60% rename from apps/ec/market/go.mod rename to module/ec/address/go.mod index 6dd5408..5e5304f 100644 --- a/apps/ec/market/go.mod +++ b/module/ec/address/go.mod @@ -1,4 +1,4 @@ -module git.apinb.com/bsm-ec/market +module bsm/full/module/ec/address go 1.26.5 @@ -13,13 +13,13 @@ tool ( require ( git.apinb.com/bsm-sdk/core v0.2.0 - github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 - go.etcd.io/etcd/client/pkg/v3 v3.6.12 - go.etcd.io/etcd/client/v3 v3.6.12 - google.golang.org/grpc v1.81.1 + github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0 + go.etcd.io/etcd/client/pkg/v3 v3.7.1 + go.etcd.io/etcd/client/v3 v3.7.1 + google.golang.org/grpc v1.83.0 google.golang.org/protobuf v1.36.11 gorm.io/driver/mysql v1.6.0 - gorm.io/gorm v1.31.1 + gorm.io/gorm v1.31.2 ) require ( @@ -29,9 +29,7 @@ require ( github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/coreos/go-semver v0.3.1 // indirect github.com/coreos/go-systemd/v22 v22.7.0 // indirect - github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/go-sql-driver/mysql v1.10.0 // indirect - github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt/v5 v5.3.1 // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/google/uuid v1.6.0 // indirect @@ -41,23 +39,24 @@ require ( github.com/jackc/puddle/v2 v2.2.2 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect - github.com/oklog/ulid/v2 v2.1.1 // indirect - github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - github.com/redis/go-redis/v9 v9.20.0 // indirect + github.com/oklog/ulid/v2 v2.1.2 // indirect + github.com/redis/go-redis/v9 v9.22.0 // indirect github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect - go.etcd.io/etcd/api/v3 v3.6.12 // indirect + go.etcd.io/etcd/api/v3 v3.7.1 // indirect go.uber.org/atomic v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.28.0 // indirect - go.yaml.in/yaml/v3 v3.0.4 // indirect - golang.org/x/mod v0.36.0 // indirect - golang.org/x/net v0.55.0 // indirect - golang.org/x/sync v0.20.0 // indirect - golang.org/x/sys v0.45.0 // indirect - golang.org/x/text v0.37.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa // indirect + go.yaml.in/yaml/v3 v3.0.5 // indirect + golang.org/x/mod v0.37.0 // indirect + golang.org/x/net v0.57.0 // indirect + golang.org/x/sync v0.22.0 // indirect + golang.org/x/sys v0.47.0 // indirect + golang.org/x/text v0.40.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea // indirect google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - gorm.io/driver/postgres v1.6.0 // indirect + gorm.io/driver/postgres v1.6.2 // indirect ) + +replace git.apinb.com/bsm-sdk/core => D:/work/bsm-sdk/core diff --git a/apps/ec/market/go.sum b/module/ec/address/go.sum similarity index 51% rename from apps/ec/market/go.sum rename to module/ec/address/go.sum index b65c077..09e7b42 100644 --- a/apps/ec/market/go.sum +++ b/module/ec/address/go.sum @@ -1,7 +1,5 @@ filippo.io/edwards25519 v1.2.0 h1:crnVqOiS4jqYleHd9vaKZ+HKtHfllngJIiOpNpoJsjo= filippo.io/edwards25519 v1.2.0/go.mod h1:xzAOLCNug/yB62zG1bQ8uziwrIqIuxhctzJT18Q77mc= -git.apinb.com/bsm-sdk/core v0.2.0 h1:/e9yqpsbKBrRgMiGpS3KX2O4qDLxo5V5GpPSLNGxEKw= -git.apinb.com/bsm-sdk/core v0.2.0/go.mod h1:E9T6Eboo/0Zb36BjkKbIgvFzq4fQ2Q8P/7y5zmYTI6Y= git.apinb.com/bsm-tools/protoc-gen-slc v0.0.13 h1:RGg2R2kHz6IAD7scH6So2FlZYctFUDxqWR8i/+fMfOU= git.apinb.com/bsm-tools/protoc-gen-slc v0.0.13/go.mod h1:NpJaupVAxmyBleRMAug4mGS6BQV2E32rtuiqQzj1b+A= git.apinb.com/bsm-tools/protoc-gen-ts v0.0.2 h1:T9C1kY6iIHl5cZ7xyNgV2xlPNWxXmaWfTbD8AzpBB9M= @@ -19,14 +17,12 @@ github.com/coreos/go-systemd/v22 v22.7.0/go.mod h1:xNUYtjHu2EDXbsxz1i41wouACIwT7 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= -github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.4 h1:tG4xh9yMsRCAiodLVTxyrkzSZ9+o0L1Kg/+cPVcbP/8= +github.com/go-logr/logr v1.4.4/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-sql-driver/mysql v1.10.0 h1:Q+1LV8DkHJvSYAdR83XzuhDaTykuDx0l6fkXxoWCWfw= github.com/go-sql-driver/mysql v1.10.0/go.mod h1:M+cqaI7+xxXGG9swrdeUIoPG3Y3KCkF0pZej+SK+nWk= -github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= -github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt/v5 v5.3.1 h1:kYf81DTWFe7t+1VvL7eS+jKFVWaUnK9cB1qbwn63YCY= github.com/golang-jwt/jwt/v5 v5.3.1/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= @@ -35,8 +31,8 @@ github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= 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/grpc-ecosystem/grpc-gateway/v2 v2.29.0 h1:5VipnvEpbqr2gA2VbM+nYVbkIF28c5ZQfqCBQ5g2xfk= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0/go.mod h1:Hyl3n6Twe1hvtd9XUXDec4pTvgMSEixRuQKPTMH2bNs= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0 h1:/Tnpcb2E0Pz/tN9s3bfEY2Q8ePCEX9iuS+cneUwncnw= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0/go.mod h1:zOBXOsUaBSjKgmH4OGzV1esUpR3oUSCPYVd2cUBjKYY= 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= @@ -49,22 +45,22 @@ github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= -github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= -github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y= -github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0= +github.com/klauspost/cpuid/v2 v2.4.0 h1:S6Hrbc7+ywsr0r+RLapfGBHfyefhCTwEh3A0tV913Dw= +github.com/klauspost/cpuid/v2 v2.4.0/go.mod h1:19jmZ9mjzoF//ddRSUsv0zfBTJWh3QJh9FNxZTMrGxU= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/oklog/ulid/v2 v2.1.1 h1:suPZ4ARWLOJLegGFiZZ1dFAkqzhMjL3J1TzI+5wHz8s= -github.com/oklog/ulid/v2 v2.1.1/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ= +github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= +github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= +github.com/oklog/ulid/v2 v2.1.2 h1:IEclFb9JNvzYA6MW2SCxbLzcHTVsfqm3PrqGQJH5zec= +github.com/oklog/ulid/v2 v2.1.2/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ= github.com/pborman/getopt v0.0.0-20170112200414-7148bc3a4c30/go.mod h1:85jBQOZwpVEaDAr341tbn15RS4fCAsIst0qp7i8ex1o= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/redis/go-redis/v9 v9.20.0 h1:WnQYxLkgO2xiXTCJY0ldIiI8dNqCDlQAG+AtaH7a2a0= -github.com/redis/go-redis/v9 v9.20.0/go.mod h1:v/M13XI1PVCDcm01VtPFOADfZtHf8YW3baQf57KlIkA= +github.com/redis/go-redis/v9 v9.22.0 h1:laDvpYXTJtZLloinw1fA5Kqd6HAEH2XKxOkG/PDq2F0= +github.com/redis/go-redis/v9 v9.22.0/go.mod h1:y2g0Wj8rQvuK0ELM+oxSudcLtC09JScs98I/X9gRWY4= github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0= @@ -74,28 +70,26 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= -github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/zeebo/xxh3 v1.1.0 h1:s7DLGDK45Dyfg7++yxI0khrfwq9661w9EN78eP/UZVs= github.com/zeebo/xxh3 v1.1.0/go.mod h1:IisAie1LELR4xhVinxWS5+zf1lA4p0MW4T+w+W07F5s= -go.etcd.io/etcd/api/v3 v3.6.12 h1:OLOZUKEuAA36TR48F0cIaa8FdzrWygjyfrJxXg4iDgs= -go.etcd.io/etcd/api/v3 v3.6.12/go.mod h1:p14EIQXHbuOQbVvL/WEes5uqKnxP9AgKJgpjbMVvzvE= -go.etcd.io/etcd/client/pkg/v3 v3.6.12 h1:36zzB+pQOdHbhN+kH2iJz/K8bJn0ZLtLfPPO7jozTDo= -go.etcd.io/etcd/client/pkg/v3 v3.6.12/go.mod h1:hh2+ZXtfLzs3o6mn92ntgNPBrTJJOvXqICM5g3L3DMY= -go.etcd.io/etcd/client/v3 v3.6.12 h1:kMSP6JcPZMqSJiX+TXdUIBU/4eXEZWBAaui4VihMbIc= -go.etcd.io/etcd/client/v3 v3.6.12/go.mod h1:CMs6fJWYiZQk4ytFjd4lE1diOvvRMmtbbn/alZXd3dQ= +go.etcd.io/etcd/api/v3 v3.7.1 h1:KJG0/DcWGfe3Y1otDf/fsBf0TSSgpxZ5RO/L8SFt73E= +go.etcd.io/etcd/api/v3 v3.7.1/go.mod h1:8bXIpCMeV7E3/XL0Ix123ATn3dB+0V7d9zklHbB0m78= +go.etcd.io/etcd/client/pkg/v3 v3.7.1 h1:rKYsj3pRkR0eK3yjT3XOgrhqfmIfj9pzNgxjh7mfFv4= +go.etcd.io/etcd/client/pkg/v3 v3.7.1/go.mod h1:cnzZGIUzSfjEwLC6UBVsSXlEK1eepS/JUD7wE6PLRT0= +go.etcd.io/etcd/client/v3 v3.7.1 h1:0PEMMC0KuZmVIN+RAbdqfkZ45pYTgKVtmBEbRCvZFUg= +go.etcd.io/etcd/client/v3 v3.7.1/go.mod h1:ffNqALa8tRCYhYo1F9oR489y23K39Gz+BSR3ApAGYq0= go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64= go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y= -go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I= -go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0= -go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM= -go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY= -go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg= -go.opentelemetry.io/otel/sdk v1.43.0/go.mod h1:P+IkVU3iWukmiit/Yf9AWvpyRDlUeBaRg6Y+C58QHzg= -go.opentelemetry.io/otel/sdk/metric v1.43.0 h1:S88dyqXjJkuBNLeMcVPRFXpRw2fuwdvfCGLEo89fDkw= -go.opentelemetry.io/otel/sdk/metric v1.43.0/go.mod h1:C/RJtwSEJ5hzTiUz5pXF1kILHStzb9zFlIEe85bhj6A= -go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A= -go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0= +go.opentelemetry.io/otel v1.45.0 h1:pdrWmLHofpubmArBv1LgFSv1Z0Ie/ppdZzu+kUN5EeU= +go.opentelemetry.io/otel v1.45.0/go.mod h1:XZxIqPapzEYnhNSScF5DIqXhm/rYi0FzCe2XddAwZfQ= +go.opentelemetry.io/otel/metric v1.45.0 h1:7Eg1uH7CJ5cXv9is6tnBe1FI6rj1nwUdbFypRm3br/M= +go.opentelemetry.io/otel/metric v1.45.0/go.mod h1:HAPbm1nd3p1PmFH7v2dR+6BjXxw+Lq4a2+pndMAm08s= +go.opentelemetry.io/otel/sdk v1.45.0 h1:4VVSMgQ83dUgW2aoX5f6JgLvHwIvzcuLnF9lUdCSpCw= +go.opentelemetry.io/otel/sdk v1.45.0/go.mod h1:Sr40LgXV7DsKMMJMKOhUWOgMWTfAaqvm2kF0g7ilwuA= +go.opentelemetry.io/otel/sdk/metric v1.44.0 h1:3LlKgI+VjbVsjNRFZJZAJ30WjXC5VkNRks6si09iEfI= +go.opentelemetry.io/otel/sdk/metric v1.44.0/go.mod h1:5B5pMARnXxKhltooO4xUuCBorl65a4EpnTalObqOigA= +go.opentelemetry.io/otel/trace v1.45.0 h1:l/mP6Uv7oNO7/TblbhpbgMidxhq1uO/rPsikOyVhxag= +go.opentelemetry.io/otel/trace v1.45.0/go.mod h1:qoJJA2xNMnxRrdISU/kLtfUH2wNeQbiv+jhs/CxI8bc= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= @@ -104,51 +98,26 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.28.0 h1:IZzaP1Fv73/T/pBMLk4VutPl36uNC+OSUh3JLG3FIjo= go.uber.org/zap v1.28.0/go.mod h1:rDLpOi171uODNm/mxFcuYWxDsqWSAVkFdX4XojSKg/Q= -go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= -go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.36.0 h1:JJjpVx6myfUsUdAzZuOSTTmRE0PfZeNWzzvKrP7amb4= -golang.org/x/mod v0.36.0/go.mod h1:moc6ELqsWcOw5Ef3xVprK5ul/MvtVvkIXLziUOICjUQ= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8= -golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -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.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4= -golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY= -golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc= -golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -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= +go.yaml.in/yaml/v3 v3.0.5 h1:N6y/pJk8buWs9NY5ERU2HSMfm+IuD/OtfdAnq6kESPw= +go.yaml.in/yaml/v3 v3.0.5/go.mod h1:HVTZu1O7/Vkt2N+BFy8Zza+lnLsABggaTM2ZpNIGuKg= +golang.org/x/mod v0.37.0 h1:vF1DjpVEshcIqoEaauuHebaLk1O1forxjxBaVn884JQ= +golang.org/x/mod v0.37.0/go.mod h1:m8S8VeM9r4dzDwjrKO0a1sZP3YjeMamRRlD+fmR2Q/0= +golang.org/x/net v0.57.0 h1:K5+3DljvIuDG9/Jv9rvyMywYNFCQ9RSUY6OOTTkT+tE= +golang.org/x/net v0.57.0/go.mod h1:KpXc8iv+r3XplLAG/f7Jsf9RPszJzdR0f58q9vGOuEU= +golang.org/x/sync v0.22.0 h1:SZjpbeLmrCk4xhRSZFNZW5gFUeCeFgjekvI/+gfScek= +golang.org/x/sync v0.22.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= +golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs= +golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +golang.org/x/text v0.40.0 h1:Ub2Z6/xjgF1WrYQz2nuITOEegKFtiIy+rieRJ5lHZKs= +golang.org/x/text v0.40.0/go.mod h1:hpnzDAfGV753zIKo+wk3u1bVKCGPbrnF7+7LBF/UHVY= gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4= gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E= -google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa h1:Kjn0N0tCrDgiAFW+lGO4JZ3ck44CehvJQMAwj9QF0G8= -google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:q4lMZS6kskjT5HvCPrnnypcDPVJqT/f4nfxmkE7gryY= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa h1:mZHHdPZl0dbGHCflZgAq/Q468DWVFcU2whhB2KAo8fk= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= -google.golang.org/grpc v1.81.1 h1:VnnIIZ88UzOOKLukQi+ImGz8O1Wdp8nAGGnvOfEIWQQ= -google.golang.org/grpc v1.81.1/go.mod h1:xGH9GfzOyMTGIOXBJmXt+BX/V0kcdQbdcuwQ/zNw42I= +google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea h1:Jifw/kjs/r3B0uszvls/m3c3tmZs2YHGM9C+rvxP9gY= +google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea/go.mod h1:K/+WGbmBY7aNW1HDw1fJnKYo10i0DkAX6pows00dLig= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea h1:kVhQEPTpKQahD5+JSBTfBB19wcgQTTjAIn45MBqnyHk= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= +google.golang.org/grpc v1.83.0 h1:JeNZEKJFbQxArAMl+hiytHauacDNqJUllNfmIMmpqnQ= +google.golang.org/grpc v1.83.0/go.mod h1:kDyl6SKsiHKt0uylY5gtn5cEjkrIOhQOGDgIc4JGwzQ= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.2 h1:rgSNvqscFZ1JgV/4wH5GOsZFSFkR2Eua9As3KIr2LlM= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.2/go.mod h1:iMEtFwDlAhjDU9L5mY6U1XLwlIId/G3h+QcBHDIvrJ8= google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE= @@ -161,9 +130,11 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gorm.io/driver/mysql v1.6.0 h1:eNbLmNTpPpTOVZi8MMxCi2aaIm0ZpInbORNXDwyLGvg= gorm.io/driver/mysql v1.6.0/go.mod h1:D/oCC2GWK3M/dqoLxnOlaNKmXz8WNTfcS9y5ovaSqKo= -gorm.io/driver/postgres v1.6.0 h1:2dxzU8xJ+ivvqTRph34QX+WrRaJlmfyPqXmoGVjMBa4= -gorm.io/driver/postgres v1.6.0/go.mod h1:vUw0mrGgrTK+uPHEhAdV4sfFELrByKVGnaVRkXDhtWo= -gorm.io/gorm v1.31.1 h1:7CA8FTFz/gRfgqgpeKIBcervUn3xSyPUmr6B2WXJ7kg= -gorm.io/gorm v1.31.1/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs= +gorm.io/driver/postgres v1.6.2 h1:BvXQ/cNUg63q5TFNg672DmDcowZSFrNLkkA3Xe6GXq4= +gorm.io/driver/postgres v1.6.2/go.mod h1:0c4fQA44XhOklXDkgtuKqysHCycTa5i9e3EIpDGCwXk= +gorm.io/driver/sqlite v1.6.0 h1:WHRRrIiulaPiPFmDcod6prc4l2VGVWHz80KspNsxSfQ= +gorm.io/driver/sqlite v1.6.0/go.mod h1:AO9V1qIQddBESngQUKWL9yoH93HIeA1X6V633rBwyT8= +gorm.io/gorm v1.31.2 h1:3o8FXNo9v9S858gil+3LlZA1LkCOzgb4g5BL64FgaCo= +gorm.io/gorm v1.31.2/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs= gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU= gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU= diff --git a/apps/ec/address/internal/config/config.go b/module/ec/address/internal/config/config.go similarity index 100% rename from apps/ec/address/internal/config/config.go rename to module/ec/address/internal/config/config.go diff --git a/apps/ec/address/internal/impl/impl.go b/module/ec/address/internal/impl/impl.go similarity index 100% rename from apps/ec/address/internal/impl/impl.go rename to module/ec/address/internal/impl/impl.go diff --git a/apps/ec/order/internal/impl/with.go b/module/ec/address/internal/impl/with.go similarity index 95% rename from apps/ec/order/internal/impl/with.go rename to module/ec/address/internal/impl/with.go index 24368e2..4b3f0ce 100644 --- a/apps/ec/order/internal/impl/with.go +++ b/module/ec/address/internal/impl/with.go @@ -3,8 +3,8 @@ package impl import ( "time" - "git.apinb.com/bsm-ec/order/internal/config" - "git.apinb.com/bsm-ec/order/internal/models" + "bsm/full/module/ec/address/internal/config" + "bsm/full/module/ec/address/internal/models" "git.apinb.com/bsm-sdk/core/cache/redis" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" diff --git a/apps/ec/address/internal/logic/library/create.go b/module/ec/address/internal/logic/library/create.go similarity index 93% rename from apps/ec/address/internal/logic/library/create.go rename to module/ec/address/internal/logic/library/create.go index 29c1504..dec3f7c 100644 --- a/apps/ec/address/internal/logic/library/create.go +++ b/module/ec/address/internal/logic/library/create.go @@ -4,8 +4,8 @@ import ( "context" "time" - "git.apinb.com/bsm-ec/address/internal/models" - pb "git.apinb.com/bsm-ec/address/pb" + "bsm/full/module/ec/address/internal/models" + pb "bsm/full/module/ec/address/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/address/internal/logic/library/delete.go b/module/ec/address/internal/logic/library/delete.go similarity index 88% rename from apps/ec/address/internal/logic/library/delete.go rename to module/ec/address/internal/logic/library/delete.go index 02d64e2..0ef50d5 100644 --- a/apps/ec/address/internal/logic/library/delete.go +++ b/module/ec/address/internal/logic/library/delete.go @@ -4,8 +4,8 @@ import ( "context" "time" - "git.apinb.com/bsm-ec/address/internal/models" - pb "git.apinb.com/bsm-ec/address/pb" + "bsm/full/module/ec/address/internal/models" + pb "bsm/full/module/ec/address/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/address/internal/logic/library/fetch.go b/module/ec/address/internal/logic/library/fetch.go similarity index 93% rename from apps/ec/address/internal/logic/library/fetch.go rename to module/ec/address/internal/logic/library/fetch.go index 58963ed..b0f514c 100644 --- a/apps/ec/address/internal/logic/library/fetch.go +++ b/module/ec/address/internal/logic/library/fetch.go @@ -3,8 +3,8 @@ package library import ( "context" - "git.apinb.com/bsm-ec/address/internal/models" - pb "git.apinb.com/bsm-ec/address/pb" + "bsm/full/module/ec/address/internal/models" + pb "bsm/full/module/ec/address/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/address/internal/logic/library/get.go b/module/ec/address/internal/logic/library/get.go similarity index 92% rename from apps/ec/address/internal/logic/library/get.go rename to module/ec/address/internal/logic/library/get.go index 3bce052..bc3d3e7 100644 --- a/apps/ec/address/internal/logic/library/get.go +++ b/module/ec/address/internal/logic/library/get.go @@ -4,8 +4,8 @@ import ( "context" "errors" - "git.apinb.com/bsm-ec/address/internal/models" - pb "git.apinb.com/bsm-ec/address/pb" + "bsm/full/module/ec/address/internal/models" + pb "bsm/full/module/ec/address/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/address/internal/logic/library/modify.go b/module/ec/address/internal/logic/library/modify.go similarity index 92% rename from apps/ec/address/internal/logic/library/modify.go rename to module/ec/address/internal/logic/library/modify.go index 773aabd..fba5480 100644 --- a/apps/ec/address/internal/logic/library/modify.go +++ b/module/ec/address/internal/logic/library/modify.go @@ -4,8 +4,8 @@ import ( "context" "time" - "git.apinb.com/bsm-ec/address/internal/models" - pb "git.apinb.com/bsm-ec/address/pb" + "bsm/full/module/ec/address/internal/models" + pb "bsm/full/module/ec/address/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/address/internal/models/address_library.go b/module/ec/address/internal/models/address_library.go similarity index 100% rename from apps/ec/address/internal/models/address_library.go rename to module/ec/address/internal/models/address_library.go diff --git a/apps/ec/address/internal/models/impl.go b/module/ec/address/internal/models/impl.go similarity index 100% rename from apps/ec/address/internal/models/impl.go rename to module/ec/address/internal/models/impl.go diff --git a/apps/ec/address/internal/models/query.go b/module/ec/address/internal/models/query.go similarity index 100% rename from apps/ec/address/internal/models/query.go rename to module/ec/address/internal/models/query.go diff --git a/apps/ec/address/internal/server/library_server.go b/module/ec/address/internal/server/library_server.go similarity index 91% rename from apps/ec/address/internal/server/library_server.go rename to module/ec/address/internal/server/library_server.go index cfbf6db..b1baa6a 100644 --- a/apps/ec/address/internal/server/library_server.go +++ b/module/ec/address/internal/server/library_server.go @@ -3,8 +3,8 @@ package server import ( "context" - "git.apinb.com/bsm-ec/address/internal/logic/library" - pb "git.apinb.com/bsm-ec/address/pb" + "bsm/full/module/ec/address/internal/logic/library" + pb "bsm/full/module/ec/address/pb" ) type LibraryServer struct { diff --git a/apps/ec/address/internal/server/new.go b/module/ec/address/internal/server/new.go similarity index 97% rename from apps/ec/address/internal/server/new.go rename to module/ec/address/internal/server/new.go index b776e40..b26200a 100644 --- a/apps/ec/address/internal/server/new.go +++ b/module/ec/address/internal/server/new.go @@ -3,7 +3,7 @@ package server import ( "context" - pb "git.apinb.com/bsm-ec/address/pb" + pb "bsm/full/module/ec/address/pb" "git.apinb.com/bsm-sdk/core/vars" gwRuntime "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "google.golang.org/grpc" diff --git a/apps/ec/address/pb/address.pb.go b/module/ec/address/pb/address.pb.go similarity index 100% rename from apps/ec/address/pb/address.pb.go rename to module/ec/address/pb/address.pb.go diff --git a/apps/ec/address/pb/address.pb.gw.go b/module/ec/address/pb/address.pb.gw.go similarity index 100% rename from apps/ec/address/pb/address.pb.gw.go rename to module/ec/address/pb/address.pb.gw.go diff --git a/apps/ec/address/pb/address_grpc.pb.go b/module/ec/address/pb/address_grpc.pb.go similarity index 100% rename from apps/ec/address/pb/address_grpc.pb.go rename to module/ec/address/pb/address_grpc.pb.go diff --git a/apps/ec/address/proto/address.proto b/module/ec/address/proto/address.proto similarity index 100% rename from apps/ec/address/proto/address.proto rename to module/ec/address/proto/address.proto diff --git a/apps/ec/address/scripts/filebeat.yaml b/module/ec/address/scripts/filebeat.yaml similarity index 100% rename from apps/ec/address/scripts/filebeat.yaml rename to module/ec/address/scripts/filebeat.yaml diff --git a/apps/ec/address/scripts/lint.sh b/module/ec/address/scripts/lint.sh similarity index 100% rename from apps/ec/address/scripts/lint.sh rename to module/ec/address/scripts/lint.sh diff --git a/apps/ec/address/sdk/typescript/address/const.ts b/module/ec/address/sdk/typescript/address/const.ts similarity index 100% rename from apps/ec/address/sdk/typescript/address/const.ts rename to module/ec/address/sdk/typescript/address/const.ts diff --git a/apps/ec/address/sdk/typescript/address/index.ts b/module/ec/address/sdk/typescript/address/index.ts similarity index 100% rename from apps/ec/address/sdk/typescript/address/index.ts rename to module/ec/address/sdk/typescript/address/index.ts diff --git a/apps/ec/address/swagger/sample.swagger.json b/module/ec/address/swagger/sample.swagger.json similarity index 100% rename from apps/ec/address/swagger/sample.swagger.json rename to module/ec/address/swagger/sample.swagger.json diff --git a/apps/ec/address/test/library/create.http b/module/ec/address/test/library/create.http similarity index 100% rename from apps/ec/address/test/library/create.http rename to module/ec/address/test/library/create.http diff --git a/apps/ec/address/test/library/get.http b/module/ec/address/test/library/get.http similarity index 100% rename from apps/ec/address/test/library/get.http rename to module/ec/address/test/library/get.http diff --git a/apps/ec/address/test/library/modify.http b/module/ec/address/test/library/modify.http similarity index 100% rename from apps/ec/address/test/library/modify.http rename to module/ec/address/test/library/modify.http diff --git a/apps/ec/address/test/rpc/rpc.go b/module/ec/address/test/rpc/rpc.go similarity index 100% rename from apps/ec/address/test/rpc/rpc.go rename to module/ec/address/test/rpc/rpc.go diff --git a/apps/ec/delivery/.actions b/module/ec/delivery/.actions similarity index 100% rename from apps/ec/delivery/.actions rename to module/ec/delivery/.actions diff --git a/apps/ec/delivery/README.md b/module/ec/delivery/README.md similarity index 100% rename from apps/ec/delivery/README.md rename to module/ec/delivery/README.md diff --git a/apps/ec/delivery/cmd/main.go b/module/ec/delivery/cmd/main.go similarity index 64% rename from apps/ec/delivery/cmd/main.go rename to module/ec/delivery/cmd/main.go index 8a33dc1..5dc4657 100644 --- a/apps/ec/delivery/cmd/main.go +++ b/module/ec/delivery/cmd/main.go @@ -1,18 +1,18 @@ package service import ( - "git.apinb.com/bsm-service-ec/delivery/internal/impl" - "git.apinb.com/bsm-service-ec/delivery/internal/svc" + "bsm/full/module/ec/delivery/internal/impl" + "bsm/full/module/ec/delivery/internal/svc" "github.com/zeromicro/go-zero/core/logx" "github.com/zeromicro/go-zero/zrpc" "google.golang.org/grpc" "google.golang.org/grpc/reflection" - pb "git.apinb.com/bsm-service-ec/delivery/external/pb/delivery" - carServer "git.apinb.com/bsm-service-ec/delivery/internal/server/car" - memberServer "git.apinb.com/bsm-service-ec/delivery/internal/server/member" - teamServer "git.apinb.com/bsm-service-ec/delivery/internal/server/team" + pb "bsm/full/module/ec/delivery/external/pb/delivery" + carServer "bsm/full/module/ec/delivery/internal/server/car" + memberServer "bsm/full/module/ec/delivery/internal/server/member" + teamServer "bsm/full/module/ec/delivery/internal/server/team" ) var ( @@ -41,3 +41,7 @@ func Run() { service.Start() } + +func main() { + Run() +} diff --git a/apps/ec/delivery/etc/delivery_dev.yaml b/module/ec/delivery/etc/delivery_dev.yaml similarity index 100% rename from apps/ec/delivery/etc/delivery_dev.yaml rename to module/ec/delivery/etc/delivery_dev.yaml diff --git a/apps/ec/delivery/etc/delivery_prod.yaml b/module/ec/delivery/etc/delivery_prod.yaml similarity index 100% rename from apps/ec/delivery/etc/delivery_prod.yaml rename to module/ec/delivery/etc/delivery_prod.yaml diff --git a/apps/ec/delivery/etc/delivery_test.yaml b/module/ec/delivery/etc/delivery_test.yaml similarity index 100% rename from apps/ec/delivery/etc/delivery_test.yaml rename to module/ec/delivery/etc/delivery_test.yaml diff --git a/apps/ec/delivery/external/client/car/car.go b/module/ec/delivery/external/client/car/car.go similarity index 97% rename from apps/ec/delivery/external/client/car/car.go rename to module/ec/delivery/external/client/car/car.go index 3aca5af..7a69399 100644 --- a/apps/ec/delivery/external/client/car/car.go +++ b/module/ec/delivery/external/client/car/car.go @@ -6,7 +6,7 @@ package car import ( "context" - "git.apinb.com/bsm-service-ec/delivery/external/pb/delivery" + "bsm/full/module/ec/delivery/external/pb/delivery" "github.com/zeromicro/go-zero/zrpc" "google.golang.org/grpc" diff --git a/apps/ec/delivery/external/client/member/member.go b/module/ec/delivery/external/client/member/member.go similarity index 97% rename from apps/ec/delivery/external/client/member/member.go rename to module/ec/delivery/external/client/member/member.go index 8000f60..ce8e2ed 100644 --- a/apps/ec/delivery/external/client/member/member.go +++ b/module/ec/delivery/external/client/member/member.go @@ -6,7 +6,7 @@ package member import ( "context" - "git.apinb.com/bsm-service-ec/delivery/external/pb/delivery" + "bsm/full/module/ec/delivery/external/pb/delivery" "github.com/zeromicro/go-zero/zrpc" "google.golang.org/grpc" diff --git a/apps/ec/delivery/external/client/team/team.go b/module/ec/delivery/external/client/team/team.go similarity index 97% rename from apps/ec/delivery/external/client/team/team.go rename to module/ec/delivery/external/client/team/team.go index 94561c8..4c7eee9 100644 --- a/apps/ec/delivery/external/client/team/team.go +++ b/module/ec/delivery/external/client/team/team.go @@ -6,7 +6,7 @@ package team import ( "context" - "git.apinb.com/bsm-service-ec/delivery/external/pb/delivery" + "bsm/full/module/ec/delivery/external/pb/delivery" "github.com/zeromicro/go-zero/zrpc" "google.golang.org/grpc" diff --git a/apps/ec/delivery/external/pb/delivery/delivery.pb.go b/module/ec/delivery/external/pb/delivery/delivery.pb.go similarity index 100% rename from apps/ec/delivery/external/pb/delivery/delivery.pb.go rename to module/ec/delivery/external/pb/delivery/delivery.pb.go diff --git a/apps/ec/delivery/external/pb/delivery/delivery_grpc.pb.go b/module/ec/delivery/external/pb/delivery/delivery_grpc.pb.go similarity index 100% rename from apps/ec/delivery/external/pb/delivery/delivery_grpc.pb.go rename to module/ec/delivery/external/pb/delivery/delivery_grpc.pb.go diff --git a/apps/ec/delivery/go.mod b/module/ec/delivery/go.mod similarity index 94% rename from apps/ec/delivery/go.mod rename to module/ec/delivery/go.mod index 7776d5a..4b846e9 100644 --- a/apps/ec/delivery/go.mod +++ b/module/ec/delivery/go.mod @@ -1,4 +1,4 @@ -module git.apinb.com/bsm-service-ec/delivery +module bsm/full/module/ec/delivery go 1.26.5 @@ -6,9 +6,9 @@ require ( git.apinb.com/bsm-sdk/engine v1.3.2 github.com/FishGoddess/cachego v0.6.1 github.com/zeromicro/go-zero v1.7.2 - google.golang.org/grpc v1.81.1 + google.golang.org/grpc v1.83.0 google.golang.org/protobuf v1.36.11 - gorm.io/gorm v1.31.1 + gorm.io/gorm v1.31.2 ) require ( @@ -91,16 +91,16 @@ require ( go.etcd.io/etcd/client/pkg/v3 v3.6.12 // indirect go.etcd.io/etcd/client/v3 v3.6.12 // indirect go.opentelemetry.io/auto/sdk v1.2.1 // indirect - go.opentelemetry.io/otel v1.43.0 // indirect + go.opentelemetry.io/otel v1.44.0 // indirect go.opentelemetry.io/otel/exporters/jaeger v1.17.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.30.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.30.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.30.0 // indirect go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.30.0 // indirect go.opentelemetry.io/otel/exporters/zipkin v1.30.0 // indirect - go.opentelemetry.io/otel/metric v1.43.0 // indirect - go.opentelemetry.io/otel/sdk v1.43.0 // indirect - go.opentelemetry.io/otel/trace v1.43.0 // indirect + go.opentelemetry.io/otel/metric v1.44.0 // indirect + go.opentelemetry.io/otel/sdk v1.44.0 // indirect + go.opentelemetry.io/otel/trace v1.44.0 // indirect go.opentelemetry.io/proto/otlp v1.9.0 // indirect go.uber.org/atomic v1.11.0 // indirect go.uber.org/automaxprocs v1.6.0 // indirect @@ -131,3 +131,5 @@ require ( sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect sigs.k8s.io/yaml v1.4.0 // indirect ) + +replace git.apinb.com/bsm-sdk/core => D:/work/bsm-sdk/core diff --git a/apps/ec/delivery/go.sum b/module/ec/delivery/go.sum similarity index 95% rename from apps/ec/delivery/go.sum rename to module/ec/delivery/go.sum index e285f6c..74e9590 100644 --- a/apps/ec/delivery/go.sum +++ b/module/ec/delivery/go.sum @@ -180,6 +180,8 @@ github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovk github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.22 h1:j8l17JJ9i6VGPUFUYoTUKPSgKe/83EYU2zBC7YNKMw4= github.com/mattn/go-isatty v0.0.22/go.mod h1:ZXfXG4SQHsB/w3ZeOYbR0PrPwLy+n6xiMrJlRFqopa4= +github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= +github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0= @@ -292,10 +294,10 @@ go.etcd.io/etcd/client/v3 v3.6.12 h1:kMSP6JcPZMqSJiX+TXdUIBU/4eXEZWBAaui4VihMbIc go.etcd.io/etcd/client/v3 v3.6.12/go.mod h1:CMs6fJWYiZQk4ytFjd4lE1diOvvRMmtbbn/alZXd3dQ= go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64= go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 h1:TT4fX+nBOA/+LUkobKGW1ydGcn+G3vRw9+g5HwCphpk= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0/go.mod h1:L7UH0GbB0p47T4Rri3uHjbpCFYrVrwc1I25QhNPiGK8= -go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I= -go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 h1:F7Jx+6hwnZ41NSFTO5q4LYDtJRXBf2PD0rNBkeB/lus= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0/go.mod h1:UHB22Z8QsdRDrnAtX4PntOl36ajSxcdUMt1sF7Y6E7Q= +go.opentelemetry.io/otel v1.44.0 h1:JjwHmHpA4iZ3wBxluu2fbbE7j4kqlE8jXyAyPXH7HqU= +go.opentelemetry.io/otel v1.44.0/go.mod h1:BMgjTHL9WPRlRjL2oZCBTL4whCGtXch2H4BhOPIAyYc= go.opentelemetry.io/otel/exporters/jaeger v1.17.0 h1:D7UpUy2Xc2wsi1Ras6V40q806WM07rqoCWzXu7Sqy+4= go.opentelemetry.io/otel/exporters/jaeger v1.17.0/go.mod h1:nPCqOnEH9rNLKqH/+rrUjiMzHJdV1BlpKcTwRTyKkKI= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.30.0 h1:lsInsfvhVIfOI6qHVyysXMNDnjO9Npvl7tlDPJFBVd4= @@ -308,14 +310,14 @@ go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.30.0 h1:kn1BudCgwtE7PxL go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.30.0/go.mod h1:ljkUDtAMdleoi9tIG1R6dJUpVwDcYjw3J2Q6Q/SuiC0= go.opentelemetry.io/otel/exporters/zipkin v1.30.0 h1:1uYaSfxiCLdJATlGEtYjQe4jZYfqCjVwxeSTMXe8VF4= go.opentelemetry.io/otel/exporters/zipkin v1.30.0/go.mod h1:r/4BhMc3kiKxD61wGh9J3NVQ3/cZ45F2NHkQgVnql48= -go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM= -go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY= -go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg= -go.opentelemetry.io/otel/sdk v1.43.0/go.mod h1:P+IkVU3iWukmiit/Yf9AWvpyRDlUeBaRg6Y+C58QHzg= -go.opentelemetry.io/otel/sdk/metric v1.43.0 h1:S88dyqXjJkuBNLeMcVPRFXpRw2fuwdvfCGLEo89fDkw= -go.opentelemetry.io/otel/sdk/metric v1.43.0/go.mod h1:C/RJtwSEJ5hzTiUz5pXF1kILHStzb9zFlIEe85bhj6A= -go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A= -go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0= +go.opentelemetry.io/otel/metric v1.44.0 h1:1w0gILTcHdr3YI+ixLyjemwrVnsMURbTZFrSYCdDdmc= +go.opentelemetry.io/otel/metric v1.44.0/go.mod h1:8O7hanEPBNgEMmybD3s2VBKcgWOCsA6tzHBPODAiquo= +go.opentelemetry.io/otel/sdk v1.44.0 h1:nHYwb9lK+fJPU/dnT6s7W7Z8itMWyqrnVfbheVYrZ58= +go.opentelemetry.io/otel/sdk v1.44.0/go.mod h1:Osuydd3Se74nqjAKxid74N5eC+jfEqfTegHRnq58oK0= +go.opentelemetry.io/otel/sdk/metric v1.44.0 h1:3LlKgI+VjbVsjNRFZJZAJ30WjXC5VkNRks6si09iEfI= +go.opentelemetry.io/otel/sdk/metric v1.44.0/go.mod h1:5B5pMARnXxKhltooO4xUuCBorl65a4EpnTalObqOigA= +go.opentelemetry.io/otel/trace v1.44.0 h1:jxF5CsGYCe74MCRx2X4g7WsY/VBKRqqpNvXlX/6gtIk= +go.opentelemetry.io/otel/trace v1.44.0/go.mod h1:oLl1jrMQAVo6v3GAggN+1VH9VIz9iUSvW53sW1Q8PIE= go.opentelemetry.io/proto/otlp v1.9.0 h1:l706jCMITVouPOqEnii2fIAuO3IVGBRPV5ICjceRb/A= go.opentelemetry.io/proto/otlp v1.9.0/go.mod h1:xE+Cx5E/eEHw+ISFkwPLwCZefwVjY+pqKg1qcK03+/4= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= @@ -393,8 +395,8 @@ google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa h1: google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:q4lMZS6kskjT5HvCPrnnypcDPVJqT/f4nfxmkE7gryY= google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa h1:mZHHdPZl0dbGHCflZgAq/Q468DWVFcU2whhB2KAo8fk= google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= -google.golang.org/grpc v1.81.1 h1:VnnIIZ88UzOOKLukQi+ImGz8O1Wdp8nAGGnvOfEIWQQ= -google.golang.org/grpc v1.81.1/go.mod h1:xGH9GfzOyMTGIOXBJmXt+BX/V0kcdQbdcuwQ/zNw42I= +google.golang.org/grpc v1.83.0 h1:JeNZEKJFbQxArAMl+hiytHauacDNqJUllNfmIMmpqnQ= +google.golang.org/grpc v1.83.0/go.mod h1:kDyl6SKsiHKt0uylY5gtn5cEjkrIOhQOGDgIc4JGwzQ= google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE= google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -415,8 +417,10 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gorm.io/driver/postgres v1.6.0 h1:2dxzU8xJ+ivvqTRph34QX+WrRaJlmfyPqXmoGVjMBa4= gorm.io/driver/postgres v1.6.0/go.mod h1:vUw0mrGgrTK+uPHEhAdV4sfFELrByKVGnaVRkXDhtWo= -gorm.io/gorm v1.31.1 h1:7CA8FTFz/gRfgqgpeKIBcervUn3xSyPUmr6B2WXJ7kg= -gorm.io/gorm v1.31.1/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs= +gorm.io/driver/sqlite v1.6.0 h1:WHRRrIiulaPiPFmDcod6prc4l2VGVWHz80KspNsxSfQ= +gorm.io/driver/sqlite v1.6.0/go.mod h1:AO9V1qIQddBESngQUKWL9yoH93HIeA1X6V633rBwyT8= +gorm.io/gorm v1.31.2 h1:3o8FXNo9v9S858gil+3LlZA1LkCOzgb4g5BL64FgaCo= +gorm.io/gorm v1.31.2/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs= k8s.io/api v0.31.1 h1:Xe1hX/fPW3PXYYv8BlozYqw63ytA92snr96zMW9gWTU= k8s.io/api v0.31.1/go.mod h1:sbN1g6eY6XVLeqNsZGLnI5FwVseTrZX7Fv3O26rhAaI= k8s.io/apimachinery v0.31.1 h1:mhcUBbj7KUjaVhyXILglcVjuS4nYXiwC+KKFBgIVy7U= diff --git a/apps/ec/delivery/internal/config/config.go b/module/ec/delivery/internal/config/config.go similarity index 100% rename from apps/ec/delivery/internal/config/config.go rename to module/ec/delivery/internal/config/config.go diff --git a/apps/ec/delivery/internal/errorcode/errorcode.go b/module/ec/delivery/internal/errorcode/errorcode.go similarity index 100% rename from apps/ec/delivery/internal/errorcode/errorcode.go rename to module/ec/delivery/internal/errorcode/errorcode.go diff --git a/apps/ec/delivery/internal/impl/cache.go b/module/ec/delivery/internal/impl/cache.go similarity index 100% rename from apps/ec/delivery/internal/impl/cache.go rename to module/ec/delivery/internal/impl/cache.go diff --git a/apps/ec/delivery/internal/impl/impl.go b/module/ec/delivery/internal/impl/impl.go similarity index 90% rename from apps/ec/delivery/internal/impl/impl.go rename to module/ec/delivery/internal/impl/impl.go index e13cfe9..7c28e0c 100644 --- a/apps/ec/delivery/internal/impl/impl.go +++ b/module/ec/delivery/internal/impl/impl.go @@ -1,7 +1,7 @@ package impl import ( - "git.apinb.com/bsm-service-ec/delivery/internal/config" + "bsm/full/module/ec/delivery/internal/config" "git.apinb.com/bsm-sdk/engine/service" ) diff --git a/apps/ec/delivery/internal/impl/model.go b/module/ec/delivery/internal/impl/model.go similarity index 87% rename from apps/ec/delivery/internal/impl/model.go rename to module/ec/delivery/internal/impl/model.go index 51bac2a..cfb4afa 100644 --- a/apps/ec/delivery/internal/impl/model.go +++ b/module/ec/delivery/internal/impl/model.go @@ -3,7 +3,7 @@ package impl import ( "os" - "git.apinb.com/bsm-service-ec/delivery/internal/models" + "bsm/full/module/ec/delivery/internal/models" "git.apinb.com/bsm-sdk/engine/print" "git.apinb.com/bsm-sdk/engine/vars" diff --git a/apps/ec/delivery/internal/impl/mq.go b/module/ec/delivery/internal/impl/mq.go similarity index 100% rename from apps/ec/delivery/internal/impl/mq.go rename to module/ec/delivery/internal/impl/mq.go diff --git a/apps/ec/delivery/internal/logic/car/car_add_logic.go b/module/ec/delivery/internal/logic/car/car_add_logic.go similarity index 91% rename from apps/ec/delivery/internal/logic/car/car_add_logic.go rename to module/ec/delivery/internal/logic/car/car_add_logic.go index 53f5941..87a9040 100644 --- a/apps/ec/delivery/internal/logic/car/car_add_logic.go +++ b/module/ec/delivery/internal/logic/car/car_add_logic.go @@ -6,9 +6,9 @@ import ( "git.apinb.com/bsm-sdk/engine/exception" "git.apinb.com/bsm-sdk/engine/service" "git.apinb.com/bsm-sdk/engine/utils" - "git.apinb.com/bsm-service-ec/delivery/external/pb/delivery" - "git.apinb.com/bsm-service-ec/delivery/internal/models" - "git.apinb.com/bsm-service-ec/delivery/internal/svc" + "bsm/full/module/ec/delivery/external/pb/delivery" + "bsm/full/module/ec/delivery/internal/models" + "bsm/full/module/ec/delivery/internal/svc" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/apps/ec/delivery/internal/logic/car/car_del_logic.go b/module/ec/delivery/internal/logic/car/car_del_logic.go similarity index 85% rename from apps/ec/delivery/internal/logic/car/car_del_logic.go rename to module/ec/delivery/internal/logic/car/car_del_logic.go index 7b57169..79aa22e 100644 --- a/apps/ec/delivery/internal/logic/car/car_del_logic.go +++ b/module/ec/delivery/internal/logic/car/car_del_logic.go @@ -5,9 +5,9 @@ import ( "git.apinb.com/bsm-sdk/engine/exception" "git.apinb.com/bsm-sdk/engine/service" - "git.apinb.com/bsm-service-ec/delivery/external/pb/delivery" - "git.apinb.com/bsm-service-ec/delivery/internal/models" - "git.apinb.com/bsm-service-ec/delivery/internal/svc" + "bsm/full/module/ec/delivery/external/pb/delivery" + "bsm/full/module/ec/delivery/internal/models" + "bsm/full/module/ec/delivery/internal/svc" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/apps/ec/delivery/internal/logic/car/car_get_logic.go b/module/ec/delivery/internal/logic/car/car_get_logic.go similarity index 86% rename from apps/ec/delivery/internal/logic/car/car_get_logic.go rename to module/ec/delivery/internal/logic/car/car_get_logic.go index 2d462f1..0439713 100644 --- a/apps/ec/delivery/internal/logic/car/car_get_logic.go +++ b/module/ec/delivery/internal/logic/car/car_get_logic.go @@ -6,9 +6,9 @@ import ( "git.apinb.com/bsm-sdk/engine/exception" "git.apinb.com/bsm-sdk/engine/service" - "git.apinb.com/bsm-service-ec/delivery/external/pb/delivery" - "git.apinb.com/bsm-service-ec/delivery/internal/models" - "git.apinb.com/bsm-service-ec/delivery/internal/svc" + "bsm/full/module/ec/delivery/external/pb/delivery" + "bsm/full/module/ec/delivery/internal/models" + "bsm/full/module/ec/delivery/internal/svc" "gorm.io/gorm" "github.com/zeromicro/go-zero/core/logx" diff --git a/apps/ec/delivery/internal/logic/car/car_list_logic.go b/module/ec/delivery/internal/logic/car/car_list_logic.go similarity index 91% rename from apps/ec/delivery/internal/logic/car/car_list_logic.go rename to module/ec/delivery/internal/logic/car/car_list_logic.go index 7ce80bb..f83a8f4 100644 --- a/apps/ec/delivery/internal/logic/car/car_list_logic.go +++ b/module/ec/delivery/internal/logic/car/car_list_logic.go @@ -6,9 +6,9 @@ import ( "git.apinb.com/bsm-sdk/engine/exception" "git.apinb.com/bsm-sdk/engine/service" - "git.apinb.com/bsm-service-ec/delivery/external/pb/delivery" - "git.apinb.com/bsm-service-ec/delivery/internal/models" - "git.apinb.com/bsm-service-ec/delivery/internal/svc" + "bsm/full/module/ec/delivery/external/pb/delivery" + "bsm/full/module/ec/delivery/internal/models" + "bsm/full/module/ec/delivery/internal/svc" "gorm.io/gorm" "github.com/zeromicro/go-zero/core/logx" diff --git a/apps/ec/delivery/internal/logic/car/car_set_logic.go b/module/ec/delivery/internal/logic/car/car_set_logic.go similarity index 91% rename from apps/ec/delivery/internal/logic/car/car_set_logic.go rename to module/ec/delivery/internal/logic/car/car_set_logic.go index 62a7861..90ab7c7 100644 --- a/apps/ec/delivery/internal/logic/car/car_set_logic.go +++ b/module/ec/delivery/internal/logic/car/car_set_logic.go @@ -5,9 +5,9 @@ import ( "git.apinb.com/bsm-sdk/engine/exception" "git.apinb.com/bsm-sdk/engine/service" - "git.apinb.com/bsm-service-ec/delivery/external/pb/delivery" - "git.apinb.com/bsm-service-ec/delivery/internal/models" - "git.apinb.com/bsm-service-ec/delivery/internal/svc" + "bsm/full/module/ec/delivery/external/pb/delivery" + "bsm/full/module/ec/delivery/internal/models" + "bsm/full/module/ec/delivery/internal/svc" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/apps/ec/delivery/internal/logic/member/member_add_logic.go b/module/ec/delivery/internal/logic/member/member_add_logic.go similarity index 90% rename from apps/ec/delivery/internal/logic/member/member_add_logic.go rename to module/ec/delivery/internal/logic/member/member_add_logic.go index 1c2657f..7b4e6b2 100644 --- a/apps/ec/delivery/internal/logic/member/member_add_logic.go +++ b/module/ec/delivery/internal/logic/member/member_add_logic.go @@ -6,9 +6,9 @@ import ( "git.apinb.com/bsm-sdk/engine/exception" "git.apinb.com/bsm-sdk/engine/service" "git.apinb.com/bsm-sdk/engine/utils" - "git.apinb.com/bsm-service-ec/delivery/external/pb/delivery" - "git.apinb.com/bsm-service-ec/delivery/internal/models" - "git.apinb.com/bsm-service-ec/delivery/internal/svc" + "bsm/full/module/ec/delivery/external/pb/delivery" + "bsm/full/module/ec/delivery/internal/models" + "bsm/full/module/ec/delivery/internal/svc" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/apps/ec/delivery/internal/logic/member/member_del_logic.go b/module/ec/delivery/internal/logic/member/member_del_logic.go similarity index 85% rename from apps/ec/delivery/internal/logic/member/member_del_logic.go rename to module/ec/delivery/internal/logic/member/member_del_logic.go index 9b36f82..dce6723 100644 --- a/apps/ec/delivery/internal/logic/member/member_del_logic.go +++ b/module/ec/delivery/internal/logic/member/member_del_logic.go @@ -5,9 +5,9 @@ import ( "git.apinb.com/bsm-sdk/engine/exception" "git.apinb.com/bsm-sdk/engine/service" - "git.apinb.com/bsm-service-ec/delivery/external/pb/delivery" - "git.apinb.com/bsm-service-ec/delivery/internal/models" - "git.apinb.com/bsm-service-ec/delivery/internal/svc" + "bsm/full/module/ec/delivery/external/pb/delivery" + "bsm/full/module/ec/delivery/internal/models" + "bsm/full/module/ec/delivery/internal/svc" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/apps/ec/delivery/internal/logic/member/member_get_logic.go b/module/ec/delivery/internal/logic/member/member_get_logic.go similarity index 86% rename from apps/ec/delivery/internal/logic/member/member_get_logic.go rename to module/ec/delivery/internal/logic/member/member_get_logic.go index f77cecd..9ffc41e 100644 --- a/apps/ec/delivery/internal/logic/member/member_get_logic.go +++ b/module/ec/delivery/internal/logic/member/member_get_logic.go @@ -6,9 +6,9 @@ import ( "git.apinb.com/bsm-sdk/engine/exception" "git.apinb.com/bsm-sdk/engine/service" - "git.apinb.com/bsm-service-ec/delivery/external/pb/delivery" - "git.apinb.com/bsm-service-ec/delivery/internal/models" - "git.apinb.com/bsm-service-ec/delivery/internal/svc" + "bsm/full/module/ec/delivery/external/pb/delivery" + "bsm/full/module/ec/delivery/internal/models" + "bsm/full/module/ec/delivery/internal/svc" "gorm.io/gorm" "github.com/zeromicro/go-zero/core/logx" diff --git a/apps/ec/delivery/internal/logic/member/member_list_logic.go b/module/ec/delivery/internal/logic/member/member_list_logic.go similarity index 91% rename from apps/ec/delivery/internal/logic/member/member_list_logic.go rename to module/ec/delivery/internal/logic/member/member_list_logic.go index 302fca5..5ff6fd4 100644 --- a/apps/ec/delivery/internal/logic/member/member_list_logic.go +++ b/module/ec/delivery/internal/logic/member/member_list_logic.go @@ -6,9 +6,9 @@ import ( "git.apinb.com/bsm-sdk/engine/exception" "git.apinb.com/bsm-sdk/engine/service" - "git.apinb.com/bsm-service-ec/delivery/external/pb/delivery" - "git.apinb.com/bsm-service-ec/delivery/internal/models" - "git.apinb.com/bsm-service-ec/delivery/internal/svc" + "bsm/full/module/ec/delivery/external/pb/delivery" + "bsm/full/module/ec/delivery/internal/models" + "bsm/full/module/ec/delivery/internal/svc" "gorm.io/gorm" "github.com/zeromicro/go-zero/core/logx" diff --git a/apps/ec/delivery/internal/logic/member/member_set_logic.go b/module/ec/delivery/internal/logic/member/member_set_logic.go similarity index 90% rename from apps/ec/delivery/internal/logic/member/member_set_logic.go rename to module/ec/delivery/internal/logic/member/member_set_logic.go index bac5a87..c1da9e9 100644 --- a/apps/ec/delivery/internal/logic/member/member_set_logic.go +++ b/module/ec/delivery/internal/logic/member/member_set_logic.go @@ -5,9 +5,9 @@ import ( "git.apinb.com/bsm-sdk/engine/exception" "git.apinb.com/bsm-sdk/engine/service" - "git.apinb.com/bsm-service-ec/delivery/external/pb/delivery" - "git.apinb.com/bsm-service-ec/delivery/internal/models" - "git.apinb.com/bsm-service-ec/delivery/internal/svc" + "bsm/full/module/ec/delivery/external/pb/delivery" + "bsm/full/module/ec/delivery/internal/models" + "bsm/full/module/ec/delivery/internal/svc" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/apps/ec/delivery/internal/logic/team/team_add_logic.go b/module/ec/delivery/internal/logic/team/team_add_logic.go similarity index 89% rename from apps/ec/delivery/internal/logic/team/team_add_logic.go rename to module/ec/delivery/internal/logic/team/team_add_logic.go index da740d5..5952d1b 100644 --- a/apps/ec/delivery/internal/logic/team/team_add_logic.go +++ b/module/ec/delivery/internal/logic/team/team_add_logic.go @@ -6,9 +6,9 @@ import ( "git.apinb.com/bsm-sdk/engine/exception" "git.apinb.com/bsm-sdk/engine/service" "git.apinb.com/bsm-sdk/engine/utils" - "git.apinb.com/bsm-service-ec/delivery/external/pb/delivery" - "git.apinb.com/bsm-service-ec/delivery/internal/models" - "git.apinb.com/bsm-service-ec/delivery/internal/svc" + "bsm/full/module/ec/delivery/external/pb/delivery" + "bsm/full/module/ec/delivery/internal/models" + "bsm/full/module/ec/delivery/internal/svc" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/apps/ec/delivery/internal/logic/team/team_del_logic.go b/module/ec/delivery/internal/logic/team/team_del_logic.go similarity index 85% rename from apps/ec/delivery/internal/logic/team/team_del_logic.go rename to module/ec/delivery/internal/logic/team/team_del_logic.go index e0d642e..b5f8ee9 100644 --- a/apps/ec/delivery/internal/logic/team/team_del_logic.go +++ b/module/ec/delivery/internal/logic/team/team_del_logic.go @@ -5,9 +5,9 @@ import ( "git.apinb.com/bsm-sdk/engine/exception" "git.apinb.com/bsm-sdk/engine/service" - "git.apinb.com/bsm-service-ec/delivery/external/pb/delivery" - "git.apinb.com/bsm-service-ec/delivery/internal/models" - "git.apinb.com/bsm-service-ec/delivery/internal/svc" + "bsm/full/module/ec/delivery/external/pb/delivery" + "bsm/full/module/ec/delivery/internal/models" + "bsm/full/module/ec/delivery/internal/svc" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/apps/ec/delivery/internal/logic/team/team_get_logic.go b/module/ec/delivery/internal/logic/team/team_get_logic.go similarity index 86% rename from apps/ec/delivery/internal/logic/team/team_get_logic.go rename to module/ec/delivery/internal/logic/team/team_get_logic.go index aa2d270..946460b 100644 --- a/apps/ec/delivery/internal/logic/team/team_get_logic.go +++ b/module/ec/delivery/internal/logic/team/team_get_logic.go @@ -6,9 +6,9 @@ import ( "git.apinb.com/bsm-sdk/engine/exception" "git.apinb.com/bsm-sdk/engine/service" - "git.apinb.com/bsm-service-ec/delivery/external/pb/delivery" - "git.apinb.com/bsm-service-ec/delivery/internal/models" - "git.apinb.com/bsm-service-ec/delivery/internal/svc" + "bsm/full/module/ec/delivery/external/pb/delivery" + "bsm/full/module/ec/delivery/internal/models" + "bsm/full/module/ec/delivery/internal/svc" "gorm.io/gorm" "github.com/zeromicro/go-zero/core/logx" diff --git a/apps/ec/delivery/internal/logic/team/team_list_logic.go b/module/ec/delivery/internal/logic/team/team_list_logic.go similarity index 91% rename from apps/ec/delivery/internal/logic/team/team_list_logic.go rename to module/ec/delivery/internal/logic/team/team_list_logic.go index 849a2b0..b64ecd0 100644 --- a/apps/ec/delivery/internal/logic/team/team_list_logic.go +++ b/module/ec/delivery/internal/logic/team/team_list_logic.go @@ -7,9 +7,9 @@ import ( "git.apinb.com/bsm-sdk/engine/exception" "git.apinb.com/bsm-sdk/engine/service" - "git.apinb.com/bsm-service-ec/delivery/external/pb/delivery" - "git.apinb.com/bsm-service-ec/delivery/internal/models" - "git.apinb.com/bsm-service-ec/delivery/internal/svc" + "bsm/full/module/ec/delivery/external/pb/delivery" + "bsm/full/module/ec/delivery/internal/models" + "bsm/full/module/ec/delivery/internal/svc" "gorm.io/gorm" "github.com/zeromicro/go-zero/core/logx" diff --git a/apps/ec/delivery/internal/logic/team/team_set_logic.go b/module/ec/delivery/internal/logic/team/team_set_logic.go similarity index 90% rename from apps/ec/delivery/internal/logic/team/team_set_logic.go rename to module/ec/delivery/internal/logic/team/team_set_logic.go index 01bcaf7..812b73d 100644 --- a/apps/ec/delivery/internal/logic/team/team_set_logic.go +++ b/module/ec/delivery/internal/logic/team/team_set_logic.go @@ -5,9 +5,9 @@ import ( "git.apinb.com/bsm-sdk/engine/exception" "git.apinb.com/bsm-sdk/engine/service" - "git.apinb.com/bsm-service-ec/delivery/external/pb/delivery" - "git.apinb.com/bsm-service-ec/delivery/internal/models" - "git.apinb.com/bsm-service-ec/delivery/internal/svc" + "bsm/full/module/ec/delivery/external/pb/delivery" + "bsm/full/module/ec/delivery/internal/models" + "bsm/full/module/ec/delivery/internal/svc" "github.com/zeromicro/go-zero/core/logx" ) diff --git a/apps/ec/delivery/internal/models/delivery_car.go b/module/ec/delivery/internal/models/delivery_car.go similarity index 100% rename from apps/ec/delivery/internal/models/delivery_car.go rename to module/ec/delivery/internal/models/delivery_car.go diff --git a/apps/ec/delivery/internal/models/delivery_item.go b/module/ec/delivery/internal/models/delivery_item.go similarity index 100% rename from apps/ec/delivery/internal/models/delivery_item.go rename to module/ec/delivery/internal/models/delivery_item.go diff --git a/apps/ec/delivery/internal/models/delivery_member.go b/module/ec/delivery/internal/models/delivery_member.go similarity index 100% rename from apps/ec/delivery/internal/models/delivery_member.go rename to module/ec/delivery/internal/models/delivery_member.go diff --git a/apps/ec/delivery/internal/models/impl.go b/module/ec/delivery/internal/models/impl.go similarity index 100% rename from apps/ec/delivery/internal/models/impl.go rename to module/ec/delivery/internal/models/impl.go diff --git a/apps/ec/delivery/internal/server/car/car_server.go b/module/ec/delivery/internal/server/car/car_server.go similarity index 87% rename from apps/ec/delivery/internal/server/car/car_server.go rename to module/ec/delivery/internal/server/car/car_server.go index 691148d..7a92a2f 100644 --- a/apps/ec/delivery/internal/server/car/car_server.go +++ b/module/ec/delivery/internal/server/car/car_server.go @@ -6,9 +6,9 @@ package server import ( "context" - "git.apinb.com/bsm-service-ec/delivery/external/pb/delivery" - carlogic "git.apinb.com/bsm-service-ec/delivery/internal/logic/car" - "git.apinb.com/bsm-service-ec/delivery/internal/svc" + "bsm/full/module/ec/delivery/external/pb/delivery" + carlogic "bsm/full/module/ec/delivery/internal/logic/car" + "bsm/full/module/ec/delivery/internal/svc" ) type CarServer struct { diff --git a/apps/ec/delivery/internal/server/member/member_server.go b/module/ec/delivery/internal/server/member/member_server.go similarity index 87% rename from apps/ec/delivery/internal/server/member/member_server.go rename to module/ec/delivery/internal/server/member/member_server.go index 10ab37c..e7f1ef7 100644 --- a/apps/ec/delivery/internal/server/member/member_server.go +++ b/module/ec/delivery/internal/server/member/member_server.go @@ -6,9 +6,9 @@ package server import ( "context" - "git.apinb.com/bsm-service-ec/delivery/external/pb/delivery" - memberlogic "git.apinb.com/bsm-service-ec/delivery/internal/logic/member" - "git.apinb.com/bsm-service-ec/delivery/internal/svc" + "bsm/full/module/ec/delivery/external/pb/delivery" + memberlogic "bsm/full/module/ec/delivery/internal/logic/member" + "bsm/full/module/ec/delivery/internal/svc" ) type MemberServer struct { diff --git a/apps/ec/delivery/internal/server/team/team_server.go b/module/ec/delivery/internal/server/team/team_server.go similarity index 87% rename from apps/ec/delivery/internal/server/team/team_server.go rename to module/ec/delivery/internal/server/team/team_server.go index 91a74c5..d45af3e 100644 --- a/apps/ec/delivery/internal/server/team/team_server.go +++ b/module/ec/delivery/internal/server/team/team_server.go @@ -6,9 +6,9 @@ package server import ( "context" - "git.apinb.com/bsm-service-ec/delivery/external/pb/delivery" - teamlogic "git.apinb.com/bsm-service-ec/delivery/internal/logic/team" - "git.apinb.com/bsm-service-ec/delivery/internal/svc" + "bsm/full/module/ec/delivery/external/pb/delivery" + teamlogic "bsm/full/module/ec/delivery/internal/logic/team" + "bsm/full/module/ec/delivery/internal/svc" ) type TeamServer struct { diff --git a/apps/ec/delivery/internal/svc/service_context.go b/module/ec/delivery/internal/svc/service_context.go similarity index 72% rename from apps/ec/delivery/internal/svc/service_context.go rename to module/ec/delivery/internal/svc/service_context.go index 67fc595..ca1937a 100644 --- a/apps/ec/delivery/internal/svc/service_context.go +++ b/module/ec/delivery/internal/svc/service_context.go @@ -1,6 +1,6 @@ package svc -import "git.apinb.com/bsm-service-ec/delivery/internal/config" +import "bsm/full/module/ec/delivery/internal/config" type ServiceContext struct { Config config.Config diff --git a/apps/ec/delivery/proto/blocks.proto b/module/ec/delivery/proto/blocks.proto similarity index 100% rename from apps/ec/delivery/proto/blocks.proto rename to module/ec/delivery/proto/blocks.proto diff --git a/apps/ec/delivery/proto/car.proto b/module/ec/delivery/proto/car.proto similarity index 100% rename from apps/ec/delivery/proto/car.proto rename to module/ec/delivery/proto/car.proto diff --git a/apps/ec/delivery/proto/member.proto b/module/ec/delivery/proto/member.proto similarity index 100% rename from apps/ec/delivery/proto/member.proto rename to module/ec/delivery/proto/member.proto diff --git a/apps/ec/delivery/proto/team.proto b/module/ec/delivery/proto/team.proto similarity index 100% rename from apps/ec/delivery/proto/team.proto rename to module/ec/delivery/proto/team.proto diff --git a/apps/ec/delivery/scripts/filebeat.yaml b/module/ec/delivery/scripts/filebeat.yaml similarity index 100% rename from apps/ec/delivery/scripts/filebeat.yaml rename to module/ec/delivery/scripts/filebeat.yaml diff --git a/apps/ec/delivery/scripts/lint.sh b/module/ec/delivery/scripts/lint.sh similarity index 100% rename from apps/ec/delivery/scripts/lint.sh rename to module/ec/delivery/scripts/lint.sh diff --git a/apps/ec/delivery/test/rpc/basic.go b/module/ec/delivery/test/rpc/basic.go similarity index 100% rename from apps/ec/delivery/test/rpc/basic.go rename to module/ec/delivery/test/rpc/basic.go diff --git a/apps/ec/delivery/test/rpc/car_test.go b/module/ec/delivery/test/rpc/car_test.go similarity index 97% rename from apps/ec/delivery/test/rpc/car_test.go rename to module/ec/delivery/test/rpc/car_test.go index 288a2be..e5651c1 100644 --- a/apps/ec/delivery/test/rpc/car_test.go +++ b/module/ec/delivery/test/rpc/car_test.go @@ -7,7 +7,7 @@ import ( "fmt" "testing" - pb "git.apinb.com/bsm-service-ec/delivery/external/pb/delivery" + pb "bsm/full/module/ec/delivery/external/pb/delivery" ) func TestCarAdd(t *testing.T) { diff --git a/apps/ec/delivery/test/rpc/member_test.go b/module/ec/delivery/test/rpc/member_test.go similarity index 97% rename from apps/ec/delivery/test/rpc/member_test.go rename to module/ec/delivery/test/rpc/member_test.go index 61d0c6a..09a35ad 100644 --- a/apps/ec/delivery/test/rpc/member_test.go +++ b/module/ec/delivery/test/rpc/member_test.go @@ -7,7 +7,7 @@ import ( "fmt" "testing" - pb "git.apinb.com/bsm-service-ec/delivery/external/pb/delivery" + pb "bsm/full/module/ec/delivery/external/pb/delivery" ) func TestMemberAdd(t *testing.T) { diff --git a/apps/ec/delivery/test/rpc/team_test.go b/module/ec/delivery/test/rpc/team_test.go similarity index 97% rename from apps/ec/delivery/test/rpc/team_test.go rename to module/ec/delivery/test/rpc/team_test.go index 6550d02..056f5d3 100644 --- a/apps/ec/delivery/test/rpc/team_test.go +++ b/module/ec/delivery/test/rpc/team_test.go @@ -7,7 +7,7 @@ import ( "fmt" "testing" - pb "git.apinb.com/bsm-service-ec/delivery/external/pb/delivery" + pb "bsm/full/module/ec/delivery/external/pb/delivery" ) func TestTeamAdd(t *testing.T) { diff --git a/apps/ec/mall/README.md b/module/ec/mall/README.md similarity index 98% rename from apps/ec/mall/README.md rename to module/ec/mall/README.md index 640e6af..5b84a33 100644 --- a/apps/ec/mall/README.md +++ b/module/ec/mall/README.md @@ -2,7 +2,7 @@ [![Go Version](https://img.shields.io/badge/Go-1.25.1-blue.svg)](https://golang.org/) [![License](https://img.shields.io/badge/License-Internal-red.svg)](LICENSE) -[![Build Status](https://img.shields.io/badge/Build-Passing-green.svg)](https://git.apinb.com/bsm-ec/mall) +[![Build Status](https://img.shields.io/badge/Build-Passing-green.svg)](https://bsm/full/module/ec/mall) 一个高性能、可扩展的商城微服务，基于 gRPC 和 HTTP Gateway 架构，提供完整的电商业务功能，包括商品管理、订单处理、用户管理、店铺运营等核心服务。 @@ -45,7 +45,7 @@ ```bash # 克隆项目 -git clone git.apinb.com/bsm-ec/mall.git +git clone bsm/full/module/ec/mall.git cd mall # 安装依赖 @@ -596,13 +596,13 @@ type(scope): description - **作者**: David Yan (david.yan@qq.com) - **维护者**: BSM 开发团队 -- **项目地址**: [git.apinb.com/bsm-ec/mall](https://git.apinb.com/bsm-ec/mall) +- **项目地址**: [bsm/full/module/ec/mall](https://bsm/full/module/ec/mall) ## 🔗 相关链接 - [BSM SDK](https://git.apinb.com/bsm-sdk) - [API 文档](https://docs.apinb.com/mall) -- [问题反馈](https://git.apinb.com/bsm-ec/mall/issues) +- [问题反馈](https://bsm/full/module/ec/mall/issues) --- diff --git a/apps/ec/mall/cmd/cli/main.go b/module/ec/mall/cmd/cli/main.go similarity index 100% rename from apps/ec/mall/cmd/cli/main.go rename to module/ec/mall/cmd/cli/main.go diff --git a/apps/ec/mall/cmd/main/main.go b/module/ec/mall/cmd/main/main.go similarity index 85% rename from apps/ec/mall/cmd/main/main.go rename to module/ec/mall/cmd/main/main.go index 01f5339..81a374d 100644 --- a/apps/ec/mall/cmd/main/main.go +++ b/module/ec/mall/cmd/main/main.go @@ -5,9 +5,9 @@ package service import ( - "git.apinb.com/bsm-ec/mall/internal/config" - "git.apinb.com/bsm-ec/mall/internal/impl" - "git.apinb.com/bsm-ec/mall/internal/server" + "bsm/full/module/ec/mall/internal/config" + "bsm/full/module/ec/mall/internal/impl" + "bsm/full/module/ec/mall/internal/server" "git.apinb.com/bsm-sdk/core/service" ) @@ -42,3 +42,7 @@ func Run() { // 启动服务 srv.Start() } + +func main() { + Run() +} diff --git a/apps/ec/mall/etc/mall_dev.yaml b/module/ec/mall/etc/mall_dev.yaml similarity index 100% rename from apps/ec/mall/etc/mall_dev.yaml rename to module/ec/mall/etc/mall_dev.yaml diff --git a/apps/ec/mall/etc/mall_prod.yaml b/module/ec/mall/etc/mall_prod.yaml similarity index 100% rename from apps/ec/mall/etc/mall_prod.yaml rename to module/ec/mall/etc/mall_prod.yaml diff --git a/apps/ec/mall/etc/mall_test.yaml b/module/ec/mall/etc/mall_test.yaml similarity index 100% rename from apps/ec/mall/etc/mall_test.yaml rename to module/ec/mall/etc/mall_test.yaml diff --git a/apps/ec/mall/etc/supervisor.bsm-ec-mall.conf b/module/ec/mall/etc/supervisor.bsm-ec-mall.conf similarity index 100% rename from apps/ec/mall/etc/supervisor.bsm-ec-mall.conf rename to module/ec/mall/etc/supervisor.bsm-ec-mall.conf diff --git a/apps/ec/mall/go.mod b/module/ec/mall/go.mod similarity index 61% rename from apps/ec/mall/go.mod rename to module/ec/mall/go.mod index 4640ff1..b949251 100644 --- a/apps/ec/mall/go.mod +++ b/module/ec/mall/go.mod @@ -1,4 +1,4 @@ -module git.apinb.com/bsm-ec/mall +module bsm/full/module/ec/mall go 1.26.5 @@ -13,12 +13,12 @@ tool ( require ( git.apinb.com/bsm-sdk/core v0.2.0 - github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 + github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0 github.com/patrickmn/go-cache v2.1.0+incompatible - go.etcd.io/etcd/client/v3 v3.6.12 - google.golang.org/grpc v1.81.1 + go.etcd.io/etcd/client/v3 v3.7.1 + google.golang.org/grpc v1.83.0 google.golang.org/protobuf v1.36.11 - gorm.io/gorm v1.31.1 + gorm.io/gorm v1.31.2 ) require ( @@ -28,9 +28,7 @@ require ( github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/coreos/go-semver v0.3.1 // indirect github.com/coreos/go-systemd/v22 v22.7.0 // indirect - github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/go-sql-driver/mysql v1.10.0 // indirect - github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt/v5 v5.3.1 // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/google/uuid v1.6.0 // indirect @@ -40,25 +38,26 @@ require ( github.com/jackc/puddle/v2 v2.2.2 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect - github.com/oklog/ulid/v2 v2.1.1 // indirect - github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - github.com/redis/go-redis/v9 v9.20.0 // indirect + github.com/oklog/ulid/v2 v2.1.2 // indirect + github.com/redis/go-redis/v9 v9.22.0 // indirect github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect - go.etcd.io/etcd/api/v3 v3.6.12 // indirect - go.etcd.io/etcd/client/pkg/v3 v3.6.12 // indirect + go.etcd.io/etcd/api/v3 v3.7.1 // indirect + go.etcd.io/etcd/client/pkg/v3 v3.7.1 // indirect go.uber.org/atomic v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.28.0 // indirect - go.yaml.in/yaml/v3 v3.0.4 // indirect - golang.org/x/mod v0.36.0 // indirect - golang.org/x/net v0.55.0 // indirect - golang.org/x/sync v0.20.0 // indirect - golang.org/x/sys v0.45.0 // indirect - golang.org/x/text v0.37.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa // indirect + go.yaml.in/yaml/v3 v3.0.5 // indirect + golang.org/x/mod v0.37.0 // indirect + golang.org/x/net v0.57.0 // indirect + golang.org/x/sync v0.22.0 // indirect + golang.org/x/sys v0.47.0 // indirect + golang.org/x/text v0.40.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea // indirect google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect gorm.io/driver/mysql v1.6.0 // indirect - gorm.io/driver/postgres v1.6.0 // indirect + gorm.io/driver/postgres v1.6.2 // indirect ) + +replace git.apinb.com/bsm-sdk/core => D:/work/bsm-sdk/core diff --git a/apps/base/cms/go.sum b/module/ec/mall/go.sum similarity index 52% rename from apps/base/cms/go.sum rename to module/ec/mall/go.sum index b5e19f9..c790b74 100644 --- a/apps/base/cms/go.sum +++ b/module/ec/mall/go.sum @@ -1,7 +1,5 @@ filippo.io/edwards25519 v1.2.0 h1:crnVqOiS4jqYleHd9vaKZ+HKtHfllngJIiOpNpoJsjo= filippo.io/edwards25519 v1.2.0/go.mod h1:xzAOLCNug/yB62zG1bQ8uziwrIqIuxhctzJT18Q77mc= -git.apinb.com/bsm-sdk/core v0.2.0 h1:/e9yqpsbKBrRgMiGpS3KX2O4qDLxo5V5GpPSLNGxEKw= -git.apinb.com/bsm-sdk/core v0.2.0/go.mod h1:E9T6Eboo/0Zb36BjkKbIgvFzq4fQ2Q8P/7y5zmYTI6Y= git.apinb.com/bsm-tools/protoc-gen-slc v0.0.13 h1:RGg2R2kHz6IAD7scH6So2FlZYctFUDxqWR8i/+fMfOU= git.apinb.com/bsm-tools/protoc-gen-slc v0.0.13/go.mod h1:NpJaupVAxmyBleRMAug4mGS6BQV2E32rtuiqQzj1b+A= git.apinb.com/bsm-tools/protoc-gen-ts v0.0.2 h1:T9C1kY6iIHl5cZ7xyNgV2xlPNWxXmaWfTbD8AzpBB9M= @@ -19,14 +17,12 @@ github.com/coreos/go-systemd/v22 v22.7.0/go.mod h1:xNUYtjHu2EDXbsxz1i41wouACIwT7 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= -github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.4 h1:tG4xh9yMsRCAiodLVTxyrkzSZ9+o0L1Kg/+cPVcbP/8= +github.com/go-logr/logr v1.4.4/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-sql-driver/mysql v1.10.0 h1:Q+1LV8DkHJvSYAdR83XzuhDaTykuDx0l6fkXxoWCWfw= github.com/go-sql-driver/mysql v1.10.0/go.mod h1:M+cqaI7+xxXGG9swrdeUIoPG3Y3KCkF0pZej+SK+nWk= -github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= -github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt/v5 v5.3.1 h1:kYf81DTWFe7t+1VvL7eS+jKFVWaUnK9cB1qbwn63YCY= github.com/golang-jwt/jwt/v5 v5.3.1/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= @@ -35,8 +31,8 @@ github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= 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/grpc-ecosystem/grpc-gateway/v2 v2.29.0 h1:5VipnvEpbqr2gA2VbM+nYVbkIF28c5ZQfqCBQ5g2xfk= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0/go.mod h1:Hyl3n6Twe1hvtd9XUXDec4pTvgMSEixRuQKPTMH2bNs= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0 h1:/Tnpcb2E0Pz/tN9s3bfEY2Q8ePCEX9iuS+cneUwncnw= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0/go.mod h1:zOBXOsUaBSjKgmH4OGzV1esUpR3oUSCPYVd2cUBjKYY= 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= @@ -49,24 +45,24 @@ github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= -github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= -github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y= -github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0= +github.com/klauspost/cpuid/v2 v2.4.0 h1:S6Hrbc7+ywsr0r+RLapfGBHfyefhCTwEh3A0tV913Dw= +github.com/klauspost/cpuid/v2 v2.4.0/go.mod h1:19jmZ9mjzoF//ddRSUsv0zfBTJWh3QJh9FNxZTMrGxU= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/oklog/ulid/v2 v2.1.1 h1:suPZ4ARWLOJLegGFiZZ1dFAkqzhMjL3J1TzI+5wHz8s= -github.com/oklog/ulid/v2 v2.1.1/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ= +github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= +github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= +github.com/oklog/ulid/v2 v2.1.2 h1:IEclFb9JNvzYA6MW2SCxbLzcHTVsfqm3PrqGQJH5zec= +github.com/oklog/ulid/v2 v2.1.2/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ= github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= github.com/pborman/getopt v0.0.0-20170112200414-7148bc3a4c30/go.mod h1:85jBQOZwpVEaDAr341tbn15RS4fCAsIst0qp7i8ex1o= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/redis/go-redis/v9 v9.20.0 h1:WnQYxLkgO2xiXTCJY0ldIiI8dNqCDlQAG+AtaH7a2a0= -github.com/redis/go-redis/v9 v9.20.0/go.mod h1:v/M13XI1PVCDcm01VtPFOADfZtHf8YW3baQf57KlIkA= +github.com/redis/go-redis/v9 v9.22.0 h1:laDvpYXTJtZLloinw1fA5Kqd6HAEH2XKxOkG/PDq2F0= +github.com/redis/go-redis/v9 v9.22.0/go.mod h1:y2g0Wj8rQvuK0ELM+oxSudcLtC09JScs98I/X9gRWY4= github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0= @@ -76,28 +72,26 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= -github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/zeebo/xxh3 v1.1.0 h1:s7DLGDK45Dyfg7++yxI0khrfwq9661w9EN78eP/UZVs= github.com/zeebo/xxh3 v1.1.0/go.mod h1:IisAie1LELR4xhVinxWS5+zf1lA4p0MW4T+w+W07F5s= -go.etcd.io/etcd/api/v3 v3.6.12 h1:OLOZUKEuAA36TR48F0cIaa8FdzrWygjyfrJxXg4iDgs= -go.etcd.io/etcd/api/v3 v3.6.12/go.mod h1:p14EIQXHbuOQbVvL/WEes5uqKnxP9AgKJgpjbMVvzvE= -go.etcd.io/etcd/client/pkg/v3 v3.6.12 h1:36zzB+pQOdHbhN+kH2iJz/K8bJn0ZLtLfPPO7jozTDo= -go.etcd.io/etcd/client/pkg/v3 v3.6.12/go.mod h1:hh2+ZXtfLzs3o6mn92ntgNPBrTJJOvXqICM5g3L3DMY= -go.etcd.io/etcd/client/v3 v3.6.12 h1:kMSP6JcPZMqSJiX+TXdUIBU/4eXEZWBAaui4VihMbIc= -go.etcd.io/etcd/client/v3 v3.6.12/go.mod h1:CMs6fJWYiZQk4ytFjd4lE1diOvvRMmtbbn/alZXd3dQ= +go.etcd.io/etcd/api/v3 v3.7.1 h1:KJG0/DcWGfe3Y1otDf/fsBf0TSSgpxZ5RO/L8SFt73E= +go.etcd.io/etcd/api/v3 v3.7.1/go.mod h1:8bXIpCMeV7E3/XL0Ix123ATn3dB+0V7d9zklHbB0m78= +go.etcd.io/etcd/client/pkg/v3 v3.7.1 h1:rKYsj3pRkR0eK3yjT3XOgrhqfmIfj9pzNgxjh7mfFv4= +go.etcd.io/etcd/client/pkg/v3 v3.7.1/go.mod h1:cnzZGIUzSfjEwLC6UBVsSXlEK1eepS/JUD7wE6PLRT0= +go.etcd.io/etcd/client/v3 v3.7.1 h1:0PEMMC0KuZmVIN+RAbdqfkZ45pYTgKVtmBEbRCvZFUg= +go.etcd.io/etcd/client/v3 v3.7.1/go.mod h1:ffNqALa8tRCYhYo1F9oR489y23K39Gz+BSR3ApAGYq0= go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64= go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y= -go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I= -go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0= -go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM= -go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY= -go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg= -go.opentelemetry.io/otel/sdk v1.43.0/go.mod h1:P+IkVU3iWukmiit/Yf9AWvpyRDlUeBaRg6Y+C58QHzg= -go.opentelemetry.io/otel/sdk/metric v1.43.0 h1:S88dyqXjJkuBNLeMcVPRFXpRw2fuwdvfCGLEo89fDkw= -go.opentelemetry.io/otel/sdk/metric v1.43.0/go.mod h1:C/RJtwSEJ5hzTiUz5pXF1kILHStzb9zFlIEe85bhj6A= -go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A= -go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0= +go.opentelemetry.io/otel v1.45.0 h1:pdrWmLHofpubmArBv1LgFSv1Z0Ie/ppdZzu+kUN5EeU= +go.opentelemetry.io/otel v1.45.0/go.mod h1:XZxIqPapzEYnhNSScF5DIqXhm/rYi0FzCe2XddAwZfQ= +go.opentelemetry.io/otel/metric v1.45.0 h1:7Eg1uH7CJ5cXv9is6tnBe1FI6rj1nwUdbFypRm3br/M= +go.opentelemetry.io/otel/metric v1.45.0/go.mod h1:HAPbm1nd3p1PmFH7v2dR+6BjXxw+Lq4a2+pndMAm08s= +go.opentelemetry.io/otel/sdk v1.45.0 h1:4VVSMgQ83dUgW2aoX5f6JgLvHwIvzcuLnF9lUdCSpCw= +go.opentelemetry.io/otel/sdk v1.45.0/go.mod h1:Sr40LgXV7DsKMMJMKOhUWOgMWTfAaqvm2kF0g7ilwuA= +go.opentelemetry.io/otel/sdk/metric v1.44.0 h1:3LlKgI+VjbVsjNRFZJZAJ30WjXC5VkNRks6si09iEfI= +go.opentelemetry.io/otel/sdk/metric v1.44.0/go.mod h1:5B5pMARnXxKhltooO4xUuCBorl65a4EpnTalObqOigA= +go.opentelemetry.io/otel/trace v1.45.0 h1:l/mP6Uv7oNO7/TblbhpbgMidxhq1uO/rPsikOyVhxag= +go.opentelemetry.io/otel/trace v1.45.0/go.mod h1:qoJJA2xNMnxRrdISU/kLtfUH2wNeQbiv+jhs/CxI8bc= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= @@ -106,51 +100,26 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.28.0 h1:IZzaP1Fv73/T/pBMLk4VutPl36uNC+OSUh3JLG3FIjo= go.uber.org/zap v1.28.0/go.mod h1:rDLpOi171uODNm/mxFcuYWxDsqWSAVkFdX4XojSKg/Q= -go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= -go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.36.0 h1:JJjpVx6myfUsUdAzZuOSTTmRE0PfZeNWzzvKrP7amb4= -golang.org/x/mod v0.36.0/go.mod h1:moc6ELqsWcOw5Ef3xVprK5ul/MvtVvkIXLziUOICjUQ= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8= -golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -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.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4= -golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY= -golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc= -golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -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= +go.yaml.in/yaml/v3 v3.0.5 h1:N6y/pJk8buWs9NY5ERU2HSMfm+IuD/OtfdAnq6kESPw= +go.yaml.in/yaml/v3 v3.0.5/go.mod h1:HVTZu1O7/Vkt2N+BFy8Zza+lnLsABggaTM2ZpNIGuKg= +golang.org/x/mod v0.37.0 h1:vF1DjpVEshcIqoEaauuHebaLk1O1forxjxBaVn884JQ= +golang.org/x/mod v0.37.0/go.mod h1:m8S8VeM9r4dzDwjrKO0a1sZP3YjeMamRRlD+fmR2Q/0= +golang.org/x/net v0.57.0 h1:K5+3DljvIuDG9/Jv9rvyMywYNFCQ9RSUY6OOTTkT+tE= +golang.org/x/net v0.57.0/go.mod h1:KpXc8iv+r3XplLAG/f7Jsf9RPszJzdR0f58q9vGOuEU= +golang.org/x/sync v0.22.0 h1:SZjpbeLmrCk4xhRSZFNZW5gFUeCeFgjekvI/+gfScek= +golang.org/x/sync v0.22.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= +golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs= +golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +golang.org/x/text v0.40.0 h1:Ub2Z6/xjgF1WrYQz2nuITOEegKFtiIy+rieRJ5lHZKs= +golang.org/x/text v0.40.0/go.mod h1:hpnzDAfGV753zIKo+wk3u1bVKCGPbrnF7+7LBF/UHVY= gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4= gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E= -google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa h1:Kjn0N0tCrDgiAFW+lGO4JZ3ck44CehvJQMAwj9QF0G8= -google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:q4lMZS6kskjT5HvCPrnnypcDPVJqT/f4nfxmkE7gryY= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa h1:mZHHdPZl0dbGHCflZgAq/Q468DWVFcU2whhB2KAo8fk= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= -google.golang.org/grpc v1.81.1 h1:VnnIIZ88UzOOKLukQi+ImGz8O1Wdp8nAGGnvOfEIWQQ= -google.golang.org/grpc v1.81.1/go.mod h1:xGH9GfzOyMTGIOXBJmXt+BX/V0kcdQbdcuwQ/zNw42I= +google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea h1:Jifw/kjs/r3B0uszvls/m3c3tmZs2YHGM9C+rvxP9gY= +google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea/go.mod h1:K/+WGbmBY7aNW1HDw1fJnKYo10i0DkAX6pows00dLig= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea h1:kVhQEPTpKQahD5+JSBTfBB19wcgQTTjAIn45MBqnyHk= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= +google.golang.org/grpc v1.83.0 h1:JeNZEKJFbQxArAMl+hiytHauacDNqJUllNfmIMmpqnQ= +google.golang.org/grpc v1.83.0/go.mod h1:kDyl6SKsiHKt0uylY5gtn5cEjkrIOhQOGDgIc4JGwzQ= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.2 h1:rgSNvqscFZ1JgV/4wH5GOsZFSFkR2Eua9As3KIr2LlM= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.2/go.mod h1:iMEtFwDlAhjDU9L5mY6U1XLwlIId/G3h+QcBHDIvrJ8= google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE= @@ -163,9 +132,11 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gorm.io/driver/mysql v1.6.0 h1:eNbLmNTpPpTOVZi8MMxCi2aaIm0ZpInbORNXDwyLGvg= gorm.io/driver/mysql v1.6.0/go.mod h1:D/oCC2GWK3M/dqoLxnOlaNKmXz8WNTfcS9y5ovaSqKo= -gorm.io/driver/postgres v1.6.0 h1:2dxzU8xJ+ivvqTRph34QX+WrRaJlmfyPqXmoGVjMBa4= -gorm.io/driver/postgres v1.6.0/go.mod h1:vUw0mrGgrTK+uPHEhAdV4sfFELrByKVGnaVRkXDhtWo= -gorm.io/gorm v1.31.1 h1:7CA8FTFz/gRfgqgpeKIBcervUn3xSyPUmr6B2WXJ7kg= -gorm.io/gorm v1.31.1/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs= +gorm.io/driver/postgres v1.6.2 h1:BvXQ/cNUg63q5TFNg672DmDcowZSFrNLkkA3Xe6GXq4= +gorm.io/driver/postgres v1.6.2/go.mod h1:0c4fQA44XhOklXDkgtuKqysHCycTa5i9e3EIpDGCwXk= +gorm.io/driver/sqlite v1.6.0 h1:WHRRrIiulaPiPFmDcod6prc4l2VGVWHz80KspNsxSfQ= +gorm.io/driver/sqlite v1.6.0/go.mod h1:AO9V1qIQddBESngQUKWL9yoH93HIeA1X6V633rBwyT8= +gorm.io/gorm v1.31.2 h1:3o8FXNo9v9S858gil+3LlZA1LkCOzgb4g5BL64FgaCo= +gorm.io/gorm v1.31.2/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs= gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU= gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU= diff --git a/apps/ec/mall/internal/config/config.go b/module/ec/mall/internal/config/config.go similarity index 100% rename from apps/ec/mall/internal/config/config.go rename to module/ec/mall/internal/config/config.go diff --git a/apps/ec/mall/internal/excode/ex.go b/module/ec/mall/internal/excode/ex.go similarity index 100% rename from apps/ec/mall/internal/excode/ex.go rename to module/ec/mall/internal/excode/ex.go diff --git a/apps/ec/mall/internal/impl/impl.go b/module/ec/mall/internal/impl/impl.go similarity index 94% rename from apps/ec/mall/internal/impl/impl.go rename to module/ec/mall/internal/impl/impl.go index ba0b273..ad6aad0 100644 --- a/apps/ec/mall/internal/impl/impl.go +++ b/module/ec/mall/internal/impl/impl.go @@ -1,7 +1,7 @@ package impl import ( - "git.apinb.com/bsm-ec/mall/internal/config" + "bsm/full/module/ec/mall/internal/config" "git.apinb.com/bsm-sdk/core/cache/redis" "git.apinb.com/bsm-sdk/core/with" cache "github.com/patrickmn/go-cache" diff --git a/apps/ec/mall/internal/logic/ads/by_pos.go b/module/ec/mall/internal/logic/ads/by_pos.go similarity index 82% rename from apps/ec/mall/internal/logic/ads/by_pos.go rename to module/ec/mall/internal/logic/ads/by_pos.go index e985771..82e7ec2 100644 --- a/apps/ec/mall/internal/logic/ads/by_pos.go +++ b/module/ec/mall/internal/logic/ads/by_pos.go @@ -3,9 +3,9 @@ package ads import ( "context" - "git.apinb.com/bsm-ec/mall/internal/impl" - "git.apinb.com/bsm-ec/mall/internal/models" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/impl" + "bsm/full/module/ec/mall/internal/models" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" ) diff --git a/apps/ec/mall/internal/logic/ads/create.go b/module/ec/mall/internal/logic/ads/create.go similarity index 90% rename from apps/ec/mall/internal/logic/ads/create.go rename to module/ec/mall/internal/logic/ads/create.go index 9405f71..c5e2920 100644 --- a/apps/ec/mall/internal/logic/ads/create.go +++ b/module/ec/mall/internal/logic/ads/create.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-ec/mall/internal/impl" - "git.apinb.com/bsm-ec/mall/internal/models" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/impl" + "bsm/full/module/ec/mall/internal/models" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/mall/internal/logic/ads/delete.go b/module/ec/mall/internal/logic/ads/delete.go similarity index 87% rename from apps/ec/mall/internal/logic/ads/delete.go rename to module/ec/mall/internal/logic/ads/delete.go index bc2f169..abace77 100644 --- a/apps/ec/mall/internal/logic/ads/delete.go +++ b/module/ec/mall/internal/logic/ads/delete.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-ec/mall/internal/impl" - "git.apinb.com/bsm-ec/mall/internal/models" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/impl" + "bsm/full/module/ec/mall/internal/models" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/mall/internal/logic/ads/fetch.go b/module/ec/mall/internal/logic/ads/fetch.go similarity index 89% rename from apps/ec/mall/internal/logic/ads/fetch.go rename to module/ec/mall/internal/logic/ads/fetch.go index 08b82c8..10cc154 100644 --- a/apps/ec/mall/internal/logic/ads/fetch.go +++ b/module/ec/mall/internal/logic/ads/fetch.go @@ -3,9 +3,9 @@ package ads import ( "context" - "git.apinb.com/bsm-ec/mall/internal/impl" - "git.apinb.com/bsm-ec/mall/internal/models" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/impl" + "bsm/full/module/ec/mall/internal/models" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" ) diff --git a/apps/ec/mall/internal/logic/ads/modify.go b/module/ec/mall/internal/logic/ads/modify.go similarity index 89% rename from apps/ec/mall/internal/logic/ads/modify.go rename to module/ec/mall/internal/logic/ads/modify.go index 8c9c08e..6dff089 100644 --- a/apps/ec/mall/internal/logic/ads/modify.go +++ b/module/ec/mall/internal/logic/ads/modify.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-ec/mall/internal/impl" - "git.apinb.com/bsm-ec/mall/internal/models" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/impl" + "bsm/full/module/ec/mall/internal/models" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/mall/internal/logic/ads/ref.go b/module/ec/mall/internal/logic/ads/ref.go similarity index 85% rename from apps/ec/mall/internal/logic/ads/ref.go rename to module/ec/mall/internal/logic/ads/ref.go index 6bec6be..d521282 100644 --- a/apps/ec/mall/internal/logic/ads/ref.go +++ b/module/ec/mall/internal/logic/ads/ref.go @@ -1,8 +1,8 @@ package ads import ( - "git.apinb.com/bsm-ec/mall/internal/models" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/models" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/vars" ) diff --git a/apps/ec/mall/internal/logic/category/create.go b/module/ec/mall/internal/logic/category/create.go similarity index 93% rename from apps/ec/mall/internal/logic/category/create.go rename to module/ec/mall/internal/logic/category/create.go index db820da..268b20b 100644 --- a/apps/ec/mall/internal/logic/category/create.go +++ b/module/ec/mall/internal/logic/category/create.go @@ -4,8 +4,8 @@ import ( "context" "time" - "git.apinb.com/bsm-ec/mall/internal/impl" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/impl" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/mall/internal/logic/category/delete.go b/module/ec/mall/internal/logic/category/delete.go similarity index 87% rename from apps/ec/mall/internal/logic/category/delete.go rename to module/ec/mall/internal/logic/category/delete.go index c4c3450..23f421c 100644 --- a/apps/ec/mall/internal/logic/category/delete.go +++ b/module/ec/mall/internal/logic/category/delete.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-ec/mall/internal/impl" - "git.apinb.com/bsm-ec/mall/internal/models" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/impl" + "bsm/full/module/ec/mall/internal/models" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/mall/internal/logic/category/fetch.go b/module/ec/mall/internal/logic/category/fetch.go similarity index 89% rename from apps/ec/mall/internal/logic/category/fetch.go rename to module/ec/mall/internal/logic/category/fetch.go index c2c2fed..3e54e07 100644 --- a/apps/ec/mall/internal/logic/category/fetch.go +++ b/module/ec/mall/internal/logic/category/fetch.go @@ -3,8 +3,8 @@ package category import ( "context" - "git.apinb.com/bsm-ec/mall/internal/models" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/models" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" ) diff --git a/apps/ec/mall/internal/logic/category/modify.go b/module/ec/mall/internal/logic/category/modify.go similarity index 92% rename from apps/ec/mall/internal/logic/category/modify.go rename to module/ec/mall/internal/logic/category/modify.go index bdf6dbb..0659668 100644 --- a/apps/ec/mall/internal/logic/category/modify.go +++ b/module/ec/mall/internal/logic/category/modify.go @@ -4,8 +4,8 @@ import ( "context" "time" - "git.apinb.com/bsm-ec/mall/internal/impl" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/impl" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/mall/internal/logic/category/ref.go b/module/ec/mall/internal/logic/category/ref.go similarity index 92% rename from apps/ec/mall/internal/logic/category/ref.go rename to module/ec/mall/internal/logic/category/ref.go index 8c3948a..f84c4f4 100644 --- a/apps/ec/mall/internal/logic/category/ref.go +++ b/module/ec/mall/internal/logic/category/ref.go @@ -3,8 +3,8 @@ package category import ( "encoding/json" - "git.apinb.com/bsm-ec/mall/internal/models" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/models" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/vars" ) diff --git a/apps/ec/mall/internal/logic/freight/create.go b/module/ec/mall/internal/logic/freight/create.go similarity index 94% rename from apps/ec/mall/internal/logic/freight/create.go rename to module/ec/mall/internal/logic/freight/create.go index 719c2c8..7f649f3 100644 --- a/apps/ec/mall/internal/logic/freight/create.go +++ b/module/ec/mall/internal/logic/freight/create.go @@ -4,7 +4,7 @@ import ( "context" "time" - pb "git.apinb.com/bsm-ec/mall/pb" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/ec/mall/internal/logic/freight/delete.go b/module/ec/mall/internal/logic/freight/delete.go similarity index 94% rename from apps/ec/mall/internal/logic/freight/delete.go rename to module/ec/mall/internal/logic/freight/delete.go index 0bfc7fd..e1e672f 100644 --- a/apps/ec/mall/internal/logic/freight/delete.go +++ b/module/ec/mall/internal/logic/freight/delete.go @@ -4,7 +4,7 @@ import ( "context" "time" - pb "git.apinb.com/bsm-ec/mall/pb" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/ec/mall/internal/logic/freight/deny_region_create.go b/module/ec/mall/internal/logic/freight/deny_region_create.go similarity index 94% rename from apps/ec/mall/internal/logic/freight/deny_region_create.go rename to module/ec/mall/internal/logic/freight/deny_region_create.go index f808272..343ca8a 100644 --- a/apps/ec/mall/internal/logic/freight/deny_region_create.go +++ b/module/ec/mall/internal/logic/freight/deny_region_create.go @@ -4,7 +4,7 @@ import ( "context" "time" - pb "git.apinb.com/bsm-ec/mall/pb" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/ec/mall/internal/logic/freight/deny_region_delete.go b/module/ec/mall/internal/logic/freight/deny_region_delete.go similarity index 94% rename from apps/ec/mall/internal/logic/freight/deny_region_delete.go rename to module/ec/mall/internal/logic/freight/deny_region_delete.go index 42d2fac..e19bfce 100644 --- a/apps/ec/mall/internal/logic/freight/deny_region_delete.go +++ b/module/ec/mall/internal/logic/freight/deny_region_delete.go @@ -2,7 +2,7 @@ package freight import ( "context" - pb "git.apinb.com/bsm-ec/mall/pb" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/service" "time" diff --git a/apps/ec/mall/internal/logic/freight/deny_region_fetch.go b/module/ec/mall/internal/logic/freight/deny_region_fetch.go similarity index 94% rename from apps/ec/mall/internal/logic/freight/deny_region_fetch.go rename to module/ec/mall/internal/logic/freight/deny_region_fetch.go index fb4c935..5130d6d 100644 --- a/apps/ec/mall/internal/logic/freight/deny_region_fetch.go +++ b/module/ec/mall/internal/logic/freight/deny_region_fetch.go @@ -3,7 +3,7 @@ package freight import ( "context" - pb "git.apinb.com/bsm-ec/mall/pb" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/ec/mall/internal/logic/freight/deny_region_modify.go b/module/ec/mall/internal/logic/freight/deny_region_modify.go similarity index 93% rename from apps/ec/mall/internal/logic/freight/deny_region_modify.go rename to module/ec/mall/internal/logic/freight/deny_region_modify.go index 5524eeb..73fc359 100644 --- a/apps/ec/mall/internal/logic/freight/deny_region_modify.go +++ b/module/ec/mall/internal/logic/freight/deny_region_modify.go @@ -4,7 +4,7 @@ import ( "context" "time" - pb "git.apinb.com/bsm-ec/mall/pb" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/ec/mall/internal/logic/freight/deny_region_remove.go b/module/ec/mall/internal/logic/freight/deny_region_remove.go similarity index 95% rename from apps/ec/mall/internal/logic/freight/deny_region_remove.go rename to module/ec/mall/internal/logic/freight/deny_region_remove.go index 65a98d3..f67e667 100644 --- a/apps/ec/mall/internal/logic/freight/deny_region_remove.go +++ b/module/ec/mall/internal/logic/freight/deny_region_remove.go @@ -4,7 +4,7 @@ import ( "context" "time" - pb "git.apinb.com/bsm-ec/mall/pb" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/ec/mall/internal/logic/freight/detail.go b/module/ec/mall/internal/logic/freight/detail.go similarity index 94% rename from apps/ec/mall/internal/logic/freight/detail.go rename to module/ec/mall/internal/logic/freight/detail.go index 00ad9f4..dc32d13 100644 --- a/apps/ec/mall/internal/logic/freight/detail.go +++ b/module/ec/mall/internal/logic/freight/detail.go @@ -3,7 +3,7 @@ package freight import ( "context" - pb "git.apinb.com/bsm-ec/mall/pb" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/ec/mall/internal/logic/freight/fetch.go b/module/ec/mall/internal/logic/freight/fetch.go similarity index 94% rename from apps/ec/mall/internal/logic/freight/fetch.go rename to module/ec/mall/internal/logic/freight/fetch.go index 62d08ef..8c3526f 100644 --- a/apps/ec/mall/internal/logic/freight/fetch.go +++ b/module/ec/mall/internal/logic/freight/fetch.go @@ -3,7 +3,7 @@ package freight import ( "context" - pb "git.apinb.com/bsm-ec/mall/pb" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/ec/mall/internal/logic/freight/modify.go b/module/ec/mall/internal/logic/freight/modify.go similarity index 94% rename from apps/ec/mall/internal/logic/freight/modify.go rename to module/ec/mall/internal/logic/freight/modify.go index 1b6f7fa..368781e 100644 --- a/apps/ec/mall/internal/logic/freight/modify.go +++ b/module/ec/mall/internal/logic/freight/modify.go @@ -4,7 +4,7 @@ import ( "context" "time" - pb "git.apinb.com/bsm-ec/mall/pb" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/ec/mall/internal/logic/freight/remove.go b/module/ec/mall/internal/logic/freight/remove.go similarity index 87% rename from apps/ec/mall/internal/logic/freight/remove.go rename to module/ec/mall/internal/logic/freight/remove.go index 89b5e4d..91b26fd 100644 --- a/apps/ec/mall/internal/logic/freight/remove.go +++ b/module/ec/mall/internal/logic/freight/remove.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-ec/mall/internal/impl" - "git.apinb.com/bsm-ec/mall/internal/models" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/impl" + "bsm/full/module/ec/mall/internal/models" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/mall/internal/logic/notice/create.go b/module/ec/mall/internal/logic/notice/create.go similarity index 90% rename from apps/ec/mall/internal/logic/notice/create.go rename to module/ec/mall/internal/logic/notice/create.go index c46b1a4..a806a00 100644 --- a/apps/ec/mall/internal/logic/notice/create.go +++ b/module/ec/mall/internal/logic/notice/create.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-ec/mall/internal/impl" - "git.apinb.com/bsm-ec/mall/internal/models" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/impl" + "bsm/full/module/ec/mall/internal/models" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/mall/internal/logic/notice/delete.go b/module/ec/mall/internal/logic/notice/delete.go similarity index 87% rename from apps/ec/mall/internal/logic/notice/delete.go rename to module/ec/mall/internal/logic/notice/delete.go index 468b0a7..d9fb28b 100644 --- a/apps/ec/mall/internal/logic/notice/delete.go +++ b/module/ec/mall/internal/logic/notice/delete.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-ec/mall/internal/impl" - "git.apinb.com/bsm-ec/mall/internal/models" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/impl" + "bsm/full/module/ec/mall/internal/models" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/mall/internal/logic/notice/fetch.go b/module/ec/mall/internal/logic/notice/fetch.go similarity index 89% rename from apps/ec/mall/internal/logic/notice/fetch.go rename to module/ec/mall/internal/logic/notice/fetch.go index 4c4ffdd..a8b29eb 100644 --- a/apps/ec/mall/internal/logic/notice/fetch.go +++ b/module/ec/mall/internal/logic/notice/fetch.go @@ -3,9 +3,9 @@ package notice import ( "context" - "git.apinb.com/bsm-ec/mall/internal/impl" - "git.apinb.com/bsm-ec/mall/internal/models" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/impl" + "bsm/full/module/ec/mall/internal/models" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" ) diff --git a/apps/ec/mall/internal/logic/notice/modify.go b/module/ec/mall/internal/logic/notice/modify.go similarity index 89% rename from apps/ec/mall/internal/logic/notice/modify.go rename to module/ec/mall/internal/logic/notice/modify.go index 3ec6a89..8e52a82 100644 --- a/apps/ec/mall/internal/logic/notice/modify.go +++ b/module/ec/mall/internal/logic/notice/modify.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-ec/mall/internal/impl" - "git.apinb.com/bsm-ec/mall/internal/models" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/impl" + "bsm/full/module/ec/mall/internal/models" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/mall/internal/logic/notice/ref.go b/module/ec/mall/internal/logic/notice/ref.go similarity index 87% rename from apps/ec/mall/internal/logic/notice/ref.go rename to module/ec/mall/internal/logic/notice/ref.go index 041995f..76c44f8 100644 --- a/apps/ec/mall/internal/logic/notice/ref.go +++ b/module/ec/mall/internal/logic/notice/ref.go @@ -1,8 +1,8 @@ package notice import ( - "git.apinb.com/bsm-ec/mall/internal/models" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/models" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/vars" ) diff --git a/apps/ec/mall/internal/logic/product/comment_create.go b/module/ec/mall/internal/logic/product/comment_create.go similarity index 93% rename from apps/ec/mall/internal/logic/product/comment_create.go rename to module/ec/mall/internal/logic/product/comment_create.go index 30be613..92516c0 100644 --- a/apps/ec/mall/internal/logic/product/comment_create.go +++ b/module/ec/mall/internal/logic/product/comment_create.go @@ -5,9 +5,9 @@ import ( "encoding/json" "time" - "git.apinb.com/bsm-ec/mall/internal/impl" - "git.apinb.com/bsm-ec/mall/internal/models" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/impl" + "bsm/full/module/ec/mall/internal/models" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/mall/internal/logic/product/comment_delete.go b/module/ec/mall/internal/logic/product/comment_delete.go similarity index 87% rename from apps/ec/mall/internal/logic/product/comment_delete.go rename to module/ec/mall/internal/logic/product/comment_delete.go index 7f794a9..8a0d389 100644 --- a/apps/ec/mall/internal/logic/product/comment_delete.go +++ b/module/ec/mall/internal/logic/product/comment_delete.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-ec/mall/internal/impl" - "git.apinb.com/bsm-ec/mall/internal/models" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/impl" + "bsm/full/module/ec/mall/internal/models" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/mall/internal/logic/product/comment_fetch.go b/module/ec/mall/internal/logic/product/comment_fetch.go similarity index 95% rename from apps/ec/mall/internal/logic/product/comment_fetch.go rename to module/ec/mall/internal/logic/product/comment_fetch.go index 79f6c17..bc16e77 100644 --- a/apps/ec/mall/internal/logic/product/comment_fetch.go +++ b/module/ec/mall/internal/logic/product/comment_fetch.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-ec/mall/internal/impl" - "git.apinb.com/bsm-ec/mall/internal/models" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/impl" + "bsm/full/module/ec/mall/internal/models" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" ) diff --git a/apps/ec/mall/internal/logic/product/comment_modify.go b/module/ec/mall/internal/logic/product/comment_modify.go similarity index 92% rename from apps/ec/mall/internal/logic/product/comment_modify.go rename to module/ec/mall/internal/logic/product/comment_modify.go index 30c8ff5..9444f4e 100644 --- a/apps/ec/mall/internal/logic/product/comment_modify.go +++ b/module/ec/mall/internal/logic/product/comment_modify.go @@ -4,8 +4,8 @@ import ( "context" "time" - "git.apinb.com/bsm-ec/mall/internal/impl" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/impl" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/mall/internal/logic/product/comment_re.go b/module/ec/mall/internal/logic/product/comment_re.go similarity index 91% rename from apps/ec/mall/internal/logic/product/comment_re.go rename to module/ec/mall/internal/logic/product/comment_re.go index d8b7812..94b7ca4 100644 --- a/apps/ec/mall/internal/logic/product/comment_re.go +++ b/module/ec/mall/internal/logic/product/comment_re.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-ec/mall/internal/impl" - "git.apinb.com/bsm-ec/mall/internal/models" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/impl" + "bsm/full/module/ec/mall/internal/models" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/types" diff --git a/apps/ec/mall/internal/logic/product/item_batch_op.go b/module/ec/mall/internal/logic/product/item_batch_op.go similarity index 87% rename from apps/ec/mall/internal/logic/product/item_batch_op.go rename to module/ec/mall/internal/logic/product/item_batch_op.go index 9d89737..fc48c68 100644 --- a/apps/ec/mall/internal/logic/product/item_batch_op.go +++ b/module/ec/mall/internal/logic/product/item_batch_op.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-ec/mall/internal/impl" - "git.apinb.com/bsm-ec/mall/internal/models" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/impl" + "bsm/full/module/ec/mall/internal/models" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/mall/internal/logic/product/item_create.go b/module/ec/mall/internal/logic/product/item_create.go similarity index 98% rename from apps/ec/mall/internal/logic/product/item_create.go rename to module/ec/mall/internal/logic/product/item_create.go index 5e88eca..2349486 100644 --- a/apps/ec/mall/internal/logic/product/item_create.go +++ b/module/ec/mall/internal/logic/product/item_create.go @@ -4,8 +4,8 @@ import ( "context" "time" - "git.apinb.com/bsm-ec/mall/internal/models" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/models" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/crypto/token" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" diff --git a/apps/ec/mall/internal/logic/product/item_delete.go b/module/ec/mall/internal/logic/product/item_delete.go similarity index 87% rename from apps/ec/mall/internal/logic/product/item_delete.go rename to module/ec/mall/internal/logic/product/item_delete.go index 2461fb9..e7c7f02 100644 --- a/apps/ec/mall/internal/logic/product/item_delete.go +++ b/module/ec/mall/internal/logic/product/item_delete.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-ec/mall/internal/impl" - "git.apinb.com/bsm-ec/mall/internal/models" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/impl" + "bsm/full/module/ec/mall/internal/models" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/mall/internal/logic/product/item_detail.go b/module/ec/mall/internal/logic/product/item_detail.go similarity index 90% rename from apps/ec/mall/internal/logic/product/item_detail.go rename to module/ec/mall/internal/logic/product/item_detail.go index b4f2f69..627fe51 100644 --- a/apps/ec/mall/internal/logic/product/item_detail.go +++ b/module/ec/mall/internal/logic/product/item_detail.go @@ -3,9 +3,9 @@ package product import ( "context" - "git.apinb.com/bsm-ec/mall/internal/impl" - "git.apinb.com/bsm-ec/mall/internal/models" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/impl" + "bsm/full/module/ec/mall/internal/models" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" ) diff --git a/apps/ec/mall/internal/logic/product/item_detail_by_serial.go b/module/ec/mall/internal/logic/product/item_detail_by_serial.go similarity index 87% rename from apps/ec/mall/internal/logic/product/item_detail_by_serial.go rename to module/ec/mall/internal/logic/product/item_detail_by_serial.go index dd9c8d5..c9c53d9 100644 --- a/apps/ec/mall/internal/logic/product/item_detail_by_serial.go +++ b/module/ec/mall/internal/logic/product/item_detail_by_serial.go @@ -4,9 +4,9 @@ import ( "context" "errors" - "git.apinb.com/bsm-ec/mall/internal/impl" - "git.apinb.com/bsm-ec/mall/internal/models" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/impl" + "bsm/full/module/ec/mall/internal/models" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "gorm.io/gorm" diff --git a/apps/ec/mall/internal/logic/product/item_detail_by_spec.go b/module/ec/mall/internal/logic/product/item_detail_by_spec.go similarity index 91% rename from apps/ec/mall/internal/logic/product/item_detail_by_spec.go rename to module/ec/mall/internal/logic/product/item_detail_by_spec.go index e434a67..1860e00 100644 --- a/apps/ec/mall/internal/logic/product/item_detail_by_spec.go +++ b/module/ec/mall/internal/logic/product/item_detail_by_spec.go @@ -3,7 +3,7 @@ package product import ( "context" - pb "git.apinb.com/bsm-ec/mall/pb" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" ) diff --git a/apps/ec/mall/internal/logic/product/item_fetch.go b/module/ec/mall/internal/logic/product/item_fetch.go similarity index 96% rename from apps/ec/mall/internal/logic/product/item_fetch.go rename to module/ec/mall/internal/logic/product/item_fetch.go index 3dd4ad1..7f5702b 100644 --- a/apps/ec/mall/internal/logic/product/item_fetch.go +++ b/module/ec/mall/internal/logic/product/item_fetch.go @@ -3,9 +3,9 @@ package product import ( "context" - "git.apinb.com/bsm-ec/mall/internal/impl" - "git.apinb.com/bsm-ec/mall/internal/models" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/impl" + "bsm/full/module/ec/mall/internal/models" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "gorm.io/gorm" diff --git a/apps/ec/mall/internal/logic/product/item_modify.go b/module/ec/mall/internal/logic/product/item_modify.go similarity index 88% rename from apps/ec/mall/internal/logic/product/item_modify.go rename to module/ec/mall/internal/logic/product/item_modify.go index 9a9fabd..9162167 100644 --- a/apps/ec/mall/internal/logic/product/item_modify.go +++ b/module/ec/mall/internal/logic/product/item_modify.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-ec/mall/internal/impl" - "git.apinb.com/bsm-ec/mall/internal/models" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/impl" + "bsm/full/module/ec/mall/internal/models" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/mall/internal/logic/product/photo_create.go b/module/ec/mall/internal/logic/product/photo_create.go similarity index 89% rename from apps/ec/mall/internal/logic/product/photo_create.go rename to module/ec/mall/internal/logic/product/photo_create.go index 6b83fe0..2c76161 100644 --- a/apps/ec/mall/internal/logic/product/photo_create.go +++ b/module/ec/mall/internal/logic/product/photo_create.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-ec/mall/internal/impl" - "git.apinb.com/bsm-ec/mall/internal/models" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/impl" + "bsm/full/module/ec/mall/internal/models" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/mall/internal/logic/product/photo_delete.go b/module/ec/mall/internal/logic/product/photo_delete.go similarity index 88% rename from apps/ec/mall/internal/logic/product/photo_delete.go rename to module/ec/mall/internal/logic/product/photo_delete.go index 600fb7b..9c037a8 100644 --- a/apps/ec/mall/internal/logic/product/photo_delete.go +++ b/module/ec/mall/internal/logic/product/photo_delete.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-ec/mall/internal/impl" - "git.apinb.com/bsm-ec/mall/internal/models" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/impl" + "bsm/full/module/ec/mall/internal/models" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/mall/internal/logic/product/photo_list.go b/module/ec/mall/internal/logic/product/photo_list.go similarity index 88% rename from apps/ec/mall/internal/logic/product/photo_list.go rename to module/ec/mall/internal/logic/product/photo_list.go index 3bc94c9..0bb1f28 100644 --- a/apps/ec/mall/internal/logic/product/photo_list.go +++ b/module/ec/mall/internal/logic/product/photo_list.go @@ -3,9 +3,9 @@ package product import ( "context" - "git.apinb.com/bsm-ec/mall/internal/impl" - "git.apinb.com/bsm-ec/mall/internal/models" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/impl" + "bsm/full/module/ec/mall/internal/models" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" ) diff --git a/apps/ec/mall/internal/logic/product/ref.go b/module/ec/mall/internal/logic/product/ref.go similarity index 98% rename from apps/ec/mall/internal/logic/product/ref.go rename to module/ec/mall/internal/logic/product/ref.go index 1e5cd07..4756c25 100644 --- a/apps/ec/mall/internal/logic/product/ref.go +++ b/module/ec/mall/internal/logic/product/ref.go @@ -1,8 +1,8 @@ package product import ( - "git.apinb.com/bsm-ec/mall/internal/models" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/models" + pb "bsm/full/module/ec/mall/pb" ) func ModelsToProductItems(data []*models.MallProduct) (list []*pb.ProductItem) { diff --git a/apps/ec/mall/internal/logic/product/spec_create.go b/module/ec/mall/internal/logic/product/spec_create.go similarity index 95% rename from apps/ec/mall/internal/logic/product/spec_create.go rename to module/ec/mall/internal/logic/product/spec_create.go index bea4e48..6ac71c7 100644 --- a/apps/ec/mall/internal/logic/product/spec_create.go +++ b/module/ec/mall/internal/logic/product/spec_create.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-ec/mall/internal/impl" - "git.apinb.com/bsm-ec/mall/internal/models" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/impl" + "bsm/full/module/ec/mall/internal/models" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/mall/internal/logic/product/spec_delete.go b/module/ec/mall/internal/logic/product/spec_delete.go similarity index 87% rename from apps/ec/mall/internal/logic/product/spec_delete.go rename to module/ec/mall/internal/logic/product/spec_delete.go index 0dbfbde..f476082 100644 --- a/apps/ec/mall/internal/logic/product/spec_delete.go +++ b/module/ec/mall/internal/logic/product/spec_delete.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-ec/mall/internal/impl" - "git.apinb.com/bsm-ec/mall/internal/models" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/impl" + "bsm/full/module/ec/mall/internal/models" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/mall/internal/logic/product/spec_detail.go b/module/ec/mall/internal/logic/product/spec_detail.go similarity index 89% rename from apps/ec/mall/internal/logic/product/spec_detail.go rename to module/ec/mall/internal/logic/product/spec_detail.go index 3d08d86..6cf98d9 100644 --- a/apps/ec/mall/internal/logic/product/spec_detail.go +++ b/module/ec/mall/internal/logic/product/spec_detail.go @@ -3,9 +3,9 @@ package product import ( "context" - "git.apinb.com/bsm-ec/mall/internal/impl" - "git.apinb.com/bsm-ec/mall/internal/models" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/impl" + "bsm/full/module/ec/mall/internal/models" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" ) diff --git a/apps/ec/mall/internal/logic/product/spec_fetch.go b/module/ec/mall/internal/logic/product/spec_fetch.go similarity index 88% rename from apps/ec/mall/internal/logic/product/spec_fetch.go rename to module/ec/mall/internal/logic/product/spec_fetch.go index 5359ffb..e523820 100644 --- a/apps/ec/mall/internal/logic/product/spec_fetch.go +++ b/module/ec/mall/internal/logic/product/spec_fetch.go @@ -3,9 +3,9 @@ package product import ( "context" - "git.apinb.com/bsm-ec/mall/internal/impl" - "git.apinb.com/bsm-ec/mall/internal/models" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/impl" + "bsm/full/module/ec/mall/internal/models" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/mall/internal/logic/product/spec_modify.go b/module/ec/mall/internal/logic/product/spec_modify.go similarity index 94% rename from apps/ec/mall/internal/logic/product/spec_modify.go rename to module/ec/mall/internal/logic/product/spec_modify.go index ea62b95..4db9133 100644 --- a/apps/ec/mall/internal/logic/product/spec_modify.go +++ b/module/ec/mall/internal/logic/product/spec_modify.go @@ -4,8 +4,8 @@ import ( "context" "time" - "git.apinb.com/bsm-ec/mall/internal/impl" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/impl" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/mall/internal/logic/staff/create.go b/module/ec/mall/internal/logic/staff/create.go similarity index 93% rename from apps/ec/mall/internal/logic/staff/create.go rename to module/ec/mall/internal/logic/staff/create.go index 6fa9514..672e580 100644 --- a/apps/ec/mall/internal/logic/staff/create.go +++ b/module/ec/mall/internal/logic/staff/create.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-ec/mall/internal/impl" - "git.apinb.com/bsm-ec/mall/internal/models" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/impl" + "bsm/full/module/ec/mall/internal/models" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/mall/internal/logic/staff/delete.go b/module/ec/mall/internal/logic/staff/delete.go similarity index 87% rename from apps/ec/mall/internal/logic/staff/delete.go rename to module/ec/mall/internal/logic/staff/delete.go index 6ad93a0..ed92cb4 100644 --- a/apps/ec/mall/internal/logic/staff/delete.go +++ b/module/ec/mall/internal/logic/staff/delete.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-ec/mall/internal/impl" - "git.apinb.com/bsm-ec/mall/internal/models" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/impl" + "bsm/full/module/ec/mall/internal/models" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/mall/internal/logic/staff/fetch.go b/module/ec/mall/internal/logic/staff/fetch.go similarity index 93% rename from apps/ec/mall/internal/logic/staff/fetch.go rename to module/ec/mall/internal/logic/staff/fetch.go index 58fcb01..36c8cd5 100644 --- a/apps/ec/mall/internal/logic/staff/fetch.go +++ b/module/ec/mall/internal/logic/staff/fetch.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-ec/mall/internal/impl" - "git.apinb.com/bsm-ec/mall/internal/models" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/impl" + "bsm/full/module/ec/mall/internal/models" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" ) diff --git a/apps/ec/mall/internal/logic/staff/get_profile.go b/module/ec/mall/internal/logic/staff/get_profile.go similarity index 90% rename from apps/ec/mall/internal/logic/staff/get_profile.go rename to module/ec/mall/internal/logic/staff/get_profile.go index 0f2b957..b57d9d2 100644 --- a/apps/ec/mall/internal/logic/staff/get_profile.go +++ b/module/ec/mall/internal/logic/staff/get_profile.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-ec/mall/internal/impl" - "git.apinb.com/bsm-ec/mall/internal/models" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/impl" + "bsm/full/module/ec/mall/internal/models" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/mall/internal/logic/staff/login.go b/module/ec/mall/internal/logic/staff/login.go similarity index 95% rename from apps/ec/mall/internal/logic/staff/login.go rename to module/ec/mall/internal/logic/staff/login.go index 3e646c4..5240734 100644 --- a/apps/ec/mall/internal/logic/staff/login.go +++ b/module/ec/mall/internal/logic/staff/login.go @@ -6,10 +6,10 @@ import ( "regexp" "time" - "git.apinb.com/bsm-ec/mall/internal/excode" - "git.apinb.com/bsm-ec/mall/internal/impl" - "git.apinb.com/bsm-ec/mall/internal/models" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/excode" + "bsm/full/module/ec/mall/internal/impl" + "bsm/full/module/ec/mall/internal/models" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/crypto/encipher" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" diff --git a/apps/ec/mall/internal/logic/staff/ref.go b/module/ec/mall/internal/logic/staff/ref.go similarity index 86% rename from apps/ec/mall/internal/logic/staff/ref.go rename to module/ec/mall/internal/logic/staff/ref.go index e7379c2..ffc5bd0 100644 --- a/apps/ec/mall/internal/logic/staff/ref.go +++ b/module/ec/mall/internal/logic/staff/ref.go @@ -3,8 +3,8 @@ package staff import ( "time" - "git.apinb.com/bsm-ec/mall/internal/models" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/models" + pb "bsm/full/module/ec/mall/pb" ) func ref(data []*models.MallStaff) (list []*pb.StaffItem) { diff --git a/apps/ec/mall/internal/logic/staff/set_password.go b/module/ec/mall/internal/logic/staff/set_password.go similarity index 88% rename from apps/ec/mall/internal/logic/staff/set_password.go rename to module/ec/mall/internal/logic/staff/set_password.go index 4f3e35e..4949060 100644 --- a/apps/ec/mall/internal/logic/staff/set_password.go +++ b/module/ec/mall/internal/logic/staff/set_password.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-ec/mall/internal/impl" - "git.apinb.com/bsm-ec/mall/internal/models" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/impl" + "bsm/full/module/ec/mall/internal/models" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/mall/internal/logic/staff/set_profile.go b/module/ec/mall/internal/logic/staff/set_profile.go similarity index 87% rename from apps/ec/mall/internal/logic/staff/set_profile.go rename to module/ec/mall/internal/logic/staff/set_profile.go index bee7d20..9258080 100644 --- a/apps/ec/mall/internal/logic/staff/set_profile.go +++ b/module/ec/mall/internal/logic/staff/set_profile.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-ec/mall/internal/impl" - "git.apinb.com/bsm-ec/mall/internal/models" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/impl" + "bsm/full/module/ec/mall/internal/models" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/mall/internal/logic/store/apply_join.go b/module/ec/mall/internal/logic/store/apply_join.go similarity index 93% rename from apps/ec/mall/internal/logic/store/apply_join.go rename to module/ec/mall/internal/logic/store/apply_join.go index 83318fd..12a9be2 100644 --- a/apps/ec/mall/internal/logic/store/apply_join.go +++ b/module/ec/mall/internal/logic/store/apply_join.go @@ -4,7 +4,7 @@ import ( "context" "time" - pb "git.apinb.com/bsm-ec/mall/pb" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/ec/mall/internal/logic/store/get_email.go b/module/ec/mall/internal/logic/store/get_email.go similarity index 85% rename from apps/ec/mall/internal/logic/store/get_email.go rename to module/ec/mall/internal/logic/store/get_email.go index c2735a4..3fb05b9 100644 --- a/apps/ec/mall/internal/logic/store/get_email.go +++ b/module/ec/mall/internal/logic/store/get_email.go @@ -3,9 +3,9 @@ package store import ( "context" - "git.apinb.com/bsm-ec/mall/internal/impl" - "git.apinb.com/bsm-ec/mall/internal/models" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/impl" + "bsm/full/module/ec/mall/internal/models" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/ec/mall/internal/logic/store/get_payment.go b/module/ec/mall/internal/logic/store/get_payment.go similarity index 85% rename from apps/ec/mall/internal/logic/store/get_payment.go rename to module/ec/mall/internal/logic/store/get_payment.go index a6ba8ce..adef667 100644 --- a/apps/ec/mall/internal/logic/store/get_payment.go +++ b/module/ec/mall/internal/logic/store/get_payment.go @@ -3,9 +3,9 @@ package store import ( "context" - "git.apinb.com/bsm-ec/mall/internal/impl" - "git.apinb.com/bsm-ec/mall/internal/models" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/impl" + "bsm/full/module/ec/mall/internal/models" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/ec/mall/internal/logic/store/get_setting.go b/module/ec/mall/internal/logic/store/get_setting.go similarity index 88% rename from apps/ec/mall/internal/logic/store/get_setting.go rename to module/ec/mall/internal/logic/store/get_setting.go index 4509ba0..8c99073 100644 --- a/apps/ec/mall/internal/logic/store/get_setting.go +++ b/module/ec/mall/internal/logic/store/get_setting.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-ec/mall/internal/impl" - "git.apinb.com/bsm-ec/mall/internal/models" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/impl" + "bsm/full/module/ec/mall/internal/models" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" ) diff --git a/apps/ec/mall/internal/logic/store/licensing.go b/module/ec/mall/internal/logic/store/licensing.go similarity index 88% rename from apps/ec/mall/internal/logic/store/licensing.go rename to module/ec/mall/internal/logic/store/licensing.go index f475911..6e035d6 100644 --- a/apps/ec/mall/internal/logic/store/licensing.go +++ b/module/ec/mall/internal/logic/store/licensing.go @@ -5,9 +5,9 @@ import ( "strings" "time" - "git.apinb.com/bsm-ec/mall/internal/impl" - "git.apinb.com/bsm-ec/mall/internal/models" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/impl" + "bsm/full/module/ec/mall/internal/models" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" ) diff --git a/apps/ec/mall/internal/logic/store/mini_code.go b/module/ec/mall/internal/logic/store/mini_code.go similarity index 92% rename from apps/ec/mall/internal/logic/store/mini_code.go rename to module/ec/mall/internal/logic/store/mini_code.go index aa8c70a..bb43824 100644 --- a/apps/ec/mall/internal/logic/store/mini_code.go +++ b/module/ec/mall/internal/logic/store/mini_code.go @@ -3,7 +3,7 @@ package store import ( "context" - pb "git.apinb.com/bsm-ec/mall/pb" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/ec/mall/internal/logic/store/search.go b/module/ec/mall/internal/logic/store/search.go similarity index 92% rename from apps/ec/mall/internal/logic/store/search.go rename to module/ec/mall/internal/logic/store/search.go index c429521..52e277a 100644 --- a/apps/ec/mall/internal/logic/store/search.go +++ b/module/ec/mall/internal/logic/store/search.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-ec/mall/internal/impl" - "git.apinb.com/bsm-ec/mall/internal/models" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/impl" + "bsm/full/module/ec/mall/internal/models" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/mall/internal/logic/store/set_email.go b/module/ec/mall/internal/logic/store/set_email.go similarity index 86% rename from apps/ec/mall/internal/logic/store/set_email.go rename to module/ec/mall/internal/logic/store/set_email.go index 14a1771..2506201 100644 --- a/apps/ec/mall/internal/logic/store/set_email.go +++ b/module/ec/mall/internal/logic/store/set_email.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-ec/mall/internal/impl" - "git.apinb.com/bsm-ec/mall/internal/models" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/impl" + "bsm/full/module/ec/mall/internal/models" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/mall/internal/logic/store/set_payment.go b/module/ec/mall/internal/logic/store/set_payment.go similarity index 86% rename from apps/ec/mall/internal/logic/store/set_payment.go rename to module/ec/mall/internal/logic/store/set_payment.go index 8f5a10f..c0a1305 100644 --- a/apps/ec/mall/internal/logic/store/set_payment.go +++ b/module/ec/mall/internal/logic/store/set_payment.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-ec/mall/internal/impl" - "git.apinb.com/bsm-ec/mall/internal/models" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/impl" + "bsm/full/module/ec/mall/internal/models" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/mall/internal/logic/store/set_setting.go b/module/ec/mall/internal/logic/store/set_setting.go similarity index 89% rename from apps/ec/mall/internal/logic/store/set_setting.go rename to module/ec/mall/internal/logic/store/set_setting.go index eed85c5..c5ed4b0 100644 --- a/apps/ec/mall/internal/logic/store/set_setting.go +++ b/module/ec/mall/internal/logic/store/set_setting.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-ec/mall/internal/impl" - "git.apinb.com/bsm-ec/mall/internal/models" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/impl" + "bsm/full/module/ec/mall/internal/models" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/ec/mall/internal/models/mall_ads.go b/module/ec/mall/internal/models/mall_ads.go similarity index 100% rename from apps/ec/mall/internal/models/mall_ads.go rename to module/ec/mall/internal/models/mall_ads.go diff --git a/apps/ec/mall/internal/models/mall_apply.go b/module/ec/mall/internal/models/mall_apply.go similarity index 100% rename from apps/ec/mall/internal/models/mall_apply.go rename to module/ec/mall/internal/models/mall_apply.go diff --git a/apps/ec/mall/internal/models/mall_category.go b/module/ec/mall/internal/models/mall_category.go similarity index 100% rename from apps/ec/mall/internal/models/mall_category.go rename to module/ec/mall/internal/models/mall_category.go diff --git a/apps/ec/mall/internal/models/mall_freight.go b/module/ec/mall/internal/models/mall_freight.go similarity index 100% rename from apps/ec/mall/internal/models/mall_freight.go rename to module/ec/mall/internal/models/mall_freight.go diff --git a/apps/ec/mall/internal/models/mall_freight_attr.go b/module/ec/mall/internal/models/mall_freight_attr.go similarity index 100% rename from apps/ec/mall/internal/models/mall_freight_attr.go rename to module/ec/mall/internal/models/mall_freight_attr.go diff --git a/apps/ec/mall/internal/models/mall_freight_deny.go b/module/ec/mall/internal/models/mall_freight_deny.go similarity index 100% rename from apps/ec/mall/internal/models/mall_freight_deny.go rename to module/ec/mall/internal/models/mall_freight_deny.go diff --git a/apps/ec/mall/internal/models/mall_notice.go b/module/ec/mall/internal/models/mall_notice.go similarity index 100% rename from apps/ec/mall/internal/models/mall_notice.go rename to module/ec/mall/internal/models/mall_notice.go diff --git a/apps/ec/mall/internal/models/mall_product.go b/module/ec/mall/internal/models/mall_product.go similarity index 99% rename from apps/ec/mall/internal/models/mall_product.go rename to module/ec/mall/internal/models/mall_product.go index 29bfe07..0cfc0ae 100644 --- a/apps/ec/mall/internal/models/mall_product.go +++ b/module/ec/mall/internal/models/mall_product.go @@ -2,7 +2,7 @@ package models import ( - "git.apinb.com/bsm-ec/mall/internal/impl" + "bsm/full/module/ec/mall/internal/impl" "git.apinb.com/bsm-sdk/core/database" "git.apinb.com/bsm-sdk/core/types" "gorm.io/gorm" diff --git a/apps/ec/mall/internal/models/mall_product_attr.go b/module/ec/mall/internal/models/mall_product_attr.go similarity index 100% rename from apps/ec/mall/internal/models/mall_product_attr.go rename to module/ec/mall/internal/models/mall_product_attr.go diff --git a/apps/ec/mall/internal/models/mall_product_comment.go b/module/ec/mall/internal/models/mall_product_comment.go similarity index 98% rename from apps/ec/mall/internal/models/mall_product_comment.go rename to module/ec/mall/internal/models/mall_product_comment.go index e7f83d7..969bd9a 100644 --- a/apps/ec/mall/internal/models/mall_product_comment.go +++ b/module/ec/mall/internal/models/mall_product_comment.go @@ -2,7 +2,7 @@ package models import ( - "git.apinb.com/bsm-ec/mall/internal/impl" + "bsm/full/module/ec/mall/internal/impl" "git.apinb.com/bsm-sdk/core/database" "git.apinb.com/bsm-sdk/core/types" "gorm.io/gorm" diff --git a/apps/ec/mall/internal/models/mall_product_link_category.go b/module/ec/mall/internal/models/mall_product_link_category.go similarity index 100% rename from apps/ec/mall/internal/models/mall_product_link_category.go rename to module/ec/mall/internal/models/mall_product_link_category.go diff --git a/apps/ec/mall/internal/models/mall_product_link_spec.go b/module/ec/mall/internal/models/mall_product_link_spec.go similarity index 100% rename from apps/ec/mall/internal/models/mall_product_link_spec.go rename to module/ec/mall/internal/models/mall_product_link_spec.go diff --git a/apps/ec/mall/internal/models/mall_product_photos.go b/module/ec/mall/internal/models/mall_product_photos.go similarity index 97% rename from apps/ec/mall/internal/models/mall_product_photos.go rename to module/ec/mall/internal/models/mall_product_photos.go index d6af37e..494a5d7 100644 --- a/apps/ec/mall/internal/models/mall_product_photos.go +++ b/module/ec/mall/internal/models/mall_product_photos.go @@ -2,7 +2,7 @@ package models import ( - "git.apinb.com/bsm-ec/mall/internal/impl" + "bsm/full/module/ec/mall/internal/impl" "git.apinb.com/bsm-sdk/core/database" "git.apinb.com/bsm-sdk/core/types" "gorm.io/gorm" diff --git a/apps/ec/mall/internal/models/mall_product_spec.go b/module/ec/mall/internal/models/mall_product_spec.go similarity index 98% rename from apps/ec/mall/internal/models/mall_product_spec.go rename to module/ec/mall/internal/models/mall_product_spec.go index ee98912..f0496d1 100644 --- a/apps/ec/mall/internal/models/mall_product_spec.go +++ b/module/ec/mall/internal/models/mall_product_spec.go @@ -1,7 +1,7 @@ package models import ( - "git.apinb.com/bsm-ec/mall/internal/impl" + "bsm/full/module/ec/mall/internal/impl" "git.apinb.com/bsm-sdk/core/database" "git.apinb.com/bsm-sdk/core/types" "gorm.io/gorm" diff --git a/apps/ec/mall/internal/models/mall_staff.go b/module/ec/mall/internal/models/mall_staff.go similarity index 100% rename from apps/ec/mall/internal/models/mall_staff.go rename to module/ec/mall/internal/models/mall_staff.go diff --git a/apps/ec/mall/internal/models/mall_store.go b/module/ec/mall/internal/models/mall_store.go similarity index 100% rename from apps/ec/mall/internal/models/mall_store.go rename to module/ec/mall/internal/models/mall_store.go diff --git a/apps/ec/mall/internal/models/query.go b/module/ec/mall/internal/models/query.go similarity index 98% rename from apps/ec/mall/internal/models/query.go rename to module/ec/mall/internal/models/query.go index e64f48e..c56b78a 100644 --- a/apps/ec/mall/internal/models/query.go +++ b/module/ec/mall/internal/models/query.go @@ -1,7 +1,7 @@ package models import ( - "git.apinb.com/bsm-ec/mall/internal/impl" + "bsm/full/module/ec/mall/internal/impl" "git.apinb.com/bsm-sdk/core/types" "git.apinb.com/bsm-sdk/core/utils" "gorm.io/gorm" diff --git a/apps/ec/mall/internal/server/ads_server.go b/module/ec/mall/internal/server/ads_server.go similarity index 91% rename from apps/ec/mall/internal/server/ads_server.go rename to module/ec/mall/internal/server/ads_server.go index b48ce1c..8849dfd 100644 --- a/apps/ec/mall/internal/server/ads_server.go +++ b/module/ec/mall/internal/server/ads_server.go @@ -3,8 +3,8 @@ package server import ( "context" - "git.apinb.com/bsm-ec/mall/internal/logic/ads" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/logic/ads" + pb "bsm/full/module/ec/mall/pb" ) type AdsServer struct { diff --git a/apps/ec/mall/internal/server/category_server.go b/module/ec/mall/internal/server/category_server.go similarity index 90% rename from apps/ec/mall/internal/server/category_server.go rename to module/ec/mall/internal/server/category_server.go index dbc267f..5c5e724 100644 --- a/apps/ec/mall/internal/server/category_server.go +++ b/module/ec/mall/internal/server/category_server.go @@ -3,8 +3,8 @@ package server import ( "context" - "git.apinb.com/bsm-ec/mall/internal/logic/category" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/logic/category" + pb "bsm/full/module/ec/mall/pb" ) type CategoryServer struct { diff --git a/apps/ec/mall/internal/server/freight_server.go b/module/ec/mall/internal/server/freight_server.go similarity index 95% rename from apps/ec/mall/internal/server/freight_server.go rename to module/ec/mall/internal/server/freight_server.go index f99bce8..60ba1df 100644 --- a/apps/ec/mall/internal/server/freight_server.go +++ b/module/ec/mall/internal/server/freight_server.go @@ -3,8 +3,8 @@ package server import ( "context" - "git.apinb.com/bsm-ec/mall/internal/logic/freight" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/logic/freight" + pb "bsm/full/module/ec/mall/pb" ) type FreightServer struct { diff --git a/apps/ec/mall/internal/server/new.go b/module/ec/mall/internal/server/new.go similarity index 98% rename from apps/ec/mall/internal/server/new.go rename to module/ec/mall/internal/server/new.go index 17022a5..49528f5 100644 --- a/apps/ec/mall/internal/server/new.go +++ b/module/ec/mall/internal/server/new.go @@ -3,7 +3,7 @@ package server import ( "context" - pb "git.apinb.com/bsm-ec/mall/pb" + pb "bsm/full/module/ec/mall/pb" "git.apinb.com/bsm-sdk/core/vars" gwRuntime "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "google.golang.org/grpc" diff --git a/apps/ec/mall/internal/server/notice_server.go b/module/ec/mall/internal/server/notice_server.go similarity index 90% rename from apps/ec/mall/internal/server/notice_server.go rename to module/ec/mall/internal/server/notice_server.go index 5c44e56..70c997a 100644 --- a/apps/ec/mall/internal/server/notice_server.go +++ b/module/ec/mall/internal/server/notice_server.go @@ -3,8 +3,8 @@ package server import ( "context" - "git.apinb.com/bsm-ec/mall/internal/logic/notice" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/logic/notice" + pb "bsm/full/module/ec/mall/pb" ) type NoticeServer struct { diff --git a/apps/ec/mall/internal/server/product_server.go b/module/ec/mall/internal/server/product_server.go similarity index 97% rename from apps/ec/mall/internal/server/product_server.go rename to module/ec/mall/internal/server/product_server.go index 7211c85..36a8a6b 100644 --- a/apps/ec/mall/internal/server/product_server.go +++ b/module/ec/mall/internal/server/product_server.go @@ -3,8 +3,8 @@ package server import ( "context" - "git.apinb.com/bsm-ec/mall/internal/logic/product" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/logic/product" + pb "bsm/full/module/ec/mall/pb" ) type ProductServer struct { diff --git a/apps/ec/mall/internal/server/staff_server.go b/module/ec/mall/internal/server/staff_server.go similarity index 93% rename from apps/ec/mall/internal/server/staff_server.go rename to module/ec/mall/internal/server/staff_server.go index fdc1bf5..45ca8e8 100644 --- a/apps/ec/mall/internal/server/staff_server.go +++ b/module/ec/mall/internal/server/staff_server.go @@ -3,8 +3,8 @@ package server import ( "context" - "git.apinb.com/bsm-ec/mall/internal/logic/staff" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/logic/staff" + pb "bsm/full/module/ec/mall/pb" ) type StaffServer struct { diff --git a/apps/ec/mall/internal/server/store_server.go b/module/ec/mall/internal/server/store_server.go similarity index 95% rename from apps/ec/mall/internal/server/store_server.go rename to module/ec/mall/internal/server/store_server.go index e043470..a4a58db 100644 --- a/apps/ec/mall/internal/server/store_server.go +++ b/module/ec/mall/internal/server/store_server.go @@ -3,8 +3,8 @@ package server import ( "context" - "git.apinb.com/bsm-ec/mall/internal/logic/store" - pb "git.apinb.com/bsm-ec/mall/pb" + "bsm/full/module/ec/mall/internal/logic/store" + pb "bsm/full/module/ec/mall/pb" ) type StoreServer struct { diff --git a/apps/ec/mall/pb/ads.pb.go b/module/ec/mall/pb/ads.pb.go similarity index 100% rename from apps/ec/mall/pb/ads.pb.go rename to module/ec/mall/pb/ads.pb.go diff --git a/apps/ec/mall/pb/ads.pb.gw.go b/module/ec/mall/pb/ads.pb.gw.go similarity index 100% rename from apps/ec/mall/pb/ads.pb.gw.go rename to module/ec/mall/pb/ads.pb.gw.go diff --git a/apps/ec/mall/pb/ads_grpc.pb.go b/module/ec/mall/pb/ads_grpc.pb.go similarity index 100% rename from apps/ec/mall/pb/ads_grpc.pb.go rename to module/ec/mall/pb/ads_grpc.pb.go diff --git a/apps/ec/mall/pb/blocks.pb.go b/module/ec/mall/pb/blocks.pb.go similarity index 100% rename from apps/ec/mall/pb/blocks.pb.go rename to module/ec/mall/pb/blocks.pb.go diff --git a/apps/ec/mall/pb/category.pb.go b/module/ec/mall/pb/category.pb.go similarity index 100% rename from apps/ec/mall/pb/category.pb.go rename to module/ec/mall/pb/category.pb.go diff --git a/apps/ec/mall/pb/category.pb.gw.go b/module/ec/mall/pb/category.pb.gw.go similarity index 100% rename from apps/ec/mall/pb/category.pb.gw.go rename to module/ec/mall/pb/category.pb.gw.go diff --git a/apps/ec/mall/pb/category_grpc.pb.go b/module/ec/mall/pb/category_grpc.pb.go similarity index 100% rename from apps/ec/mall/pb/category_grpc.pb.go rename to module/ec/mall/pb/category_grpc.pb.go diff --git a/apps/ec/mall/pb/freight.pb.go b/module/ec/mall/pb/freight.pb.go similarity index 100% rename from apps/ec/mall/pb/freight.pb.go rename to module/ec/mall/pb/freight.pb.go diff --git a/apps/ec/mall/pb/freight.pb.gw.go b/module/ec/mall/pb/freight.pb.gw.go similarity index 100% rename from apps/ec/mall/pb/freight.pb.gw.go rename to module/ec/mall/pb/freight.pb.gw.go diff --git a/apps/ec/mall/pb/freight_grpc.pb.go b/module/ec/mall/pb/freight_grpc.pb.go similarity index 100% rename from apps/ec/mall/pb/freight_grpc.pb.go rename to module/ec/mall/pb/freight_grpc.pb.go diff --git a/apps/ec/mall/pb/notice.pb.go b/module/ec/mall/pb/notice.pb.go similarity index 100% rename from apps/ec/mall/pb/notice.pb.go rename to module/ec/mall/pb/notice.pb.go diff --git a/apps/ec/mall/pb/notice.pb.gw.go b/module/ec/mall/pb/notice.pb.gw.go similarity index 100% rename from apps/ec/mall/pb/notice.pb.gw.go rename to module/ec/mall/pb/notice.pb.gw.go diff --git a/apps/ec/mall/pb/notice_grpc.pb.go b/module/ec/mall/pb/notice_grpc.pb.go similarity index 100% rename from apps/ec/mall/pb/notice_grpc.pb.go rename to module/ec/mall/pb/notice_grpc.pb.go diff --git a/apps/ec/mall/pb/product.pb.go b/module/ec/mall/pb/product.pb.go similarity index 100% rename from apps/ec/mall/pb/product.pb.go rename to module/ec/mall/pb/product.pb.go diff --git a/apps/ec/mall/pb/product.pb.gw.go b/module/ec/mall/pb/product.pb.gw.go similarity index 100% rename from apps/ec/mall/pb/product.pb.gw.go rename to module/ec/mall/pb/product.pb.gw.go diff --git a/apps/ec/mall/pb/product_grpc.pb.go b/module/ec/mall/pb/product_grpc.pb.go similarity index 100% rename from apps/ec/mall/pb/product_grpc.pb.go rename to module/ec/mall/pb/product_grpc.pb.go diff --git a/apps/ec/mall/pb/staff.pb.go b/module/ec/mall/pb/staff.pb.go similarity index 100% rename from apps/ec/mall/pb/staff.pb.go rename to module/ec/mall/pb/staff.pb.go diff --git a/apps/ec/mall/pb/staff.pb.gw.go b/module/ec/mall/pb/staff.pb.gw.go similarity index 100% rename from apps/ec/mall/pb/staff.pb.gw.go rename to module/ec/mall/pb/staff.pb.gw.go diff --git a/apps/ec/mall/pb/staff_grpc.pb.go b/module/ec/mall/pb/staff_grpc.pb.go similarity index 100% rename from apps/ec/mall/pb/staff_grpc.pb.go rename to module/ec/mall/pb/staff_grpc.pb.go diff --git a/apps/ec/mall/pb/store.pb.go b/module/ec/mall/pb/store.pb.go similarity index 100% rename from apps/ec/mall/pb/store.pb.go rename to module/ec/mall/pb/store.pb.go diff --git a/apps/ec/mall/pb/store.pb.gw.go b/module/ec/mall/pb/store.pb.gw.go similarity index 100% rename from apps/ec/mall/pb/store.pb.gw.go rename to module/ec/mall/pb/store.pb.gw.go diff --git a/apps/ec/mall/pb/store_grpc.pb.go b/module/ec/mall/pb/store_grpc.pb.go similarity index 100% rename from apps/ec/mall/pb/store_grpc.pb.go rename to module/ec/mall/pb/store_grpc.pb.go diff --git a/apps/ec/mall/proto/ads.proto b/module/ec/mall/proto/ads.proto similarity index 100% rename from apps/ec/mall/proto/ads.proto rename to module/ec/mall/proto/ads.proto diff --git a/apps/ec/mall/proto/blocks.proto b/module/ec/mall/proto/blocks.proto similarity index 100% rename from apps/ec/mall/proto/blocks.proto rename to module/ec/mall/proto/blocks.proto diff --git a/apps/ec/mall/proto/category.proto b/module/ec/mall/proto/category.proto similarity index 100% rename from apps/ec/mall/proto/category.proto rename to module/ec/mall/proto/category.proto diff --git a/apps/ec/mall/proto/freight.proto b/module/ec/mall/proto/freight.proto similarity index 100% rename from apps/ec/mall/proto/freight.proto rename to module/ec/mall/proto/freight.proto diff --git a/apps/ec/mall/proto/notice.proto b/module/ec/mall/proto/notice.proto similarity index 100% rename from apps/ec/mall/proto/notice.proto rename to module/ec/mall/proto/notice.proto diff --git a/apps/ec/mall/proto/product.proto b/module/ec/mall/proto/product.proto similarity index 100% rename from apps/ec/mall/proto/product.proto rename to module/ec/mall/proto/product.proto diff --git a/apps/ec/mall/proto/staff.proto b/module/ec/mall/proto/staff.proto similarity index 100% rename from apps/ec/mall/proto/staff.proto rename to module/ec/mall/proto/staff.proto diff --git a/apps/ec/mall/proto/store.proto b/module/ec/mall/proto/store.proto similarity index 100% rename from apps/ec/mall/proto/store.proto rename to module/ec/mall/proto/store.proto diff --git a/apps/ec/mall/scripts/filebeat.yaml b/module/ec/mall/scripts/filebeat.yaml similarity index 100% rename from apps/ec/mall/scripts/filebeat.yaml rename to module/ec/mall/scripts/filebeat.yaml diff --git a/apps/ec/market/scripts/lint.sh b/module/ec/mall/scripts/lint.sh similarity index 90% rename from apps/ec/market/scripts/lint.sh rename to module/ec/mall/scripts/lint.sh index c18eb9e..bfcce13 100644 --- a/apps/ec/market/scripts/lint.sh +++ b/module/ec/mall/scripts/lint.sh @@ -3,5 +3,3 @@ go install github.com/securego/gosec/v2/cmd/gosec@latest #run gosec -fmt=json -out=./test/lint/gosec.json ./... - -buf generate \ No newline at end of file diff --git a/apps/ec/mall/sdk/typescript/ads.ts b/module/ec/mall/sdk/typescript/ads.ts similarity index 100% rename from apps/ec/mall/sdk/typescript/ads.ts rename to module/ec/mall/sdk/typescript/ads.ts diff --git a/apps/ec/mall/sdk/typescript/blocks.ts b/module/ec/mall/sdk/typescript/blocks.ts similarity index 100% rename from apps/ec/mall/sdk/typescript/blocks.ts rename to module/ec/mall/sdk/typescript/blocks.ts diff --git a/apps/ec/mall/sdk/typescript/category.ts b/module/ec/mall/sdk/typescript/category.ts similarity index 100% rename from apps/ec/mall/sdk/typescript/category.ts rename to module/ec/mall/sdk/typescript/category.ts diff --git a/apps/ec/mall/sdk/typescript/freight.ts b/module/ec/mall/sdk/typescript/freight.ts similarity index 100% rename from apps/ec/mall/sdk/typescript/freight.ts rename to module/ec/mall/sdk/typescript/freight.ts diff --git a/apps/ec/mall/sdk/typescript/mall/const.ts b/module/ec/mall/sdk/typescript/mall/const.ts similarity index 100% rename from apps/ec/mall/sdk/typescript/mall/const.ts rename to module/ec/mall/sdk/typescript/mall/const.ts diff --git a/apps/ec/mall/sdk/typescript/mall/index.ts b/module/ec/mall/sdk/typescript/mall/index.ts similarity index 100% rename from apps/ec/mall/sdk/typescript/mall/index.ts rename to module/ec/mall/sdk/typescript/mall/index.ts diff --git a/apps/ec/mall/sdk/typescript/notice.ts b/module/ec/mall/sdk/typescript/notice.ts similarity index 100% rename from apps/ec/mall/sdk/typescript/notice.ts rename to module/ec/mall/sdk/typescript/notice.ts diff --git a/apps/ec/mall/sdk/typescript/product.ts b/module/ec/mall/sdk/typescript/product.ts similarity index 100% rename from apps/ec/mall/sdk/typescript/product.ts rename to module/ec/mall/sdk/typescript/product.ts diff --git a/apps/ec/mall/sdk/typescript/staff.ts b/module/ec/mall/sdk/typescript/staff.ts similarity index 100% rename from apps/ec/mall/sdk/typescript/staff.ts rename to module/ec/mall/sdk/typescript/staff.ts diff --git a/apps/ec/mall/sdk/typescript/store.ts b/module/ec/mall/sdk/typescript/store.ts similarity index 100% rename from apps/ec/mall/sdk/typescript/store.ts rename to module/ec/mall/sdk/typescript/store.ts diff --git a/apps/ec/mall/swagger/sample.swagger.json b/module/ec/mall/swagger/sample.swagger.json similarity index 100% rename from apps/ec/mall/swagger/sample.swagger.json rename to module/ec/mall/swagger/sample.swagger.json diff --git a/apps/ec/mall/test/ads/ads_by_pos.http b/module/ec/mall/test/ads/ads_by_pos.http similarity index 100% rename from apps/ec/mall/test/ads/ads_by_pos.http rename to module/ec/mall/test/ads/ads_by_pos.http diff --git a/apps/ec/mall/test/ads/ads_create.http b/module/ec/mall/test/ads/ads_create.http similarity index 100% rename from apps/ec/mall/test/ads/ads_create.http rename to module/ec/mall/test/ads/ads_create.http diff --git a/apps/ec/mall/test/ads/ads_del.http b/module/ec/mall/test/ads/ads_del.http similarity index 100% rename from apps/ec/mall/test/ads/ads_del.http rename to module/ec/mall/test/ads/ads_del.http diff --git a/apps/ec/mall/test/ads/ads_fetch.http b/module/ec/mall/test/ads/ads_fetch.http similarity index 100% rename from apps/ec/mall/test/ads/ads_fetch.http rename to module/ec/mall/test/ads/ads_fetch.http diff --git a/apps/ec/mall/test/ads/ads_modify.http b/module/ec/mall/test/ads/ads_modify.http similarity index 100% rename from apps/ec/mall/test/ads/ads_modify.http rename to module/ec/mall/test/ads/ads_modify.http diff --git a/apps/ec/mall/test/category/category_create.http b/module/ec/mall/test/category/category_create.http similarity index 100% rename from apps/ec/mall/test/category/category_create.http rename to module/ec/mall/test/category/category_create.http diff --git a/apps/ec/mall/test/category/category_del.http b/module/ec/mall/test/category/category_del.http similarity index 100% rename from apps/ec/mall/test/category/category_del.http rename to module/ec/mall/test/category/category_del.http diff --git a/apps/ec/mall/test/category/category_fetch.http b/module/ec/mall/test/category/category_fetch.http similarity index 100% rename from apps/ec/mall/test/category/category_fetch.http rename to module/ec/mall/test/category/category_fetch.http diff --git a/apps/ec/mall/test/category/category_modify.http b/module/ec/mall/test/category/category_modify.http similarity index 100% rename from apps/ec/mall/test/category/category_modify.http rename to module/ec/mall/test/category/category_modify.http diff --git a/apps/ec/mall/test/item/comment/comment_create.http b/module/ec/mall/test/item/comment/comment_create.http similarity index 100% rename from apps/ec/mall/test/item/comment/comment_create.http rename to module/ec/mall/test/item/comment/comment_create.http diff --git a/apps/ec/mall/test/item/comment/comment_del.http b/module/ec/mall/test/item/comment/comment_del.http similarity index 100% rename from apps/ec/mall/test/item/comment/comment_del.http rename to module/ec/mall/test/item/comment/comment_del.http diff --git a/apps/ec/mall/test/item/comment/comment_fetch.http b/module/ec/mall/test/item/comment/comment_fetch.http similarity index 100% rename from apps/ec/mall/test/item/comment/comment_fetch.http rename to module/ec/mall/test/item/comment/comment_fetch.http diff --git a/apps/ec/mall/test/item/comment/comment_modify.http b/module/ec/mall/test/item/comment/comment_modify.http similarity index 100% rename from apps/ec/mall/test/item/comment/comment_modify.http rename to module/ec/mall/test/item/comment/comment_modify.http diff --git a/apps/ec/mall/test/item/item_batch_op.http b/module/ec/mall/test/item/item_batch_op.http similarity index 100% rename from apps/ec/mall/test/item/item_batch_op.http rename to module/ec/mall/test/item/item_batch_op.http diff --git a/apps/ec/mall/test/item/item_create.http b/module/ec/mall/test/item/item_create.http similarity index 100% rename from apps/ec/mall/test/item/item_create.http rename to module/ec/mall/test/item/item_create.http diff --git a/apps/ec/mall/test/item/item_del.http b/module/ec/mall/test/item/item_del.http similarity index 100% rename from apps/ec/mall/test/item/item_del.http rename to module/ec/mall/test/item/item_del.http diff --git a/apps/ec/mall/test/item/item_detai_by_serial.http b/module/ec/mall/test/item/item_detai_by_serial.http similarity index 100% rename from apps/ec/mall/test/item/item_detai_by_serial.http rename to module/ec/mall/test/item/item_detai_by_serial.http diff --git a/apps/ec/mall/test/item/item_detail.http b/module/ec/mall/test/item/item_detail.http similarity index 100% rename from apps/ec/mall/test/item/item_detail.http rename to module/ec/mall/test/item/item_detail.http diff --git a/apps/ec/mall/test/item/item_fetch.http b/module/ec/mall/test/item/item_fetch.http similarity index 100% rename from apps/ec/mall/test/item/item_fetch.http rename to module/ec/mall/test/item/item_fetch.http diff --git a/apps/ec/mall/test/item/photo/photo_create.http b/module/ec/mall/test/item/photo/photo_create.http similarity index 100% rename from apps/ec/mall/test/item/photo/photo_create.http rename to module/ec/mall/test/item/photo/photo_create.http diff --git a/apps/ec/mall/test/item/photo/photo_delete.http b/module/ec/mall/test/item/photo/photo_delete.http similarity index 100% rename from apps/ec/mall/test/item/photo/photo_delete.http rename to module/ec/mall/test/item/photo/photo_delete.http diff --git a/apps/ec/mall/test/item/photo/photo_list.http b/module/ec/mall/test/item/photo/photo_list.http similarity index 100% rename from apps/ec/mall/test/item/photo/photo_list.http rename to module/ec/mall/test/item/photo/photo_list.http diff --git a/apps/ec/mall/test/item/spec/spec_create.http b/module/ec/mall/test/item/spec/spec_create.http similarity index 100% rename from apps/ec/mall/test/item/spec/spec_create.http rename to module/ec/mall/test/item/spec/spec_create.http diff --git a/apps/ec/mall/test/item/spec/spec_del.http b/module/ec/mall/test/item/spec/spec_del.http similarity index 100% rename from apps/ec/mall/test/item/spec/spec_del.http rename to module/ec/mall/test/item/spec/spec_del.http diff --git a/apps/ec/mall/test/item/spec/spec_detail.http b/module/ec/mall/test/item/spec/spec_detail.http similarity index 100% rename from apps/ec/mall/test/item/spec/spec_detail.http rename to module/ec/mall/test/item/spec/spec_detail.http diff --git a/apps/ec/mall/test/item/spec/spec_fetch.http b/module/ec/mall/test/item/spec/spec_fetch.http similarity index 100% rename from apps/ec/mall/test/item/spec/spec_fetch.http rename to module/ec/mall/test/item/spec/spec_fetch.http diff --git a/apps/ec/mall/test/item/spec/spec_modify.http b/module/ec/mall/test/item/spec/spec_modify.http similarity index 100% rename from apps/ec/mall/test/item/spec/spec_modify.http rename to module/ec/mall/test/item/spec/spec_modify.http diff --git a/apps/ec/mall/test/item/tem_modify.http b/module/ec/mall/test/item/tem_modify.http similarity index 100% rename from apps/ec/mall/test/item/tem_modify.http rename to module/ec/mall/test/item/tem_modify.http diff --git a/apps/ec/mall/test/login_account.http b/module/ec/mall/test/login_account.http similarity index 100% rename from apps/ec/mall/test/login_account.http rename to module/ec/mall/test/login_account.http diff --git a/apps/ec/mall/test/notice/notice_create.http b/module/ec/mall/test/notice/notice_create.http similarity index 100% rename from apps/ec/mall/test/notice/notice_create.http rename to module/ec/mall/test/notice/notice_create.http diff --git a/apps/ec/mall/test/notice/notice_delete.http b/module/ec/mall/test/notice/notice_delete.http similarity index 100% rename from apps/ec/mall/test/notice/notice_delete.http rename to module/ec/mall/test/notice/notice_delete.http diff --git a/apps/ec/mall/test/notice/notice_fetch.http b/module/ec/mall/test/notice/notice_fetch.http similarity index 100% rename from apps/ec/mall/test/notice/notice_fetch.http rename to module/ec/mall/test/notice/notice_fetch.http diff --git a/apps/ec/mall/test/notice/notice_modify.http b/module/ec/mall/test/notice/notice_modify.http similarity index 100% rename from apps/ec/mall/test/notice/notice_modify.http rename to module/ec/mall/test/notice/notice_modify.http diff --git a/apps/ec/mall/test/readme.md b/module/ec/mall/test/readme.md similarity index 100% rename from apps/ec/mall/test/readme.md rename to module/ec/mall/test/readme.md diff --git a/apps/ec/mall/test/staff/get_profile.http b/module/ec/mall/test/staff/get_profile.http similarity index 100% rename from apps/ec/mall/test/staff/get_profile.http rename to module/ec/mall/test/staff/get_profile.http diff --git a/apps/ec/mall/test/staff/set_password.http b/module/ec/mall/test/staff/set_password.http similarity index 100% rename from apps/ec/mall/test/staff/set_password.http rename to module/ec/mall/test/staff/set_password.http diff --git a/apps/ec/mall/test/staff/set_profile.http b/module/ec/mall/test/staff/set_profile.http similarity index 100% rename from apps/ec/mall/test/staff/set_profile.http rename to module/ec/mall/test/staff/set_profile.http diff --git a/apps/ec/mall/test/staff/staff_create.http b/module/ec/mall/test/staff/staff_create.http similarity index 100% rename from apps/ec/mall/test/staff/staff_create.http rename to module/ec/mall/test/staff/staff_create.http diff --git a/apps/ec/mall/test/staff/staff_fetch.http b/module/ec/mall/test/staff/staff_fetch.http similarity index 100% rename from apps/ec/mall/test/staff/staff_fetch.http rename to module/ec/mall/test/staff/staff_fetch.http diff --git a/apps/ec/mall/test/store/apply_join.http b/module/ec/mall/test/store/apply_join.http similarity index 100% rename from apps/ec/mall/test/store/apply_join.http rename to module/ec/mall/test/store/apply_join.http diff --git a/apps/ec/mall/test/store/get.http b/module/ec/mall/test/store/get.http similarity index 100% rename from apps/ec/mall/test/store/get.http rename to module/ec/mall/test/store/get.http diff --git a/apps/ec/mall/test/store/licensing.http b/module/ec/mall/test/store/licensing.http similarity index 100% rename from apps/ec/mall/test/store/licensing.http rename to module/ec/mall/test/store/licensing.http diff --git a/apps/ec/mall/test/store/set.http b/module/ec/mall/test/store/set.http similarity index 100% rename from apps/ec/mall/test/store/set.http rename to module/ec/mall/test/store/set.http diff --git a/apps/ec/market/README.md b/module/ec/market/README.md similarity index 100% rename from apps/ec/market/README.md rename to module/ec/market/README.md diff --git a/apps/ec/market/cmd/cli/main.go b/module/ec/market/cmd/cli/main.go similarity index 100% rename from apps/ec/market/cmd/cli/main.go rename to module/ec/market/cmd/cli/main.go diff --git a/apps/ec/market/cmd/main/main.go b/module/ec/market/cmd/main/main.go similarity index 79% rename from apps/ec/market/cmd/main/main.go rename to module/ec/market/cmd/main/main.go index 9f01b6f..aea533c 100644 --- a/apps/ec/market/cmd/main/main.go +++ b/module/ec/market/cmd/main/main.go @@ -5,9 +5,9 @@ package service import ( - "git.apinb.com/bsm-ec/market/internal/config" - "git.apinb.com/bsm-ec/market/internal/impl" - "git.apinb.com/bsm-ec/market/internal/server" + "bsm/full/module/ec/market/internal/config" + "bsm/full/module/ec/market/internal/impl" + "bsm/full/module/ec/market/internal/server" "git.apinb.com/bsm-sdk/core/service" ) @@ -39,3 +39,7 @@ func Run() { // 启动服务 srv.Start() } + +func main() { + Run() +} diff --git a/apps/ec/market/etc/market_dev.yaml b/module/ec/market/etc/market_dev.yaml similarity index 100% rename from apps/ec/market/etc/market_dev.yaml rename to module/ec/market/etc/market_dev.yaml diff --git a/apps/ec/market/etc/market_prod.yaml b/module/ec/market/etc/market_prod.yaml similarity index 100% rename from apps/ec/market/etc/market_prod.yaml rename to module/ec/market/etc/market_prod.yaml diff --git a/apps/ec/market/etc/market_test.yaml b/module/ec/market/etc/market_test.yaml similarity index 100% rename from apps/ec/market/etc/market_test.yaml rename to module/ec/market/etc/market_test.yaml diff --git a/apps/ec/market/etc/supervisor.bsm-ec-market.conf b/module/ec/market/etc/supervisor.bsm-ec-market.conf similarity index 100% rename from apps/ec/market/etc/supervisor.bsm-ec-market.conf rename to module/ec/market/etc/supervisor.bsm-ec-market.conf diff --git a/apps/ec/address/go.mod b/module/ec/market/go.mod similarity index 60% rename from apps/ec/address/go.mod rename to module/ec/market/go.mod index 3352c41..83186f5 100644 --- a/apps/ec/address/go.mod +++ b/module/ec/market/go.mod @@ -1,4 +1,4 @@ -module git.apinb.com/bsm-ec/address +module bsm/full/module/ec/market go 1.26.5 @@ -13,13 +13,13 @@ tool ( require ( git.apinb.com/bsm-sdk/core v0.2.0 - github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 - go.etcd.io/etcd/client/pkg/v3 v3.6.12 - go.etcd.io/etcd/client/v3 v3.6.12 - google.golang.org/grpc v1.81.1 + github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0 + go.etcd.io/etcd/client/pkg/v3 v3.7.1 + go.etcd.io/etcd/client/v3 v3.7.1 + google.golang.org/grpc v1.83.0 google.golang.org/protobuf v1.36.11 gorm.io/driver/mysql v1.6.0 - gorm.io/gorm v1.31.1 + gorm.io/gorm v1.31.2 ) require ( @@ -29,9 +29,7 @@ require ( github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/coreos/go-semver v0.3.1 // indirect github.com/coreos/go-systemd/v22 v22.7.0 // indirect - github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/go-sql-driver/mysql v1.10.0 // indirect - github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt/v5 v5.3.1 // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/google/uuid v1.6.0 // indirect @@ -41,23 +39,24 @@ require ( github.com/jackc/puddle/v2 v2.2.2 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect - github.com/oklog/ulid/v2 v2.1.1 // indirect - github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - github.com/redis/go-redis/v9 v9.20.0 // indirect + github.com/oklog/ulid/v2 v2.1.2 // indirect + github.com/redis/go-redis/v9 v9.22.0 // indirect github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect - go.etcd.io/etcd/api/v3 v3.6.12 // indirect + go.etcd.io/etcd/api/v3 v3.7.1 // indirect go.uber.org/atomic v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.28.0 // indirect - go.yaml.in/yaml/v3 v3.0.4 // indirect - golang.org/x/mod v0.36.0 // indirect - golang.org/x/net v0.55.0 // indirect - golang.org/x/sync v0.20.0 // indirect - golang.org/x/sys v0.45.0 // indirect - golang.org/x/text v0.37.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa // indirect + go.yaml.in/yaml/v3 v3.0.5 // indirect + golang.org/x/mod v0.37.0 // indirect + golang.org/x/net v0.57.0 // indirect + golang.org/x/sync v0.22.0 // indirect + golang.org/x/sys v0.47.0 // indirect + golang.org/x/text v0.40.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea // indirect google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - gorm.io/driver/postgres v1.6.0 // indirect + gorm.io/driver/postgres v1.6.2 // indirect ) + +replace git.apinb.com/bsm-sdk/core => D:/work/bsm-sdk/core diff --git a/apps/ec/order/go.sum b/module/ec/market/go.sum similarity index 51% rename from apps/ec/order/go.sum rename to module/ec/market/go.sum index b65c077..09e7b42 100644 --- a/apps/ec/order/go.sum +++ b/module/ec/market/go.sum @@ -1,7 +1,5 @@ filippo.io/edwards25519 v1.2.0 h1:crnVqOiS4jqYleHd9vaKZ+HKtHfllngJIiOpNpoJsjo= filippo.io/edwards25519 v1.2.0/go.mod h1:xzAOLCNug/yB62zG1bQ8uziwrIqIuxhctzJT18Q77mc= -git.apinb.com/bsm-sdk/core v0.2.0 h1:/e9yqpsbKBrRgMiGpS3KX2O4qDLxo5V5GpPSLNGxEKw= -git.apinb.com/bsm-sdk/core v0.2.0/go.mod h1:E9T6Eboo/0Zb36BjkKbIgvFzq4fQ2Q8P/7y5zmYTI6Y= git.apinb.com/bsm-tools/protoc-gen-slc v0.0.13 h1:RGg2R2kHz6IAD7scH6So2FlZYctFUDxqWR8i/+fMfOU= git.apinb.com/bsm-tools/protoc-gen-slc v0.0.13/go.mod h1:NpJaupVAxmyBleRMAug4mGS6BQV2E32rtuiqQzj1b+A= git.apinb.com/bsm-tools/protoc-gen-ts v0.0.2 h1:T9C1kY6iIHl5cZ7xyNgV2xlPNWxXmaWfTbD8AzpBB9M= @@ -19,14 +17,12 @@ github.com/coreos/go-systemd/v22 v22.7.0/go.mod h1:xNUYtjHu2EDXbsxz1i41wouACIwT7 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= -github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.4 h1:tG4xh9yMsRCAiodLVTxyrkzSZ9+o0L1Kg/+cPVcbP/8= +github.com/go-logr/logr v1.4.4/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-sql-driver/mysql v1.10.0 h1:Q+1LV8DkHJvSYAdR83XzuhDaTykuDx0l6fkXxoWCWfw= github.com/go-sql-driver/mysql v1.10.0/go.mod h1:M+cqaI7+xxXGG9swrdeUIoPG3Y3KCkF0pZej+SK+nWk= -github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= -github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt/v5 v5.3.1 h1:kYf81DTWFe7t+1VvL7eS+jKFVWaUnK9cB1qbwn63YCY= github.com/golang-jwt/jwt/v5 v5.3.1/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= @@ -35,8 +31,8 @@ github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= 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/grpc-ecosystem/grpc-gateway/v2 v2.29.0 h1:5VipnvEpbqr2gA2VbM+nYVbkIF28c5ZQfqCBQ5g2xfk= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0/go.mod h1:Hyl3n6Twe1hvtd9XUXDec4pTvgMSEixRuQKPTMH2bNs= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0 h1:/Tnpcb2E0Pz/tN9s3bfEY2Q8ePCEX9iuS+cneUwncnw= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0/go.mod h1:zOBXOsUaBSjKgmH4OGzV1esUpR3oUSCPYVd2cUBjKYY= 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= @@ -49,22 +45,22 @@ github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= -github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= -github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y= -github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0= +github.com/klauspost/cpuid/v2 v2.4.0 h1:S6Hrbc7+ywsr0r+RLapfGBHfyefhCTwEh3A0tV913Dw= +github.com/klauspost/cpuid/v2 v2.4.0/go.mod h1:19jmZ9mjzoF//ddRSUsv0zfBTJWh3QJh9FNxZTMrGxU= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/oklog/ulid/v2 v2.1.1 h1:suPZ4ARWLOJLegGFiZZ1dFAkqzhMjL3J1TzI+5wHz8s= -github.com/oklog/ulid/v2 v2.1.1/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ= +github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= +github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= +github.com/oklog/ulid/v2 v2.1.2 h1:IEclFb9JNvzYA6MW2SCxbLzcHTVsfqm3PrqGQJH5zec= +github.com/oklog/ulid/v2 v2.1.2/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ= github.com/pborman/getopt v0.0.0-20170112200414-7148bc3a4c30/go.mod h1:85jBQOZwpVEaDAr341tbn15RS4fCAsIst0qp7i8ex1o= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/redis/go-redis/v9 v9.20.0 h1:WnQYxLkgO2xiXTCJY0ldIiI8dNqCDlQAG+AtaH7a2a0= -github.com/redis/go-redis/v9 v9.20.0/go.mod h1:v/M13XI1PVCDcm01VtPFOADfZtHf8YW3baQf57KlIkA= +github.com/redis/go-redis/v9 v9.22.0 h1:laDvpYXTJtZLloinw1fA5Kqd6HAEH2XKxOkG/PDq2F0= +github.com/redis/go-redis/v9 v9.22.0/go.mod h1:y2g0Wj8rQvuK0ELM+oxSudcLtC09JScs98I/X9gRWY4= github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0= @@ -74,28 +70,26 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= -github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/zeebo/xxh3 v1.1.0 h1:s7DLGDK45Dyfg7++yxI0khrfwq9661w9EN78eP/UZVs= github.com/zeebo/xxh3 v1.1.0/go.mod h1:IisAie1LELR4xhVinxWS5+zf1lA4p0MW4T+w+W07F5s= -go.etcd.io/etcd/api/v3 v3.6.12 h1:OLOZUKEuAA36TR48F0cIaa8FdzrWygjyfrJxXg4iDgs= -go.etcd.io/etcd/api/v3 v3.6.12/go.mod h1:p14EIQXHbuOQbVvL/WEes5uqKnxP9AgKJgpjbMVvzvE= -go.etcd.io/etcd/client/pkg/v3 v3.6.12 h1:36zzB+pQOdHbhN+kH2iJz/K8bJn0ZLtLfPPO7jozTDo= -go.etcd.io/etcd/client/pkg/v3 v3.6.12/go.mod h1:hh2+ZXtfLzs3o6mn92ntgNPBrTJJOvXqICM5g3L3DMY= -go.etcd.io/etcd/client/v3 v3.6.12 h1:kMSP6JcPZMqSJiX+TXdUIBU/4eXEZWBAaui4VihMbIc= -go.etcd.io/etcd/client/v3 v3.6.12/go.mod h1:CMs6fJWYiZQk4ytFjd4lE1diOvvRMmtbbn/alZXd3dQ= +go.etcd.io/etcd/api/v3 v3.7.1 h1:KJG0/DcWGfe3Y1otDf/fsBf0TSSgpxZ5RO/L8SFt73E= +go.etcd.io/etcd/api/v3 v3.7.1/go.mod h1:8bXIpCMeV7E3/XL0Ix123ATn3dB+0V7d9zklHbB0m78= +go.etcd.io/etcd/client/pkg/v3 v3.7.1 h1:rKYsj3pRkR0eK3yjT3XOgrhqfmIfj9pzNgxjh7mfFv4= +go.etcd.io/etcd/client/pkg/v3 v3.7.1/go.mod h1:cnzZGIUzSfjEwLC6UBVsSXlEK1eepS/JUD7wE6PLRT0= +go.etcd.io/etcd/client/v3 v3.7.1 h1:0PEMMC0KuZmVIN+RAbdqfkZ45pYTgKVtmBEbRCvZFUg= +go.etcd.io/etcd/client/v3 v3.7.1/go.mod h1:ffNqALa8tRCYhYo1F9oR489y23K39Gz+BSR3ApAGYq0= go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64= go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y= -go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I= -go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0= -go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM= -go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY= -go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg= -go.opentelemetry.io/otel/sdk v1.43.0/go.mod h1:P+IkVU3iWukmiit/Yf9AWvpyRDlUeBaRg6Y+C58QHzg= -go.opentelemetry.io/otel/sdk/metric v1.43.0 h1:S88dyqXjJkuBNLeMcVPRFXpRw2fuwdvfCGLEo89fDkw= -go.opentelemetry.io/otel/sdk/metric v1.43.0/go.mod h1:C/RJtwSEJ5hzTiUz5pXF1kILHStzb9zFlIEe85bhj6A= -go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A= -go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0= +go.opentelemetry.io/otel v1.45.0 h1:pdrWmLHofpubmArBv1LgFSv1Z0Ie/ppdZzu+kUN5EeU= +go.opentelemetry.io/otel v1.45.0/go.mod h1:XZxIqPapzEYnhNSScF5DIqXhm/rYi0FzCe2XddAwZfQ= +go.opentelemetry.io/otel/metric v1.45.0 h1:7Eg1uH7CJ5cXv9is6tnBe1FI6rj1nwUdbFypRm3br/M= +go.opentelemetry.io/otel/metric v1.45.0/go.mod h1:HAPbm1nd3p1PmFH7v2dR+6BjXxw+Lq4a2+pndMAm08s= +go.opentelemetry.io/otel/sdk v1.45.0 h1:4VVSMgQ83dUgW2aoX5f6JgLvHwIvzcuLnF9lUdCSpCw= +go.opentelemetry.io/otel/sdk v1.45.0/go.mod h1:Sr40LgXV7DsKMMJMKOhUWOgMWTfAaqvm2kF0g7ilwuA= +go.opentelemetry.io/otel/sdk/metric v1.44.0 h1:3LlKgI+VjbVsjNRFZJZAJ30WjXC5VkNRks6si09iEfI= +go.opentelemetry.io/otel/sdk/metric v1.44.0/go.mod h1:5B5pMARnXxKhltooO4xUuCBorl65a4EpnTalObqOigA= +go.opentelemetry.io/otel/trace v1.45.0 h1:l/mP6Uv7oNO7/TblbhpbgMidxhq1uO/rPsikOyVhxag= +go.opentelemetry.io/otel/trace v1.45.0/go.mod h1:qoJJA2xNMnxRrdISU/kLtfUH2wNeQbiv+jhs/CxI8bc= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= @@ -104,51 +98,26 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.28.0 h1:IZzaP1Fv73/T/pBMLk4VutPl36uNC+OSUh3JLG3FIjo= go.uber.org/zap v1.28.0/go.mod h1:rDLpOi171uODNm/mxFcuYWxDsqWSAVkFdX4XojSKg/Q= -go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= -go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.36.0 h1:JJjpVx6myfUsUdAzZuOSTTmRE0PfZeNWzzvKrP7amb4= -golang.org/x/mod v0.36.0/go.mod h1:moc6ELqsWcOw5Ef3xVprK5ul/MvtVvkIXLziUOICjUQ= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8= -golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -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.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4= -golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY= -golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc= -golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -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= +go.yaml.in/yaml/v3 v3.0.5 h1:N6y/pJk8buWs9NY5ERU2HSMfm+IuD/OtfdAnq6kESPw= +go.yaml.in/yaml/v3 v3.0.5/go.mod h1:HVTZu1O7/Vkt2N+BFy8Zza+lnLsABggaTM2ZpNIGuKg= +golang.org/x/mod v0.37.0 h1:vF1DjpVEshcIqoEaauuHebaLk1O1forxjxBaVn884JQ= +golang.org/x/mod v0.37.0/go.mod h1:m8S8VeM9r4dzDwjrKO0a1sZP3YjeMamRRlD+fmR2Q/0= +golang.org/x/net v0.57.0 h1:K5+3DljvIuDG9/Jv9rvyMywYNFCQ9RSUY6OOTTkT+tE= +golang.org/x/net v0.57.0/go.mod h1:KpXc8iv+r3XplLAG/f7Jsf9RPszJzdR0f58q9vGOuEU= +golang.org/x/sync v0.22.0 h1:SZjpbeLmrCk4xhRSZFNZW5gFUeCeFgjekvI/+gfScek= +golang.org/x/sync v0.22.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= +golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs= +golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +golang.org/x/text v0.40.0 h1:Ub2Z6/xjgF1WrYQz2nuITOEegKFtiIy+rieRJ5lHZKs= +golang.org/x/text v0.40.0/go.mod h1:hpnzDAfGV753zIKo+wk3u1bVKCGPbrnF7+7LBF/UHVY= gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4= gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E= -google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa h1:Kjn0N0tCrDgiAFW+lGO4JZ3ck44CehvJQMAwj9QF0G8= -google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:q4lMZS6kskjT5HvCPrnnypcDPVJqT/f4nfxmkE7gryY= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa h1:mZHHdPZl0dbGHCflZgAq/Q468DWVFcU2whhB2KAo8fk= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= -google.golang.org/grpc v1.81.1 h1:VnnIIZ88UzOOKLukQi+ImGz8O1Wdp8nAGGnvOfEIWQQ= -google.golang.org/grpc v1.81.1/go.mod h1:xGH9GfzOyMTGIOXBJmXt+BX/V0kcdQbdcuwQ/zNw42I= +google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea h1:Jifw/kjs/r3B0uszvls/m3c3tmZs2YHGM9C+rvxP9gY= +google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea/go.mod h1:K/+WGbmBY7aNW1HDw1fJnKYo10i0DkAX6pows00dLig= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea h1:kVhQEPTpKQahD5+JSBTfBB19wcgQTTjAIn45MBqnyHk= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= +google.golang.org/grpc v1.83.0 h1:JeNZEKJFbQxArAMl+hiytHauacDNqJUllNfmIMmpqnQ= +google.golang.org/grpc v1.83.0/go.mod h1:kDyl6SKsiHKt0uylY5gtn5cEjkrIOhQOGDgIc4JGwzQ= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.2 h1:rgSNvqscFZ1JgV/4wH5GOsZFSFkR2Eua9As3KIr2LlM= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.2/go.mod h1:iMEtFwDlAhjDU9L5mY6U1XLwlIId/G3h+QcBHDIvrJ8= google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE= @@ -161,9 +130,11 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gorm.io/driver/mysql v1.6.0 h1:eNbLmNTpPpTOVZi8MMxCi2aaIm0ZpInbORNXDwyLGvg= gorm.io/driver/mysql v1.6.0/go.mod h1:D/oCC2GWK3M/dqoLxnOlaNKmXz8WNTfcS9y5ovaSqKo= -gorm.io/driver/postgres v1.6.0 h1:2dxzU8xJ+ivvqTRph34QX+WrRaJlmfyPqXmoGVjMBa4= -gorm.io/driver/postgres v1.6.0/go.mod h1:vUw0mrGgrTK+uPHEhAdV4sfFELrByKVGnaVRkXDhtWo= -gorm.io/gorm v1.31.1 h1:7CA8FTFz/gRfgqgpeKIBcervUn3xSyPUmr6B2WXJ7kg= -gorm.io/gorm v1.31.1/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs= +gorm.io/driver/postgres v1.6.2 h1:BvXQ/cNUg63q5TFNg672DmDcowZSFrNLkkA3Xe6GXq4= +gorm.io/driver/postgres v1.6.2/go.mod h1:0c4fQA44XhOklXDkgtuKqysHCycTa5i9e3EIpDGCwXk= +gorm.io/driver/sqlite v1.6.0 h1:WHRRrIiulaPiPFmDcod6prc4l2VGVWHz80KspNsxSfQ= +gorm.io/driver/sqlite v1.6.0/go.mod h1:AO9V1qIQddBESngQUKWL9yoH93HIeA1X6V633rBwyT8= +gorm.io/gorm v1.31.2 h1:3o8FXNo9v9S858gil+3LlZA1LkCOzgb4g5BL64FgaCo= +gorm.io/gorm v1.31.2/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs= gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU= gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU= diff --git a/apps/ec/market/internal/config/config.go b/module/ec/market/internal/config/config.go similarity index 100% rename from apps/ec/market/internal/config/config.go rename to module/ec/market/internal/config/config.go diff --git a/apps/ec/market/internal/impl/impl.go b/module/ec/market/internal/impl/impl.go similarity index 100% rename from apps/ec/market/internal/impl/impl.go rename to module/ec/market/internal/impl/impl.go diff --git a/apps/ec/market/internal/impl/with.go b/module/ec/market/internal/impl/with.go similarity index 95% rename from apps/ec/market/internal/impl/with.go rename to module/ec/market/internal/impl/with.go index f84a387..96d1053 100644 --- a/apps/ec/market/internal/impl/with.go +++ b/module/ec/market/internal/impl/with.go @@ -3,8 +3,8 @@ package impl import ( "time" - "git.apinb.com/bsm-ec/market/internal/config" - "git.apinb.com/bsm-ec/market/internal/models" + "bsm/full/module/ec/market/internal/config" + "bsm/full/module/ec/market/internal/models" "git.apinb.com/bsm-sdk/core/cache/redis" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" diff --git a/apps/ec/market/internal/logic/agency/approve.go b/module/ec/market/internal/logic/agency/approve.go similarity index 92% rename from apps/ec/market/internal/logic/agency/approve.go rename to module/ec/market/internal/logic/agency/approve.go index ac891bf..a1a27b9 100644 --- a/apps/ec/market/internal/logic/agency/approve.go +++ b/module/ec/market/internal/logic/agency/approve.go @@ -4,8 +4,8 @@ import ( "context" "log" - "git.apinb.com/bsm-ec/market/internal/models" - pb "git.apinb.com/bsm-ec/market/pb" + "bsm/full/module/ec/market/internal/models" + pb "bsm/full/module/ec/market/pb" "git.apinb.com/bsm-sdk/core/errcode" ) diff --git a/apps/ec/market/internal/logic/agency/create.go b/module/ec/market/internal/logic/agency/create.go similarity index 94% rename from apps/ec/market/internal/logic/agency/create.go rename to module/ec/market/internal/logic/agency/create.go index 63edb1f..7eaa855 100644 --- a/apps/ec/market/internal/logic/agency/create.go +++ b/module/ec/market/internal/logic/agency/create.go @@ -5,8 +5,8 @@ import ( "fmt" "time" - "git.apinb.com/bsm-ec/market/internal/models" - pb "git.apinb.com/bsm-ec/market/pb" + "bsm/full/module/ec/market/internal/models" + pb "bsm/full/module/ec/market/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/types" "git.apinb.com/bsm-sdk/core/utils" diff --git a/apps/ec/market/internal/logic/agency/delete.go b/module/ec/market/internal/logic/agency/delete.go similarity index 90% rename from apps/ec/market/internal/logic/agency/delete.go rename to module/ec/market/internal/logic/agency/delete.go index 8bb8457..d561f7a 100644 --- a/apps/ec/market/internal/logic/agency/delete.go +++ b/module/ec/market/internal/logic/agency/delete.go @@ -4,8 +4,8 @@ import ( "context" "time" - "git.apinb.com/bsm-ec/market/internal/models" - pb "git.apinb.com/bsm-ec/market/pb" + "bsm/full/module/ec/market/internal/models" + pb "bsm/full/module/ec/market/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" ) diff --git a/apps/ec/market/internal/logic/agency/fetch.go b/module/ec/market/internal/logic/agency/fetch.go similarity index 93% rename from apps/ec/market/internal/logic/agency/fetch.go rename to module/ec/market/internal/logic/agency/fetch.go index 327a4f0..79b7485 100644 --- a/apps/ec/market/internal/logic/agency/fetch.go +++ b/module/ec/market/internal/logic/agency/fetch.go @@ -3,8 +3,8 @@ package agency import ( "context" - "git.apinb.com/bsm-ec/market/internal/models" - pb "git.apinb.com/bsm-ec/market/pb" + "bsm/full/module/ec/market/internal/models" + pb "bsm/full/module/ec/market/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/market/internal/logic/agency/get.go b/module/ec/market/internal/logic/agency/get.go similarity index 93% rename from apps/ec/market/internal/logic/agency/get.go rename to module/ec/market/internal/logic/agency/get.go index 689c8be..c082c46 100644 --- a/apps/ec/market/internal/logic/agency/get.go +++ b/module/ec/market/internal/logic/agency/get.go @@ -5,8 +5,8 @@ import ( "log" "time" - "git.apinb.com/bsm-ec/market/internal/models" - pb "git.apinb.com/bsm-ec/market/pb" + "bsm/full/module/ec/market/internal/models" + pb "bsm/full/module/ec/market/pb" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/ec/market/internal/logic/agency/login.go b/module/ec/market/internal/logic/agency/login.go similarity index 95% rename from apps/ec/market/internal/logic/agency/login.go rename to module/ec/market/internal/logic/agency/login.go index 39432fd..a95fdeb 100644 --- a/apps/ec/market/internal/logic/agency/login.go +++ b/module/ec/market/internal/logic/agency/login.go @@ -5,8 +5,8 @@ import ( "errors" "time" - "git.apinb.com/bsm-ec/market/internal/models" - pb "git.apinb.com/bsm-ec/market/pb" + "bsm/full/module/ec/market/internal/models" + pb "bsm/full/module/ec/market/pb" "git.apinb.com/bsm-sdk/core/crypto/encipher" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/utils" diff --git a/apps/ec/market/internal/logic/agency/modify.go b/module/ec/market/internal/logic/agency/modify.go similarity index 93% rename from apps/ec/market/internal/logic/agency/modify.go rename to module/ec/market/internal/logic/agency/modify.go index 968b038..c4e6e68 100644 --- a/apps/ec/market/internal/logic/agency/modify.go +++ b/module/ec/market/internal/logic/agency/modify.go @@ -5,8 +5,8 @@ import ( "log" "time" - "git.apinb.com/bsm-ec/market/internal/models" - pb "git.apinb.com/bsm-ec/market/pb" + "bsm/full/module/ec/market/internal/models" + pb "bsm/full/module/ec/market/pb" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/ec/market/internal/logic/agency/pending.go b/module/ec/market/internal/logic/agency/pending.go similarity index 92% rename from apps/ec/market/internal/logic/agency/pending.go rename to module/ec/market/internal/logic/agency/pending.go index 3507019..6ba6717 100644 --- a/apps/ec/market/internal/logic/agency/pending.go +++ b/module/ec/market/internal/logic/agency/pending.go @@ -3,8 +3,8 @@ package agency import ( "context" - "git.apinb.com/bsm-ec/market/internal/models" - pb "git.apinb.com/bsm-ec/market/pb" + "bsm/full/module/ec/market/internal/models" + pb "bsm/full/module/ec/market/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/market/internal/logic/agency/ref.go b/module/ec/market/internal/logic/agency/ref.go similarity index 90% rename from apps/ec/market/internal/logic/agency/ref.go rename to module/ec/market/internal/logic/agency/ref.go index 0a2636f..80eea6e 100644 --- a/apps/ec/market/internal/logic/agency/ref.go +++ b/module/ec/market/internal/logic/agency/ref.go @@ -3,8 +3,8 @@ package agency import ( "time" - "git.apinb.com/bsm-ec/market/internal/models" - pb "git.apinb.com/bsm-ec/market/pb" + "bsm/full/module/ec/market/internal/models" + pb "bsm/full/module/ec/market/pb" ) func ref(data []*models.MarketAgency) (list []*pb.MarketAgenctyItem) { diff --git a/apps/ec/market/internal/logic/agency/set_password.go b/module/ec/market/internal/logic/agency/set_password.go similarity index 94% rename from apps/ec/market/internal/logic/agency/set_password.go rename to module/ec/market/internal/logic/agency/set_password.go index dc84b03..2b469a5 100644 --- a/apps/ec/market/internal/logic/agency/set_password.go +++ b/module/ec/market/internal/logic/agency/set_password.go @@ -7,8 +7,8 @@ import ( "log" "time" - "git.apinb.com/bsm-ec/market/internal/models" - pb "git.apinb.com/bsm-ec/market/pb" + "bsm/full/module/ec/market/internal/models" + pb "bsm/full/module/ec/market/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/utils" diff --git a/apps/ec/market/internal/logic/data/member_details.go b/module/ec/market/internal/logic/data/member_details.go similarity index 93% rename from apps/ec/market/internal/logic/data/member_details.go rename to module/ec/market/internal/logic/data/member_details.go index f42c561..5d44f6a 100644 --- a/apps/ec/market/internal/logic/data/member_details.go +++ b/module/ec/market/internal/logic/data/member_details.go @@ -2,7 +2,7 @@ package data import ( "context" - pb "git.apinb.com/bsm-ec/market/pb" + pb "bsm/full/module/ec/market/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/ec/market/internal/logic/data/member_fetch.go b/module/ec/market/internal/logic/data/member_fetch.go similarity index 93% rename from apps/ec/market/internal/logic/data/member_fetch.go rename to module/ec/market/internal/logic/data/member_fetch.go index f4ed4ae..abe57dc 100644 --- a/apps/ec/market/internal/logic/data/member_fetch.go +++ b/module/ec/market/internal/logic/data/member_fetch.go @@ -2,7 +2,7 @@ package data import ( "context" - pb "git.apinb.com/bsm-ec/market/pb" + pb "bsm/full/module/ec/market/pb" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/ec/market/internal/logic/data/order_details.go b/module/ec/market/internal/logic/data/order_details.go similarity index 93% rename from apps/ec/market/internal/logic/data/order_details.go rename to module/ec/market/internal/logic/data/order_details.go index f82ea79..2d6ae5f 100644 --- a/apps/ec/market/internal/logic/data/order_details.go +++ b/module/ec/market/internal/logic/data/order_details.go @@ -2,7 +2,7 @@ package data import ( "context" - pb "git.apinb.com/bsm-ec/market/pb" + pb "bsm/full/module/ec/market/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/ec/market/internal/logic/data/order_fetch.go b/module/ec/market/internal/logic/data/order_fetch.go similarity index 92% rename from apps/ec/market/internal/logic/data/order_fetch.go rename to module/ec/market/internal/logic/data/order_fetch.go index ad14c0c..254e8f8 100644 --- a/apps/ec/market/internal/logic/data/order_fetch.go +++ b/module/ec/market/internal/logic/data/order_fetch.go @@ -2,7 +2,7 @@ package data import ( "context" - pb "git.apinb.com/bsm-ec/market/pb" + pb "bsm/full/module/ec/market/pb" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/ec/market/internal/logic/data/overview.go b/module/ec/market/internal/logic/data/overview.go similarity index 90% rename from apps/ec/market/internal/logic/data/overview.go rename to module/ec/market/internal/logic/data/overview.go index 092354d..1573588 100644 --- a/apps/ec/market/internal/logic/data/overview.go +++ b/module/ec/market/internal/logic/data/overview.go @@ -2,7 +2,7 @@ package data import ( "context" - pb "git.apinb.com/bsm-ec/market/pb" + pb "bsm/full/module/ec/market/pb" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/ec/market/internal/logic/supply/create.go b/module/ec/market/internal/logic/supply/create.go similarity index 93% rename from apps/ec/market/internal/logic/supply/create.go rename to module/ec/market/internal/logic/supply/create.go index 8e7f2f3..328d062 100644 --- a/apps/ec/market/internal/logic/supply/create.go +++ b/module/ec/market/internal/logic/supply/create.go @@ -4,8 +4,8 @@ import ( "context" "time" - "git.apinb.com/bsm-ec/market/internal/models" - pb "git.apinb.com/bsm-ec/market/pb" + "bsm/full/module/ec/market/internal/models" + pb "bsm/full/module/ec/market/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/types" "git.apinb.com/bsm-sdk/core/utils" diff --git a/apps/ec/market/internal/logic/supply/delete.go b/module/ec/market/internal/logic/supply/delete.go similarity index 90% rename from apps/ec/market/internal/logic/supply/delete.go rename to module/ec/market/internal/logic/supply/delete.go index 0eee7cb..7223119 100644 --- a/apps/ec/market/internal/logic/supply/delete.go +++ b/module/ec/market/internal/logic/supply/delete.go @@ -4,8 +4,8 @@ import ( "context" "time" - "git.apinb.com/bsm-ec/market/internal/models" - pb "git.apinb.com/bsm-ec/market/pb" + "bsm/full/module/ec/market/internal/models" + pb "bsm/full/module/ec/market/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/market/internal/logic/supply/fetch.go b/module/ec/market/internal/logic/supply/fetch.go similarity index 92% rename from apps/ec/market/internal/logic/supply/fetch.go rename to module/ec/market/internal/logic/supply/fetch.go index 62d5d3a..cea68de 100644 --- a/apps/ec/market/internal/logic/supply/fetch.go +++ b/module/ec/market/internal/logic/supply/fetch.go @@ -3,8 +3,8 @@ package supply import ( "context" - "git.apinb.com/bsm-ec/market/internal/models" - pb "git.apinb.com/bsm-ec/market/pb" + "bsm/full/module/ec/market/internal/models" + pb "bsm/full/module/ec/market/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/market/internal/logic/supply/get.go b/module/ec/market/internal/logic/supply/get.go similarity index 91% rename from apps/ec/market/internal/logic/supply/get.go rename to module/ec/market/internal/logic/supply/get.go index 19990fb..a7de831 100644 --- a/apps/ec/market/internal/logic/supply/get.go +++ b/module/ec/market/internal/logic/supply/get.go @@ -4,8 +4,8 @@ import ( "context" "log" - "git.apinb.com/bsm-ec/market/internal/models" - pb "git.apinb.com/bsm-ec/market/pb" + "bsm/full/module/ec/market/internal/models" + pb "bsm/full/module/ec/market/pb" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/ec/market/internal/logic/supply/modify.go b/module/ec/market/internal/logic/supply/modify.go similarity index 93% rename from apps/ec/market/internal/logic/supply/modify.go rename to module/ec/market/internal/logic/supply/modify.go index 54a5b53..2555ea6 100644 --- a/apps/ec/market/internal/logic/supply/modify.go +++ b/module/ec/market/internal/logic/supply/modify.go @@ -5,8 +5,8 @@ import ( "log" "time" - "git.apinb.com/bsm-ec/market/internal/models" - pb "git.apinb.com/bsm-ec/market/pb" + "bsm/full/module/ec/market/internal/models" + pb "bsm/full/module/ec/market/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/ec/market/internal/logic/supply/ref.go b/module/ec/market/internal/logic/supply/ref.go similarity index 88% rename from apps/ec/market/internal/logic/supply/ref.go rename to module/ec/market/internal/logic/supply/ref.go index a55e64f..a620dc4 100644 --- a/apps/ec/market/internal/logic/supply/ref.go +++ b/module/ec/market/internal/logic/supply/ref.go @@ -1,8 +1,8 @@ package supply import ( - "git.apinb.com/bsm-ec/market/internal/models" - pb "git.apinb.com/bsm-ec/market/pb" + "bsm/full/module/ec/market/internal/models" + pb "bsm/full/module/ec/market/pb" ) func ref(data []*models.MarketSupply) (list []*pb.MarketSupplyItem) { diff --git a/apps/ec/market/internal/models/impl.go b/module/ec/market/internal/models/impl.go similarity index 100% rename from apps/ec/market/internal/models/impl.go rename to module/ec/market/internal/models/impl.go diff --git a/apps/ec/market/internal/models/market_agency.go b/module/ec/market/internal/models/market_agency.go similarity index 100% rename from apps/ec/market/internal/models/market_agency.go rename to module/ec/market/internal/models/market_agency.go diff --git a/apps/ec/market/internal/models/market_supply.go b/module/ec/market/internal/models/market_supply.go similarity index 100% rename from apps/ec/market/internal/models/market_supply.go rename to module/ec/market/internal/models/market_supply.go diff --git a/apps/ec/market/internal/models/query.go b/module/ec/market/internal/models/query.go similarity index 100% rename from apps/ec/market/internal/models/query.go rename to module/ec/market/internal/models/query.go diff --git a/apps/ec/market/internal/server/agency_server.go b/module/ec/market/internal/server/agency_server.go similarity index 94% rename from apps/ec/market/internal/server/agency_server.go rename to module/ec/market/internal/server/agency_server.go index 2b80a6d..a0e8a9f 100644 --- a/apps/ec/market/internal/server/agency_server.go +++ b/module/ec/market/internal/server/agency_server.go @@ -3,8 +3,8 @@ package server import ( "context" - "git.apinb.com/bsm-ec/market/internal/logic/agency" - pb "git.apinb.com/bsm-ec/market/pb" + "bsm/full/module/ec/market/internal/logic/agency" + pb "bsm/full/module/ec/market/pb" ) type AgencyServer struct { diff --git a/apps/ec/market/internal/server/data_server.go b/module/ec/market/internal/server/data_server.go similarity index 91% rename from apps/ec/market/internal/server/data_server.go rename to module/ec/market/internal/server/data_server.go index a2fd0f8..66f7210 100644 --- a/apps/ec/market/internal/server/data_server.go +++ b/module/ec/market/internal/server/data_server.go @@ -3,8 +3,8 @@ package server import ( "context" - "git.apinb.com/bsm-ec/market/internal/logic/data" - pb "git.apinb.com/bsm-ec/market/pb" + "bsm/full/module/ec/market/internal/logic/data" + pb "bsm/full/module/ec/market/pb" ) type DataServer struct { diff --git a/apps/ec/market/internal/server/new.go b/module/ec/market/internal/server/new.go similarity index 98% rename from apps/ec/market/internal/server/new.go rename to module/ec/market/internal/server/new.go index 676eb6c..559427d 100644 --- a/apps/ec/market/internal/server/new.go +++ b/module/ec/market/internal/server/new.go @@ -3,7 +3,7 @@ package server import ( "context" - pb "git.apinb.com/bsm-ec/market/pb" + pb "bsm/full/module/ec/market/pb" "git.apinb.com/bsm-sdk/core/vars" gwRuntime "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "google.golang.org/grpc" diff --git a/apps/ec/market/internal/server/supply_server.go b/module/ec/market/internal/server/supply_server.go similarity index 91% rename from apps/ec/market/internal/server/supply_server.go rename to module/ec/market/internal/server/supply_server.go index e6b02f9..1af678c 100644 --- a/apps/ec/market/internal/server/supply_server.go +++ b/module/ec/market/internal/server/supply_server.go @@ -3,8 +3,8 @@ package server import ( "context" - "git.apinb.com/bsm-ec/market/internal/logic/supply" - pb "git.apinb.com/bsm-ec/market/pb" + "bsm/full/module/ec/market/internal/logic/supply" + pb "bsm/full/module/ec/market/pb" ) type SupplyServer struct { diff --git a/apps/ec/market/pb/agency.pb.go b/module/ec/market/pb/agency.pb.go similarity index 100% rename from apps/ec/market/pb/agency.pb.go rename to module/ec/market/pb/agency.pb.go diff --git a/apps/ec/market/pb/agency.pb.gw.go b/module/ec/market/pb/agency.pb.gw.go similarity index 100% rename from apps/ec/market/pb/agency.pb.gw.go rename to module/ec/market/pb/agency.pb.gw.go diff --git a/apps/ec/market/pb/agency_grpc.pb.go b/module/ec/market/pb/agency_grpc.pb.go similarity index 100% rename from apps/ec/market/pb/agency_grpc.pb.go rename to module/ec/market/pb/agency_grpc.pb.go diff --git a/apps/ec/market/pb/blocks.pb.go b/module/ec/market/pb/blocks.pb.go similarity index 100% rename from apps/ec/market/pb/blocks.pb.go rename to module/ec/market/pb/blocks.pb.go diff --git a/apps/ec/market/pb/data.pb.go b/module/ec/market/pb/data.pb.go similarity index 100% rename from apps/ec/market/pb/data.pb.go rename to module/ec/market/pb/data.pb.go diff --git a/apps/ec/market/pb/data.pb.gw.go b/module/ec/market/pb/data.pb.gw.go similarity index 100% rename from apps/ec/market/pb/data.pb.gw.go rename to module/ec/market/pb/data.pb.gw.go diff --git a/apps/ec/market/pb/data_grpc.pb.go b/module/ec/market/pb/data_grpc.pb.go similarity index 100% rename from apps/ec/market/pb/data_grpc.pb.go rename to module/ec/market/pb/data_grpc.pb.go diff --git a/apps/ec/market/pb/supply.pb.go b/module/ec/market/pb/supply.pb.go similarity index 100% rename from apps/ec/market/pb/supply.pb.go rename to module/ec/market/pb/supply.pb.go diff --git a/apps/ec/market/pb/supply.pb.gw.go b/module/ec/market/pb/supply.pb.gw.go similarity index 100% rename from apps/ec/market/pb/supply.pb.gw.go rename to module/ec/market/pb/supply.pb.gw.go diff --git a/apps/ec/market/pb/supply_grpc.pb.go b/module/ec/market/pb/supply_grpc.pb.go similarity index 100% rename from apps/ec/market/pb/supply_grpc.pb.go rename to module/ec/market/pb/supply_grpc.pb.go diff --git a/apps/ec/market/proto/agency.proto b/module/ec/market/proto/agency.proto similarity index 100% rename from apps/ec/market/proto/agency.proto rename to module/ec/market/proto/agency.proto diff --git a/apps/ec/market/proto/blocks.proto b/module/ec/market/proto/blocks.proto similarity index 100% rename from apps/ec/market/proto/blocks.proto rename to module/ec/market/proto/blocks.proto diff --git a/apps/ec/market/proto/data.proto b/module/ec/market/proto/data.proto similarity index 100% rename from apps/ec/market/proto/data.proto rename to module/ec/market/proto/data.proto diff --git a/apps/ec/market/proto/supply.proto b/module/ec/market/proto/supply.proto similarity index 100% rename from apps/ec/market/proto/supply.proto rename to module/ec/market/proto/supply.proto diff --git a/apps/ec/market/scripts/filebeat.yaml b/module/ec/market/scripts/filebeat.yaml similarity index 100% rename from apps/ec/market/scripts/filebeat.yaml rename to module/ec/market/scripts/filebeat.yaml diff --git a/apps/ec/mall/scripts/lint.sh b/module/ec/market/scripts/lint.sh similarity index 90% rename from apps/ec/mall/scripts/lint.sh rename to module/ec/market/scripts/lint.sh index c18eb9e..bfcce13 100644 --- a/apps/ec/mall/scripts/lint.sh +++ b/module/ec/market/scripts/lint.sh @@ -3,5 +3,3 @@ go install github.com/securego/gosec/v2/cmd/gosec@latest #run gosec -fmt=json -out=./test/lint/gosec.json ./... - -buf generate \ No newline at end of file diff --git a/apps/ec/market/sdk/typescript/agency.ts b/module/ec/market/sdk/typescript/agency.ts similarity index 100% rename from apps/ec/market/sdk/typescript/agency.ts rename to module/ec/market/sdk/typescript/agency.ts diff --git a/apps/ec/market/sdk/typescript/blocks.ts b/module/ec/market/sdk/typescript/blocks.ts similarity index 100% rename from apps/ec/market/sdk/typescript/blocks.ts rename to module/ec/market/sdk/typescript/blocks.ts diff --git a/apps/ec/market/sdk/typescript/data.ts b/module/ec/market/sdk/typescript/data.ts similarity index 100% rename from apps/ec/market/sdk/typescript/data.ts rename to module/ec/market/sdk/typescript/data.ts diff --git a/apps/ec/market/sdk/typescript/market/const.ts b/module/ec/market/sdk/typescript/market/const.ts similarity index 100% rename from apps/ec/market/sdk/typescript/market/const.ts rename to module/ec/market/sdk/typescript/market/const.ts diff --git a/apps/ec/market/sdk/typescript/market/index.ts b/module/ec/market/sdk/typescript/market/index.ts similarity index 100% rename from apps/ec/market/sdk/typescript/market/index.ts rename to module/ec/market/sdk/typescript/market/index.ts diff --git a/apps/ec/market/swagger/market.swagger.json b/module/ec/market/swagger/market.swagger.json similarity index 100% rename from apps/ec/market/swagger/market.swagger.json rename to module/ec/market/swagger/market.swagger.json diff --git a/apps/ec/market/test/agency/approve.http b/module/ec/market/test/agency/approve.http similarity index 100% rename from apps/ec/market/test/agency/approve.http rename to module/ec/market/test/agency/approve.http diff --git a/apps/ec/market/test/agency/create.http b/module/ec/market/test/agency/create.http similarity index 100% rename from apps/ec/market/test/agency/create.http rename to module/ec/market/test/agency/create.http diff --git a/apps/ec/market/test/agency/delete.http b/module/ec/market/test/agency/delete.http similarity index 100% rename from apps/ec/market/test/agency/delete.http rename to module/ec/market/test/agency/delete.http diff --git a/apps/ec/market/test/agency/fetch.http b/module/ec/market/test/agency/fetch.http similarity index 100% rename from apps/ec/market/test/agency/fetch.http rename to module/ec/market/test/agency/fetch.http diff --git a/apps/ec/market/test/agency/get.http b/module/ec/market/test/agency/get.http similarity index 100% rename from apps/ec/market/test/agency/get.http rename to module/ec/market/test/agency/get.http diff --git a/apps/ec/market/test/agency/login.http b/module/ec/market/test/agency/login.http similarity index 100% rename from apps/ec/market/test/agency/login.http rename to module/ec/market/test/agency/login.http diff --git a/apps/ec/market/test/agency/modify.http b/module/ec/market/test/agency/modify.http similarity index 100% rename from apps/ec/market/test/agency/modify.http rename to module/ec/market/test/agency/modify.http diff --git a/apps/ec/market/test/agency/pending.http b/module/ec/market/test/agency/pending.http similarity index 100% rename from apps/ec/market/test/agency/pending.http rename to module/ec/market/test/agency/pending.http diff --git a/apps/ec/market/test/agency/set_password.http b/module/ec/market/test/agency/set_password.http similarity index 100% rename from apps/ec/market/test/agency/set_password.http rename to module/ec/market/test/agency/set_password.http diff --git a/apps/ec/market/test/supply/fetch.http b/module/ec/market/test/supply/fetch.http similarity index 100% rename from apps/ec/market/test/supply/fetch.http rename to module/ec/market/test/supply/fetch.http diff --git a/apps/ec/order/README.md b/module/ec/order/README.md similarity index 100% rename from apps/ec/order/README.md rename to module/ec/order/README.md diff --git a/apps/ec/order/cmd/main/main.go b/module/ec/order/cmd/main/main.go similarity index 79% rename from apps/ec/order/cmd/main/main.go rename to module/ec/order/cmd/main/main.go index 7a5d611..74f0c81 100644 --- a/apps/ec/order/cmd/main/main.go +++ b/module/ec/order/cmd/main/main.go @@ -5,9 +5,9 @@ package service import ( - "git.apinb.com/bsm-ec/order/internal/config" - "git.apinb.com/bsm-ec/order/internal/impl" - "git.apinb.com/bsm-ec/order/internal/server" + "bsm/full/module/ec/order/internal/config" + "bsm/full/module/ec/order/internal/impl" + "bsm/full/module/ec/order/internal/server" "git.apinb.com/bsm-sdk/core/service" ) @@ -39,3 +39,7 @@ func Run() { // 启动服务 srv.Start() } + +func main() { + Run() +} diff --git a/apps/ec/order/etc/order_dev.yaml b/module/ec/order/etc/order_dev.yaml similarity index 100% rename from apps/ec/order/etc/order_dev.yaml rename to module/ec/order/etc/order_dev.yaml diff --git a/apps/ec/order/etc/order_prod.yaml b/module/ec/order/etc/order_prod.yaml similarity index 100% rename from apps/ec/order/etc/order_prod.yaml rename to module/ec/order/etc/order_prod.yaml diff --git a/apps/ec/order/etc/order_test.yaml b/module/ec/order/etc/order_test.yaml similarity index 100% rename from apps/ec/order/etc/order_test.yaml rename to module/ec/order/etc/order_test.yaml diff --git a/apps/ec/order/etc/supervisor.bsm-ec-order.conf b/module/ec/order/etc/supervisor.bsm-ec-order.conf similarity index 100% rename from apps/ec/order/etc/supervisor.bsm-ec-order.conf rename to module/ec/order/etc/supervisor.bsm-ec-order.conf diff --git a/apps/ec/order/go.mod b/module/ec/order/go.mod similarity index 60% rename from apps/ec/order/go.mod rename to module/ec/order/go.mod index b1a7d1a..b070f9a 100644 --- a/apps/ec/order/go.mod +++ b/module/ec/order/go.mod @@ -1,4 +1,4 @@ -module git.apinb.com/bsm-ec/order +module bsm/full/module/ec/order go 1.26.5 @@ -17,14 +17,12 @@ require ( filippo.io/edwards25519 v1.2.0 // indirect git.apinb.com/bsm-tools/protoc-gen-slc v0.0.13 // indirect git.apinb.com/bsm-tools/protoc-gen-ts v0.0.2 // indirect - github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/go-sql-driver/mysql v1.10.0 // indirect github.com/golang-jwt/jwt/v5 v5.3.1 // indirect - github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect go.uber.org/atomic v1.11.0 // indirect - go.yaml.in/yaml/v3 v3.0.4 // indirect - golang.org/x/mod v0.36.0 // indirect + go.yaml.in/yaml/v3 v3.0.5 // indirect + golang.org/x/mod v0.37.0 // indirect google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.2 // indirect ) @@ -32,33 +30,34 @@ require ( github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/coreos/go-semver v0.3.1 // indirect github.com/coreos/go-systemd/v22 v22.7.0 // indirect - github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/google/uuid v1.6.0 // indirect - github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 + github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0 github.com/jackc/pgpassfile v1.0.0 // indirect github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect github.com/jackc/pgx/v5 v5.10.0 // indirect github.com/jackc/puddle/v2 v2.2.2 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect - github.com/oklog/ulid/v2 v2.1.1 // indirect - github.com/redis/go-redis/v9 v9.20.0 // indirect - go.etcd.io/etcd/api/v3 v3.6.12 // indirect - go.etcd.io/etcd/client/pkg/v3 v3.6.12 - go.etcd.io/etcd/client/v3 v3.6.12 + github.com/oklog/ulid/v2 v2.1.2 // indirect + github.com/redis/go-redis/v9 v9.22.0 // indirect + go.etcd.io/etcd/api/v3 v3.7.1 // indirect + go.etcd.io/etcd/client/pkg/v3 v3.7.1 + go.etcd.io/etcd/client/v3 v3.7.1 go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.28.0 // indirect - golang.org/x/net v0.55.0 // indirect - golang.org/x/sync v0.20.0 // indirect - golang.org/x/sys v0.45.0 // indirect - golang.org/x/text v0.37.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa // indirect - google.golang.org/grpc v1.81.1 + golang.org/x/net v0.57.0 // indirect + golang.org/x/sync v0.22.0 // indirect + golang.org/x/sys v0.47.0 // indirect + golang.org/x/text v0.40.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea // indirect + google.golang.org/grpc v1.83.0 google.golang.org/protobuf v1.36.11 gopkg.in/yaml.v3 v3.0.1 // indirect gorm.io/driver/mysql v1.6.0 - gorm.io/driver/postgres v1.6.0 // indirect - gorm.io/gorm v1.31.1 + gorm.io/driver/postgres v1.6.2 // indirect + gorm.io/gorm v1.31.2 ) + +replace git.apinb.com/bsm-sdk/core => D:/work/bsm-sdk/core diff --git a/apps/ec/address/go.sum b/module/ec/order/go.sum similarity index 51% rename from apps/ec/address/go.sum rename to module/ec/order/go.sum index b65c077..09e7b42 100644 --- a/apps/ec/address/go.sum +++ b/module/ec/order/go.sum @@ -1,7 +1,5 @@ filippo.io/edwards25519 v1.2.0 h1:crnVqOiS4jqYleHd9vaKZ+HKtHfllngJIiOpNpoJsjo= filippo.io/edwards25519 v1.2.0/go.mod h1:xzAOLCNug/yB62zG1bQ8uziwrIqIuxhctzJT18Q77mc= -git.apinb.com/bsm-sdk/core v0.2.0 h1:/e9yqpsbKBrRgMiGpS3KX2O4qDLxo5V5GpPSLNGxEKw= -git.apinb.com/bsm-sdk/core v0.2.0/go.mod h1:E9T6Eboo/0Zb36BjkKbIgvFzq4fQ2Q8P/7y5zmYTI6Y= git.apinb.com/bsm-tools/protoc-gen-slc v0.0.13 h1:RGg2R2kHz6IAD7scH6So2FlZYctFUDxqWR8i/+fMfOU= git.apinb.com/bsm-tools/protoc-gen-slc v0.0.13/go.mod h1:NpJaupVAxmyBleRMAug4mGS6BQV2E32rtuiqQzj1b+A= git.apinb.com/bsm-tools/protoc-gen-ts v0.0.2 h1:T9C1kY6iIHl5cZ7xyNgV2xlPNWxXmaWfTbD8AzpBB9M= @@ -19,14 +17,12 @@ github.com/coreos/go-systemd/v22 v22.7.0/go.mod h1:xNUYtjHu2EDXbsxz1i41wouACIwT7 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= -github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.4 h1:tG4xh9yMsRCAiodLVTxyrkzSZ9+o0L1Kg/+cPVcbP/8= +github.com/go-logr/logr v1.4.4/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-sql-driver/mysql v1.10.0 h1:Q+1LV8DkHJvSYAdR83XzuhDaTykuDx0l6fkXxoWCWfw= github.com/go-sql-driver/mysql v1.10.0/go.mod h1:M+cqaI7+xxXGG9swrdeUIoPG3Y3KCkF0pZej+SK+nWk= -github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= -github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt/v5 v5.3.1 h1:kYf81DTWFe7t+1VvL7eS+jKFVWaUnK9cB1qbwn63YCY= github.com/golang-jwt/jwt/v5 v5.3.1/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= @@ -35,8 +31,8 @@ github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= 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/grpc-ecosystem/grpc-gateway/v2 v2.29.0 h1:5VipnvEpbqr2gA2VbM+nYVbkIF28c5ZQfqCBQ5g2xfk= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0/go.mod h1:Hyl3n6Twe1hvtd9XUXDec4pTvgMSEixRuQKPTMH2bNs= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0 h1:/Tnpcb2E0Pz/tN9s3bfEY2Q8ePCEX9iuS+cneUwncnw= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0/go.mod h1:zOBXOsUaBSjKgmH4OGzV1esUpR3oUSCPYVd2cUBjKYY= 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= @@ -49,22 +45,22 @@ github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= -github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= -github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y= -github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0= +github.com/klauspost/cpuid/v2 v2.4.0 h1:S6Hrbc7+ywsr0r+RLapfGBHfyefhCTwEh3A0tV913Dw= +github.com/klauspost/cpuid/v2 v2.4.0/go.mod h1:19jmZ9mjzoF//ddRSUsv0zfBTJWh3QJh9FNxZTMrGxU= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/oklog/ulid/v2 v2.1.1 h1:suPZ4ARWLOJLegGFiZZ1dFAkqzhMjL3J1TzI+5wHz8s= -github.com/oklog/ulid/v2 v2.1.1/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ= +github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= +github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= +github.com/oklog/ulid/v2 v2.1.2 h1:IEclFb9JNvzYA6MW2SCxbLzcHTVsfqm3PrqGQJH5zec= +github.com/oklog/ulid/v2 v2.1.2/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ= github.com/pborman/getopt v0.0.0-20170112200414-7148bc3a4c30/go.mod h1:85jBQOZwpVEaDAr341tbn15RS4fCAsIst0qp7i8ex1o= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/redis/go-redis/v9 v9.20.0 h1:WnQYxLkgO2xiXTCJY0ldIiI8dNqCDlQAG+AtaH7a2a0= -github.com/redis/go-redis/v9 v9.20.0/go.mod h1:v/M13XI1PVCDcm01VtPFOADfZtHf8YW3baQf57KlIkA= +github.com/redis/go-redis/v9 v9.22.0 h1:laDvpYXTJtZLloinw1fA5Kqd6HAEH2XKxOkG/PDq2F0= +github.com/redis/go-redis/v9 v9.22.0/go.mod h1:y2g0Wj8rQvuK0ELM+oxSudcLtC09JScs98I/X9gRWY4= github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0= @@ -74,28 +70,26 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= -github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/zeebo/xxh3 v1.1.0 h1:s7DLGDK45Dyfg7++yxI0khrfwq9661w9EN78eP/UZVs= github.com/zeebo/xxh3 v1.1.0/go.mod h1:IisAie1LELR4xhVinxWS5+zf1lA4p0MW4T+w+W07F5s= -go.etcd.io/etcd/api/v3 v3.6.12 h1:OLOZUKEuAA36TR48F0cIaa8FdzrWygjyfrJxXg4iDgs= -go.etcd.io/etcd/api/v3 v3.6.12/go.mod h1:p14EIQXHbuOQbVvL/WEes5uqKnxP9AgKJgpjbMVvzvE= -go.etcd.io/etcd/client/pkg/v3 v3.6.12 h1:36zzB+pQOdHbhN+kH2iJz/K8bJn0ZLtLfPPO7jozTDo= -go.etcd.io/etcd/client/pkg/v3 v3.6.12/go.mod h1:hh2+ZXtfLzs3o6mn92ntgNPBrTJJOvXqICM5g3L3DMY= -go.etcd.io/etcd/client/v3 v3.6.12 h1:kMSP6JcPZMqSJiX+TXdUIBU/4eXEZWBAaui4VihMbIc= -go.etcd.io/etcd/client/v3 v3.6.12/go.mod h1:CMs6fJWYiZQk4ytFjd4lE1diOvvRMmtbbn/alZXd3dQ= +go.etcd.io/etcd/api/v3 v3.7.1 h1:KJG0/DcWGfe3Y1otDf/fsBf0TSSgpxZ5RO/L8SFt73E= +go.etcd.io/etcd/api/v3 v3.7.1/go.mod h1:8bXIpCMeV7E3/XL0Ix123ATn3dB+0V7d9zklHbB0m78= +go.etcd.io/etcd/client/pkg/v3 v3.7.1 h1:rKYsj3pRkR0eK3yjT3XOgrhqfmIfj9pzNgxjh7mfFv4= +go.etcd.io/etcd/client/pkg/v3 v3.7.1/go.mod h1:cnzZGIUzSfjEwLC6UBVsSXlEK1eepS/JUD7wE6PLRT0= +go.etcd.io/etcd/client/v3 v3.7.1 h1:0PEMMC0KuZmVIN+RAbdqfkZ45pYTgKVtmBEbRCvZFUg= +go.etcd.io/etcd/client/v3 v3.7.1/go.mod h1:ffNqALa8tRCYhYo1F9oR489y23K39Gz+BSR3ApAGYq0= go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64= go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y= -go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I= -go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0= -go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM= -go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY= -go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg= -go.opentelemetry.io/otel/sdk v1.43.0/go.mod h1:P+IkVU3iWukmiit/Yf9AWvpyRDlUeBaRg6Y+C58QHzg= -go.opentelemetry.io/otel/sdk/metric v1.43.0 h1:S88dyqXjJkuBNLeMcVPRFXpRw2fuwdvfCGLEo89fDkw= -go.opentelemetry.io/otel/sdk/metric v1.43.0/go.mod h1:C/RJtwSEJ5hzTiUz5pXF1kILHStzb9zFlIEe85bhj6A= -go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A= -go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0= +go.opentelemetry.io/otel v1.45.0 h1:pdrWmLHofpubmArBv1LgFSv1Z0Ie/ppdZzu+kUN5EeU= +go.opentelemetry.io/otel v1.45.0/go.mod h1:XZxIqPapzEYnhNSScF5DIqXhm/rYi0FzCe2XddAwZfQ= +go.opentelemetry.io/otel/metric v1.45.0 h1:7Eg1uH7CJ5cXv9is6tnBe1FI6rj1nwUdbFypRm3br/M= +go.opentelemetry.io/otel/metric v1.45.0/go.mod h1:HAPbm1nd3p1PmFH7v2dR+6BjXxw+Lq4a2+pndMAm08s= +go.opentelemetry.io/otel/sdk v1.45.0 h1:4VVSMgQ83dUgW2aoX5f6JgLvHwIvzcuLnF9lUdCSpCw= +go.opentelemetry.io/otel/sdk v1.45.0/go.mod h1:Sr40LgXV7DsKMMJMKOhUWOgMWTfAaqvm2kF0g7ilwuA= +go.opentelemetry.io/otel/sdk/metric v1.44.0 h1:3LlKgI+VjbVsjNRFZJZAJ30WjXC5VkNRks6si09iEfI= +go.opentelemetry.io/otel/sdk/metric v1.44.0/go.mod h1:5B5pMARnXxKhltooO4xUuCBorl65a4EpnTalObqOigA= +go.opentelemetry.io/otel/trace v1.45.0 h1:l/mP6Uv7oNO7/TblbhpbgMidxhq1uO/rPsikOyVhxag= +go.opentelemetry.io/otel/trace v1.45.0/go.mod h1:qoJJA2xNMnxRrdISU/kLtfUH2wNeQbiv+jhs/CxI8bc= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= @@ -104,51 +98,26 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.28.0 h1:IZzaP1Fv73/T/pBMLk4VutPl36uNC+OSUh3JLG3FIjo= go.uber.org/zap v1.28.0/go.mod h1:rDLpOi171uODNm/mxFcuYWxDsqWSAVkFdX4XojSKg/Q= -go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= -go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.36.0 h1:JJjpVx6myfUsUdAzZuOSTTmRE0PfZeNWzzvKrP7amb4= -golang.org/x/mod v0.36.0/go.mod h1:moc6ELqsWcOw5Ef3xVprK5ul/MvtVvkIXLziUOICjUQ= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8= -golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -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.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4= -golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY= -golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc= -golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -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= +go.yaml.in/yaml/v3 v3.0.5 h1:N6y/pJk8buWs9NY5ERU2HSMfm+IuD/OtfdAnq6kESPw= +go.yaml.in/yaml/v3 v3.0.5/go.mod h1:HVTZu1O7/Vkt2N+BFy8Zza+lnLsABggaTM2ZpNIGuKg= +golang.org/x/mod v0.37.0 h1:vF1DjpVEshcIqoEaauuHebaLk1O1forxjxBaVn884JQ= +golang.org/x/mod v0.37.0/go.mod h1:m8S8VeM9r4dzDwjrKO0a1sZP3YjeMamRRlD+fmR2Q/0= +golang.org/x/net v0.57.0 h1:K5+3DljvIuDG9/Jv9rvyMywYNFCQ9RSUY6OOTTkT+tE= +golang.org/x/net v0.57.0/go.mod h1:KpXc8iv+r3XplLAG/f7Jsf9RPszJzdR0f58q9vGOuEU= +golang.org/x/sync v0.22.0 h1:SZjpbeLmrCk4xhRSZFNZW5gFUeCeFgjekvI/+gfScek= +golang.org/x/sync v0.22.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= +golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs= +golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +golang.org/x/text v0.40.0 h1:Ub2Z6/xjgF1WrYQz2nuITOEegKFtiIy+rieRJ5lHZKs= +golang.org/x/text v0.40.0/go.mod h1:hpnzDAfGV753zIKo+wk3u1bVKCGPbrnF7+7LBF/UHVY= gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4= gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E= -google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa h1:Kjn0N0tCrDgiAFW+lGO4JZ3ck44CehvJQMAwj9QF0G8= -google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:q4lMZS6kskjT5HvCPrnnypcDPVJqT/f4nfxmkE7gryY= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa h1:mZHHdPZl0dbGHCflZgAq/Q468DWVFcU2whhB2KAo8fk= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= -google.golang.org/grpc v1.81.1 h1:VnnIIZ88UzOOKLukQi+ImGz8O1Wdp8nAGGnvOfEIWQQ= -google.golang.org/grpc v1.81.1/go.mod h1:xGH9GfzOyMTGIOXBJmXt+BX/V0kcdQbdcuwQ/zNw42I= +google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea h1:Jifw/kjs/r3B0uszvls/m3c3tmZs2YHGM9C+rvxP9gY= +google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea/go.mod h1:K/+WGbmBY7aNW1HDw1fJnKYo10i0DkAX6pows00dLig= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea h1:kVhQEPTpKQahD5+JSBTfBB19wcgQTTjAIn45MBqnyHk= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= +google.golang.org/grpc v1.83.0 h1:JeNZEKJFbQxArAMl+hiytHauacDNqJUllNfmIMmpqnQ= +google.golang.org/grpc v1.83.0/go.mod h1:kDyl6SKsiHKt0uylY5gtn5cEjkrIOhQOGDgIc4JGwzQ= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.2 h1:rgSNvqscFZ1JgV/4wH5GOsZFSFkR2Eua9As3KIr2LlM= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.2/go.mod h1:iMEtFwDlAhjDU9L5mY6U1XLwlIId/G3h+QcBHDIvrJ8= google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE= @@ -161,9 +130,11 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gorm.io/driver/mysql v1.6.0 h1:eNbLmNTpPpTOVZi8MMxCi2aaIm0ZpInbORNXDwyLGvg= gorm.io/driver/mysql v1.6.0/go.mod h1:D/oCC2GWK3M/dqoLxnOlaNKmXz8WNTfcS9y5ovaSqKo= -gorm.io/driver/postgres v1.6.0 h1:2dxzU8xJ+ivvqTRph34QX+WrRaJlmfyPqXmoGVjMBa4= -gorm.io/driver/postgres v1.6.0/go.mod h1:vUw0mrGgrTK+uPHEhAdV4sfFELrByKVGnaVRkXDhtWo= -gorm.io/gorm v1.31.1 h1:7CA8FTFz/gRfgqgpeKIBcervUn3xSyPUmr6B2WXJ7kg= -gorm.io/gorm v1.31.1/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs= +gorm.io/driver/postgres v1.6.2 h1:BvXQ/cNUg63q5TFNg672DmDcowZSFrNLkkA3Xe6GXq4= +gorm.io/driver/postgres v1.6.2/go.mod h1:0c4fQA44XhOklXDkgtuKqysHCycTa5i9e3EIpDGCwXk= +gorm.io/driver/sqlite v1.6.0 h1:WHRRrIiulaPiPFmDcod6prc4l2VGVWHz80KspNsxSfQ= +gorm.io/driver/sqlite v1.6.0/go.mod h1:AO9V1qIQddBESngQUKWL9yoH93HIeA1X6V633rBwyT8= +gorm.io/gorm v1.31.2 h1:3o8FXNo9v9S858gil+3LlZA1LkCOzgb4g5BL64FgaCo= +gorm.io/gorm v1.31.2/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs= gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU= gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU= diff --git a/apps/ec/order/internal/config/config.go b/module/ec/order/internal/config/config.go similarity index 100% rename from apps/ec/order/internal/config/config.go rename to module/ec/order/internal/config/config.go diff --git a/apps/ec/order/internal/impl/impl.go b/module/ec/order/internal/impl/impl.go similarity index 100% rename from apps/ec/order/internal/impl/impl.go rename to module/ec/order/internal/impl/impl.go diff --git a/apps/ec/address/internal/impl/with.go b/module/ec/order/internal/impl/with.go similarity index 95% rename from apps/ec/address/internal/impl/with.go rename to module/ec/order/internal/impl/with.go index 591a7e6..693b0e1 100644 --- a/apps/ec/address/internal/impl/with.go +++ b/module/ec/order/internal/impl/with.go @@ -3,8 +3,8 @@ package impl import ( "time" - "git.apinb.com/bsm-ec/address/internal/config" - "git.apinb.com/bsm-ec/address/internal/models" + "bsm/full/module/ec/order/internal/config" + "bsm/full/module/ec/order/internal/models" "git.apinb.com/bsm-sdk/core/cache/redis" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" diff --git a/apps/ec/order/internal/logic/cart/create.go b/module/ec/order/internal/logic/cart/create.go similarity index 94% rename from apps/ec/order/internal/logic/cart/create.go rename to module/ec/order/internal/logic/cart/create.go index e4c9fd7..65d82e5 100644 --- a/apps/ec/order/internal/logic/cart/create.go +++ b/module/ec/order/internal/logic/cart/create.go @@ -5,8 +5,8 @@ import ( "errors" "time" - "git.apinb.com/bsm-ec/order/internal/models" - pb "git.apinb.com/bsm-ec/order/pb" + "bsm/full/module/ec/order/internal/models" + pb "bsm/full/module/ec/order/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/order/internal/logic/cart/delete.go b/module/ec/order/internal/logic/cart/delete.go similarity index 86% rename from apps/ec/order/internal/logic/cart/delete.go rename to module/ec/order/internal/logic/cart/delete.go index a065f22..f2b2019 100644 --- a/apps/ec/order/internal/logic/cart/delete.go +++ b/module/ec/order/internal/logic/cart/delete.go @@ -4,8 +4,8 @@ import ( "context" "time" - "git.apinb.com/bsm-ec/order/internal/models" - pb "git.apinb.com/bsm-ec/order/pb" + "bsm/full/module/ec/order/internal/models" + pb "bsm/full/module/ec/order/pb" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/ec/order/internal/logic/cart/fetch.go b/module/ec/order/internal/logic/cart/fetch.go similarity index 95% rename from apps/ec/order/internal/logic/cart/fetch.go rename to module/ec/order/internal/logic/cart/fetch.go index d7d767b..e9f43b7 100644 --- a/apps/ec/order/internal/logic/cart/fetch.go +++ b/module/ec/order/internal/logic/cart/fetch.go @@ -3,8 +3,8 @@ package cart import ( "context" - "git.apinb.com/bsm-ec/order/internal/models" - pb "git.apinb.com/bsm-ec/order/pb" + "bsm/full/module/ec/order/internal/models" + pb "bsm/full/module/ec/order/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/order/internal/logic/cart/modify.go b/module/ec/order/internal/logic/cart/modify.go similarity index 93% rename from apps/ec/order/internal/logic/cart/modify.go rename to module/ec/order/internal/logic/cart/modify.go index f09d8ae..d853cfe 100644 --- a/apps/ec/order/internal/logic/cart/modify.go +++ b/module/ec/order/internal/logic/cart/modify.go @@ -4,8 +4,8 @@ import ( "context" "time" - "git.apinb.com/bsm-ec/order/internal/models" - pb "git.apinb.com/bsm-ec/order/pb" + "bsm/full/module/ec/order/internal/models" + pb "bsm/full/module/ec/order/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/order/internal/logic/common/get.go b/module/ec/order/internal/logic/common/get.go similarity index 90% rename from apps/ec/order/internal/logic/common/get.go rename to module/ec/order/internal/logic/common/get.go index c5231c0..130c4be 100644 --- a/apps/ec/order/internal/logic/common/get.go +++ b/module/ec/order/internal/logic/common/get.go @@ -1,8 +1,8 @@ package common import ( - "git.apinb.com/bsm-ec/order/internal/models" - pb "git.apinb.com/bsm-ec/order/pb" + "bsm/full/module/ec/order/internal/models" + pb "bsm/full/module/ec/order/pb" ) // GetOrderSummaryByIdentity 根据订单号获取订单详情 diff --git a/apps/ec/order/internal/logic/common/no.go b/module/ec/order/internal/logic/common/no.go similarity index 100% rename from apps/ec/order/internal/logic/common/no.go rename to module/ec/order/internal/logic/common/no.go diff --git a/apps/ec/order/internal/logic/common/reflect.go b/module/ec/order/internal/logic/common/reflect.go similarity index 96% rename from apps/ec/order/internal/logic/common/reflect.go rename to module/ec/order/internal/logic/common/reflect.go index d64695a..f36386a 100644 --- a/apps/ec/order/internal/logic/common/reflect.go +++ b/module/ec/order/internal/logic/common/reflect.go @@ -1,9 +1,9 @@ package common import ( - "git.apinb.com/bsm-ec/order/internal/models" - order "git.apinb.com/bsm-ec/order/pb" - pb "git.apinb.com/bsm-ec/order/pb" + "bsm/full/module/ec/order/internal/models" + order "bsm/full/module/ec/order/pb" + pb "bsm/full/module/ec/order/pb" "git.apinb.com/bsm-sdk/core/vars" ) diff --git a/apps/ec/order/internal/logic/coupon/by_status.go b/module/ec/order/internal/logic/coupon/by_status.go similarity index 92% rename from apps/ec/order/internal/logic/coupon/by_status.go rename to module/ec/order/internal/logic/coupon/by_status.go index 1acbc5c..9ca4223 100644 --- a/apps/ec/order/internal/logic/coupon/by_status.go +++ b/module/ec/order/internal/logic/coupon/by_status.go @@ -3,8 +3,8 @@ package coupon import ( "context" - "git.apinb.com/bsm-ec/order/internal/models" - pb "git.apinb.com/bsm-ec/order/pb" + "bsm/full/module/ec/order/internal/models" + pb "bsm/full/module/ec/order/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/order/internal/logic/mgt/order_approve.go b/module/ec/order/internal/logic/mgt/order_approve.go similarity index 96% rename from apps/ec/order/internal/logic/mgt/order_approve.go rename to module/ec/order/internal/logic/mgt/order_approve.go index 7d8fa99..2308d9c 100644 --- a/apps/ec/order/internal/logic/mgt/order_approve.go +++ b/module/ec/order/internal/logic/mgt/order_approve.go @@ -4,8 +4,8 @@ import ( "context" "time" - "git.apinb.com/bsm-ec/order/internal/models" - pb "git.apinb.com/bsm-ec/order/pb" + "bsm/full/module/ec/order/internal/models" + pb "bsm/full/module/ec/order/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "gorm.io/gorm" diff --git a/apps/ec/order/internal/logic/mgt/order_cancel.go b/module/ec/order/internal/logic/mgt/order_cancel.go similarity index 92% rename from apps/ec/order/internal/logic/mgt/order_cancel.go rename to module/ec/order/internal/logic/mgt/order_cancel.go index 35da3a9..b66c56a 100644 --- a/apps/ec/order/internal/logic/mgt/order_cancel.go +++ b/module/ec/order/internal/logic/mgt/order_cancel.go @@ -4,8 +4,8 @@ import ( "context" "time" - "git.apinb.com/bsm-ec/order/internal/models" - pb "git.apinb.com/bsm-ec/order/pb" + "bsm/full/module/ec/order/internal/models" + pb "bsm/full/module/ec/order/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/order/internal/logic/mgt/order_create.go b/module/ec/order/internal/logic/mgt/order_create.go similarity index 97% rename from apps/ec/order/internal/logic/mgt/order_create.go rename to module/ec/order/internal/logic/mgt/order_create.go index 5ac68b2..59b56b0 100644 --- a/apps/ec/order/internal/logic/mgt/order_create.go +++ b/module/ec/order/internal/logic/mgt/order_create.go @@ -5,9 +5,9 @@ import ( "errors" "time" - "git.apinb.com/bsm-ec/order/internal/logic/common" - "git.apinb.com/bsm-ec/order/internal/models" - pb "git.apinb.com/bsm-ec/order/pb" + "bsm/full/module/ec/order/internal/logic/common" + "bsm/full/module/ec/order/internal/models" + pb "bsm/full/module/ec/order/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/order/internal/logic/mgt/order_get.go b/module/ec/order/internal/logic/mgt/order_get.go similarity index 91% rename from apps/ec/order/internal/logic/mgt/order_get.go rename to module/ec/order/internal/logic/mgt/order_get.go index e6ec4f1..ff45de8 100644 --- a/apps/ec/order/internal/logic/mgt/order_get.go +++ b/module/ec/order/internal/logic/mgt/order_get.go @@ -4,9 +4,9 @@ import ( "context" "errors" - "git.apinb.com/bsm-ec/order/internal/logic/common" - "git.apinb.com/bsm-ec/order/internal/models" - pb "git.apinb.com/bsm-ec/order/pb" + "bsm/full/module/ec/order/internal/logic/common" + "bsm/full/module/ec/order/internal/models" + pb "bsm/full/module/ec/order/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/order/internal/logic/mgt/order_list_by_store.go b/module/ec/order/internal/logic/mgt/order_list_by_store.go similarity index 94% rename from apps/ec/order/internal/logic/mgt/order_list_by_store.go rename to module/ec/order/internal/logic/mgt/order_list_by_store.go index 001d380..17b0ccb 100644 --- a/apps/ec/order/internal/logic/mgt/order_list_by_store.go +++ b/module/ec/order/internal/logic/mgt/order_list_by_store.go @@ -4,9 +4,9 @@ import ( "context" "errors" - "git.apinb.com/bsm-ec/order/internal/logic/common" - "git.apinb.com/bsm-ec/order/internal/models" - pb "git.apinb.com/bsm-ec/order/pb" + "bsm/full/module/ec/order/internal/logic/common" + "bsm/full/module/ec/order/internal/models" + pb "bsm/full/module/ec/order/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/order/internal/logic/mgt/order_modify.go b/module/ec/order/internal/logic/mgt/order_modify.go similarity index 94% rename from apps/ec/order/internal/logic/mgt/order_modify.go rename to module/ec/order/internal/logic/mgt/order_modify.go index d136733..2124ccc 100644 --- a/apps/ec/order/internal/logic/mgt/order_modify.go +++ b/module/ec/order/internal/logic/mgt/order_modify.go @@ -4,7 +4,7 @@ import ( "context" "time" - pb "git.apinb.com/bsm-ec/order/pb" + pb "bsm/full/module/ec/order/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/ec/order/internal/logic/mgt/order_returnable.go b/module/ec/order/internal/logic/mgt/order_returnable.go similarity index 95% rename from apps/ec/order/internal/logic/mgt/order_returnable.go rename to module/ec/order/internal/logic/mgt/order_returnable.go index 854a2f2..182c6f5 100644 --- a/apps/ec/order/internal/logic/mgt/order_returnable.go +++ b/module/ec/order/internal/logic/mgt/order_returnable.go @@ -5,8 +5,8 @@ import ( "errors" "time" - "git.apinb.com/bsm-ec/order/internal/models" - pb "git.apinb.com/bsm-ec/order/pb" + "bsm/full/module/ec/order/internal/models" + pb "bsm/full/module/ec/order/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/order/internal/logic/summary/cancel.go b/module/ec/order/internal/logic/summary/cancel.go similarity index 93% rename from apps/ec/order/internal/logic/summary/cancel.go rename to module/ec/order/internal/logic/summary/cancel.go index 2ed1872..64ceae4 100644 --- a/apps/ec/order/internal/logic/summary/cancel.go +++ b/module/ec/order/internal/logic/summary/cancel.go @@ -4,8 +4,8 @@ import ( "context" "time" - "git.apinb.com/bsm-ec/order/internal/models" - pb "git.apinb.com/bsm-ec/order/pb" + "bsm/full/module/ec/order/internal/models" + pb "bsm/full/module/ec/order/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/order/internal/logic/summary/check.go b/module/ec/order/internal/logic/summary/check.go similarity index 90% rename from apps/ec/order/internal/logic/summary/check.go rename to module/ec/order/internal/logic/summary/check.go index 8e450a4..53aeb4b 100644 --- a/apps/ec/order/internal/logic/summary/check.go +++ b/module/ec/order/internal/logic/summary/check.go @@ -4,8 +4,8 @@ import ( "context" "time" - "git.apinb.com/bsm-ec/order/internal/models" - pb "git.apinb.com/bsm-ec/order/pb" + "bsm/full/module/ec/order/internal/models" + pb "bsm/full/module/ec/order/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/order/internal/logic/summary/confirm.go b/module/ec/order/internal/logic/summary/confirm.go similarity index 96% rename from apps/ec/order/internal/logic/summary/confirm.go rename to module/ec/order/internal/logic/summary/confirm.go index 6506900..b02a873 100644 --- a/apps/ec/order/internal/logic/summary/confirm.go +++ b/module/ec/order/internal/logic/summary/confirm.go @@ -3,8 +3,8 @@ package summary import ( "context" - "git.apinb.com/bsm-ec/order/internal/models" - pb "git.apinb.com/bsm-ec/order/pb" + "bsm/full/module/ec/order/internal/models" + pb "bsm/full/module/ec/order/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/order/internal/logic/summary/get.go b/module/ec/order/internal/logic/summary/get.go similarity index 88% rename from apps/ec/order/internal/logic/summary/get.go rename to module/ec/order/internal/logic/summary/get.go index 4077feb..597122b 100644 --- a/apps/ec/order/internal/logic/summary/get.go +++ b/module/ec/order/internal/logic/summary/get.go @@ -3,8 +3,8 @@ package summary import ( "context" - "git.apinb.com/bsm-ec/order/internal/logic/common" - pb "git.apinb.com/bsm-ec/order/pb" + "bsm/full/module/ec/order/internal/logic/common" + pb "bsm/full/module/ec/order/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/order/internal/logic/summary/list.go b/module/ec/order/internal/logic/summary/list.go similarity index 92% rename from apps/ec/order/internal/logic/summary/list.go rename to module/ec/order/internal/logic/summary/list.go index b3803f6..e662600 100644 --- a/apps/ec/order/internal/logic/summary/list.go +++ b/module/ec/order/internal/logic/summary/list.go @@ -4,9 +4,9 @@ import ( "context" "errors" - "git.apinb.com/bsm-ec/order/internal/logic/common" - "git.apinb.com/bsm-ec/order/internal/models" - pb "git.apinb.com/bsm-ec/order/pb" + "bsm/full/module/ec/order/internal/logic/common" + "bsm/full/module/ec/order/internal/models" + pb "bsm/full/module/ec/order/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/order/internal/logic/summary/quick_create_by_product.go b/module/ec/order/internal/logic/summary/quick_create_by_product.go similarity index 97% rename from apps/ec/order/internal/logic/summary/quick_create_by_product.go rename to module/ec/order/internal/logic/summary/quick_create_by_product.go index 25dc067..6725284 100644 --- a/apps/ec/order/internal/logic/summary/quick_create_by_product.go +++ b/module/ec/order/internal/logic/summary/quick_create_by_product.go @@ -6,9 +6,9 @@ import ( "strings" "time" - "git.apinb.com/bsm-ec/order/internal/logic/common" - "git.apinb.com/bsm-ec/order/internal/models" - pb "git.apinb.com/bsm-ec/order/pb" + "bsm/full/module/ec/order/internal/logic/common" + "bsm/full/module/ec/order/internal/models" + pb "bsm/full/module/ec/order/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/order/internal/logic/summary/simulate_pay.go b/module/ec/order/internal/logic/summary/simulate_pay.go similarity index 91% rename from apps/ec/order/internal/logic/summary/simulate_pay.go rename to module/ec/order/internal/logic/summary/simulate_pay.go index 7ee4936..16e208c 100644 --- a/apps/ec/order/internal/logic/summary/simulate_pay.go +++ b/module/ec/order/internal/logic/summary/simulate_pay.go @@ -5,8 +5,8 @@ import ( "errors" "time" - "git.apinb.com/bsm-ec/order/internal/models" - pb "git.apinb.com/bsm-ec/order/pb" + "bsm/full/module/ec/order/internal/models" + pb "bsm/full/module/ec/order/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/order/internal/logic/summary/simulate_receiving.go b/module/ec/order/internal/logic/summary/simulate_receiving.go similarity index 91% rename from apps/ec/order/internal/logic/summary/simulate_receiving.go rename to module/ec/order/internal/logic/summary/simulate_receiving.go index 71c632a..1ca8cce 100644 --- a/apps/ec/order/internal/logic/summary/simulate_receiving.go +++ b/module/ec/order/internal/logic/summary/simulate_receiving.go @@ -5,8 +5,8 @@ import ( "errors" "time" - "git.apinb.com/bsm-ec/order/internal/models" - pb "git.apinb.com/bsm-ec/order/pb" + "bsm/full/module/ec/order/internal/models" + pb "bsm/full/module/ec/order/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/order/internal/logic/summary/simulate_shipments.go b/module/ec/order/internal/logic/summary/simulate_shipments.go similarity index 91% rename from apps/ec/order/internal/logic/summary/simulate_shipments.go rename to module/ec/order/internal/logic/summary/simulate_shipments.go index 804e4fc..0aab750 100644 --- a/apps/ec/order/internal/logic/summary/simulate_shipments.go +++ b/module/ec/order/internal/logic/summary/simulate_shipments.go @@ -5,8 +5,8 @@ import ( "errors" "time" - "git.apinb.com/bsm-ec/order/internal/models" - pb "git.apinb.com/bsm-ec/order/pb" + "bsm/full/module/ec/order/internal/models" + pb "bsm/full/module/ec/order/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/order/internal/logic/summary/submit.go b/module/ec/order/internal/logic/summary/submit.go similarity index 98% rename from apps/ec/order/internal/logic/summary/submit.go rename to module/ec/order/internal/logic/summary/submit.go index 1b83de6..02239f4 100644 --- a/apps/ec/order/internal/logic/summary/submit.go +++ b/module/ec/order/internal/logic/summary/submit.go @@ -7,9 +7,9 @@ import ( "strings" "time" - "git.apinb.com/bsm-ec/order/internal/logic/common" - "git.apinb.com/bsm-ec/order/internal/models" - pb "git.apinb.com/bsm-ec/order/pb" + "bsm/full/module/ec/order/internal/logic/common" + "bsm/full/module/ec/order/internal/models" + pb "bsm/full/module/ec/order/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/ec/order/internal/models/impl.go b/module/ec/order/internal/models/impl.go similarity index 100% rename from apps/ec/order/internal/models/impl.go rename to module/ec/order/internal/models/impl.go diff --git a/apps/ec/order/internal/models/order_cart.go b/module/ec/order/internal/models/order_cart.go similarity index 100% rename from apps/ec/order/internal/models/order_cart.go rename to module/ec/order/internal/models/order_cart.go diff --git a/apps/ec/order/internal/models/order_coupon.go b/module/ec/order/internal/models/order_coupon.go similarity index 100% rename from apps/ec/order/internal/models/order_coupon.go rename to module/ec/order/internal/models/order_coupon.go diff --git a/apps/ec/order/internal/models/order_details.go b/module/ec/order/internal/models/order_details.go similarity index 100% rename from apps/ec/order/internal/models/order_details.go rename to module/ec/order/internal/models/order_details.go diff --git a/apps/ec/order/internal/models/order_summary.go b/module/ec/order/internal/models/order_summary.go similarity index 100% rename from apps/ec/order/internal/models/order_summary.go rename to module/ec/order/internal/models/order_summary.go diff --git a/apps/ec/order/internal/models/query.go b/module/ec/order/internal/models/query.go similarity index 100% rename from apps/ec/order/internal/models/query.go rename to module/ec/order/internal/models/query.go diff --git a/apps/ec/order/internal/models/types.go b/module/ec/order/internal/models/types.go similarity index 100% rename from apps/ec/order/internal/models/types.go rename to module/ec/order/internal/models/types.go diff --git a/apps/ec/order/internal/server/cart_server.go b/module/ec/order/internal/server/cart_server.go similarity index 90% rename from apps/ec/order/internal/server/cart_server.go rename to module/ec/order/internal/server/cart_server.go index 64433cd..6b68421 100644 --- a/apps/ec/order/internal/server/cart_server.go +++ b/module/ec/order/internal/server/cart_server.go @@ -3,8 +3,8 @@ package server import ( "context" - "git.apinb.com/bsm-ec/order/internal/logic/cart" - pb "git.apinb.com/bsm-ec/order/pb" + "bsm/full/module/ec/order/internal/logic/cart" + pb "bsm/full/module/ec/order/pb" ) type CartServer struct { diff --git a/apps/ec/order/internal/server/coupon_server.go b/module/ec/order/internal/server/coupon_server.go similarity index 81% rename from apps/ec/order/internal/server/coupon_server.go rename to module/ec/order/internal/server/coupon_server.go index b8afcb7..2f947d2 100644 --- a/apps/ec/order/internal/server/coupon_server.go +++ b/module/ec/order/internal/server/coupon_server.go @@ -3,8 +3,8 @@ package server import ( "context" - "git.apinb.com/bsm-ec/order/internal/logic/coupon" - pb "git.apinb.com/bsm-ec/order/pb" + "bsm/full/module/ec/order/internal/logic/coupon" + pb "bsm/full/module/ec/order/pb" ) type CouponServer struct { diff --git a/apps/ec/order/internal/server/mgt_server.go b/module/ec/order/internal/server/mgt_server.go similarity index 94% rename from apps/ec/order/internal/server/mgt_server.go rename to module/ec/order/internal/server/mgt_server.go index 076cadd..861c3ca 100644 --- a/apps/ec/order/internal/server/mgt_server.go +++ b/module/ec/order/internal/server/mgt_server.go @@ -3,8 +3,8 @@ package server import ( "context" - "git.apinb.com/bsm-ec/order/internal/logic/mgt" - pb "git.apinb.com/bsm-ec/order/pb" + "bsm/full/module/ec/order/internal/logic/mgt" + pb "bsm/full/module/ec/order/pb" ) type MgtServer struct { diff --git a/apps/ec/order/internal/server/new.go b/module/ec/order/internal/server/new.go similarity index 98% rename from apps/ec/order/internal/server/new.go rename to module/ec/order/internal/server/new.go index 68e8289..18a58e2 100644 --- a/apps/ec/order/internal/server/new.go +++ b/module/ec/order/internal/server/new.go @@ -3,7 +3,7 @@ package server import ( "context" - pb "git.apinb.com/bsm-ec/order/pb" + pb "bsm/full/module/ec/order/pb" "git.apinb.com/bsm-sdk/core/vars" gwRuntime "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "google.golang.org/grpc" diff --git a/apps/ec/order/internal/server/summary_server.go b/module/ec/order/internal/server/summary_server.go similarity index 95% rename from apps/ec/order/internal/server/summary_server.go rename to module/ec/order/internal/server/summary_server.go index 47dc893..747129c 100644 --- a/apps/ec/order/internal/server/summary_server.go +++ b/module/ec/order/internal/server/summary_server.go @@ -3,8 +3,8 @@ package server import ( "context" - "git.apinb.com/bsm-ec/order/internal/logic/summary" - pb "git.apinb.com/bsm-ec/order/pb" + "bsm/full/module/ec/order/internal/logic/summary" + pb "bsm/full/module/ec/order/pb" ) type SummaryServer struct { diff --git a/apps/ec/order/pb/blocks.pb.go b/module/ec/order/pb/blocks.pb.go similarity index 100% rename from apps/ec/order/pb/blocks.pb.go rename to module/ec/order/pb/blocks.pb.go diff --git a/apps/ec/order/pb/cart.pb.go b/module/ec/order/pb/cart.pb.go similarity index 100% rename from apps/ec/order/pb/cart.pb.go rename to module/ec/order/pb/cart.pb.go diff --git a/apps/ec/order/pb/cart.pb.gw.go b/module/ec/order/pb/cart.pb.gw.go similarity index 100% rename from apps/ec/order/pb/cart.pb.gw.go rename to module/ec/order/pb/cart.pb.gw.go diff --git a/apps/ec/order/pb/cart_grpc.pb.go b/module/ec/order/pb/cart_grpc.pb.go similarity index 100% rename from apps/ec/order/pb/cart_grpc.pb.go rename to module/ec/order/pb/cart_grpc.pb.go diff --git a/apps/ec/order/pb/coupon.pb.go b/module/ec/order/pb/coupon.pb.go similarity index 100% rename from apps/ec/order/pb/coupon.pb.go rename to module/ec/order/pb/coupon.pb.go diff --git a/apps/ec/order/pb/coupon.pb.gw.go b/module/ec/order/pb/coupon.pb.gw.go similarity index 100% rename from apps/ec/order/pb/coupon.pb.gw.go rename to module/ec/order/pb/coupon.pb.gw.go diff --git a/apps/ec/order/pb/coupon_grpc.pb.go b/module/ec/order/pb/coupon_grpc.pb.go similarity index 100% rename from apps/ec/order/pb/coupon_grpc.pb.go rename to module/ec/order/pb/coupon_grpc.pb.go diff --git a/apps/ec/order/pb/mgt.pb.go b/module/ec/order/pb/mgt.pb.go similarity index 100% rename from apps/ec/order/pb/mgt.pb.go rename to module/ec/order/pb/mgt.pb.go diff --git a/apps/ec/order/pb/mgt.pb.gw.go b/module/ec/order/pb/mgt.pb.gw.go similarity index 100% rename from apps/ec/order/pb/mgt.pb.gw.go rename to module/ec/order/pb/mgt.pb.gw.go diff --git a/apps/ec/order/pb/mgt_grpc.pb.go b/module/ec/order/pb/mgt_grpc.pb.go similarity index 100% rename from apps/ec/order/pb/mgt_grpc.pb.go rename to module/ec/order/pb/mgt_grpc.pb.go diff --git a/apps/ec/order/pb/summary.pb.go b/module/ec/order/pb/summary.pb.go similarity index 100% rename from apps/ec/order/pb/summary.pb.go rename to module/ec/order/pb/summary.pb.go diff --git a/apps/ec/order/pb/summary.pb.gw.go b/module/ec/order/pb/summary.pb.gw.go similarity index 100% rename from apps/ec/order/pb/summary.pb.gw.go rename to module/ec/order/pb/summary.pb.gw.go diff --git a/apps/ec/order/pb/summary_grpc.pb.go b/module/ec/order/pb/summary_grpc.pb.go similarity index 100% rename from apps/ec/order/pb/summary_grpc.pb.go rename to module/ec/order/pb/summary_grpc.pb.go diff --git a/apps/ec/order/proto/blocks.proto b/module/ec/order/proto/blocks.proto similarity index 100% rename from apps/ec/order/proto/blocks.proto rename to module/ec/order/proto/blocks.proto diff --git a/apps/ec/order/proto/cart.proto b/module/ec/order/proto/cart.proto similarity index 100% rename from apps/ec/order/proto/cart.proto rename to module/ec/order/proto/cart.proto diff --git a/apps/ec/order/proto/coupon.proto b/module/ec/order/proto/coupon.proto similarity index 100% rename from apps/ec/order/proto/coupon.proto rename to module/ec/order/proto/coupon.proto diff --git a/apps/ec/order/proto/mgt.proto b/module/ec/order/proto/mgt.proto similarity index 100% rename from apps/ec/order/proto/mgt.proto rename to module/ec/order/proto/mgt.proto diff --git a/apps/ec/order/proto/summary.proto b/module/ec/order/proto/summary.proto similarity index 100% rename from apps/ec/order/proto/summary.proto rename to module/ec/order/proto/summary.proto diff --git a/apps/ec/order/scripts/blocks.yaml b/module/ec/order/scripts/blocks.yaml similarity index 100% rename from apps/ec/order/scripts/blocks.yaml rename to module/ec/order/scripts/blocks.yaml diff --git a/apps/ec/order/scripts/filebeat.yaml b/module/ec/order/scripts/filebeat.yaml similarity index 100% rename from apps/ec/order/scripts/filebeat.yaml rename to module/ec/order/scripts/filebeat.yaml diff --git a/apps/ec/order/scripts/lint.sh b/module/ec/order/scripts/lint.sh similarity index 100% rename from apps/ec/order/scripts/lint.sh rename to module/ec/order/scripts/lint.sh diff --git a/apps/ec/order/sdk/typescript/order/const.ts b/module/ec/order/sdk/typescript/order/const.ts similarity index 100% rename from apps/ec/order/sdk/typescript/order/const.ts rename to module/ec/order/sdk/typescript/order/const.ts diff --git a/apps/ec/order/sdk/typescript/order/index.ts b/module/ec/order/sdk/typescript/order/index.ts similarity index 100% rename from apps/ec/order/sdk/typescript/order/index.ts rename to module/ec/order/sdk/typescript/order/index.ts diff --git a/apps/ec/order/swagger/sample.swagger.json b/module/ec/order/swagger/sample.swagger.json similarity index 100% rename from apps/ec/order/swagger/sample.swagger.json rename to module/ec/order/swagger/sample.swagger.json diff --git a/apps/ec/order/test/cart/cart_create.http b/module/ec/order/test/cart/cart_create.http similarity index 100% rename from apps/ec/order/test/cart/cart_create.http rename to module/ec/order/test/cart/cart_create.http diff --git a/apps/ec/order/test/cart/cart_del.http b/module/ec/order/test/cart/cart_del.http similarity index 100% rename from apps/ec/order/test/cart/cart_del.http rename to module/ec/order/test/cart/cart_del.http diff --git a/apps/ec/order/test/cart/cart_fetch.http b/module/ec/order/test/cart/cart_fetch.http similarity index 100% rename from apps/ec/order/test/cart/cart_fetch.http rename to module/ec/order/test/cart/cart_fetch.http diff --git a/apps/ec/order/test/cart/cart_modify.http b/module/ec/order/test/cart/cart_modify.http similarity index 100% rename from apps/ec/order/test/cart/cart_modify.http rename to module/ec/order/test/cart/cart_modify.http diff --git a/apps/ec/order/test/coupon/coupon_by_status.http b/module/ec/order/test/coupon/coupon_by_status.http similarity index 100% rename from apps/ec/order/test/coupon/coupon_by_status.http rename to module/ec/order/test/coupon/coupon_by_status.http diff --git a/apps/ec/order/test/mgt/order_cancel.http b/module/ec/order/test/mgt/order_cancel.http similarity index 100% rename from apps/ec/order/test/mgt/order_cancel.http rename to module/ec/order/test/mgt/order_cancel.http diff --git a/apps/ec/order/test/mgt/order_create.http b/module/ec/order/test/mgt/order_create.http similarity index 100% rename from apps/ec/order/test/mgt/order_create.http rename to module/ec/order/test/mgt/order_create.http diff --git a/apps/ec/order/test/mgt/order_get.http b/module/ec/order/test/mgt/order_get.http similarity index 100% rename from apps/ec/order/test/mgt/order_get.http rename to module/ec/order/test/mgt/order_get.http diff --git a/apps/ec/order/test/mgt/order_list_by_store.http b/module/ec/order/test/mgt/order_list_by_store.http similarity index 100% rename from apps/ec/order/test/mgt/order_list_by_store.http rename to module/ec/order/test/mgt/order_list_by_store.http diff --git a/apps/ec/order/test/mgt/order_returnable.http b/module/ec/order/test/mgt/order_returnable.http similarity index 100% rename from apps/ec/order/test/mgt/order_returnable.http rename to module/ec/order/test/mgt/order_returnable.http diff --git a/apps/ec/order/test/rpc/bisic_test.go b/module/ec/order/test/rpc/bisic_test.go similarity index 100% rename from apps/ec/order/test/rpc/bisic_test.go rename to module/ec/order/test/rpc/bisic_test.go diff --git a/apps/ec/order/test/rpc/cart_test.go b/module/ec/order/test/rpc/cart_test.go similarity index 98% rename from apps/ec/order/test/rpc/cart_test.go rename to module/ec/order/test/rpc/cart_test.go index a514a84..5924cdf 100644 --- a/apps/ec/order/test/rpc/cart_test.go +++ b/module/ec/order/test/rpc/cart_test.go @@ -7,7 +7,7 @@ import ( "fmt" "testing" - pb "git.apinb.com/bsm-ec/order/pb" + pb "bsm/full/module/ec/order/pb" ) func TestAdd(t *testing.T) { diff --git a/apps/ec/order/test/rpc/coupon_test.go b/module/ec/order/test/rpc/coupon_test.go similarity index 90% rename from apps/ec/order/test/rpc/coupon_test.go rename to module/ec/order/test/rpc/coupon_test.go index d5ad951..262863a 100644 --- a/apps/ec/order/test/rpc/coupon_test.go +++ b/module/ec/order/test/rpc/coupon_test.go @@ -6,7 +6,7 @@ import ( "fmt" "testing" - pb "git.apinb.com/bsm-ec/order/pb" + pb "bsm/full/module/ec/order/pb" ) func TestByStatus(t *testing.T) { diff --git a/apps/ec/order/test/rpc/mgt_test.go b/module/ec/order/test/rpc/mgt_test.go similarity index 93% rename from apps/ec/order/test/rpc/mgt_test.go rename to module/ec/order/test/rpc/mgt_test.go index 7357129..61365c4 100644 --- a/apps/ec/order/test/rpc/mgt_test.go +++ b/module/ec/order/test/rpc/mgt_test.go @@ -7,7 +7,7 @@ import ( "fmt" "testing" - pb "git.apinb.com/bsm-ec/order/pb" + pb "bsm/full/module/ec/order/pb" ) func TestOrderListByStore(t *testing.T) { diff --git a/apps/ec/order/test/rpc/rpc.go b/module/ec/order/test/rpc/rpc.go similarity index 100% rename from apps/ec/order/test/rpc/rpc.go rename to module/ec/order/test/rpc/rpc.go diff --git a/apps/ec/order/test/rpc/summary_test.go b/module/ec/order/test/rpc/summary_test.go similarity index 99% rename from apps/ec/order/test/rpc/summary_test.go rename to module/ec/order/test/rpc/summary_test.go index 27487af..1a79042 100644 --- a/apps/ec/order/test/rpc/summary_test.go +++ b/module/ec/order/test/rpc/summary_test.go @@ -7,7 +7,7 @@ import ( "fmt" "testing" - pb "git.apinb.com/bsm-ec/order/pb" + pb "bsm/full/module/ec/order/pb" ) func TestQuickCreateByToken(t *testing.T) { diff --git a/apps/ec/order/test/summary/cancel.http b/module/ec/order/test/summary/cancel.http similarity index 100% rename from apps/ec/order/test/summary/cancel.http rename to module/ec/order/test/summary/cancel.http diff --git a/apps/ec/order/test/summary/check.http b/module/ec/order/test/summary/check.http similarity index 100% rename from apps/ec/order/test/summary/check.http rename to module/ec/order/test/summary/check.http diff --git a/apps/ec/order/test/summary/confirm.http b/module/ec/order/test/summary/confirm.http similarity index 100% rename from apps/ec/order/test/summary/confirm.http rename to module/ec/order/test/summary/confirm.http diff --git a/apps/ec/order/test/summary/get.http b/module/ec/order/test/summary/get.http similarity index 100% rename from apps/ec/order/test/summary/get.http rename to module/ec/order/test/summary/get.http diff --git a/apps/ec/order/test/summary/list.http b/module/ec/order/test/summary/list.http similarity index 100% rename from apps/ec/order/test/summary/list.http rename to module/ec/order/test/summary/list.http diff --git a/apps/ec/order/test/summary/quick_create_by_product.http b/module/ec/order/test/summary/quick_create_by_product.http similarity index 100% rename from apps/ec/order/test/summary/quick_create_by_product.http rename to module/ec/order/test/summary/quick_create_by_product.http diff --git a/apps/ec/order/test/summary/simulate_pay.http b/module/ec/order/test/summary/simulate_pay.http similarity index 100% rename from apps/ec/order/test/summary/simulate_pay.http rename to module/ec/order/test/summary/simulate_pay.http diff --git a/apps/ec/order/test/summary/simulate_receiving.http b/module/ec/order/test/summary/simulate_receiving.http similarity index 100% rename from apps/ec/order/test/summary/simulate_receiving.http rename to module/ec/order/test/summary/simulate_receiving.http diff --git a/apps/ec/order/test/summary/simulate_shipments.http b/module/ec/order/test/summary/simulate_shipments.http similarity index 100% rename from apps/ec/order/test/summary/simulate_shipments.http rename to module/ec/order/test/summary/simulate_shipments.http diff --git a/apps/ec/order/test/summary/submit.http b/module/ec/order/test/summary/submit.http similarity index 100% rename from apps/ec/order/test/summary/submit.http rename to module/ec/order/test/summary/submit.http diff --git a/apps/ec/supply/README.md b/module/ec/supply/README.md similarity index 100% rename from apps/ec/supply/README.md rename to module/ec/supply/README.md diff --git a/apps/finance/wallet/README.md b/module/finance/wallet/README.md similarity index 98% rename from apps/finance/wallet/README.md rename to module/finance/wallet/README.md index c7f7018..c8e4433 100644 --- a/apps/finance/wallet/README.md +++ b/module/finance/wallet/README.md @@ -2,7 +2,7 @@ [![Go Version](https://img.shields.io/badge/Go-1.25.1-blue.svg)](https://golang.org/) [![License](https://img.shields.io/badge/License-Internal-red.svg)](LICENSE) -[![Build Status](https://img.shields.io/badge/Build-Passing-green.svg)](https://git.apinb.com/bsm-finance/wallet) +[![Build Status](https://img.shields.io/badge/Build-Passing-green.svg)](https://bsm/full/module/finance/wallet) 一个高性能、可扩展的钱包微服务，基于 gRPC 和 HTTP Gateway 架构，提供钱包管理、支付处理、充值提现等金融服务功能。 @@ -43,7 +43,7 @@ ```bash # 克隆项目 -git clone git.apinb.com/bsm-finance/wallet.git +git clone bsm/full/module/finance/wallet.git cd wallet # 安装依赖 @@ -534,13 +534,13 @@ type(scope): description - **作者**: David Yan (david.yan@qq.com) - **维护者**: BSM 开发团队 -- **项目地址**: [git.apinb.com/bsm-finance/wallet](https://git.apinb.com/bsm-finance/wallet) +- **项目地址**: [bsm/full/module/finance/wallet](https://bsm/full/module/finance/wallet) ## 🔗 相关链接 - [BSM SDK](https://git.apinb.com/bsm-sdk) - [API 文档](https://docs.apinb.com/wallet) -- [问题反馈](https://git.apinb.com/bsm-finance/wallet/issues) +- [问题反馈](https://bsm/full/module/finance/wallet/issues) --- diff --git a/apps/finance/wallet/cmd/cli/main.go b/module/finance/wallet/cmd/cli/main.go similarity index 100% rename from apps/finance/wallet/cmd/cli/main.go rename to module/finance/wallet/cmd/cli/main.go diff --git a/apps/finance/wallet/cmd/main/main.go b/module/finance/wallet/cmd/main/main.go similarity index 83% rename from apps/finance/wallet/cmd/main/main.go rename to module/finance/wallet/cmd/main/main.go index beb7b7c..19c05bf 100644 --- a/apps/finance/wallet/cmd/main/main.go +++ b/module/finance/wallet/cmd/main/main.go @@ -6,10 +6,10 @@ package service import ( - "git.apinb.com/bsm-finance/wallet/internal/config" - "git.apinb.com/bsm-finance/wallet/internal/impl" - "git.apinb.com/bsm-finance/wallet/internal/models" - "git.apinb.com/bsm-finance/wallet/internal/server" + "bsm/full/module/finance/wallet/internal/config" + "bsm/full/module/finance/wallet/internal/impl" + "bsm/full/module/finance/wallet/internal/models" + "bsm/full/module/finance/wallet/internal/server" "git.apinb.com/bsm-sdk/core/service" ) @@ -49,3 +49,7 @@ func Run() { // 启动服务 srv.Start() } + +func main() { + Run() +} diff --git a/apps/finance/wallet/etc/supervisor.bsm-finance-wallet.conf b/module/finance/wallet/etc/supervisor.bsm-finance-wallet.conf similarity index 100% rename from apps/finance/wallet/etc/supervisor.bsm-finance-wallet.conf rename to module/finance/wallet/etc/supervisor.bsm-finance-wallet.conf diff --git a/apps/finance/wallet/etc/wallet_dev.yaml b/module/finance/wallet/etc/wallet_dev.yaml similarity index 100% rename from apps/finance/wallet/etc/wallet_dev.yaml rename to module/finance/wallet/etc/wallet_dev.yaml diff --git a/apps/finance/wallet/etc/wallet_prod.yaml b/module/finance/wallet/etc/wallet_prod.yaml similarity index 100% rename from apps/finance/wallet/etc/wallet_prod.yaml rename to module/finance/wallet/etc/wallet_prod.yaml diff --git a/apps/finance/wallet/etc/wallet_test.yaml b/module/finance/wallet/etc/wallet_test.yaml similarity index 100% rename from apps/finance/wallet/etc/wallet_test.yaml rename to module/finance/wallet/etc/wallet_test.yaml diff --git a/apps/finance/wallet/go.mod b/module/finance/wallet/go.mod similarity index 68% rename from apps/finance/wallet/go.mod rename to module/finance/wallet/go.mod index f6cd2ce..7d37116 100644 --- a/apps/finance/wallet/go.mod +++ b/module/finance/wallet/go.mod @@ -1,4 +1,4 @@ -module git.apinb.com/bsm-finance/wallet +module bsm/full/module/finance/wallet go 1.26.5 @@ -15,16 +15,15 @@ tool ( require ( git.apinb.com/bsm-sdk/core v0.2.0 - github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 + github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0 github.com/patrickmn/go-cache v2.1.0+incompatible - go.etcd.io/etcd/client/v3 v3.6.12 - google.golang.org/grpc v1.81.1 + go.etcd.io/etcd/client/v3 v3.7.1 + google.golang.org/grpc v1.83.0 google.golang.org/protobuf v1.36.11 - gorm.io/gorm v1.31.1 + gorm.io/gorm v1.31.2 ) require ( - github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/go-pay/crypto v0.0.1 // indirect github.com/go-pay/errgroup v0.0.3 // indirect github.com/go-pay/smap v0.0.2 // indirect @@ -32,9 +31,8 @@ require ( github.com/go-pay/xlog v0.0.3 // indirect github.com/go-pay/xtime v0.0.2 // indirect github.com/golang-jwt/jwt/v5 v5.3.1 // indirect - github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect - go.etcd.io/etcd/client/pkg/v3 v3.6.12 // indirect + go.etcd.io/etcd/client/pkg/v3 v3.7.1 // indirect go.uber.org/atomic v1.11.0 // indirect gorm.io/driver/mysql v1.6.0 // indirect ) @@ -50,7 +48,6 @@ require ( github.com/ditashi/jsbeautifier-go v0.0.0-20141206144643-2520a8026a9c // indirect github.com/go-pay/gopay v1.5.114 github.com/go-sql-driver/mysql v1.10.0 // indirect - github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/google/uuid v1.6.0 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect @@ -59,21 +56,23 @@ require ( github.com/jackc/puddle/v2 v2.2.2 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect - github.com/oklog/ulid/v2 v2.1.1 // indirect + github.com/oklog/ulid/v2 v2.1.2 // indirect github.com/pepabo/protoc-gen-go-client v0.3.0 // indirect - github.com/redis/go-redis/v9 v9.20.0 // indirect - go.etcd.io/etcd/api/v3 v3.6.12 // indirect + github.com/redis/go-redis/v9 v9.22.0 // indirect + go.etcd.io/etcd/api/v3 v3.7.1 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.28.0 // indirect - go.yaml.in/yaml/v3 v3.0.4 // indirect - golang.org/x/mod v0.36.0 // indirect - golang.org/x/net v0.55.0 // indirect - golang.org/x/sync v0.20.0 // indirect - golang.org/x/sys v0.45.0 // indirect - golang.org/x/text v0.37.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa // indirect + go.yaml.in/yaml/v3 v3.0.5 // indirect + golang.org/x/mod v0.37.0 // indirect + golang.org/x/net v0.57.0 // indirect + golang.org/x/sync v0.22.0 // indirect + golang.org/x/sys v0.47.0 // indirect + golang.org/x/text v0.40.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea // indirect google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - gorm.io/driver/postgres v1.6.0 // indirect + gorm.io/driver/postgres v1.6.2 // indirect ) + +replace git.apinb.com/bsm-sdk/core => D:/work/bsm-sdk/core diff --git a/apps/finance/wallet/go.sum b/module/finance/wallet/go.sum similarity index 57% rename from apps/finance/wallet/go.sum rename to module/finance/wallet/go.sum index 259ac2e..f01ee03 100644 --- a/apps/finance/wallet/go.sum +++ b/module/finance/wallet/go.sum @@ -1,7 +1,5 @@ filippo.io/edwards25519 v1.2.0 h1:crnVqOiS4jqYleHd9vaKZ+HKtHfllngJIiOpNpoJsjo= filippo.io/edwards25519 v1.2.0/go.mod h1:xzAOLCNug/yB62zG1bQ8uziwrIqIuxhctzJT18Q77mc= -git.apinb.com/bsm-sdk/core v0.2.0 h1:/e9yqpsbKBrRgMiGpS3KX2O4qDLxo5V5GpPSLNGxEKw= -git.apinb.com/bsm-sdk/core v0.2.0/go.mod h1:E9T6Eboo/0Zb36BjkKbIgvFzq4fQ2Q8P/7y5zmYTI6Y= git.apinb.com/bsm-tools/protoc-gen-markdown v0.0.0-20250907131213-6c1694ce6bcb h1:GoXhkGzI5vZ9JMXCVsSRw/AGsJY0tM2aEv76YaUg2wM= git.apinb.com/bsm-tools/protoc-gen-markdown v0.0.0-20250907131213-6c1694ce6bcb/go.mod h1:l+84zWPM4F40Ppar+jLapgjRNt6XWDsr+l0vN4Jjlm4= git.apinb.com/bsm-tools/protoc-gen-slc v0.0.13 h1:RGg2R2kHz6IAD7scH6So2FlZYctFUDxqWR8i/+fMfOU= @@ -23,8 +21,8 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/ditashi/jsbeautifier-go v0.0.0-20141206144643-2520a8026a9c h1:+Zo5Ca9GH0RoeVZQKzFJcTLoAixx5s5Gq3pTIS+n354= github.com/ditashi/jsbeautifier-go v0.0.0-20141206144643-2520a8026a9c/go.mod h1:HJGU9ULdREjOcVGZVPB5s6zYmHi1RxzT71l2wQyLmnE= -github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= -github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.4 h1:tG4xh9yMsRCAiodLVTxyrkzSZ9+o0L1Kg/+cPVcbP/8= +github.com/go-logr/logr v1.4.4/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-pay/crypto v0.0.1 h1:B6InT8CLfSLc6nGRVx9VMJRBBazFMjr293+jl0lLXUY= @@ -43,8 +41,6 @@ github.com/go-pay/xtime v0.0.2 h1:7YR4/iuELsEHpJ6LUO0SVK80hQxDO9MLCfuVYIiTCRM= github.com/go-pay/xtime v0.0.2/go.mod h1:W1yRbJaSt4CSBcdAtLBQ8xajiN/Pl5hquGczUcUE9xE= github.com/go-sql-driver/mysql v1.10.0 h1:Q+1LV8DkHJvSYAdR83XzuhDaTykuDx0l6fkXxoWCWfw= github.com/go-sql-driver/mysql v1.10.0/go.mod h1:M+cqaI7+xxXGG9swrdeUIoPG3Y3KCkF0pZej+SK+nWk= -github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= -github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt/v5 v5.3.1 h1:kYf81DTWFe7t+1VvL7eS+jKFVWaUnK9cB1qbwn63YCY= github.com/golang-jwt/jwt/v5 v5.3.1/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= @@ -53,8 +49,8 @@ github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= 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/grpc-ecosystem/grpc-gateway/v2 v2.29.0 h1:5VipnvEpbqr2gA2VbM+nYVbkIF28c5ZQfqCBQ5g2xfk= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0/go.mod h1:Hyl3n6Twe1hvtd9XUXDec4pTvgMSEixRuQKPTMH2bNs= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0 h1:/Tnpcb2E0Pz/tN9s3bfEY2Q8ePCEX9iuS+cneUwncnw= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0/go.mod h1:zOBXOsUaBSjKgmH4OGzV1esUpR3oUSCPYVd2cUBjKYY= 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= @@ -67,16 +63,16 @@ github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= -github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= -github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y= -github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0= +github.com/klauspost/cpuid/v2 v2.4.0 h1:S6Hrbc7+ywsr0r+RLapfGBHfyefhCTwEh3A0tV913Dw= +github.com/klauspost/cpuid/v2 v2.4.0/go.mod h1:19jmZ9mjzoF//ddRSUsv0zfBTJWh3QJh9FNxZTMrGxU= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/oklog/ulid/v2 v2.1.1 h1:suPZ4ARWLOJLegGFiZZ1dFAkqzhMjL3J1TzI+5wHz8s= -github.com/oklog/ulid/v2 v2.1.1/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ= +github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= +github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= +github.com/oklog/ulid/v2 v2.1.2 h1:IEclFb9JNvzYA6MW2SCxbLzcHTVsfqm3PrqGQJH5zec= +github.com/oklog/ulid/v2 v2.1.2/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ= github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= github.com/pborman/getopt v0.0.0-20170112200414-7148bc3a4c30/go.mod h1:85jBQOZwpVEaDAr341tbn15RS4fCAsIst0qp7i8ex1o= @@ -85,8 +81,8 @@ github.com/pepabo/protoc-gen-go-client v0.3.0/go.mod h1:NvHW7/gsmZUK2UxafqzUzWD8 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/redis/go-redis/v9 v9.20.0 h1:WnQYxLkgO2xiXTCJY0ldIiI8dNqCDlQAG+AtaH7a2a0= -github.com/redis/go-redis/v9 v9.20.0/go.mod h1:v/M13XI1PVCDcm01VtPFOADfZtHf8YW3baQf57KlIkA= +github.com/redis/go-redis/v9 v9.22.0 h1:laDvpYXTJtZLloinw1fA5Kqd6HAEH2XKxOkG/PDq2F0= +github.com/redis/go-redis/v9 v9.22.0/go.mod h1:y2g0Wj8rQvuK0ELM+oxSudcLtC09JScs98I/X9gRWY4= github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0= @@ -96,28 +92,26 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= -github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/zeebo/xxh3 v1.1.0 h1:s7DLGDK45Dyfg7++yxI0khrfwq9661w9EN78eP/UZVs= github.com/zeebo/xxh3 v1.1.0/go.mod h1:IisAie1LELR4xhVinxWS5+zf1lA4p0MW4T+w+W07F5s= -go.etcd.io/etcd/api/v3 v3.6.12 h1:OLOZUKEuAA36TR48F0cIaa8FdzrWygjyfrJxXg4iDgs= -go.etcd.io/etcd/api/v3 v3.6.12/go.mod h1:p14EIQXHbuOQbVvL/WEes5uqKnxP9AgKJgpjbMVvzvE= -go.etcd.io/etcd/client/pkg/v3 v3.6.12 h1:36zzB+pQOdHbhN+kH2iJz/K8bJn0ZLtLfPPO7jozTDo= -go.etcd.io/etcd/client/pkg/v3 v3.6.12/go.mod h1:hh2+ZXtfLzs3o6mn92ntgNPBrTJJOvXqICM5g3L3DMY= -go.etcd.io/etcd/client/v3 v3.6.12 h1:kMSP6JcPZMqSJiX+TXdUIBU/4eXEZWBAaui4VihMbIc= -go.etcd.io/etcd/client/v3 v3.6.12/go.mod h1:CMs6fJWYiZQk4ytFjd4lE1diOvvRMmtbbn/alZXd3dQ= +go.etcd.io/etcd/api/v3 v3.7.1 h1:KJG0/DcWGfe3Y1otDf/fsBf0TSSgpxZ5RO/L8SFt73E= +go.etcd.io/etcd/api/v3 v3.7.1/go.mod h1:8bXIpCMeV7E3/XL0Ix123ATn3dB+0V7d9zklHbB0m78= +go.etcd.io/etcd/client/pkg/v3 v3.7.1 h1:rKYsj3pRkR0eK3yjT3XOgrhqfmIfj9pzNgxjh7mfFv4= +go.etcd.io/etcd/client/pkg/v3 v3.7.1/go.mod h1:cnzZGIUzSfjEwLC6UBVsSXlEK1eepS/JUD7wE6PLRT0= +go.etcd.io/etcd/client/v3 v3.7.1 h1:0PEMMC0KuZmVIN+RAbdqfkZ45pYTgKVtmBEbRCvZFUg= +go.etcd.io/etcd/client/v3 v3.7.1/go.mod h1:ffNqALa8tRCYhYo1F9oR489y23K39Gz+BSR3ApAGYq0= go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64= go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y= -go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I= -go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0= -go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM= -go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY= -go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg= -go.opentelemetry.io/otel/sdk v1.43.0/go.mod h1:P+IkVU3iWukmiit/Yf9AWvpyRDlUeBaRg6Y+C58QHzg= -go.opentelemetry.io/otel/sdk/metric v1.43.0 h1:S88dyqXjJkuBNLeMcVPRFXpRw2fuwdvfCGLEo89fDkw= -go.opentelemetry.io/otel/sdk/metric v1.43.0/go.mod h1:C/RJtwSEJ5hzTiUz5pXF1kILHStzb9zFlIEe85bhj6A= -go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A= -go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0= +go.opentelemetry.io/otel v1.45.0 h1:pdrWmLHofpubmArBv1LgFSv1Z0Ie/ppdZzu+kUN5EeU= +go.opentelemetry.io/otel v1.45.0/go.mod h1:XZxIqPapzEYnhNSScF5DIqXhm/rYi0FzCe2XddAwZfQ= +go.opentelemetry.io/otel/metric v1.45.0 h1:7Eg1uH7CJ5cXv9is6tnBe1FI6rj1nwUdbFypRm3br/M= +go.opentelemetry.io/otel/metric v1.45.0/go.mod h1:HAPbm1nd3p1PmFH7v2dR+6BjXxw+Lq4a2+pndMAm08s= +go.opentelemetry.io/otel/sdk v1.45.0 h1:4VVSMgQ83dUgW2aoX5f6JgLvHwIvzcuLnF9lUdCSpCw= +go.opentelemetry.io/otel/sdk v1.45.0/go.mod h1:Sr40LgXV7DsKMMJMKOhUWOgMWTfAaqvm2kF0g7ilwuA= +go.opentelemetry.io/otel/sdk/metric v1.44.0 h1:3LlKgI+VjbVsjNRFZJZAJ30WjXC5VkNRks6si09iEfI= +go.opentelemetry.io/otel/sdk/metric v1.44.0/go.mod h1:5B5pMARnXxKhltooO4xUuCBorl65a4EpnTalObqOigA= +go.opentelemetry.io/otel/trace v1.45.0 h1:l/mP6Uv7oNO7/TblbhpbgMidxhq1uO/rPsikOyVhxag= +go.opentelemetry.io/otel/trace v1.45.0/go.mod h1:qoJJA2xNMnxRrdISU/kLtfUH2wNeQbiv+jhs/CxI8bc= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= @@ -126,51 +120,26 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.28.0 h1:IZzaP1Fv73/T/pBMLk4VutPl36uNC+OSUh3JLG3FIjo= go.uber.org/zap v1.28.0/go.mod h1:rDLpOi171uODNm/mxFcuYWxDsqWSAVkFdX4XojSKg/Q= -go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= -go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.36.0 h1:JJjpVx6myfUsUdAzZuOSTTmRE0PfZeNWzzvKrP7amb4= -golang.org/x/mod v0.36.0/go.mod h1:moc6ELqsWcOw5Ef3xVprK5ul/MvtVvkIXLziUOICjUQ= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8= -golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -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.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4= -golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY= -golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc= -golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -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= +go.yaml.in/yaml/v3 v3.0.5 h1:N6y/pJk8buWs9NY5ERU2HSMfm+IuD/OtfdAnq6kESPw= +go.yaml.in/yaml/v3 v3.0.5/go.mod h1:HVTZu1O7/Vkt2N+BFy8Zza+lnLsABggaTM2ZpNIGuKg= +golang.org/x/mod v0.37.0 h1:vF1DjpVEshcIqoEaauuHebaLk1O1forxjxBaVn884JQ= +golang.org/x/mod v0.37.0/go.mod h1:m8S8VeM9r4dzDwjrKO0a1sZP3YjeMamRRlD+fmR2Q/0= +golang.org/x/net v0.57.0 h1:K5+3DljvIuDG9/Jv9rvyMywYNFCQ9RSUY6OOTTkT+tE= +golang.org/x/net v0.57.0/go.mod h1:KpXc8iv+r3XplLAG/f7Jsf9RPszJzdR0f58q9vGOuEU= +golang.org/x/sync v0.22.0 h1:SZjpbeLmrCk4xhRSZFNZW5gFUeCeFgjekvI/+gfScek= +golang.org/x/sync v0.22.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= +golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs= +golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +golang.org/x/text v0.40.0 h1:Ub2Z6/xjgF1WrYQz2nuITOEegKFtiIy+rieRJ5lHZKs= +golang.org/x/text v0.40.0/go.mod h1:hpnzDAfGV753zIKo+wk3u1bVKCGPbrnF7+7LBF/UHVY= gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4= gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E= -google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa h1:Kjn0N0tCrDgiAFW+lGO4JZ3ck44CehvJQMAwj9QF0G8= -google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:q4lMZS6kskjT5HvCPrnnypcDPVJqT/f4nfxmkE7gryY= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa h1:mZHHdPZl0dbGHCflZgAq/Q468DWVFcU2whhB2KAo8fk= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= -google.golang.org/grpc v1.81.1 h1:VnnIIZ88UzOOKLukQi+ImGz8O1Wdp8nAGGnvOfEIWQQ= -google.golang.org/grpc v1.81.1/go.mod h1:xGH9GfzOyMTGIOXBJmXt+BX/V0kcdQbdcuwQ/zNw42I= +google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea h1:Jifw/kjs/r3B0uszvls/m3c3tmZs2YHGM9C+rvxP9gY= +google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea/go.mod h1:K/+WGbmBY7aNW1HDw1fJnKYo10i0DkAX6pows00dLig= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea h1:kVhQEPTpKQahD5+JSBTfBB19wcgQTTjAIn45MBqnyHk= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= +google.golang.org/grpc v1.83.0 h1:JeNZEKJFbQxArAMl+hiytHauacDNqJUllNfmIMmpqnQ= +google.golang.org/grpc v1.83.0/go.mod h1:kDyl6SKsiHKt0uylY5gtn5cEjkrIOhQOGDgIc4JGwzQ= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.2 h1:rgSNvqscFZ1JgV/4wH5GOsZFSFkR2Eua9As3KIr2LlM= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.2/go.mod h1:iMEtFwDlAhjDU9L5mY6U1XLwlIId/G3h+QcBHDIvrJ8= google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE= @@ -183,9 +152,11 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gorm.io/driver/mysql v1.6.0 h1:eNbLmNTpPpTOVZi8MMxCi2aaIm0ZpInbORNXDwyLGvg= gorm.io/driver/mysql v1.6.0/go.mod h1:D/oCC2GWK3M/dqoLxnOlaNKmXz8WNTfcS9y5ovaSqKo= -gorm.io/driver/postgres v1.6.0 h1:2dxzU8xJ+ivvqTRph34QX+WrRaJlmfyPqXmoGVjMBa4= -gorm.io/driver/postgres v1.6.0/go.mod h1:vUw0mrGgrTK+uPHEhAdV4sfFELrByKVGnaVRkXDhtWo= -gorm.io/gorm v1.31.1 h1:7CA8FTFz/gRfgqgpeKIBcervUn3xSyPUmr6B2WXJ7kg= -gorm.io/gorm v1.31.1/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs= +gorm.io/driver/postgres v1.6.2 h1:BvXQ/cNUg63q5TFNg672DmDcowZSFrNLkkA3Xe6GXq4= +gorm.io/driver/postgres v1.6.2/go.mod h1:0c4fQA44XhOklXDkgtuKqysHCycTa5i9e3EIpDGCwXk= +gorm.io/driver/sqlite v1.6.0 h1:WHRRrIiulaPiPFmDcod6prc4l2VGVWHz80KspNsxSfQ= +gorm.io/driver/sqlite v1.6.0/go.mod h1:AO9V1qIQddBESngQUKWL9yoH93HIeA1X6V633rBwyT8= +gorm.io/gorm v1.31.2 h1:3o8FXNo9v9S858gil+3LlZA1LkCOzgb4g5BL64FgaCo= +gorm.io/gorm v1.31.2/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs= gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU= gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU= diff --git a/apps/finance/wallet/internal/config/config.go b/module/finance/wallet/internal/config/config.go similarity index 100% rename from apps/finance/wallet/internal/config/config.go rename to module/finance/wallet/internal/config/config.go diff --git a/apps/finance/wallet/internal/excode/ex.go b/module/finance/wallet/internal/excode/ex.go similarity index 100% rename from apps/finance/wallet/internal/excode/ex.go rename to module/finance/wallet/internal/excode/ex.go diff --git a/apps/finance/wallet/internal/impl/impl.go b/module/finance/wallet/internal/impl/impl.go similarity index 93% rename from apps/finance/wallet/internal/impl/impl.go rename to module/finance/wallet/internal/impl/impl.go index 3646316..48f1d76 100644 --- a/apps/finance/wallet/internal/impl/impl.go +++ b/module/finance/wallet/internal/impl/impl.go @@ -1,7 +1,7 @@ package impl import ( - "git.apinb.com/bsm-finance/wallet/internal/config" + "bsm/full/module/finance/wallet/internal/config" "git.apinb.com/bsm-sdk/core/cache/redis" "git.apinb.com/bsm-sdk/core/with" cache "github.com/patrickmn/go-cache" diff --git a/apps/finance/wallet/internal/logic/alipay/alipay.go b/module/finance/wallet/internal/logic/alipay/alipay.go similarity index 97% rename from apps/finance/wallet/internal/logic/alipay/alipay.go rename to module/finance/wallet/internal/logic/alipay/alipay.go index dfecb56..8846242 100644 --- a/apps/finance/wallet/internal/logic/alipay/alipay.go +++ b/module/finance/wallet/internal/logic/alipay/alipay.go @@ -3,7 +3,7 @@ package alipay import ( "context" - "git.apinb.com/bsm-finance/wallet/internal/config" + "bsm/full/module/finance/wallet/internal/config" "github.com/go-pay/gopay" "github.com/go-pay/gopay/alipay" ) diff --git a/apps/finance/wallet/internal/logic/alipay/app_pay.go b/module/finance/wallet/internal/logic/alipay/app_pay.go similarity index 90% rename from apps/finance/wallet/internal/logic/alipay/app_pay.go rename to module/finance/wallet/internal/logic/alipay/app_pay.go index 01091f9..5a1d16a 100644 --- a/apps/finance/wallet/internal/logic/alipay/app_pay.go +++ b/module/finance/wallet/internal/logic/alipay/app_pay.go @@ -3,7 +3,7 @@ package alipay import ( "context" - pb "git.apinb.com/bsm-finance/wallet/pb" + pb "bsm/full/module/finance/wallet/pb" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/finance/wallet/internal/logic/alipay/page_pay.go b/module/finance/wallet/internal/logic/alipay/page_pay.go similarity index 90% rename from apps/finance/wallet/internal/logic/alipay/page_pay.go rename to module/finance/wallet/internal/logic/alipay/page_pay.go index c9e84e2..2197020 100644 --- a/apps/finance/wallet/internal/logic/alipay/page_pay.go +++ b/module/finance/wallet/internal/logic/alipay/page_pay.go @@ -3,7 +3,7 @@ package alipay import ( "context" - pb "git.apinb.com/bsm-finance/wallet/pb" + pb "bsm/full/module/finance/wallet/pb" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/finance/wallet/internal/logic/alipay/transfer.go b/module/finance/wallet/internal/logic/alipay/transfer.go similarity index 91% rename from apps/finance/wallet/internal/logic/alipay/transfer.go rename to module/finance/wallet/internal/logic/alipay/transfer.go index c8b1388..917c63f 100644 --- a/apps/finance/wallet/internal/logic/alipay/transfer.go +++ b/module/finance/wallet/internal/logic/alipay/transfer.go @@ -3,7 +3,7 @@ package alipay import ( "context" - pb "git.apinb.com/bsm-finance/wallet/pb" + pb "bsm/full/module/finance/wallet/pb" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/finance/wallet/internal/logic/alipay/wap_pay.go b/module/finance/wallet/internal/logic/alipay/wap_pay.go similarity index 90% rename from apps/finance/wallet/internal/logic/alipay/wap_pay.go rename to module/finance/wallet/internal/logic/alipay/wap_pay.go index b178cdc..ab692c9 100644 --- a/apps/finance/wallet/internal/logic/alipay/wap_pay.go +++ b/module/finance/wallet/internal/logic/alipay/wap_pay.go @@ -3,7 +3,7 @@ package alipay import ( "context" - pb "git.apinb.com/bsm-finance/wallet/pb" + pb "bsm/full/module/finance/wallet/pb" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/finance/wallet/internal/logic/basic/add_bank_card.go b/module/finance/wallet/internal/logic/basic/add_bank_card.go similarity index 91% rename from apps/finance/wallet/internal/logic/basic/add_bank_card.go rename to module/finance/wallet/internal/logic/basic/add_bank_card.go index c6b5e8f..27ce627 100644 --- a/apps/finance/wallet/internal/logic/basic/add_bank_card.go +++ b/module/finance/wallet/internal/logic/basic/add_bank_card.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-finance/wallet/internal/impl" - "git.apinb.com/bsm-finance/wallet/internal/models" - pb "git.apinb.com/bsm-finance/wallet/pb" + "bsm/full/module/finance/wallet/internal/impl" + "bsm/full/module/finance/wallet/internal/models" + pb "bsm/full/module/finance/wallet/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/finance/wallet/internal/logic/basic/apply_cash.go b/module/finance/wallet/internal/logic/basic/apply_cash.go similarity index 86% rename from apps/finance/wallet/internal/logic/basic/apply_cash.go rename to module/finance/wallet/internal/logic/basic/apply_cash.go index 4f24a80..542b38f 100644 --- a/apps/finance/wallet/internal/logic/basic/apply_cash.go +++ b/module/finance/wallet/internal/logic/basic/apply_cash.go @@ -4,10 +4,10 @@ import ( "context" "time" - "git.apinb.com/bsm-finance/wallet/internal/excode" - "git.apinb.com/bsm-finance/wallet/internal/impl" - "git.apinb.com/bsm-finance/wallet/internal/models" - pb "git.apinb.com/bsm-finance/wallet/pb" + "bsm/full/module/finance/wallet/internal/excode" + "bsm/full/module/finance/wallet/internal/impl" + "bsm/full/module/finance/wallet/internal/models" + pb "bsm/full/module/finance/wallet/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/finance/wallet/internal/logic/basic/bind_payment_id.go b/module/finance/wallet/internal/logic/basic/bind_payment_id.go similarity index 86% rename from apps/finance/wallet/internal/logic/basic/bind_payment_id.go rename to module/finance/wallet/internal/logic/basic/bind_payment_id.go index 65f75f9..f9acb7e 100644 --- a/apps/finance/wallet/internal/logic/basic/bind_payment_id.go +++ b/module/finance/wallet/internal/logic/basic/bind_payment_id.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-finance/wallet/internal/impl" - "git.apinb.com/bsm-finance/wallet/internal/models" - pb "git.apinb.com/bsm-finance/wallet/pb" + "bsm/full/module/finance/wallet/internal/impl" + "bsm/full/module/finance/wallet/internal/models" + pb "bsm/full/module/finance/wallet/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/finance/wallet/internal/logic/basic/get_bank_card.go b/module/finance/wallet/internal/logic/basic/get_bank_card.go similarity index 89% rename from apps/finance/wallet/internal/logic/basic/get_bank_card.go rename to module/finance/wallet/internal/logic/basic/get_bank_card.go index 36709b2..c5458df 100644 --- a/apps/finance/wallet/internal/logic/basic/get_bank_card.go +++ b/module/finance/wallet/internal/logic/basic/get_bank_card.go @@ -3,9 +3,9 @@ package basic import ( "context" - "git.apinb.com/bsm-finance/wallet/internal/impl" - "git.apinb.com/bsm-finance/wallet/internal/models" - pb "git.apinb.com/bsm-finance/wallet/pb" + "bsm/full/module/finance/wallet/internal/impl" + "bsm/full/module/finance/wallet/internal/models" + pb "bsm/full/module/finance/wallet/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/finance/wallet/internal/logic/basic/get_wallet.go b/module/finance/wallet/internal/logic/basic/get_wallet.go similarity index 94% rename from apps/finance/wallet/internal/logic/basic/get_wallet.go rename to module/finance/wallet/internal/logic/basic/get_wallet.go index 56e3d6e..67df337 100644 --- a/apps/finance/wallet/internal/logic/basic/get_wallet.go +++ b/module/finance/wallet/internal/logic/basic/get_wallet.go @@ -5,9 +5,9 @@ import ( "strconv" "time" - "git.apinb.com/bsm-finance/wallet/internal/impl" - "git.apinb.com/bsm-finance/wallet/internal/models" - pb "git.apinb.com/bsm-finance/wallet/pb" + "bsm/full/module/finance/wallet/internal/impl" + "bsm/full/module/finance/wallet/internal/models" + pb "bsm/full/module/finance/wallet/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/finance/wallet/internal/logic/basic/rm_bank_card.go b/module/finance/wallet/internal/logic/basic/rm_bank_card.go similarity index 84% rename from apps/finance/wallet/internal/logic/basic/rm_bank_card.go rename to module/finance/wallet/internal/logic/basic/rm_bank_card.go index 29ae3a8..3aa6761 100644 --- a/apps/finance/wallet/internal/logic/basic/rm_bank_card.go +++ b/module/finance/wallet/internal/logic/basic/rm_bank_card.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-finance/wallet/internal/impl" - "git.apinb.com/bsm-finance/wallet/internal/models" - pb "git.apinb.com/bsm-finance/wallet/pb" + "bsm/full/module/finance/wallet/internal/impl" + "bsm/full/module/finance/wallet/internal/models" + pb "bsm/full/module/finance/wallet/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/finance/wallet/internal/logic/basic/set_pay_password.go b/module/finance/wallet/internal/logic/basic/set_pay_password.go similarity index 85% rename from apps/finance/wallet/internal/logic/basic/set_pay_password.go rename to module/finance/wallet/internal/logic/basic/set_pay_password.go index 2d3094f..e24bf28 100644 --- a/apps/finance/wallet/internal/logic/basic/set_pay_password.go +++ b/module/finance/wallet/internal/logic/basic/set_pay_password.go @@ -4,9 +4,9 @@ import ( "context" "time" - "git.apinb.com/bsm-finance/wallet/internal/impl" - "git.apinb.com/bsm-finance/wallet/internal/models" - pb "git.apinb.com/bsm-finance/wallet/pb" + "bsm/full/module/finance/wallet/internal/impl" + "bsm/full/module/finance/wallet/internal/models" + pb "bsm/full/module/finance/wallet/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/finance/wallet/internal/logic/basic/transactions.go b/module/finance/wallet/internal/logic/basic/transactions.go similarity index 93% rename from apps/finance/wallet/internal/logic/basic/transactions.go rename to module/finance/wallet/internal/logic/basic/transactions.go index 88aacce..f017e62 100644 --- a/apps/finance/wallet/internal/logic/basic/transactions.go +++ b/module/finance/wallet/internal/logic/basic/transactions.go @@ -3,8 +3,8 @@ package basic import ( "context" - "git.apinb.com/bsm-finance/wallet/internal/models" - pb "git.apinb.com/bsm-finance/wallet/pb" + "bsm/full/module/finance/wallet/internal/models" + pb "bsm/full/module/finance/wallet/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" diff --git a/apps/finance/wallet/internal/logic/basic/wallet.go b/module/finance/wallet/internal/logic/basic/wallet.go similarity index 88% rename from apps/finance/wallet/internal/logic/basic/wallet.go rename to module/finance/wallet/internal/logic/basic/wallet.go index 06d5acf..32f82a8 100644 --- a/apps/finance/wallet/internal/logic/basic/wallet.go +++ b/module/finance/wallet/internal/logic/basic/wallet.go @@ -4,10 +4,10 @@ package basic import ( "context" - "git.apinb.com/bsm-finance/wallet/internal/config" - "git.apinb.com/bsm-finance/wallet/internal/excode" - "git.apinb.com/bsm-finance/wallet/internal/impl" - "git.apinb.com/bsm-finance/wallet/internal/models" + "bsm/full/module/finance/wallet/internal/config" + "bsm/full/module/finance/wallet/internal/excode" + "bsm/full/module/finance/wallet/internal/impl" + "bsm/full/module/finance/wallet/internal/models" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/utils" ) diff --git a/apps/finance/wallet/internal/logic/payment/by_charge.go b/module/finance/wallet/internal/logic/payment/by_charge.go similarity index 92% rename from apps/finance/wallet/internal/logic/payment/by_charge.go rename to module/finance/wallet/internal/logic/payment/by_charge.go index 3a075c3..e7656cd 100644 --- a/apps/finance/wallet/internal/logic/payment/by_charge.go +++ b/module/finance/wallet/internal/logic/payment/by_charge.go @@ -4,11 +4,11 @@ import ( "context" "strings" - "git.apinb.com/bsm-finance/wallet/internal/excode" - "git.apinb.com/bsm-finance/wallet/internal/logic/alipay" - "git.apinb.com/bsm-finance/wallet/internal/logic/wechat" - "git.apinb.com/bsm-finance/wallet/internal/models" - pb "git.apinb.com/bsm-finance/wallet/pb" + "bsm/full/module/finance/wallet/internal/excode" + "bsm/full/module/finance/wallet/internal/logic/alipay" + "bsm/full/module/finance/wallet/internal/logic/wechat" + "bsm/full/module/finance/wallet/internal/models" + pb "bsm/full/module/finance/wallet/pb" "git.apinb.com/bsm-sdk/core/env" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" diff --git a/apps/finance/wallet/internal/logic/payment/by_order.go b/module/finance/wallet/internal/logic/payment/by_order.go similarity index 92% rename from apps/finance/wallet/internal/logic/payment/by_order.go rename to module/finance/wallet/internal/logic/payment/by_order.go index d0e745a..d511379 100644 --- a/apps/finance/wallet/internal/logic/payment/by_order.go +++ b/module/finance/wallet/internal/logic/payment/by_order.go @@ -4,12 +4,12 @@ import ( "context" "strings" - "git.apinb.com/bsm-finance/wallet/internal/excode" - "git.apinb.com/bsm-finance/wallet/internal/logic/alipay" - "git.apinb.com/bsm-finance/wallet/internal/logic/basic" - "git.apinb.com/bsm-finance/wallet/internal/logic/wechat" - "git.apinb.com/bsm-finance/wallet/internal/models" - pb "git.apinb.com/bsm-finance/wallet/pb" + "bsm/full/module/finance/wallet/internal/excode" + "bsm/full/module/finance/wallet/internal/logic/alipay" + "bsm/full/module/finance/wallet/internal/logic/basic" + "bsm/full/module/finance/wallet/internal/logic/wechat" + "bsm/full/module/finance/wallet/internal/models" + pb "bsm/full/module/finance/wallet/pb" "git.apinb.com/bsm-sdk/core/env" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" diff --git a/apps/finance/wallet/internal/logic/payment/callback.go b/module/finance/wallet/internal/logic/payment/callback.go similarity index 88% rename from apps/finance/wallet/internal/logic/payment/callback.go rename to module/finance/wallet/internal/logic/payment/callback.go index 2dcfdd9..1ca87ed 100644 --- a/apps/finance/wallet/internal/logic/payment/callback.go +++ b/module/finance/wallet/internal/logic/payment/callback.go @@ -4,8 +4,8 @@ import ( "context" "time" - "git.apinb.com/bsm-finance/wallet/internal/models" - pb "git.apinb.com/bsm-finance/wallet/pb" + "bsm/full/module/finance/wallet/internal/models" + pb "bsm/full/module/finance/wallet/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/vars" diff --git a/apps/finance/wallet/internal/logic/payment/get.go b/module/finance/wallet/internal/logic/payment/get.go similarity index 90% rename from apps/finance/wallet/internal/logic/payment/get.go rename to module/finance/wallet/internal/logic/payment/get.go index 7a53d20..5aa4696 100644 --- a/apps/finance/wallet/internal/logic/payment/get.go +++ b/module/finance/wallet/internal/logic/payment/get.go @@ -3,8 +3,8 @@ package payment import ( "context" - "git.apinb.com/bsm-finance/wallet/internal/models" - pb "git.apinb.com/bsm-finance/wallet/pb" + "bsm/full/module/finance/wallet/internal/models" + pb "bsm/full/module/finance/wallet/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/finance/wallet/internal/logic/payment/hello.go b/module/finance/wallet/internal/logic/payment/hello.go similarity index 93% rename from apps/finance/wallet/internal/logic/payment/hello.go rename to module/finance/wallet/internal/logic/payment/hello.go index cd2e5a4..a0c1962 100644 --- a/apps/finance/wallet/internal/logic/payment/hello.go +++ b/module/finance/wallet/internal/logic/payment/hello.go @@ -4,7 +4,7 @@ package payment import ( "context" - pb "git.apinb.com/bsm-finance/wallet/pb" + pb "bsm/full/module/finance/wallet/pb" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/finance/wallet/internal/logic/payment/way.go b/module/finance/wallet/internal/logic/payment/way.go similarity index 85% rename from apps/finance/wallet/internal/logic/payment/way.go rename to module/finance/wallet/internal/logic/payment/way.go index 5f5dd3a..a86e52b 100644 --- a/apps/finance/wallet/internal/logic/payment/way.go +++ b/module/finance/wallet/internal/logic/payment/way.go @@ -4,9 +4,9 @@ import ( "context" "fmt" - "git.apinb.com/bsm-finance/wallet/internal/config" - "git.apinb.com/bsm-finance/wallet/internal/models" - pb "git.apinb.com/bsm-finance/wallet/pb" + "bsm/full/module/finance/wallet/internal/config" + "bsm/full/module/finance/wallet/internal/models" + pb "bsm/full/module/finance/wallet/pb" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/finance/wallet/internal/logic/wechat/app_pre_order.go b/module/finance/wallet/internal/logic/wechat/app_pre_order.go similarity index 90% rename from apps/finance/wallet/internal/logic/wechat/app_pre_order.go rename to module/finance/wallet/internal/logic/wechat/app_pre_order.go index 25ede0c..6228ebc 100644 --- a/apps/finance/wallet/internal/logic/wechat/app_pre_order.go +++ b/module/finance/wallet/internal/logic/wechat/app_pre_order.go @@ -3,7 +3,7 @@ package wechat import ( "context" - pb "git.apinb.com/bsm-finance/wallet/pb" + pb "bsm/full/module/finance/wallet/pb" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/finance/wallet/internal/logic/wechat/jsapi_pre_order.go b/module/finance/wallet/internal/logic/wechat/jsapi_pre_order.go similarity index 94% rename from apps/finance/wallet/internal/logic/wechat/jsapi_pre_order.go rename to module/finance/wallet/internal/logic/wechat/jsapi_pre_order.go index 7a1592a..7a3e079 100644 --- a/apps/finance/wallet/internal/logic/wechat/jsapi_pre_order.go +++ b/module/finance/wallet/internal/logic/wechat/jsapi_pre_order.go @@ -3,7 +3,7 @@ package wechat import ( "context" - pb "git.apinb.com/bsm-finance/wallet/pb" + pb "bsm/full/module/finance/wallet/pb" ) // 微信JSAPI下单 diff --git a/apps/finance/wallet/internal/logic/wechat/native_pre_order.go b/module/finance/wallet/internal/logic/wechat/native_pre_order.go similarity index 91% rename from apps/finance/wallet/internal/logic/wechat/native_pre_order.go rename to module/finance/wallet/internal/logic/wechat/native_pre_order.go index 5d20e6f..804ba04 100644 --- a/apps/finance/wallet/internal/logic/wechat/native_pre_order.go +++ b/module/finance/wallet/internal/logic/wechat/native_pre_order.go @@ -3,7 +3,7 @@ package wechat import ( "context" - pb "git.apinb.com/bsm-finance/wallet/pb" + pb "bsm/full/module/finance/wallet/pb" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/finance/wallet/internal/logic/wechat/transfer.go b/module/finance/wallet/internal/logic/wechat/transfer.go similarity index 90% rename from apps/finance/wallet/internal/logic/wechat/transfer.go rename to module/finance/wallet/internal/logic/wechat/transfer.go index 7eeb73e..c81147d 100644 --- a/apps/finance/wallet/internal/logic/wechat/transfer.go +++ b/module/finance/wallet/internal/logic/wechat/transfer.go @@ -3,7 +3,7 @@ package wechat import ( "context" - pb "git.apinb.com/bsm-finance/wallet/pb" + pb "bsm/full/module/finance/wallet/pb" "git.apinb.com/bsm-sdk/core/service" ) diff --git a/apps/finance/wallet/internal/logic/wechat/wechat.go b/module/finance/wallet/internal/logic/wechat/wechat.go similarity index 98% rename from apps/finance/wallet/internal/logic/wechat/wechat.go rename to module/finance/wallet/internal/logic/wechat/wechat.go index 4e6b6c3..73a75e9 100644 --- a/apps/finance/wallet/internal/logic/wechat/wechat.go +++ b/module/finance/wallet/internal/logic/wechat/wechat.go @@ -6,8 +6,8 @@ import ( "os" "time" - "git.apinb.com/bsm-finance/wallet/internal/config" - "git.apinb.com/bsm-finance/wallet/internal/excode" + "bsm/full/module/finance/wallet/internal/config" + "bsm/full/module/finance/wallet/internal/excode" "github.com/go-pay/gopay" "github.com/go-pay/gopay/wechat/v3" ) diff --git a/apps/finance/wallet/internal/logic/wechat/wx_callback.go b/module/finance/wallet/internal/logic/wechat/wx_callback.go similarity index 91% rename from apps/finance/wallet/internal/logic/wechat/wx_callback.go rename to module/finance/wallet/internal/logic/wechat/wx_callback.go index 302fff2..02de1fd 100644 --- a/apps/finance/wallet/internal/logic/wechat/wx_callback.go +++ b/module/finance/wallet/internal/logic/wechat/wx_callback.go @@ -4,8 +4,8 @@ import ( "context" "encoding/json" - "git.apinb.com/bsm-finance/wallet/internal/config" - pb "git.apinb.com/bsm-finance/wallet/pb" + "bsm/full/module/finance/wallet/internal/config" + pb "bsm/full/module/finance/wallet/pb" "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "github.com/go-pay/gopay/wechat/v3" diff --git a/apps/finance/wallet/internal/models/query.go b/module/finance/wallet/internal/models/query.go similarity index 99% rename from apps/finance/wallet/internal/models/query.go rename to module/finance/wallet/internal/models/query.go index 30e795d..cc0a4a0 100644 --- a/apps/finance/wallet/internal/models/query.go +++ b/module/finance/wallet/internal/models/query.go @@ -4,7 +4,7 @@ package models import ( "errors" - "git.apinb.com/bsm-finance/wallet/internal/impl" + "bsm/full/module/finance/wallet/internal/impl" "git.apinb.com/bsm-sdk/core/types" "git.apinb.com/bsm-sdk/core/utils" "google.golang.org/grpc/codes" diff --git a/apps/finance/wallet/internal/models/wallet_apply_cash.go b/module/finance/wallet/internal/models/wallet_apply_cash.go similarity index 100% rename from apps/finance/wallet/internal/models/wallet_apply_cash.go rename to module/finance/wallet/internal/models/wallet_apply_cash.go diff --git a/apps/finance/wallet/internal/models/wallet_bank.go b/module/finance/wallet/internal/models/wallet_bank.go similarity index 100% rename from apps/finance/wallet/internal/models/wallet_bank.go rename to module/finance/wallet/internal/models/wallet_bank.go diff --git a/apps/finance/wallet/internal/models/wallet_basic.go b/module/finance/wallet/internal/models/wallet_basic.go similarity index 100% rename from apps/finance/wallet/internal/models/wallet_basic.go rename to module/finance/wallet/internal/models/wallet_basic.go diff --git a/apps/finance/wallet/internal/models/wallet_payment.go b/module/finance/wallet/internal/models/wallet_payment.go similarity index 100% rename from apps/finance/wallet/internal/models/wallet_payment.go rename to module/finance/wallet/internal/models/wallet_payment.go diff --git a/apps/finance/wallet/internal/models/wallet_record.go b/module/finance/wallet/internal/models/wallet_record.go similarity index 100% rename from apps/finance/wallet/internal/models/wallet_record.go rename to module/finance/wallet/internal/models/wallet_record.go diff --git a/apps/finance/wallet/internal/models/wallet_refund.go b/module/finance/wallet/internal/models/wallet_refund.go similarity index 100% rename from apps/finance/wallet/internal/models/wallet_refund.go rename to module/finance/wallet/internal/models/wallet_refund.go diff --git a/apps/finance/wallet/internal/server/alipay_server.go b/module/finance/wallet/internal/server/alipay_server.go similarity index 90% rename from apps/finance/wallet/internal/server/alipay_server.go rename to module/finance/wallet/internal/server/alipay_server.go index e753110..d06e350 100644 --- a/apps/finance/wallet/internal/server/alipay_server.go +++ b/module/finance/wallet/internal/server/alipay_server.go @@ -3,8 +3,8 @@ package server import ( "context" - "git.apinb.com/bsm-finance/wallet/internal/logic/alipay" - pb "git.apinb.com/bsm-finance/wallet/pb" + "bsm/full/module/finance/wallet/internal/logic/alipay" + pb "bsm/full/module/finance/wallet/pb" ) type AlipayServer struct { diff --git a/apps/finance/wallet/internal/server/basic_server.go b/module/finance/wallet/internal/server/basic_server.go similarity index 94% rename from apps/finance/wallet/internal/server/basic_server.go rename to module/finance/wallet/internal/server/basic_server.go index 5e34ab0..b181809 100644 --- a/apps/finance/wallet/internal/server/basic_server.go +++ b/module/finance/wallet/internal/server/basic_server.go @@ -3,8 +3,8 @@ package server import ( "context" - "git.apinb.com/bsm-finance/wallet/internal/logic/basic" - pb "git.apinb.com/bsm-finance/wallet/pb" + "bsm/full/module/finance/wallet/internal/logic/basic" + pb "bsm/full/module/finance/wallet/pb" ) type BasicServer struct { diff --git a/apps/finance/wallet/internal/server/new.go b/module/finance/wallet/internal/server/new.go similarity index 98% rename from apps/finance/wallet/internal/server/new.go rename to module/finance/wallet/internal/server/new.go index 00a0c4c..512d9d2 100644 --- a/apps/finance/wallet/internal/server/new.go +++ b/module/finance/wallet/internal/server/new.go @@ -3,7 +3,7 @@ package server import ( "context" - pb "git.apinb.com/bsm-finance/wallet/pb" + pb "bsm/full/module/finance/wallet/pb" "git.apinb.com/bsm-sdk/core/vars" gwRuntime "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "google.golang.org/grpc" diff --git a/apps/finance/wallet/internal/server/payment_server.go b/module/finance/wallet/internal/server/payment_server.go similarity index 92% rename from apps/finance/wallet/internal/server/payment_server.go rename to module/finance/wallet/internal/server/payment_server.go index 1df0384..fe8da89 100644 --- a/apps/finance/wallet/internal/server/payment_server.go +++ b/module/finance/wallet/internal/server/payment_server.go @@ -3,8 +3,8 @@ package server import ( "context" - "git.apinb.com/bsm-finance/wallet/internal/logic/payment" - pb "git.apinb.com/bsm-finance/wallet/pb" + "bsm/full/module/finance/wallet/internal/logic/payment" + pb "bsm/full/module/finance/wallet/pb" ) type PaymentServer struct { diff --git a/apps/finance/wallet/internal/server/wechat_server.go b/module/finance/wallet/internal/server/wechat_server.go similarity index 92% rename from apps/finance/wallet/internal/server/wechat_server.go rename to module/finance/wallet/internal/server/wechat_server.go index f95ddcf..9ff0d21 100644 --- a/apps/finance/wallet/internal/server/wechat_server.go +++ b/module/finance/wallet/internal/server/wechat_server.go @@ -3,8 +3,8 @@ package server import ( "context" - "git.apinb.com/bsm-finance/wallet/internal/logic/wechat" - pb "git.apinb.com/bsm-finance/wallet/pb" + "bsm/full/module/finance/wallet/internal/logic/wechat" + pb "bsm/full/module/finance/wallet/pb" ) type WechatServer struct { diff --git a/apps/finance/wallet/pb/alipay.pb.go b/module/finance/wallet/pb/alipay.pb.go similarity index 100% rename from apps/finance/wallet/pb/alipay.pb.go rename to module/finance/wallet/pb/alipay.pb.go diff --git a/apps/finance/wallet/pb/alipay.pb.gw.go b/module/finance/wallet/pb/alipay.pb.gw.go similarity index 100% rename from apps/finance/wallet/pb/alipay.pb.gw.go rename to module/finance/wallet/pb/alipay.pb.gw.go diff --git a/apps/finance/wallet/pb/alipay_grpc.pb.go b/module/finance/wallet/pb/alipay_grpc.pb.go similarity index 100% rename from apps/finance/wallet/pb/alipay_grpc.pb.go rename to module/finance/wallet/pb/alipay_grpc.pb.go diff --git a/apps/finance/wallet/pb/blocks.pb.go b/module/finance/wallet/pb/blocks.pb.go similarity index 100% rename from apps/finance/wallet/pb/blocks.pb.go rename to module/finance/wallet/pb/blocks.pb.go diff --git a/apps/finance/wallet/pb/payment.pb.go b/module/finance/wallet/pb/payment.pb.go similarity index 100% rename from apps/finance/wallet/pb/payment.pb.go rename to module/finance/wallet/pb/payment.pb.go diff --git a/apps/finance/wallet/pb/payment.pb.gw.go b/module/finance/wallet/pb/payment.pb.gw.go similarity index 100% rename from apps/finance/wallet/pb/payment.pb.gw.go rename to module/finance/wallet/pb/payment.pb.gw.go diff --git a/apps/finance/wallet/pb/payment_grpc.pb.go b/module/finance/wallet/pb/payment_grpc.pb.go similarity index 100% rename from apps/finance/wallet/pb/payment_grpc.pb.go rename to module/finance/wallet/pb/payment_grpc.pb.go diff --git a/apps/finance/wallet/pb/wallet.pb.go b/module/finance/wallet/pb/wallet.pb.go similarity index 100% rename from apps/finance/wallet/pb/wallet.pb.go rename to module/finance/wallet/pb/wallet.pb.go diff --git a/apps/finance/wallet/pb/wallet.pb.gw.go b/module/finance/wallet/pb/wallet.pb.gw.go similarity index 100% rename from apps/finance/wallet/pb/wallet.pb.gw.go rename to module/finance/wallet/pb/wallet.pb.gw.go diff --git a/apps/finance/wallet/pb/wallet_grpc.pb.go b/module/finance/wallet/pb/wallet_grpc.pb.go similarity index 100% rename from apps/finance/wallet/pb/wallet_grpc.pb.go rename to module/finance/wallet/pb/wallet_grpc.pb.go diff --git a/apps/finance/wallet/pb/wechat.pb.go b/module/finance/wallet/pb/wechat.pb.go similarity index 100% rename from apps/finance/wallet/pb/wechat.pb.go rename to module/finance/wallet/pb/wechat.pb.go diff --git a/apps/finance/wallet/pb/wechat.pb.gw.go b/module/finance/wallet/pb/wechat.pb.gw.go similarity index 100% rename from apps/finance/wallet/pb/wechat.pb.gw.go rename to module/finance/wallet/pb/wechat.pb.gw.go diff --git a/apps/finance/wallet/pb/wechat_grpc.pb.go b/module/finance/wallet/pb/wechat_grpc.pb.go similarity index 100% rename from apps/finance/wallet/pb/wechat_grpc.pb.go rename to module/finance/wallet/pb/wechat_grpc.pb.go diff --git a/apps/finance/wallet/proto/alipay.proto b/module/finance/wallet/proto/alipay.proto similarity index 100% rename from apps/finance/wallet/proto/alipay.proto rename to module/finance/wallet/proto/alipay.proto diff --git a/apps/finance/wallet/proto/blocks.proto b/module/finance/wallet/proto/blocks.proto similarity index 100% rename from apps/finance/wallet/proto/blocks.proto rename to module/finance/wallet/proto/blocks.proto diff --git a/apps/finance/wallet/proto/payment.proto b/module/finance/wallet/proto/payment.proto similarity index 100% rename from apps/finance/wallet/proto/payment.proto rename to module/finance/wallet/proto/payment.proto diff --git a/apps/finance/wallet/proto/wallet.proto b/module/finance/wallet/proto/wallet.proto similarity index 100% rename from apps/finance/wallet/proto/wallet.proto rename to module/finance/wallet/proto/wallet.proto diff --git a/apps/finance/wallet/proto/wechat.proto b/module/finance/wallet/proto/wechat.proto similarity index 100% rename from apps/finance/wallet/proto/wechat.proto rename to module/finance/wallet/proto/wechat.proto diff --git a/apps/finance/wallet/scripts/filebeat.yaml b/module/finance/wallet/scripts/filebeat.yaml similarity index 100% rename from apps/finance/wallet/scripts/filebeat.yaml rename to module/finance/wallet/scripts/filebeat.yaml diff --git a/apps/finance/wallet/scripts/lint.sh b/module/finance/wallet/scripts/lint.sh similarity index 100% rename from apps/finance/wallet/scripts/lint.sh rename to module/finance/wallet/scripts/lint.sh diff --git a/apps/finance/wallet/swagger/index.html b/module/finance/wallet/swagger/index.html similarity index 100% rename from apps/finance/wallet/swagger/index.html rename to module/finance/wallet/swagger/index.html diff --git a/apps/finance/wallet/swagger/wallet.swagger.json b/module/finance/wallet/swagger/wallet.swagger.json similarity index 100% rename from apps/finance/wallet/swagger/wallet.swagger.json rename to module/finance/wallet/swagger/wallet.swagger.json diff --git a/apps/finance/wallet/test/alipay.http b/module/finance/wallet/test/alipay.http similarity index 100% rename from apps/finance/wallet/test/alipay.http rename to module/finance/wallet/test/alipay.http diff --git a/apps/finance/wallet/test/basic.http b/module/finance/wallet/test/basic.http similarity index 100% rename from apps/finance/wallet/test/basic.http rename to module/finance/wallet/test/basic.http diff --git a/apps/finance/wallet/test/hello.http b/module/finance/wallet/test/hello.http similarity index 100% rename from apps/finance/wallet/test/hello.http rename to module/finance/wallet/test/hello.http diff --git a/apps/finance/wallet/test/payment.http b/module/finance/wallet/test/payment.http similarity index 100% rename from apps/finance/wallet/test/payment.http rename to module/finance/wallet/test/payment.http diff --git a/apps/finance/wallet/test/readme.md b/module/finance/wallet/test/readme.md similarity index 100% rename from apps/finance/wallet/test/readme.md rename to module/finance/wallet/test/readme.md diff --git a/apps/finance/wallet/test/wechat.http b/module/finance/wallet/test/wechat.http similarity index 100% rename from apps/finance/wallet/test/wechat.http rename to module/finance/wallet/test/wechat.http diff --git a/apps/social/feed/README.md b/module/social/feed/README.md similarity index 100% rename from apps/social/feed/README.md rename to module/social/feed/README.md diff --git a/apps/social/feed/cmd/cli/main.go b/module/social/feed/cmd/cli/main.go similarity index 68% rename from apps/social/feed/cmd/cli/main.go rename to module/social/feed/cmd/cli/main.go index 86220a8..410bec5 100644 --- a/apps/social/feed/cmd/cli/main.go +++ b/module/social/feed/cmd/cli/main.go @@ -3,7 +3,7 @@ package main import ( "fmt" - "git.apinb.com/bsm-social/feed/internal/config" + "bsm/full/module/social/feed/internal/config" ) func main() { diff --git a/apps/social/feed/cmd/main/main.go b/module/social/feed/cmd/main/main.go similarity index 75% rename from apps/social/feed/cmd/main/main.go rename to module/social/feed/cmd/main/main.go index 5f644c7..7c75449 100644 --- a/apps/social/feed/cmd/main/main.go +++ b/module/social/feed/cmd/main/main.go @@ -5,18 +5,18 @@ package main import ( + "bsm/full/module/social/feed/internal/config" + "bsm/full/module/social/feed/internal/impl" + "bsm/full/module/social/feed/internal/models" + "bsm/full/module/social/feed/internal/server" "git.apinb.com/bsm-sdk/core/service" - "git.apinb.com/bsm-social/feed/internal/config" - "git.apinb.com/bsm-social/feed/internal/impl" - "git.apinb.com/bsm-social/feed/internal/models" - "git.apinb.com/bsm-social/feed/internal/server" ) var ( ServiceKey = "Feed" ) -func main() { +func Run() { config.New(ServiceKey) impl.NewImpl() @@ -43,3 +43,7 @@ func main() { // 启动服务 srv.Start() } + +func main() { + Run() +} diff --git a/apps/social/feed/etc/feed_dev.yaml b/module/social/feed/etc/feed_dev.yaml similarity index 100% rename from apps/social/feed/etc/feed_dev.yaml rename to module/social/feed/etc/feed_dev.yaml diff --git a/apps/social/feed/etc/feed_prod.yaml b/module/social/feed/etc/feed_prod.yaml similarity index 100% rename from apps/social/feed/etc/feed_prod.yaml rename to module/social/feed/etc/feed_prod.yaml diff --git a/apps/social/feed/etc/feed_test.yaml b/module/social/feed/etc/feed_test.yaml similarity index 100% rename from apps/social/feed/etc/feed_test.yaml rename to module/social/feed/etc/feed_test.yaml diff --git a/apps/social/feed/etc/passport_dev.yaml b/module/social/feed/etc/passport_dev.yaml similarity index 100% rename from apps/social/feed/etc/passport_dev.yaml rename to module/social/feed/etc/passport_dev.yaml diff --git a/apps/social/feed/etc/passport_prod.yaml b/module/social/feed/etc/passport_prod.yaml similarity index 100% rename from apps/social/feed/etc/passport_prod.yaml rename to module/social/feed/etc/passport_prod.yaml diff --git a/apps/social/feed/etc/passport_test.yaml b/module/social/feed/etc/passport_test.yaml similarity index 100% rename from apps/social/feed/etc/passport_test.yaml rename to module/social/feed/etc/passport_test.yaml diff --git a/apps/social/feed/etc/supervisor.bsm-apps-passport.conf b/module/social/feed/etc/supervisor.bsm-apps-passport.conf similarity index 100% rename from apps/social/feed/etc/supervisor.bsm-apps-passport.conf rename to module/social/feed/etc/supervisor.bsm-apps-passport.conf diff --git a/apps/social/feed/go.mod b/module/social/feed/go.mod similarity index 54% rename from apps/social/feed/go.mod rename to module/social/feed/go.mod index 806263d..7329d77 100644 --- a/apps/social/feed/go.mod +++ b/module/social/feed/go.mod @@ -1,15 +1,15 @@ -module git.apinb.com/bsm-social/feed +module bsm/full/module/social/feed go 1.26.5 require ( git.apinb.com/bsm-sdk/core v0.2.0 - github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 + github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0 github.com/patrickmn/go-cache v2.1.0+incompatible - go.etcd.io/etcd/client/v3 v3.6.12 - google.golang.org/grpc v1.81.1 + go.etcd.io/etcd/client/v3 v3.7.1 + google.golang.org/grpc v1.83.0 google.golang.org/protobuf v1.36.11 - gorm.io/gorm v1.31.1 + gorm.io/gorm v1.31.2 ) require ( @@ -17,9 +17,7 @@ require ( github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/coreos/go-semver v0.3.1 // indirect github.com/coreos/go-systemd/v22 v22.7.0 // indirect - github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/go-sql-driver/mysql v1.10.0 // indirect - github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt/v5 v5.3.1 // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/google/uuid v1.6.0 // indirect @@ -29,22 +27,23 @@ require ( github.com/jackc/puddle/v2 v2.2.2 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect - github.com/oklog/ulid/v2 v2.1.1 // indirect - github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - github.com/redis/go-redis/v9 v9.20.0 // indirect + github.com/oklog/ulid/v2 v2.1.2 // indirect + github.com/redis/go-redis/v9 v9.22.0 // indirect github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect - go.etcd.io/etcd/api/v3 v3.6.12 // indirect - go.etcd.io/etcd/client/pkg/v3 v3.6.12 // indirect + go.etcd.io/etcd/api/v3 v3.7.1 // indirect + go.etcd.io/etcd/client/pkg/v3 v3.7.1 // indirect go.uber.org/atomic v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.28.0 // indirect - golang.org/x/net v0.55.0 // indirect - golang.org/x/sync v0.20.0 // indirect - golang.org/x/sys v0.45.0 // indirect - golang.org/x/text v0.37.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa // indirect + golang.org/x/net v0.57.0 // indirect + golang.org/x/sync v0.22.0 // indirect + golang.org/x/sys v0.47.0 // indirect + golang.org/x/text v0.40.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea // indirect gopkg.in/yaml.v3 v3.0.1 // indirect gorm.io/driver/mysql v1.6.0 // indirect - gorm.io/driver/postgres v1.6.0 // indirect + gorm.io/driver/postgres v1.6.2 // indirect ) + +replace git.apinb.com/bsm-sdk/core => D:/work/bsm-sdk/core diff --git a/apps/social/feed/go.sum b/module/social/feed/go.sum similarity index 50% rename from apps/social/feed/go.sum rename to module/social/feed/go.sum index 80f7a17..d418bfb 100644 --- a/apps/social/feed/go.sum +++ b/module/social/feed/go.sum @@ -1,7 +1,5 @@ filippo.io/edwards25519 v1.2.0 h1:crnVqOiS4jqYleHd9vaKZ+HKtHfllngJIiOpNpoJsjo= filippo.io/edwards25519 v1.2.0/go.mod h1:xzAOLCNug/yB62zG1bQ8uziwrIqIuxhctzJT18Q77mc= -git.apinb.com/bsm-sdk/core v0.2.0 h1:/e9yqpsbKBrRgMiGpS3KX2O4qDLxo5V5GpPSLNGxEKw= -git.apinb.com/bsm-sdk/core v0.2.0/go.mod h1:E9T6Eboo/0Zb36BjkKbIgvFzq4fQ2Q8P/7y5zmYTI6Y= github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs= github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c= github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA= @@ -15,14 +13,12 @@ github.com/coreos/go-systemd/v22 v22.7.0/go.mod h1:xNUYtjHu2EDXbsxz1i41wouACIwT7 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= -github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.4 h1:tG4xh9yMsRCAiodLVTxyrkzSZ9+o0L1Kg/+cPVcbP/8= +github.com/go-logr/logr v1.4.4/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-sql-driver/mysql v1.10.0 h1:Q+1LV8DkHJvSYAdR83XzuhDaTykuDx0l6fkXxoWCWfw= github.com/go-sql-driver/mysql v1.10.0/go.mod h1:M+cqaI7+xxXGG9swrdeUIoPG3Y3KCkF0pZej+SK+nWk= -github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= -github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt/v5 v5.3.1 h1:kYf81DTWFe7t+1VvL7eS+jKFVWaUnK9cB1qbwn63YCY= github.com/golang-jwt/jwt/v5 v5.3.1/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= @@ -31,8 +27,8 @@ github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= 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/grpc-ecosystem/grpc-gateway/v2 v2.29.0 h1:5VipnvEpbqr2gA2VbM+nYVbkIF28c5ZQfqCBQ5g2xfk= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0/go.mod h1:Hyl3n6Twe1hvtd9XUXDec4pTvgMSEixRuQKPTMH2bNs= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0 h1:/Tnpcb2E0Pz/tN9s3bfEY2Q8ePCEX9iuS+cneUwncnw= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0/go.mod h1:zOBXOsUaBSjKgmH4OGzV1esUpR3oUSCPYVd2cUBjKYY= 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= @@ -45,24 +41,24 @@ github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= -github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= -github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y= -github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0= +github.com/klauspost/cpuid/v2 v2.4.0 h1:S6Hrbc7+ywsr0r+RLapfGBHfyefhCTwEh3A0tV913Dw= +github.com/klauspost/cpuid/v2 v2.4.0/go.mod h1:19jmZ9mjzoF//ddRSUsv0zfBTJWh3QJh9FNxZTMrGxU= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/oklog/ulid/v2 v2.1.1 h1:suPZ4ARWLOJLegGFiZZ1dFAkqzhMjL3J1TzI+5wHz8s= -github.com/oklog/ulid/v2 v2.1.1/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ= +github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= +github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= +github.com/oklog/ulid/v2 v2.1.2 h1:IEclFb9JNvzYA6MW2SCxbLzcHTVsfqm3PrqGQJH5zec= +github.com/oklog/ulid/v2 v2.1.2/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ= github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= github.com/pborman/getopt v0.0.0-20170112200414-7148bc3a4c30/go.mod h1:85jBQOZwpVEaDAr341tbn15RS4fCAsIst0qp7i8ex1o= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/redis/go-redis/v9 v9.20.0 h1:WnQYxLkgO2xiXTCJY0ldIiI8dNqCDlQAG+AtaH7a2a0= -github.com/redis/go-redis/v9 v9.20.0/go.mod h1:v/M13XI1PVCDcm01VtPFOADfZtHf8YW3baQf57KlIkA= +github.com/redis/go-redis/v9 v9.22.0 h1:laDvpYXTJtZLloinw1fA5Kqd6HAEH2XKxOkG/PDq2F0= +github.com/redis/go-redis/v9 v9.22.0/go.mod h1:y2g0Wj8rQvuK0ELM+oxSudcLtC09JScs98I/X9gRWY4= github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0= @@ -72,28 +68,26 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= -github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/zeebo/xxh3 v1.1.0 h1:s7DLGDK45Dyfg7++yxI0khrfwq9661w9EN78eP/UZVs= github.com/zeebo/xxh3 v1.1.0/go.mod h1:IisAie1LELR4xhVinxWS5+zf1lA4p0MW4T+w+W07F5s= -go.etcd.io/etcd/api/v3 v3.6.12 h1:OLOZUKEuAA36TR48F0cIaa8FdzrWygjyfrJxXg4iDgs= -go.etcd.io/etcd/api/v3 v3.6.12/go.mod h1:p14EIQXHbuOQbVvL/WEes5uqKnxP9AgKJgpjbMVvzvE= -go.etcd.io/etcd/client/pkg/v3 v3.6.12 h1:36zzB+pQOdHbhN+kH2iJz/K8bJn0ZLtLfPPO7jozTDo= -go.etcd.io/etcd/client/pkg/v3 v3.6.12/go.mod h1:hh2+ZXtfLzs3o6mn92ntgNPBrTJJOvXqICM5g3L3DMY= -go.etcd.io/etcd/client/v3 v3.6.12 h1:kMSP6JcPZMqSJiX+TXdUIBU/4eXEZWBAaui4VihMbIc= -go.etcd.io/etcd/client/v3 v3.6.12/go.mod h1:CMs6fJWYiZQk4ytFjd4lE1diOvvRMmtbbn/alZXd3dQ= +go.etcd.io/etcd/api/v3 v3.7.1 h1:KJG0/DcWGfe3Y1otDf/fsBf0TSSgpxZ5RO/L8SFt73E= +go.etcd.io/etcd/api/v3 v3.7.1/go.mod h1:8bXIpCMeV7E3/XL0Ix123ATn3dB+0V7d9zklHbB0m78= +go.etcd.io/etcd/client/pkg/v3 v3.7.1 h1:rKYsj3pRkR0eK3yjT3XOgrhqfmIfj9pzNgxjh7mfFv4= +go.etcd.io/etcd/client/pkg/v3 v3.7.1/go.mod h1:cnzZGIUzSfjEwLC6UBVsSXlEK1eepS/JUD7wE6PLRT0= +go.etcd.io/etcd/client/v3 v3.7.1 h1:0PEMMC0KuZmVIN+RAbdqfkZ45pYTgKVtmBEbRCvZFUg= +go.etcd.io/etcd/client/v3 v3.7.1/go.mod h1:ffNqALa8tRCYhYo1F9oR489y23K39Gz+BSR3ApAGYq0= go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64= go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y= -go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I= -go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0= -go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM= -go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY= -go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg= -go.opentelemetry.io/otel/sdk v1.43.0/go.mod h1:P+IkVU3iWukmiit/Yf9AWvpyRDlUeBaRg6Y+C58QHzg= -go.opentelemetry.io/otel/sdk/metric v1.43.0 h1:S88dyqXjJkuBNLeMcVPRFXpRw2fuwdvfCGLEo89fDkw= -go.opentelemetry.io/otel/sdk/metric v1.43.0/go.mod h1:C/RJtwSEJ5hzTiUz5pXF1kILHStzb9zFlIEe85bhj6A= -go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A= -go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0= +go.opentelemetry.io/otel v1.45.0 h1:pdrWmLHofpubmArBv1LgFSv1Z0Ie/ppdZzu+kUN5EeU= +go.opentelemetry.io/otel v1.45.0/go.mod h1:XZxIqPapzEYnhNSScF5DIqXhm/rYi0FzCe2XddAwZfQ= +go.opentelemetry.io/otel/metric v1.45.0 h1:7Eg1uH7CJ5cXv9is6tnBe1FI6rj1nwUdbFypRm3br/M= +go.opentelemetry.io/otel/metric v1.45.0/go.mod h1:HAPbm1nd3p1PmFH7v2dR+6BjXxw+Lq4a2+pndMAm08s= +go.opentelemetry.io/otel/sdk v1.45.0 h1:4VVSMgQ83dUgW2aoX5f6JgLvHwIvzcuLnF9lUdCSpCw= +go.opentelemetry.io/otel/sdk v1.45.0/go.mod h1:Sr40LgXV7DsKMMJMKOhUWOgMWTfAaqvm2kF0g7ilwuA= +go.opentelemetry.io/otel/sdk/metric v1.44.0 h1:3LlKgI+VjbVsjNRFZJZAJ30WjXC5VkNRks6si09iEfI= +go.opentelemetry.io/otel/sdk/metric v1.44.0/go.mod h1:5B5pMARnXxKhltooO4xUuCBorl65a4EpnTalObqOigA= +go.opentelemetry.io/otel/trace v1.45.0 h1:l/mP6Uv7oNO7/TblbhpbgMidxhq1uO/rPsikOyVhxag= +go.opentelemetry.io/otel/trace v1.45.0/go.mod h1:qoJJA2xNMnxRrdISU/kLtfUH2wNeQbiv+jhs/CxI8bc= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= @@ -102,49 +96,24 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.28.0 h1:IZzaP1Fv73/T/pBMLk4VutPl36uNC+OSUh3JLG3FIjo= go.uber.org/zap v1.28.0/go.mod h1:rDLpOi171uODNm/mxFcuYWxDsqWSAVkFdX4XojSKg/Q= -go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= -go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8= -golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -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.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4= -golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY= -golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc= -golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -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= +go.yaml.in/yaml/v3 v3.0.5 h1:N6y/pJk8buWs9NY5ERU2HSMfm+IuD/OtfdAnq6kESPw= +go.yaml.in/yaml/v3 v3.0.5/go.mod h1:HVTZu1O7/Vkt2N+BFy8Zza+lnLsABggaTM2ZpNIGuKg= +golang.org/x/net v0.57.0 h1:K5+3DljvIuDG9/Jv9rvyMywYNFCQ9RSUY6OOTTkT+tE= +golang.org/x/net v0.57.0/go.mod h1:KpXc8iv+r3XplLAG/f7Jsf9RPszJzdR0f58q9vGOuEU= +golang.org/x/sync v0.22.0 h1:SZjpbeLmrCk4xhRSZFNZW5gFUeCeFgjekvI/+gfScek= +golang.org/x/sync v0.22.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= +golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs= +golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +golang.org/x/text v0.40.0 h1:Ub2Z6/xjgF1WrYQz2nuITOEegKFtiIy+rieRJ5lHZKs= +golang.org/x/text v0.40.0/go.mod h1:hpnzDAfGV753zIKo+wk3u1bVKCGPbrnF7+7LBF/UHVY= gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4= gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E= -google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa h1:Kjn0N0tCrDgiAFW+lGO4JZ3ck44CehvJQMAwj9QF0G8= -google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:q4lMZS6kskjT5HvCPrnnypcDPVJqT/f4nfxmkE7gryY= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa h1:mZHHdPZl0dbGHCflZgAq/Q468DWVFcU2whhB2KAo8fk= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= -google.golang.org/grpc v1.81.1 h1:VnnIIZ88UzOOKLukQi+ImGz8O1Wdp8nAGGnvOfEIWQQ= -google.golang.org/grpc v1.81.1/go.mod h1:xGH9GfzOyMTGIOXBJmXt+BX/V0kcdQbdcuwQ/zNw42I= +google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea h1:Jifw/kjs/r3B0uszvls/m3c3tmZs2YHGM9C+rvxP9gY= +google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea/go.mod h1:K/+WGbmBY7aNW1HDw1fJnKYo10i0DkAX6pows00dLig= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea h1:kVhQEPTpKQahD5+JSBTfBB19wcgQTTjAIn45MBqnyHk= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= +google.golang.org/grpc v1.83.0 h1:JeNZEKJFbQxArAMl+hiytHauacDNqJUllNfmIMmpqnQ= +google.golang.org/grpc v1.83.0/go.mod h1:kDyl6SKsiHKt0uylY5gtn5cEjkrIOhQOGDgIc4JGwzQ= google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE= google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -155,7 +124,9 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gorm.io/driver/mysql v1.6.0 h1:eNbLmNTpPpTOVZi8MMxCi2aaIm0ZpInbORNXDwyLGvg= gorm.io/driver/mysql v1.6.0/go.mod h1:D/oCC2GWK3M/dqoLxnOlaNKmXz8WNTfcS9y5ovaSqKo= -gorm.io/driver/postgres v1.6.0 h1:2dxzU8xJ+ivvqTRph34QX+WrRaJlmfyPqXmoGVjMBa4= -gorm.io/driver/postgres v1.6.0/go.mod h1:vUw0mrGgrTK+uPHEhAdV4sfFELrByKVGnaVRkXDhtWo= -gorm.io/gorm v1.31.1 h1:7CA8FTFz/gRfgqgpeKIBcervUn3xSyPUmr6B2WXJ7kg= -gorm.io/gorm v1.31.1/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs= +gorm.io/driver/postgres v1.6.2 h1:BvXQ/cNUg63q5TFNg672DmDcowZSFrNLkkA3Xe6GXq4= +gorm.io/driver/postgres v1.6.2/go.mod h1:0c4fQA44XhOklXDkgtuKqysHCycTa5i9e3EIpDGCwXk= +gorm.io/driver/sqlite v1.6.0 h1:WHRRrIiulaPiPFmDcod6prc4l2VGVWHz80KspNsxSfQ= +gorm.io/driver/sqlite v1.6.0/go.mod h1:AO9V1qIQddBESngQUKWL9yoH93HIeA1X6V633rBwyT8= +gorm.io/gorm v1.31.2 h1:3o8FXNo9v9S858gil+3LlZA1LkCOzgb4g5BL64FgaCo= +gorm.io/gorm v1.31.2/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs= diff --git a/apps/social/feed/internal/config/config.go b/module/social/feed/internal/config/config.go similarity index 100% rename from apps/social/feed/internal/config/config.go rename to module/social/feed/internal/config/config.go diff --git a/apps/social/feed/internal/impl/impl.go b/module/social/feed/internal/impl/impl.go similarity index 92% rename from apps/social/feed/internal/impl/impl.go rename to module/social/feed/internal/impl/impl.go index c13a1b8..21b88aa 100644 --- a/apps/social/feed/internal/impl/impl.go +++ b/module/social/feed/internal/impl/impl.go @@ -3,7 +3,7 @@ package impl import ( "git.apinb.com/bsm-sdk/core/cache/redis" "git.apinb.com/bsm-sdk/core/with" - "git.apinb.com/bsm-social/feed/internal/config" + "bsm/full/module/social/feed/internal/config" cache "github.com/patrickmn/go-cache" clientv3 "go.etcd.io/etcd/client/v3" "gorm.io/gorm" diff --git a/apps/social/feed/internal/logic/post/action.go b/module/social/feed/internal/logic/post/action.go similarity index 89% rename from apps/social/feed/internal/logic/post/action.go rename to module/social/feed/internal/logic/post/action.go index 8929159..afa9718 100644 --- a/apps/social/feed/internal/logic/post/action.go +++ b/module/social/feed/internal/logic/post/action.go @@ -9,8 +9,8 @@ import ( "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/vars" - "git.apinb.com/bsm-social/feed/internal/models" - pb "git.apinb.com/bsm-social/feed/pb" + "bsm/full/module/social/feed/internal/models" + pb "bsm/full/module/social/feed/pb" ) // 计数操作 diff --git a/apps/social/feed/internal/logic/post/add_comment.go b/module/social/feed/internal/logic/post/add_comment.go similarity index 90% rename from apps/social/feed/internal/logic/post/add_comment.go rename to module/social/feed/internal/logic/post/add_comment.go index 25d736f..8cb8c12 100644 --- a/apps/social/feed/internal/logic/post/add_comment.go +++ b/module/social/feed/internal/logic/post/add_comment.go @@ -10,8 +10,8 @@ import ( "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/types" "git.apinb.com/bsm-sdk/core/utils" - "git.apinb.com/bsm-social/feed/internal/models" - pb "git.apinb.com/bsm-social/feed/pb" + "bsm/full/module/social/feed/internal/models" + pb "bsm/full/module/social/feed/pb" ) // 新建评论 diff --git a/apps/social/feed/internal/logic/post/change.go b/module/social/feed/internal/logic/post/change.go similarity index 92% rename from apps/social/feed/internal/logic/post/change.go rename to module/social/feed/internal/logic/post/change.go index 351dd1c..4d95625 100644 --- a/apps/social/feed/internal/logic/post/change.go +++ b/module/social/feed/internal/logic/post/change.go @@ -9,8 +9,8 @@ import ( "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/types" "git.apinb.com/bsm-sdk/core/utils" - "git.apinb.com/bsm-social/feed/internal/models" - pb "git.apinb.com/bsm-social/feed/pb" + "bsm/full/module/social/feed/internal/models" + pb "bsm/full/module/social/feed/pb" ) // 修改推文 diff --git a/apps/social/feed/internal/logic/post/comment_list.go b/module/social/feed/internal/logic/post/comment_list.go similarity index 92% rename from apps/social/feed/internal/logic/post/comment_list.go rename to module/social/feed/internal/logic/post/comment_list.go index f99f07d..43a128e 100644 --- a/apps/social/feed/internal/logic/post/comment_list.go +++ b/module/social/feed/internal/logic/post/comment_list.go @@ -4,7 +4,7 @@ import ( "context" "git.apinb.com/bsm-sdk/core/service" - pb "git.apinb.com/bsm-social/feed/pb" + pb "bsm/full/module/social/feed/pb" ) // 评论列表 diff --git a/apps/social/feed/internal/logic/post/create.go b/module/social/feed/internal/logic/post/create.go similarity index 94% rename from apps/social/feed/internal/logic/post/create.go rename to module/social/feed/internal/logic/post/create.go index 309994a..36fb9c5 100644 --- a/apps/social/feed/internal/logic/post/create.go +++ b/module/social/feed/internal/logic/post/create.go @@ -9,8 +9,8 @@ import ( "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/types" "git.apinb.com/bsm-sdk/core/utils" - "git.apinb.com/bsm-social/feed/internal/models" - pb "git.apinb.com/bsm-social/feed/pb" + "bsm/full/module/social/feed/internal/models" + pb "bsm/full/module/social/feed/pb" ) // 新建推文 diff --git a/apps/social/feed/internal/logic/post/delete_comment.go b/module/social/feed/internal/logic/post/delete_comment.go similarity index 88% rename from apps/social/feed/internal/logic/post/delete_comment.go rename to module/social/feed/internal/logic/post/delete_comment.go index 4a5326d..6250bc5 100644 --- a/apps/social/feed/internal/logic/post/delete_comment.go +++ b/module/social/feed/internal/logic/post/delete_comment.go @@ -8,8 +8,8 @@ import ( "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/vars" - "git.apinb.com/bsm-social/feed/internal/models" - pb "git.apinb.com/bsm-social/feed/pb" + "bsm/full/module/social/feed/internal/models" + pb "bsm/full/module/social/feed/pb" ) // 删除评论 diff --git a/apps/social/feed/internal/logic/post/fetch.go b/module/social/feed/internal/logic/post/fetch.go similarity index 94% rename from apps/social/feed/internal/logic/post/fetch.go rename to module/social/feed/internal/logic/post/fetch.go index ddc82b8..c821c96 100644 --- a/apps/social/feed/internal/logic/post/fetch.go +++ b/module/social/feed/internal/logic/post/fetch.go @@ -6,8 +6,8 @@ import ( "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" - "git.apinb.com/bsm-social/feed/internal/models" - pb "git.apinb.com/bsm-social/feed/pb" + "bsm/full/module/social/feed/internal/models" + pb "bsm/full/module/social/feed/pb" ) // 推文列表 diff --git a/apps/social/feed/internal/logic/post/remove.go b/module/social/feed/internal/logic/post/remove.go similarity index 88% rename from apps/social/feed/internal/logic/post/remove.go rename to module/social/feed/internal/logic/post/remove.go index 6aa091d..3b42d42 100644 --- a/apps/social/feed/internal/logic/post/remove.go +++ b/module/social/feed/internal/logic/post/remove.go @@ -8,8 +8,8 @@ import ( "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/vars" - "git.apinb.com/bsm-social/feed/internal/models" - pb "git.apinb.com/bsm-social/feed/pb" + "bsm/full/module/social/feed/internal/models" + pb "bsm/full/module/social/feed/pb" ) // 删除推文 diff --git a/apps/social/feed/internal/logic/setting/info.go b/module/social/feed/internal/logic/setting/info.go similarity index 90% rename from apps/social/feed/internal/logic/setting/info.go rename to module/social/feed/internal/logic/setting/info.go index 235c16c..22a1611 100644 --- a/apps/social/feed/internal/logic/setting/info.go +++ b/module/social/feed/internal/logic/setting/info.go @@ -4,7 +4,7 @@ import ( "context" "git.apinb.com/bsm-sdk/core/service" - pb "git.apinb.com/bsm-social/feed/pb" + pb "bsm/full/module/social/feed/pb" ) // 修改个人信息 diff --git a/apps/social/feed/internal/logic/setting/rights.go b/module/social/feed/internal/logic/setting/rights.go similarity index 90% rename from apps/social/feed/internal/logic/setting/rights.go rename to module/social/feed/internal/logic/setting/rights.go index 9e2f039..49b08a7 100644 --- a/apps/social/feed/internal/logic/setting/rights.go +++ b/module/social/feed/internal/logic/setting/rights.go @@ -4,7 +4,7 @@ import ( "context" "git.apinb.com/bsm-sdk/core/service" - pb "git.apinb.com/bsm-social/feed/pb" + pb "bsm/full/module/social/feed/pb" ) // 修改权限信息 diff --git a/apps/social/feed/internal/logic/tag/create.go b/module/social/feed/internal/logic/tag/create.go similarity index 89% rename from apps/social/feed/internal/logic/tag/create.go rename to module/social/feed/internal/logic/tag/create.go index cec2645..93cab3c 100644 --- a/apps/social/feed/internal/logic/tag/create.go +++ b/module/social/feed/internal/logic/tag/create.go @@ -7,8 +7,8 @@ import ( "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/utils" - "git.apinb.com/bsm-social/feed/internal/models" - pb "git.apinb.com/bsm-social/feed/pb" + "bsm/full/module/social/feed/internal/models" + pb "bsm/full/module/social/feed/pb" ) // 新建标签 diff --git a/apps/social/feed/internal/logic/tag/list.go b/module/social/feed/internal/logic/tag/list.go similarity index 87% rename from apps/social/feed/internal/logic/tag/list.go rename to module/social/feed/internal/logic/tag/list.go index a86a226..a686901 100644 --- a/apps/social/feed/internal/logic/tag/list.go +++ b/module/social/feed/internal/logic/tag/list.go @@ -5,8 +5,8 @@ import ( "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/service" - "git.apinb.com/bsm-social/feed/internal/models" - pb "git.apinb.com/bsm-social/feed/pb" + "bsm/full/module/social/feed/internal/models" + pb "bsm/full/module/social/feed/pb" ) // 标签列表 diff --git a/apps/social/feed/internal/logic/tag/post_list.go b/module/social/feed/internal/logic/tag/post_list.go similarity index 92% rename from apps/social/feed/internal/logic/tag/post_list.go rename to module/social/feed/internal/logic/tag/post_list.go index fd067a7..5e6a38d 100644 --- a/apps/social/feed/internal/logic/tag/post_list.go +++ b/module/social/feed/internal/logic/tag/post_list.go @@ -4,7 +4,7 @@ import ( "context" "git.apinb.com/bsm-sdk/core/service" - pb "git.apinb.com/bsm-social/feed/pb" + pb "bsm/full/module/social/feed/pb" ) // 话题相关的文章 diff --git a/apps/social/feed/internal/logic/timeline/follow.go b/module/social/feed/internal/logic/timeline/follow.go similarity index 92% rename from apps/social/feed/internal/logic/timeline/follow.go rename to module/social/feed/internal/logic/timeline/follow.go index 363a233..a32f766 100644 --- a/apps/social/feed/internal/logic/timeline/follow.go +++ b/module/social/feed/internal/logic/timeline/follow.go @@ -4,7 +4,7 @@ import ( "context" "git.apinb.com/bsm-sdk/core/service" - pb "git.apinb.com/bsm-social/feed/pb" + pb "bsm/full/module/social/feed/pb" ) // 关注的动态 diff --git a/apps/social/feed/internal/logic/timeline/friend.go b/module/social/feed/internal/logic/timeline/friend.go similarity index 92% rename from apps/social/feed/internal/logic/timeline/friend.go rename to module/social/feed/internal/logic/timeline/friend.go index 9c6598e..f7f68ef 100644 --- a/apps/social/feed/internal/logic/timeline/friend.go +++ b/module/social/feed/internal/logic/timeline/friend.go @@ -4,7 +4,7 @@ import ( "context" "git.apinb.com/bsm-sdk/core/service" - pb "git.apinb.com/bsm-social/feed/pb" + pb "bsm/full/module/social/feed/pb" ) // 好友动态 diff --git a/apps/social/feed/internal/logic/timeline/hot.go b/module/social/feed/internal/logic/timeline/hot.go similarity index 92% rename from apps/social/feed/internal/logic/timeline/hot.go rename to module/social/feed/internal/logic/timeline/hot.go index a5e9ea2..3809f55 100644 --- a/apps/social/feed/internal/logic/timeline/hot.go +++ b/module/social/feed/internal/logic/timeline/hot.go @@ -4,7 +4,7 @@ import ( "context" "git.apinb.com/bsm-sdk/core/service" - pb "git.apinb.com/bsm-social/feed/pb" + pb "bsm/full/module/social/feed/pb" ) // 热门 diff --git a/apps/social/feed/internal/logic/timeline/recommend.go b/module/social/feed/internal/logic/timeline/recommend.go similarity index 92% rename from apps/social/feed/internal/logic/timeline/recommend.go rename to module/social/feed/internal/logic/timeline/recommend.go index e993854..dd50605 100644 --- a/apps/social/feed/internal/logic/timeline/recommend.go +++ b/module/social/feed/internal/logic/timeline/recommend.go @@ -4,7 +4,7 @@ import ( "context" "git.apinb.com/bsm-sdk/core/service" - pb "git.apinb.com/bsm-social/feed/pb" + pb "bsm/full/module/social/feed/pb" ) // 推荐 diff --git a/apps/social/feed/internal/models/feed_comment.go b/module/social/feed/internal/models/feed_comment.go similarity index 100% rename from apps/social/feed/internal/models/feed_comment.go rename to module/social/feed/internal/models/feed_comment.go diff --git a/apps/social/feed/internal/models/feed_post.go b/module/social/feed/internal/models/feed_post.go similarity index 100% rename from apps/social/feed/internal/models/feed_post.go rename to module/social/feed/internal/models/feed_post.go diff --git a/apps/social/feed/internal/models/feed_relate_attachs.go b/module/social/feed/internal/models/feed_relate_attachs.go similarity index 100% rename from apps/social/feed/internal/models/feed_relate_attachs.go rename to module/social/feed/internal/models/feed_relate_attachs.go diff --git a/apps/social/feed/internal/models/feed_relate_tags.go b/module/social/feed/internal/models/feed_relate_tags.go similarity index 100% rename from apps/social/feed/internal/models/feed_relate_tags.go rename to module/social/feed/internal/models/feed_relate_tags.go diff --git a/apps/social/feed/internal/models/feed_tags.go b/module/social/feed/internal/models/feed_tags.go similarity index 100% rename from apps/social/feed/internal/models/feed_tags.go rename to module/social/feed/internal/models/feed_tags.go diff --git a/apps/social/feed/internal/models/query.go b/module/social/feed/internal/models/query.go similarity index 98% rename from apps/social/feed/internal/models/query.go rename to module/social/feed/internal/models/query.go index 9023640..d847d4a 100644 --- a/apps/social/feed/internal/models/query.go +++ b/module/social/feed/internal/models/query.go @@ -3,7 +3,7 @@ package models import ( "fmt" - "git.apinb.com/bsm-social/feed/internal/impl" + "bsm/full/module/social/feed/internal/impl" "gorm.io/gorm" ) diff --git a/apps/social/feed/internal/server/new.go b/module/social/feed/internal/server/new.go similarity index 98% rename from apps/social/feed/internal/server/new.go rename to module/social/feed/internal/server/new.go index b84d56c..941e4ab 100644 --- a/apps/social/feed/internal/server/new.go +++ b/module/social/feed/internal/server/new.go @@ -4,7 +4,7 @@ package server import ( "context" "git.apinb.com/bsm-sdk/core/vars" - pb "git.apinb.com/bsm-social/feed/pb" + pb "bsm/full/module/social/feed/pb" gwRuntime "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "google.golang.org/grpc" "google.golang.org/grpc/reflection" diff --git a/apps/social/feed/internal/server/post_server.go b/module/social/feed/internal/server/post_server.go similarity index 93% rename from apps/social/feed/internal/server/post_server.go rename to module/social/feed/internal/server/post_server.go index 8bab886..3941b9d 100644 --- a/apps/social/feed/internal/server/post_server.go +++ b/module/social/feed/internal/server/post_server.go @@ -3,8 +3,8 @@ package server import ( "context" - "git.apinb.com/bsm-social/feed/internal/logic/post" - pb "git.apinb.com/bsm-social/feed/pb" + "bsm/full/module/social/feed/internal/logic/post" + pb "bsm/full/module/social/feed/pb" ) type PostServer struct { diff --git a/apps/social/feed/internal/server/setting_server.go b/module/social/feed/internal/server/setting_server.go similarity index 84% rename from apps/social/feed/internal/server/setting_server.go rename to module/social/feed/internal/server/setting_server.go index b4501fa..cfb92f0 100644 --- a/apps/social/feed/internal/server/setting_server.go +++ b/module/social/feed/internal/server/setting_server.go @@ -3,8 +3,8 @@ package server import ( "context" - "git.apinb.com/bsm-social/feed/internal/logic/setting" - pb "git.apinb.com/bsm-social/feed/pb" + "bsm/full/module/social/feed/internal/logic/setting" + pb "bsm/full/module/social/feed/pb" ) type SettingServer struct { diff --git a/apps/social/feed/internal/server/tag_server.go b/module/social/feed/internal/server/tag_server.go similarity index 87% rename from apps/social/feed/internal/server/tag_server.go rename to module/social/feed/internal/server/tag_server.go index dc8c6da..3e97c59 100644 --- a/apps/social/feed/internal/server/tag_server.go +++ b/module/social/feed/internal/server/tag_server.go @@ -3,8 +3,8 @@ package server import ( "context" - "git.apinb.com/bsm-social/feed/internal/logic/tag" - pb "git.apinb.com/bsm-social/feed/pb" + "bsm/full/module/social/feed/internal/logic/tag" + pb "bsm/full/module/social/feed/pb" ) type TagServer struct { diff --git a/apps/social/feed/internal/server/timeline_server.go b/module/social/feed/internal/server/timeline_server.go similarity index 89% rename from apps/social/feed/internal/server/timeline_server.go rename to module/social/feed/internal/server/timeline_server.go index 4d7a237..3f70c72 100644 --- a/apps/social/feed/internal/server/timeline_server.go +++ b/module/social/feed/internal/server/timeline_server.go @@ -3,8 +3,8 @@ package server import ( "context" - "git.apinb.com/bsm-social/feed/internal/logic/timeline" - pb "git.apinb.com/bsm-social/feed/pb" + "bsm/full/module/social/feed/internal/logic/timeline" + pb "bsm/full/module/social/feed/pb" ) type TimelineServer struct { diff --git a/apps/social/feed/pb/blocks.pb.go b/module/social/feed/pb/blocks.pb.go similarity index 100% rename from apps/social/feed/pb/blocks.pb.go rename to module/social/feed/pb/blocks.pb.go diff --git a/apps/social/feed/pb/post.pb.go b/module/social/feed/pb/post.pb.go similarity index 100% rename from apps/social/feed/pb/post.pb.go rename to module/social/feed/pb/post.pb.go diff --git a/apps/social/feed/pb/post.pb.gw.go b/module/social/feed/pb/post.pb.gw.go similarity index 100% rename from apps/social/feed/pb/post.pb.gw.go rename to module/social/feed/pb/post.pb.gw.go diff --git a/apps/social/feed/pb/post_grpc.pb.go b/module/social/feed/pb/post_grpc.pb.go similarity index 100% rename from apps/social/feed/pb/post_grpc.pb.go rename to module/social/feed/pb/post_grpc.pb.go diff --git a/apps/social/feed/pb/setting.pb.go b/module/social/feed/pb/setting.pb.go similarity index 100% rename from apps/social/feed/pb/setting.pb.go rename to module/social/feed/pb/setting.pb.go diff --git a/apps/social/feed/pb/setting.pb.gw.go b/module/social/feed/pb/setting.pb.gw.go similarity index 100% rename from apps/social/feed/pb/setting.pb.gw.go rename to module/social/feed/pb/setting.pb.gw.go diff --git a/apps/social/feed/pb/setting_grpc.pb.go b/module/social/feed/pb/setting_grpc.pb.go similarity index 100% rename from apps/social/feed/pb/setting_grpc.pb.go rename to module/social/feed/pb/setting_grpc.pb.go diff --git a/apps/social/feed/pb/tag.pb.go b/module/social/feed/pb/tag.pb.go similarity index 100% rename from apps/social/feed/pb/tag.pb.go rename to module/social/feed/pb/tag.pb.go diff --git a/apps/social/feed/pb/tag.pb.gw.go b/module/social/feed/pb/tag.pb.gw.go similarity index 100% rename from apps/social/feed/pb/tag.pb.gw.go rename to module/social/feed/pb/tag.pb.gw.go diff --git a/apps/social/feed/pb/tag_grpc.pb.go b/module/social/feed/pb/tag_grpc.pb.go similarity index 100% rename from apps/social/feed/pb/tag_grpc.pb.go rename to module/social/feed/pb/tag_grpc.pb.go diff --git a/apps/social/feed/pb/timeline.pb.go b/module/social/feed/pb/timeline.pb.go similarity index 100% rename from apps/social/feed/pb/timeline.pb.go rename to module/social/feed/pb/timeline.pb.go diff --git a/apps/social/feed/pb/timeline.pb.gw.go b/module/social/feed/pb/timeline.pb.gw.go similarity index 100% rename from apps/social/feed/pb/timeline.pb.gw.go rename to module/social/feed/pb/timeline.pb.gw.go diff --git a/apps/social/feed/pb/timeline_grpc.pb.go b/module/social/feed/pb/timeline_grpc.pb.go similarity index 100% rename from apps/social/feed/pb/timeline_grpc.pb.go rename to module/social/feed/pb/timeline_grpc.pb.go diff --git a/apps/social/feed/proto/blocks.proto b/module/social/feed/proto/blocks.proto similarity index 100% rename from apps/social/feed/proto/blocks.proto rename to module/social/feed/proto/blocks.proto diff --git a/apps/social/feed/proto/post.proto b/module/social/feed/proto/post.proto similarity index 100% rename from apps/social/feed/proto/post.proto rename to module/social/feed/proto/post.proto diff --git a/apps/social/feed/proto/setting.proto b/module/social/feed/proto/setting.proto similarity index 100% rename from apps/social/feed/proto/setting.proto rename to module/social/feed/proto/setting.proto diff --git a/apps/social/feed/proto/tag.proto b/module/social/feed/proto/tag.proto similarity index 100% rename from apps/social/feed/proto/tag.proto rename to module/social/feed/proto/tag.proto diff --git a/apps/social/feed/proto/timeline.proto b/module/social/feed/proto/timeline.proto similarity index 100% rename from apps/social/feed/proto/timeline.proto rename to module/social/feed/proto/timeline.proto diff --git a/apps/social/feed/scripts/filebeat.yaml b/module/social/feed/scripts/filebeat.yaml similarity index 100% rename from apps/social/feed/scripts/filebeat.yaml rename to module/social/feed/scripts/filebeat.yaml diff --git a/apps/social/feed/scripts/lint.sh b/module/social/feed/scripts/lint.sh similarity index 100% rename from apps/social/feed/scripts/lint.sh rename to module/social/feed/scripts/lint.sh diff --git a/apps/social/feed/swagger/feed.swagger.json b/module/social/feed/swagger/feed.swagger.json similarity index 100% rename from apps/social/feed/swagger/feed.swagger.json rename to module/social/feed/swagger/feed.swagger.json diff --git a/apps/social/group/README.md b/module/social/group/README.md similarity index 100% rename from apps/social/group/README.md rename to module/social/group/README.md diff --git a/apps/social/group/cmd/cli/main.go b/module/social/group/cmd/cli/main.go similarity index 100% rename from apps/social/group/cmd/cli/main.go rename to module/social/group/cmd/cli/main.go diff --git a/apps/social/group/cmd/main/main.go b/module/social/group/cmd/main/main.go similarity index 75% rename from apps/social/group/cmd/main/main.go rename to module/social/group/cmd/main/main.go index 19e6909..3ca7689 100644 --- a/apps/social/group/cmd/main/main.go +++ b/module/social/group/cmd/main/main.go @@ -5,18 +5,18 @@ package main import ( + "bsm/full/module/social/group/internal/config" + "bsm/full/module/social/group/internal/impl" + "bsm/full/module/social/group/internal/models" + "bsm/full/module/social/group/internal/server" "git.apinb.com/bsm-sdk/core/service" - "git.apinb.com/bsm-social/group/internal/config" - "git.apinb.com/bsm-social/group/internal/impl" - "git.apinb.com/bsm-social/group/internal/models" - "git.apinb.com/bsm-social/group/internal/server" ) var ( ServiceKey = "group" ) -func main() { +func Run() { config.New(ServiceKey) impl.NewImpl() @@ -43,3 +43,7 @@ func main() { // 启动服务 srv.Start() } + +func main() { + Run() +} diff --git a/apps/social/group/etc/group_dev.yaml b/module/social/group/etc/group_dev.yaml similarity index 100% rename from apps/social/group/etc/group_dev.yaml rename to module/social/group/etc/group_dev.yaml diff --git a/apps/social/group/etc/group_prod.yaml b/module/social/group/etc/group_prod.yaml similarity index 100% rename from apps/social/group/etc/group_prod.yaml rename to module/social/group/etc/group_prod.yaml diff --git a/apps/social/group/etc/group_test.yaml b/module/social/group/etc/group_test.yaml similarity index 100% rename from apps/social/group/etc/group_test.yaml rename to module/social/group/etc/group_test.yaml diff --git a/apps/social/group/etc/supervisor.bsm-social-group.conf b/module/social/group/etc/supervisor.bsm-social-group.conf similarity index 100% rename from apps/social/group/etc/supervisor.bsm-social-group.conf rename to module/social/group/etc/supervisor.bsm-social-group.conf diff --git a/apps/social/group/go.mod b/module/social/group/go.mod similarity index 54% rename from apps/social/group/go.mod rename to module/social/group/go.mod index 7e00071..2444a61 100644 --- a/apps/social/group/go.mod +++ b/module/social/group/go.mod @@ -1,15 +1,15 @@ -module git.apinb.com/bsm-social/group +module bsm/full/module/social/group go 1.26.5 require ( git.apinb.com/bsm-sdk/core v0.2.0 - github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 + github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0 github.com/patrickmn/go-cache v2.1.0+incompatible - go.etcd.io/etcd/client/v3 v3.6.12 - google.golang.org/grpc v1.81.1 + go.etcd.io/etcd/client/v3 v3.7.1 + google.golang.org/grpc v1.83.0 google.golang.org/protobuf v1.36.11 - gorm.io/gorm v1.31.1 + gorm.io/gorm v1.31.2 ) require ( @@ -17,9 +17,7 @@ require ( github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/coreos/go-semver v0.3.1 // indirect github.com/coreos/go-systemd/v22 v22.7.0 // indirect - github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/go-sql-driver/mysql v1.10.0 // indirect - github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt/v5 v5.3.1 // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/google/uuid v1.6.0 // indirect @@ -29,22 +27,23 @@ require ( github.com/jackc/puddle/v2 v2.2.2 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect - github.com/oklog/ulid/v2 v2.1.1 // indirect - github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - github.com/redis/go-redis/v9 v9.20.0 // indirect + github.com/oklog/ulid/v2 v2.1.2 // indirect + github.com/redis/go-redis/v9 v9.22.0 // indirect github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect - go.etcd.io/etcd/api/v3 v3.6.12 // indirect - go.etcd.io/etcd/client/pkg/v3 v3.6.12 // indirect + go.etcd.io/etcd/api/v3 v3.7.1 // indirect + go.etcd.io/etcd/client/pkg/v3 v3.7.1 // indirect go.uber.org/atomic v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.28.0 // indirect - golang.org/x/net v0.55.0 // indirect - golang.org/x/sync v0.20.0 // indirect - golang.org/x/sys v0.45.0 // indirect - golang.org/x/text v0.37.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa // indirect + golang.org/x/net v0.57.0 // indirect + golang.org/x/sync v0.22.0 // indirect + golang.org/x/sys v0.47.0 // indirect + golang.org/x/text v0.40.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea // indirect gopkg.in/yaml.v3 v3.0.1 // indirect gorm.io/driver/mysql v1.6.0 // indirect - gorm.io/driver/postgres v1.6.0 // indirect + gorm.io/driver/postgres v1.6.2 // indirect ) + +replace git.apinb.com/bsm-sdk/core => D:/work/bsm-sdk/core diff --git a/apps/social/group/go.sum b/module/social/group/go.sum similarity index 50% rename from apps/social/group/go.sum rename to module/social/group/go.sum index 80f7a17..d418bfb 100644 --- a/apps/social/group/go.sum +++ b/module/social/group/go.sum @@ -1,7 +1,5 @@ filippo.io/edwards25519 v1.2.0 h1:crnVqOiS4jqYleHd9vaKZ+HKtHfllngJIiOpNpoJsjo= filippo.io/edwards25519 v1.2.0/go.mod h1:xzAOLCNug/yB62zG1bQ8uziwrIqIuxhctzJT18Q77mc= -git.apinb.com/bsm-sdk/core v0.2.0 h1:/e9yqpsbKBrRgMiGpS3KX2O4qDLxo5V5GpPSLNGxEKw= -git.apinb.com/bsm-sdk/core v0.2.0/go.mod h1:E9T6Eboo/0Zb36BjkKbIgvFzq4fQ2Q8P/7y5zmYTI6Y= github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs= github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c= github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA= @@ -15,14 +13,12 @@ github.com/coreos/go-systemd/v22 v22.7.0/go.mod h1:xNUYtjHu2EDXbsxz1i41wouACIwT7 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= -github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.4 h1:tG4xh9yMsRCAiodLVTxyrkzSZ9+o0L1Kg/+cPVcbP/8= +github.com/go-logr/logr v1.4.4/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-sql-driver/mysql v1.10.0 h1:Q+1LV8DkHJvSYAdR83XzuhDaTykuDx0l6fkXxoWCWfw= github.com/go-sql-driver/mysql v1.10.0/go.mod h1:M+cqaI7+xxXGG9swrdeUIoPG3Y3KCkF0pZej+SK+nWk= -github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= -github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt/v5 v5.3.1 h1:kYf81DTWFe7t+1VvL7eS+jKFVWaUnK9cB1qbwn63YCY= github.com/golang-jwt/jwt/v5 v5.3.1/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= @@ -31,8 +27,8 @@ github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= 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/grpc-ecosystem/grpc-gateway/v2 v2.29.0 h1:5VipnvEpbqr2gA2VbM+nYVbkIF28c5ZQfqCBQ5g2xfk= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0/go.mod h1:Hyl3n6Twe1hvtd9XUXDec4pTvgMSEixRuQKPTMH2bNs= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0 h1:/Tnpcb2E0Pz/tN9s3bfEY2Q8ePCEX9iuS+cneUwncnw= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0/go.mod h1:zOBXOsUaBSjKgmH4OGzV1esUpR3oUSCPYVd2cUBjKYY= 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= @@ -45,24 +41,24 @@ github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= -github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= -github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y= -github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0= +github.com/klauspost/cpuid/v2 v2.4.0 h1:S6Hrbc7+ywsr0r+RLapfGBHfyefhCTwEh3A0tV913Dw= +github.com/klauspost/cpuid/v2 v2.4.0/go.mod h1:19jmZ9mjzoF//ddRSUsv0zfBTJWh3QJh9FNxZTMrGxU= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/oklog/ulid/v2 v2.1.1 h1:suPZ4ARWLOJLegGFiZZ1dFAkqzhMjL3J1TzI+5wHz8s= -github.com/oklog/ulid/v2 v2.1.1/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ= +github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= +github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= +github.com/oklog/ulid/v2 v2.1.2 h1:IEclFb9JNvzYA6MW2SCxbLzcHTVsfqm3PrqGQJH5zec= +github.com/oklog/ulid/v2 v2.1.2/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ= github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= github.com/pborman/getopt v0.0.0-20170112200414-7148bc3a4c30/go.mod h1:85jBQOZwpVEaDAr341tbn15RS4fCAsIst0qp7i8ex1o= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/redis/go-redis/v9 v9.20.0 h1:WnQYxLkgO2xiXTCJY0ldIiI8dNqCDlQAG+AtaH7a2a0= -github.com/redis/go-redis/v9 v9.20.0/go.mod h1:v/M13XI1PVCDcm01VtPFOADfZtHf8YW3baQf57KlIkA= +github.com/redis/go-redis/v9 v9.22.0 h1:laDvpYXTJtZLloinw1fA5Kqd6HAEH2XKxOkG/PDq2F0= +github.com/redis/go-redis/v9 v9.22.0/go.mod h1:y2g0Wj8rQvuK0ELM+oxSudcLtC09JScs98I/X9gRWY4= github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0= @@ -72,28 +68,26 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= -github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/zeebo/xxh3 v1.1.0 h1:s7DLGDK45Dyfg7++yxI0khrfwq9661w9EN78eP/UZVs= github.com/zeebo/xxh3 v1.1.0/go.mod h1:IisAie1LELR4xhVinxWS5+zf1lA4p0MW4T+w+W07F5s= -go.etcd.io/etcd/api/v3 v3.6.12 h1:OLOZUKEuAA36TR48F0cIaa8FdzrWygjyfrJxXg4iDgs= -go.etcd.io/etcd/api/v3 v3.6.12/go.mod h1:p14EIQXHbuOQbVvL/WEes5uqKnxP9AgKJgpjbMVvzvE= -go.etcd.io/etcd/client/pkg/v3 v3.6.12 h1:36zzB+pQOdHbhN+kH2iJz/K8bJn0ZLtLfPPO7jozTDo= -go.etcd.io/etcd/client/pkg/v3 v3.6.12/go.mod h1:hh2+ZXtfLzs3o6mn92ntgNPBrTJJOvXqICM5g3L3DMY= -go.etcd.io/etcd/client/v3 v3.6.12 h1:kMSP6JcPZMqSJiX+TXdUIBU/4eXEZWBAaui4VihMbIc= -go.etcd.io/etcd/client/v3 v3.6.12/go.mod h1:CMs6fJWYiZQk4ytFjd4lE1diOvvRMmtbbn/alZXd3dQ= +go.etcd.io/etcd/api/v3 v3.7.1 h1:KJG0/DcWGfe3Y1otDf/fsBf0TSSgpxZ5RO/L8SFt73E= +go.etcd.io/etcd/api/v3 v3.7.1/go.mod h1:8bXIpCMeV7E3/XL0Ix123ATn3dB+0V7d9zklHbB0m78= +go.etcd.io/etcd/client/pkg/v3 v3.7.1 h1:rKYsj3pRkR0eK3yjT3XOgrhqfmIfj9pzNgxjh7mfFv4= +go.etcd.io/etcd/client/pkg/v3 v3.7.1/go.mod h1:cnzZGIUzSfjEwLC6UBVsSXlEK1eepS/JUD7wE6PLRT0= +go.etcd.io/etcd/client/v3 v3.7.1 h1:0PEMMC0KuZmVIN+RAbdqfkZ45pYTgKVtmBEbRCvZFUg= +go.etcd.io/etcd/client/v3 v3.7.1/go.mod h1:ffNqALa8tRCYhYo1F9oR489y23K39Gz+BSR3ApAGYq0= go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64= go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y= -go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I= -go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0= -go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM= -go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY= -go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg= -go.opentelemetry.io/otel/sdk v1.43.0/go.mod h1:P+IkVU3iWukmiit/Yf9AWvpyRDlUeBaRg6Y+C58QHzg= -go.opentelemetry.io/otel/sdk/metric v1.43.0 h1:S88dyqXjJkuBNLeMcVPRFXpRw2fuwdvfCGLEo89fDkw= -go.opentelemetry.io/otel/sdk/metric v1.43.0/go.mod h1:C/RJtwSEJ5hzTiUz5pXF1kILHStzb9zFlIEe85bhj6A= -go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A= -go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0= +go.opentelemetry.io/otel v1.45.0 h1:pdrWmLHofpubmArBv1LgFSv1Z0Ie/ppdZzu+kUN5EeU= +go.opentelemetry.io/otel v1.45.0/go.mod h1:XZxIqPapzEYnhNSScF5DIqXhm/rYi0FzCe2XddAwZfQ= +go.opentelemetry.io/otel/metric v1.45.0 h1:7Eg1uH7CJ5cXv9is6tnBe1FI6rj1nwUdbFypRm3br/M= +go.opentelemetry.io/otel/metric v1.45.0/go.mod h1:HAPbm1nd3p1PmFH7v2dR+6BjXxw+Lq4a2+pndMAm08s= +go.opentelemetry.io/otel/sdk v1.45.0 h1:4VVSMgQ83dUgW2aoX5f6JgLvHwIvzcuLnF9lUdCSpCw= +go.opentelemetry.io/otel/sdk v1.45.0/go.mod h1:Sr40LgXV7DsKMMJMKOhUWOgMWTfAaqvm2kF0g7ilwuA= +go.opentelemetry.io/otel/sdk/metric v1.44.0 h1:3LlKgI+VjbVsjNRFZJZAJ30WjXC5VkNRks6si09iEfI= +go.opentelemetry.io/otel/sdk/metric v1.44.0/go.mod h1:5B5pMARnXxKhltooO4xUuCBorl65a4EpnTalObqOigA= +go.opentelemetry.io/otel/trace v1.45.0 h1:l/mP6Uv7oNO7/TblbhpbgMidxhq1uO/rPsikOyVhxag= +go.opentelemetry.io/otel/trace v1.45.0/go.mod h1:qoJJA2xNMnxRrdISU/kLtfUH2wNeQbiv+jhs/CxI8bc= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= @@ -102,49 +96,24 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.28.0 h1:IZzaP1Fv73/T/pBMLk4VutPl36uNC+OSUh3JLG3FIjo= go.uber.org/zap v1.28.0/go.mod h1:rDLpOi171uODNm/mxFcuYWxDsqWSAVkFdX4XojSKg/Q= -go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= -go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8= -golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -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.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4= -golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY= -golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc= -golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -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= +go.yaml.in/yaml/v3 v3.0.5 h1:N6y/pJk8buWs9NY5ERU2HSMfm+IuD/OtfdAnq6kESPw= +go.yaml.in/yaml/v3 v3.0.5/go.mod h1:HVTZu1O7/Vkt2N+BFy8Zza+lnLsABggaTM2ZpNIGuKg= +golang.org/x/net v0.57.0 h1:K5+3DljvIuDG9/Jv9rvyMywYNFCQ9RSUY6OOTTkT+tE= +golang.org/x/net v0.57.0/go.mod h1:KpXc8iv+r3XplLAG/f7Jsf9RPszJzdR0f58q9vGOuEU= +golang.org/x/sync v0.22.0 h1:SZjpbeLmrCk4xhRSZFNZW5gFUeCeFgjekvI/+gfScek= +golang.org/x/sync v0.22.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= +golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs= +golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +golang.org/x/text v0.40.0 h1:Ub2Z6/xjgF1WrYQz2nuITOEegKFtiIy+rieRJ5lHZKs= +golang.org/x/text v0.40.0/go.mod h1:hpnzDAfGV753zIKo+wk3u1bVKCGPbrnF7+7LBF/UHVY= gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4= gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E= -google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa h1:Kjn0N0tCrDgiAFW+lGO4JZ3ck44CehvJQMAwj9QF0G8= -google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:q4lMZS6kskjT5HvCPrnnypcDPVJqT/f4nfxmkE7gryY= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa h1:mZHHdPZl0dbGHCflZgAq/Q468DWVFcU2whhB2KAo8fk= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= -google.golang.org/grpc v1.81.1 h1:VnnIIZ88UzOOKLukQi+ImGz8O1Wdp8nAGGnvOfEIWQQ= -google.golang.org/grpc v1.81.1/go.mod h1:xGH9GfzOyMTGIOXBJmXt+BX/V0kcdQbdcuwQ/zNw42I= +google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea h1:Jifw/kjs/r3B0uszvls/m3c3tmZs2YHGM9C+rvxP9gY= +google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea/go.mod h1:K/+WGbmBY7aNW1HDw1fJnKYo10i0DkAX6pows00dLig= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea h1:kVhQEPTpKQahD5+JSBTfBB19wcgQTTjAIn45MBqnyHk= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= +google.golang.org/grpc v1.83.0 h1:JeNZEKJFbQxArAMl+hiytHauacDNqJUllNfmIMmpqnQ= +google.golang.org/grpc v1.83.0/go.mod h1:kDyl6SKsiHKt0uylY5gtn5cEjkrIOhQOGDgIc4JGwzQ= google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE= google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -155,7 +124,9 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gorm.io/driver/mysql v1.6.0 h1:eNbLmNTpPpTOVZi8MMxCi2aaIm0ZpInbORNXDwyLGvg= gorm.io/driver/mysql v1.6.0/go.mod h1:D/oCC2GWK3M/dqoLxnOlaNKmXz8WNTfcS9y5ovaSqKo= -gorm.io/driver/postgres v1.6.0 h1:2dxzU8xJ+ivvqTRph34QX+WrRaJlmfyPqXmoGVjMBa4= -gorm.io/driver/postgres v1.6.0/go.mod h1:vUw0mrGgrTK+uPHEhAdV4sfFELrByKVGnaVRkXDhtWo= -gorm.io/gorm v1.31.1 h1:7CA8FTFz/gRfgqgpeKIBcervUn3xSyPUmr6B2WXJ7kg= -gorm.io/gorm v1.31.1/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs= +gorm.io/driver/postgres v1.6.2 h1:BvXQ/cNUg63q5TFNg672DmDcowZSFrNLkkA3Xe6GXq4= +gorm.io/driver/postgres v1.6.2/go.mod h1:0c4fQA44XhOklXDkgtuKqysHCycTa5i9e3EIpDGCwXk= +gorm.io/driver/sqlite v1.6.0 h1:WHRRrIiulaPiPFmDcod6prc4l2VGVWHz80KspNsxSfQ= +gorm.io/driver/sqlite v1.6.0/go.mod h1:AO9V1qIQddBESngQUKWL9yoH93HIeA1X6V633rBwyT8= +gorm.io/gorm v1.31.2 h1:3o8FXNo9v9S858gil+3LlZA1LkCOzgb4g5BL64FgaCo= +gorm.io/gorm v1.31.2/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs= diff --git a/apps/social/group/internal/config/config.go b/module/social/group/internal/config/config.go similarity index 100% rename from apps/social/group/internal/config/config.go rename to module/social/group/internal/config/config.go diff --git a/apps/social/group/internal/impl/impl.go b/module/social/group/internal/impl/impl.go similarity index 92% rename from apps/social/group/internal/impl/impl.go rename to module/social/group/internal/impl/impl.go index 40d6598..b4d52e1 100644 --- a/apps/social/group/internal/impl/impl.go +++ b/module/social/group/internal/impl/impl.go @@ -3,7 +3,7 @@ package impl import ( "git.apinb.com/bsm-sdk/core/cache/redis" "git.apinb.com/bsm-sdk/core/with" - "git.apinb.com/bsm-social/group/internal/config" + "bsm/full/module/social/group/internal/config" cache "github.com/patrickmn/go-cache" clientv3 "go.etcd.io/etcd/client/v3" "gorm.io/gorm" diff --git a/apps/social/group/internal/logic/basic/const.go b/module/social/group/internal/logic/basic/const.go similarity index 100% rename from apps/social/group/internal/logic/basic/const.go rename to module/social/group/internal/logic/basic/const.go diff --git a/apps/social/group/internal/logic/basic/create.go b/module/social/group/internal/logic/basic/create.go similarity index 90% rename from apps/social/group/internal/logic/basic/create.go rename to module/social/group/internal/logic/basic/create.go index 3eeded1..a1f8815 100644 --- a/apps/social/group/internal/logic/basic/create.go +++ b/module/social/group/internal/logic/basic/create.go @@ -8,9 +8,9 @@ import ( "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/utils" - "git.apinb.com/bsm-social/group/internal/impl" - "git.apinb.com/bsm-social/group/internal/models" - pb "git.apinb.com/bsm-social/group/pb" + "bsm/full/module/social/group/internal/impl" + "bsm/full/module/social/group/internal/models" + pb "bsm/full/module/social/group/pb" ) // 创建群组 diff --git a/apps/social/group/internal/logic/basic/disband.go b/module/social/group/internal/logic/basic/disband.go similarity index 94% rename from apps/social/group/internal/logic/basic/disband.go rename to module/social/group/internal/logic/basic/disband.go index 4538a4f..9ead1b3 100644 --- a/apps/social/group/internal/logic/basic/disband.go +++ b/module/social/group/internal/logic/basic/disband.go @@ -6,7 +6,7 @@ import ( "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/vars" - pb "git.apinb.com/bsm-social/group/pb" + pb "bsm/full/module/social/group/pb" "time" ) diff --git a/apps/social/group/internal/logic/basic/fetch.go b/module/social/group/internal/logic/basic/fetch.go similarity index 85% rename from apps/social/group/internal/logic/basic/fetch.go rename to module/social/group/internal/logic/basic/fetch.go index 2778e3c..2be736a 100644 --- a/apps/social/group/internal/logic/basic/fetch.go +++ b/module/social/group/internal/logic/basic/fetch.go @@ -6,8 +6,8 @@ import ( "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" - "git.apinb.com/bsm-social/group/internal/models" - pb "git.apinb.com/bsm-social/group/pb" + "bsm/full/module/social/group/internal/models" + pb "bsm/full/module/social/group/pb" ) // 获取群组列表 diff --git a/apps/social/group/internal/logic/basic/get.go b/module/social/group/internal/logic/basic/get.go similarity index 86% rename from apps/social/group/internal/logic/basic/get.go rename to module/social/group/internal/logic/basic/get.go index 4730d8a..091d128 100644 --- a/apps/social/group/internal/logic/basic/get.go +++ b/module/social/group/internal/logic/basic/get.go @@ -6,8 +6,8 @@ import ( "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" - "git.apinb.com/bsm-social/group/internal/impl" - pb "git.apinb.com/bsm-social/group/pb" + "bsm/full/module/social/group/internal/impl" + pb "bsm/full/module/social/group/pb" ) // 获取群组信息 diff --git a/apps/social/group/internal/logic/basic/modify.go b/module/social/group/internal/logic/basic/modify.go similarity index 88% rename from apps/social/group/internal/logic/basic/modify.go rename to module/social/group/internal/logic/basic/modify.go index 81d5899..73d7dbe 100644 --- a/apps/social/group/internal/logic/basic/modify.go +++ b/module/social/group/internal/logic/basic/modify.go @@ -9,9 +9,9 @@ import ( "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/utils" "git.apinb.com/bsm-sdk/core/vars" - "git.apinb.com/bsm-social/group/internal/impl" - "git.apinb.com/bsm-social/group/internal/models" - pb "git.apinb.com/bsm-social/group/pb" + "bsm/full/module/social/group/internal/impl" + "bsm/full/module/social/group/internal/models" + pb "bsm/full/module/social/group/pb" ) // 修改群组信息 diff --git a/apps/social/group/internal/logic/basic/search.go b/module/social/group/internal/logic/basic/search.go similarity index 90% rename from apps/social/group/internal/logic/basic/search.go rename to module/social/group/internal/logic/basic/search.go index 1ecc141..2fb5a66 100644 --- a/apps/social/group/internal/logic/basic/search.go +++ b/module/social/group/internal/logic/basic/search.go @@ -5,7 +5,7 @@ import ( "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/service" - pb "git.apinb.com/bsm-social/group/pb" + pb "bsm/full/module/social/group/pb" ) // 搜索 diff --git a/apps/social/group/internal/logic/member/const.go b/module/social/group/internal/logic/member/const.go similarity index 100% rename from apps/social/group/internal/logic/member/const.go rename to module/social/group/internal/logic/member/const.go diff --git a/apps/social/group/internal/logic/member/do_join.go b/module/social/group/internal/logic/member/do_join.go similarity index 90% rename from apps/social/group/internal/logic/member/do_join.go rename to module/social/group/internal/logic/member/do_join.go index 8f694c1..b44b132 100644 --- a/apps/social/group/internal/logic/member/do_join.go +++ b/module/social/group/internal/logic/member/do_join.go @@ -8,9 +8,9 @@ import ( "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/utils" - "git.apinb.com/bsm-social/group/internal/impl" - "git.apinb.com/bsm-social/group/internal/models" - pb "git.apinb.com/bsm-social/group/pb" + "bsm/full/module/social/group/internal/impl" + "bsm/full/module/social/group/internal/models" + pb "bsm/full/module/social/group/pb" ) // 申请加群 diff --git a/apps/social/group/internal/logic/member/do_kick.go b/module/social/group/internal/logic/member/do_kick.go similarity index 89% rename from apps/social/group/internal/logic/member/do_kick.go rename to module/social/group/internal/logic/member/do_kick.go index ab965a2..c1098db 100644 --- a/apps/social/group/internal/logic/member/do_kick.go +++ b/module/social/group/internal/logic/member/do_kick.go @@ -8,9 +8,9 @@ import ( "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/vars" - "git.apinb.com/bsm-social/group/internal/impl" - "git.apinb.com/bsm-social/group/internal/models" - pb "git.apinb.com/bsm-social/group/pb" + "bsm/full/module/social/group/internal/impl" + "bsm/full/module/social/group/internal/models" + pb "bsm/full/module/social/group/pb" ) // 踢人 diff --git a/apps/social/group/internal/logic/member/do_quit.go b/module/social/group/internal/logic/member/do_quit.go similarity index 88% rename from apps/social/group/internal/logic/member/do_quit.go rename to module/social/group/internal/logic/member/do_quit.go index e4cf826..8c8e070 100644 --- a/apps/social/group/internal/logic/member/do_quit.go +++ b/module/social/group/internal/logic/member/do_quit.go @@ -8,9 +8,9 @@ import ( "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/vars" - "git.apinb.com/bsm-social/group/internal/impl" - "git.apinb.com/bsm-social/group/internal/models" - pb "git.apinb.com/bsm-social/group/pb" + "bsm/full/module/social/group/internal/impl" + "bsm/full/module/social/group/internal/models" + pb "bsm/full/module/social/group/pb" ) // 退群 diff --git a/apps/social/group/internal/logic/member/do_set_manager.go b/module/social/group/internal/logic/member/do_set_manager.go similarity index 89% rename from apps/social/group/internal/logic/member/do_set_manager.go rename to module/social/group/internal/logic/member/do_set_manager.go index 5dd44f6..c954a0b 100644 --- a/apps/social/group/internal/logic/member/do_set_manager.go +++ b/module/social/group/internal/logic/member/do_set_manager.go @@ -9,9 +9,9 @@ import ( "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/vars" - "git.apinb.com/bsm-social/group/internal/impl" - "git.apinb.com/bsm-social/group/internal/models" - pb "git.apinb.com/bsm-social/group/pb" + "bsm/full/module/social/group/internal/impl" + "bsm/full/module/social/group/internal/models" + pb "bsm/full/module/social/group/pb" ) // 设置或取消管理员 diff --git a/apps/social/group/internal/logic/member/fetch.go b/module/social/group/internal/logic/member/fetch.go similarity index 87% rename from apps/social/group/internal/logic/member/fetch.go rename to module/social/group/internal/logic/member/fetch.go index ed7cb83..cc24cc0 100644 --- a/apps/social/group/internal/logic/member/fetch.go +++ b/module/social/group/internal/logic/member/fetch.go @@ -6,8 +6,8 @@ import ( "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" - "git.apinb.com/bsm-social/group/internal/models" - pb "git.apinb.com/bsm-social/group/pb" + "bsm/full/module/social/group/internal/models" + pb "bsm/full/module/social/group/pb" ) // 获取群组成员列表 diff --git a/apps/social/group/internal/logic/member/join_do_handle.go b/module/social/group/internal/logic/member/join_do_handle.go similarity index 92% rename from apps/social/group/internal/logic/member/join_do_handle.go rename to module/social/group/internal/logic/member/join_do_handle.go index 40e86cd..f57c075 100644 --- a/apps/social/group/internal/logic/member/join_do_handle.go +++ b/module/social/group/internal/logic/member/join_do_handle.go @@ -9,9 +9,9 @@ import ( "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/utils" - "git.apinb.com/bsm-social/group/internal/impl" - "git.apinb.com/bsm-social/group/internal/models" - pb "git.apinb.com/bsm-social/group/pb" + "bsm/full/module/social/group/internal/impl" + "bsm/full/module/social/group/internal/models" + pb "bsm/full/module/social/group/pb" ) // 申请加群处理 diff --git a/apps/social/group/internal/logic/member/join_fetch.go b/module/social/group/internal/logic/member/join_fetch.go similarity index 88% rename from apps/social/group/internal/logic/member/join_fetch.go rename to module/social/group/internal/logic/member/join_fetch.go index e9402a8..1cf060f 100644 --- a/apps/social/group/internal/logic/member/join_fetch.go +++ b/module/social/group/internal/logic/member/join_fetch.go @@ -6,9 +6,9 @@ import ( "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" - "git.apinb.com/bsm-social/group/internal/impl" - "git.apinb.com/bsm-social/group/internal/models" - pb "git.apinb.com/bsm-social/group/pb" + "bsm/full/module/social/group/internal/impl" + "bsm/full/module/social/group/internal/models" + pb "bsm/full/module/social/group/pb" ) // 申请加群列表 diff --git a/apps/social/group/internal/models/group_apply.go b/module/social/group/internal/models/group_apply.go similarity index 100% rename from apps/social/group/internal/models/group_apply.go rename to module/social/group/internal/models/group_apply.go diff --git a/apps/social/group/internal/models/group_basic.go b/module/social/group/internal/models/group_basic.go similarity index 100% rename from apps/social/group/internal/models/group_basic.go rename to module/social/group/internal/models/group_basic.go diff --git a/apps/social/group/internal/models/group_member.go b/module/social/group/internal/models/group_member.go similarity index 100% rename from apps/social/group/internal/models/group_member.go rename to module/social/group/internal/models/group_member.go diff --git a/apps/social/group/internal/models/group_res.go b/module/social/group/internal/models/group_res.go similarity index 100% rename from apps/social/group/internal/models/group_res.go rename to module/social/group/internal/models/group_res.go diff --git a/apps/social/group/internal/models/query.go b/module/social/group/internal/models/query.go similarity index 94% rename from apps/social/group/internal/models/query.go rename to module/social/group/internal/models/query.go index 86bcf31..71ef85e 100644 --- a/apps/social/group/internal/models/query.go +++ b/module/social/group/internal/models/query.go @@ -1,8 +1,8 @@ package models import ( - "git.apinb.com/bsm-social/group/internal/impl" - pb "git.apinb.com/bsm-social/group/pb" + "bsm/full/module/social/group/internal/impl" + pb "bsm/full/module/social/group/pb" "gorm.io/gorm" ) diff --git a/apps/social/group/internal/server/basic_server.go b/module/social/group/internal/server/basic_server.go similarity index 91% rename from apps/social/group/internal/server/basic_server.go rename to module/social/group/internal/server/basic_server.go index 61e1844..f73b729 100644 --- a/apps/social/group/internal/server/basic_server.go +++ b/module/social/group/internal/server/basic_server.go @@ -3,8 +3,8 @@ package server import ( "context" - "git.apinb.com/bsm-social/group/internal/logic/basic" - pb "git.apinb.com/bsm-social/group/pb" + "bsm/full/module/social/group/internal/logic/basic" + pb "bsm/full/module/social/group/pb" ) type BasicServer struct { diff --git a/apps/social/group/internal/server/member_server.go b/module/social/group/internal/server/member_server.go similarity index 93% rename from apps/social/group/internal/server/member_server.go rename to module/social/group/internal/server/member_server.go index a86b9b4..0b41012 100644 --- a/apps/social/group/internal/server/member_server.go +++ b/module/social/group/internal/server/member_server.go @@ -3,8 +3,8 @@ package server import ( "context" - "git.apinb.com/bsm-social/group/internal/logic/member" - pb "git.apinb.com/bsm-social/group/pb" + "bsm/full/module/social/group/internal/logic/member" + pb "bsm/full/module/social/group/pb" ) type MemberServer struct { diff --git a/apps/social/group/internal/server/new.go b/module/social/group/internal/server/new.go similarity index 97% rename from apps/social/group/internal/server/new.go rename to module/social/group/internal/server/new.go index 57967b1..b58941e 100644 --- a/apps/social/group/internal/server/new.go +++ b/module/social/group/internal/server/new.go @@ -4,7 +4,7 @@ package server import ( "context" "git.apinb.com/bsm-sdk/core/vars" - pb "git.apinb.com/bsm-social/group/pb" + pb "bsm/full/module/social/group/pb" gwRuntime "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "google.golang.org/grpc" "google.golang.org/grpc/reflection" diff --git a/apps/social/group/pb/blocks.pb.go b/module/social/group/pb/blocks.pb.go similarity index 100% rename from apps/social/group/pb/blocks.pb.go rename to module/social/group/pb/blocks.pb.go diff --git a/apps/social/group/pb/group.pb.go b/module/social/group/pb/group.pb.go similarity index 100% rename from apps/social/group/pb/group.pb.go rename to module/social/group/pb/group.pb.go diff --git a/apps/social/group/pb/group.pb.gw.go b/module/social/group/pb/group.pb.gw.go similarity index 100% rename from apps/social/group/pb/group.pb.gw.go rename to module/social/group/pb/group.pb.gw.go diff --git a/apps/social/group/pb/group_grpc.pb.go b/module/social/group/pb/group_grpc.pb.go similarity index 100% rename from apps/social/group/pb/group_grpc.pb.go rename to module/social/group/pb/group_grpc.pb.go diff --git a/apps/social/group/pb/member.pb.go b/module/social/group/pb/member.pb.go similarity index 100% rename from apps/social/group/pb/member.pb.go rename to module/social/group/pb/member.pb.go diff --git a/apps/social/group/pb/member.pb.gw.go b/module/social/group/pb/member.pb.gw.go similarity index 100% rename from apps/social/group/pb/member.pb.gw.go rename to module/social/group/pb/member.pb.gw.go diff --git a/apps/social/group/pb/member_grpc.pb.go b/module/social/group/pb/member_grpc.pb.go similarity index 100% rename from apps/social/group/pb/member_grpc.pb.go rename to module/social/group/pb/member_grpc.pb.go diff --git a/apps/social/group/proto/blocks.proto b/module/social/group/proto/blocks.proto similarity index 100% rename from apps/social/group/proto/blocks.proto rename to module/social/group/proto/blocks.proto diff --git a/apps/social/group/proto/group.proto b/module/social/group/proto/group.proto similarity index 100% rename from apps/social/group/proto/group.proto rename to module/social/group/proto/group.proto diff --git a/apps/social/group/proto/member.proto b/module/social/group/proto/member.proto similarity index 100% rename from apps/social/group/proto/member.proto rename to module/social/group/proto/member.proto diff --git a/apps/social/group/scripts/filebeat.yaml b/module/social/group/scripts/filebeat.yaml similarity index 100% rename from apps/social/group/scripts/filebeat.yaml rename to module/social/group/scripts/filebeat.yaml diff --git a/apps/social/group/scripts/lint.sh b/module/social/group/scripts/lint.sh similarity index 100% rename from apps/social/group/scripts/lint.sh rename to module/social/group/scripts/lint.sh diff --git a/apps/social/group/swagger/passport.swagger.json b/module/social/group/swagger/passport.swagger.json similarity index 100% rename from apps/social/group/swagger/passport.swagger.json rename to module/social/group/swagger/passport.swagger.json diff --git a/apps/social/relation/README.md b/module/social/relation/README.md similarity index 100% rename from apps/social/relation/README.md rename to module/social/relation/README.md diff --git a/apps/social/relation/cmd/cli/main.go b/module/social/relation/cmd/cli/main.go similarity index 67% rename from apps/social/relation/cmd/cli/main.go rename to module/social/relation/cmd/cli/main.go index 3e58d0a..5217d95 100644 --- a/apps/social/relation/cmd/cli/main.go +++ b/module/social/relation/cmd/cli/main.go @@ -3,7 +3,7 @@ package main import ( "fmt" - "git.apinb.com/bsm-social/relation/internal/config" + "bsm/full/module/social/relation/internal/config" ) func main() { diff --git a/apps/social/relation/cmd/main/main.go b/module/social/relation/cmd/main/main.go similarity index 79% rename from apps/social/relation/cmd/main/main.go rename to module/social/relation/cmd/main/main.go index ef953a7..b1e0bb8 100644 --- a/apps/social/relation/cmd/main/main.go +++ b/module/social/relation/cmd/main/main.go @@ -5,17 +5,17 @@ package main import ( + "bsm/full/module/social/relation/internal/config" + "bsm/full/module/social/relation/internal/impl" + "bsm/full/module/social/relation/internal/server" "git.apinb.com/bsm-sdk/core/service" - "git.apinb.com/bsm-social/relation/internal/config" - "git.apinb.com/bsm-social/relation/internal/impl" - "git.apinb.com/bsm-social/relation/internal/server" ) var ( ServiceKey = "relation" ) -func main() { +func Run() { config.New(ServiceKey) impl.NewImpl() @@ -42,3 +42,7 @@ func main() { // 启动服务 srv.Start() } + +func main() { + Run() +} diff --git a/apps/social/relation/etc/relation_dev.yaml b/module/social/relation/etc/relation_dev.yaml similarity index 100% rename from apps/social/relation/etc/relation_dev.yaml rename to module/social/relation/etc/relation_dev.yaml diff --git a/apps/social/relation/etc/relation_prod.yaml b/module/social/relation/etc/relation_prod.yaml similarity index 100% rename from apps/social/relation/etc/relation_prod.yaml rename to module/social/relation/etc/relation_prod.yaml diff --git a/apps/social/relation/etc/relation_test.yaml b/module/social/relation/etc/relation_test.yaml similarity index 100% rename from apps/social/relation/etc/relation_test.yaml rename to module/social/relation/etc/relation_test.yaml diff --git a/apps/social/relation/etc/supervisor.bsm-social-relation.conf b/module/social/relation/etc/supervisor.bsm-social-relation.conf similarity index 100% rename from apps/social/relation/etc/supervisor.bsm-social-relation.conf rename to module/social/relation/etc/supervisor.bsm-social-relation.conf diff --git a/module/social/relation/go.mod b/module/social/relation/go.mod new file mode 100644 index 0000000..677b42d --- /dev/null +++ b/module/social/relation/go.mod @@ -0,0 +1,68 @@ +module bsm/full/module/social/relation + +go 1.26.5 + +tool ( + git.apinb.com/bsm-tools/protoc-gen-markdown + git.apinb.com/bsm-tools/protoc-gen-slc + git.apinb.com/bsm-tools/protoc-gen-ts + github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway + github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2 + github.com/pepabo/protoc-gen-go-client + google.golang.org/grpc/cmd/protoc-gen-go-grpc + google.golang.org/protobuf/cmd/protoc-gen-go +) + +require ( + git.apinb.com/bsm-sdk/core v0.2.0 + github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0 + github.com/patrickmn/go-cache v2.1.0+incompatible + go.etcd.io/etcd/client/v3 v3.7.1 + google.golang.org/grpc v1.83.0 + google.golang.org/protobuf v1.36.11 + gorm.io/gorm v1.31.2 +) + +require ( + filippo.io/edwards25519 v1.2.0 // indirect + git.apinb.com/bsm-tools/protoc-gen-markdown v0.0.0-20250907131213-6c1694ce6bcb // indirect + git.apinb.com/bsm-tools/protoc-gen-slc v0.0.13 // indirect + git.apinb.com/bsm-tools/protoc-gen-ts v0.0.2 // indirect + github.com/cespare/xxhash/v2 v2.3.0 // indirect + github.com/coreos/go-semver v0.3.1 // indirect + github.com/coreos/go-systemd/v22 v22.7.0 // indirect + github.com/ditashi/jsbeautifier-go v0.0.0-20141206144643-2520a8026a9c // indirect + github.com/go-sql-driver/mysql v1.10.0 // indirect + github.com/golang-jwt/jwt/v5 v5.3.1 // indirect + github.com/golang/protobuf v1.5.4 // indirect + github.com/google/uuid v1.6.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.10.0 // indirect + github.com/jackc/puddle/v2 v2.2.2 // indirect + github.com/jinzhu/inflection v1.0.0 // indirect + github.com/jinzhu/now v1.1.5 // indirect + github.com/oklog/ulid/v2 v2.1.2 // indirect + github.com/pepabo/protoc-gen-go-client v0.3.0 // indirect + github.com/redis/go-redis/v9 v9.22.0 // indirect + github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e // indirect + go.etcd.io/etcd/api/v3 v3.7.1 // indirect + go.etcd.io/etcd/client/pkg/v3 v3.7.1 // indirect + go.uber.org/atomic v1.11.0 // indirect + go.uber.org/multierr v1.11.0 // indirect + go.uber.org/zap v1.28.0 // indirect + go.yaml.in/yaml/v3 v3.0.5 // indirect + golang.org/x/mod v0.37.0 // indirect + golang.org/x/net v0.57.0 // indirect + golang.org/x/sync v0.22.0 // indirect + golang.org/x/sys v0.47.0 // indirect + golang.org/x/text v0.40.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea // indirect + google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.2 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect + gorm.io/driver/mysql v1.6.0 // indirect + gorm.io/driver/postgres v1.6.2 // indirect +) + +replace git.apinb.com/bsm-sdk/core => D:/work/bsm-sdk/core diff --git a/apps/base/passport/go.sum b/module/social/relation/go.sum similarity index 53% rename from apps/base/passport/go.sum rename to module/social/relation/go.sum index 7595588..09a9a51 100644 --- a/apps/base/passport/go.sum +++ b/module/social/relation/go.sum @@ -1,7 +1,5 @@ filippo.io/edwards25519 v1.2.0 h1:crnVqOiS4jqYleHd9vaKZ+HKtHfllngJIiOpNpoJsjo= filippo.io/edwards25519 v1.2.0/go.mod h1:xzAOLCNug/yB62zG1bQ8uziwrIqIuxhctzJT18Q77mc= -git.apinb.com/bsm-sdk/core v0.2.0 h1:/e9yqpsbKBrRgMiGpS3KX2O4qDLxo5V5GpPSLNGxEKw= -git.apinb.com/bsm-sdk/core v0.2.0/go.mod h1:E9T6Eboo/0Zb36BjkKbIgvFzq4fQ2Q8P/7y5zmYTI6Y= git.apinb.com/bsm-tools/protoc-gen-markdown v0.0.0-20250907131213-6c1694ce6bcb h1:GoXhkGzI5vZ9JMXCVsSRw/AGsJY0tM2aEv76YaUg2wM= git.apinb.com/bsm-tools/protoc-gen-markdown v0.0.0-20250907131213-6c1694ce6bcb/go.mod h1:l+84zWPM4F40Ppar+jLapgjRNt6XWDsr+l0vN4Jjlm4= git.apinb.com/bsm-tools/protoc-gen-slc v0.0.13 h1:RGg2R2kHz6IAD7scH6So2FlZYctFUDxqWR8i/+fMfOU= @@ -23,14 +21,12 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/ditashi/jsbeautifier-go v0.0.0-20141206144643-2520a8026a9c h1:+Zo5Ca9GH0RoeVZQKzFJcTLoAixx5s5Gq3pTIS+n354= github.com/ditashi/jsbeautifier-go v0.0.0-20141206144643-2520a8026a9c/go.mod h1:HJGU9ULdREjOcVGZVPB5s6zYmHi1RxzT71l2wQyLmnE= -github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= -github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.4 h1:tG4xh9yMsRCAiodLVTxyrkzSZ9+o0L1Kg/+cPVcbP/8= +github.com/go-logr/logr v1.4.4/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-sql-driver/mysql v1.10.0 h1:Q+1LV8DkHJvSYAdR83XzuhDaTykuDx0l6fkXxoWCWfw= github.com/go-sql-driver/mysql v1.10.0/go.mod h1:M+cqaI7+xxXGG9swrdeUIoPG3Y3KCkF0pZej+SK+nWk= -github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= -github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt/v5 v5.3.1 h1:kYf81DTWFe7t+1VvL7eS+jKFVWaUnK9cB1qbwn63YCY= github.com/golang-jwt/jwt/v5 v5.3.1/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= @@ -39,8 +35,8 @@ github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= 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/grpc-ecosystem/grpc-gateway/v2 v2.29.0 h1:5VipnvEpbqr2gA2VbM+nYVbkIF28c5ZQfqCBQ5g2xfk= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0/go.mod h1:Hyl3n6Twe1hvtd9XUXDec4pTvgMSEixRuQKPTMH2bNs= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0 h1:/Tnpcb2E0Pz/tN9s3bfEY2Q8ePCEX9iuS+cneUwncnw= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0/go.mod h1:zOBXOsUaBSjKgmH4OGzV1esUpR3oUSCPYVd2cUBjKYY= 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= @@ -53,16 +49,16 @@ github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= -github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= -github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y= -github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0= +github.com/klauspost/cpuid/v2 v2.4.0 h1:S6Hrbc7+ywsr0r+RLapfGBHfyefhCTwEh3A0tV913Dw= +github.com/klauspost/cpuid/v2 v2.4.0/go.mod h1:19jmZ9mjzoF//ddRSUsv0zfBTJWh3QJh9FNxZTMrGxU= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/oklog/ulid/v2 v2.1.1 h1:suPZ4ARWLOJLegGFiZZ1dFAkqzhMjL3J1TzI+5wHz8s= -github.com/oklog/ulid/v2 v2.1.1/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ= +github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= +github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= +github.com/oklog/ulid/v2 v2.1.2 h1:IEclFb9JNvzYA6MW2SCxbLzcHTVsfqm3PrqGQJH5zec= +github.com/oklog/ulid/v2 v2.1.2/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ= github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc= github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ= github.com/pborman/getopt v0.0.0-20170112200414-7148bc3a4c30/go.mod h1:85jBQOZwpVEaDAr341tbn15RS4fCAsIst0qp7i8ex1o= @@ -71,8 +67,8 @@ github.com/pepabo/protoc-gen-go-client v0.3.0/go.mod h1:NvHW7/gsmZUK2UxafqzUzWD8 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/redis/go-redis/v9 v9.20.0 h1:WnQYxLkgO2xiXTCJY0ldIiI8dNqCDlQAG+AtaH7a2a0= -github.com/redis/go-redis/v9 v9.20.0/go.mod h1:v/M13XI1PVCDcm01VtPFOADfZtHf8YW3baQf57KlIkA= +github.com/redis/go-redis/v9 v9.22.0 h1:laDvpYXTJtZLloinw1fA5Kqd6HAEH2XKxOkG/PDq2F0= +github.com/redis/go-redis/v9 v9.22.0/go.mod h1:y2g0Wj8rQvuK0ELM+oxSudcLtC09JScs98I/X9gRWY4= github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e h1:MRM5ITcdelLK2j1vwZ3Je0FKVCfqOLp5zO6trqMLYs0= @@ -82,28 +78,26 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= -github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/zeebo/xxh3 v1.1.0 h1:s7DLGDK45Dyfg7++yxI0khrfwq9661w9EN78eP/UZVs= github.com/zeebo/xxh3 v1.1.0/go.mod h1:IisAie1LELR4xhVinxWS5+zf1lA4p0MW4T+w+W07F5s= -go.etcd.io/etcd/api/v3 v3.6.12 h1:OLOZUKEuAA36TR48F0cIaa8FdzrWygjyfrJxXg4iDgs= -go.etcd.io/etcd/api/v3 v3.6.12/go.mod h1:p14EIQXHbuOQbVvL/WEes5uqKnxP9AgKJgpjbMVvzvE= -go.etcd.io/etcd/client/pkg/v3 v3.6.12 h1:36zzB+pQOdHbhN+kH2iJz/K8bJn0ZLtLfPPO7jozTDo= -go.etcd.io/etcd/client/pkg/v3 v3.6.12/go.mod h1:hh2+ZXtfLzs3o6mn92ntgNPBrTJJOvXqICM5g3L3DMY= -go.etcd.io/etcd/client/v3 v3.6.12 h1:kMSP6JcPZMqSJiX+TXdUIBU/4eXEZWBAaui4VihMbIc= -go.etcd.io/etcd/client/v3 v3.6.12/go.mod h1:CMs6fJWYiZQk4ytFjd4lE1diOvvRMmtbbn/alZXd3dQ= +go.etcd.io/etcd/api/v3 v3.7.1 h1:KJG0/DcWGfe3Y1otDf/fsBf0TSSgpxZ5RO/L8SFt73E= +go.etcd.io/etcd/api/v3 v3.7.1/go.mod h1:8bXIpCMeV7E3/XL0Ix123ATn3dB+0V7d9zklHbB0m78= +go.etcd.io/etcd/client/pkg/v3 v3.7.1 h1:rKYsj3pRkR0eK3yjT3XOgrhqfmIfj9pzNgxjh7mfFv4= +go.etcd.io/etcd/client/pkg/v3 v3.7.1/go.mod h1:cnzZGIUzSfjEwLC6UBVsSXlEK1eepS/JUD7wE6PLRT0= +go.etcd.io/etcd/client/v3 v3.7.1 h1:0PEMMC0KuZmVIN+RAbdqfkZ45pYTgKVtmBEbRCvZFUg= +go.etcd.io/etcd/client/v3 v3.7.1/go.mod h1:ffNqALa8tRCYhYo1F9oR489y23K39Gz+BSR3ApAGYq0= go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64= go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y= -go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I= -go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0= -go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM= -go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY= -go.opentelemetry.io/otel/sdk v1.43.0 h1:pi5mE86i5rTeLXqoF/hhiBtUNcrAGHLKQdhg4h4V9Dg= -go.opentelemetry.io/otel/sdk v1.43.0/go.mod h1:P+IkVU3iWukmiit/Yf9AWvpyRDlUeBaRg6Y+C58QHzg= -go.opentelemetry.io/otel/sdk/metric v1.43.0 h1:S88dyqXjJkuBNLeMcVPRFXpRw2fuwdvfCGLEo89fDkw= -go.opentelemetry.io/otel/sdk/metric v1.43.0/go.mod h1:C/RJtwSEJ5hzTiUz5pXF1kILHStzb9zFlIEe85bhj6A= -go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A= -go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0= +go.opentelemetry.io/otel v1.45.0 h1:pdrWmLHofpubmArBv1LgFSv1Z0Ie/ppdZzu+kUN5EeU= +go.opentelemetry.io/otel v1.45.0/go.mod h1:XZxIqPapzEYnhNSScF5DIqXhm/rYi0FzCe2XddAwZfQ= +go.opentelemetry.io/otel/metric v1.45.0 h1:7Eg1uH7CJ5cXv9is6tnBe1FI6rj1nwUdbFypRm3br/M= +go.opentelemetry.io/otel/metric v1.45.0/go.mod h1:HAPbm1nd3p1PmFH7v2dR+6BjXxw+Lq4a2+pndMAm08s= +go.opentelemetry.io/otel/sdk v1.45.0 h1:4VVSMgQ83dUgW2aoX5f6JgLvHwIvzcuLnF9lUdCSpCw= +go.opentelemetry.io/otel/sdk v1.45.0/go.mod h1:Sr40LgXV7DsKMMJMKOhUWOgMWTfAaqvm2kF0g7ilwuA= +go.opentelemetry.io/otel/sdk/metric v1.44.0 h1:3LlKgI+VjbVsjNRFZJZAJ30WjXC5VkNRks6si09iEfI= +go.opentelemetry.io/otel/sdk/metric v1.44.0/go.mod h1:5B5pMARnXxKhltooO4xUuCBorl65a4EpnTalObqOigA= +go.opentelemetry.io/otel/trace v1.45.0 h1:l/mP6Uv7oNO7/TblbhpbgMidxhq1uO/rPsikOyVhxag= +go.opentelemetry.io/otel/trace v1.45.0/go.mod h1:qoJJA2xNMnxRrdISU/kLtfUH2wNeQbiv+jhs/CxI8bc= go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE= go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= @@ -112,53 +106,26 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.28.0 h1:IZzaP1Fv73/T/pBMLk4VutPl36uNC+OSUh3JLG3FIjo= go.uber.org/zap v1.28.0/go.mod h1:rDLpOi171uODNm/mxFcuYWxDsqWSAVkFdX4XojSKg/Q= -go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= -go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.52.0 h1:RMs7fP2rXdep0CftQlK8Uf+kibLm7qkCcradZWYz988= -golang.org/x/crypto v0.52.0/go.mod h1:1QgfPxDqh0T2M/elOJtp9RvuR95kVjir0e6/BvEmGbc= -golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.36.0 h1:JJjpVx6myfUsUdAzZuOSTTmRE0PfZeNWzzvKrP7amb4= -golang.org/x/mod v0.36.0/go.mod h1:moc6ELqsWcOw5Ef3xVprK5ul/MvtVvkIXLziUOICjUQ= -golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8= -golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -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.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4= -golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY= -golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.37.0 h1:Cqjiwd9eSg8e0QAkyCaQTNHFIIzWtidPahFWR83rTrc= -golang.org/x/text v0.37.0/go.mod h1:a5sjxXGs9hsn/AJVwuElvCAo9v8QYLzvavO5z2PiM38= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -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= +go.yaml.in/yaml/v3 v3.0.5 h1:N6y/pJk8buWs9NY5ERU2HSMfm+IuD/OtfdAnq6kESPw= +go.yaml.in/yaml/v3 v3.0.5/go.mod h1:HVTZu1O7/Vkt2N+BFy8Zza+lnLsABggaTM2ZpNIGuKg= +golang.org/x/mod v0.37.0 h1:vF1DjpVEshcIqoEaauuHebaLk1O1forxjxBaVn884JQ= +golang.org/x/mod v0.37.0/go.mod h1:m8S8VeM9r4dzDwjrKO0a1sZP3YjeMamRRlD+fmR2Q/0= +golang.org/x/net v0.57.0 h1:K5+3DljvIuDG9/Jv9rvyMywYNFCQ9RSUY6OOTTkT+tE= +golang.org/x/net v0.57.0/go.mod h1:KpXc8iv+r3XplLAG/f7Jsf9RPszJzdR0f58q9vGOuEU= +golang.org/x/sync v0.22.0 h1:SZjpbeLmrCk4xhRSZFNZW5gFUeCeFgjekvI/+gfScek= +golang.org/x/sync v0.22.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= +golang.org/x/sys v0.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs= +golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= +golang.org/x/text v0.40.0 h1:Ub2Z6/xjgF1WrYQz2nuITOEegKFtiIy+rieRJ5lHZKs= +golang.org/x/text v0.40.0/go.mod h1:hpnzDAfGV753zIKo+wk3u1bVKCGPbrnF7+7LBF/UHVY= gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4= gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E= -google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa h1:Kjn0N0tCrDgiAFW+lGO4JZ3ck44CehvJQMAwj9QF0G8= -google.golang.org/genproto/googleapis/api v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:q4lMZS6kskjT5HvCPrnnypcDPVJqT/f4nfxmkE7gryY= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa h1:mZHHdPZl0dbGHCflZgAq/Q468DWVFcU2whhB2KAo8fk= -google.golang.org/genproto/googleapis/rpc v0.0.0-20260526163538-3dc84a4a5aaa/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= -google.golang.org/grpc v1.81.1 h1:VnnIIZ88UzOOKLukQi+ImGz8O1Wdp8nAGGnvOfEIWQQ= -google.golang.org/grpc v1.81.1/go.mod h1:xGH9GfzOyMTGIOXBJmXt+BX/V0kcdQbdcuwQ/zNw42I= +google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea h1:Jifw/kjs/r3B0uszvls/m3c3tmZs2YHGM9C+rvxP9gY= +google.golang.org/genproto/googleapis/api v0.0.0-20260807164820-c8921c73eeea/go.mod h1:K/+WGbmBY7aNW1HDw1fJnKYo10i0DkAX6pows00dLig= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea h1:kVhQEPTpKQahD5+JSBTfBB19wcgQTTjAIn45MBqnyHk= +google.golang.org/genproto/googleapis/rpc v0.0.0-20260807164820-c8921c73eeea/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8= +google.golang.org/grpc v1.83.0 h1:JeNZEKJFbQxArAMl+hiytHauacDNqJUllNfmIMmpqnQ= +google.golang.org/grpc v1.83.0/go.mod h1:kDyl6SKsiHKt0uylY5gtn5cEjkrIOhQOGDgIc4JGwzQ= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.2 h1:rgSNvqscFZ1JgV/4wH5GOsZFSFkR2Eua9As3KIr2LlM= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.2/go.mod h1:iMEtFwDlAhjDU9L5mY6U1XLwlIId/G3h+QcBHDIvrJ8= google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE= @@ -171,9 +138,11 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gorm.io/driver/mysql v1.6.0 h1:eNbLmNTpPpTOVZi8MMxCi2aaIm0ZpInbORNXDwyLGvg= gorm.io/driver/mysql v1.6.0/go.mod h1:D/oCC2GWK3M/dqoLxnOlaNKmXz8WNTfcS9y5ovaSqKo= -gorm.io/driver/postgres v1.6.0 h1:2dxzU8xJ+ivvqTRph34QX+WrRaJlmfyPqXmoGVjMBa4= -gorm.io/driver/postgres v1.6.0/go.mod h1:vUw0mrGgrTK+uPHEhAdV4sfFELrByKVGnaVRkXDhtWo= -gorm.io/gorm v1.31.1 h1:7CA8FTFz/gRfgqgpeKIBcervUn3xSyPUmr6B2WXJ7kg= -gorm.io/gorm v1.31.1/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs= +gorm.io/driver/postgres v1.6.2 h1:BvXQ/cNUg63q5TFNg672DmDcowZSFrNLkkA3Xe6GXq4= +gorm.io/driver/postgres v1.6.2/go.mod h1:0c4fQA44XhOklXDkgtuKqysHCycTa5i9e3EIpDGCwXk= +gorm.io/driver/sqlite v1.6.0 h1:WHRRrIiulaPiPFmDcod6prc4l2VGVWHz80KspNsxSfQ= +gorm.io/driver/sqlite v1.6.0/go.mod h1:AO9V1qIQddBESngQUKWL9yoH93HIeA1X6V633rBwyT8= +gorm.io/gorm v1.31.2 h1:3o8FXNo9v9S858gil+3LlZA1LkCOzgb4g5BL64FgaCo= +gorm.io/gorm v1.31.2/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs= gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU= gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU= diff --git a/apps/social/relation/internal/config/config.go b/module/social/relation/internal/config/config.go similarity index 100% rename from apps/social/relation/internal/config/config.go rename to module/social/relation/internal/config/config.go diff --git a/module/social/relation/internal/impl/impl.go b/module/social/relation/internal/impl/impl.go new file mode 100644 index 0000000..1846df5 --- /dev/null +++ b/module/social/relation/internal/impl/impl.go @@ -0,0 +1,25 @@ +package impl + +import ( + "git.apinb.com/bsm-sdk/core/cache/redis" + "git.apinb.com/bsm-sdk/core/with" + "bsm/full/module/social/relation/internal/config" + cache "github.com/patrickmn/go-cache" + clientv3 "go.etcd.io/etcd/client/v3" + "gorm.io/gorm" +) + +var ( + RedisService *redis.RedisClient + EtcdService *clientv3.Client + DBService *gorm.DB + MemorySerice *cache.Cache +) + +func NewImpl() { + // with activating + MemorySerice = with.Memory(nil) + RedisService = with.RedisCache(config.Spec.Cache) // redis cache + DBService = with.Databases(config.Spec.Databases, nil) // model + EtcdService = with.Etcd(config.Spec.Etcd) // etcd +} diff --git a/apps/social/relation/internal/logic/common/const.go b/module/social/relation/internal/logic/common/const.go similarity index 97% rename from apps/social/relation/internal/logic/common/const.go rename to module/social/relation/internal/logic/common/const.go index f327bbf..0194845 100644 --- a/apps/social/relation/internal/logic/common/const.go +++ b/module/social/relation/internal/logic/common/const.go @@ -6,9 +6,9 @@ import ( "hash/crc64" "sort" - "git.apinb.com/bsm-social/relation/internal/impl" - "git.apinb.com/bsm-social/relation/internal/models" - pb "git.apinb.com/bsm-social/relation/pb" + "bsm/full/module/social/relation/internal/impl" + "bsm/full/module/social/relation/internal/models" + pb "bsm/full/module/social/relation/pb" ) var ( diff --git a/apps/social/relation/internal/logic/follow/do.go b/module/social/relation/internal/logic/follow/do.go similarity index 93% rename from apps/social/relation/internal/logic/follow/do.go rename to module/social/relation/internal/logic/follow/do.go index 21c0757..bd602b0 100644 --- a/apps/social/relation/internal/logic/follow/do.go +++ b/module/social/relation/internal/logic/follow/do.go @@ -6,7 +6,7 @@ import ( "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/vars" - pb "git.apinb.com/bsm-social/relation/pb" + pb "bsm/full/module/social/relation/pb" "time" ) diff --git a/apps/social/relation/internal/logic/follow/doing.go b/module/social/relation/internal/logic/follow/doing.go similarity index 84% rename from apps/social/relation/internal/logic/follow/doing.go rename to module/social/relation/internal/logic/follow/doing.go index f843ce7..8f81aef 100644 --- a/apps/social/relation/internal/logic/follow/doing.go +++ b/module/social/relation/internal/logic/follow/doing.go @@ -9,9 +9,9 @@ import ( "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/utils" "git.apinb.com/bsm-sdk/core/vars" - "git.apinb.com/bsm-social/relation/internal/impl" - "git.apinb.com/bsm-social/relation/internal/models" - pb "git.apinb.com/bsm-social/relation/pb" + "bsm/full/module/social/relation/internal/impl" + "bsm/full/module/social/relation/internal/models" + pb "bsm/full/module/social/relation/pb" ) // 执行关注 diff --git a/apps/social/relation/internal/logic/follow/fetch.go b/module/social/relation/internal/logic/follow/fetch.go similarity index 86% rename from apps/social/relation/internal/logic/follow/fetch.go rename to module/social/relation/internal/logic/follow/fetch.go index d6a1c04..a24974a 100644 --- a/apps/social/relation/internal/logic/follow/fetch.go +++ b/module/social/relation/internal/logic/follow/fetch.go @@ -7,10 +7,10 @@ import ( "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" - "git.apinb.com/bsm-social/relation/internal/impl" - common "git.apinb.com/bsm-social/relation/internal/logic/common" - "git.apinb.com/bsm-social/relation/internal/models" - pb "git.apinb.com/bsm-social/relation/pb" + "bsm/full/module/social/relation/internal/impl" + common "bsm/full/module/social/relation/internal/logic/common" + "bsm/full/module/social/relation/internal/models" + pb "bsm/full/module/social/relation/pb" ) // 获取关注列表 diff --git a/apps/social/relation/internal/logic/follow/state.go b/module/social/relation/internal/logic/follow/state.go similarity index 86% rename from apps/social/relation/internal/logic/follow/state.go rename to module/social/relation/internal/logic/follow/state.go index 079618b..722c33b 100644 --- a/apps/social/relation/internal/logic/follow/state.go +++ b/module/social/relation/internal/logic/follow/state.go @@ -8,9 +8,9 @@ import ( "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/vars" - "git.apinb.com/bsm-social/relation/internal/impl" - "git.apinb.com/bsm-social/relation/internal/models" - pb "git.apinb.com/bsm-social/relation/pb" + "bsm/full/module/social/relation/internal/impl" + "bsm/full/module/social/relation/internal/models" + pb "bsm/full/module/social/relation/pb" "gorm.io/gorm" ) diff --git a/apps/social/relation/internal/logic/follow/undo.go b/module/social/relation/internal/logic/follow/undo.go similarity index 82% rename from apps/social/relation/internal/logic/follow/undo.go rename to module/social/relation/internal/logic/follow/undo.go index 44386a4..9203815 100644 --- a/apps/social/relation/internal/logic/follow/undo.go +++ b/module/social/relation/internal/logic/follow/undo.go @@ -8,9 +8,9 @@ import ( "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/vars" - "git.apinb.com/bsm-social/relation/internal/impl" - "git.apinb.com/bsm-social/relation/internal/models" - pb "git.apinb.com/bsm-social/relation/pb" + "bsm/full/module/social/relation/internal/impl" + "bsm/full/module/social/relation/internal/models" + pb "bsm/full/module/social/relation/pb" ) // 撤销关注 diff --git a/apps/social/relation/internal/logic/friend/apply_do.go b/module/social/relation/internal/logic/friend/apply_do.go similarity index 91% rename from apps/social/relation/internal/logic/friend/apply_do.go rename to module/social/relation/internal/logic/friend/apply_do.go index e173a06..4560520 100644 --- a/apps/social/relation/internal/logic/friend/apply_do.go +++ b/module/social/relation/internal/logic/friend/apply_do.go @@ -9,9 +9,9 @@ import ( "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/utils" "git.apinb.com/bsm-sdk/core/vars" - "git.apinb.com/bsm-social/relation/internal/impl" - "git.apinb.com/bsm-social/relation/internal/models" - pb "git.apinb.com/bsm-social/relation/pb" + "bsm/full/module/social/relation/internal/impl" + "bsm/full/module/social/relation/internal/models" + pb "bsm/full/module/social/relation/pb" ) // 好友申请 diff --git a/apps/social/relation/internal/logic/friend/apply_do_message.go b/module/social/relation/internal/logic/friend/apply_do_message.go similarity index 88% rename from apps/social/relation/internal/logic/friend/apply_do_message.go rename to module/social/relation/internal/logic/friend/apply_do_message.go index e14b916..4b216ce 100644 --- a/apps/social/relation/internal/logic/friend/apply_do_message.go +++ b/module/social/relation/internal/logic/friend/apply_do_message.go @@ -8,9 +8,9 @@ import ( "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/vars" - "git.apinb.com/bsm-social/relation/internal/impl" - "git.apinb.com/bsm-social/relation/internal/models" - pb "git.apinb.com/bsm-social/relation/pb" + "bsm/full/module/social/relation/internal/impl" + "bsm/full/module/social/relation/internal/models" + pb "bsm/full/module/social/relation/pb" ) // 好友申请Do:留言 diff --git a/apps/social/relation/internal/logic/friend/apply_do_pass.go b/module/social/relation/internal/logic/friend/apply_do_pass.go similarity index 87% rename from apps/social/relation/internal/logic/friend/apply_do_pass.go rename to module/social/relation/internal/logic/friend/apply_do_pass.go index 8a7c9c6..884e981 100644 --- a/apps/social/relation/internal/logic/friend/apply_do_pass.go +++ b/module/social/relation/internal/logic/friend/apply_do_pass.go @@ -9,10 +9,10 @@ import ( "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/utils" "git.apinb.com/bsm-sdk/core/vars" - "git.apinb.com/bsm-social/relation/internal/impl" - "git.apinb.com/bsm-social/relation/internal/logic/common" - "git.apinb.com/bsm-social/relation/internal/models" - pb "git.apinb.com/bsm-social/relation/pb" + "bsm/full/module/social/relation/internal/impl" + "bsm/full/module/social/relation/internal/logic/common" + "bsm/full/module/social/relation/internal/models" + pb "bsm/full/module/social/relation/pb" ) // 好友申请Do:确认 diff --git a/apps/social/relation/internal/logic/friend/apply_do_reject.go b/module/social/relation/internal/logic/friend/apply_do_reject.go similarity index 85% rename from apps/social/relation/internal/logic/friend/apply_do_reject.go rename to module/social/relation/internal/logic/friend/apply_do_reject.go index f02bf70..98120b8 100644 --- a/apps/social/relation/internal/logic/friend/apply_do_reject.go +++ b/module/social/relation/internal/logic/friend/apply_do_reject.go @@ -8,9 +8,9 @@ import ( "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/vars" - "git.apinb.com/bsm-social/relation/internal/impl" - "git.apinb.com/bsm-social/relation/internal/models" - pb "git.apinb.com/bsm-social/relation/pb" + "bsm/full/module/social/relation/internal/impl" + "bsm/full/module/social/relation/internal/models" + pb "bsm/full/module/social/relation/pb" ) // 好友申请Do:拒绝 diff --git a/apps/social/relation/internal/logic/friend/apply_fetch.go b/module/social/relation/internal/logic/friend/apply_fetch.go similarity index 91% rename from apps/social/relation/internal/logic/friend/apply_fetch.go rename to module/social/relation/internal/logic/friend/apply_fetch.go index acfe4ae..a7129ff 100644 --- a/apps/social/relation/internal/logic/friend/apply_fetch.go +++ b/module/social/relation/internal/logic/friend/apply_fetch.go @@ -6,8 +6,8 @@ import ( "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" - "git.apinb.com/bsm-social/relation/internal/logic/common" - pb "git.apinb.com/bsm-social/relation/pb" + "bsm/full/module/social/relation/internal/logic/common" + pb "bsm/full/module/social/relation/pb" ) // 好友申请列表 diff --git a/apps/social/relation/internal/logic/friend/apply_get.go b/module/social/relation/internal/logic/friend/apply_get.go similarity index 82% rename from apps/social/relation/internal/logic/friend/apply_get.go rename to module/social/relation/internal/logic/friend/apply_get.go index d463e94..b446c3d 100644 --- a/apps/social/relation/internal/logic/friend/apply_get.go +++ b/module/social/relation/internal/logic/friend/apply_get.go @@ -6,10 +6,10 @@ import ( "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" - "git.apinb.com/bsm-social/relation/internal/impl" - "git.apinb.com/bsm-social/relation/internal/logic/common" - "git.apinb.com/bsm-social/relation/internal/models" - pb "git.apinb.com/bsm-social/relation/pb" + "bsm/full/module/social/relation/internal/impl" + "bsm/full/module/social/relation/internal/logic/common" + "bsm/full/module/social/relation/internal/models" + pb "bsm/full/module/social/relation/pb" ) // 好友申请详情 diff --git a/apps/social/relation/internal/logic/friend/delete.go b/module/social/relation/internal/logic/friend/delete.go similarity index 84% rename from apps/social/relation/internal/logic/friend/delete.go rename to module/social/relation/internal/logic/friend/delete.go index 3d1517d..a883f4c 100644 --- a/apps/social/relation/internal/logic/friend/delete.go +++ b/module/social/relation/internal/logic/friend/delete.go @@ -8,9 +8,9 @@ import ( "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/vars" - "git.apinb.com/bsm-social/relation/internal/impl" - "git.apinb.com/bsm-social/relation/internal/models" - pb "git.apinb.com/bsm-social/relation/pb" + "bsm/full/module/social/relation/internal/impl" + "bsm/full/module/social/relation/internal/models" + pb "bsm/full/module/social/relation/pb" ) // 删除好友 diff --git a/apps/social/relation/internal/logic/friend/do_popular.go b/module/social/relation/internal/logic/friend/do_popular.go similarity index 84% rename from apps/social/relation/internal/logic/friend/do_popular.go rename to module/social/relation/internal/logic/friend/do_popular.go index 00bc9c5..2b704b4 100644 --- a/apps/social/relation/internal/logic/friend/do_popular.go +++ b/module/social/relation/internal/logic/friend/do_popular.go @@ -8,9 +8,9 @@ import ( "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/vars" - "git.apinb.com/bsm-social/relation/internal/impl" - "git.apinb.com/bsm-social/relation/internal/models" - pb "git.apinb.com/bsm-social/relation/pb" + "bsm/full/module/social/relation/internal/impl" + "bsm/full/module/social/relation/internal/models" + pb "bsm/full/module/social/relation/pb" ) // 受你欢迎的,置顶 diff --git a/apps/social/relation/internal/logic/friend/fetch.go b/module/social/relation/internal/logic/friend/fetch.go similarity index 91% rename from apps/social/relation/internal/logic/friend/fetch.go rename to module/social/relation/internal/logic/friend/fetch.go index bcf40ed..3348170 100644 --- a/apps/social/relation/internal/logic/friend/fetch.go +++ b/module/social/relation/internal/logic/friend/fetch.go @@ -6,8 +6,8 @@ import ( "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" - "git.apinb.com/bsm-social/relation/internal/logic/common" - pb "git.apinb.com/bsm-social/relation/pb" + "bsm/full/module/social/relation/internal/logic/common" + pb "bsm/full/module/social/relation/pb" ) // 获取好友列表 diff --git a/apps/social/relation/internal/logic/friend/get.go b/module/social/relation/internal/logic/friend/get.go similarity index 85% rename from apps/social/relation/internal/logic/friend/get.go rename to module/social/relation/internal/logic/friend/get.go index a0197df..1305adf 100644 --- a/apps/social/relation/internal/logic/friend/get.go +++ b/module/social/relation/internal/logic/friend/get.go @@ -6,8 +6,8 @@ import ( "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" - "git.apinb.com/bsm-social/relation/internal/logic/common" - pb "git.apinb.com/bsm-social/relation/pb" + "bsm/full/module/social/relation/internal/logic/common" + pb "bsm/full/module/social/relation/pb" ) // 获取用户信息卡片 diff --git a/apps/social/relation/internal/logic/friend/modify_nickname.go b/module/social/relation/internal/logic/friend/modify_nickname.go similarity index 85% rename from apps/social/relation/internal/logic/friend/modify_nickname.go rename to module/social/relation/internal/logic/friend/modify_nickname.go index e70ea09..ad9ad4f 100644 --- a/apps/social/relation/internal/logic/friend/modify_nickname.go +++ b/module/social/relation/internal/logic/friend/modify_nickname.go @@ -8,9 +8,9 @@ import ( "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/vars" - "git.apinb.com/bsm-social/relation/internal/impl" - "git.apinb.com/bsm-social/relation/internal/models" - pb "git.apinb.com/bsm-social/relation/pb" + "bsm/full/module/social/relation/internal/impl" + "bsm/full/module/social/relation/internal/models" + pb "bsm/full/module/social/relation/pb" ) // 修改好友备注名称,如果要清除备注,直接nickname传空值 diff --git a/apps/social/relation/internal/logic/friend/search.go b/module/social/relation/internal/logic/friend/search.go similarity index 91% rename from apps/social/relation/internal/logic/friend/search.go rename to module/social/relation/internal/logic/friend/search.go index 959739a..465c4c5 100644 --- a/apps/social/relation/internal/logic/friend/search.go +++ b/module/social/relation/internal/logic/friend/search.go @@ -5,7 +5,7 @@ import ( "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/service" - pb "git.apinb.com/bsm-social/relation/pb" + pb "bsm/full/module/social/relation/pb" ) // 搜索 diff --git a/apps/social/relation/internal/logic/friend/tag_do_create.go b/module/social/relation/internal/logic/friend/tag_do_create.go similarity index 89% rename from apps/social/relation/internal/logic/friend/tag_do_create.go rename to module/social/relation/internal/logic/friend/tag_do_create.go index 55d0dc9..d1efc57 100644 --- a/apps/social/relation/internal/logic/friend/tag_do_create.go +++ b/module/social/relation/internal/logic/friend/tag_do_create.go @@ -9,9 +9,9 @@ import ( "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/utils" "git.apinb.com/bsm-sdk/core/vars" - "git.apinb.com/bsm-social/relation/internal/impl" - "git.apinb.com/bsm-social/relation/internal/models" - pb "git.apinb.com/bsm-social/relation/pb" + "bsm/full/module/social/relation/internal/impl" + "bsm/full/module/social/relation/internal/models" + pb "bsm/full/module/social/relation/pb" ) // 创建标签 diff --git a/apps/social/relation/internal/logic/friend/tag_do_update.go b/module/social/relation/internal/logic/friend/tag_do_update.go similarity index 89% rename from apps/social/relation/internal/logic/friend/tag_do_update.go rename to module/social/relation/internal/logic/friend/tag_do_update.go index 7b40a73..af4315b 100644 --- a/apps/social/relation/internal/logic/friend/tag_do_update.go +++ b/module/social/relation/internal/logic/friend/tag_do_update.go @@ -9,9 +9,9 @@ import ( "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/vars" - "git.apinb.com/bsm-social/relation/internal/impl" - "git.apinb.com/bsm-social/relation/internal/models" - pb "git.apinb.com/bsm-social/relation/pb" + "bsm/full/module/social/relation/internal/impl" + "bsm/full/module/social/relation/internal/models" + pb "bsm/full/module/social/relation/pb" ) // 更新标签成员 diff --git a/apps/social/relation/internal/logic/friend/tag_fetch.go b/module/social/relation/internal/logic/friend/tag_fetch.go similarity index 80% rename from apps/social/relation/internal/logic/friend/tag_fetch.go rename to module/social/relation/internal/logic/friend/tag_fetch.go index 5759e20..0486dba 100644 --- a/apps/social/relation/internal/logic/friend/tag_fetch.go +++ b/module/social/relation/internal/logic/friend/tag_fetch.go @@ -6,9 +6,9 @@ import ( "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" - "git.apinb.com/bsm-social/relation/internal/impl" - "git.apinb.com/bsm-social/relation/internal/models" - pb "git.apinb.com/bsm-social/relation/pb" + "bsm/full/module/social/relation/internal/impl" + "bsm/full/module/social/relation/internal/models" + pb "bsm/full/module/social/relation/pb" ) // 获取标签列表 diff --git a/apps/social/relation/internal/logic/friend/tag_member_fetch.go b/module/social/relation/internal/logic/friend/tag_member_fetch.go similarity index 81% rename from apps/social/relation/internal/logic/friend/tag_member_fetch.go rename to module/social/relation/internal/logic/friend/tag_member_fetch.go index f981f72..a8d2c4e 100644 --- a/apps/social/relation/internal/logic/friend/tag_member_fetch.go +++ b/module/social/relation/internal/logic/friend/tag_member_fetch.go @@ -6,10 +6,10 @@ import ( "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" - "git.apinb.com/bsm-social/relation/internal/impl" - "git.apinb.com/bsm-social/relation/internal/logic/common" - "git.apinb.com/bsm-social/relation/internal/models" - pb "git.apinb.com/bsm-social/relation/pb" + "bsm/full/module/social/relation/internal/impl" + "bsm/full/module/social/relation/internal/logic/common" + "bsm/full/module/social/relation/internal/models" + pb "bsm/full/module/social/relation/pb" ) // 获取标签成员 diff --git a/apps/social/relation/internal/logic/friend/undo_popular.go b/module/social/relation/internal/logic/friend/undo_popular.go similarity index 84% rename from apps/social/relation/internal/logic/friend/undo_popular.go rename to module/social/relation/internal/logic/friend/undo_popular.go index 6921657..282d84e 100644 --- a/apps/social/relation/internal/logic/friend/undo_popular.go +++ b/module/social/relation/internal/logic/friend/undo_popular.go @@ -8,9 +8,9 @@ import ( "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/vars" - "git.apinb.com/bsm-social/relation/internal/impl" - "git.apinb.com/bsm-social/relation/internal/models" - pb "git.apinb.com/bsm-social/relation/pb" + "bsm/full/module/social/relation/internal/impl" + "bsm/full/module/social/relation/internal/models" + pb "bsm/full/module/social/relation/pb" ) // 取消受欢迎的，取消置顶 diff --git a/apps/social/relation/internal/logic/match/do_ignore.go b/module/social/relation/internal/logic/match/do_ignore.go similarity index 83% rename from apps/social/relation/internal/logic/match/do_ignore.go rename to module/social/relation/internal/logic/match/do_ignore.go index 3021772..9704791 100644 --- a/apps/social/relation/internal/logic/match/do_ignore.go +++ b/module/social/relation/internal/logic/match/do_ignore.go @@ -8,9 +8,9 @@ import ( "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/vars" - "git.apinb.com/bsm-social/relation/internal/impl" - "git.apinb.com/bsm-social/relation/internal/models" - pb "git.apinb.com/bsm-social/relation/pb" + "bsm/full/module/social/relation/internal/impl" + "bsm/full/module/social/relation/internal/models" + pb "bsm/full/module/social/relation/pb" ) // 执行忽略 diff --git a/apps/social/relation/internal/logic/match/do_join.go b/module/social/relation/internal/logic/match/do_join.go similarity index 85% rename from apps/social/relation/internal/logic/match/do_join.go rename to module/social/relation/internal/logic/match/do_join.go index aa8915b..5bf518b 100644 --- a/apps/social/relation/internal/logic/match/do_join.go +++ b/module/social/relation/internal/logic/match/do_join.go @@ -9,9 +9,9 @@ import ( "git.apinb.com/bsm-sdk/core/service" "git.apinb.com/bsm-sdk/core/utils" "git.apinb.com/bsm-sdk/core/vars" - "git.apinb.com/bsm-social/relation/internal/impl" - "git.apinb.com/bsm-social/relation/internal/models" - pb "git.apinb.com/bsm-social/relation/pb" + "bsm/full/module/social/relation/internal/impl" + "bsm/full/module/social/relation/internal/models" + pb "bsm/full/module/social/relation/pb" ) // 执行通过，加为好友 diff --git a/apps/social/relation/internal/logic/match/fetch.go b/module/social/relation/internal/logic/match/fetch.go similarity index 83% rename from apps/social/relation/internal/logic/match/fetch.go rename to module/social/relation/internal/logic/match/fetch.go index 86328dd..ca7af44 100644 --- a/apps/social/relation/internal/logic/match/fetch.go +++ b/module/social/relation/internal/logic/match/fetch.go @@ -6,10 +6,10 @@ import ( "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" - "git.apinb.com/bsm-social/relation/internal/impl" - "git.apinb.com/bsm-social/relation/internal/logic/common" - "git.apinb.com/bsm-social/relation/internal/models" - pb "git.apinb.com/bsm-social/relation/pb" + "bsm/full/module/social/relation/internal/impl" + "bsm/full/module/social/relation/internal/logic/common" + "bsm/full/module/social/relation/internal/models" + pb "bsm/full/module/social/relation/pb" ) // 获取匹配列表 diff --git a/apps/social/relation/internal/logic/match/get.go b/module/social/relation/internal/logic/match/get.go similarity index 85% rename from apps/social/relation/internal/logic/match/get.go rename to module/social/relation/internal/logic/match/get.go index 6e1c49a..85f0466 100644 --- a/apps/social/relation/internal/logic/match/get.go +++ b/module/social/relation/internal/logic/match/get.go @@ -6,8 +6,8 @@ import ( "git.apinb.com/bsm-sdk/core/errcode" "git.apinb.com/bsm-sdk/core/printer" "git.apinb.com/bsm-sdk/core/service" - "git.apinb.com/bsm-social/relation/internal/logic/common" - pb "git.apinb.com/bsm-social/relation/pb" + "bsm/full/module/social/relation/internal/logic/common" + pb "bsm/full/module/social/relation/pb" ) // 获取匹配详情 diff --git a/apps/social/relation/internal/models/base.go b/module/social/relation/internal/models/base.go similarity index 100% rename from apps/social/relation/internal/models/base.go rename to module/social/relation/internal/models/base.go diff --git a/apps/social/relation/internal/models/friend_apply.go b/module/social/relation/internal/models/friend_apply.go similarity index 100% rename from apps/social/relation/internal/models/friend_apply.go rename to module/social/relation/internal/models/friend_apply.go diff --git a/apps/social/relation/internal/models/friend_apply_message.go b/module/social/relation/internal/models/friend_apply_message.go similarity index 100% rename from apps/social/relation/internal/models/friend_apply_message.go rename to module/social/relation/internal/models/friend_apply_message.go diff --git a/apps/social/relation/internal/models/friend_in_tag.go b/module/social/relation/internal/models/friend_in_tag.go similarity index 100% rename from apps/social/relation/internal/models/friend_in_tag.go rename to module/social/relation/internal/models/friend_in_tag.go diff --git a/apps/social/relation/internal/models/friend_tag.go b/module/social/relation/internal/models/friend_tag.go similarity index 100% rename from apps/social/relation/internal/models/friend_tag.go rename to module/social/relation/internal/models/friend_tag.go diff --git a/apps/social/relation/internal/models/query.go b/module/social/relation/internal/models/query.go similarity index 100% rename from apps/social/relation/internal/models/query.go rename to module/social/relation/internal/models/query.go diff --git a/apps/social/relation/internal/models/relation_follow.go b/module/social/relation/internal/models/relation_follow.go similarity index 100% rename from apps/social/relation/internal/models/relation_follow.go rename to module/social/relation/internal/models/relation_follow.go diff --git a/apps/social/relation/internal/models/relation_friend.go b/module/social/relation/internal/models/relation_friend.go similarity index 100% rename from apps/social/relation/internal/models/relation_friend.go rename to module/social/relation/internal/models/relation_friend.go diff --git a/apps/social/relation/internal/models/relation_match.go b/module/social/relation/internal/models/relation_match.go similarity index 100% rename from apps/social/relation/internal/models/relation_match.go rename to module/social/relation/internal/models/relation_match.go diff --git a/apps/social/relation/internal/server/follow_server.go b/module/social/relation/internal/server/follow_server.go similarity index 88% rename from apps/social/relation/internal/server/follow_server.go rename to module/social/relation/internal/server/follow_server.go index 55c7b99..b6b049d 100644 --- a/apps/social/relation/internal/server/follow_server.go +++ b/module/social/relation/internal/server/follow_server.go @@ -3,8 +3,8 @@ package server import ( "context" - "git.apinb.com/bsm-social/relation/internal/logic/follow" - pb "git.apinb.com/bsm-social/relation/pb" + "bsm/full/module/social/relation/internal/logic/follow" + pb "bsm/full/module/social/relation/pb" ) type FollowServer struct { diff --git a/apps/social/relation/internal/server/friend_server.go b/module/social/relation/internal/server/friend_server.go similarity index 96% rename from apps/social/relation/internal/server/friend_server.go rename to module/social/relation/internal/server/friend_server.go index c059102..b7915e7 100644 --- a/apps/social/relation/internal/server/friend_server.go +++ b/module/social/relation/internal/server/friend_server.go @@ -3,8 +3,8 @@ package server import ( "context" - "git.apinb.com/bsm-social/relation/internal/logic/friend" - pb "git.apinb.com/bsm-social/relation/pb" + "bsm/full/module/social/relation/internal/logic/friend" + pb "bsm/full/module/social/relation/pb" ) type FriendServer struct { diff --git a/apps/social/relation/internal/server/match_server.go b/module/social/relation/internal/server/match_server.go similarity index 89% rename from apps/social/relation/internal/server/match_server.go rename to module/social/relation/internal/server/match_server.go index 5b2f720..1d927d2 100644 --- a/apps/social/relation/internal/server/match_server.go +++ b/module/social/relation/internal/server/match_server.go @@ -3,8 +3,8 @@ package server import ( "context" - "git.apinb.com/bsm-social/relation/internal/logic/match" - pb "git.apinb.com/bsm-social/relation/pb" + "bsm/full/module/social/relation/internal/logic/match" + pb "bsm/full/module/social/relation/pb" ) type MatchServer struct { diff --git a/apps/social/relation/internal/server/new.go b/module/social/relation/internal/server/new.go similarity index 97% rename from apps/social/relation/internal/server/new.go rename to module/social/relation/internal/server/new.go index 82764fc..5cc2c3f 100644 --- a/apps/social/relation/internal/server/new.go +++ b/module/social/relation/internal/server/new.go @@ -4,7 +4,7 @@ package server import ( "context" "git.apinb.com/bsm-sdk/core/vars" - pb "git.apinb.com/bsm-social/relation/pb" + pb "bsm/full/module/social/relation/pb" gwRuntime "github.com/grpc-ecosystem/grpc-gateway/v2/runtime" "google.golang.org/grpc" "google.golang.org/grpc/reflection" diff --git a/apps/social/relation/pb/blocks.pb.go b/module/social/relation/pb/blocks.pb.go similarity index 100% rename from apps/social/relation/pb/blocks.pb.go rename to module/social/relation/pb/blocks.pb.go diff --git a/apps/social/relation/pb/follow.pb.go b/module/social/relation/pb/follow.pb.go similarity index 100% rename from apps/social/relation/pb/follow.pb.go rename to module/social/relation/pb/follow.pb.go diff --git a/apps/social/relation/pb/follow.pb.gw.go b/module/social/relation/pb/follow.pb.gw.go similarity index 100% rename from apps/social/relation/pb/follow.pb.gw.go rename to module/social/relation/pb/follow.pb.gw.go diff --git a/apps/social/relation/pb/follow_grpc.pb.go b/module/social/relation/pb/follow_grpc.pb.go similarity index 100% rename from apps/social/relation/pb/follow_grpc.pb.go rename to module/social/relation/pb/follow_grpc.pb.go diff --git a/apps/social/relation/pb/friend.pb.go b/module/social/relation/pb/friend.pb.go similarity index 100% rename from apps/social/relation/pb/friend.pb.go rename to module/social/relation/pb/friend.pb.go diff --git a/apps/social/relation/pb/friend.pb.gw.go b/module/social/relation/pb/friend.pb.gw.go similarity index 100% rename from apps/social/relation/pb/friend.pb.gw.go rename to module/social/relation/pb/friend.pb.gw.go diff --git a/apps/social/relation/pb/friend_grpc.pb.go b/module/social/relation/pb/friend_grpc.pb.go similarity index 100% rename from apps/social/relation/pb/friend_grpc.pb.go rename to module/social/relation/pb/friend_grpc.pb.go diff --git a/apps/social/relation/pb/match.pb.go b/module/social/relation/pb/match.pb.go similarity index 100% rename from apps/social/relation/pb/match.pb.go rename to module/social/relation/pb/match.pb.go diff --git a/apps/social/relation/pb/match.pb.gw.go b/module/social/relation/pb/match.pb.gw.go similarity index 100% rename from apps/social/relation/pb/match.pb.gw.go rename to module/social/relation/pb/match.pb.gw.go diff --git a/apps/social/relation/pb/match_grpc.pb.go b/module/social/relation/pb/match_grpc.pb.go similarity index 100% rename from apps/social/relation/pb/match_grpc.pb.go rename to module/social/relation/pb/match_grpc.pb.go diff --git a/apps/social/relation/proto/blocks.proto b/module/social/relation/proto/blocks.proto similarity index 100% rename from apps/social/relation/proto/blocks.proto rename to module/social/relation/proto/blocks.proto diff --git a/apps/social/relation/proto/follow.proto b/module/social/relation/proto/follow.proto similarity index 100% rename from apps/social/relation/proto/follow.proto rename to module/social/relation/proto/follow.proto diff --git a/apps/social/relation/proto/friend.proto b/module/social/relation/proto/friend.proto similarity index 100% rename from apps/social/relation/proto/friend.proto rename to module/social/relation/proto/friend.proto diff --git a/apps/social/relation/proto/match.proto b/module/social/relation/proto/match.proto similarity index 100% rename from apps/social/relation/proto/match.proto rename to module/social/relation/proto/match.proto diff --git a/apps/social/relation/scripts/filebeat.yaml b/module/social/relation/scripts/filebeat.yaml similarity index 100% rename from apps/social/relation/scripts/filebeat.yaml rename to module/social/relation/scripts/filebeat.yaml diff --git a/apps/social/relation/scripts/lint.sh b/module/social/relation/scripts/lint.sh similarity index 100% rename from apps/social/relation/scripts/lint.sh rename to module/social/relation/scripts/lint.sh diff --git a/apps/social/relation/swagger/relation.swagger.json b/module/social/relation/swagger/relation.swagger.json similarity index 100% rename from apps/social/relation/swagger/relation.swagger.json rename to module/social/relation/swagger/relation.swagger.json diff --git a/scripts/build-all-linux.sh b/scripts/build-all-linux.sh new file mode 100755 index 0000000..d120d31 --- /dev/null +++ b/scripts/build-all-linux.sh @@ -0,0 +1,90 @@ +#!/usr/bin/env bash + +set -Eeuo pipefail + +readonly SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)" +readonly WORKSPACE_ROOT="$(cd -- "${SCRIPT_DIR}/.." && pwd)" +readonly MODULE_ROOT="${WORKSPACE_ROOT}/module" +readonly BUILD_ROOT="${WORKSPACE_ROOT}/builds" +readonly ENTRY_ROOT="${BUILD_ROOT}/.entries" + +if ! command -v go >/dev/null 2>&1; then + echo "error: Go is not installed or is not available in PATH" >&2 + exit 1 +fi + +if [[ ! -f "${WORKSPACE_ROOT}/go.work" ]]; then + echo "error: go.work was not found in ${WORKSPACE_ROOT}" >&2 + exit 1 +fi + +export GOWORK="${WORKSPACE_ROOT}/go.work" +export GOOS=linux +export GOARCH=amd64 +export CGO_ENABLED=0 + +modules=() +while IFS= read -r -d '' go_mod; do + modules+=("$(dirname -- "${go_mod}")") +done < <(find "${MODULE_ROOT}" -type f -name go.mod -print0 | sort -z) + +if (( ${#modules[@]} == 0 )); then + echo "error: no service modules were found under ${MODULE_ROOT}" >&2 + exit 1 +fi + +mkdir -p "${BUILD_ROOT}" +mkdir -p "${ENTRY_ROOT}" + +cleanup() { + rm -rf -- "${ENTRY_ROOT}" +} +trap cleanup EXIT + +echo "Building ${#modules[@]} service modules..." + +for module_dir in "${modules[@]}"; do + relative_path="${module_dir#"${MODULE_ROOT}/"}" + artifact_name="${relative_path//\//-}" + output="${BUILD_ROOT}/${artifact_name}" + + if [[ -f "${module_dir}/cmd/main/main.go" ]]; then + entry_file="${module_dir}/cmd/main/main.go" + entry_package="./cmd/main" + elif [[ -f "${module_dir}/cmd/main.go" ]]; then + entry_file="${module_dir}/cmd/main.go" + entry_package="./cmd" + else + echo "error: service entry not found under ${module_dir}/cmd" >&2 + exit 1 + fi + + mkdir -p "$(dirname -- "${output}")" + echo "==> ${relative_path} -> ${output#"${WORKSPACE_ROOT}/"}" + + ( + cd -- "${module_dir}" + package_name="$(awk '$1 == "package" { print $2; exit }' "${entry_file}")" + + if [[ "${package_name}" == "main" ]]; then + go build -trimpath -o "${output}" "${entry_package}" + else + module_name="$(awk '$1 == "module" { print $2; exit }' go.mod)" + module_name="${module_name//$'\r'/}" + wrapper_dir="${ENTRY_ROOT}/${relative_path}" + wrapper_file="${wrapper_dir}/main.go" + mkdir -p "${wrapper_dir}" + printf '%s\n' \ + 'package main' \ + '' \ + "import service \"${module_name}/${entry_package#./}\"" \ + '' \ + 'func main() {' \ + $'\tservice.Run()' \ + '}' >"${wrapper_file}" + go build -trimpath -o "${output}" "${wrapper_file}" + fi + ) +done + +echo "Build completed successfully: ${BUILD_ROOT}" diff --git a/scripts/update-all.sh b/scripts/update-all.sh new file mode 100755 index 0000000..561a006 --- /dev/null +++ b/scripts/update-all.sh @@ -0,0 +1,45 @@ +#!/usr/bin/env bash + +set -Eeuo pipefail + +readonly SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)" +readonly WORKSPACE_ROOT="$(cd -- "${SCRIPT_DIR}/.." && pwd)" + +if ! command -v go >/dev/null 2>&1; then + echo "error: Go is not installed or is not available in PATH" >&2 + exit 1 +fi + +cd "${WORKSPACE_ROOT}" + +if [[ ! -f go.work ]]; then + echo "error: go.work was not found in ${WORKSPACE_ROOT}" >&2 + exit 1 +fi + +mapfile -t modules < <(go list -m -f '{{.Dir}}') +if (( ${#modules[@]} == 0 )); then + echo "error: no workspace modules were found" >&2 + exit 1 +fi + +echo "Updating dependencies for ${#modules[@]} workspace modules..." + +for module_dir in "${modules[@]}"; do + module_name="$(cd -- "${module_dir}" && go list -m -f '{{.Path}}')" + echo + echo "==> ${module_name} (${module_dir})" + + ( + cd -- "${module_dir}" + go get -u ./... + go mod tidy + ) +done + +echo +echo "==> Synchronizing go.work" +go work sync + +echo +echo "Dependency update completed successfully. Review and test the changes before committing."