From 8ad811c6a021f318730c6aa858b72363d9ce9159 Mon Sep 17 00:00:00 2001 From: tx7do Date: Sun, 5 Nov 2023 16:39:46 +0800 Subject: [PATCH] feat: refactor. --- blog-backend/Makefile | 6 +- .../api/admin/service/v1/admin_error.proto | 2 +- .../api/admin/service/v1/buf.openapi.gen.yaml | 30 +- .../api/admin/service/v1/i_admin.proto | 2 +- .../api/admin/service/v1/i_attachment.proto | 4 +- .../admin/service/v1/i_authentication.proto | 2 +- .../api/admin/service/v1/i_category.proto | 4 +- .../api/admin/service/v1/i_comment.proto | 4 +- .../api/admin/service/v1/i_link.proto | 4 +- .../api/admin/service/v1/i_menu.proto | 4 +- .../api/admin/service/v1/i_photo.proto | 4 +- .../api/admin/service/v1/i_post.proto | 4 +- .../api/admin/service/v1/i_system.proto | 4 +- blog-backend/api/admin/service/v1/i_tag.proto | 4 +- .../api/admin/service/v1/i_user.proto | 4 +- blog-backend/api/buf.lock | 18 +- blog-backend/api/buf.yaml | 15 +- .../api/comment/service/v1/comment.proto | 3 +- .../api/common/pagination/pagination.proto | 78 -- .../api/content/service/v1/category.proto | 4 +- .../api/content/service/v1/link.proto | 4 +- .../api/content/service/v1/menu.proto | 4 +- .../api/content/service/v1/photo.proto | 4 +- .../api/content/service/v1/post.proto | 4 +- blog-backend/api/content/service/v1/tag.proto | 4 +- .../api/file/service/v1/attachment.proto | 3 +- .../api/front/service/v1/buf.openapi.gen.yaml | 30 +- .../api/front/service/v1/front_error.proto | 2 +- .../api/front/service/v1/i_attachment.proto | 4 +- .../front/service/v1/i_authentication.proto | 2 +- .../api/front/service/v1/i_category.proto | 4 +- .../api/front/service/v1/i_comment.proto | 4 +- .../api/front/service/v1/i_front.proto | 2 +- .../api/front/service/v1/i_link.proto | 4 +- .../api/front/service/v1/i_menu.proto | 4 +- .../api/front/service/v1/i_photo.proto | 4 +- .../api/front/service/v1/i_post.proto | 4 +- blog-backend/api/front/service/v1/i_tag.proto | 4 +- blog-backend/api/third_party/README.md | 13 - blog-backend/api/third_party/buf.yaml | 7 - .../api/third_party/errors/errors.proto | 18 - .../openapi/discovery/v1/discovery.proto | 269 ------ .../gnostic/openapi/v2/openapiv2.proto | 665 ------------- .../third_party/gnostic/openapi/v3/README.md | 26 - .../gnostic/openapi/v3/annotations.proto | 60 -- .../gnostic/openapi/v3/openapiv3.proto | 671 ------------- .../third_party/google/api/annotations.proto | 31 - .../google/api/field_behavior.proto | 90 -- .../api/third_party/google/api/http.proto | 375 -------- .../api/third_party/google/api/httpbody.proto | 81 -- .../api/third_party/google/protobuf/any.proto | 155 --- .../api/third_party/google/protobuf/api.proto | 210 ----- .../google/protobuf/descriptor.proto | 885 ------------------ .../google/protobuf/duration.proto | 116 --- .../third_party/google/protobuf/empty.proto | 52 - .../google/protobuf/field_mask.proto | 245 ----- .../google/protobuf/source_context.proto | 48 - .../third_party/google/protobuf/struct.proto | 95 -- .../google/protobuf/timestamp.proto | 138 --- .../third_party/google/protobuf/type.proto | 187 ---- .../google/protobuf/wrappers.proto | 123 --- .../api/third_party/validate/README.md | 3 - .../api/third_party/validate/validate.proto | 862 ----------------- blog-backend/api/user/service/v1/user.proto | 3 +- .../api/user/service/v1/user_error.proto | 1 - .../service/cmd/server/assets/openapi.yaml | 708 ++++++++------ .../app/admin/service/cmd/server/wire.go | 3 +- .../app/admin/service/cmd/server/wire_gen.go | 20 +- .../app/admin/service/internal/biz/README.md | 1 - .../app/admin/service/internal/biz/init.go | 11 - .../admin/service/internal/biz/user_token.go | 35 - .../app/admin/service/internal/data/data.go | 32 +- .../admin/service/internal/data/user_token.go | 25 +- .../app/admin/service/internal/server/rest.go | 22 +- .../service/internal/service/attachment.go | 2 +- .../internal/service/authentication.go | 6 +- .../service/internal/service/category.go | 2 +- .../admin/service/internal/service/comment.go | 2 +- .../admin/service/internal/service/link.go | 2 +- .../admin/service/internal/service/post.go | 2 +- .../app/admin/service/internal/service/tag.go | 2 +- .../admin/service/internal/service/user.go | 2 +- .../app/core/service/cmd/server/wire.go | 3 +- .../app/core/service/cmd/server/wire_gen.go | 24 +- .../app/core/service/internal/biz/README.md | 1 - .../core/service/internal/biz/attachment.go | 51 - .../app/core/service/internal/biz/category.go | 51 - .../app/core/service/internal/biz/comment.go | 51 - .../app/core/service/internal/biz/init.go | 17 - .../app/core/service/internal/biz/link.go | 51 - .../app/core/service/internal/biz/post.go | 51 - .../app/core/service/internal/biz/tag.go | 51 - .../app/core/service/internal/biz/user.go | 67 -- .../core/service/internal/data/attachment.go | 9 +- .../core/service/internal/data/category.go | 11 +- .../app/core/service/internal/data/comment.go | 9 +- .../app/core/service/internal/data/data.go | 2 +- .../core/service/internal/data/ent_client.go | 2 +- .../app/core/service/internal/data/link.go | 11 +- .../app/core/service/internal/data/post.go | 11 +- .../app/core/service/internal/data/tag.go | 11 +- .../app/core/service/internal/data/user.go | 9 +- .../app/core/service/internal/server/grpc.go | 2 +- .../service/internal/service/attachment.go | 8 +- .../core/service/internal/service/category.go | 10 +- .../core/service/internal/service/comment.go | 8 +- .../app/core/service/internal/service/link.go | 10 +- .../app/core/service/internal/service/post.go | 10 +- .../app/core/service/internal/service/tag.go | 8 +- .../app/core/service/internal/service/user.go | 8 +- .../service/cmd/server/assets/openapi.yaml | 624 +++++++----- .../app/front/service/cmd/server/wire.go | 3 +- .../app/front/service/cmd/server/wire_gen.go | 6 +- .../app/front/service/internal/biz/README.md | 1 - .../app/front/service/internal/biz/init.go | 11 - .../front/service/internal/biz/user_token.go | 35 - .../app/front/service/internal/data/data.go | 2 +- .../front/service/internal/data/user_token.go | 24 +- .../app/front/service/internal/server/rest.go | 18 +- .../service/internal/service/attachment.go | 2 +- .../internal/service/authentication.go | 6 +- .../service/internal/service/category.go | 2 +- .../front/service/internal/service/comment.go | 2 +- .../front/service/internal/service/link.go | 2 +- .../front/service/internal/service/post.go | 2 +- .../app/front/service/internal/service/tag.go | 2 +- blog-backend/buf.gen.yaml | 29 +- blog-backend/buf.work.yaml | 1 + blog-backend/buf.yaml | 2 + .../api/go/admin/service/v1/admin_error.pb.go | 19 +- .../service/v1/admin_error.pb.validate.go | 2 +- .../admin/service/v1/admin_error_errors.pb.go | 2 +- .../gen/api/go/admin/service/v1/i_admin.pb.go | 21 +- .../admin/service/v1/i_admin.pb.validate.go | 2 +- .../go/admin/service/v1/i_attachment.pb.go | 141 +-- .../service/v1/i_attachment.pb.validate.go | 2 +- .../admin/service/v1/i_attachment_grpc.pb.go | 74 +- .../admin/service/v1/i_attachment_http.pb.go | 72 +- .../admin/service/v1/i_authentication.pb.go | 21 +- .../v1/i_authentication.pb.validate.go | 2 +- .../service/v1/i_authentication_grpc.pb.go | 2 +- .../service/v1/i_authentication_http.pb.go | 2 +- .../api/go/admin/service/v1/i_category.pb.go | 137 +-- .../service/v1/i_category.pb.validate.go | 2 +- .../go/admin/service/v1/i_category_grpc.pb.go | 74 +- .../go/admin/service/v1/i_category_http.pb.go | 72 +- .../api/go/admin/service/v1/i_comment.pb.go | 140 +-- .../admin/service/v1/i_comment.pb.validate.go | 2 +- .../go/admin/service/v1/i_comment_grpc.pb.go | 74 +- .../go/admin/service/v1/i_comment_http.pb.go | 72 +- .../gen/api/go/admin/service/v1/i_link.pb.go | 129 +-- .../go/admin/service/v1/i_link.pb.validate.go | 2 +- .../api/go/admin/service/v1/i_link_grpc.pb.go | 74 +- .../api/go/admin/service/v1/i_link_http.pb.go | 72 +- .../gen/api/go/admin/service/v1/i_menu.pb.go | 129 +-- .../go/admin/service/v1/i_menu.pb.validate.go | 2 +- .../api/go/admin/service/v1/i_menu_grpc.pb.go | 74 +- .../api/go/admin/service/v1/i_menu_http.pb.go | 72 +- .../gen/api/go/admin/service/v1/i_photo.pb.go | 136 +-- .../admin/service/v1/i_photo.pb.validate.go | 2 +- .../go/admin/service/v1/i_photo_grpc.pb.go | 74 +- .../go/admin/service/v1/i_photo_http.pb.go | 72 +- .../gen/api/go/admin/service/v1/i_post.pb.go | 129 +-- .../go/admin/service/v1/i_post.pb.validate.go | 2 +- .../api/go/admin/service/v1/i_post_grpc.pb.go | 74 +- .../api/go/admin/service/v1/i_post_http.pb.go | 72 +- .../api/go/admin/service/v1/i_system.pb.go | 217 +++-- .../admin/service/v1/i_system.pb.validate.go | 2 +- .../go/admin/service/v1/i_system_grpc.pb.go | 16 +- .../go/admin/service/v1/i_system_http.pb.go | 14 +- .../gen/api/go/admin/service/v1/i_tag.pb.go | 125 +-- .../go/admin/service/v1/i_tag.pb.validate.go | 2 +- .../api/go/admin/service/v1/i_tag_grpc.pb.go | 74 +- .../api/go/admin/service/v1/i_tag_http.pb.go | 72 +- .../gen/api/go/admin/service/v1/i_user.pb.go | 128 +-- .../go/admin/service/v1/i_user.pb.validate.go | 2 +- .../api/go/admin/service/v1/i_user_grpc.pb.go | 74 +- .../api/go/admin/service/v1/i_user_http.pb.go | 72 +- .../api/go/comment/service/v1/comment.pb.go | 233 ++--- .../comment/service/v1/comment.pb.validate.go | 2 +- .../go/comment/service/v1/comment_grpc.pb.go | 16 +- .../api/go/common/pagination/pagination.pb.go | 369 -------- .../pagination/pagination.pb.validate.go | 292 ------ .../api/go/content/service/v1/category.pb.go | 238 ++--- .../service/v1/category.pb.validate.go | 2 +- .../go/content/service/v1/category_grpc.pb.go | 16 +- .../gen/api/go/content/service/v1/link.pb.go | 191 ++-- .../go/content/service/v1/link.pb.validate.go | 2 +- .../api/go/content/service/v1/link_grpc.pb.go | 16 +- .../gen/api/go/content/service/v1/menu.pb.go | 195 ++-- .../go/content/service/v1/menu.pb.validate.go | 2 +- .../api/go/content/service/v1/menu_grpc.pb.go | 16 +- .../gen/api/go/content/service/v1/photo.pb.go | 186 ++-- .../content/service/v1/photo.pb.validate.go | 2 +- .../go/content/service/v1/photo_grpc.pb.go | 16 +- .../gen/api/go/content/service/v1/post.pb.go | 291 +++--- .../go/content/service/v1/post.pb.validate.go | 2 +- .../api/go/content/service/v1/post_grpc.pb.go | 16 +- .../gen/api/go/content/service/v1/tag.pb.go | 185 ++-- .../go/content/service/v1/tag.pb.validate.go | 2 +- .../api/go/content/service/v1/tag_grpc.pb.go | 16 +- .../api/go/file/service/v1/attachment.pb.go | 230 ++--- .../file/service/v1/attachment.pb.validate.go | 2 +- .../go/file/service/v1/attachment_grpc.pb.go | 16 +- .../api/go/front/service/v1/front_error.pb.go | 19 +- .../service/v1/front_error.pb.validate.go | 2 +- .../front/service/v1/front_error_errors.pb.go | 2 +- .../go/front/service/v1/i_attachment.pb.go | 141 +-- .../service/v1/i_attachment.pb.validate.go | 2 +- .../front/service/v1/i_attachment_grpc.pb.go | 74 +- .../front/service/v1/i_attachment_http.pb.go | 72 +- .../front/service/v1/i_authentication.pb.go | 20 +- .../v1/i_authentication.pb.validate.go | 2 +- .../service/v1/i_authentication_grpc.pb.go | 2 +- .../service/v1/i_authentication_http.pb.go | 2 +- .../api/go/front/service/v1/i_category.pb.go | 143 +-- .../service/v1/i_category.pb.validate.go | 2 +- .../go/front/service/v1/i_category_grpc.pb.go | 74 +- .../go/front/service/v1/i_category_http.pb.go | 72 +- .../api/go/front/service/v1/i_comment.pb.go | 137 +-- .../front/service/v1/i_comment.pb.validate.go | 2 +- .../go/front/service/v1/i_comment_grpc.pb.go | 74 +- .../go/front/service/v1/i_comment_http.pb.go | 72 +- .../gen/api/go/front/service/v1/i_front.pb.go | 22 +- .../front/service/v1/i_front.pb.validate.go | 2 +- .../gen/api/go/front/service/v1/i_link.pb.go | 125 +-- .../go/front/service/v1/i_link.pb.validate.go | 2 +- .../api/go/front/service/v1/i_link_grpc.pb.go | 74 +- .../api/go/front/service/v1/i_link_http.pb.go | 72 +- .../gen/api/go/front/service/v1/i_menu.pb.go | 125 +-- .../go/front/service/v1/i_menu.pb.validate.go | 2 +- .../api/go/front/service/v1/i_menu_grpc.pb.go | 74 +- .../api/go/front/service/v1/i_menu_http.pb.go | 72 +- .../gen/api/go/front/service/v1/i_photo.pb.go | 132 +-- .../front/service/v1/i_photo.pb.validate.go | 2 +- .../go/front/service/v1/i_photo_grpc.pb.go | 74 +- .../go/front/service/v1/i_photo_http.pb.go | 72 +- .../gen/api/go/front/service/v1/i_post.pb.go | 125 +-- .../go/front/service/v1/i_post.pb.validate.go | 2 +- .../api/go/front/service/v1/i_post_grpc.pb.go | 74 +- .../api/go/front/service/v1/i_post_http.pb.go | 72 +- .../gen/api/go/front/service/v1/i_tag.pb.go | 124 +-- .../go/front/service/v1/i_tag.pb.validate.go | 2 +- .../api/go/front/service/v1/i_tag_grpc.pb.go | 74 +- .../api/go/front/service/v1/i_tag_http.pb.go | 72 +- .../gen/api/go/user/service/v1/user.pb.go | 306 +++--- .../go/user/service/v1/user.pb.validate.go | 2 +- .../api/go/user/service/v1/user_error.pb.go | 19 +- .../user/service/v1/user_error.pb.validate.go | 2 +- .../user/service/v1/user_error_errors.pb.go | 2 +- .../api/go/user/service/v1/user_grpc.pb.go | 16 +- blog-backend/go.mod | 11 +- blog-backend/go.sum | 76 +- blog-backend/pkg/util/slug/BUILD.bazel | 19 - blog-backend/pkg/util/slug/slug.go | 20 - blog-backend/pkg/util/slug/slug_test.go | 83 -- 256 files changed, 4965 insertions(+), 11230 deletions(-) delete mode 100644 blog-backend/api/common/pagination/pagination.proto delete mode 100644 blog-backend/api/third_party/README.md delete mode 100644 blog-backend/api/third_party/buf.yaml delete mode 100644 blog-backend/api/third_party/errors/errors.proto delete mode 100644 blog-backend/api/third_party/gnostic/openapi/discovery/v1/discovery.proto delete mode 100644 blog-backend/api/third_party/gnostic/openapi/v2/openapiv2.proto delete mode 100644 blog-backend/api/third_party/gnostic/openapi/v3/README.md delete mode 100644 blog-backend/api/third_party/gnostic/openapi/v3/annotations.proto delete mode 100644 blog-backend/api/third_party/gnostic/openapi/v3/openapiv3.proto delete mode 100644 blog-backend/api/third_party/google/api/annotations.proto delete mode 100644 blog-backend/api/third_party/google/api/field_behavior.proto delete mode 100644 blog-backend/api/third_party/google/api/http.proto delete mode 100644 blog-backend/api/third_party/google/api/httpbody.proto delete mode 100644 blog-backend/api/third_party/google/protobuf/any.proto delete mode 100644 blog-backend/api/third_party/google/protobuf/api.proto delete mode 100644 blog-backend/api/third_party/google/protobuf/descriptor.proto delete mode 100644 blog-backend/api/third_party/google/protobuf/duration.proto delete mode 100644 blog-backend/api/third_party/google/protobuf/empty.proto delete mode 100644 blog-backend/api/third_party/google/protobuf/field_mask.proto delete mode 100644 blog-backend/api/third_party/google/protobuf/source_context.proto delete mode 100644 blog-backend/api/third_party/google/protobuf/struct.proto delete mode 100644 blog-backend/api/third_party/google/protobuf/timestamp.proto delete mode 100644 blog-backend/api/third_party/google/protobuf/type.proto delete mode 100644 blog-backend/api/third_party/google/protobuf/wrappers.proto delete mode 100644 blog-backend/api/third_party/validate/README.md delete mode 100644 blog-backend/api/third_party/validate/validate.proto delete mode 100644 blog-backend/app/admin/service/internal/biz/README.md delete mode 100644 blog-backend/app/admin/service/internal/biz/init.go delete mode 100644 blog-backend/app/admin/service/internal/biz/user_token.go delete mode 100644 blog-backend/app/core/service/internal/biz/README.md delete mode 100644 blog-backend/app/core/service/internal/biz/attachment.go delete mode 100644 blog-backend/app/core/service/internal/biz/category.go delete mode 100644 blog-backend/app/core/service/internal/biz/comment.go delete mode 100644 blog-backend/app/core/service/internal/biz/init.go delete mode 100644 blog-backend/app/core/service/internal/biz/link.go delete mode 100644 blog-backend/app/core/service/internal/biz/post.go delete mode 100644 blog-backend/app/core/service/internal/biz/tag.go delete mode 100644 blog-backend/app/core/service/internal/biz/user.go delete mode 100644 blog-backend/app/front/service/internal/biz/README.md delete mode 100644 blog-backend/app/front/service/internal/biz/init.go delete mode 100644 blog-backend/app/front/service/internal/biz/user_token.go delete mode 100644 blog-backend/gen/api/go/common/pagination/pagination.pb.go delete mode 100644 blog-backend/gen/api/go/common/pagination/pagination.pb.validate.go delete mode 100644 blog-backend/pkg/util/slug/BUILD.bazel delete mode 100644 blog-backend/pkg/util/slug/slug.go delete mode 100644 blog-backend/pkg/util/slug/slug_test.go diff --git a/blog-backend/Makefile b/blog-backend/Makefile index d34863a2..a71311f6 100644 --- a/blog-backend/Makefile +++ b/blog-backend/Makefile @@ -45,16 +45,14 @@ openapi: init: @go install google.golang.org/protobuf/cmd/protoc-gen-go@latest @go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest + @go install github.com/google/gnostic@latest + @go install github.com/go-kratos/kratos/cmd/kratos/v2@latest @go install github.com/go-kratos/kratos/cmd/protoc-gen-go-http/v2@latest @go install github.com/go-kratos/kratos/cmd/protoc-gen-go-errors/v2@latest @go install github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2@latest @go install github.com/google/gnostic/cmd/protoc-gen-openapi@latest @go install github.com/envoyproxy/protoc-gen-validate@latest @go install github.com/bufbuild/buf/cmd/buf@latest - @go install github.com/google/gnostic@latest - @go install entgo.io/ent/cmd/ent@latest - @go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest - @go install github.com/go-kratos/kratos/cmd/kratos/v2@latest # build all service applications build: diff --git a/blog-backend/api/admin/service/v1/admin_error.proto b/blog-backend/api/admin/service/v1/admin_error.proto index f69e02b3..7fd6d336 100644 --- a/blog-backend/api/admin/service/v1/admin_error.proto +++ b/blog-backend/api/admin/service/v1/admin_error.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package admin.service.v1; -option go_package = "kratos-cms/gen/api/go/admin/service/v1;v1"; + import "errors/errors.proto"; diff --git a/blog-backend/api/admin/service/v1/buf.openapi.gen.yaml b/blog-backend/api/admin/service/v1/buf.openapi.gen.yaml index b6a09b70..2a4a2571 100644 --- a/blog-backend/api/admin/service/v1/buf.openapi.gen.yaml +++ b/blog-backend/api/admin/service/v1/buf.openapi.gen.yaml @@ -1,15 +1,29 @@ # 配置protoc生成规则 version: v1 + managed: - enabled: false + enabled: true + optimize_for: SPEED + + go_package_prefix: + default: kratos-cms/gen/api/go + except: + - 'buf.build/googleapis/googleapis' + - 'buf.build/envoyproxy/protoc-gen-validate' + - 'buf.build/kratos/apis' + - 'buf.build/gnostic/gnostic' + - 'buf.build/gogo/protobuf' + - 'buf.build/tx7do/pagination' + plugins: # generate openapi v2 json doc -# - name: openapiv2 -# out: ../docs -# opt: -# - json_names_for_fields=true -# - logtostderr=true - # generate openapi v2 yaml doc + # - name: openapiv2 + # out: ../docs + # opt: + # - json_names_for_fields=true + # - logtostderr=true + + # generate openapi v3 yaml doc - name: openapi out: ./app/admin/service/cmd/server/assets opt: @@ -18,4 +32,4 @@ plugins: - default_response=false # 添加默认响应消息。如果为“true”，则自动为使用google.rpc.Status消息的操作添加默认响应。如果您使用envoy或grpc-gateway进行转码，则非常有用，因为它们使用此类型作为默认错误响应。默认为：true。 - enum_type=string # 枚举类型的序列化的类型。使用"string"则进行基于字符串的序列化。默认为：integer。 - output_mode=merged # 输出文件生成模式。默认情况下，只有一个openapi.yaml文件会生成在输出文件夹。使用“source_relative”则会为每一个'[inputfile].proto'文件单独生成一个“[inputfile].openapi.yaml”文件。默认为：merged。 - - fq_schema_naming=true # Schema的命名是否加上包名，为true，则会加上包名，例如：system.service.v1.ListDictDetailResponse，否则为：ListDictDetailResponse。默认为：false。 + - fq_schema_naming=false # Schema的命名是否加上包名，为true，则会加上包名，例如：system.service.v1.ListDictDetailResponse，否则为：ListDictDetailResponse。默认为：false。 diff --git a/blog-backend/api/admin/service/v1/i_admin.proto b/blog-backend/api/admin/service/v1/i_admin.proto index ac978909..b4edc61f 100644 --- a/blog-backend/api/admin/service/v1/i_admin.proto +++ b/blog-backend/api/admin/service/v1/i_admin.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package admin.service.v1; -option go_package = "kratos-cms/gen/api/go/admin/service/v1;v1"; + import "gnostic/openapi/v3/annotations.proto"; diff --git a/blog-backend/api/admin/service/v1/i_attachment.proto b/blog-backend/api/admin/service/v1/i_attachment.proto index a3480848..bcb11c1e 100644 --- a/blog-backend/api/admin/service/v1/i_attachment.proto +++ b/blog-backend/api/admin/service/v1/i_attachment.proto @@ -1,13 +1,13 @@ syntax = "proto3"; package admin.service.v1; -option go_package = "kratos-cms/gen/api/go/admin/service/v1;v1"; + import "gnostic/openapi/v3/annotations.proto"; import "google/api/annotations.proto"; import "google/protobuf/empty.proto"; -import "common/pagination/pagination.proto"; +import "pagination/v1/pagination.proto"; import "file/service/v1/attachment.proto"; // 附件服务 diff --git a/blog-backend/api/admin/service/v1/i_authentication.proto b/blog-backend/api/admin/service/v1/i_authentication.proto index 577e838e..e166f7fb 100644 --- a/blog-backend/api/admin/service/v1/i_authentication.proto +++ b/blog-backend/api/admin/service/v1/i_authentication.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package admin.service.v1; -option go_package = "kratos-cms/gen/api/go/admin/service/v1;v1"; + import "gnostic/openapi/v3/annotations.proto"; import "google/api/annotations.proto"; diff --git a/blog-backend/api/admin/service/v1/i_category.proto b/blog-backend/api/admin/service/v1/i_category.proto index 36fd003f..4cd965f5 100644 --- a/blog-backend/api/admin/service/v1/i_category.proto +++ b/blog-backend/api/admin/service/v1/i_category.proto @@ -1,13 +1,13 @@ syntax = "proto3"; package admin.service.v1; -option go_package = "kratos-cms/gen/api/go/admin/service/v1;v1"; + import "gnostic/openapi/v3/annotations.proto"; import "google/api/annotations.proto"; import "google/protobuf/empty.proto"; -import "common/pagination/pagination.proto"; +import "pagination/v1/pagination.proto"; import "content/service/v1/category.proto"; // 类别服务 diff --git a/blog-backend/api/admin/service/v1/i_comment.proto b/blog-backend/api/admin/service/v1/i_comment.proto index d296cec9..9676abde 100644 --- a/blog-backend/api/admin/service/v1/i_comment.proto +++ b/blog-backend/api/admin/service/v1/i_comment.proto @@ -1,13 +1,13 @@ syntax = "proto3"; package admin.service.v1; -option go_package = "kratos-cms/gen/api/go/admin/service/v1;v1"; + import "gnostic/openapi/v3/annotations.proto"; import "google/api/annotations.proto"; import "google/protobuf/empty.proto"; -import "common/pagination/pagination.proto"; +import "pagination/v1/pagination.proto"; import "comment/service/v1/comment.proto"; // 评论服务 diff --git a/blog-backend/api/admin/service/v1/i_link.proto b/blog-backend/api/admin/service/v1/i_link.proto index 4e077c87..b7d34a84 100644 --- a/blog-backend/api/admin/service/v1/i_link.proto +++ b/blog-backend/api/admin/service/v1/i_link.proto @@ -1,13 +1,13 @@ syntax = "proto3"; package admin.service.v1; -option go_package = "kratos-cms/gen/api/go/admin/service/v1;v1"; + import "gnostic/openapi/v3/annotations.proto"; import "google/api/annotations.proto"; import "google/protobuf/empty.proto"; -import "common/pagination/pagination.proto"; +import "pagination/v1/pagination.proto"; import "content/service/v1/link.proto"; // 链接服务 diff --git a/blog-backend/api/admin/service/v1/i_menu.proto b/blog-backend/api/admin/service/v1/i_menu.proto index 9d3ad74d..30aaa613 100644 --- a/blog-backend/api/admin/service/v1/i_menu.proto +++ b/blog-backend/api/admin/service/v1/i_menu.proto @@ -1,13 +1,13 @@ syntax = "proto3"; package admin.service.v1; -option go_package = "kratos-cms/gen/api/go/admin/service/v1;v1"; + import "gnostic/openapi/v3/annotations.proto"; import "google/api/annotations.proto"; import "google/protobuf/empty.proto"; -import "common/pagination/pagination.proto"; +import "pagination/v1/pagination.proto"; import "content/service/v1/menu.proto"; // 菜单服务 diff --git a/blog-backend/api/admin/service/v1/i_photo.proto b/blog-backend/api/admin/service/v1/i_photo.proto index 814a4cc4..37e3afc9 100644 --- a/blog-backend/api/admin/service/v1/i_photo.proto +++ b/blog-backend/api/admin/service/v1/i_photo.proto @@ -1,13 +1,13 @@ syntax = "proto3"; package admin.service.v1; -option go_package = "kratos-cms/gen/api/go/admin/service/v1;v1"; + import "gnostic/openapi/v3/annotations.proto"; import "google/api/annotations.proto"; import "google/protobuf/empty.proto"; -import "common/pagination/pagination.proto"; +import "pagination/v1/pagination.proto"; import "content/service/v1/photo.proto"; // 照片服务 diff --git a/blog-backend/api/admin/service/v1/i_post.proto b/blog-backend/api/admin/service/v1/i_post.proto index b17d542f..d9957c54 100644 --- a/blog-backend/api/admin/service/v1/i_post.proto +++ b/blog-backend/api/admin/service/v1/i_post.proto @@ -1,13 +1,13 @@ syntax = "proto3"; package admin.service.v1; -option go_package = "kratos-cms/gen/api/go/admin/service/v1;v1"; + import "gnostic/openapi/v3/annotations.proto"; import "google/api/annotations.proto"; import "google/protobuf/empty.proto"; -import "common/pagination/pagination.proto"; +import "pagination/v1/pagination.proto"; import "content/service/v1/post.proto"; // 帖子服务 diff --git a/blog-backend/api/admin/service/v1/i_system.proto b/blog-backend/api/admin/service/v1/i_system.proto index 1101e5b6..9b1f0aaf 100644 --- a/blog-backend/api/admin/service/v1/i_system.proto +++ b/blog-backend/api/admin/service/v1/i_system.proto @@ -1,13 +1,13 @@ syntax = "proto3"; package admin.service.v1; -option go_package = "kratos-cms/gen/api/go/admin/service/v1;v1"; + import "gnostic/openapi/v3/annotations.proto"; import "google/api/annotations.proto"; import "google/protobuf/empty.proto"; -import "common/pagination/pagination.proto"; +import "pagination/v1/pagination.proto"; // 系统配置服务 service SystemService { diff --git a/blog-backend/api/admin/service/v1/i_tag.proto b/blog-backend/api/admin/service/v1/i_tag.proto index 2afcc98e..5c76dbee 100644 --- a/blog-backend/api/admin/service/v1/i_tag.proto +++ b/blog-backend/api/admin/service/v1/i_tag.proto @@ -1,13 +1,13 @@ syntax = "proto3"; package admin.service.v1; -option go_package = "kratos-cms/gen/api/go/admin/service/v1;v1"; + import "gnostic/openapi/v3/annotations.proto"; import "google/api/annotations.proto"; import "google/protobuf/empty.proto"; -import "common/pagination/pagination.proto"; +import "pagination/v1/pagination.proto"; import "content/service/v1/tag.proto"; // 标签服务 diff --git a/blog-backend/api/admin/service/v1/i_user.proto b/blog-backend/api/admin/service/v1/i_user.proto index 0df82d66..c6db75de 100644 --- a/blog-backend/api/admin/service/v1/i_user.proto +++ b/blog-backend/api/admin/service/v1/i_user.proto @@ -1,14 +1,14 @@ syntax = "proto3"; package admin.service.v1; -option go_package = "kratos-cms/gen/api/go/admin/service/v1;v1"; + import "gnostic/openapi/v3/annotations.proto"; import "google/api/annotations.proto"; import "google/protobuf/empty.proto"; import "user/service/v1/user.proto"; -import "common/pagination/pagination.proto"; +import "pagination/v1/pagination.proto"; // 用户管理服务 service UserService { diff --git a/blog-backend/api/buf.lock b/blog-backend/api/buf.lock index afdc004b..79bc2ac3 100644 --- a/blog-backend/api/buf.lock +++ b/blog-backend/api/buf.lock @@ -4,20 +4,30 @@ deps: - remote: buf.build owner: envoyproxy repository: protoc-gen-validate - commit: 6607b10f00ed4a3d98f906807131c44a + commit: eac44469a7af47e7839a7f1f3d7ac004 + digest: shake256:0feabcde01b6b11e3c75a5e3f807968d5995626546f39c37e5d4205892b3a59cced0ed83b35a2eb9e6dddd3309660ad46b737c9dcd224b425de0a6654ce04417 + - remote: buf.build + owner: gnostic + repository: gnostic + commit: 087bc8072ce44e339f213209e4d57bf0 + digest: shake256:4689c26f0460fea84c4c277c1b9c7e7d657388c5b4116d1065f907a92100ffbea87de05bbd138a0166411361e1f6ce063b4c0c6002358d39710f3c4a8de788d5 - remote: buf.build owner: gogo repository: protobuf commit: 5461a3dfa9d941da82028ab185dc2a0e + digest: shake256:37c7c75224982038cb1abf45b481ef06716c1f806ffaa162018d0df092bd11a2a9b62c2d0dc0a2ae43beff86b6014fc0eb8c594ffd84d52ade4b08fca901eadc - remote: buf.build owner: googleapis repository: googleapis - commit: 75b4300737fb4efca0831636be94e517 + commit: 28151c0d0a1641bf938a7672c500e01d + digest: shake256:49215edf8ef57f7863004539deff8834cfb2195113f0b890dd1f67815d9353e28e668019165b9d872395871eeafcbab3ccfdb2b5f11734d3cca95be9e8d139de - remote: buf.build owner: kratos repository: apis commit: c2de25f14fa445a79a054214f31d17a8 + digest: shake256:91c024935d46f7966667c29e4fc933435959f93c3f0e675e1227c99db09905d44f8ec275b770da7659df5a6b18f4710da157b6d8ad760a4a95f60365b231e637 - remote: buf.build owner: tx7do - repository: gnostic - commit: b9ecfa10359449f681e6e12b50b78f98 + repository: pagination + commit: 66a7080a8ac446d0abfb0250f17cad60 + digest: shake256:cb27e819fe006fad3688c7f6c882a65ebd1511c26301fc498d652d2d3b203d6afc46346bf6173243afc854914f256cd3ac77c2c5c18638809b2d31197873bcd1 diff --git a/blog-backend/api/buf.yaml b/blog-backend/api/buf.yaml index e2c78c79..ba2a0b57 100644 --- a/blog-backend/api/buf.yaml +++ b/blog-backend/api/buf.yaml @@ -1,15 +1,20 @@ version: v1 + build: excludes: [third_party] + deps: - - buf.build/googleapis/googleapis - - buf.build/envoyproxy/protoc-gen-validate - - buf.build/kratos/apis - - buf.build/tx7do/gnostic - - buf.build/gogo/protobuf + - 'buf.build/googleapis/googleapis' + - 'buf.build/envoyproxy/protoc-gen-validate' + - 'buf.build/kratos/apis' + - 'buf.build/gnostic/gnostic' + - 'buf.build/gogo/protobuf' + - 'buf.build/tx7do/pagination' + breaking: use: - FILE + lint: use: - DEFAULT diff --git a/blog-backend/api/comment/service/v1/comment.proto b/blog-backend/api/comment/service/v1/comment.proto index 0f363179..f8e82299 100644 --- a/blog-backend/api/comment/service/v1/comment.proto +++ b/blog-backend/api/comment/service/v1/comment.proto @@ -1,10 +1,9 @@ syntax = "proto3"; package comment.service.v1; -option go_package = "kratos-cms/gen/api/go/comment/service/v1;v1"; import "google/protobuf/empty.proto"; -import "common/pagination/pagination.proto"; +import "pagination/v1/pagination.proto"; // 变量的命名一律使用小驼峰命名法，例如：firstName、lastName等。 diff --git a/blog-backend/api/common/pagination/pagination.proto b/blog-backend/api/common/pagination/pagination.proto deleted file mode 100644 index 0a67cc78..00000000 --- a/blog-backend/api/common/pagination/pagination.proto +++ /dev/null @@ -1,78 +0,0 @@ -syntax = "proto3"; - -package pagination; -option go_package = "kratos-cms/gen/api/go/common/pagination;pagination"; - -import "google/protobuf/any.proto"; -import "gnostic/openapi/v3/annotations.proto"; - -// 排序类型 -enum SortOrder { - // 不排序 - UNSORTED = 0; - // 升序 - ASCENDING = 1; - // 降序 - DESCENDING = 2; -} - -// 分页通用请求 -message PagingRequest { - // 当前页码 - optional int32 page = 1 [ - (gnostic.openapi.v3.property) = { - description: "当前页码", - default: {number: 1} - } - ]; - - // 每页的行数 - optional int32 pageSize = 2 [ - json_name = "pageSize", - (gnostic.openapi.v3.property) = { - description: "每一页的行数", - default: {number: 10} - } - ]; - - // 与过滤参数 - optional string query = 3 [ - json_name = "query", - (gnostic.openapi.v3.property) = { - description: "与过滤参数", - example: {yaml: "{\"key1\":\"val1\",\"key2\":\"val2\"}"} - } - ]; - - // 或过滤参数 - optional string orQuery = 4 [ - json_name = "or", - (gnostic.openapi.v3.property) = { - description: "或过滤参数", - example: {yaml: "{\"key1\":\"val1\",\"key2\":\"val2\"}"} - } - ]; - - // 排序条件 - repeated string orderBy = 5 [ - json_name = "orderBy", - (gnostic.openapi.v3.property) = { - description: "排序条件，字段名前加'-'为降序，否则为升序。" - example: {yaml: "{\"val1\", \"-val2\"}"} - } - ]; - - // 是否不分页 - optional bool noPaging = 6 [ - json_name = "nopaging", - (gnostic.openapi.v3.property) = {description: "是否不分页"} - ]; -} - -// 分页通用结果 -message PagingResponse { - // 总数 - int32 total = 1; - // 分页数据 - repeated google.protobuf.Any items = 2; -} diff --git a/blog-backend/api/content/service/v1/category.proto b/blog-backend/api/content/service/v1/category.proto index 08a3a8ee..0e60df2d 100644 --- a/blog-backend/api/content/service/v1/category.proto +++ b/blog-backend/api/content/service/v1/category.proto @@ -1,12 +1,12 @@ syntax = "proto3"; package content.service.v1; -option go_package = "kratos-cms/gen/api/go/content/service/v1;v1"; + import "google/protobuf/empty.proto"; import "google/protobuf/field_mask.proto"; -import "common/pagination/pagination.proto"; +import "pagination/v1/pagination.proto"; // 变量的命名一律使用小驼峰命名法，例如：firstName、lastName等。 diff --git a/blog-backend/api/content/service/v1/link.proto b/blog-backend/api/content/service/v1/link.proto index f679e551..52c58af2 100644 --- a/blog-backend/api/content/service/v1/link.proto +++ b/blog-backend/api/content/service/v1/link.proto @@ -1,10 +1,10 @@ syntax = "proto3"; package content.service.v1; -option go_package = "kratos-cms/gen/api/go/content/service/v1;v1"; + import "google/protobuf/empty.proto"; -import "common/pagination/pagination.proto"; +import "pagination/v1/pagination.proto"; // 变量的命名一律使用小驼峰命名法，例如：firstName、lastName等。 diff --git a/blog-backend/api/content/service/v1/menu.proto b/blog-backend/api/content/service/v1/menu.proto index cabfadd1..83fc3506 100644 --- a/blog-backend/api/content/service/v1/menu.proto +++ b/blog-backend/api/content/service/v1/menu.proto @@ -1,10 +1,10 @@ syntax = "proto3"; package content.service.v1; -option go_package = "kratos-cms/gen/api/go/content/service/v1;v1"; + import "google/protobuf/empty.proto"; -import "common/pagination/pagination.proto"; +import "pagination/v1/pagination.proto"; // 变量的命名一律使用小驼峰命名法，例如：firstName、lastName等。 diff --git a/blog-backend/api/content/service/v1/photo.proto b/blog-backend/api/content/service/v1/photo.proto index 932b57a9..f58e8d87 100644 --- a/blog-backend/api/content/service/v1/photo.proto +++ b/blog-backend/api/content/service/v1/photo.proto @@ -1,10 +1,10 @@ syntax = "proto3"; package content.service.v1; -option go_package = "kratos-cms/gen/api/go/content/service/v1;v1"; + import "google/protobuf/empty.proto"; -import "common/pagination/pagination.proto"; +import "pagination/v1/pagination.proto"; // 变量的命名一律使用小驼峰命名法，例如：firstName、lastName等。 diff --git a/blog-backend/api/content/service/v1/post.proto b/blog-backend/api/content/service/v1/post.proto index a8c9200b..6b776355 100644 --- a/blog-backend/api/content/service/v1/post.proto +++ b/blog-backend/api/content/service/v1/post.proto @@ -1,10 +1,10 @@ syntax = "proto3"; package content.service.v1; -option go_package = "kratos-cms/gen/api/go/content/service/v1;v1"; + import "google/protobuf/empty.proto"; -import "common/pagination/pagination.proto"; +import "pagination/v1/pagination.proto"; // 变量的命名一律使用小驼峰命名法，例如：firstName、lastName等。 diff --git a/blog-backend/api/content/service/v1/tag.proto b/blog-backend/api/content/service/v1/tag.proto index b89b3181..cf6cf94c 100644 --- a/blog-backend/api/content/service/v1/tag.proto +++ b/blog-backend/api/content/service/v1/tag.proto @@ -1,10 +1,10 @@ syntax = "proto3"; package content.service.v1; -option go_package = "kratos-cms/gen/api/go/content/service/v1;v1"; + import "google/protobuf/empty.proto"; -import "common/pagination/pagination.proto"; +import "pagination/v1/pagination.proto"; // 变量的命名一律使用小驼峰命名法，例如：firstName、lastName等。 diff --git a/blog-backend/api/file/service/v1/attachment.proto b/blog-backend/api/file/service/v1/attachment.proto index 26576709..d6efe0f1 100644 --- a/blog-backend/api/file/service/v1/attachment.proto +++ b/blog-backend/api/file/service/v1/attachment.proto @@ -1,11 +1,10 @@ syntax = "proto3"; package file.service.v1; -option go_package = "kratos-cms/gen/api/go/file/service/v1"; import "google/protobuf/empty.proto"; -import "common/pagination/pagination.proto"; +import "pagination/v1/pagination.proto"; // 变量的命名一律使用小驼峰命名法，例如：firstName、lastName等。 diff --git a/blog-backend/api/front/service/v1/buf.openapi.gen.yaml b/blog-backend/api/front/service/v1/buf.openapi.gen.yaml index b29bc148..5ea10ecf 100644 --- a/blog-backend/api/front/service/v1/buf.openapi.gen.yaml +++ b/blog-backend/api/front/service/v1/buf.openapi.gen.yaml @@ -1,15 +1,29 @@ # 配置protoc生成规则 version: v1 + managed: - enabled: false + enabled: true + optimize_for: SPEED + + go_package_prefix: + default: kratos-cms/gen/api/go + except: + - 'buf.build/googleapis/googleapis' + - 'buf.build/envoyproxy/protoc-gen-validate' + - 'buf.build/kratos/apis' + - 'buf.build/gnostic/gnostic' + - 'buf.build/gogo/protobuf' + - 'buf.build/tx7do/pagination' + plugins: # generate openapi v2 json doc -# - name: openapiv2 -# out: ../docs -# opt: -# - json_names_for_fields=true -# - logtostderr=true - # generate openapi v2 yaml doc + # - name: openapiv2 + # out: ../docs + # opt: + # - json_names_for_fields=true + # - logtostderr=true + + # generate openapi v3 yaml doc - name: openapi out: ./app/front/service/cmd/server/assets opt: @@ -18,4 +32,4 @@ plugins: - default_response=false # 添加默认响应消息。如果为“true”，则自动为使用google.rpc.Status消息的操作添加默认响应。如果您使用envoy或grpc-gateway进行转码，则非常有用，因为它们使用此类型作为默认错误响应。默认为：true。 - enum_type=string # 枚举类型的序列化的类型。使用"string"则进行基于字符串的序列化。默认为：integer。 - output_mode=merged # 输出文件生成模式。默认情况下，只有一个openapi.yaml文件会生成在输出文件夹。使用“source_relative”则会为每一个'[inputfile].proto'文件单独生成一个“[inputfile].openapi.yaml”文件。默认为：merged。 - - fq_schema_naming=true # Schema的命名是否加上包名，为true，则会加上包名，例如：system.service.v1.ListDictDetailResponse，否则为：ListDictDetailResponse。默认为：false。 + - fq_schema_naming=false # Schema的命名是否加上包名，为true，则会加上包名，例如：system.service.v1.ListDictDetailResponse，否则为：ListDictDetailResponse。默认为：false。 diff --git a/blog-backend/api/front/service/v1/front_error.proto b/blog-backend/api/front/service/v1/front_error.proto index 1583038f..ec3cf667 100644 --- a/blog-backend/api/front/service/v1/front_error.proto +++ b/blog-backend/api/front/service/v1/front_error.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package front.service.v1; -option go_package = "kratos-cms/gen/api/go/front/service/v1;v1"; + import "errors/errors.proto"; diff --git a/blog-backend/api/front/service/v1/i_attachment.proto b/blog-backend/api/front/service/v1/i_attachment.proto index 9e411ef6..74f02775 100644 --- a/blog-backend/api/front/service/v1/i_attachment.proto +++ b/blog-backend/api/front/service/v1/i_attachment.proto @@ -1,13 +1,13 @@ syntax = "proto3"; package front.service.v1; -option go_package = "kratos-cms/gen/api/go/front/service/v1;v1"; + import "gnostic/openapi/v3/annotations.proto"; import "google/api/annotations.proto"; import "google/protobuf/empty.proto"; -import "common/pagination/pagination.proto"; +import "pagination/v1/pagination.proto"; import "file/service/v1/attachment.proto"; // 附件服务 diff --git a/blog-backend/api/front/service/v1/i_authentication.proto b/blog-backend/api/front/service/v1/i_authentication.proto index d2f05c9e..1a059392 100644 --- a/blog-backend/api/front/service/v1/i_authentication.proto +++ b/blog-backend/api/front/service/v1/i_authentication.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package front.service.v1; -option go_package = "kratos-cms/gen/api/go/front/service/v1;v1"; + import "gnostic/openapi/v3/annotations.proto"; import "google/api/annotations.proto"; diff --git a/blog-backend/api/front/service/v1/i_category.proto b/blog-backend/api/front/service/v1/i_category.proto index e7d9d42b..0249f478 100644 --- a/blog-backend/api/front/service/v1/i_category.proto +++ b/blog-backend/api/front/service/v1/i_category.proto @@ -1,13 +1,13 @@ syntax = "proto3"; package front.service.v1; -option go_package = "kratos-cms/gen/api/go/front/service/v1;v1"; + import "gnostic/openapi/v3/annotations.proto"; import "google/api/annotations.proto"; import "google/protobuf/empty.proto"; -import "common/pagination/pagination.proto"; +import "pagination/v1/pagination.proto"; import "content/service/v1/category.proto"; // 类别服务 diff --git a/blog-backend/api/front/service/v1/i_comment.proto b/blog-backend/api/front/service/v1/i_comment.proto index 37c0ba02..f5e6a9f1 100644 --- a/blog-backend/api/front/service/v1/i_comment.proto +++ b/blog-backend/api/front/service/v1/i_comment.proto @@ -1,13 +1,13 @@ syntax = "proto3"; package front.service.v1; -option go_package = "kratos-cms/gen/api/go/front/service/v1;v1"; + import "gnostic/openapi/v3/annotations.proto"; import "google/api/annotations.proto"; import "google/protobuf/empty.proto"; -import "common/pagination/pagination.proto"; +import "pagination/v1/pagination.proto"; import "comment/service/v1/comment.proto"; // 评论服务 diff --git a/blog-backend/api/front/service/v1/i_front.proto b/blog-backend/api/front/service/v1/i_front.proto index c93ac709..fcb96e68 100644 --- a/blog-backend/api/front/service/v1/i_front.proto +++ b/blog-backend/api/front/service/v1/i_front.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package front.service.v1; -option go_package = "kratos-cms/gen/api/go/front/service/v1;v1"; + import "gnostic/openapi/v3/annotations.proto"; diff --git a/blog-backend/api/front/service/v1/i_link.proto b/blog-backend/api/front/service/v1/i_link.proto index e624f366..dd58b983 100644 --- a/blog-backend/api/front/service/v1/i_link.proto +++ b/blog-backend/api/front/service/v1/i_link.proto @@ -1,13 +1,13 @@ syntax = "proto3"; package front.service.v1; -option go_package = "kratos-cms/gen/api/go/front/service/v1;v1"; + import "gnostic/openapi/v3/annotations.proto"; import "google/api/annotations.proto"; import "google/protobuf/empty.proto"; -import "common/pagination/pagination.proto"; +import "pagination/v1/pagination.proto"; import "content/service/v1/link.proto"; // 链接服务 diff --git a/blog-backend/api/front/service/v1/i_menu.proto b/blog-backend/api/front/service/v1/i_menu.proto index da9b6d00..0529f9ef 100644 --- a/blog-backend/api/front/service/v1/i_menu.proto +++ b/blog-backend/api/front/service/v1/i_menu.proto @@ -1,13 +1,13 @@ syntax = "proto3"; package front.service.v1; -option go_package = "kratos-cms/gen/api/go/front/service/v1;v1"; + import "gnostic/openapi/v3/annotations.proto"; import "google/api/annotations.proto"; import "google/protobuf/empty.proto"; -import "common/pagination/pagination.proto"; +import "pagination/v1/pagination.proto"; import "content/service/v1/menu.proto"; // 菜单服务 diff --git a/blog-backend/api/front/service/v1/i_photo.proto b/blog-backend/api/front/service/v1/i_photo.proto index 9cbf98b2..ca901019 100644 --- a/blog-backend/api/front/service/v1/i_photo.proto +++ b/blog-backend/api/front/service/v1/i_photo.proto @@ -1,13 +1,13 @@ syntax = "proto3"; package front.service.v1; -option go_package = "kratos-cms/gen/api/go/front/service/v1;v1"; + import "gnostic/openapi/v3/annotations.proto"; import "google/api/annotations.proto"; import "google/protobuf/empty.proto"; -import "common/pagination/pagination.proto"; +import "pagination/v1/pagination.proto"; import "content/service/v1/photo.proto"; // 照片服务 diff --git a/blog-backend/api/front/service/v1/i_post.proto b/blog-backend/api/front/service/v1/i_post.proto index 02fda154..54ec21f8 100644 --- a/blog-backend/api/front/service/v1/i_post.proto +++ b/blog-backend/api/front/service/v1/i_post.proto @@ -1,13 +1,13 @@ syntax = "proto3"; package front.service.v1; -option go_package = "kratos-cms/gen/api/go/front/service/v1;v1"; + import "gnostic/openapi/v3/annotations.proto"; import "google/api/annotations.proto"; import "google/protobuf/empty.proto"; -import "common/pagination/pagination.proto"; +import "pagination/v1/pagination.proto"; import "content/service/v1/post.proto"; // 帖子服务 diff --git a/blog-backend/api/front/service/v1/i_tag.proto b/blog-backend/api/front/service/v1/i_tag.proto index ee45f7b8..095839e6 100644 --- a/blog-backend/api/front/service/v1/i_tag.proto +++ b/blog-backend/api/front/service/v1/i_tag.proto @@ -1,13 +1,13 @@ syntax = "proto3"; package front.service.v1; -option go_package = "kratos-cms/gen/api/go/front/service/v1;v1"; + import "gnostic/openapi/v3/annotations.proto"; import "google/api/annotations.proto"; import "google/protobuf/empty.proto"; -import "common/pagination/pagination.proto"; +import "pagination/v1/pagination.proto"; import "content/service/v1/tag.proto"; // 标签服务 diff --git a/blog-backend/api/third_party/README.md b/blog-backend/api/third_party/README.md deleted file mode 100644 index 2c40bce1..00000000 --- a/blog-backend/api/third_party/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# Protobuf 第三方库 - -- [Krator Errors](https://github.com/go-kratos/kratos/v2/errors) -- [googleapis](https://google.golang.org/genproto/googleapis) -- [gnostic OpenAPI v3](https://github.com/google/gnostic/openapiv3) -- [protoc-gen-validate](https://github.com/envoyproxy/protoc-gen-validate) - -Protobuf使用[Buf.build](https://buf.build)进行管理编译，第三方库也使用Buf进行管理： - -- `buf.build/googleapis/googleapis` -- `buf.build/envoyproxy/protoc-gen-validate` -- `buf.build/kratos/apis` -- `buf.build/tx7do/gnostic` diff --git a/blog-backend/api/third_party/buf.yaml b/blog-backend/api/third_party/buf.yaml deleted file mode 100644 index 1a519456..00000000 --- a/blog-backend/api/third_party/buf.yaml +++ /dev/null @@ -1,7 +0,0 @@ -version: v1 -breaking: - use: - - FILE -lint: - use: - - DEFAULT diff --git a/blog-backend/api/third_party/errors/errors.proto b/blog-backend/api/third_party/errors/errors.proto deleted file mode 100644 index a57cdbdd..00000000 --- a/blog-backend/api/third_party/errors/errors.proto +++ /dev/null @@ -1,18 +0,0 @@ -syntax = "proto3"; - -package errors; - -option go_package = "github.com/go-kratos/kratos/v2/errors;errors"; -option java_multiple_files = true; -option java_package = "com.github.kratos.errors"; -option objc_class_prefix = "KratosErrors"; - -import "google/protobuf/descriptor.proto"; - -extend google.protobuf.EnumOptions { - int32 default_code = 1108; -} - -extend google.protobuf.EnumValueOptions { - int32 code = 1109; -} \ No newline at end of file diff --git a/blog-backend/api/third_party/gnostic/openapi/discovery/v1/discovery.proto b/blog-backend/api/third_party/gnostic/openapi/discovery/v1/discovery.proto deleted file mode 100644 index 378aaeb6..00000000 --- a/blog-backend/api/third_party/gnostic/openapi/discovery/v1/discovery.proto +++ /dev/null @@ -1,269 +0,0 @@ -// Copyright 2020 Google LLC. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// THIS FILE IS AUTOMATICALLY GENERATED. - -syntax = "proto3"; - -package gnostic.discovery.v1; - -import "google/protobuf/any.proto"; - -// This option lets the proto compiler generate Java code inside the package -// name (see below) instead of inside an outer class. It creates a simpler -// developer experience by reducing one-level of name nesting and be -// consistent with most programming languages that don't support outer classes. -option java_multiple_files = true; - -// The Java outer classname should be the filename in UpperCamelCase. This -// class is only used to hold proto descriptor, so developers don't need to -// work with it directly. -option java_outer_classname = "OpenAPIProto"; - -// The Java package name must be proto package name with proper prefix. -option java_package = "org.discovery_v1"; - -// A reasonable prefix for the Objective-C symbols generated from the package. -// It should at a minimum be 3 characters long, all uppercase, and convention -// is to use an abbreviation of the package name. Something short, but -// hopefully unique enough to not conflict with things that may come along in -// the future. 'GPB' is reserved for the protocol buffer implementation itself. -option objc_class_prefix = "OAS"; - -// The Go package name. -option go_package = "github.com/google/gnostic/discovery;discovery_v1"; - -message Annotations { - repeated string required = 1; -} - -message Any { - google.protobuf.Any value = 1; - string yaml = 2; -} - -message Auth { - Oauth2 oauth2 = 1; -} - -message Document { - string kind = 1; - string discovery_version = 2; - string id = 3; - string name = 4; - string version = 5; - string revision = 6; - string title = 7; - string description = 8; - Icons icons = 9; - string documentation_link = 10; - repeated string labels = 11; - string protocol = 12; - string base_url = 13; - string base_path = 14; - string root_url = 15; - string service_path = 16; - string batch_path = 17; - Parameters parameters = 18; - Auth auth = 19; - repeated string features = 20; - Schemas schemas = 21; - Methods methods = 22; - Resources resources = 23; - string etag = 24; - string owner_domain = 25; - string owner_name = 26; - bool version_module = 27; - string canonical_name = 28; - bool fully_encode_reserved_expansion = 29; - string package_path = 30; - string mtls_root_url = 31; -} - -// Icons that represent the API. -message Icons { - string x16 = 1; - string x32 = 2; -} - -message MediaUpload { - repeated string accept = 1; - string max_size = 2; - Protocols protocols = 3; - bool supports_subscription = 4; -} - -message Method { - string id = 1; - string path = 2; - string http_method = 3; - string description = 4; - Parameters parameters = 5; - repeated string parameter_order = 6; - Request request = 7; - Response response = 8; - repeated string scopes = 9; - bool supports_media_download = 10; - bool supports_media_upload = 11; - bool use_media_download_service = 12; - MediaUpload media_upload = 13; - bool supports_subscription = 14; - string flat_path = 15; - bool etag_required = 16; - string streaming_type = 17; -} - -message Methods { - repeated NamedMethod additional_properties = 1; -} - -// Automatically-generated message used to represent maps of Method as ordered (name,value) pairs. -message NamedMethod { - // Map key - string name = 1; - // Mapped value - Method value = 2; -} - -// Automatically-generated message used to represent maps of Parameter as ordered (name,value) pairs. -message NamedParameter { - // Map key - string name = 1; - // Mapped value - Parameter value = 2; -} - -// Automatically-generated message used to represent maps of Resource as ordered (name,value) pairs. -message NamedResource { - // Map key - string name = 1; - // Mapped value - Resource value = 2; -} - -// Automatically-generated message used to represent maps of Schema as ordered (name,value) pairs. -message NamedSchema { - // Map key - string name = 1; - // Mapped value - Schema value = 2; -} - -// Automatically-generated message used to represent maps of Scope as ordered (name,value) pairs. -message NamedScope { - // Map key - string name = 1; - // Mapped value - Scope value = 2; -} - -message Oauth2 { - Scopes scopes = 1; -} - -message Parameter { - string id = 1; - string type = 2; - string _ref = 3; - string description = 4; - string default = 5; - bool required = 6; - string format = 7; - string pattern = 8; - string minimum = 9; - string maximum = 10; - repeated string enum = 11; - repeated string enum_descriptions = 12; - bool repeated = 13; - string location = 14; - Schemas properties = 15; - Schema additional_properties = 16; - Schema items = 17; - Annotations annotations = 18; -} - -message Parameters { - repeated NamedParameter additional_properties = 1; -} - -message Protocols { - Simple simple = 1; - Resumable resumable = 2; -} - -message Request { - string _ref = 1; - string parameter_name = 2; -} - -message Resource { - Methods methods = 1; - Resources resources = 2; -} - -message Resources { - repeated NamedResource additional_properties = 1; -} - -message Response { - string _ref = 1; -} - -message Resumable { - bool multipart = 1; - string path = 2; -} - -message Schema { - string id = 1; - string type = 2; - string description = 3; - string default = 4; - bool required = 5; - string format = 6; - string pattern = 7; - string minimum = 8; - string maximum = 9; - repeated string enum = 10; - repeated string enum_descriptions = 11; - bool repeated = 12; - string location = 13; - Schemas properties = 14; - Schema additional_properties = 15; - Schema items = 16; - string _ref = 17; - Annotations annotations = 18; - bool read_only = 19; -} - -message Schemas { - repeated NamedSchema additional_properties = 1; -} - -message Scope { - string description = 1; -} - -message Scopes { - repeated NamedScope additional_properties = 1; -} - -message Simple { - bool multipart = 1; - string path = 2; -} - -message StringArray { - repeated string value = 1; -} diff --git a/blog-backend/api/third_party/gnostic/openapi/v2/openapiv2.proto b/blog-backend/api/third_party/gnostic/openapi/v2/openapiv2.proto deleted file mode 100644 index 899d2710..00000000 --- a/blog-backend/api/third_party/gnostic/openapi/v2/openapiv2.proto +++ /dev/null @@ -1,665 +0,0 @@ -// Copyright 2020 Google LLC. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// THIS FILE IS AUTOMATICALLY GENERATED. - -syntax = "proto3"; - -package gnostic.openapi.v2; - -import "google/protobuf/any.proto"; - -// This option lets the proto compiler generate Java code inside the package -// name (see below) instead of inside an outer class. It creates a simpler -// developer experience by reducing one-level of name nesting and be -// consistent with most programming languages that don't support outer classes. -option java_multiple_files = true; - -// The Java outer classname should be the filename in UpperCamelCase. This -// class is only used to hold proto descriptor, so developers don't need to -// work with it directly. -option java_outer_classname = "OpenAPIProto"; - -// The Java package name must be proto package name with proper prefix. -option java_package = "org.openapi_v2"; - -// A reasonable prefix for the Objective-C symbols generated from the package. -// It should at a minimum be 3 characters long, all uppercase, and convention -// is to use an abbreviation of the package name. Something short, but -// hopefully unique enough to not conflict with things that may come along in -// the future. 'GPB' is reserved for the protocol buffer implementation itself. -option objc_class_prefix = "OAS"; - -// The Go package name. -option go_package = "github.com/google/gnostic/openapiv2;openapi_v2"; - -message AdditionalPropertiesItem { - oneof oneof { - Schema schema = 1; - bool boolean = 2; - } -} - -message Any { - google.protobuf.Any value = 1; - string yaml = 2; -} - -message ApiKeySecurity { - string type = 1; - string name = 2; - string in = 3; - string description = 4; - repeated NamedAny vendor_extension = 5; -} - -message BasicAuthenticationSecurity { - string type = 1; - string description = 2; - repeated NamedAny vendor_extension = 3; -} - -message BodyParameter { - // A brief description of the parameter. This could contain examples of use. GitHub Flavored Markdown is allowed. - string description = 1; - // The name of the parameter. - string name = 2; - // Determines the location of the parameter. - string in = 3; - // Determines whether or not this parameter is required or optional. - bool required = 4; - Schema schema = 5; - repeated NamedAny vendor_extension = 6; -} - -// Contact information for the owners of the API. -message Contact { - // The identifying name of the contact person/organization. - string name = 1; - // The URL pointing to the contact information. - string url = 2; - // The email address of the contact person/organization. - string email = 3; - repeated NamedAny vendor_extension = 4; -} - -message Default { - repeated NamedAny additional_properties = 1; -} - -// One or more JSON objects describing the schemas being consumed and produced by the API. -message Definitions { - repeated NamedSchema additional_properties = 1; -} - -message Document { - // The Swagger version of this document. - string swagger = 1; - Info info = 2; - // The host (name or ip) of the API. Example: 'swagger.io' - string host = 3; - // The base path to the API. Example: '/api'. - string base_path = 4; - // The transfer protocol of the API. - repeated string schemes = 5; - // A list of MIME types accepted by the API. - repeated string consumes = 6; - // A list of MIME types the API can produce. - repeated string produces = 7; - Paths paths = 8; - Definitions definitions = 9; - ParameterDefinitions parameters = 10; - ResponseDefinitions responses = 11; - repeated SecurityRequirement security = 12; - SecurityDefinitions security_definitions = 13; - repeated Tag tags = 14; - ExternalDocs external_docs = 15; - repeated NamedAny vendor_extension = 16; -} - -message Examples { - repeated NamedAny additional_properties = 1; -} - -// information about external documentation -message ExternalDocs { - string description = 1; - string url = 2; - repeated NamedAny vendor_extension = 3; -} - -// A deterministic version of a JSON Schema object. -message FileSchema { - string format = 1; - string title = 2; - string description = 3; - Any default = 4; - repeated string required = 5; - string type = 6; - bool read_only = 7; - ExternalDocs external_docs = 8; - Any example = 9; - repeated NamedAny vendor_extension = 10; -} - -message FormDataParameterSubSchema { - // Determines whether or not this parameter is required or optional. - bool required = 1; - // Determines the location of the parameter. - string in = 2; - // A brief description of the parameter. This could contain examples of use. GitHub Flavored Markdown is allowed. - string description = 3; - // The name of the parameter. - string name = 4; - // allows sending a parameter by name only or with an empty value. - bool allow_empty_value = 5; - string type = 6; - string format = 7; - PrimitivesItems items = 8; - string collection_format = 9; - Any default = 10; - double maximum = 11; - bool exclusive_maximum = 12; - double minimum = 13; - bool exclusive_minimum = 14; - int64 max_length = 15; - int64 min_length = 16; - string pattern = 17; - int64 max_items = 18; - int64 min_items = 19; - bool unique_items = 20; - repeated Any enum = 21; - double multiple_of = 22; - repeated NamedAny vendor_extension = 23; -} - -message Header { - string type = 1; - string format = 2; - PrimitivesItems items = 3; - string collection_format = 4; - Any default = 5; - double maximum = 6; - bool exclusive_maximum = 7; - double minimum = 8; - bool exclusive_minimum = 9; - int64 max_length = 10; - int64 min_length = 11; - string pattern = 12; - int64 max_items = 13; - int64 min_items = 14; - bool unique_items = 15; - repeated Any enum = 16; - double multiple_of = 17; - string description = 18; - repeated NamedAny vendor_extension = 19; -} - -message HeaderParameterSubSchema { - // Determines whether or not this parameter is required or optional. - bool required = 1; - // Determines the location of the parameter. - string in = 2; - // A brief description of the parameter. This could contain examples of use. GitHub Flavored Markdown is allowed. - string description = 3; - // The name of the parameter. - string name = 4; - string type = 5; - string format = 6; - PrimitivesItems items = 7; - string collection_format = 8; - Any default = 9; - double maximum = 10; - bool exclusive_maximum = 11; - double minimum = 12; - bool exclusive_minimum = 13; - int64 max_length = 14; - int64 min_length = 15; - string pattern = 16; - int64 max_items = 17; - int64 min_items = 18; - bool unique_items = 19; - repeated Any enum = 20; - double multiple_of = 21; - repeated NamedAny vendor_extension = 22; -} - -message Headers { - repeated NamedHeader additional_properties = 1; -} - -// General information about the API. -message Info { - // A unique and precise title of the API. - string title = 1; - // A semantic version number of the API. - string version = 2; - // A longer description of the API. Should be different from the title. GitHub Flavored Markdown is allowed. - string description = 3; - // The terms of service for the API. - string terms_of_service = 4; - Contact contact = 5; - License license = 6; - repeated NamedAny vendor_extension = 7; -} - -message ItemsItem { - repeated Schema schema = 1; -} - -message JsonReference { - string _ref = 1; - string description = 2; -} - -message License { - // The name of the license type. It's encouraged to use an OSI compatible license. - string name = 1; - // The URL pointing to the license. - string url = 2; - repeated NamedAny vendor_extension = 3; -} - -// Automatically-generated message used to represent maps of Any as ordered (name,value) pairs. -message NamedAny { - // Map key - string name = 1; - // Mapped value - Any value = 2; -} - -// Automatically-generated message used to represent maps of Header as ordered (name,value) pairs. -message NamedHeader { - // Map key - string name = 1; - // Mapped value - Header value = 2; -} - -// Automatically-generated message used to represent maps of Parameter as ordered (name,value) pairs. -message NamedParameter { - // Map key - string name = 1; - // Mapped value - Parameter value = 2; -} - -// Automatically-generated message used to represent maps of PathItem as ordered (name,value) pairs. -message NamedPathItem { - // Map key - string name = 1; - // Mapped value - PathItem value = 2; -} - -// Automatically-generated message used to represent maps of Response as ordered (name,value) pairs. -message NamedResponse { - // Map key - string name = 1; - // Mapped value - Response value = 2; -} - -// Automatically-generated message used to represent maps of ResponseValue as ordered (name,value) pairs. -message NamedResponseValue { - // Map key - string name = 1; - // Mapped value - ResponseValue value = 2; -} - -// Automatically-generated message used to represent maps of Schema as ordered (name,value) pairs. -message NamedSchema { - // Map key - string name = 1; - // Mapped value - Schema value = 2; -} - -// Automatically-generated message used to represent maps of SecurityDefinitionsItem as ordered (name,value) pairs. -message NamedSecurityDefinitionsItem { - // Map key - string name = 1; - // Mapped value - SecurityDefinitionsItem value = 2; -} - -// Automatically-generated message used to represent maps of string as ordered (name,value) pairs. -message NamedString { - // Map key - string name = 1; - // Mapped value - string value = 2; -} - -// Automatically-generated message used to represent maps of StringArray as ordered (name,value) pairs. -message NamedStringArray { - // Map key - string name = 1; - // Mapped value - StringArray value = 2; -} - -message NonBodyParameter { - oneof oneof { - HeaderParameterSubSchema header_parameter_sub_schema = 1; - FormDataParameterSubSchema form_data_parameter_sub_schema = 2; - QueryParameterSubSchema query_parameter_sub_schema = 3; - PathParameterSubSchema path_parameter_sub_schema = 4; - } -} - -message Oauth2AccessCodeSecurity { - string type = 1; - string flow = 2; - Oauth2Scopes scopes = 3; - string authorization_url = 4; - string token_url = 5; - string description = 6; - repeated NamedAny vendor_extension = 7; -} - -message Oauth2ApplicationSecurity { - string type = 1; - string flow = 2; - Oauth2Scopes scopes = 3; - string token_url = 4; - string description = 5; - repeated NamedAny vendor_extension = 6; -} - -message Oauth2ImplicitSecurity { - string type = 1; - string flow = 2; - Oauth2Scopes scopes = 3; - string authorization_url = 4; - string description = 5; - repeated NamedAny vendor_extension = 6; -} - -message Oauth2PasswordSecurity { - string type = 1; - string flow = 2; - Oauth2Scopes scopes = 3; - string token_url = 4; - string description = 5; - repeated NamedAny vendor_extension = 6; -} - -message Oauth2Scopes { - repeated NamedString additional_properties = 1; -} - -message Operation { - repeated string tags = 1; - // A brief summary of the operation. - string summary = 2; - // A longer description of the operation, GitHub Flavored Markdown is allowed. - string description = 3; - ExternalDocs external_docs = 4; - // A unique identifier of the operation. - string operation_id = 5; - // A list of MIME types the API can produce. - repeated string produces = 6; - // A list of MIME types the API can consume. - repeated string consumes = 7; - // The parameters needed to send a valid API call. - repeated ParametersItem parameters = 8; - Responses responses = 9; - // The transfer protocol of the API. - repeated string schemes = 10; - bool deprecated = 11; - repeated SecurityRequirement security = 12; - repeated NamedAny vendor_extension = 13; -} - -message Parameter { - oneof oneof { - BodyParameter body_parameter = 1; - NonBodyParameter non_body_parameter = 2; - } -} - -// One or more JSON representations for parameters -message ParameterDefinitions { - repeated NamedParameter additional_properties = 1; -} - -message ParametersItem { - oneof oneof { - Parameter parameter = 1; - JsonReference json_reference = 2; - } -} - -message PathItem { - string _ref = 1; - Operation get = 2; - Operation put = 3; - Operation post = 4; - Operation delete = 5; - Operation options = 6; - Operation head = 7; - Operation patch = 8; - // The parameters needed to send a valid API call. - repeated ParametersItem parameters = 9; - repeated NamedAny vendor_extension = 10; -} - -message PathParameterSubSchema { - // Determines whether or not this parameter is required or optional. - bool required = 1; - // Determines the location of the parameter. - string in = 2; - // A brief description of the parameter. This could contain examples of use. GitHub Flavored Markdown is allowed. - string description = 3; - // The name of the parameter. - string name = 4; - string type = 5; - string format = 6; - PrimitivesItems items = 7; - string collection_format = 8; - Any default = 9; - double maximum = 10; - bool exclusive_maximum = 11; - double minimum = 12; - bool exclusive_minimum = 13; - int64 max_length = 14; - int64 min_length = 15; - string pattern = 16; - int64 max_items = 17; - int64 min_items = 18; - bool unique_items = 19; - repeated Any enum = 20; - double multiple_of = 21; - repeated NamedAny vendor_extension = 22; -} - -// Relative paths to the individual endpoints. They must be relative to the 'basePath'. -message Paths { - repeated NamedAny vendor_extension = 1; - repeated NamedPathItem path = 2; -} - -message PrimitivesItems { - string type = 1; - string format = 2; - PrimitivesItems items = 3; - string collection_format = 4; - Any default = 5; - double maximum = 6; - bool exclusive_maximum = 7; - double minimum = 8; - bool exclusive_minimum = 9; - int64 max_length = 10; - int64 min_length = 11; - string pattern = 12; - int64 max_items = 13; - int64 min_items = 14; - bool unique_items = 15; - repeated Any enum = 16; - double multiple_of = 17; - repeated NamedAny vendor_extension = 18; -} - -message Properties { - repeated NamedSchema additional_properties = 1; -} - -message QueryParameterSubSchema { - // Determines whether or not this parameter is required or optional. - bool required = 1; - // Determines the location of the parameter. - string in = 2; - // A brief description of the parameter. This could contain examples of use. GitHub Flavored Markdown is allowed. - string description = 3; - // The name of the parameter. - string name = 4; - // allows sending a parameter by name only or with an empty value. - bool allow_empty_value = 5; - string type = 6; - string format = 7; - PrimitivesItems items = 8; - string collection_format = 9; - Any default = 10; - double maximum = 11; - bool exclusive_maximum = 12; - double minimum = 13; - bool exclusive_minimum = 14; - int64 max_length = 15; - int64 min_length = 16; - string pattern = 17; - int64 max_items = 18; - int64 min_items = 19; - bool unique_items = 20; - repeated Any enum = 21; - double multiple_of = 22; - repeated NamedAny vendor_extension = 23; -} - -message Response { - string description = 1; - SchemaItem schema = 2; - Headers headers = 3; - Examples examples = 4; - repeated NamedAny vendor_extension = 5; -} - -// One or more JSON representations for responses -message ResponseDefinitions { - repeated NamedResponse additional_properties = 1; -} - -message ResponseValue { - oneof oneof { - Response response = 1; - JsonReference json_reference = 2; - } -} - -// Response objects names can either be any valid HTTP status code or 'default'. -message Responses { - repeated NamedResponseValue response_code = 1; - repeated NamedAny vendor_extension = 2; -} - -// A deterministic version of a JSON Schema object. -message Schema { - string _ref = 1; - string format = 2; - string title = 3; - string description = 4; - Any default = 5; - double multiple_of = 6; - double maximum = 7; - bool exclusive_maximum = 8; - double minimum = 9; - bool exclusive_minimum = 10; - int64 max_length = 11; - int64 min_length = 12; - string pattern = 13; - int64 max_items = 14; - int64 min_items = 15; - bool unique_items = 16; - int64 max_properties = 17; - int64 min_properties = 18; - repeated string required = 19; - repeated Any enum = 20; - AdditionalPropertiesItem additional_properties = 21; - TypeItem type = 22; - ItemsItem items = 23; - repeated Schema all_of = 24; - Properties properties = 25; - string discriminator = 26; - bool read_only = 27; - Xml xml = 28; - ExternalDocs external_docs = 29; - Any example = 30; - repeated NamedAny vendor_extension = 31; -} - -message SchemaItem { - oneof oneof { - Schema schema = 1; - FileSchema file_schema = 2; - } -} - -message SecurityDefinitions { - repeated NamedSecurityDefinitionsItem additional_properties = 1; -} - -message SecurityDefinitionsItem { - oneof oneof { - BasicAuthenticationSecurity basic_authentication_security = 1; - ApiKeySecurity api_key_security = 2; - Oauth2ImplicitSecurity oauth2_implicit_security = 3; - Oauth2PasswordSecurity oauth2_password_security = 4; - Oauth2ApplicationSecurity oauth2_application_security = 5; - Oauth2AccessCodeSecurity oauth2_access_code_security = 6; - } -} - -message SecurityRequirement { - repeated NamedStringArray additional_properties = 1; -} - -message StringArray { - repeated string value = 1; -} - -message Tag { - string name = 1; - string description = 2; - ExternalDocs external_docs = 3; - repeated NamedAny vendor_extension = 4; -} - -message TypeItem { - repeated string value = 1; -} - -// Any property starting with x- is valid. -message VendorExtension { - repeated NamedAny additional_properties = 1; -} - -message Xml { - string name = 1; - string namespace = 2; - string prefix = 3; - bool attribute = 4; - bool wrapped = 5; - repeated NamedAny vendor_extension = 6; -} diff --git a/blog-backend/api/third_party/gnostic/openapi/v3/README.md b/blog-backend/api/third_party/gnostic/openapi/v3/README.md deleted file mode 100644 index 0b015bce..00000000 --- a/blog-backend/api/third_party/gnostic/openapi/v3/README.md +++ /dev/null @@ -1,26 +0,0 @@ -# OpenAPI v3 Protocol Buffer Models - -This directory contains a Protocol Buffer-language model and related code for -supporting OpenAPI v3. - -Gnostic applications and plugins can use OpenAPIv3.proto to generate Protocol -Buffer support code for their preferred languages. - -OpenAPIv3.go is used by Gnostic to read JSON and YAML OpenAPI descriptions into -the Protocol Buffer-based datastructures generated from OpenAPIv3.proto. - -OpenAPIv3.proto and OpenAPIv3.go are generated by the Gnostic compiler -generator, and OpenAPIv3.pb.go is generated by protoc, the Protocol Buffer -compiler, and protoc-gen-go, the Protocol Buffer Go code generation plugin. - -openapi-3.1.json is a JSON schema for OpenAPI 3.1 that is automatically -generated from the OpenAPI 3.1 specification. It is not an official JSON Schema -for OpenAPI. - -The schema-generator directory contains support code which generates -openapi-3.1.json from the OpenAPI 3.1 specification document (Markdown). - -### How to rebuild - -Run: -`COMPILE-PROTOS.sh` diff --git a/blog-backend/api/third_party/gnostic/openapi/v3/annotations.proto b/blog-backend/api/third_party/gnostic/openapi/v3/annotations.proto deleted file mode 100644 index 1b1a13fe..00000000 --- a/blog-backend/api/third_party/gnostic/openapi/v3/annotations.proto +++ /dev/null @@ -1,60 +0,0 @@ -// Copyright 2022 Google LLC. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -package gnostic.openapi.v3; - -import "gnostic/openapi/v3/openapiv3.proto"; -import "google/protobuf/descriptor.proto"; - -// This option lets the proto compiler generate Java code inside the package -// name (see below) instead of inside an outer class. It creates a simpler -// developer experience by reducing one-level of name nesting and be -// consistent with most programming languages that don't support outer classes. -option java_multiple_files = true; - -// The Java outer classname should be the filename in UpperCamelCase. This -// class is only used to hold proto descriptor, so developers don't need to -// work with it directly. -option java_outer_classname = "AnnotationsProto"; - -// The Java package name must be proto package name with proper prefix. -option java_package = "org.openapi_v3"; - -// A reasonable prefix for the Objective-C symbols generated from the package. -// It should at a minimum be 3 characters long, all uppercase, and convention -// is to use an abbreviation of the package name. Something short, but -// hopefully unique enough to not conflict with things that may come along in -// the future. 'GPB' is reserved for the protocol buffer implementation itself. -option objc_class_prefix = "OAS"; - -// The Go package name. -option go_package = "github.com/google/gnostic/openapiv3;openapi_v3"; - -extend google.protobuf.FileOptions { - Document document = 1143; -} - -extend google.protobuf.MethodOptions { - Operation operation = 1143; -} - -extend google.protobuf.MessageOptions { - Schema schema = 1143; -} - -extend google.protobuf.FieldOptions { - Schema property = 1143; -} diff --git a/blog-backend/api/third_party/gnostic/openapi/v3/openapiv3.proto b/blog-backend/api/third_party/gnostic/openapi/v3/openapiv3.proto deleted file mode 100644 index e7835644..00000000 --- a/blog-backend/api/third_party/gnostic/openapi/v3/openapiv3.proto +++ /dev/null @@ -1,671 +0,0 @@ -// Copyright 2020 Google LLC. All Rights Reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -// THIS FILE IS AUTOMATICALLY GENERATED. - -syntax = "proto3"; - -package gnostic.openapi.v3; - -import "google/protobuf/any.proto"; - -// This option lets the proto compiler generate Java code inside the package -// name (see below) instead of inside an outer class. It creates a simpler -// developer experience by reducing one-level of name nesting and be -// consistent with most programming languages that don't support outer classes. -option java_multiple_files = true; - -// The Java outer classname should be the filename in UpperCamelCase. This -// class is only used to hold proto descriptor, so developers don't need to -// work with it directly. -option java_outer_classname = "OpenAPIProto"; - -// The Java package name must be proto package name with proper prefix. -option java_package = "org.openapi_v3"; - -// A reasonable prefix for the Objective-C symbols generated from the package. -// It should at a minimum be 3 characters long, all uppercase, and convention -// is to use an abbreviation of the package name. Something short, but -// hopefully unique enough to not conflict with things that may come along in -// the future. 'GPB' is reserved for the protocol buffer implementation itself. -option objc_class_prefix = "OAS"; - -// The Go package name. -option go_package = "github.com/google/gnostic/openapiv3;openapi_v3"; - -message AdditionalPropertiesItem { - oneof oneof { - SchemaOrReference schema_or_reference = 1; - bool boolean = 2; - } -} - -message Any { - google.protobuf.Any value = 1; - string yaml = 2; -} - -message AnyOrExpression { - oneof oneof { - Any any = 1; - Expression expression = 2; - } -} - -// A map of possible out-of band callbacks related to the parent operation. Each value in the map is a Path Item Object that describes a set of requests that may be initiated by the API provider and the expected responses. The key value used to identify the callback object is an expression, evaluated at runtime, that identifies a URL to use for the callback operation. -message Callback { - repeated NamedPathItem path = 1; - repeated NamedAny specification_extension = 2; -} - -message CallbackOrReference { - oneof oneof { - Callback callback = 1; - Reference reference = 2; - } -} - -message CallbacksOrReferences { - repeated NamedCallbackOrReference additional_properties = 1; -} - -// Holds a set of reusable objects for different aspects of the OAS. All objects defined within the components object will have no effect on the API unless they are explicitly referenced from properties outside the components object. -message Components { - SchemasOrReferences schemas = 1; - ResponsesOrReferences responses = 2; - ParametersOrReferences parameters = 3; - ExamplesOrReferences examples = 4; - RequestBodiesOrReferences request_bodies = 5; - HeadersOrReferences headers = 6; - SecuritySchemesOrReferences security_schemes = 7; - LinksOrReferences links = 8; - CallbacksOrReferences callbacks = 9; - repeated NamedAny specification_extension = 10; -} - -// Contact information for the exposed API. -message Contact { - string name = 1; - string url = 2; - string email = 3; - repeated NamedAny specification_extension = 4; -} - -message DefaultType { - oneof oneof { - double number = 1; - bool boolean = 2; - string string = 3; - } -} - -// When request bodies or response payloads may be one of a number of different schemas, a `discriminator` object can be used to aid in serialization, deserialization, and validation. The discriminator is a specific object in a schema which is used to inform the consumer of the specification of an alternative schema based on the value associated with it. When using the discriminator, _inline_ schemas will not be considered. -message Discriminator { - string property_name = 1; - Strings mapping = 2; - repeated NamedAny specification_extension = 3; -} - -message Document { - string openapi = 1; - Info info = 2; - repeated Server servers = 3; - Paths paths = 4; - Components components = 5; - repeated SecurityRequirement security = 6; - repeated Tag tags = 7; - ExternalDocs external_docs = 8; - repeated NamedAny specification_extension = 9; -} - -// A single encoding definition applied to a single schema property. -message Encoding { - string content_type = 1; - HeadersOrReferences headers = 2; - string style = 3; - bool explode = 4; - bool allow_reserved = 5; - repeated NamedAny specification_extension = 6; -} - -message Encodings { - repeated NamedEncoding additional_properties = 1; -} - -message Example { - string summary = 1; - string description = 2; - Any value = 3; - string external_value = 4; - repeated NamedAny specification_extension = 5; -} - -message ExampleOrReference { - oneof oneof { - Example example = 1; - Reference reference = 2; - } -} - -message ExamplesOrReferences { - repeated NamedExampleOrReference additional_properties = 1; -} - -message Expression { - repeated NamedAny additional_properties = 1; -} - -// Allows referencing an external resource for extended documentation. -message ExternalDocs { - string description = 1; - string url = 2; - repeated NamedAny specification_extension = 3; -} - -// The Header Object follows the structure of the Parameter Object with the following changes: 1. `name` MUST NOT be specified, it is given in the corresponding `headers` map. 1. `in` MUST NOT be specified, it is implicitly in `header`. 1. All traits that are affected by the location MUST be applicable to a location of `header` (for example, `style`). -message Header { - string description = 1; - bool required = 2; - bool deprecated = 3; - bool allow_empty_value = 4; - string style = 5; - bool explode = 6; - bool allow_reserved = 7; - SchemaOrReference schema = 8; - Any example = 9; - ExamplesOrReferences examples = 10; - MediaTypes content = 11; - repeated NamedAny specification_extension = 12; -} - -message HeaderOrReference { - oneof oneof { - Header header = 1; - Reference reference = 2; - } -} - -message HeadersOrReferences { - repeated NamedHeaderOrReference additional_properties = 1; -} - -// The object provides metadata about the API. The metadata MAY be used by the clients if needed, and MAY be presented in editing or documentation generation tools for convenience. -message Info { - string title = 1; - string description = 2; - string terms_of_service = 3; - Contact contact = 4; - License license = 5; - string version = 6; - repeated NamedAny specification_extension = 7; - string summary = 8; -} - -message ItemsItem { - repeated SchemaOrReference schema_or_reference = 1; -} - -// License information for the exposed API. -message License { - string name = 1; - string url = 2; - repeated NamedAny specification_extension = 3; -} - -// The `Link object` represents a possible design-time link for a response. The presence of a link does not guarantee the caller's ability to successfully invoke it, rather it provides a known relationship and traversal mechanism between responses and other operations. Unlike _dynamic_ links (i.e. links provided **in** the response payload), the OAS linking mechanism does not require link information in the runtime response. For computing links, and providing instructions to execute them, a runtime expression is used for accessing values in an operation and using them as parameters while invoking the linked operation. -message Link { - string operation_ref = 1; - string operation_id = 2; - AnyOrExpression parameters = 3; - AnyOrExpression request_body = 4; - string description = 5; - Server server = 6; - repeated NamedAny specification_extension = 7; -} - -message LinkOrReference { - oneof oneof { - Link link = 1; - Reference reference = 2; - } -} - -message LinksOrReferences { - repeated NamedLinkOrReference additional_properties = 1; -} - -// Each Media Type Object provides schema and examples for the media type identified by its key. -message MediaType { - SchemaOrReference schema = 1; - Any example = 2; - ExamplesOrReferences examples = 3; - Encodings encoding = 4; - repeated NamedAny specification_extension = 5; -} - -message MediaTypes { - repeated NamedMediaType additional_properties = 1; -} - -// Automatically-generated message used to represent maps of Any as ordered (name,value) pairs. -message NamedAny { - // Map key - string name = 1; - // Mapped value - Any value = 2; -} - -// Automatically-generated message used to represent maps of CallbackOrReference as ordered (name,value) pairs. -message NamedCallbackOrReference { - // Map key - string name = 1; - // Mapped value - CallbackOrReference value = 2; -} - -// Automatically-generated message used to represent maps of Encoding as ordered (name,value) pairs. -message NamedEncoding { - // Map key - string name = 1; - // Mapped value - Encoding value = 2; -} - -// Automatically-generated message used to represent maps of ExampleOrReference as ordered (name,value) pairs. -message NamedExampleOrReference { - // Map key - string name = 1; - // Mapped value - ExampleOrReference value = 2; -} - -// Automatically-generated message used to represent maps of HeaderOrReference as ordered (name,value) pairs. -message NamedHeaderOrReference { - // Map key - string name = 1; - // Mapped value - HeaderOrReference value = 2; -} - -// Automatically-generated message used to represent maps of LinkOrReference as ordered (name,value) pairs. -message NamedLinkOrReference { - // Map key - string name = 1; - // Mapped value - LinkOrReference value = 2; -} - -// Automatically-generated message used to represent maps of MediaType as ordered (name,value) pairs. -message NamedMediaType { - // Map key - string name = 1; - // Mapped value - MediaType value = 2; -} - -// Automatically-generated message used to represent maps of ParameterOrReference as ordered (name,value) pairs. -message NamedParameterOrReference { - // Map key - string name = 1; - // Mapped value - ParameterOrReference value = 2; -} - -// Automatically-generated message used to represent maps of PathItem as ordered (name,value) pairs. -message NamedPathItem { - // Map key - string name = 1; - // Mapped value - PathItem value = 2; -} - -// Automatically-generated message used to represent maps of RequestBodyOrReference as ordered (name,value) pairs. -message NamedRequestBodyOrReference { - // Map key - string name = 1; - // Mapped value - RequestBodyOrReference value = 2; -} - -// Automatically-generated message used to represent maps of ResponseOrReference as ordered (name,value) pairs. -message NamedResponseOrReference { - // Map key - string name = 1; - // Mapped value - ResponseOrReference value = 2; -} - -// Automatically-generated message used to represent maps of SchemaOrReference as ordered (name,value) pairs. -message NamedSchemaOrReference { - // Map key - string name = 1; - // Mapped value - SchemaOrReference value = 2; -} - -// Automatically-generated message used to represent maps of SecuritySchemeOrReference as ordered (name,value) pairs. -message NamedSecuritySchemeOrReference { - // Map key - string name = 1; - // Mapped value - SecuritySchemeOrReference value = 2; -} - -// Automatically-generated message used to represent maps of ServerVariable as ordered (name,value) pairs. -message NamedServerVariable { - // Map key - string name = 1; - // Mapped value - ServerVariable value = 2; -} - -// Automatically-generated message used to represent maps of string as ordered (name,value) pairs. -message NamedString { - // Map key - string name = 1; - // Mapped value - string value = 2; -} - -// Automatically-generated message used to represent maps of StringArray as ordered (name,value) pairs. -message NamedStringArray { - // Map key - string name = 1; - // Mapped value - StringArray value = 2; -} - -// Configuration details for a supported OAuth Flow -message OauthFlow { - string authorization_url = 1; - string token_url = 2; - string refresh_url = 3; - Strings scopes = 4; - repeated NamedAny specification_extension = 5; -} - -// Allows configuration of the supported OAuth Flows. -message OauthFlows { - OauthFlow implicit = 1; - OauthFlow password = 2; - OauthFlow client_credentials = 3; - OauthFlow authorization_code = 4; - repeated NamedAny specification_extension = 5; -} - -message Object { - repeated NamedAny additional_properties = 1; -} - -// Describes a single API operation on a path. -message Operation { - repeated string tags = 1; - string summary = 2; - string description = 3; - ExternalDocs external_docs = 4; - string operation_id = 5; - repeated ParameterOrReference parameters = 6; - RequestBodyOrReference request_body = 7; - Responses responses = 8; - CallbacksOrReferences callbacks = 9; - bool deprecated = 10; - repeated SecurityRequirement security = 11; - repeated Server servers = 12; - repeated NamedAny specification_extension = 13; -} - -// Describes a single operation parameter. A unique parameter is defined by a combination of a name and location. -message Parameter { - string name = 1; - string in = 2; - string description = 3; - bool required = 4; - bool deprecated = 5; - bool allow_empty_value = 6; - string style = 7; - bool explode = 8; - bool allow_reserved = 9; - SchemaOrReference schema = 10; - Any example = 11; - ExamplesOrReferences examples = 12; - MediaTypes content = 13; - repeated NamedAny specification_extension = 14; -} - -message ParameterOrReference { - oneof oneof { - Parameter parameter = 1; - Reference reference = 2; - } -} - -message ParametersOrReferences { - repeated NamedParameterOrReference additional_properties = 1; -} - -// Describes the operations available on a single path. A Path Item MAY be empty, due to ACL constraints. The path itself is still exposed to the documentation viewer but they will not know which operations and parameters are available. -message PathItem { - string _ref = 1; - string summary = 2; - string description = 3; - Operation get = 4; - Operation put = 5; - Operation post = 6; - Operation delete = 7; - Operation options = 8; - Operation head = 9; - Operation patch = 10; - Operation trace = 11; - repeated Server servers = 12; - repeated ParameterOrReference parameters = 13; - repeated NamedAny specification_extension = 14; -} - -// Holds the relative paths to the individual endpoints and their operations. The path is appended to the URL from the `Server Object` in order to construct the full URL. The Paths MAY be empty, due to ACL constraints. -message Paths { - repeated NamedPathItem path = 1; - repeated NamedAny specification_extension = 2; -} - -message Properties { - repeated NamedSchemaOrReference additional_properties = 1; -} - -// A simple object to allow referencing other components in the specification, internally and externally. The Reference Object is defined by JSON Reference and follows the same structure, behavior and rules. For this specification, reference resolution is accomplished as defined by the JSON Reference specification and not by the JSON Schema specification. -message Reference { - string _ref = 1; - string summary = 2; - string description = 3; -} - -message RequestBodiesOrReferences { - repeated NamedRequestBodyOrReference additional_properties = 1; -} - -// Describes a single request body. -message RequestBody { - string description = 1; - MediaTypes content = 2; - bool required = 3; - repeated NamedAny specification_extension = 4; -} - -message RequestBodyOrReference { - oneof oneof { - RequestBody request_body = 1; - Reference reference = 2; - } -} - -// Describes a single response from an API Operation, including design-time, static `links` to operations based on the response. -message Response { - string description = 1; - HeadersOrReferences headers = 2; - MediaTypes content = 3; - LinksOrReferences links = 4; - repeated NamedAny specification_extension = 5; -} - -message ResponseOrReference { - oneof oneof { - Response response = 1; - Reference reference = 2; - } -} - -// A container for the expected responses of an operation. The container maps a HTTP response code to the expected response. The documentation is not necessarily expected to cover all possible HTTP response codes because they may not be known in advance. However, documentation is expected to cover a successful operation response and any known errors. The `default` MAY be used as a default response object for all HTTP codes that are not covered individually by the specification. The `Responses Object` MUST contain at least one response code, and it SHOULD be the response for a successful operation call. -message Responses { - ResponseOrReference default = 1; - repeated NamedResponseOrReference response_or_reference = 2; - repeated NamedAny specification_extension = 3; -} - -message ResponsesOrReferences { - repeated NamedResponseOrReference additional_properties = 1; -} - -// The Schema Object allows the definition of input and output data types. These types can be objects, but also primitives and arrays. This object is an extended subset of the JSON Schema Specification Wright Draft 00. For more information about the properties, see JSON Schema Core and JSON Schema Validation. Unless stated otherwise, the property definitions follow the JSON Schema. -message Schema { - bool nullable = 1; - Discriminator discriminator = 2; - bool read_only = 3; - bool write_only = 4; - Xml xml = 5; - ExternalDocs external_docs = 6; - Any example = 7; - bool deprecated = 8; - string title = 9; - double multiple_of = 10; - double maximum = 11; - bool exclusive_maximum = 12; - double minimum = 13; - bool exclusive_minimum = 14; - int64 max_length = 15; - int64 min_length = 16; - string pattern = 17; - int64 max_items = 18; - int64 min_items = 19; - bool unique_items = 20; - int64 max_properties = 21; - int64 min_properties = 22; - repeated string required = 23; - repeated Any enum = 24; - string type = 25; - repeated SchemaOrReference all_of = 26; - repeated SchemaOrReference one_of = 27; - repeated SchemaOrReference any_of = 28; - Schema not = 29; - ItemsItem items = 30; - Properties properties = 31; - AdditionalPropertiesItem additional_properties = 32; - DefaultType default = 33; - string description = 34; - string format = 35; - repeated NamedAny specification_extension = 36; -} - -message SchemaOrReference { - oneof oneof { - Schema schema = 1; - Reference reference = 2; - } -} - -message SchemasOrReferences { - repeated NamedSchemaOrReference additional_properties = 1; -} - -// Lists the required security schemes to execute this operation. The name used for each property MUST correspond to a security scheme declared in the Security Schemes under the Components Object. Security Requirement Objects that contain multiple schemes require that all schemes MUST be satisfied for a request to be authorized. This enables support for scenarios where multiple query parameters or HTTP headers are required to convey security information. When a list of Security Requirement Objects is defined on the OpenAPI Object or Operation Object, only one of the Security Requirement Objects in the list needs to be satisfied to authorize the request. -message SecurityRequirement { - repeated NamedStringArray additional_properties = 1; -} - -// Defines a security scheme that can be used by the operations. Supported schemes are HTTP authentication, an API key (either as a header, a cookie parameter or as a query parameter), mutual TLS (use of a client certificate), OAuth2's common flows (implicit, password, application and access code) as defined in RFC6749, and OpenID Connect. Please note that currently (2019) the implicit flow is about to be deprecated OAuth 2.0 Security Best Current Practice. Recommended for most use case is Authorization Code Grant flow with PKCE. -message SecurityScheme { - string type = 1; - string description = 2; - string name = 3; - string in = 4; - string scheme = 5; - string bearer_format = 6; - OauthFlows flows = 7; - string open_id_connect_url = 8; - repeated NamedAny specification_extension = 9; -} - -message SecuritySchemeOrReference { - oneof oneof { - SecurityScheme security_scheme = 1; - Reference reference = 2; - } -} - -message SecuritySchemesOrReferences { - repeated NamedSecuritySchemeOrReference additional_properties = 1; -} - -// An object representing a Server. -message Server { - string url = 1; - string description = 2; - ServerVariables variables = 3; - repeated NamedAny specification_extension = 4; -} - -// An object representing a Server Variable for server URL template substitution. -message ServerVariable { - repeated string enum = 1; - string default = 2; - string description = 3; - repeated NamedAny specification_extension = 4; -} - -message ServerVariables { - repeated NamedServerVariable additional_properties = 1; -} - -// Any property starting with x- is valid. -message SpecificationExtension { - oneof oneof { - double number = 1; - bool boolean = 2; - string string = 3; - } -} - -message StringArray { - repeated string value = 1; -} - -message Strings { - repeated NamedString additional_properties = 1; -} - -// Adds metadata to a single tag that is used by the Operation Object. It is not mandatory to have a Tag Object per tag defined in the Operation Object instances. -message Tag { - string name = 1; - string description = 2; - ExternalDocs external_docs = 3; - repeated NamedAny specification_extension = 4; -} - -// A metadata object that allows for more fine-tuned XML model definitions. When using arrays, XML element names are *not* inferred (for singular/plural forms) and the `name` property SHOULD be used to add that information. See examples for expected behavior. -message Xml { - string name = 1; - string namespace = 2; - string prefix = 3; - bool attribute = 4; - bool wrapped = 5; - repeated NamedAny specification_extension = 6; -} diff --git a/blog-backend/api/third_party/google/api/annotations.proto b/blog-backend/api/third_party/google/api/annotations.proto deleted file mode 100644 index efdab3db..00000000 --- a/blog-backend/api/third_party/google/api/annotations.proto +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright 2015 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -package google.api; - -import "google/api/http.proto"; -import "google/protobuf/descriptor.proto"; - -option go_package = "google.golang.org/genproto/googleapis/api/annotations;annotations"; -option java_multiple_files = true; -option java_outer_classname = "AnnotationsProto"; -option java_package = "com.google.api"; -option objc_class_prefix = "GAPI"; - -extend google.protobuf.MethodOptions { - // See `HttpRule`. - HttpRule http = 72295728; -} diff --git a/blog-backend/api/third_party/google/api/field_behavior.proto b/blog-backend/api/third_party/google/api/field_behavior.proto deleted file mode 100644 index c4abe3b6..00000000 --- a/blog-backend/api/third_party/google/api/field_behavior.proto +++ /dev/null @@ -1,90 +0,0 @@ -// Copyright 2018 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -package google.api; - -import "google/protobuf/descriptor.proto"; - -option go_package = "google.golang.org/genproto/googleapis/api/annotations;annotations"; -option java_multiple_files = true; -option java_outer_classname = "FieldBehaviorProto"; -option java_package = "com.google.api"; -option objc_class_prefix = "GAPI"; - -extend google.protobuf.FieldOptions { - // A designation of a specific field behavior (required, output only, etc.) - // in protobuf messages. - // - // Examples: - // - // string name = 1 [(google.api.field_behavior) = REQUIRED]; - // State state = 1 [(google.api.field_behavior) = OUTPUT_ONLY]; - // google.protobuf.Duration ttl = 1 - // [(google.api.field_behavior) = INPUT_ONLY]; - // google.protobuf.Timestamp expire_time = 1 - // [(google.api.field_behavior) = OUTPUT_ONLY, - // (google.api.field_behavior) = IMMUTABLE]; - repeated google.api.FieldBehavior field_behavior = 1052; -} - -// An indicator of the behavior of a given field (for example, that a field -// is required in requests, or given as output but ignored as input). -// This **does not** change the behavior in protocol buffers itself; it only -// denotes the behavior and may affect how API tooling handles the field. -// -// Note: This enum **may** receive new values in the future. -enum FieldBehavior { - // Conventional default for enums. Do not use this. - FIELD_BEHAVIOR_UNSPECIFIED = 0; - - // Specifically denotes a field as optional. - // While all fields in protocol buffers are optional, this may be specified - // for emphasis if appropriate. - OPTIONAL = 1; - - // Denotes a field as required. - // This indicates that the field **must** be provided as part of the request, - // and failure to do so will cause an error (usually `INVALID_ARGUMENT`). - REQUIRED = 2; - - // Denotes a field as output only. - // This indicates that the field is provided in responses, but including the - // field in a request does nothing (the server *must* ignore it and - // *must not* throw an error as a result of the field's presence). - OUTPUT_ONLY = 3; - - // Denotes a field as input only. - // This indicates that the field is provided in requests, and the - // corresponding field is not included in output. - INPUT_ONLY = 4; - - // Denotes a field as immutable. - // This indicates that the field may be set once in a request to create a - // resource, but may not be changed thereafter. - IMMUTABLE = 5; - - // Denotes that a (repeated) field is an unordered list. - // This indicates that the service may provide the elements of the list - // in any arbitrary order, rather than the order the user originally - // provided. Additionally, the list's order may or may not be stable. - UNORDERED_LIST = 6; - - // Denotes that this field returns a non-empty default value if not set. - // This indicates that if the user provides the empty value in a request, - // a non-empty value will be returned. The user will not be aware of what - // non-empty value to expect. - NON_EMPTY_DEFAULT = 7; -} diff --git a/blog-backend/api/third_party/google/api/http.proto b/blog-backend/api/third_party/google/api/http.proto deleted file mode 100644 index 69460cf7..00000000 --- a/blog-backend/api/third_party/google/api/http.proto +++ /dev/null @@ -1,375 +0,0 @@ -// Copyright 2020 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -package google.api; - -option cc_enable_arenas = true; -option go_package = "google.golang.org/genproto/googleapis/api/annotations;annotations"; -option java_multiple_files = true; -option java_outer_classname = "HttpProto"; -option java_package = "com.google.api"; -option objc_class_prefix = "GAPI"; - -// Defines the HTTP configuration for an API service. It contains a list of -// [HttpRule][google.api.HttpRule], each specifying the mapping of an RPC method -// to one or more HTTP REST API methods. -message Http { - // A list of HTTP configuration rules that apply to individual API methods. - // - // **NOTE:** All service configuration rules follow "last one wins" order. - repeated HttpRule rules = 1; - - // When set to true, URL path parameters will be fully URI-decoded except in - // cases of single segment matches in reserved expansion, where "%2F" will be - // left encoded. - // - // The default behavior is to not decode RFC 6570 reserved characters in multi - // segment matches. - bool fully_decode_reserved_expansion = 2; -} - -// # gRPC Transcoding -// -// gRPC Transcoding is a feature for mapping between a gRPC method and one or -// more HTTP REST endpoints. It allows developers to build a single API service -// that supports both gRPC APIs and REST APIs. Many systems, including [Google -// APIs](https://github.com/googleapis/googleapis), -// [Cloud Endpoints](https://cloud.google.com/endpoints), [gRPC -// Gateway](https://github.com/grpc-ecosystem/grpc-gateway), -// and [Envoy](https://github.com/envoyproxy/envoy) proxy support this feature -// and use it for large scale production services. -// -// `HttpRule` defines the schema of the gRPC/REST mapping. The mapping specifies -// how different portions of the gRPC request message are mapped to the URL -// path, URL query parameters, and HTTP request body. It also controls how the -// gRPC response message is mapped to the HTTP response body. `HttpRule` is -// typically specified as an `google.api.http` annotation on the gRPC method. -// -// Each mapping specifies a URL path template and an HTTP method. The path -// template may refer to one or more fields in the gRPC request message, as long -// as each field is a non-repeated field with a primitive (non-message) type. -// The path template controls how fields of the request message are mapped to -// the URL path. -// -// Example: -// -// service Messaging { -// rpc GetMessage(GetMessageRequest) returns (Message) { -// option (google.api.http) = { -// get: "/v1/{name=messages/*}" -// }; -// } -// } -// message GetMessageRequest { -// string name = 1; // Mapped to URL path. -// } -// message Message { -// string text = 1; // The resource content. -// } -// -// This enables an HTTP REST to gRPC mapping as below: -// -// HTTP | gRPC -// -----|----- -// `GET /v1/messages/123456` | `GetMessage(name: "messages/123456")` -// -// Any fields in the request message which are not bound by the path template -// automatically become HTTP query parameters if there is no HTTP request body. -// For example: -// -// service Messaging { -// rpc GetMessage(GetMessageRequest) returns (Message) { -// option (google.api.http) = { -// get:"/v1/messages/{message_id}" -// }; -// } -// } -// message GetMessageRequest { -// message SubMessage { -// string subfield = 1; -// } -// string message_id = 1; // Mapped to URL path. -// int64 revision = 2; // Mapped to URL query parameter `revision`. -// SubMessage sub = 3; // Mapped to URL query parameter `sub.subfield`. -// } -// -// This enables a HTTP JSON to RPC mapping as below: -// -// HTTP | gRPC -// -----|----- -// `GET /v1/messages/123456?revision=2&sub.subfield=foo` | -// `GetMessage(message_id: "123456" revision: 2 sub: SubMessage(subfield: -// "foo"))` -// -// Note that fields which are mapped to URL query parameters must have a -// primitive type or a repeated primitive type or a non-repeated message type. -// In the case of a repeated type, the parameter can be repeated in the URL -// as `...?param=A¶m=B`. In the case of a message type, each field of the -// message is mapped to a separate parameter, such as -// `...?foo.a=A&foo.b=B&foo.c=C`. -// -// For HTTP methods that allow a request body, the `body` field -// specifies the mapping. Consider a REST update method on the -// message resource collection: -// -// service Messaging { -// rpc UpdateMessage(UpdateMessageRequest) returns (Message) { -// option (google.api.http) = { -// patch: "/v1/messages/{message_id}" -// body: "message" -// }; -// } -// } -// message UpdateMessageRequest { -// string message_id = 1; // mapped to the URL -// Message message = 2; // mapped to the body -// } -// -// The following HTTP JSON to RPC mapping is enabled, where the -// representation of the JSON in the request body is determined by -// protos JSON encoding: -// -// HTTP | gRPC -// -----|----- -// `PATCH /v1/messages/123456 { "text": "Hi!" }` | `UpdateMessage(message_id: -// "123456" message { text: "Hi!" })` -// -// The special name `*` can be used in the body mapping to define that -// every field not bound by the path template should be mapped to the -// request body. This enables the following alternative definition of -// the update method: -// -// service Messaging { -// rpc UpdateMessage(Message) returns (Message) { -// option (google.api.http) = { -// patch: "/v1/messages/{message_id}" -// body: "*" -// }; -// } -// } -// message Message { -// string message_id = 1; -// string text = 2; -// } -// -// -// The following HTTP JSON to RPC mapping is enabled: -// -// HTTP | gRPC -// -----|----- -// `PATCH /v1/messages/123456 { "text": "Hi!" }` | `UpdateMessage(message_id: -// "123456" text: "Hi!")` -// -// Note that when using `*` in the body mapping, it is not possible to -// have HTTP parameters, as all fields not bound by the path end in -// the body. This makes this option more rarely used in practice when -// defining REST APIs. The common usage of `*` is in custom methods -// which don't use the URL at all for transferring data. -// -// It is possible to define multiple HTTP methods for one RPC by using -// the `additional_bindings` option. Example: -// -// service Messaging { -// rpc GetMessage(GetMessageRequest) returns (Message) { -// option (google.api.http) = { -// get: "/v1/messages/{message_id}" -// additional_bindings { -// get: "/v1/users/{user_id}/messages/{message_id}" -// } -// }; -// } -// } -// message GetMessageRequest { -// string message_id = 1; -// string user_id = 2; -// } -// -// This enables the following two alternative HTTP JSON to RPC mappings: -// -// HTTP | gRPC -// -----|----- -// `GET /v1/messages/123456` | `GetMessage(message_id: "123456")` -// `GET /v1/users/me/messages/123456` | `GetMessage(user_id: "me" message_id: -// "123456")` -// -// ## Rules for HTTP mapping -// -// 1. Leaf request fields (recursive expansion nested messages in the request -// message) are classified into three categories: -// - Fields referred by the path template. They are passed via the URL path. -// - Fields referred by the [HttpRule.body][google.api.HttpRule.body]. They are passed via the HTTP -// request body. -// - All other fields are passed via the URL query parameters, and the -// parameter name is the field path in the request message. A repeated -// field can be represented as multiple query parameters under the same -// name. -// 2. If [HttpRule.body][google.api.HttpRule.body] is "*", there is no URL query parameter, all fields -// are passed via URL path and HTTP request body. -// 3. If [HttpRule.body][google.api.HttpRule.body] is omitted, there is no HTTP request body, all -// fields are passed via URL path and URL query parameters. -// -// ### Path template syntax -// -// Template = "/" Segments [ Verb ] ; -// Segments = Segment { "/" Segment } ; -// Segment = "*" | "**" | LITERAL | Variable ; -// Variable = "{" FieldPath [ "=" Segments ] "}" ; -// FieldPath = IDENT { "." IDENT } ; -// Verb = ":" LITERAL ; -// -// The syntax `*` matches a single URL path segment. The syntax `**` matches -// zero or more URL path segments, which must be the last part of the URL path -// except the `Verb`. -// -// The syntax `Variable` matches part of the URL path as specified by its -// template. A variable template must not contain other variables. If a variable -// matches a single path segment, its template may be omitted, e.g. `{var}` -// is equivalent to `{var=*}`. -// -// The syntax `LITERAL` matches literal text in the URL path. If the `LITERAL` -// contains any reserved character, such characters should be percent-encoded -// before the matching. -// -// If a variable contains exactly one path segment, such as `"{var}"` or -// `"{var=*}"`, when such a variable is expanded into a URL path on the client -// side, all characters except `[-_.~0-9a-zA-Z]` are percent-encoded. The -// server side does the reverse decoding. Such variables show up in the -// [Discovery -// Document](https://developers.google.com/discovery/v1/reference/apis) as -// `{var}`. -// -// If a variable contains multiple path segments, such as `"{var=foo/*}"` -// or `"{var=**}"`, when such a variable is expanded into a URL path on the -// client side, all characters except `[-_.~/0-9a-zA-Z]` are percent-encoded. -// The server side does the reverse decoding, except "%2F" and "%2f" are left -// unchanged. Such variables show up in the -// [Discovery -// Document](https://developers.google.com/discovery/v1/reference/apis) as -// `{+var}`. -// -// ## Using gRPC API Service Configuration -// -// gRPC API Service Configuration (service config) is a configuration language -// for configuring a gRPC service to become a user-facing product. The -// service config is simply the YAML representation of the `google.api.Service` -// proto message. -// -// As an alternative to annotating your proto file, you can configure gRPC -// transcoding in your service config YAML files. You do this by specifying a -// `HttpRule` that maps the gRPC method to a REST endpoint, achieving the same -// effect as the proto annotation. This can be particularly useful if you -// have a proto that is reused in multiple services. Note that any transcoding -// specified in the service config will override any matching transcoding -// configuration in the proto. -// -// Example: -// -// http: -// rules: -// # Selects a gRPC method and applies HttpRule to it. -// - selector: example.v1.Messaging.GetMessage -// get: /v1/messages/{message_id}/{sub.subfield} -// -// ## Special notes -// -// When gRPC Transcoding is used to map a gRPC to JSON REST endpoints, the -// proto to JSON conversion must follow the [proto3 -// specification](https://developers.google.com/protocol-buffers/docs/proto3#json). -// -// While the single segment variable follows the semantics of -// [RFC 6570](https://tools.ietf.org/html/rfc6570) Section 3.2.2 Simple String -// Expansion, the multi segment variable **does not** follow RFC 6570 Section -// 3.2.3 Reserved Expansion. The reason is that the Reserved Expansion -// does not expand special characters like `?` and `#`, which would lead -// to invalid URLs. As the result, gRPC Transcoding uses a custom encoding -// for multi segment variables. -// -// The path variables **must not** refer to any repeated or mapped field, -// because client libraries are not capable of handling such variable expansion. -// -// The path variables **must not** capture the leading "/" character. The reason -// is that the most common use case "{var}" does not capture the leading "/" -// character. For consistency, all path variables must share the same behavior. -// -// Repeated message fields must not be mapped to URL query parameters, because -// no client library can support such complicated mapping. -// -// If an API needs to use a JSON array for request or response body, it can map -// the request or response body to a repeated field. However, some gRPC -// Transcoding implementations may not support this feature. -message HttpRule { - // Selects a method to which this rule applies. - // - // Refer to [selector][google.api.DocumentationRule.selector] for syntax details. - string selector = 1; - - // Determines the URL pattern is matched by this rules. This pattern can be - // used with any of the {get|put|post|delete|patch} methods. A custom method - // can be defined using the 'custom' field. - oneof pattern { - // Maps to HTTP GET. Used for listing and getting information about - // resources. - string get = 2; - - // Maps to HTTP PUT. Used for replacing a resource. - string put = 3; - - // Maps to HTTP POST. Used for creating a resource or performing an action. - string post = 4; - - // Maps to HTTP DELETE. Used for deleting a resource. - string delete = 5; - - // Maps to HTTP PATCH. Used for updating a resource. - string patch = 6; - - // The custom pattern is used for specifying an HTTP method that is not - // included in the `pattern` field, such as HEAD, or "*" to leave the - // HTTP method unspecified for this rule. The wild-card rule is useful - // for services that provide content to Web (HTML) clients. - CustomHttpPattern custom = 8; - } - - // The name of the request field whose value is mapped to the HTTP request - // body, or `*` for mapping all request fields not captured by the path - // pattern to the HTTP body, or omitted for not having any HTTP request body. - // - // NOTE: the referred field must be present at the top-level of the request - // message type. - string body = 7; - - // Optional. The name of the response field whose value is mapped to the HTTP - // response body. When omitted, the entire response message will be used - // as the HTTP response body. - // - // NOTE: The referred field must be present at the top-level of the response - // message type. - string response_body = 12; - - // Additional HTTP bindings for the selector. Nested bindings must - // not contain an `additional_bindings` field themselves (that is, - // the nesting may only be one level deep). - repeated HttpRule additional_bindings = 11; -} - -// A custom pattern is used for defining custom HTTP verb. -message CustomHttpPattern { - // The name of this custom HTTP verb. - string kind = 1; - - // The path matched by this custom verb. - string path = 2; -} diff --git a/blog-backend/api/third_party/google/api/httpbody.proto b/blog-backend/api/third_party/google/api/httpbody.proto deleted file mode 100644 index 950be8fb..00000000 --- a/blog-backend/api/third_party/google/api/httpbody.proto +++ /dev/null @@ -1,81 +0,0 @@ -// Copyright 2015 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -syntax = "proto3"; - -package google.api; - -import "google/protobuf/any.proto"; - -option cc_enable_arenas = true; -option go_package = "google.golang.org/genproto/googleapis/api/annotations;annotations"; -option java_multiple_files = true; -option java_outer_classname = "HttpBodyProto"; -option java_package = "com.google.api"; -option objc_class_prefix = "GAPI"; - -// Message that represents an arbitrary HTTP body. It should only be used for -// payload formats that can't be represented as JSON, such as raw binary or -// an HTML page. -// -// -// This message can be used both in streaming and non-streaming API methods in -// the request as well as the response. -// -// It can be used as a top-level request field, which is convenient if one -// wants to extract parameters from either the URL or HTTP template into the -// request fields and also want access to the raw HTTP body. -// -// Example: -// -// message GetResourceRequest { -// // A unique request id. -// string request_id = 1; -// -// // The raw HTTP body is bound to this field. -// google.api.HttpBody http_body = 2; -// -// } -// -// service ResourceService { -// rpc GetResource(GetResourceRequest) -// returns (google.api.HttpBody); -// rpc UpdateResource(google.api.HttpBody) -// returns (google.protobuf.Empty); -// -// } -// -// Example with streaming methods: -// -// service CaldavService { -// rpc GetCalendar(stream google.api.HttpBody) -// returns (stream google.api.HttpBody); -// rpc UpdateCalendar(stream google.api.HttpBody) -// returns (stream google.api.HttpBody); -// -// } -// -// Use of this type only changes how the request and response bodies are -// handled, all other features will continue to work unchanged. -message HttpBody { - // The HTTP Content-Type header value specifying the content type of the body. - string content_type = 1; - - // The HTTP request/response body as raw binary. - bytes data = 2; - - // Application specific response metadata. Must be set in the first response - // for streaming APIs. - repeated google.protobuf.Any extensions = 3; -} diff --git a/blog-backend/api/third_party/google/protobuf/any.proto b/blog-backend/api/third_party/google/protobuf/any.proto deleted file mode 100644 index c9be8541..00000000 --- a/blog-backend/api/third_party/google/protobuf/any.proto +++ /dev/null @@ -1,155 +0,0 @@ -// Protocol Buffers - Google's data interchange format -// Copyright 2008 Google Inc. All rights reserved. -// https://developers.google.com/protocol-buffers/ -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -syntax = "proto3"; - -package google.protobuf; - -option csharp_namespace = "Google.Protobuf.WellKnownTypes"; -option go_package = "github.com/golang/protobuf/ptypes/any"; -option java_package = "com.google.protobuf"; -option java_outer_classname = "AnyProto"; -option java_multiple_files = true; -option objc_class_prefix = "GPB"; - -// `Any` contains an arbitrary serialized protocol buffer message along with a -// URL that describes the type of the serialized message. -// -// Protobuf library provides support to pack/unpack Any values in the form -// of utility functions or additional generated methods of the Any type. -// -// Example 1: Pack and unpack a message in C++. -// -// Foo foo = ...; -// Any any; -// any.PackFrom(foo); -// ... -// if (any.UnpackTo(&foo)) { -// ... -// } -// -// Example 2: Pack and unpack a message in Java. -// -// Foo foo = ...; -// Any any = Any.pack(foo); -// ... -// if (any.is(Foo.class)) { -// foo = any.unpack(Foo.class); -// } -// -// Example 3: Pack and unpack a message in Python. -// -// foo = Foo(...) -// any = Any() -// any.Pack(foo) -// ... -// if any.Is(Foo.DESCRIPTOR): -// any.Unpack(foo) -// ... -// -// Example 4: Pack and unpack a message in Go -// -// foo := &pb.Foo{...} -// any, err := ptypes.MarshalAny(foo) -// ... -// foo := &pb.Foo{} -// if err := ptypes.UnmarshalAny(any, foo); err != nil { -// ... -// } -// -// The pack methods provided by protobuf library will by default use -// 'type.googleapis.com/full.type.name' as the type URL and the unpack -// methods only use the fully qualified type name after the last '/' -// in the type URL, for example "foo.bar.com/x/y.z" will yield type -// name "y.z". -// -// -// JSON -// ==== -// The JSON representation of an `Any` value uses the regular -// representation of the deserialized, embedded message, with an -// additional field `@type` which contains the type URL. Example: -// -// package google.profile; -// message Person { -// string first_name = 1; -// string last_name = 2; -// } -// -// { -// "@type": "type.googleapis.com/google.profile.Person", -// "firstName": , -// "lastName": -// } -// -// If the embedded message type is well-known and has a custom JSON -// representation, that representation will be embedded adding a field -// `value` which holds the custom JSON in addition to the `@type` -// field. Example (for message [google.protobuf.Duration][]): -// -// { -// "@type": "type.googleapis.com/google.protobuf.Duration", -// "value": "1.212s" -// } -// -message Any { - // A URL/resource name that uniquely identifies the type of the serialized - // protocol buffer message. This string must contain at least - // one "/" character. The last segment of the URL's path must represent - // the fully qualified name of the type (as in - // `path/google.protobuf.Duration`). The name should be in a canonical form - // (e.g., leading "." is not accepted). - // - // In practice, teams usually precompile into the binary all types that they - // expect it to use in the context of Any. However, for URLs which use the - // scheme `http`, `https`, or no scheme, one can optionally set up a type - // server that maps type URLs to message definitions as follows: - // - // * If no scheme is provided, `https` is assumed. - // * An HTTP GET on the URL must yield a [google.protobuf.Type][] - // value in binary format, or produce an error. - // * Applications are allowed to cache lookup results based on the - // URL, or have them precompiled into a binary to avoid any - // lookup. Therefore, binary compatibility needs to be preserved - // on changes to types. (Use versioned type names to manage - // breaking changes.) - // - // Note: this functionality is not currently available in the official - // protobuf release, and it is not used for type URLs beginning with - // type.googleapis.com. - // - // Schemes other than `http`, `https` (or the empty scheme) might be - // used with implementation specific semantics. - // - string type_url = 1; - - // Must be a valid serialized protocol buffer of the above specified type. - bytes value = 2; -} diff --git a/blog-backend/api/third_party/google/protobuf/api.proto b/blog-backend/api/third_party/google/protobuf/api.proto deleted file mode 100644 index f37ee2fa..00000000 --- a/blog-backend/api/third_party/google/protobuf/api.proto +++ /dev/null @@ -1,210 +0,0 @@ -// Protocol Buffers - Google's data interchange format -// Copyright 2008 Google Inc. All rights reserved. -// https://developers.google.com/protocol-buffers/ -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -syntax = "proto3"; - -package google.protobuf; - -import "google/protobuf/source_context.proto"; -import "google/protobuf/type.proto"; - -option csharp_namespace = "Google.Protobuf.WellKnownTypes"; -option java_package = "com.google.protobuf"; -option java_outer_classname = "ApiProto"; -option java_multiple_files = true; -option objc_class_prefix = "GPB"; -option go_package = "google.golang.org/genproto/protobuf/api;api"; - -// Api is a light-weight descriptor for an API Interface. -// -// Interfaces are also described as "protocol buffer services" in some contexts, -// such as by the "service" keyword in a .proto file, but they are different -// from API Services, which represent a concrete implementation of an interface -// as opposed to simply a description of methods and bindings. They are also -// sometimes simply referred to as "APIs" in other contexts, such as the name of -// this message itself. See https://cloud.google.com/apis/design/glossary for -// detailed terminology. -message Api { - - // The fully qualified name of this interface, including package name - // followed by the interface's simple name. - string name = 1; - - // The methods of this interface, in unspecified order. - repeated Method methods = 2; - - // Any metadata attached to the interface. - repeated Option options = 3; - - // A version string for this interface. If specified, must have the form - // `major-version.minor-version`, as in `1.10`. If the minor version is - // omitted, it defaults to zero. If the entire version field is empty, the - // major version is derived from the package name, as outlined below. If the - // field is not empty, the version in the package name will be verified to be - // consistent with what is provided here. - // - // The versioning schema uses [semantic - // versioning](http://semver.org) where the major version number - // indicates a breaking change and the minor version an additive, - // non-breaking change. Both version numbers are signals to users - // what to expect from different versions, and should be carefully - // chosen based on the product plan. - // - // The major version is also reflected in the package name of the - // interface, which must end in `v`, as in - // `google.feature.v1`. For major versions 0 and 1, the suffix can - // be omitted. Zero major versions must only be used for - // experimental, non-GA interfaces. - // - // - string version = 4; - - // Source context for the protocol buffer service represented by this - // message. - SourceContext source_context = 5; - - // Included interfaces. See [Mixin][]. - repeated Mixin mixins = 6; - - // The source syntax of the service. - Syntax syntax = 7; -} - -// Method represents a method of an API interface. -message Method { - - // The simple name of this method. - string name = 1; - - // A URL of the input message type. - string request_type_url = 2; - - // If true, the request is streamed. - bool request_streaming = 3; - - // The URL of the output message type. - string response_type_url = 4; - - // If true, the response is streamed. - bool response_streaming = 5; - - // Any metadata attached to the method. - repeated Option options = 6; - - // The source syntax of this method. - Syntax syntax = 7; -} - -// Declares an API Interface to be included in this interface. The including -// interface must redeclare all the methods from the included interface, but -// documentation and options are inherited as follows: -// -// - If after comment and whitespace stripping, the documentation -// string of the redeclared method is empty, it will be inherited -// from the original method. -// -// - Each annotation belonging to the service config (http, -// visibility) which is not set in the redeclared method will be -// inherited. -// -// - If an http annotation is inherited, the path pattern will be -// modified as follows. Any version prefix will be replaced by the -// version of the including interface plus the [root][] path if -// specified. -// -// Example of a simple mixin: -// -// package google.acl.v1; -// service AccessControl { -// // Get the underlying ACL object. -// rpc GetAcl(GetAclRequest) returns (Acl) { -// option (google.api.http).get = "/v1/{resource=**}:getAcl"; -// } -// } -// -// package google.storage.v2; -// service Storage { -// rpc GetAcl(GetAclRequest) returns (Acl); -// -// // Get a data record. -// rpc GetData(GetDataRequest) returns (Data) { -// option (google.api.http).get = "/v2/{resource=**}"; -// } -// } -// -// Example of a mixin configuration: -// -// apis: -// - name: google.storage.v2.Storage -// mixins: -// - name: google.acl.v1.AccessControl -// -// The mixin construct implies that all methods in `AccessControl` are -// also declared with same name and request/response types in -// `Storage`. A documentation generator or annotation processor will -// see the effective `Storage.GetAcl` method after inherting -// documentation and annotations as follows: -// -// service Storage { -// // Get the underlying ACL object. -// rpc GetAcl(GetAclRequest) returns (Acl) { -// option (google.api.http).get = "/v2/{resource=**}:getAcl"; -// } -// ... -// } -// -// Note how the version in the path pattern changed from `v1` to `v2`. -// -// If the `root` field in the mixin is specified, it should be a -// relative path under which inherited HTTP paths are placed. Example: -// -// apis: -// - name: google.storage.v2.Storage -// mixins: -// - name: google.acl.v1.AccessControl -// root: acls -// -// This implies the following inherited HTTP annotation: -// -// service Storage { -// // Get the underlying ACL object. -// rpc GetAcl(GetAclRequest) returns (Acl) { -// option (google.api.http).get = "/v2/acls/{resource=**}:getAcl"; -// } -// ... -// } -message Mixin { - // The fully qualified name of the interface which is included. - string name = 1; - - // If non-empty specifies a path under which inherited HTTP paths - // are rooted. - string root = 2; -} diff --git a/blog-backend/api/third_party/google/protobuf/descriptor.proto b/blog-backend/api/third_party/google/protobuf/descriptor.proto deleted file mode 100644 index a2102d7a..00000000 --- a/blog-backend/api/third_party/google/protobuf/descriptor.proto +++ /dev/null @@ -1,885 +0,0 @@ -// Protocol Buffers - Google's data interchange format -// Copyright 2008 Google Inc. All rights reserved. -// https://developers.google.com/protocol-buffers/ -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -// Author: kenton@google.com (Kenton Varda) -// Based on original Protocol Buffers design by -// Sanjay Ghemawat, Jeff Dean, and others. -// -// The messages in this file describe the definitions found in .proto files. -// A valid .proto file can be translated directly to a FileDescriptorProto -// without any other information (e.g. without reading its imports). - - -syntax = "proto2"; - -package google.protobuf; - -option go_package = "github.com/golang/protobuf/protoc-gen-go/descriptor;descriptor"; -option java_package = "com.google.protobuf"; -option java_outer_classname = "DescriptorProtos"; -option csharp_namespace = "Google.Protobuf.Reflection"; -option objc_class_prefix = "GPB"; -option cc_enable_arenas = true; - -// descriptor.proto must be optimized for speed because reflection-based -// algorithms don't work during bootstrapping. -option optimize_for = SPEED; - -// The protocol compiler can output a FileDescriptorSet containing the .proto -// files it parses. -message FileDescriptorSet { - repeated FileDescriptorProto file = 1; -} - -// Describes a complete .proto file. -message FileDescriptorProto { - optional string name = 1; // file name, relative to root of source tree - optional string package = 2; // e.g. "foo", "foo.bar", etc. - - // Names of files imported by this file. - repeated string dependency = 3; - // Indexes of the public imported files in the dependency list above. - repeated int32 public_dependency = 10; - // Indexes of the weak imported files in the dependency list. - // For Google-internal migration only. Do not use. - repeated int32 weak_dependency = 11; - - // All top-level definitions in this file. - repeated DescriptorProto message_type = 4; - repeated EnumDescriptorProto enum_type = 5; - repeated ServiceDescriptorProto service = 6; - repeated FieldDescriptorProto extension = 7; - - optional FileOptions options = 8; - - // This field contains optional information about the original source code. - // You may safely remove this entire field without harming runtime - // functionality of the descriptors -- the information is needed only by - // development tools. - optional SourceCodeInfo source_code_info = 9; - - // The syntax of the proto file. - // The supported values are "proto2" and "proto3". - optional string syntax = 12; -} - -// Describes a message type. -message DescriptorProto { - optional string name = 1; - - repeated FieldDescriptorProto field = 2; - repeated FieldDescriptorProto extension = 6; - - repeated DescriptorProto nested_type = 3; - repeated EnumDescriptorProto enum_type = 4; - - message ExtensionRange { - optional int32 start = 1; // Inclusive. - optional int32 end = 2; // Exclusive. - - optional ExtensionRangeOptions options = 3; - } - repeated ExtensionRange extension_range = 5; - - repeated OneofDescriptorProto oneof_decl = 8; - - optional MessageOptions options = 7; - - // Range of reserved tag numbers. Reserved tag numbers may not be used by - // fields or extension ranges in the same message. Reserved ranges may - // not overlap. - message ReservedRange { - optional int32 start = 1; // Inclusive. - optional int32 end = 2; // Exclusive. - } - repeated ReservedRange reserved_range = 9; - // Reserved field names, which may not be used by fields in the same message. - // A given name may only be reserved once. - repeated string reserved_name = 10; -} - -message ExtensionRangeOptions { - // The parser stores options it doesn't recognize here. See above. - repeated UninterpretedOption uninterpreted_option = 999; - - // Clients can define custom options in extensions of this message. See above. - extensions 1000 to max; -} - -// Describes a field within a message. -message FieldDescriptorProto { - enum Type { - // 0 is reserved for errors. - // Order is weird for historical reasons. - TYPE_DOUBLE = 1; - TYPE_FLOAT = 2; - // Not ZigZag encoded. Negative numbers take 10 bytes. Use TYPE_SINT64 if - // negative values are likely. - TYPE_INT64 = 3; - TYPE_UINT64 = 4; - // Not ZigZag encoded. Negative numbers take 10 bytes. Use TYPE_SINT32 if - // negative values are likely. - TYPE_INT32 = 5; - TYPE_FIXED64 = 6; - TYPE_FIXED32 = 7; - TYPE_BOOL = 8; - TYPE_STRING = 9; - // Tag-delimited aggregate. - // Group type is deprecated and not supported in proto3. However, Proto3 - // implementations should still be able to parse the group wire format and - // treat group fields as unknown fields. - TYPE_GROUP = 10; - TYPE_MESSAGE = 11; // Length-delimited aggregate. - - // New in version 2. - TYPE_BYTES = 12; - TYPE_UINT32 = 13; - TYPE_ENUM = 14; - TYPE_SFIXED32 = 15; - TYPE_SFIXED64 = 16; - TYPE_SINT32 = 17; // Uses ZigZag encoding. - TYPE_SINT64 = 18; // Uses ZigZag encoding. - } - - enum Label { - // 0 is reserved for errors - LABEL_OPTIONAL = 1; - LABEL_REQUIRED = 2; - LABEL_REPEATED = 3; - } - - optional string name = 1; - optional int32 number = 3; - optional Label label = 4; - - // If type_name is set, this need not be set. If both this and type_name - // are set, this must be one of TYPE_ENUM, TYPE_MESSAGE or TYPE_GROUP. - optional Type type = 5; - - // For message and enum types, this is the name of the type. If the name - // starts with a '.', it is fully-qualified. Otherwise, C++-like scoping - // rules are used to find the type (i.e. first the nested types within this - // message are searched, then within the parent, on up to the root - // namespace). - optional string type_name = 6; - - // For extensions, this is the name of the type being extended. It is - // resolved in the same manner as type_name. - optional string extendee = 2; - - // For numeric types, contains the original text representation of the value. - // For booleans, "true" or "false". - // For strings, contains the default text contents (not escaped in any way). - // For bytes, contains the C escaped value. All bytes >= 128 are escaped. - // TODO(kenton): Base-64 encode? - optional string default_value = 7; - - // If set, gives the index of a oneof in the containing type's oneof_decl - // list. This field is a member of that oneof. - optional int32 oneof_index = 9; - - // JSON name of this field. The value is set by protocol compiler. If the - // user has set a "json_name" option on this field, that option's value - // will be used. Otherwise, it's deduced from the field's name by converting - // it to camelCase. - optional string json_name = 10; - - optional FieldOptions options = 8; -} - -// Describes a oneof. -message OneofDescriptorProto { - optional string name = 1; - optional OneofOptions options = 2; -} - -// Describes an enum type. -message EnumDescriptorProto { - optional string name = 1; - - repeated EnumValueDescriptorProto value = 2; - - optional EnumOptions options = 3; - - // Range of reserved numeric values. Reserved values may not be used by - // entries in the same enum. Reserved ranges may not overlap. - // - // Note that this is distinct from DescriptorProto.ReservedRange in that it - // is inclusive such that it can appropriately represent the entire int32 - // domain. - message EnumReservedRange { - optional int32 start = 1; // Inclusive. - optional int32 end = 2; // Inclusive. - } - - // Range of reserved numeric values. Reserved numeric values may not be used - // by enum values in the same enum declaration. Reserved ranges may not - // overlap. - repeated EnumReservedRange reserved_range = 4; - - // Reserved enum value names, which may not be reused. A given name may only - // be reserved once. - repeated string reserved_name = 5; -} - -// Describes a value within an enum. -message EnumValueDescriptorProto { - optional string name = 1; - optional int32 number = 2; - - optional EnumValueOptions options = 3; -} - -// Describes a service. -message ServiceDescriptorProto { - optional string name = 1; - repeated MethodDescriptorProto method = 2; - - optional ServiceOptions options = 3; -} - -// Describes a method of a service. -message MethodDescriptorProto { - optional string name = 1; - - // Input and output type names. These are resolved in the same way as - // FieldDescriptorProto.type_name, but must refer to a message type. - optional string input_type = 2; - optional string output_type = 3; - - optional MethodOptions options = 4; - - // Identifies if client streams multiple client messages - optional bool client_streaming = 5 [default = false]; - // Identifies if server streams multiple server messages - optional bool server_streaming = 6 [default = false]; -} - - -// =================================================================== -// Options - -// Each of the definitions above may have "options" attached. These are -// just annotations which may cause code to be generated slightly differently -// or may contain hints for code that manipulates protocol messages. -// -// Clients may define custom options as extensions of the *Options messages. -// These extensions may not yet be known at parsing time, so the parser cannot -// store the values in them. Instead it stores them in a field in the *Options -// message called uninterpreted_option. This field must have the same name -// across all *Options messages. We then use this field to populate the -// extensions when we build a descriptor, at which point all protos have been -// parsed and so all extensions are known. -// -// Extension numbers for custom options may be chosen as follows: -// * For options which will only be used within a single application or -// organization, or for experimental options, use field numbers 50000 -// through 99999. It is up to you to ensure that you do not use the -// same number for multiple options. -// * For options which will be published and used publicly by multiple -// independent entities, e-mail protobuf-global-extension-registry@google.com -// to reserve extension numbers. Simply provide your project name (e.g. -// Objective-C plugin) and your project website (if available) -- there's no -// need to explain how you intend to use them. Usually you only need one -// extension number. You can declare multiple options with only one extension -// number by putting them in a sub-message. See the Custom Options section of -// the docs for examples: -// https://developers.google.com/protocol-buffers/docs/proto#options -// If this turns out to be popular, a web service will be set up -// to automatically assign option numbers. - -message FileOptions { - - // Sets the Java package where classes generated from this .proto will be - // placed. By default, the proto package is used, but this is often - // inappropriate because proto packages do not normally start with backwards - // domain names. - optional string java_package = 1; - - - // If set, all the classes from the .proto file are wrapped in a single - // outer class with the given name. This applies to both Proto1 - // (equivalent to the old "--one_java_file" option) and Proto2 (where - // a .proto always translates to a single class, but you may want to - // explicitly choose the class name). - optional string java_outer_classname = 8; - - // If set true, then the Java code generator will generate a separate .java - // file for each top-level message, enum, and service defined in the .proto - // file. Thus, these types will *not* be nested inside the outer class - // named by java_outer_classname. However, the outer class will still be - // generated to contain the file's getDescriptor() method as well as any - // top-level extensions defined in the file. - optional bool java_multiple_files = 10 [default = false]; - - // This option does nothing. - optional bool java_generate_equals_and_hash = 20 [deprecated=true]; - - // If set true, then the Java2 code generator will generate code that - // throws an exception whenever an attempt is made to assign a non-UTF-8 - // byte sequence to a string field. - // Message reflection will do the same. - // However, an extension field still accepts non-UTF-8 byte sequences. - // This option has no effect on when used with the lite runtime. - optional bool java_string_check_utf8 = 27 [default = false]; - - - // Generated classes can be optimized for speed or code size. - enum OptimizeMode { - SPEED = 1; // Generate complete code for parsing, serialization, - // etc. - CODE_SIZE = 2; // Use ReflectionOps to implement these methods. - LITE_RUNTIME = 3; // Generate code using MessageLite and the lite runtime. - } - optional OptimizeMode optimize_for = 9 [default = SPEED]; - - // Sets the Go package where structs generated from this .proto will be - // placed. If omitted, the Go package will be derived from the following: - // - The basename of the package import path, if provided. - // - Otherwise, the package statement in the .proto file, if present. - // - Otherwise, the basename of the .proto file, without extension. - optional string go_package = 11; - - - - - // Should generic services be generated in each language? "Generic" services - // are not specific to any particular RPC system. They are generated by the - // main code generators in each language (without additional plugins). - // Generic services were the only kind of service generation supported by - // early versions of google.protobuf. - // - // Generic services are now considered deprecated in favor of using plugins - // that generate code specific to your particular RPC system. Therefore, - // these default to false. Old code which depends on generic services should - // explicitly set them to true. - optional bool cc_generic_services = 16 [default = false]; - optional bool java_generic_services = 17 [default = false]; - optional bool py_generic_services = 18 [default = false]; - optional bool php_generic_services = 42 [default = false]; - - // Is this file deprecated? - // Depending on the target platform, this can emit Deprecated annotations - // for everything in the file, or it will be completely ignored; in the very - // least, this is a formalization for deprecating files. - optional bool deprecated = 23 [default = false]; - - // Enables the use of arenas for the proto messages in this file. This applies - // only to generated classes for C++. - optional bool cc_enable_arenas = 31 [default = false]; - - - // Sets the objective c class prefix which is prepended to all objective c - // generated classes from this .proto. There is no default. - optional string objc_class_prefix = 36; - - // Namespace for generated classes; defaults to the package. - optional string csharp_namespace = 37; - - // By default Swift generators will take the proto package and CamelCase it - // replacing '.' with underscore and use that to prefix the types/symbols - // defined. When this options is provided, they will use this value instead - // to prefix the types/symbols defined. - optional string swift_prefix = 39; - - // Sets the php class prefix which is prepended to all php generated classes - // from this .proto. Default is empty. - optional string php_class_prefix = 40; - - // Use this option to change the namespace of php generated classes. Default - // is empty. When this option is empty, the package name will be used for - // determining the namespace. - optional string php_namespace = 41; - - // Use this option to change the namespace of php generated metadata classes. - // Default is empty. When this option is empty, the proto file name will be - // used for determining the namespace. - optional string php_metadata_namespace = 44; - - // Use this option to change the package of ruby generated classes. Default - // is empty. When this option is not set, the package name will be used for - // determining the ruby package. - optional string ruby_package = 45; - - - // The parser stores options it doesn't recognize here. - // See the documentation for the "Options" section above. - repeated UninterpretedOption uninterpreted_option = 999; - - // Clients can define custom options in extensions of this message. - // See the documentation for the "Options" section above. - extensions 1000 to max; - - reserved 38; -} - -message MessageOptions { - // Set true to use the old proto1 MessageSet wire format for extensions. - // This is provided for backwards-compatibility with the MessageSet wire - // format. You should not use this for any other reason: It's less - // efficient, has fewer features, and is more complicated. - // - // The message must be defined exactly as follows: - // message Foo { - // option message_set_wire_format = true; - // extensions 4 to max; - // } - // Note that the message cannot have any defined fields; MessageSets only - // have extensions. - // - // All extensions of your type must be singular messages; e.g. they cannot - // be int32s, enums, or repeated messages. - // - // Because this is an option, the above two restrictions are not enforced by - // the protocol compiler. - optional bool message_set_wire_format = 1 [default = false]; - - // Disables the generation of the standard "descriptor()" accessor, which can - // conflict with a field of the same name. This is meant to make migration - // from proto1 easier; new code should avoid fields named "descriptor". - optional bool no_standard_descriptor_accessor = 2 [default = false]; - - // Is this message deprecated? - // Depending on the target platform, this can emit Deprecated annotations - // for the message, or it will be completely ignored; in the very least, - // this is a formalization for deprecating messages. - optional bool deprecated = 3 [default = false]; - - // Whether the message is an automatically generated map entry type for the - // maps field. - // - // For maps fields: - // map map_field = 1; - // The parsed descriptor looks like: - // message MapFieldEntry { - // option map_entry = true; - // optional KeyType key = 1; - // optional ValueType value = 2; - // } - // repeated MapFieldEntry map_field = 1; - // - // Implementations may choose not to generate the map_entry=true message, but - // use a native map in the target language to hold the keys and values. - // The reflection APIs in such implementations still need to work as - // if the field is a repeated message field. - // - // NOTE: Do not set the option in .proto files. Always use the maps syntax - // instead. The option should only be implicitly set by the proto compiler - // parser. - optional bool map_entry = 7; - - reserved 8; // javalite_serializable - reserved 9; // javanano_as_lite - - - // The parser stores options it doesn't recognize here. See above. - repeated UninterpretedOption uninterpreted_option = 999; - - // Clients can define custom options in extensions of this message. See above. - extensions 1000 to max; -} - -message FieldOptions { - // The ctype option instructs the C++ code generator to use a different - // representation of the field than it normally would. See the specific - // options below. This option is not yet implemented in the open source - // release -- sorry, we'll try to include it in a future version! - optional CType ctype = 1 [default = STRING]; - enum CType { - // Default mode. - STRING = 0; - - CORD = 1; - - STRING_PIECE = 2; - } - // The packed option can be enabled for repeated primitive fields to enable - // a more efficient representation on the wire. Rather than repeatedly - // writing the tag and type for each element, the entire array is encoded as - // a single length-delimited blob. In proto3, only explicit setting it to - // false will avoid using packed encoding. - optional bool packed = 2; - - // The jstype option determines the JavaScript type used for values of the - // field. The option is permitted only for 64 bit integral and fixed types - // (int64, uint64, sint64, fixed64, sfixed64). A field with jstype JS_STRING - // is represented as JavaScript string, which avoids loss of precision that - // can happen when a large value is converted to a floating point JavaScript. - // Specifying JS_NUMBER for the jstype causes the generated JavaScript code to - // use the JavaScript "number" type. The behavior of the default option - // JS_NORMAL is implementation dependent. - // - // This option is an enum to permit additional types to be added, e.g. - // goog.math.Integer. - optional JSType jstype = 6 [default = JS_NORMAL]; - enum JSType { - // Use the default type. - JS_NORMAL = 0; - - // Use JavaScript strings. - JS_STRING = 1; - - // Use JavaScript numbers. - JS_NUMBER = 2; - } - - // Should this field be parsed lazily? Lazy applies only to message-type - // fields. It means that when the outer message is initially parsed, the - // inner message's contents will not be parsed but instead stored in encoded - // form. The inner message will actually be parsed when it is first accessed. - // - // This is only a hint. Implementations are free to choose whether to use - // eager or lazy parsing regardless of the value of this option. However, - // setting this option true suggests that the protocol author believes that - // using lazy parsing on this field is worth the additional bookkeeping - // overhead typically needed to implement it. - // - // This option does not affect the public interface of any generated code; - // all method signatures remain the same. Furthermore, thread-safety of the - // interface is not affected by this option; const methods remain safe to - // call from multiple threads concurrently, while non-const methods continue - // to require exclusive access. - // - // - // Note that implementations may choose not to check required fields within - // a lazy sub-message. That is, calling IsInitialized() on the outer message - // may return true even if the inner message has missing required fields. - // This is necessary because otherwise the inner message would have to be - // parsed in order to perform the check, defeating the purpose of lazy - // parsing. An implementation which chooses not to check required fields - // must be consistent about it. That is, for any particular sub-message, the - // implementation must either *always* check its required fields, or *never* - // check its required fields, regardless of whether or not the message has - // been parsed. - optional bool lazy = 5 [default = false]; - - // Is this field deprecated? - // Depending on the target platform, this can emit Deprecated annotations - // for accessors, or it will be completely ignored; in the very least, this - // is a formalization for deprecating fields. - optional bool deprecated = 3 [default = false]; - - // For Google-internal migration only. Do not use. - optional bool weak = 10 [default = false]; - - - // The parser stores options it doesn't recognize here. See above. - repeated UninterpretedOption uninterpreted_option = 999; - - // Clients can define custom options in extensions of this message. See above. - extensions 1000 to max; - - reserved 4; // removed jtype -} - -message OneofOptions { - // The parser stores options it doesn't recognize here. See above. - repeated UninterpretedOption uninterpreted_option = 999; - - // Clients can define custom options in extensions of this message. See above. - extensions 1000 to max; -} - -message EnumOptions { - - // Set this option to true to allow mapping different tag names to the same - // value. - optional bool allow_alias = 2; - - // Is this enum deprecated? - // Depending on the target platform, this can emit Deprecated annotations - // for the enum, or it will be completely ignored; in the very least, this - // is a formalization for deprecating enums. - optional bool deprecated = 3 [default = false]; - - reserved 5; // javanano_as_lite - - // The parser stores options it doesn't recognize here. See above. - repeated UninterpretedOption uninterpreted_option = 999; - - // Clients can define custom options in extensions of this message. See above. - extensions 1000 to max; -} - -message EnumValueOptions { - // Is this enum value deprecated? - // Depending on the target platform, this can emit Deprecated annotations - // for the enum value, or it will be completely ignored; in the very least, - // this is a formalization for deprecating enum values. - optional bool deprecated = 1 [default = false]; - - // The parser stores options it doesn't recognize here. See above. - repeated UninterpretedOption uninterpreted_option = 999; - - // Clients can define custom options in extensions of this message. See above. - extensions 1000 to max; -} - -message ServiceOptions { - - // Note: Field numbers 1 through 32 are reserved for Google's internal RPC - // framework. We apologize for hoarding these numbers to ourselves, but - // we were already using them long before we decided to release Protocol - // Buffers. - - // Is this service deprecated? - // Depending on the target platform, this can emit Deprecated annotations - // for the service, or it will be completely ignored; in the very least, - // this is a formalization for deprecating services. - optional bool deprecated = 33 [default = false]; - - // The parser stores options it doesn't recognize here. See above. - repeated UninterpretedOption uninterpreted_option = 999; - - // Clients can define custom options in extensions of this message. See above. - extensions 1000 to max; -} - -message MethodOptions { - - // Note: Field numbers 1 through 32 are reserved for Google's internal RPC - // framework. We apologize for hoarding these numbers to ourselves, but - // we were already using them long before we decided to release Protocol - // Buffers. - - // Is this method deprecated? - // Depending on the target platform, this can emit Deprecated annotations - // for the method, or it will be completely ignored; in the very least, - // this is a formalization for deprecating methods. - optional bool deprecated = 33 [default = false]; - - // Is this method side-effect-free (or safe in HTTP parlance), or idempotent, - // or neither? HTTP based RPC implementation may choose GET verb for safe - // methods, and PUT verb for idempotent methods instead of the default POST. - enum IdempotencyLevel { - IDEMPOTENCY_UNKNOWN = 0; - NO_SIDE_EFFECTS = 1; // implies idempotent - IDEMPOTENT = 2; // idempotent, but may have side effects - } - optional IdempotencyLevel idempotency_level = 34 - [default = IDEMPOTENCY_UNKNOWN]; - - // The parser stores options it doesn't recognize here. See above. - repeated UninterpretedOption uninterpreted_option = 999; - - // Clients can define custom options in extensions of this message. See above. - extensions 1000 to max; -} - - -// A message representing a option the parser does not recognize. This only -// appears in options protos created by the compiler::Parser class. -// DescriptorPool resolves these when building Descriptor objects. Therefore, -// options protos in descriptor objects (e.g. returned by Descriptor::options(), -// or produced by Descriptor::CopyTo()) will never have UninterpretedOptions -// in them. -message UninterpretedOption { - // The name of the uninterpreted option. Each string represents a segment in - // a dot-separated name. is_extension is true iff a segment represents an - // extension (denoted with parentheses in options specs in .proto files). - // E.g.,{ ["foo", false], ["bar.baz", true], ["qux", false] } represents - // "foo.(bar.baz).qux". - message NamePart { - required string name_part = 1; - required bool is_extension = 2; - } - repeated NamePart name = 2; - - // The value of the uninterpreted option, in whatever type the tokenizer - // identified it as during parsing. Exactly one of these should be set. - optional string identifier_value = 3; - optional uint64 positive_int_value = 4; - optional int64 negative_int_value = 5; - optional double double_value = 6; - optional bytes string_value = 7; - optional string aggregate_value = 8; -} - -// =================================================================== -// Optional source code info - -// Encapsulates information about the original source file from which a -// FileDescriptorProto was generated. -message SourceCodeInfo { - // A Location identifies a piece of source code in a .proto file which - // corresponds to a particular definition. This information is intended - // to be useful to IDEs, code indexers, documentation generators, and similar - // tools. - // - // For example, say we have a file like: - // message Foo { - // optional string foo = 1; - // } - // Let's look at just the field definition: - // optional string foo = 1; - // ^ ^^ ^^ ^ ^^^ - // a bc de f ghi - // We have the following locations: - // span path represents - // [a,i) [ 4, 0, 2, 0 ] The whole field definition. - // [a,b) [ 4, 0, 2, 0, 4 ] The label (optional). - // [c,d) [ 4, 0, 2, 0, 5 ] The type (string). - // [e,f) [ 4, 0, 2, 0, 1 ] The name (foo). - // [g,h) [ 4, 0, 2, 0, 3 ] The number (1). - // - // Notes: - // - A location may refer to a repeated field itself (i.e. not to any - // particular index within it). This is used whenever a set of elements are - // logically enclosed in a single code segment. For example, an entire - // extend block (possibly containing multiple extension definitions) will - // have an outer location whose path refers to the "extensions" repeated - // field without an index. - // - Multiple locations may have the same path. This happens when a single - // logical declaration is spread out across multiple places. The most - // obvious example is the "extend" block again -- there may be multiple - // extend blocks in the same scope, each of which will have the same path. - // - A location's span is not always a subset of its parent's span. For - // example, the "extendee" of an extension declaration appears at the - // beginning of the "extend" block and is shared by all extensions within - // the block. - // - Just because a location's span is a subset of some other location's span - // does not mean that it is a descendant. For example, a "group" defines - // both a type and a field in a single declaration. Thus, the locations - // corresponding to the type and field and their components will overlap. - // - Code which tries to interpret locations should probably be designed to - // ignore those that it doesn't understand, as more types of locations could - // be recorded in the future. - repeated Location location = 1; - message Location { - // Identifies which part of the FileDescriptorProto was defined at this - // location. - // - // Each element is a field number or an index. They form a path from - // the root FileDescriptorProto to the place where the definition. For - // example, this path: - // [ 4, 3, 2, 7, 1 ] - // refers to: - // file.message_type(3) // 4, 3 - // .field(7) // 2, 7 - // .name() // 1 - // This is because FileDescriptorProto.message_type has field number 4: - // repeated DescriptorProto message_type = 4; - // and DescriptorProto.field has field number 2: - // repeated FieldDescriptorProto field = 2; - // and FieldDescriptorProto.name has field number 1: - // optional string name = 1; - // - // Thus, the above path gives the location of a field name. If we removed - // the last element: - // [ 4, 3, 2, 7 ] - // this path refers to the whole field declaration (from the beginning - // of the label to the terminating semicolon). - repeated int32 path = 1 [packed = true]; - - // Always has exactly three or four elements: start line, start column, - // end line (optional, otherwise assumed same as start line), end column. - // These are packed into a single field for efficiency. Note that line - // and column numbers are zero-based -- typically you will want to add - // 1 to each before displaying to a user. - repeated int32 span = 2 [packed = true]; - - // If this SourceCodeInfo represents a complete declaration, these are any - // comments appearing before and after the declaration which appear to be - // attached to the declaration. - // - // A series of line comments appearing on consecutive lines, with no other - // tokens appearing on those lines, will be treated as a single comment. - // - // leading_detached_comments will keep paragraphs of comments that appear - // before (but not connected to) the current element. Each paragraph, - // separated by empty lines, will be one comment element in the repeated - // field. - // - // Only the comment content is provided; comment markers (e.g. //) are - // stripped out. For block comments, leading whitespace and an asterisk - // will be stripped from the beginning of each line other than the first. - // Newlines are included in the output. - // - // Examples: - // - // optional int32 foo = 1; // Comment attached to foo. - // // Comment attached to bar. - // optional int32 bar = 2; - // - // optional string baz = 3; - // // Comment attached to baz. - // // Another line attached to baz. - // - // // Comment attached to qux. - // // - // // Another line attached to qux. - // optional double qux = 4; - // - // // Detached comment for corge. This is not leading or trailing comments - // // to qux or corge because there are blank lines separating it from - // // both. - // - // // Detached comment for corge paragraph 2. - // - // optional string corge = 5; - // /* Block comment attached - // * to corge. Leading asterisks - // * will be removed. */ - // /* Block comment attached to - // * grault. */ - // optional int32 grault = 6; - // - // // ignored detached comments. - optional string leading_comments = 3; - optional string trailing_comments = 4; - repeated string leading_detached_comments = 6; - } -} - -// Describes the relationship between generated code and its original source -// file. A GeneratedCodeInfo message is associated with only one generated -// source file, but may contain references to different source .proto files. -message GeneratedCodeInfo { - // An Annotation connects some span of text in generated code to an element - // of its generating .proto file. - repeated Annotation annotation = 1; - message Annotation { - // Identifies the element in the original source .proto file. This field - // is formatted the same as SourceCodeInfo.Location.path. - repeated int32 path = 1 [packed = true]; - - // Identifies the filesystem path to the original source .proto. - optional string source_file = 2; - - // Identifies the starting offset in bytes in the generated code - // that relates to the identified object. - optional int32 begin = 3; - - // Identifies the ending offset in bytes in the generated code that - // relates to the identified offset. The end offset should be one past - // the last relevant byte (so the length of the text = end - begin). - optional int32 end = 4; - } -} diff --git a/blog-backend/api/third_party/google/protobuf/duration.proto b/blog-backend/api/third_party/google/protobuf/duration.proto deleted file mode 100644 index 99cb102c..00000000 --- a/blog-backend/api/third_party/google/protobuf/duration.proto +++ /dev/null @@ -1,116 +0,0 @@ -// Protocol Buffers - Google's data interchange format -// Copyright 2008 Google Inc. All rights reserved. -// https://developers.google.com/protocol-buffers/ -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -syntax = "proto3"; - -package google.protobuf; - -option csharp_namespace = "Google.Protobuf.WellKnownTypes"; -option cc_enable_arenas = true; -option go_package = "github.com/golang/protobuf/ptypes/duration"; -option java_package = "com.google.protobuf"; -option java_outer_classname = "DurationProto"; -option java_multiple_files = true; -option objc_class_prefix = "GPB"; - -// A Duration represents a signed, fixed-length span of time represented -// as a count of seconds and fractions of seconds at nanosecond -// resolution. It is independent of any calendar and concepts like "day" -// or "month". It is related to Timestamp in that the difference between -// two Timestamp values is a Duration and it can be added or subtracted -// from a Timestamp. Range is approximately +-10,000 years. -// -// # Examples -// -// Example 1: Compute Duration from two Timestamps in pseudo code. -// -// Timestamp start = ...; -// Timestamp end = ...; -// Duration duration = ...; -// -// duration.seconds = end.seconds - start.seconds; -// duration.nanos = end.nanos - start.nanos; -// -// if (duration.seconds < 0 && duration.nanos > 0) { -// duration.seconds += 1; -// duration.nanos -= 1000000000; -// } else if (duration.seconds > 0 && duration.nanos < 0) { -// duration.seconds -= 1; -// duration.nanos += 1000000000; -// } -// -// Example 2: Compute Timestamp from Timestamp + Duration in pseudo code. -// -// Timestamp start = ...; -// Duration duration = ...; -// Timestamp end = ...; -// -// end.seconds = start.seconds + duration.seconds; -// end.nanos = start.nanos + duration.nanos; -// -// if (end.nanos < 0) { -// end.seconds -= 1; -// end.nanos += 1000000000; -// } else if (end.nanos >= 1000000000) { -// end.seconds += 1; -// end.nanos -= 1000000000; -// } -// -// Example 3: Compute Duration from datetime.timedelta in Python. -// -// td = datetime.timedelta(days=3, minutes=10) -// duration = Duration() -// duration.FromTimedelta(td) -// -// # JSON Mapping -// -// In JSON format, the Duration type is encoded as a string rather than an -// object, where the string ends in the suffix "s" (indicating seconds) and -// is preceded by the number of seconds, with nanoseconds expressed as -// fractional seconds. For example, 3 seconds with 0 nanoseconds should be -// encoded in JSON format as "3s", while 3 seconds and 1 nanosecond should -// be expressed in JSON format as "3.000000001s", and 3 seconds and 1 -// microsecond should be expressed in JSON format as "3.000001s". -// -// -message Duration { - // Signed seconds of the span of time. Must be from -315,576,000,000 - // to +315,576,000,000 inclusive. Note: these bounds are computed from: - // 60 sec/min * 60 min/hr * 24 hr/day * 365.25 days/year * 10000 years - int64 seconds = 1; - - // Signed fractions of a second at nanosecond resolution of the span - // of time. Durations less than one second are represented with a 0 - // `seconds` field and a positive or negative `nanos` field. For durations - // of one second or more, a non-zero value for the `nanos` field must be - // of the same sign as the `seconds` field. Must be from -999,999,999 - // to +999,999,999 inclusive. - int32 nanos = 2; -} diff --git a/blog-backend/api/third_party/google/protobuf/empty.proto b/blog-backend/api/third_party/google/protobuf/empty.proto deleted file mode 100644 index 03cacd23..00000000 --- a/blog-backend/api/third_party/google/protobuf/empty.proto +++ /dev/null @@ -1,52 +0,0 @@ -// Protocol Buffers - Google's data interchange format -// Copyright 2008 Google Inc. All rights reserved. -// https://developers.google.com/protocol-buffers/ -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -syntax = "proto3"; - -package google.protobuf; - -option csharp_namespace = "Google.Protobuf.WellKnownTypes"; -option go_package = "github.com/golang/protobuf/ptypes/empty"; -option java_package = "com.google.protobuf"; -option java_outer_classname = "EmptyProto"; -option java_multiple_files = true; -option objc_class_prefix = "GPB"; -option cc_enable_arenas = true; - -// A generic empty message that you can re-use to avoid defining duplicated -// empty messages in your APIs. A typical example is to use it as the request -// or the response type of an API method. For instance: -// -// service Foo { -// rpc Bar(google.protobuf.Empty) returns (google.protobuf.Empty); -// } -// -// The JSON representation for `Empty` is empty JSON object `{}`. -message Empty {} diff --git a/blog-backend/api/third_party/google/protobuf/field_mask.proto b/blog-backend/api/third_party/google/protobuf/field_mask.proto deleted file mode 100644 index baac8744..00000000 --- a/blog-backend/api/third_party/google/protobuf/field_mask.proto +++ /dev/null @@ -1,245 +0,0 @@ -// Protocol Buffers - Google's data interchange format -// Copyright 2008 Google Inc. All rights reserved. -// https://developers.google.com/protocol-buffers/ -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -syntax = "proto3"; - -package google.protobuf; - -option csharp_namespace = "Google.Protobuf.WellKnownTypes"; -option java_package = "com.google.protobuf"; -option java_outer_classname = "FieldMaskProto"; -option java_multiple_files = true; -option objc_class_prefix = "GPB"; -option go_package = "google.golang.org/genproto/protobuf/field_mask;field_mask"; -option cc_enable_arenas = true; - -// `FieldMask` represents a set of symbolic field paths, for example: -// -// paths: "f.a" -// paths: "f.b.d" -// -// Here `f` represents a field in some root message, `a` and `b` -// fields in the message found in `f`, and `d` a field found in the -// message in `f.b`. -// -// Field masks are used to specify a subset of fields that should be -// returned by a get operation or modified by an update operation. -// Field masks also have a custom JSON encoding (see below). -// -// # Field Masks in Projections -// -// When used in the context of a projection, a response message or -// sub-message is filtered by the API to only contain those fields as -// specified in the mask. For example, if the mask in the previous -// example is applied to a response message as follows: -// -// f { -// a : 22 -// b { -// d : 1 -// x : 2 -// } -// y : 13 -// } -// z: 8 -// -// The result will not contain specific values for fields x,y and z -// (their value will be set to the default, and omitted in proto text -// output): -// -// -// f { -// a : 22 -// b { -// d : 1 -// } -// } -// -// A repeated field is not allowed except at the last position of a -// paths string. -// -// If a FieldMask object is not present in a get operation, the -// operation applies to all fields (as if a FieldMask of all fields -// had been specified). -// -// Note that a field mask does not necessarily apply to the -// top-level response message. In case of a REST get operation, the -// field mask applies directly to the response, but in case of a REST -// list operation, the mask instead applies to each individual message -// in the returned resource list. In case of a REST custom method, -// other definitions may be used. Where the mask applies will be -// clearly documented together with its declaration in the API. In -// any case, the effect on the returned resource/resources is required -// behavior for APIs. -// -// # Field Masks in Update Operations -// -// A field mask in update operations specifies which fields of the -// targeted resource are going to be updated. The API is required -// to only change the values of the fields as specified in the mask -// and leave the others untouched. If a resource is passed in to -// describe the updated values, the API ignores the values of all -// fields not covered by the mask. -// -// If a repeated field is specified for an update operation, new values will -// be appended to the existing repeated field in the target resource. Note that -// a repeated field is only allowed in the last position of a `paths` string. -// -// If a sub-message is specified in the last position of the field mask for an -// update operation, then new value will be merged into the existing sub-message -// in the target resource. -// -// For example, given the target message: -// -// f { -// b { -// d: 1 -// x: 2 -// } -// c: [1] -// } -// -// And an update message: -// -// f { -// b { -// d: 10 -// } -// c: [2] -// } -// -// then if the field mask is: -// -// paths: ["f.b", "f.c"] -// -// then the result will be: -// -// f { -// b { -// d: 10 -// x: 2 -// } -// c: [1, 2] -// } -// -// An implementation may provide options to override this default behavior for -// repeated and message fields. -// -// In order to reset a field's value to the default, the field must -// be in the mask and set to the default value in the provided resource. -// Hence, in order to reset all fields of a resource, provide a default -// instance of the resource and set all fields in the mask, or do -// not provide a mask as described below. -// -// If a field mask is not present on update, the operation applies to -// all fields (as if a field mask of all fields has been specified). -// Note that in the presence of schema evolution, this may mean that -// fields the client does not know and has therefore not filled into -// the request will be reset to their default. If this is unwanted -// behavior, a specific service may require a client to always specify -// a field mask, producing an error if not. -// -// As with get operations, the location of the resource which -// describes the updated values in the request message depends on the -// operation kind. In any case, the effect of the field mask is -// required to be honored by the API. -// -// ## Considerations for HTTP REST -// -// The HTTP kind of an update operation which uses a field mask must -// be set to PATCH instead of PUT in order to satisfy HTTP semantics -// (PUT must only be used for full updates). -// -// # JSON Encoding of Field Masks -// -// In JSON, a field mask is encoded as a single string where paths are -// separated by a comma. Fields name in each path are converted -// to/from lower-camel naming conventions. -// -// As an example, consider the following message declarations: -// -// message Profile { -// User user = 1; -// Photo photo = 2; -// } -// message User { -// string display_name = 1; -// string address = 2; -// } -// -// In proto a field mask for `Profile` may look as such: -// -// mask { -// paths: "user.display_name" -// paths: "photo" -// } -// -// In JSON, the same mask is represented as below: -// -// { -// mask: "user.displayName,photo" -// } -// -// # Field Masks and Oneof Fields -// -// Field masks treat fields in oneofs just as regular fields. Consider the -// following message: -// -// message SampleMessage { -// oneof test_oneof { -// string name = 4; -// SubMessage sub_message = 9; -// } -// } -// -// The field mask can be: -// -// mask { -// paths: "name" -// } -// -// Or: -// -// mask { -// paths: "sub_message" -// } -// -// Note that oneof type names ("test_oneof" in this case) cannot be used in -// paths. -// -// ## Field Mask Verification -// -// The implementation of any API method which has a FieldMask type field in the -// request should verify the included field paths, and return an -// `INVALID_ARGUMENT` error if any path is unmappable. -message FieldMask { - // The set of field mask paths. - repeated string paths = 1; -} diff --git a/blog-backend/api/third_party/google/protobuf/source_context.proto b/blog-backend/api/third_party/google/protobuf/source_context.proto deleted file mode 100644 index f3b2c966..00000000 --- a/blog-backend/api/third_party/google/protobuf/source_context.proto +++ /dev/null @@ -1,48 +0,0 @@ -// Protocol Buffers - Google's data interchange format -// Copyright 2008 Google Inc. All rights reserved. -// https://developers.google.com/protocol-buffers/ -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -syntax = "proto3"; - -package google.protobuf; - -option csharp_namespace = "Google.Protobuf.WellKnownTypes"; -option java_package = "com.google.protobuf"; -option java_outer_classname = "SourceContextProto"; -option java_multiple_files = true; -option objc_class_prefix = "GPB"; -option go_package = "google.golang.org/genproto/protobuf/source_context;source_context"; - -// `SourceContext` represents information about the source of a -// protobuf element, like the file in which it is defined. -message SourceContext { - // The path-qualified name of the .proto file that contained the associated - // protobuf element. For example: `"google/protobuf/source_context.proto"`. - string file_name = 1; -} diff --git a/blog-backend/api/third_party/google/protobuf/struct.proto b/blog-backend/api/third_party/google/protobuf/struct.proto deleted file mode 100644 index ed990e31..00000000 --- a/blog-backend/api/third_party/google/protobuf/struct.proto +++ /dev/null @@ -1,95 +0,0 @@ -// Protocol Buffers - Google's data interchange format -// Copyright 2008 Google Inc. All rights reserved. -// https://developers.google.com/protocol-buffers/ -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -syntax = "proto3"; - -package google.protobuf; - -option csharp_namespace = "Google.Protobuf.WellKnownTypes"; -option cc_enable_arenas = true; -option go_package = "github.com/golang/protobuf/ptypes/struct;structpb"; -option java_package = "com.google.protobuf"; -option java_outer_classname = "StructProto"; -option java_multiple_files = true; -option objc_class_prefix = "GPB"; - -// `Struct` represents a structured data value, consisting of fields -// which map to dynamically typed values. In some languages, `Struct` -// might be supported by a native representation. For example, in -// scripting languages like JS a struct is represented as an -// object. The details of that representation are described together -// with the proto support for the language. -// -// The JSON representation for `Struct` is JSON object. -message Struct { - // Unordered map of dynamically typed values. - map fields = 1; -} - -// `Value` represents a dynamically typed value which can be either -// null, a number, a string, a boolean, a recursive struct value, or a -// list of values. A producer of value is expected to set one of that -// variants, absence of any variant indicates an error. -// -// The JSON representation for `Value` is JSON value. -message Value { - // The kind of value. - oneof kind { - // Represents a null value. - NullValue null_value = 1; - // Represents a double value. - double number_value = 2; - // Represents a string value. - string string_value = 3; - // Represents a boolean value. - bool bool_value = 4; - // Represents a structured value. - Struct struct_value = 5; - // Represents a repeated `Value`. - ListValue list_value = 6; - } -} - -// `NullValue` is a singleton enumeration to represent the null value for the -// `Value` type union. -// -// The JSON representation for `NullValue` is JSON `null`. -enum NullValue { - // Null value. - NULL_VALUE = 0; -} - -// `ListValue` is a wrapper around a repeated field of values. -// -// The JSON representation for `ListValue` is JSON array. -message ListValue { - // Repeated field of dynamically typed values. - repeated Value values = 1; -} diff --git a/blog-backend/api/third_party/google/protobuf/timestamp.proto b/blog-backend/api/third_party/google/protobuf/timestamp.proto deleted file mode 100644 index cd357864..00000000 --- a/blog-backend/api/third_party/google/protobuf/timestamp.proto +++ /dev/null @@ -1,138 +0,0 @@ -// Protocol Buffers - Google's data interchange format -// Copyright 2008 Google Inc. All rights reserved. -// https://developers.google.com/protocol-buffers/ -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -syntax = "proto3"; - -package google.protobuf; - -option csharp_namespace = "Google.Protobuf.WellKnownTypes"; -option cc_enable_arenas = true; -option go_package = "github.com/golang/protobuf/ptypes/timestamp"; -option java_package = "com.google.protobuf"; -option java_outer_classname = "TimestampProto"; -option java_multiple_files = true; -option objc_class_prefix = "GPB"; - -// A Timestamp represents a point in time independent of any time zone or local -// calendar, encoded as a count of seconds and fractions of seconds at -// nanosecond resolution. The count is relative to an epoch at UTC midnight on -// January 1, 1970, in the proleptic Gregorian calendar which extends the -// Gregorian calendar backwards to year one. -// -// All minutes are 60 seconds long. Leap seconds are "smeared" so that no leap -// second table is needed for interpretation, using a [24-hour linear -// smear](https://developers.google.com/time/smear). -// -// The range is from 0001-01-01T00:00:00Z to 9999-12-31T23:59:59.999999999Z. By -// restricting to that range, we ensure that we can convert to and from [RFC -// 3339](https://www.ietf.org/rfc/rfc3339.txt) date strings. -// -// # Examples -// -// Example 1: Compute Timestamp from POSIX `time()`. -// -// Timestamp timestamp; -// timestamp.set_seconds(time(NULL)); -// timestamp.set_nanos(0); -// -// Example 2: Compute Timestamp from POSIX `gettimeofday()`. -// -// struct timeval tv; -// gettimeofday(&tv, NULL); -// -// Timestamp timestamp; -// timestamp.set_seconds(tv.tv_sec); -// timestamp.set_nanos(tv.tv_usec * 1000); -// -// Example 3: Compute Timestamp from Win32 `GetSystemTimeAsFileTime()`. -// -// FILETIME ft; -// GetSystemTimeAsFileTime(&ft); -// UINT64 ticks = (((UINT64)ft.dwHighDateTime) << 32) | ft.dwLowDateTime; -// -// // A Windows tick is 100 nanoseconds. Windows epoch 1601-01-01T00:00:00Z -// // is 11644473600 seconds before Unix epoch 1970-01-01T00:00:00Z. -// Timestamp timestamp; -// timestamp.set_seconds((INT64) ((ticks / 10000000) - 11644473600LL)); -// timestamp.set_nanos((INT32) ((ticks % 10000000) * 100)); -// -// Example 4: Compute Timestamp from Java `System.currentTimeMillis()`. -// -// long millis = System.currentTimeMillis(); -// -// Timestamp timestamp = Timestamp.newBuilder().setSeconds(millis / 1000) -// .setNanos((int) ((millis % 1000) * 1000000)).build(); -// -// -// Example 5: Compute Timestamp from current time in Python. -// -// timestamp = Timestamp() -// timestamp.GetCurrentTime() -// -// # JSON Mapping -// -// In JSON format, the Timestamp type is encoded as a string in the -// [RFC 3339](https://www.ietf.org/rfc/rfc3339.txt) format. That is, the -// format is "{year}-{month}-{day}T{hour}:{min}:{sec}[.{frac_sec}]Z" -// where {year} is always expressed using four digits while {month}, {day}, -// {hour}, {min}, and {sec} are zero-padded to two digits each. The fractional -// seconds, which can go up to 9 digits (i.e. up to 1 nanosecond resolution), -// are optional. The "Z" suffix indicates the timezone ("UTC"); the timezone -// is required. A proto3 JSON serializer should always use UTC (as indicated by -// "Z") when printing the Timestamp type and a proto3 JSON parser should be -// able to accept both UTC and other timezones (as indicated by an offset). -// -// For example, "2017-01-15T01:30:15.01Z" encodes 15.01 seconds past -// 01:30 UTC on January 15, 2017. -// -// In JavaScript, one can convert a Date object to this format using the -// standard -// [toISOString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toISOString) -// method. In Python, a standard `datetime.datetime` object can be converted -// to this format using -// [`strftime`](https://docs.python.org/2/library/time.html#time.strftime) with -// the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one can use -// the Joda Time's [`ISODateTimeFormat.dateTime()`]( -// http://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime%2D%2D -// ) to obtain a formatter capable of generating timestamps in this format. -// -// -message Timestamp { - // Represents seconds of UTC time since Unix epoch - // 1970-01-01T00:00:00Z. Must be from 0001-01-01T00:00:00Z to - // 9999-12-31T23:59:59Z inclusive. - int64 seconds = 1; - - // Non-negative fractions of a second at nanosecond resolution. Negative - // second values with fractions must still have non-negative nanos values - // that count forward in time. Must be from 0 to 999,999,999 - // inclusive. - int32 nanos = 2; -} diff --git a/blog-backend/api/third_party/google/protobuf/type.proto b/blog-backend/api/third_party/google/protobuf/type.proto deleted file mode 100644 index e4b1d3a4..00000000 --- a/blog-backend/api/third_party/google/protobuf/type.proto +++ /dev/null @@ -1,187 +0,0 @@ -// Protocol Buffers - Google's data interchange format -// Copyright 2008 Google Inc. All rights reserved. -// https://developers.google.com/protocol-buffers/ -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -syntax = "proto3"; - -package google.protobuf; - -import "google/protobuf/any.proto"; -import "google/protobuf/source_context.proto"; - -option csharp_namespace = "Google.Protobuf.WellKnownTypes"; -option cc_enable_arenas = true; -option java_package = "com.google.protobuf"; -option java_outer_classname = "TypeProto"; -option java_multiple_files = true; -option objc_class_prefix = "GPB"; -option go_package = "google.golang.org/genproto/protobuf/ptype;ptype"; - -// A protocol buffer message type. -message Type { - // The fully qualified message name. - string name = 1; - // The list of fields. - repeated Field fields = 2; - // The list of types appearing in `oneof` definitions in this type. - repeated string oneofs = 3; - // The protocol buffer options. - repeated Option options = 4; - // The source context. - SourceContext source_context = 5; - // The source syntax. - Syntax syntax = 6; -} - -// A single field of a message type. -message Field { - // Basic field types. - enum Kind { - // Field type unknown. - TYPE_UNKNOWN = 0; - // Field type double. - TYPE_DOUBLE = 1; - // Field type float. - TYPE_FLOAT = 2; - // Field type int64. - TYPE_INT64 = 3; - // Field type uint64. - TYPE_UINT64 = 4; - // Field type int32. - TYPE_INT32 = 5; - // Field type fixed64. - TYPE_FIXED64 = 6; - // Field type fixed32. - TYPE_FIXED32 = 7; - // Field type bool. - TYPE_BOOL = 8; - // Field type string. - TYPE_STRING = 9; - // Field type group. Proto2 syntax only, and deprecated. - TYPE_GROUP = 10; - // Field type message. - TYPE_MESSAGE = 11; - // Field type bytes. - TYPE_BYTES = 12; - // Field type uint32. - TYPE_UINT32 = 13; - // Field type enum. - TYPE_ENUM = 14; - // Field type sfixed32. - TYPE_SFIXED32 = 15; - // Field type sfixed64. - TYPE_SFIXED64 = 16; - // Field type sint32. - TYPE_SINT32 = 17; - // Field type sint64. - TYPE_SINT64 = 18; - } - - // Whether a field is optional, required, or repeated. - enum Cardinality { - // For fields with unknown cardinality. - CARDINALITY_UNKNOWN = 0; - // For optional fields. - CARDINALITY_OPTIONAL = 1; - // For required fields. Proto2 syntax only. - CARDINALITY_REQUIRED = 2; - // For repeated fields. - CARDINALITY_REPEATED = 3; - }; - - // The field type. - Kind kind = 1; - // The field cardinality. - Cardinality cardinality = 2; - // The field number. - int32 number = 3; - // The field name. - string name = 4; - // The field type URL, without the scheme, for message or enumeration - // types. Example: `"type.googleapis.com/google.protobuf.Timestamp"`. - string type_url = 6; - // The index of the field type in `Type.oneofs`, for message or enumeration - // types. The first type has index 1; zero means the type is not in the list. - int32 oneof_index = 7; - // Whether to use alternative packed wire representation. - bool packed = 8; - // The protocol buffer options. - repeated Option options = 9; - // The field JSON name. - string json_name = 10; - // The string value of the default value of this field. Proto2 syntax only. - string default_value = 11; -} - -// Enum type definition. -message Enum { - // Enum type name. - string name = 1; - // Enum value definitions. - repeated EnumValue enumvalue = 2; - // Protocol buffer options. - repeated Option options = 3; - // The source context. - SourceContext source_context = 4; - // The source syntax. - Syntax syntax = 5; -} - -// Enum value definition. -message EnumValue { - // Enum value name. - string name = 1; - // Enum value number. - int32 number = 2; - // Protocol buffer options. - repeated Option options = 3; -} - -// A protocol buffer option, which can be attached to a message, field, -// enumeration, etc. -message Option { - // The option's name. For protobuf built-in options (options defined in - // descriptor.proto), this is the short name. For example, `"map_entry"`. - // For custom options, it should be the fully-qualified name. For example, - // `"google.api.http"`. - string name = 1; - // The option's value packed in an Any message. If the value is a primitive, - // the corresponding wrapper type defined in google/protobuf/wrappers.proto - // should be used. If the value is an enum, it should be stored as an int32 - // value using the google.protobuf.Int32Value type. - Any value = 2; -} - -// The syntax in which a protocol buffer element is defined. -enum Syntax { - // Syntax `proto2`. - SYNTAX_PROTO2 = 0; - // Syntax `proto3`. - SYNTAX_PROTO3 = 1; -} diff --git a/blog-backend/api/third_party/google/protobuf/wrappers.proto b/blog-backend/api/third_party/google/protobuf/wrappers.proto deleted file mode 100644 index 9ee41e38..00000000 --- a/blog-backend/api/third_party/google/protobuf/wrappers.proto +++ /dev/null @@ -1,123 +0,0 @@ -// Protocol Buffers - Google's data interchange format -// Copyright 2008 Google Inc. All rights reserved. -// https://developers.google.com/protocol-buffers/ -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -// Wrappers for primitive (non-message) types. These types are useful -// for embedding primitives in the `google.protobuf.Any` type and for places -// where we need to distinguish between the absence of a primitive -// typed field and its default value. -// -// These wrappers have no meaningful use within repeated fields as they lack -// the ability to detect presence on individual elements. -// These wrappers have no meaningful use within a map or a oneof since -// individual entries of a map or fields of a oneof can already detect presence. - -syntax = "proto3"; - -package google.protobuf; - -option csharp_namespace = "Google.Protobuf.WellKnownTypes"; -option cc_enable_arenas = true; -option go_package = "github.com/golang/protobuf/ptypes/wrappers"; -option java_package = "com.google.protobuf"; -option java_outer_classname = "WrappersProto"; -option java_multiple_files = true; -option objc_class_prefix = "GPB"; - -// Wrapper message for `double`. -// -// The JSON representation for `DoubleValue` is JSON number. -message DoubleValue { - // The double value. - double value = 1; -} - -// Wrapper message for `float`. -// -// The JSON representation for `FloatValue` is JSON number. -message FloatValue { - // The float value. - float value = 1; -} - -// Wrapper message for `int64`. -// -// The JSON representation for `Int64Value` is JSON string. -message Int64Value { - // The int64 value. - int64 value = 1; -} - -// Wrapper message for `uint64`. -// -// The JSON representation for `UInt64Value` is JSON string. -message UInt64Value { - // The uint64 value. - uint64 value = 1; -} - -// Wrapper message for `int32`. -// -// The JSON representation for `Int32Value` is JSON number. -message Int32Value { - // The int32 value. - int32 value = 1; -} - -// Wrapper message for `uint32`. -// -// The JSON representation for `UInt32Value` is JSON number. -message UInt32Value { - // The uint32 value. - uint32 value = 1; -} - -// Wrapper message for `bool`. -// -// The JSON representation for `BoolValue` is JSON `true` and `false`. -message BoolValue { - // The bool value. - bool value = 1; -} - -// Wrapper message for `string`. -// -// The JSON representation for `StringValue` is JSON string. -message StringValue { - // The string value. - string value = 1; -} - -// Wrapper message for `bytes`. -// -// The JSON representation for `BytesValue` is JSON string. -message BytesValue { - // The bytes value. - bytes value = 1; -} diff --git a/blog-backend/api/third_party/validate/README.md b/blog-backend/api/third_party/validate/README.md deleted file mode 100644 index 56698db8..00000000 --- a/blog-backend/api/third_party/validate/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# protoc-gen-validate (PGV) - -* https://github.com/envoyproxy/protoc-gen-validate diff --git a/blog-backend/api/third_party/validate/validate.proto b/blog-backend/api/third_party/validate/validate.proto deleted file mode 100644 index 02d8ce95..00000000 --- a/blog-backend/api/third_party/validate/validate.proto +++ /dev/null @@ -1,862 +0,0 @@ -syntax = "proto2"; -package validate; - -option go_package = "github.com/envoyproxy/protoc-gen-validate/validate"; -option java_package = "io.envoyproxy.pgv.validate"; - -import "google/protobuf/descriptor.proto"; -import "google/protobuf/duration.proto"; -import "google/protobuf/timestamp.proto"; - -// Validation rules applied at the message level -extend google.protobuf.MessageOptions { - // Disabled nullifies any validation rules for this message, including any - // message fields associated with it that do support validation. - optional bool disabled = 1071; - // Ignore skips generation of validation methods for this message. - optional bool ignored = 1072; -} - -// Validation rules applied at the oneof level -extend google.protobuf.OneofOptions { - // Required ensures that exactly one the field options in a oneof is set; - // validation fails if no fields in the oneof are set. - optional bool required = 1071; -} - -// Validation rules applied at the field level -extend google.protobuf.FieldOptions { - // Rules specify the validations to be performed on this field. By default, - // no validation is performed against a field. - optional FieldRules rules = 1071; -} - -// FieldRules encapsulates the rules for each type of field. Depending on the -// field, the correct set should be used to ensure proper validations. -message FieldRules { - optional MessageRules message = 17; - oneof type { - // Scalar Field Types - FloatRules float = 1; - DoubleRules double = 2; - Int32Rules int32 = 3; - Int64Rules int64 = 4; - UInt32Rules uint32 = 5; - UInt64Rules uint64 = 6; - SInt32Rules sint32 = 7; - SInt64Rules sint64 = 8; - Fixed32Rules fixed32 = 9; - Fixed64Rules fixed64 = 10; - SFixed32Rules sfixed32 = 11; - SFixed64Rules sfixed64 = 12; - BoolRules bool = 13; - StringRules string = 14; - BytesRules bytes = 15; - - // Complex Field Types - EnumRules enum = 16; - RepeatedRules repeated = 18; - MapRules map = 19; - - // Well-Known Field Types - AnyRules any = 20; - DurationRules duration = 21; - TimestampRules timestamp = 22; - } -} - -// FloatRules describes the constraints applied to `float` values -message FloatRules { - // Const specifies that this field must be exactly the specified value - optional float const = 1; - - // Lt specifies that this field must be less than the specified value, - // exclusive - optional float lt = 2; - - // Lte specifies that this field must be less than or equal to the - // specified value, inclusive - optional float lte = 3; - - // Gt specifies that this field must be greater than the specified value, - // exclusive. If the value of Gt is larger than a specified Lt or Lte, the - // range is reversed. - optional float gt = 4; - - // Gte specifies that this field must be greater than or equal to the - // specified value, inclusive. If the value of Gte is larger than a - // specified Lt or Lte, the range is reversed. - optional float gte = 5; - - // In specifies that this field must be equal to one of the specified - // values - repeated float in = 6; - - // NotIn specifies that this field cannot be equal to one of the specified - // values - repeated float not_in = 7; - - // IgnoreEmpty specifies that the validation rules of this field should be - // evaluated only if the field is not empty - optional bool ignore_empty = 8; -} - -// DoubleRules describes the constraints applied to `double` values -message DoubleRules { - // Const specifies that this field must be exactly the specified value - optional double const = 1; - - // Lt specifies that this field must be less than the specified value, - // exclusive - optional double lt = 2; - - // Lte specifies that this field must be less than or equal to the - // specified value, inclusive - optional double lte = 3; - - // Gt specifies that this field must be greater than the specified value, - // exclusive. If the value of Gt is larger than a specified Lt or Lte, the - // range is reversed. - optional double gt = 4; - - // Gte specifies that this field must be greater than or equal to the - // specified value, inclusive. If the value of Gte is larger than a - // specified Lt or Lte, the range is reversed. - optional double gte = 5; - - // In specifies that this field must be equal to one of the specified - // values - repeated double in = 6; - - // NotIn specifies that this field cannot be equal to one of the specified - // values - repeated double not_in = 7; - - // IgnoreEmpty specifies that the validation rules of this field should be - // evaluated only if the field is not empty - optional bool ignore_empty = 8; -} - -// Int32Rules describes the constraints applied to `int32` values -message Int32Rules { - // Const specifies that this field must be exactly the specified value - optional int32 const = 1; - - // Lt specifies that this field must be less than the specified value, - // exclusive - optional int32 lt = 2; - - // Lte specifies that this field must be less than or equal to the - // specified value, inclusive - optional int32 lte = 3; - - // Gt specifies that this field must be greater than the specified value, - // exclusive. If the value of Gt is larger than a specified Lt or Lte, the - // range is reversed. - optional int32 gt = 4; - - // Gte specifies that this field must be greater than or equal to the - // specified value, inclusive. If the value of Gte is larger than a - // specified Lt or Lte, the range is reversed. - optional int32 gte = 5; - - // In specifies that this field must be equal to one of the specified - // values - repeated int32 in = 6; - - // NotIn specifies that this field cannot be equal to one of the specified - // values - repeated int32 not_in = 7; - - // IgnoreEmpty specifies that the validation rules of this field should be - // evaluated only if the field is not empty - optional bool ignore_empty = 8; -} - -// Int64Rules describes the constraints applied to `int64` values -message Int64Rules { - // Const specifies that this field must be exactly the specified value - optional int64 const = 1; - - // Lt specifies that this field must be less than the specified value, - // exclusive - optional int64 lt = 2; - - // Lte specifies that this field must be less than or equal to the - // specified value, inclusive - optional int64 lte = 3; - - // Gt specifies that this field must be greater than the specified value, - // exclusive. If the value of Gt is larger than a specified Lt or Lte, the - // range is reversed. - optional int64 gt = 4; - - // Gte specifies that this field must be greater than or equal to the - // specified value, inclusive. If the value of Gte is larger than a - // specified Lt or Lte, the range is reversed. - optional int64 gte = 5; - - // In specifies that this field must be equal to one of the specified - // values - repeated int64 in = 6; - - // NotIn specifies that this field cannot be equal to one of the specified - // values - repeated int64 not_in = 7; - - // IgnoreEmpty specifies that the validation rules of this field should be - // evaluated only if the field is not empty - optional bool ignore_empty = 8; -} - -// UInt32Rules describes the constraints applied to `uint32` values -message UInt32Rules { - // Const specifies that this field must be exactly the specified value - optional uint32 const = 1; - - // Lt specifies that this field must be less than the specified value, - // exclusive - optional uint32 lt = 2; - - // Lte specifies that this field must be less than or equal to the - // specified value, inclusive - optional uint32 lte = 3; - - // Gt specifies that this field must be greater than the specified value, - // exclusive. If the value of Gt is larger than a specified Lt or Lte, the - // range is reversed. - optional uint32 gt = 4; - - // Gte specifies that this field must be greater than or equal to the - // specified value, inclusive. If the value of Gte is larger than a - // specified Lt or Lte, the range is reversed. - optional uint32 gte = 5; - - // In specifies that this field must be equal to one of the specified - // values - repeated uint32 in = 6; - - // NotIn specifies that this field cannot be equal to one of the specified - // values - repeated uint32 not_in = 7; - - // IgnoreEmpty specifies that the validation rules of this field should be - // evaluated only if the field is not empty - optional bool ignore_empty = 8; -} - -// UInt64Rules describes the constraints applied to `uint64` values -message UInt64Rules { - // Const specifies that this field must be exactly the specified value - optional uint64 const = 1; - - // Lt specifies that this field must be less than the specified value, - // exclusive - optional uint64 lt = 2; - - // Lte specifies that this field must be less than or equal to the - // specified value, inclusive - optional uint64 lte = 3; - - // Gt specifies that this field must be greater than the specified value, - // exclusive. If the value of Gt is larger than a specified Lt or Lte, the - // range is reversed. - optional uint64 gt = 4; - - // Gte specifies that this field must be greater than or equal to the - // specified value, inclusive. If the value of Gte is larger than a - // specified Lt or Lte, the range is reversed. - optional uint64 gte = 5; - - // In specifies that this field must be equal to one of the specified - // values - repeated uint64 in = 6; - - // NotIn specifies that this field cannot be equal to one of the specified - // values - repeated uint64 not_in = 7; - - // IgnoreEmpty specifies that the validation rules of this field should be - // evaluated only if the field is not empty - optional bool ignore_empty = 8; -} - -// SInt32Rules describes the constraints applied to `sint32` values -message SInt32Rules { - // Const specifies that this field must be exactly the specified value - optional sint32 const = 1; - - // Lt specifies that this field must be less than the specified value, - // exclusive - optional sint32 lt = 2; - - // Lte specifies that this field must be less than or equal to the - // specified value, inclusive - optional sint32 lte = 3; - - // Gt specifies that this field must be greater than the specified value, - // exclusive. If the value of Gt is larger than a specified Lt or Lte, the - // range is reversed. - optional sint32 gt = 4; - - // Gte specifies that this field must be greater than or equal to the - // specified value, inclusive. If the value of Gte is larger than a - // specified Lt or Lte, the range is reversed. - optional sint32 gte = 5; - - // In specifies that this field must be equal to one of the specified - // values - repeated sint32 in = 6; - - // NotIn specifies that this field cannot be equal to one of the specified - // values - repeated sint32 not_in = 7; - - // IgnoreEmpty specifies that the validation rules of this field should be - // evaluated only if the field is not empty - optional bool ignore_empty = 8; -} - -// SInt64Rules describes the constraints applied to `sint64` values -message SInt64Rules { - // Const specifies that this field must be exactly the specified value - optional sint64 const = 1; - - // Lt specifies that this field must be less than the specified value, - // exclusive - optional sint64 lt = 2; - - // Lte specifies that this field must be less than or equal to the - // specified value, inclusive - optional sint64 lte = 3; - - // Gt specifies that this field must be greater than the specified value, - // exclusive. If the value of Gt is larger than a specified Lt or Lte, the - // range is reversed. - optional sint64 gt = 4; - - // Gte specifies that this field must be greater than or equal to the - // specified value, inclusive. If the value of Gte is larger than a - // specified Lt or Lte, the range is reversed. - optional sint64 gte = 5; - - // In specifies that this field must be equal to one of the specified - // values - repeated sint64 in = 6; - - // NotIn specifies that this field cannot be equal to one of the specified - // values - repeated sint64 not_in = 7; - - // IgnoreEmpty specifies that the validation rules of this field should be - // evaluated only if the field is not empty - optional bool ignore_empty = 8; -} - -// Fixed32Rules describes the constraints applied to `fixed32` values -message Fixed32Rules { - // Const specifies that this field must be exactly the specified value - optional fixed32 const = 1; - - // Lt specifies that this field must be less than the specified value, - // exclusive - optional fixed32 lt = 2; - - // Lte specifies that this field must be less than or equal to the - // specified value, inclusive - optional fixed32 lte = 3; - - // Gt specifies that this field must be greater than the specified value, - // exclusive. If the value of Gt is larger than a specified Lt or Lte, the - // range is reversed. - optional fixed32 gt = 4; - - // Gte specifies that this field must be greater than or equal to the - // specified value, inclusive. If the value of Gte is larger than a - // specified Lt or Lte, the range is reversed. - optional fixed32 gte = 5; - - // In specifies that this field must be equal to one of the specified - // values - repeated fixed32 in = 6; - - // NotIn specifies that this field cannot be equal to one of the specified - // values - repeated fixed32 not_in = 7; - - // IgnoreEmpty specifies that the validation rules of this field should be - // evaluated only if the field is not empty - optional bool ignore_empty = 8; -} - -// Fixed64Rules describes the constraints applied to `fixed64` values -message Fixed64Rules { - // Const specifies that this field must be exactly the specified value - optional fixed64 const = 1; - - // Lt specifies that this field must be less than the specified value, - // exclusive - optional fixed64 lt = 2; - - // Lte specifies that this field must be less than or equal to the - // specified value, inclusive - optional fixed64 lte = 3; - - // Gt specifies that this field must be greater than the specified value, - // exclusive. If the value of Gt is larger than a specified Lt or Lte, the - // range is reversed. - optional fixed64 gt = 4; - - // Gte specifies that this field must be greater than or equal to the - // specified value, inclusive. If the value of Gte is larger than a - // specified Lt or Lte, the range is reversed. - optional fixed64 gte = 5; - - // In specifies that this field must be equal to one of the specified - // values - repeated fixed64 in = 6; - - // NotIn specifies that this field cannot be equal to one of the specified - // values - repeated fixed64 not_in = 7; - - // IgnoreEmpty specifies that the validation rules of this field should be - // evaluated only if the field is not empty - optional bool ignore_empty = 8; -} - -// SFixed32Rules describes the constraints applied to `sfixed32` values -message SFixed32Rules { - // Const specifies that this field must be exactly the specified value - optional sfixed32 const = 1; - - // Lt specifies that this field must be less than the specified value, - // exclusive - optional sfixed32 lt = 2; - - // Lte specifies that this field must be less than or equal to the - // specified value, inclusive - optional sfixed32 lte = 3; - - // Gt specifies that this field must be greater than the specified value, - // exclusive. If the value of Gt is larger than a specified Lt or Lte, the - // range is reversed. - optional sfixed32 gt = 4; - - // Gte specifies that this field must be greater than or equal to the - // specified value, inclusive. If the value of Gte is larger than a - // specified Lt or Lte, the range is reversed. - optional sfixed32 gte = 5; - - // In specifies that this field must be equal to one of the specified - // values - repeated sfixed32 in = 6; - - // NotIn specifies that this field cannot be equal to one of the specified - // values - repeated sfixed32 not_in = 7; - - // IgnoreEmpty specifies that the validation rules of this field should be - // evaluated only if the field is not empty - optional bool ignore_empty = 8; -} - -// SFixed64Rules describes the constraints applied to `sfixed64` values -message SFixed64Rules { - // Const specifies that this field must be exactly the specified value - optional sfixed64 const = 1; - - // Lt specifies that this field must be less than the specified value, - // exclusive - optional sfixed64 lt = 2; - - // Lte specifies that this field must be less than or equal to the - // specified value, inclusive - optional sfixed64 lte = 3; - - // Gt specifies that this field must be greater than the specified value, - // exclusive. If the value of Gt is larger than a specified Lt or Lte, the - // range is reversed. - optional sfixed64 gt = 4; - - // Gte specifies that this field must be greater than or equal to the - // specified value, inclusive. If the value of Gte is larger than a - // specified Lt or Lte, the range is reversed. - optional sfixed64 gte = 5; - - // In specifies that this field must be equal to one of the specified - // values - repeated sfixed64 in = 6; - - // NotIn specifies that this field cannot be equal to one of the specified - // values - repeated sfixed64 not_in = 7; - - // IgnoreEmpty specifies that the validation rules of this field should be - // evaluated only if the field is not empty - optional bool ignore_empty = 8; -} - -// BoolRules describes the constraints applied to `bool` values -message BoolRules { - // Const specifies that this field must be exactly the specified value - optional bool const = 1; -} - -// StringRules describe the constraints applied to `string` values -message StringRules { - // Const specifies that this field must be exactly the specified value - optional string const = 1; - - // Len specifies that this field must be the specified number of - // characters (Unicode code points). Note that the number of - // characters may differ from the number of bytes in the string. - optional uint64 len = 19; - - // MinLen specifies that this field must be the specified number of - // characters (Unicode code points) at a minimum. Note that the number of - // characters may differ from the number of bytes in the string. - optional uint64 min_len = 2; - - // MaxLen specifies that this field must be the specified number of - // characters (Unicode code points) at a maximum. Note that the number of - // characters may differ from the number of bytes in the string. - optional uint64 max_len = 3; - - // LenBytes specifies that this field must be the specified number of bytes - optional uint64 len_bytes = 20; - - // MinBytes specifies that this field must be the specified number of bytes - // at a minimum - optional uint64 min_bytes = 4; - - // MaxBytes specifies that this field must be the specified number of bytes - // at a maximum - optional uint64 max_bytes = 5; - - // Pattern specifes that this field must match against the specified - // regular expression (RE2 syntax). The included expression should elide - // any delimiters. - optional string pattern = 6; - - // Prefix specifies that this field must have the specified substring at - // the beginning of the string. - optional string prefix = 7; - - // Suffix specifies that this field must have the specified substring at - // the end of the string. - optional string suffix = 8; - - // Contains specifies that this field must have the specified substring - // anywhere in the string. - optional string contains = 9; - - // NotContains specifies that this field cannot have the specified substring - // anywhere in the string. - optional string not_contains = 23; - - // In specifies that this field must be equal to one of the specified - // values - repeated string in = 10; - - // NotIn specifies that this field cannot be equal to one of the specified - // values - repeated string not_in = 11; - - // WellKnown rules provide advanced constraints against common string - // patterns - oneof well_known { - // Email specifies that the field must be a valid email address as - // defined by RFC 5322 - bool email = 12; - - // Hostname specifies that the field must be a valid hostname as - // defined by RFC 1034. This constraint does not support - // internationalized domain names (IDNs). - bool hostname = 13; - - // Ip specifies that the field must be a valid IP (v4 or v6) address. - // Valid IPv6 addresses should not include surrounding square brackets. - bool ip = 14; - - // Ipv4 specifies that the field must be a valid IPv4 address. - bool ipv4 = 15; - - // Ipv6 specifies that the field must be a valid IPv6 address. Valid - // IPv6 addresses should not include surrounding square brackets. - bool ipv6 = 16; - - // Uri specifies that the field must be a valid, absolute URI as defined - // by RFC 3986 - bool uri = 17; - - // UriRef specifies that the field must be a valid URI as defined by RFC - // 3986 and may be relative or absolute. - bool uri_ref = 18; - - // Address specifies that the field must be either a valid hostname as - // defined by RFC 1034 (which does not support internationalized domain - // names or IDNs), or it can be a valid IP (v4 or v6). - bool address = 21; - - // Uuid specifies that the field must be a valid UUID as defined by - // RFC 4122 - bool uuid = 22; - - // WellKnownRegex specifies a common well known pattern defined as a regex. - KnownRegex well_known_regex = 24; - } - - // This applies to regexes HTTP_HEADER_NAME and HTTP_HEADER_VALUE to enable - // strict header validation. - // By default, this is true, and HTTP header validations are RFC-compliant. - // Setting to false will enable a looser validations that only disallows - // \r\n\0 characters, which can be used to bypass header matching rules. - optional bool strict = 25 [default = true]; - - // IgnoreEmpty specifies that the validation rules of this field should be - // evaluated only if the field is not empty - optional bool ignore_empty = 26; -} - -// WellKnownRegex contain some well-known patterns. -enum KnownRegex { - UNKNOWN = 0; - - // HTTP header name as defined by RFC 7230. - HTTP_HEADER_NAME = 1; - - // HTTP header value as defined by RFC 7230. - HTTP_HEADER_VALUE = 2; -} - -// BytesRules describe the constraints applied to `bytes` values -message BytesRules { - // Const specifies that this field must be exactly the specified value - optional bytes const = 1; - - // Len specifies that this field must be the specified number of bytes - optional uint64 len = 13; - - // MinLen specifies that this field must be the specified number of bytes - // at a minimum - optional uint64 min_len = 2; - - // MaxLen specifies that this field must be the specified number of bytes - // at a maximum - optional uint64 max_len = 3; - - // Pattern specifes that this field must match against the specified - // regular expression (RE2 syntax). The included expression should elide - // any delimiters. - optional string pattern = 4; - - // Prefix specifies that this field must have the specified bytes at the - // beginning of the string. - optional bytes prefix = 5; - - // Suffix specifies that this field must have the specified bytes at the - // end of the string. - optional bytes suffix = 6; - - // Contains specifies that this field must have the specified bytes - // anywhere in the string. - optional bytes contains = 7; - - // In specifies that this field must be equal to one of the specified - // values - repeated bytes in = 8; - - // NotIn specifies that this field cannot be equal to one of the specified - // values - repeated bytes not_in = 9; - - // WellKnown rules provide advanced constraints against common byte - // patterns - oneof well_known { - // Ip specifies that the field must be a valid IP (v4 or v6) address in - // byte format - bool ip = 10; - - // Ipv4 specifies that the field must be a valid IPv4 address in byte - // format - bool ipv4 = 11; - - // Ipv6 specifies that the field must be a valid IPv6 address in byte - // format - bool ipv6 = 12; - } - - // IgnoreEmpty specifies that the validation rules of this field should be - // evaluated only if the field is not empty - optional bool ignore_empty = 14; -} - -// EnumRules describe the constraints applied to enum values -message EnumRules { - // Const specifies that this field must be exactly the specified value - optional int32 const = 1; - - // DefinedOnly specifies that this field must be only one of the defined - // values for this enum, failing on any undefined value. - optional bool defined_only = 2; - - // In specifies that this field must be equal to one of the specified - // values - repeated int32 in = 3; - - // NotIn specifies that this field cannot be equal to one of the specified - // values - repeated int32 not_in = 4; -} - -// MessageRules describe the constraints applied to embedded message values. -// For message-type fields, validation is performed recursively. -message MessageRules { - // Skip specifies that the validation rules of this field should not be - // evaluated - optional bool skip = 1; - - // Required specifies that this field must be set - optional bool required = 2; -} - -// RepeatedRules describe the constraints applied to `repeated` values -message RepeatedRules { - // MinItems specifies that this field must have the specified number of - // items at a minimum - optional uint64 min_items = 1; - - // MaxItems specifies that this field must have the specified number of - // items at a maximum - optional uint64 max_items = 2; - - // Unique specifies that all elements in this field must be unique. This - // contraint is only applicable to scalar and enum types (messages are not - // supported). - optional bool unique = 3; - - // Items specifies the contraints to be applied to each item in the field. - // Repeated message fields will still execute validation against each item - // unless skip is specified here. - optional FieldRules items = 4; - - // IgnoreEmpty specifies that the validation rules of this field should be - // evaluated only if the field is not empty - optional bool ignore_empty = 5; -} - -// MapRules describe the constraints applied to `map` values -message MapRules { - // MinPairs specifies that this field must have the specified number of - // KVs at a minimum - optional uint64 min_pairs = 1; - - // MaxPairs specifies that this field must have the specified number of - // KVs at a maximum - optional uint64 max_pairs = 2; - - // NoSparse specifies values in this field cannot be unset. This only - // applies to map's with message value types. - optional bool no_sparse = 3; - - // Keys specifies the constraints to be applied to each key in the field. - optional FieldRules keys = 4; - - // Values specifies the constraints to be applied to the value of each key - // in the field. Message values will still have their validations evaluated - // unless skip is specified here. - optional FieldRules values = 5; - - // IgnoreEmpty specifies that the validation rules of this field should be - // evaluated only if the field is not empty - optional bool ignore_empty = 6; -} - -// AnyRules describe constraints applied exclusively to the -// `google.protobuf.Any` well-known type -message AnyRules { - // Required specifies that this field must be set - optional bool required = 1; - - // In specifies that this field's `type_url` must be equal to one of the - // specified values. - repeated string in = 2; - - // NotIn specifies that this field's `type_url` must not be equal to any of - // the specified values. - repeated string not_in = 3; -} - -// DurationRules describe the constraints applied exclusively to the -// `google.protobuf.Duration` well-known type -message DurationRules { - // Required specifies that this field must be set - optional bool required = 1; - - // Const specifies that this field must be exactly the specified value - optional google.protobuf.Duration const = 2; - - // Lt specifies that this field must be less than the specified value, - // exclusive - optional google.protobuf.Duration lt = 3; - - // Lt specifies that this field must be less than the specified value, - // inclusive - optional google.protobuf.Duration lte = 4; - - // Gt specifies that this field must be greater than the specified value, - // exclusive - optional google.protobuf.Duration gt = 5; - - // Gte specifies that this field must be greater than the specified value, - // inclusive - optional google.protobuf.Duration gte = 6; - - // In specifies that this field must be equal to one of the specified - // values - repeated google.protobuf.Duration in = 7; - - // NotIn specifies that this field cannot be equal to one of the specified - // values - repeated google.protobuf.Duration not_in = 8; -} - -// TimestampRules describe the constraints applied exclusively to the -// `google.protobuf.Timestamp` well-known type -message TimestampRules { - // Required specifies that this field must be set - optional bool required = 1; - - // Const specifies that this field must be exactly the specified value - optional google.protobuf.Timestamp const = 2; - - // Lt specifies that this field must be less than the specified value, - // exclusive - optional google.protobuf.Timestamp lt = 3; - - // Lte specifies that this field must be less than the specified value, - // inclusive - optional google.protobuf.Timestamp lte = 4; - - // Gt specifies that this field must be greater than the specified value, - // exclusive - optional google.protobuf.Timestamp gt = 5; - - // Gte specifies that this field must be greater than the specified value, - // inclusive - optional google.protobuf.Timestamp gte = 6; - - // LtNow specifies that this must be less than the current time. LtNow - // can only be used with the Within rule. - optional bool lt_now = 7; - - // GtNow specifies that this must be greater than the current time. GtNow - // can only be used with the Within rule. - optional bool gt_now = 8; - - // Within specifies that this field must be within this duration of the - // current time. This constraint can be used alone or with the LtNow and - // GtNow rules. - optional google.protobuf.Duration within = 9; -} diff --git a/blog-backend/api/user/service/v1/user.proto b/blog-backend/api/user/service/v1/user.proto index 9c85519b..3d8b31fe 100644 --- a/blog-backend/api/user/service/v1/user.proto +++ b/blog-backend/api/user/service/v1/user.proto @@ -1,12 +1,11 @@ syntax = "proto3"; package user.service.v1; -option go_package = "kratos-cms/gen/api/go/user/service/v1;v1"; import "gnostic/openapi/v3/annotations.proto"; import "google/protobuf/empty.proto"; -import "common/pagination/pagination.proto"; +import "pagination/v1/pagination.proto"; // 变量的命名一律使用小驼峰命名法，例如：firstName、lastName等。 diff --git a/blog-backend/api/user/service/v1/user_error.proto b/blog-backend/api/user/service/v1/user_error.proto index e17006b5..3b92cafb 100644 --- a/blog-backend/api/user/service/v1/user_error.proto +++ b/blog-backend/api/user/service/v1/user_error.proto @@ -1,7 +1,6 @@ syntax = "proto3"; package user.service.v1; -option go_package = "kratos-cms/gen/api/go/user/service/v1;v1"; import "errors/errors.proto"; diff --git a/blog-backend/app/admin/service/cmd/server/assets/openapi.yaml b/blog-backend/app/admin/service/cmd/server/assets/openapi.yaml index b0d4332a..8afe2a9f 100644 --- a/blog-backend/app/admin/service/cmd/server/assets/openapi.yaml +++ b/blog-backend/app/admin/service/cmd/server/assets/openapi.yaml @@ -55,13 +55,19 @@ paths: description: 是否不分页 schema: type: boolean + - name: fieldMask + in: query + description: 字段掩码 + schema: + type: string + format: field-mask responses: "200": description: OK content: application/json: schema: - $ref: '#/components/schemas/file.service.v1.ListAttachmentResponse' + $ref: '#/components/schemas/ListAttachmentResponse' security: - OAuth2PasswordBearer: [] post: @@ -73,7 +79,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/file.service.v1.CreateAttachmentRequest' + $ref: '#/components/schemas/CreateAttachmentRequest' required: true responses: "200": @@ -81,7 +87,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/file.service.v1.Attachment' + $ref: '#/components/schemas/Attachment' security: - OAuth2PasswordBearer: [] /admin/v1/attachments/{id}: @@ -103,7 +109,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/file.service.v1.Attachment' + $ref: '#/components/schemas/Attachment' security: - OAuth2PasswordBearer: [] put: @@ -127,7 +133,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/file.service.v1.Attachment' + $ref: '#/components/schemas/Attachment' required: true responses: "200": @@ -135,7 +141,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/file.service.v1.Attachment' + $ref: '#/components/schemas/Attachment' security: - OAuth2PasswordBearer: [] delete: @@ -202,13 +208,19 @@ paths: description: 是否不分页 schema: type: boolean + - name: fieldMask + in: query + description: 字段掩码 + schema: + type: string + format: field-mask responses: "200": description: OK content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.ListCategoryResponse' + $ref: '#/components/schemas/ListCategoryResponse' security: - OAuth2PasswordBearer: [] post: @@ -220,7 +232,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.CreateCategoryRequest' + $ref: '#/components/schemas/CreateCategoryRequest' required: true responses: "200": @@ -228,7 +240,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.Category' + $ref: '#/components/schemas/Category' security: - OAuth2PasswordBearer: [] /admin/v1/categories/{id}: @@ -255,7 +267,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.Category' + $ref: '#/components/schemas/Category' security: - OAuth2PasswordBearer: [] put: @@ -279,7 +291,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.Category' + $ref: '#/components/schemas/Category' required: true responses: "200": @@ -287,7 +299,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.Category' + $ref: '#/components/schemas/Category' security: - OAuth2PasswordBearer: [] delete: @@ -354,13 +366,19 @@ paths: description: 是否不分页 schema: type: boolean + - name: fieldMask + in: query + description: 字段掩码 + schema: + type: string + format: field-mask responses: "200": description: OK content: application/json: schema: - $ref: '#/components/schemas/comment.service.v1.ListCommentResponse' + $ref: '#/components/schemas/ListCommentResponse' security: - OAuth2PasswordBearer: [] post: @@ -372,7 +390,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/comment.service.v1.CreateCommentRequest' + $ref: '#/components/schemas/CreateCommentRequest' required: true responses: "200": @@ -380,7 +398,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/comment.service.v1.Comment' + $ref: '#/components/schemas/Comment' security: - OAuth2PasswordBearer: [] /admin/v1/comments/{id}: @@ -402,7 +420,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/comment.service.v1.Comment' + $ref: '#/components/schemas/Comment' security: - OAuth2PasswordBearer: [] put: @@ -426,7 +444,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/comment.service.v1.Comment' + $ref: '#/components/schemas/Comment' required: true responses: "200": @@ -434,7 +452,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/comment.service.v1.Comment' + $ref: '#/components/schemas/Comment' security: - OAuth2PasswordBearer: [] delete: @@ -501,13 +519,19 @@ paths: description: 是否不分页 schema: type: boolean + - name: fieldMask + in: query + description: 字段掩码 + schema: + type: string + format: field-mask responses: "200": description: OK content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.ListLinkResponse' + $ref: '#/components/schemas/ListLinkResponse' security: - OAuth2PasswordBearer: [] post: @@ -519,7 +543,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.CreateLinkRequest' + $ref: '#/components/schemas/CreateLinkRequest' required: true responses: "200": @@ -527,7 +551,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.Link' + $ref: '#/components/schemas/Link' security: - OAuth2PasswordBearer: [] /admin/v1/links/{id}: @@ -549,7 +573,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.Link' + $ref: '#/components/schemas/Link' security: - OAuth2PasswordBearer: [] put: @@ -573,7 +597,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.Link' + $ref: '#/components/schemas/Link' required: true responses: "200": @@ -581,7 +605,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.Link' + $ref: '#/components/schemas/Link' security: - OAuth2PasswordBearer: [] delete: @@ -617,7 +641,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/admin.service.v1.LoginRequest' + $ref: '#/components/schemas/LoginRequest' required: true responses: "200": @@ -625,7 +649,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/admin.service.v1.LoginResponse' + $ref: '#/components/schemas/LoginResponse' /admin/v1/logout: post: tags: @@ -636,7 +660,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/admin.service.v1.LogoutRequest' + $ref: '#/components/schemas/LogoutRequest' required: true responses: "200": @@ -662,7 +686,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/user.service.v1.User' + $ref: '#/components/schemas/User' security: - OAuth2PasswordBearer: [] /admin/v1/menus: @@ -706,13 +730,19 @@ paths: description: 是否不分页 schema: type: boolean + - name: fieldMask + in: query + description: 字段掩码 + schema: + type: string + format: field-mask responses: "200": description: OK content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.ListMenuResponse' + $ref: '#/components/schemas/ListMenuResponse' security: - OAuth2PasswordBearer: [] post: @@ -724,7 +754,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.CreateMenuRequest' + $ref: '#/components/schemas/CreateMenuRequest' required: true responses: "200": @@ -732,7 +762,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.Menu' + $ref: '#/components/schemas/Menu' security: - OAuth2PasswordBearer: [] /admin/v1/menus/{id}: @@ -754,7 +784,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.Menu' + $ref: '#/components/schemas/Menu' security: - OAuth2PasswordBearer: [] put: @@ -778,7 +808,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.Menu' + $ref: '#/components/schemas/Menu' required: true responses: "200": @@ -786,7 +816,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.Menu' + $ref: '#/components/schemas/Menu' security: - OAuth2PasswordBearer: [] delete: @@ -853,13 +883,19 @@ paths: description: 是否不分页 schema: type: boolean + - name: fieldMask + in: query + description: 字段掩码 + schema: + type: string + format: field-mask responses: "200": description: OK content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.ListPhotoResponse' + $ref: '#/components/schemas/ListPhotoResponse' security: - OAuth2PasswordBearer: [] post: @@ -871,7 +907,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.CreatePhotoRequest' + $ref: '#/components/schemas/CreatePhotoRequest' required: true responses: "200": @@ -879,7 +915,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.Photo' + $ref: '#/components/schemas/Photo' security: - OAuth2PasswordBearer: [] /admin/v1/photos/{id}: @@ -901,7 +937,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.Photo' + $ref: '#/components/schemas/Photo' security: - OAuth2PasswordBearer: [] put: @@ -925,7 +961,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.Photo' + $ref: '#/components/schemas/Photo' required: true responses: "200": @@ -933,7 +969,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.Photo' + $ref: '#/components/schemas/Photo' security: - OAuth2PasswordBearer: [] delete: @@ -1000,13 +1036,19 @@ paths: description: 是否不分页 schema: type: boolean + - name: fieldMask + in: query + description: 字段掩码 + schema: + type: string + format: field-mask responses: "200": description: OK content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.ListPostResponse' + $ref: '#/components/schemas/ListPostResponse' security: - OAuth2PasswordBearer: [] post: @@ -1018,7 +1060,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.CreatePostRequest' + $ref: '#/components/schemas/CreatePostRequest' required: true responses: "200": @@ -1026,7 +1068,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.Post' + $ref: '#/components/schemas/Post' security: - OAuth2PasswordBearer: [] /admin/v1/posts/{id}: @@ -1048,7 +1090,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.Post' + $ref: '#/components/schemas/Post' security: - OAuth2PasswordBearer: [] put: @@ -1072,7 +1114,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.Post' + $ref: '#/components/schemas/Post' required: true responses: "200": @@ -1080,7 +1122,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.Post' + $ref: '#/components/schemas/Post' security: - OAuth2PasswordBearer: [] delete: @@ -1147,13 +1189,19 @@ paths: description: 是否不分页 schema: type: boolean + - name: fieldMask + in: query + description: 字段掩码 + schema: + type: string + format: field-mask responses: "200": description: OK content: application/json: schema: - $ref: '#/components/schemas/admin.service.v1.ListSystemResponse' + $ref: '#/components/schemas/ListSystemResponse' security: - OAuth2PasswordBearer: [] post: @@ -1165,7 +1213,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/admin.service.v1.CreateSystemRequest' + $ref: '#/components/schemas/CreateSystemRequest' required: true responses: "200": @@ -1173,7 +1221,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/admin.service.v1.System' + $ref: '#/components/schemas/System' security: - OAuth2PasswordBearer: [] /admin/v1/system/{id}: @@ -1194,7 +1242,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/admin.service.v1.System' + $ref: '#/components/schemas/System' security: - OAuth2PasswordBearer: [] put: @@ -1216,7 +1264,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/admin.service.v1.System' + $ref: '#/components/schemas/System' required: true responses: "200": @@ -1224,7 +1272,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/admin.service.v1.System' + $ref: '#/components/schemas/System' security: - OAuth2PasswordBearer: [] delete: @@ -1289,13 +1337,19 @@ paths: description: 是否不分页 schema: type: boolean + - name: fieldMask + in: query + description: 字段掩码 + schema: + type: string + format: field-mask responses: "200": description: OK content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.ListTagResponse' + $ref: '#/components/schemas/ListTagResponse' security: - OAuth2PasswordBearer: [] post: @@ -1307,7 +1361,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.CreateTagRequest' + $ref: '#/components/schemas/CreateTagRequest' required: true responses: "200": @@ -1315,7 +1369,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.Tag' + $ref: '#/components/schemas/Tag' security: - OAuth2PasswordBearer: [] /admin/v1/tags/{id}: @@ -1337,7 +1391,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.Tag' + $ref: '#/components/schemas/Tag' security: - OAuth2PasswordBearer: [] put: @@ -1361,7 +1415,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.Tag' + $ref: '#/components/schemas/Tag' required: true responses: "200": @@ -1369,7 +1423,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.Tag' + $ref: '#/components/schemas/Tag' security: - OAuth2PasswordBearer: [] delete: @@ -1436,13 +1490,19 @@ paths: description: 是否不分页 schema: type: boolean + - name: fieldMask + in: query + description: 字段掩码 + schema: + type: string + format: field-mask responses: "200": description: OK content: application/json: schema: - $ref: '#/components/schemas/user.service.v1.ListUserResponse' + $ref: '#/components/schemas/ListUserResponse' security: - OAuth2PasswordBearer: [] post: @@ -1460,7 +1520,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/user.service.v1.User' + $ref: '#/components/schemas/User' required: true responses: "200": @@ -1468,7 +1528,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/user.service.v1.User' + $ref: '#/components/schemas/User' security: - OAuth2PasswordBearer: [] /admin/v1/users/{id}: @@ -1490,7 +1550,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/user.service.v1.User' + $ref: '#/components/schemas/User' security: - OAuth2PasswordBearer: [] put: @@ -1514,7 +1574,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/user.service.v1.User' + $ref: '#/components/schemas/User' required: true responses: "200": @@ -1522,7 +1582,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/user.service.v1.User' + $ref: '#/components/schemas/User' security: - OAuth2PasswordBearer: [] delete: @@ -1550,91 +1610,89 @@ paths: - OAuth2PasswordBearer: [] components: schemas: - KratosStatus: + Any: type: object properties: - code: - type: number - description: 错误码 - format: int32 - message: + value: + $ref: '#/components/schemas/GoogleProtobufAny' + yaml: type: string - description: 错误消息 - reason: - type: string - description: 错误原因 - metadata: - type: object - description: 元数据 - description: Kratos错误返回 - admin.service.v1.CreateSystemRequest: + AnyOrExpression: type: object properties: - system: - $ref: '#/components/schemas/admin.service.v1.System' - operatorId: - type: string - description: 请求 - 创建系统设置 - admin.service.v1.ListSystemResponse: + any: + $ref: '#/components/schemas/Any' + expression: + $ref: '#/components/schemas/Expression' + Attachment: type: object properties: - items: - type: array - items: - $ref: '#/components/schemas/admin.service.v1.System' - total: + id: type: integer - format: int32 - description: 回应 - 系统设置列表 - admin.service.v1.LoginRequest: - type: object - properties: - username: + format: uint32 + name: type: string - password: + path: type: string - grand_type: + fileKey: type: string - description: 用户后台登陆 - 请求 - admin.service.v1.LoginResponse: - type: object - properties: - id: + thumbPath: + type: string + mediaType: + type: string + suffix: + type: string + width: type: integer - format: uint32 - username: + format: int32 + height: + type: integer + format: int32 + size: type: string - token_type: + type: + type: integer + format: int32 + createTime: type: string - access_token: + updateTime: type: string - refresh_token: + deleteTime: type: string - description: 用户后台登陆 - 回应 - admin.service.v1.LogoutRequest: + description: 附件 + Category: type: object properties: id: type: integer format: uint32 - description: 用户后台登出 - 请求 - admin.service.v1.System: - type: object - properties: - id: - type: string - theme: + parentId: type: integer - format: int32 - title: + format: uint32 + name: type: string - keywords: + slug: type: string description: type: string - recordNumber: + thumbnail: + type: string + password: + type: string + fullPath: type: string - comment.service.v1.Comment: + priority: + type: integer + format: int32 + createTime: + type: string + updateTime: + type: string + postCount: + type: integer + format: uint32 + description: 类别 + Comment: type: object properties: id: @@ -1671,203 +1729,293 @@ components: updateTime: type: string description: 评论 - comment.service.v1.CreateCommentRequest: + CreateAttachmentRequest: type: object properties: - comment: - $ref: '#/components/schemas/comment.service.v1.Comment' + attachment: + $ref: '#/components/schemas/Attachment' operatorId: type: integer format: uint32 - description: 请求 - 创建评论 - comment.service.v1.ListCommentResponse: - type: object - properties: - items: - type: array - items: - $ref: '#/components/schemas/comment.service.v1.Comment' - total: - type: integer - format: int32 - description: 回应 - 评论列表 - content.service.v1.Category: + description: 创建附件 - 请求 + CreateCategoryRequest: type: object properties: - id: - type: integer - format: uint32 - parentId: - type: integer - format: uint32 - name: - type: string - slug: - type: string - description: - type: string - thumbnail: - type: string - password: - type: string - fullPath: - type: string - priority: - type: integer - format: int32 - createTime: - type: string - updateTime: - type: string - postCount: + category: + $ref: '#/components/schemas/Category' + operatorId: type: integer format: uint32 - description: 类别 - content.service.v1.CreateCategoryRequest: + description: 请求 - 创建类别 + CreateCommentRequest: type: object properties: - category: - $ref: '#/components/schemas/content.service.v1.Category' + comment: + $ref: '#/components/schemas/Comment' operatorId: type: integer format: uint32 - description: 请求 - 创建类别 - content.service.v1.CreateLinkRequest: + description: 请求 - 创建评论 + CreateLinkRequest: type: object properties: link: - $ref: '#/components/schemas/content.service.v1.Link' + $ref: '#/components/schemas/Link' operatorId: type: integer format: uint32 description: 请求 - 创建链接 - content.service.v1.CreateMenuRequest: + CreateMenuRequest: type: object properties: menu: - $ref: '#/components/schemas/content.service.v1.Menu' + $ref: '#/components/schemas/Menu' operatorId: type: integer format: uint32 description: 请求 - 创建菜单 - content.service.v1.CreatePhotoRequest: + CreatePhotoRequest: type: object properties: photo: - $ref: '#/components/schemas/content.service.v1.Photo' + $ref: '#/components/schemas/Photo' operatorId: type: integer format: uint32 description: 请求 - 创建照片 - content.service.v1.CreatePostRequest: + CreatePostRequest: type: object properties: post: - $ref: '#/components/schemas/content.service.v1.Post' + $ref: '#/components/schemas/Post' operatorId: type: integer format: uint32 description: 请求 - 创建帖子 - content.service.v1.CreateTagRequest: + CreateSystemRequest: + type: object + properties: + system: + $ref: '#/components/schemas/System' + operatorId: + type: string + description: 请求 - 创建系统设置 + CreateTagRequest: type: object properties: tag: - $ref: '#/components/schemas/content.service.v1.Tag' + $ref: '#/components/schemas/Tag' operatorId: type: integer format: uint32 description: 请求 - 创建标签 - content.service.v1.Link: + Expression: type: object properties: - id: - type: integer - format: uint32 - name: + additionalProperties: + type: array + items: + $ref: '#/components/schemas/NamedAny' + ExternalDocs: + type: object + properties: + description: type: string url: type: string - logo: + specificationExtension: + type: array + items: + $ref: '#/components/schemas/NamedAny' + description: Allows referencing an external resource for extended documentation. + GoogleProtobufAny: + type: object + properties: + '@type': type: string - description: + description: The type of the serialized message. + additionalProperties: true + description: Contains an arbitrary serialized message along with a @type that describes the type of the serialized message. + KratosStatus: + type: object + properties: + code: + type: number + description: 错误码 + format: int32 + message: type: string - team: + description: 错误消息 + reason: type: string - priority: - type: integer - format: int32 - createTime: + description: 错误原因 + metadata: + type: object + description: 元数据 + description: Kratos错误返回 + Link: + type: object + properties: + operationRef: type: string - updateTime: + operationId: + type: string + parameters: + $ref: '#/components/schemas/AnyOrExpression' + requestBody: + $ref: '#/components/schemas/AnyOrExpression' + description: type: string - description: 链接 - content.service.v1.ListCategoryResponse: + server: + $ref: '#/components/schemas/Server' + specificationExtension: + type: array + items: + $ref: '#/components/schemas/NamedAny' + description: The `Link object` represents a possible design-time link for a response. The presence of a link does not guarantee the caller's ability to successfully invoke it, rather it provides a known relationship and traversal mechanism between responses and other operations. Unlike _dynamic_ links (i.e. links provided **in** the response payload), the OAS linking mechanism does not require link information in the runtime response. For computing links, and providing instructions to execute them, a runtime expression is used for accessing values in an operation and using them as parameters while invoking the linked operation. + ListAttachmentResponse: type: object properties: items: type: array items: - $ref: '#/components/schemas/content.service.v1.Category' + $ref: '#/components/schemas/Attachment' + total: + type: integer + format: int32 + description: 附件列表 - 回应 + ListCategoryResponse: + type: object + properties: + items: + type: array + items: + $ref: '#/components/schemas/Category' total: type: integer format: int32 description: 回应 - 类别列表 - content.service.v1.ListLinkResponse: + ListCommentResponse: type: object properties: items: type: array items: - $ref: '#/components/schemas/content.service.v1.Link' + $ref: '#/components/schemas/Comment' + total: + type: integer + format: int32 + description: 回应 - 评论列表 + ListLinkResponse: + type: object + properties: + items: + type: array + items: + $ref: '#/components/schemas/Link' total: type: integer format: int32 description: 回应 - 链接列表 - content.service.v1.ListMenuResponse: + ListMenuResponse: type: object properties: items: type: array items: - $ref: '#/components/schemas/content.service.v1.Menu' + $ref: '#/components/schemas/Menu' total: type: integer format: int32 description: 回应 - 菜单列表 - content.service.v1.ListPhotoResponse: + ListPhotoResponse: type: object properties: items: type: array items: - $ref: '#/components/schemas/content.service.v1.Photo' + $ref: '#/components/schemas/Photo' total: type: integer format: int32 description: 回应 - 照片列表 - content.service.v1.ListPostResponse: + ListPostResponse: type: object properties: items: type: array items: - $ref: '#/components/schemas/content.service.v1.Post' + $ref: '#/components/schemas/Post' total: type: integer format: int32 description: 回应 - 帖子列表 - content.service.v1.ListTagResponse: + ListSystemResponse: type: object properties: items: type: array items: - $ref: '#/components/schemas/content.service.v1.Tag' + $ref: '#/components/schemas/System' + total: + type: integer + format: int32 + description: 回应 - 系统设置列表 + ListTagResponse: + type: object + properties: + items: + type: array + items: + $ref: '#/components/schemas/Tag' total: type: integer format: int32 description: 回应 - 标签列表 - content.service.v1.Menu: + ListUserResponse: + type: object + properties: + items: + type: array + items: + $ref: '#/components/schemas/User' + total: + type: integer + format: int32 + description: 获取用户列表 - 答复 + LoginRequest: + type: object + properties: + username: + type: string + password: + type: string + grand_type: + type: string + description: 用户后台登陆 - 请求 + LoginResponse: + type: object + properties: + id: + type: integer + format: uint32 + username: + type: string + token_type: + type: string + access_token: + type: string + refresh_token: + type: string + description: 用户后台登陆 - 回应 + LogoutRequest: + type: object + properties: + id: + type: integer + format: uint32 + description: 用户后台登出 - 请求 + Menu: type: object properties: id: @@ -1894,7 +2042,29 @@ components: updateTime: type: string description: 菜单 - content.service.v1.Photo: + NamedAny: + type: object + properties: + name: + type: string + description: Map key + value: + allOf: + - $ref: '#/components/schemas/Any' + description: Mapped value + description: Automatically-generated message used to represent maps of Any as ordered (name,value) pairs. + NamedServerVariable: + type: object + properties: + name: + type: string + description: Map key + value: + allOf: + - $ref: '#/components/schemas/ServerVariable' + description: Mapped value + description: Automatically-generated message used to represent maps of ServerVariable as ordered (name,value) pairs. + Photo: type: object properties: id: @@ -1920,7 +2090,7 @@ components: createTime: type: string description: 照片 - content.service.v1.Post: + Post: type: object properties: id: @@ -1980,100 +2150,74 @@ components: editTime: type: string description: 帖子 - content.service.v1.Tag: + Server: type: object properties: - id: - type: integer - format: uint32 - name: - type: string - slug: - type: string - slugName: - type: string - color: - type: string - thumbnail: + url: type: string - createTime: + description: type: string - updateTime: + variables: + $ref: '#/components/schemas/ServerVariables' + specificationExtension: + type: array + items: + $ref: '#/components/schemas/NamedAny' + description: An object representing a Server. + ServerVariable: + type: object + properties: + enum: + type: array + items: + type: string + default: type: string - postCount: - type: integer - format: uint32 - fullPath: + description: type: string - description: 标签 - file.service.v1.Attachment: + specificationExtension: + type: array + items: + $ref: '#/components/schemas/NamedAny' + description: An object representing a Server Variable for server URL template substitution. + ServerVariables: + type: object + properties: + additionalProperties: + type: array + items: + $ref: '#/components/schemas/NamedServerVariable' + System: type: object properties: id: - type: integer - format: uint32 - name: type: string - path: - type: string - fileKey: - type: string - thumbPath: - type: string - mediaType: - type: string - suffix: - type: string - width: - type: integer - format: int32 - height: + theme: type: integer format: int32 - size: + title: type: string - type: - type: integer - format: int32 - createTime: + keywords: type: string - updateTime: + description: type: string - deleteTime: + recordNumber: type: string - description: 附件 - file.service.v1.CreateAttachmentRequest: + Tag: type: object properties: - attachment: - $ref: '#/components/schemas/file.service.v1.Attachment' - operatorId: - type: integer - format: uint32 - description: 创建附件 - 请求 - file.service.v1.ListAttachmentResponse: - type: object - properties: - items: - type: array - items: - $ref: '#/components/schemas/file.service.v1.Attachment' - total: - type: integer - format: int32 - description: 附件列表 - 回应 - user.service.v1.ListUserResponse: - type: object - properties: - items: + name: + type: string + description: + type: string + externalDocs: + $ref: '#/components/schemas/ExternalDocs' + specificationExtension: type: array items: - $ref: '#/components/schemas/user.service.v1.User' - total: - type: integer - format: int32 - description: 获取用户列表 - 答复 - user.service.v1.User: + $ref: '#/components/schemas/NamedAny' + description: Adds metadata to a single tag that is used by the Operation Object. It is not mandatory to have a Tag Object per tag defined in the Operation Object instances. + User: type: object properties: id: diff --git a/blog-backend/app/admin/service/cmd/server/wire.go b/blog-backend/app/admin/service/cmd/server/wire.go index 5b1901a2..e97bb552 100644 --- a/blog-backend/app/admin/service/cmd/server/wire.go +++ b/blog-backend/app/admin/service/cmd/server/wire.go @@ -14,7 +14,6 @@ import ( conf "github.com/tx7do/kratos-bootstrap/gen/api/go/conf/v1" - "kratos-cms/app/admin/service/internal/biz" "kratos-cms/app/admin/service/internal/data" "kratos-cms/app/admin/service/internal/server" "kratos-cms/app/admin/service/internal/service" @@ -22,5 +21,5 @@ import ( // initApp init kratos application. func initApp(log.Logger, registry.Registrar, *conf.Bootstrap) (*kratos.App, func(), error) { - panic(wire.Build(server.ProviderSet, service.ProviderSet, data.ProviderSet, biz.ProviderSet, newApp)) + panic(wire.Build(server.ProviderSet, service.ProviderSet, data.ProviderSet, newApp)) } diff --git a/blog-backend/app/admin/service/cmd/server/wire_gen.go b/blog-backend/app/admin/service/cmd/server/wire_gen.go index fc62352c..871e0173 100644 --- a/blog-backend/app/admin/service/cmd/server/wire_gen.go +++ b/blog-backend/app/admin/service/cmd/server/wire_gen.go @@ -11,7 +11,6 @@ import ( "github.com/go-kratos/kratos/v2/log" "github.com/go-kratos/kratos/v2/registry" "github.com/tx7do/kratos-bootstrap/gen/api/go/conf/v1" - "kratos-cms/app/admin/service/internal/biz" "kratos-cms/app/admin/service/internal/data" "kratos-cms/app/admin/service/internal/server" "kratos-cms/app/admin/service/internal/service" @@ -20,31 +19,30 @@ import ( // Injectors from wire.go: // initApp init kratos application. -func initApp(logger log.Logger, registrar registry.Registrar, bootstrap *conf.Bootstrap) (*kratos.App, func(), error) { +func initApp(logger log.Logger, registrar registry.Registrar, bootstrap *v1.Bootstrap) (*kratos.App, func(), error) { authenticator := data.NewAuthenticator(bootstrap) engine := data.NewAuthorizer() discovery := data.NewDiscovery(bootstrap) userServiceClient := data.NewUserServiceClient(discovery, bootstrap) client := data.NewRedisClient(bootstrap, logger) - attachmentServiceClient := data.NewAttachmentServiceClient(discovery, bootstrap) - commentServiceClient := data.NewCommentServiceClient(discovery, bootstrap) - categoryServiceClient := data.NewCategoryServiceClient(discovery, bootstrap) - linkServiceClient := data.NewLinkServiceClient(discovery, bootstrap) - postServiceClient := data.NewPostServiceClient(discovery, bootstrap) - tagServiceClient := data.NewTagServiceClient(discovery, bootstrap) - dataData, cleanup, err := data.NewData(client, authenticator, engine, userServiceClient, attachmentServiceClient, commentServiceClient, categoryServiceClient, linkServiceClient, postServiceClient, tagServiceClient, logger) + dataData, cleanup, err := data.NewData(client, authenticator, engine, logger) if err != nil { return nil, nil, err } userTokenRepo := data.NewUserTokenRepo(dataData, authenticator, logger) - userTokenUseCase := biz.NewUserAuthUseCase(userTokenRepo) - authenticationService := service.NewAuthenticationService(logger, userServiceClient, userTokenUseCase) + authenticationService := service.NewAuthenticationService(logger, userServiceClient, userTokenRepo) userService := service.NewUserService(logger, userServiceClient) + postServiceClient := data.NewPostServiceClient(discovery, bootstrap) postService := service.NewPostService(logger, postServiceClient) + linkServiceClient := data.NewLinkServiceClient(discovery, bootstrap) linkService := service.NewLinkService(logger, linkServiceClient) + categoryServiceClient := data.NewCategoryServiceClient(discovery, bootstrap) categoryService := service.NewCategoryService(logger, categoryServiceClient) + commentServiceClient := data.NewCommentServiceClient(discovery, bootstrap) commentService := service.NewCommentService(logger, commentServiceClient) + tagServiceClient := data.NewTagServiceClient(discovery, bootstrap) tagService := service.NewTagService(logger, tagServiceClient) + attachmentServiceClient := data.NewAttachmentServiceClient(discovery, bootstrap) attachmentService := service.NewAttachmentService(logger, attachmentServiceClient) httpServer := server.NewHTTPServer(bootstrap, logger, authenticator, engine, authenticationService, userService, postService, linkService, categoryService, commentService, tagService, attachmentService) app := newApp(logger, registrar, httpServer) diff --git a/blog-backend/app/admin/service/internal/biz/README.md b/blog-backend/app/admin/service/internal/biz/README.md deleted file mode 100644 index 26a66b63..00000000 --- a/blog-backend/app/admin/service/internal/biz/README.md +++ /dev/null @@ -1 +0,0 @@ -# Biz diff --git a/blog-backend/app/admin/service/internal/biz/init.go b/blog-backend/app/admin/service/internal/biz/init.go deleted file mode 100644 index 5b3bbcf1..00000000 --- a/blog-backend/app/admin/service/internal/biz/init.go +++ /dev/null @@ -1,11 +0,0 @@ -//go:build wireinject -// +build wireinject - -package biz - -import "github.com/google/wire" - -// ProviderSet is biz providers. -var ProviderSet = wire.NewSet( - NewUserAuthUseCase, -) diff --git a/blog-backend/app/admin/service/internal/biz/user_token.go b/blog-backend/app/admin/service/internal/biz/user_token.go deleted file mode 100644 index 7a364300..00000000 --- a/blog-backend/app/admin/service/internal/biz/user_token.go +++ /dev/null @@ -1,35 +0,0 @@ -package biz - -import ( - "context" - - v1 "kratos-cms/gen/api/go/user/service/v1" -) - -type UserTokenRepo interface { - GetToken(ctx context.Context, userId uint32) string - GenerateToken(ctx context.Context, user *v1.User) (string, error) - RemoveToken(ctx context.Context, userId uint32) error -} - -type UserTokenUseCase struct { - repo UserTokenRepo -} - -func NewUserAuthUseCase(repo UserTokenRepo) *UserTokenUseCase { - return &UserTokenUseCase{ - repo: repo, - } -} - -func (uc *UserTokenUseCase) GenerateToken(ctx context.Context, user *v1.User) (string, error) { - return uc.repo.GenerateToken(ctx, user) -} - -func (uc *UserTokenUseCase) GetToken(ctx context.Context, userId uint32) string { - return uc.repo.GetToken(ctx, userId) -} - -func (uc *UserTokenUseCase) RemoveToken(ctx context.Context, userId uint32) error { - return uc.repo.RemoveToken(ctx, userId) -} diff --git a/blog-backend/app/admin/service/internal/data/data.go b/blog-backend/app/admin/service/internal/data/data.go index bbb9be81..ebf8ea3c 100644 --- a/blog-backend/app/admin/service/internal/data/data.go +++ b/blog-backend/app/admin/service/internal/data/data.go @@ -15,7 +15,7 @@ import ( "github.com/go-kratos/kratos/v2/registry" "github.com/tx7do/kratos-bootstrap" - "github.com/tx7do/kratos-bootstrap/gen/api/go/conf/v1" + conf "github.com/tx7do/kratos-bootstrap/gen/api/go/conf/v1" commentV1 "kratos-cms/gen/api/go/comment/service/v1" contentV1 "kratos-cms/gen/api/go/content/service/v1" @@ -32,43 +32,21 @@ type Data struct { authenticator authnEngine.Authenticator authorizer authzEngine.Engine - - userClient userV1.UserServiceClient - attachmentClient fileV1.AttachmentServiceClient - commentClient commentV1.CommentServiceClient - categoryClient contentV1.CategoryServiceClient - linkClient contentV1.LinkServiceClient - postClient contentV1.PostServiceClient - tagClient contentV1.TagServiceClient } // NewData . func NewData(redisClient *redis.Client, authenticator authnEngine.Authenticator, authorizer authzEngine.Engine, - userClient userV1.UserServiceClient, - attachmentClient fileV1.AttachmentServiceClient, - commentClient commentV1.CommentServiceClient, - categoryClient contentV1.CategoryServiceClient, - linkClient contentV1.LinkServiceClient, - postClient contentV1.PostServiceClient, - tagClient contentV1.TagServiceClient, logger log.Logger, ) (*Data, func(), error) { l := log.NewHelper(log.With(logger, "module", "data/admin-service")) d := &Data{ - rdb: redisClient, - log: l, - authenticator: authenticator, - authorizer: authorizer, - userClient: userClient, - attachmentClient: attachmentClient, - commentClient: commentClient, - categoryClient: categoryClient, - linkClient: linkClient, - postClient: postClient, - tagClient: tagClient, + rdb: redisClient, + log: l, + authenticator: authenticator, + authorizer: authorizer, } return d, func() { diff --git a/blog-backend/app/admin/service/internal/data/user_token.go b/blog-backend/app/admin/service/internal/data/user_token.go index 858d6004..d1f71e83 100644 --- a/blog-backend/app/admin/service/internal/data/user_token.go +++ b/blog-backend/app/admin/service/internal/data/user_token.go @@ -12,28 +12,25 @@ import ( "github.com/go-kratos/kratos/v2/log" "github.com/go-redis/redis/v8" - "kratos-cms/app/admin/service/internal/biz" v1 "kratos-cms/gen/api/go/user/service/v1" ) -var _ biz.UserTokenRepo = (*userTokenRepo)(nil) - -type userTokenRepo struct { +type UserTokenRepo struct { data *Data log *log.Helper authenticator authnEngine.Authenticator } -func NewUserTokenRepo(data *Data, authenticator authnEngine.Authenticator, logger log.Logger) biz.UserTokenRepo { +func NewUserTokenRepo(data *Data, authenticator authnEngine.Authenticator, logger log.Logger) *UserTokenRepo { l := log.NewHelper(log.With(logger, "module", "user-token/repo/admin-service")) - return &userTokenRepo{ + return &UserTokenRepo{ data: data, log: l, authenticator: authenticator, } } -func (r *userTokenRepo) createAccessJwtToken(_ string, userId uint32) string { +func (r *UserTokenRepo) createAccessJwtToken(_ string, userId uint32) string { principal := authn.AuthClaims{ Subject: strconv.FormatUint(uint64(userId), 10), Scopes: make(authn.ScopeSet), @@ -47,7 +44,7 @@ func (r *userTokenRepo) createAccessJwtToken(_ string, userId uint32) string { return signedToken } -func (r *userTokenRepo) GenerateToken(ctx context.Context, user *v1.User) (string, error) { +func (r *UserTokenRepo) GenerateToken(ctx context.Context, user *v1.User) (string, error) { token := r.createAccessJwtToken(user.GetUserName(), user.GetId()) if token == "" { return "", errors.New("create token failed") @@ -61,11 +58,11 @@ func (r *userTokenRepo) GenerateToken(ctx context.Context, user *v1.User) (strin return token, nil } -func (r *userTokenRepo) GetToken(ctx context.Context, userId uint32) string { +func (r *UserTokenRepo) GetToken(ctx context.Context, userId uint32) string { return r.getToken(ctx, userId) } -func (r *userTokenRepo) RemoveToken(ctx context.Context, userId uint32) error { +func (r *UserTokenRepo) RemoveToken(ctx context.Context, userId uint32) error { validToken := r.getToken(ctx, userId) if validToken == "" { return v1.ErrorTokenNotExist("令牌不存在") @@ -74,7 +71,7 @@ func (r *userTokenRepo) RemoveToken(ctx context.Context, userId uint32) error { return r.deleteToken(ctx, userId) } -func (r *userTokenRepo) RemoveUserToken(ctx context.Context, userId uint32) error { +func (r *UserTokenRepo) RemoveUserToken(ctx context.Context, userId uint32) error { validToken := r.getToken(ctx, userId) if validToken == "" { return v1.ErrorTokenNotExist("令牌不存在") @@ -85,12 +82,12 @@ func (r *userTokenRepo) RemoveUserToken(ctx context.Context, userId uint32) erro const userTokenKeyPrefix = "admin_ut_" -func (r *userTokenRepo) setToken(ctx context.Context, userId uint32, token string) error { +func (r *UserTokenRepo) setToken(ctx context.Context, userId uint32, token string) error { key := fmt.Sprintf("%s%d", userTokenKeyPrefix, userId) return r.data.rdb.Set(ctx, key, token, 0).Err() } -func (r *userTokenRepo) getToken(ctx context.Context, userId uint32) string { +func (r *UserTokenRepo) getToken(ctx context.Context, userId uint32) string { key := fmt.Sprintf("%s%d", userTokenKeyPrefix, userId) result, err := r.data.rdb.Get(ctx, key).Result() if err != nil { @@ -102,7 +99,7 @@ func (r *userTokenRepo) getToken(ctx context.Context, userId uint32) string { return result } -func (r *userTokenRepo) deleteToken(ctx context.Context, userId uint32) error { +func (r *UserTokenRepo) deleteToken(ctx context.Context, userId uint32) error { key := fmt.Sprintf("%s%d", userTokenKeyPrefix, userId) return r.data.rdb.Del(ctx, key).Err() } diff --git a/blog-backend/app/admin/service/internal/server/rest.go b/blog-backend/app/admin/service/internal/server/rest.go index f9615af9..6ac8f55d 100644 --- a/blog-backend/app/admin/service/internal/server/rest.go +++ b/blog-backend/app/admin/service/internal/server/rest.go @@ -18,19 +18,19 @@ import ( swaggerUI "github.com/tx7do/kratos-swagger-ui" bootstrap "github.com/tx7do/kratos-bootstrap" - "github.com/tx7do/kratos-bootstrap/gen/api/go/conf/v1" + conf "github.com/tx7do/kratos-bootstrap/gen/api/go/conf/v1" "kratos-cms/app/admin/service/cmd/server/assets" "kratos-cms/app/admin/service/internal/service" - v1 "kratos-cms/gen/api/go/admin/service/v1" + adminV1 "kratos-cms/gen/api/go/admin/service/v1" "kratos-cms/pkg/middleware/auth" ) // NewWhiteListMatcher 创建jwt白名单 func newRestWhiteListMatcher() selector.MatchFunc { whiteList := make(map[string]bool) - whiteList[v1.OperationAuthenticationServiceLogin] = true + whiteList[adminV1.OperationAuthenticationServiceLogin] = true return func(ctx context.Context, operation string) bool { if _, ok := whiteList[operation]; ok { return false @@ -66,14 +66,14 @@ func NewHTTPServer( ) *http.Server { srv := bootstrap.CreateRestServer(cfg, newRestMiddleware(authenticator, authorizer, logger)...) - v1.RegisterAuthenticationServiceHTTPServer(srv, authnSvc) - v1.RegisterPostServiceHTTPServer(srv, postSvc) - v1.RegisterCategoryServiceHTTPServer(srv, cateSvc) - v1.RegisterTagServiceHTTPServer(srv, tagSvc) - v1.RegisterLinkServiceHTTPServer(srv, linkSvc) - v1.RegisterUserServiceHTTPServer(srv, userSvc) - v1.RegisterAttachmentServiceHTTPServer(srv, attachmentSvc) - v1.RegisterCommentServiceHTTPServer(srv, commentSvc) + adminV1.RegisterAuthenticationServiceHTTPServer(srv, authnSvc) + adminV1.RegisterPostServiceHTTPServer(srv, postSvc) + adminV1.RegisterCategoryServiceHTTPServer(srv, cateSvc) + adminV1.RegisterTagServiceHTTPServer(srv, tagSvc) + adminV1.RegisterLinkServiceHTTPServer(srv, linkSvc) + adminV1.RegisterUserServiceHTTPServer(srv, userSvc) + adminV1.RegisterAttachmentServiceHTTPServer(srv, attachmentSvc) + adminV1.RegisterCommentServiceHTTPServer(srv, commentSvc) if cfg.GetServer().GetRest().GetEnableSwagger() { swaggerUI.RegisterSwaggerUIServerWithOption( diff --git a/blog-backend/app/admin/service/internal/service/attachment.go b/blog-backend/app/admin/service/internal/service/attachment.go index 08e59cb5..cb0b42e4 100644 --- a/blog-backend/app/admin/service/internal/service/attachment.go +++ b/blog-backend/app/admin/service/internal/service/attachment.go @@ -6,8 +6,8 @@ import ( "github.com/go-kratos/kratos/v2/log" "google.golang.org/protobuf/types/known/emptypb" + pagination "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" v1 "kratos-cms/gen/api/go/admin/service/v1" - "kratos-cms/gen/api/go/common/pagination" fileV1 "kratos-cms/gen/api/go/file/service/v1" ) diff --git a/blog-backend/app/admin/service/internal/service/authentication.go b/blog-backend/app/admin/service/internal/service/authentication.go index 954fc332..2e1b00a1 100644 --- a/blog-backend/app/admin/service/internal/service/authentication.go +++ b/blog-backend/app/admin/service/internal/service/authentication.go @@ -6,7 +6,7 @@ import ( "github.com/go-kratos/kratos/v2/log" "google.golang.org/protobuf/types/known/emptypb" - "kratos-cms/app/admin/service/internal/biz" + "kratos-cms/app/admin/service/internal/data" v1 "kratos-cms/gen/api/go/admin/service/v1" userV1 "kratos-cms/gen/api/go/user/service/v1" @@ -18,12 +18,12 @@ type AuthenticationService struct { v1.AuthenticationServiceHTTPServer uc userV1.UserServiceClient - utuc *biz.UserTokenUseCase + utuc *data.UserTokenRepo log *log.Helper } -func NewAuthenticationService(logger log.Logger, uc userV1.UserServiceClient, utuc *biz.UserTokenUseCase) *AuthenticationService { +func NewAuthenticationService(logger log.Logger, uc userV1.UserServiceClient, utuc *data.UserTokenRepo) *AuthenticationService { l := log.NewHelper(log.With(logger, "module", "user/service/admin-service")) return &AuthenticationService{ log: l, diff --git a/blog-backend/app/admin/service/internal/service/category.go b/blog-backend/app/admin/service/internal/service/category.go index 30af2069..b8269341 100644 --- a/blog-backend/app/admin/service/internal/service/category.go +++ b/blog-backend/app/admin/service/internal/service/category.go @@ -6,8 +6,8 @@ import ( "github.com/go-kratos/kratos/v2/log" "google.golang.org/protobuf/types/known/emptypb" + pagination "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" v1 "kratos-cms/gen/api/go/admin/service/v1" - "kratos-cms/gen/api/go/common/pagination" contentV1 "kratos-cms/gen/api/go/content/service/v1" ) diff --git a/blog-backend/app/admin/service/internal/service/comment.go b/blog-backend/app/admin/service/internal/service/comment.go index 225b4269..2773ecc3 100644 --- a/blog-backend/app/admin/service/internal/service/comment.go +++ b/blog-backend/app/admin/service/internal/service/comment.go @@ -6,9 +6,9 @@ import ( "github.com/go-kratos/kratos/v2/log" "google.golang.org/protobuf/types/known/emptypb" + pagination "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" v1 "kratos-cms/gen/api/go/admin/service/v1" commentV1 "kratos-cms/gen/api/go/comment/service/v1" - "kratos-cms/gen/api/go/common/pagination" ) type CommentService struct { diff --git a/blog-backend/app/admin/service/internal/service/link.go b/blog-backend/app/admin/service/internal/service/link.go index c8693cbd..33e699bf 100644 --- a/blog-backend/app/admin/service/internal/service/link.go +++ b/blog-backend/app/admin/service/internal/service/link.go @@ -6,8 +6,8 @@ import ( "github.com/go-kratos/kratos/v2/log" "google.golang.org/protobuf/types/known/emptypb" + pagination "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" v1 "kratos-cms/gen/api/go/admin/service/v1" - "kratos-cms/gen/api/go/common/pagination" contentV1 "kratos-cms/gen/api/go/content/service/v1" ) diff --git a/blog-backend/app/admin/service/internal/service/post.go b/blog-backend/app/admin/service/internal/service/post.go index f5cbc042..3b04562d 100644 --- a/blog-backend/app/admin/service/internal/service/post.go +++ b/blog-backend/app/admin/service/internal/service/post.go @@ -6,8 +6,8 @@ import ( "github.com/go-kratos/kratos/v2/log" "google.golang.org/protobuf/types/known/emptypb" + pagination "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" v1 "kratos-cms/gen/api/go/admin/service/v1" - "kratos-cms/gen/api/go/common/pagination" contentV1 "kratos-cms/gen/api/go/content/service/v1" ) diff --git a/blog-backend/app/admin/service/internal/service/tag.go b/blog-backend/app/admin/service/internal/service/tag.go index 3a1f2a86..07cfe41f 100644 --- a/blog-backend/app/admin/service/internal/service/tag.go +++ b/blog-backend/app/admin/service/internal/service/tag.go @@ -6,8 +6,8 @@ import ( "github.com/go-kratos/kratos/v2/log" "google.golang.org/protobuf/types/known/emptypb" + pagination "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" v1 "kratos-cms/gen/api/go/admin/service/v1" - "kratos-cms/gen/api/go/common/pagination" contentV1 "kratos-cms/gen/api/go/content/service/v1" ) diff --git a/blog-backend/app/admin/service/internal/service/user.go b/blog-backend/app/admin/service/internal/service/user.go index b5b5a984..82c6f1ad 100644 --- a/blog-backend/app/admin/service/internal/service/user.go +++ b/blog-backend/app/admin/service/internal/service/user.go @@ -7,8 +7,8 @@ import ( "github.com/tx7do/go-utils/trans" "google.golang.org/protobuf/types/known/emptypb" + pagination "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" v1 "kratos-cms/gen/api/go/admin/service/v1" - "kratos-cms/gen/api/go/common/pagination" userV1 "kratos-cms/gen/api/go/user/service/v1" "kratos-cms/pkg/middleware/auth" diff --git a/blog-backend/app/core/service/cmd/server/wire.go b/blog-backend/app/core/service/cmd/server/wire.go index 98e3ca30..16ae9e6a 100644 --- a/blog-backend/app/core/service/cmd/server/wire.go +++ b/blog-backend/app/core/service/cmd/server/wire.go @@ -14,7 +14,6 @@ import ( conf "github.com/tx7do/kratos-bootstrap/gen/api/go/conf/v1" - "kratos-cms/app/core/service/internal/biz" "kratos-cms/app/core/service/internal/data" "kratos-cms/app/core/service/internal/server" "kratos-cms/app/core/service/internal/service" @@ -22,5 +21,5 @@ import ( // initApp init kratos application. func initApp(log.Logger, registry.Registrar, *conf.Bootstrap) (*kratos.App, func(), error) { - panic(wire.Build(server.ProviderSet, data.ProviderSet, biz.ProviderSet, service.ProviderSet, newApp)) + panic(wire.Build(server.ProviderSet, data.ProviderSet, service.ProviderSet, newApp)) } diff --git a/blog-backend/app/core/service/cmd/server/wire_gen.go b/blog-backend/app/core/service/cmd/server/wire_gen.go index bde51be6..12cc9b39 100644 --- a/blog-backend/app/core/service/cmd/server/wire_gen.go +++ b/blog-backend/app/core/service/cmd/server/wire_gen.go @@ -11,7 +11,6 @@ import ( "github.com/go-kratos/kratos/v2/log" "github.com/go-kratos/kratos/v2/registry" "github.com/tx7do/kratos-bootstrap/gen/api/go/conf/v1" - "kratos-cms/app/core/service/internal/biz" "kratos-cms/app/core/service/internal/data" "kratos-cms/app/core/service/internal/server" "kratos-cms/app/core/service/internal/service" @@ -20,7 +19,7 @@ import ( // Injectors from wire.go: // initApp init kratos application. -func initApp(logger log.Logger, registrar registry.Registrar, bootstrap *conf.Bootstrap) (*kratos.App, func(), error) { +func initApp(logger log.Logger, registrar registry.Registrar, bootstrap *v1.Bootstrap) (*kratos.App, func(), error) { entClient := data.NewEntClient(bootstrap, logger) client := data.NewRedisClient(bootstrap, logger) dataData, cleanup, err := data.NewData(entClient, client, logger) @@ -28,26 +27,19 @@ func initApp(logger log.Logger, registrar registry.Registrar, bootstrap *conf.Bo return nil, nil, err } commentRepo := data.NewCommentRepo(dataData, logger) - commentUseCase := biz.NewCommentUseCase(commentRepo, logger) - commentService := service.NewCommentService(logger, commentUseCase) + commentService := service.NewCommentService(logger, commentRepo) postRepo := data.NewPostRepo(dataData, logger) - postUseCase := biz.NewPostUseCase(postRepo, logger) - postService := service.NewPostService(logger, postUseCase) + postService := service.NewPostService(logger, postRepo) linkRepo := data.NewLinkRepo(dataData, logger) - linkUseCase := biz.NewLinkUseCase(linkRepo, logger) - linkService := service.NewLinkService(logger, linkUseCase) + linkService := service.NewLinkService(logger, linkRepo) categoryRepo := data.NewCategoryRepo(dataData, logger) - categoryUseCase := biz.NewCategoryUseCase(categoryRepo, logger) - categoryService := service.NewCategoryService(logger, categoryUseCase) + categoryService := service.NewCategoryService(logger, categoryRepo) tagRepo := data.NewTagRepo(dataData, logger) - tagUseCase := biz.NewTagUseCase(tagRepo, logger) - tagService := service.NewTagService(logger, tagUseCase) + tagService := service.NewTagService(logger, tagRepo) userRepo := data.NewUserRepo(dataData, logger) - userUseCase := biz.NewUserUseCase(userRepo, logger) - userService := service.NewUserService(logger, userUseCase) + userService := service.NewUserService(logger, userRepo) attachmentRepo := data.NewAttachmentRepo(dataData, logger) - attachmentUseCase := biz.NewAttachmentUseCase(attachmentRepo, logger) - attachmentService := service.NewAttachmentService(logger, attachmentUseCase) + attachmentService := service.NewAttachmentService(logger, attachmentRepo) grpcServer := server.NewGRPCServer(bootstrap, logger, commentService, postService, linkService, categoryService, tagService, userService, attachmentService) app := newApp(logger, registrar, grpcServer) return app, func() { diff --git a/blog-backend/app/core/service/internal/biz/README.md b/blog-backend/app/core/service/internal/biz/README.md deleted file mode 100644 index 26a66b63..00000000 --- a/blog-backend/app/core/service/internal/biz/README.md +++ /dev/null @@ -1 +0,0 @@ -# Biz diff --git a/blog-backend/app/core/service/internal/biz/attachment.go b/blog-backend/app/core/service/internal/biz/attachment.go deleted file mode 100644 index 46f4193f..00000000 --- a/blog-backend/app/core/service/internal/biz/attachment.go +++ /dev/null @@ -1,51 +0,0 @@ -package biz - -import ( - "context" - - "github.com/go-kratos/kratos/v2/log" - - "kratos-cms/gen/api/go/common/pagination" - v1 "kratos-cms/gen/api/go/file/service/v1" -) - -type AttachmentRepo interface { - List(ctx context.Context, req *pagination.PagingRequest) (*v1.ListAttachmentResponse, error) - Get(ctx context.Context, req *v1.GetAttachmentRequest) (*v1.Attachment, error) - Create(ctx context.Context, req *v1.CreateAttachmentRequest) (*v1.Attachment, error) - Update(ctx context.Context, req *v1.UpdateAttachmentRequest) (*v1.Attachment, error) - Delete(ctx context.Context, req *v1.DeleteAttachmentRequest) (bool, error) -} - -type AttachmentUseCase struct { - repo AttachmentRepo - log *log.Helper -} - -func NewAttachmentUseCase(repo AttachmentRepo, logger log.Logger) *AttachmentUseCase { - l := log.NewHelper(log.With(logger, "module", "attachment/usecase/core-service")) - return &AttachmentUseCase{ - repo: repo, - log: l, - } -} - -func (uc *AttachmentUseCase) List(ctx context.Context, req *pagination.PagingRequest) (*v1.ListAttachmentResponse, error) { - return uc.repo.List(ctx, req) -} - -func (uc *AttachmentUseCase) Get(ctx context.Context, req *v1.GetAttachmentRequest) (*v1.Attachment, error) { - return uc.repo.Get(ctx, req) -} - -func (uc *AttachmentUseCase) Create(ctx context.Context, req *v1.CreateAttachmentRequest) (*v1.Attachment, error) { - return uc.repo.Create(ctx, req) -} - -func (uc *AttachmentUseCase) Update(ctx context.Context, req *v1.UpdateAttachmentRequest) (*v1.Attachment, error) { - return uc.repo.Update(ctx, req) -} - -func (uc *AttachmentUseCase) Delete(ctx context.Context, req *v1.DeleteAttachmentRequest) (bool, error) { - return uc.repo.Delete(ctx, req) -} diff --git a/blog-backend/app/core/service/internal/biz/category.go b/blog-backend/app/core/service/internal/biz/category.go deleted file mode 100644 index b65afcc2..00000000 --- a/blog-backend/app/core/service/internal/biz/category.go +++ /dev/null @@ -1,51 +0,0 @@ -package biz - -import ( - "context" - - "github.com/go-kratos/kratos/v2/log" - - "kratos-cms/gen/api/go/common/pagination" - "kratos-cms/gen/api/go/content/service/v1" -) - -type CategoryRepo interface { - List(ctx context.Context, req *pagination.PagingRequest) (*v1.ListCategoryResponse, error) - Get(ctx context.Context, req *v1.GetCategoryRequest) (*v1.Category, error) - Create(ctx context.Context, req *v1.CreateCategoryRequest) (*v1.Category, error) - Update(ctx context.Context, req *v1.UpdateCategoryRequest) (*v1.Category, error) - Delete(ctx context.Context, req *v1.DeleteCategoryRequest) (bool, error) -} - -type CategoryUseCase struct { - repo CategoryRepo - log *log.Helper -} - -func NewCategoryUseCase(repo CategoryRepo, logger log.Logger) *CategoryUseCase { - l := log.NewHelper(log.With(logger, "module", "category/usecase/core-service")) - return &CategoryUseCase{ - repo: repo, - log: l, - } -} - -func (uc *CategoryUseCase) List(ctx context.Context, req *pagination.PagingRequest) (*v1.ListCategoryResponse, error) { - return uc.repo.List(ctx, req) -} - -func (uc *CategoryUseCase) Get(ctx context.Context, req *v1.GetCategoryRequest) (*v1.Category, error) { - return uc.repo.Get(ctx, req) -} - -func (uc *CategoryUseCase) Create(ctx context.Context, req *v1.CreateCategoryRequest) (*v1.Category, error) { - return uc.repo.Create(ctx, req) -} - -func (uc *CategoryUseCase) Update(ctx context.Context, req *v1.UpdateCategoryRequest) (*v1.Category, error) { - return uc.repo.Update(ctx, req) -} - -func (uc *CategoryUseCase) Delete(ctx context.Context, req *v1.DeleteCategoryRequest) (bool, error) { - return uc.repo.Delete(ctx, req) -} diff --git a/blog-backend/app/core/service/internal/biz/comment.go b/blog-backend/app/core/service/internal/biz/comment.go deleted file mode 100644 index 55d7aae0..00000000 --- a/blog-backend/app/core/service/internal/biz/comment.go +++ /dev/null @@ -1,51 +0,0 @@ -package biz - -import ( - "context" - - "github.com/go-kratos/kratos/v2/log" - - v1 "kratos-cms/gen/api/go/comment/service/v1" - "kratos-cms/gen/api/go/common/pagination" -) - -type CommentRepo interface { - List(ctx context.Context, req *pagination.PagingRequest) (*v1.ListCommentResponse, error) - Get(ctx context.Context, req *v1.GetCommentRequest) (*v1.Comment, error) - Create(ctx context.Context, req *v1.CreateCommentRequest) (*v1.Comment, error) - Update(ctx context.Context, req *v1.UpdateCommentRequest) (*v1.Comment, error) - Delete(ctx context.Context, req *v1.DeleteCommentRequest) (bool, error) -} - -type CommentUseCase struct { - repo CommentRepo - log *log.Helper -} - -func NewCommentUseCase(repo CommentRepo, logger log.Logger) *CommentUseCase { - l := log.NewHelper(log.With(logger, "module", "comment/usecase/core-service")) - return &CommentUseCase{ - repo: repo, - log: l, - } -} - -func (uc *CommentUseCase) List(ctx context.Context, req *pagination.PagingRequest) (*v1.ListCommentResponse, error) { - return uc.repo.List(ctx, req) -} - -func (uc *CommentUseCase) Get(ctx context.Context, req *v1.GetCommentRequest) (*v1.Comment, error) { - return uc.repo.Get(ctx, req) -} - -func (uc *CommentUseCase) Create(ctx context.Context, req *v1.CreateCommentRequest) (*v1.Comment, error) { - return uc.repo.Create(ctx, req) -} - -func (uc *CommentUseCase) Update(ctx context.Context, req *v1.UpdateCommentRequest) (*v1.Comment, error) { - return uc.repo.Update(ctx, req) -} - -func (uc *CommentUseCase) Delete(ctx context.Context, req *v1.DeleteCommentRequest) (bool, error) { - return uc.repo.Delete(ctx, req) -} diff --git a/blog-backend/app/core/service/internal/biz/init.go b/blog-backend/app/core/service/internal/biz/init.go deleted file mode 100644 index 23ddb8d1..00000000 --- a/blog-backend/app/core/service/internal/biz/init.go +++ /dev/null @@ -1,17 +0,0 @@ -//go:build wireinject -// +build wireinject - -package biz - -import "github.com/google/wire" - -// ProviderSet is biz providers. -var ProviderSet = wire.NewSet( - NewAttachmentUseCase, - NewCategoryUseCase, - NewCommentUseCase, - NewLinkUseCase, - NewPostUseCase, - NewTagUseCase, - NewUserUseCase, -) diff --git a/blog-backend/app/core/service/internal/biz/link.go b/blog-backend/app/core/service/internal/biz/link.go deleted file mode 100644 index aab1d777..00000000 --- a/blog-backend/app/core/service/internal/biz/link.go +++ /dev/null @@ -1,51 +0,0 @@ -package biz - -import ( - "context" - - "github.com/go-kratos/kratos/v2/log" - - "kratos-cms/gen/api/go/common/pagination" - "kratos-cms/gen/api/go/content/service/v1" -) - -type LinkRepo interface { - List(ctx context.Context, req *pagination.PagingRequest) (*v1.ListLinkResponse, error) - Get(ctx context.Context, req *v1.GetLinkRequest) (*v1.Link, error) - Create(ctx context.Context, req *v1.CreateLinkRequest) (*v1.Link, error) - Update(ctx context.Context, req *v1.UpdateLinkRequest) (*v1.Link, error) - Delete(ctx context.Context, req *v1.DeleteLinkRequest) (bool, error) -} - -type LinkUseCase struct { - repo LinkRepo - log *log.Helper -} - -func NewLinkUseCase(repo LinkRepo, logger log.Logger) *LinkUseCase { - l := log.NewHelper(log.With(logger, "module", "link/usecase/core-service")) - return &LinkUseCase{ - repo: repo, - log: l, - } -} - -func (uc *LinkUseCase) List(ctx context.Context, req *pagination.PagingRequest) (*v1.ListLinkResponse, error) { - return uc.repo.List(ctx, req) -} - -func (uc *LinkUseCase) Get(ctx context.Context, req *v1.GetLinkRequest) (*v1.Link, error) { - return uc.repo.Get(ctx, req) -} - -func (uc *LinkUseCase) Create(ctx context.Context, req *v1.CreateLinkRequest) (*v1.Link, error) { - return uc.repo.Create(ctx, req) -} - -func (uc *LinkUseCase) Update(ctx context.Context, req *v1.UpdateLinkRequest) (*v1.Link, error) { - return uc.repo.Update(ctx, req) -} - -func (uc *LinkUseCase) Delete(ctx context.Context, req *v1.DeleteLinkRequest) (bool, error) { - return uc.repo.Delete(ctx, req) -} diff --git a/blog-backend/app/core/service/internal/biz/post.go b/blog-backend/app/core/service/internal/biz/post.go deleted file mode 100644 index deb410dc..00000000 --- a/blog-backend/app/core/service/internal/biz/post.go +++ /dev/null @@ -1,51 +0,0 @@ -package biz - -import ( - "context" - - "github.com/go-kratos/kratos/v2/log" - - "kratos-cms/gen/api/go/common/pagination" - "kratos-cms/gen/api/go/content/service/v1" -) - -type PostRepo interface { - List(ctx context.Context, req *pagination.PagingRequest) (*v1.ListPostResponse, error) - Get(ctx context.Context, req *v1.GetPostRequest) (*v1.Post, error) - Create(ctx context.Context, req *v1.CreatePostRequest) (*v1.Post, error) - Update(ctx context.Context, req *v1.UpdatePostRequest) (*v1.Post, error) - Delete(ctx context.Context, req *v1.DeletePostRequest) (bool, error) -} - -type PostUseCase struct { - repo PostRepo - log *log.Helper -} - -func NewPostUseCase(repo PostRepo, logger log.Logger) *PostUseCase { - l := log.NewHelper(log.With(logger, "module", "post/usecase/core-service")) - return &PostUseCase{ - repo: repo, - log: l, - } -} - -func (uc *PostUseCase) List(ctx context.Context, req *pagination.PagingRequest) (*v1.ListPostResponse, error) { - return uc.repo.List(ctx, req) -} - -func (uc *PostUseCase) Get(ctx context.Context, req *v1.GetPostRequest) (*v1.Post, error) { - return uc.repo.Get(ctx, req) -} - -func (uc *PostUseCase) Create(ctx context.Context, req *v1.CreatePostRequest) (*v1.Post, error) { - return uc.repo.Create(ctx, req) -} - -func (uc *PostUseCase) Update(ctx context.Context, req *v1.UpdatePostRequest) (*v1.Post, error) { - return uc.repo.Update(ctx, req) -} - -func (uc *PostUseCase) Delete(ctx context.Context, req *v1.DeletePostRequest) (bool, error) { - return uc.repo.Delete(ctx, req) -} diff --git a/blog-backend/app/core/service/internal/biz/tag.go b/blog-backend/app/core/service/internal/biz/tag.go deleted file mode 100644 index e20795c1..00000000 --- a/blog-backend/app/core/service/internal/biz/tag.go +++ /dev/null @@ -1,51 +0,0 @@ -package biz - -import ( - "context" - - "github.com/go-kratos/kratos/v2/log" - - "kratos-cms/gen/api/go/common/pagination" - "kratos-cms/gen/api/go/content/service/v1" -) - -type TagRepo interface { - List(ctx context.Context, req *pagination.PagingRequest) (*v1.ListTagResponse, error) - Get(ctx context.Context, req *v1.GetTagRequest) (*v1.Tag, error) - Create(ctx context.Context, req *v1.CreateTagRequest) (*v1.Tag, error) - Update(ctx context.Context, req *v1.UpdateTagRequest) (*v1.Tag, error) - Delete(ctx context.Context, req *v1.DeleteTagRequest) (bool, error) -} - -type TagUseCase struct { - repo TagRepo - log *log.Helper -} - -func NewTagUseCase(repo TagRepo, logger log.Logger) *TagUseCase { - l := log.NewHelper(log.With(logger, "module", "tag/usecase/core-service")) - return &TagUseCase{ - repo: repo, - log: l, - } -} - -func (uc *TagUseCase) List(ctx context.Context, req *pagination.PagingRequest) (*v1.ListTagResponse, error) { - return uc.repo.List(ctx, req) -} - -func (uc *TagUseCase) Get(ctx context.Context, req *v1.GetTagRequest) (*v1.Tag, error) { - return uc.repo.Get(ctx, req) -} - -func (uc *TagUseCase) Create(ctx context.Context, req *v1.CreateTagRequest) (*v1.Tag, error) { - return uc.repo.Create(ctx, req) -} - -func (uc *TagUseCase) Update(ctx context.Context, req *v1.UpdateTagRequest) (*v1.Tag, error) { - return uc.repo.Update(ctx, req) -} - -func (uc *TagUseCase) Delete(ctx context.Context, req *v1.DeleteTagRequest) (bool, error) { - return uc.repo.Delete(ctx, req) -} diff --git a/blog-backend/app/core/service/internal/biz/user.go b/blog-backend/app/core/service/internal/biz/user.go deleted file mode 100644 index 55a5cb14..00000000 --- a/blog-backend/app/core/service/internal/biz/user.go +++ /dev/null @@ -1,67 +0,0 @@ -package biz - -import ( - "context" - - "github.com/go-kratos/kratos/v2/log" - - "kratos-cms/gen/api/go/common/pagination" - v1 "kratos-cms/gen/api/go/user/service/v1" -) - -type UserRepo interface { - Create(ctx context.Context, req *v1.CreateUserRequest) (*v1.User, error) - Update(ctx context.Context, req *v1.UpdateUserRequest) (*v1.User, error) - Delete(ctx context.Context, req *v1.DeleteUserRequest) (bool, error) - List(ctx context.Context, req *pagination.PagingRequest) (*v1.ListUserResponse, error) - Get(ctx context.Context, req *v1.GetUserRequest) (*v1.User, error) - - GetUserByUserName(ctx context.Context, userName string) (*v1.User, error) - - VerifyPassword(ctx context.Context, req *v1.VerifyPasswordRequest) (bool, error) -} - -type UserUseCase struct { - repo UserRepo - log *log.Helper -} - -func NewUserUseCase(repo UserRepo, logger log.Logger) *UserUseCase { - l := log.NewHelper(log.With(logger, "module", "user/usecase/core-service")) - return &UserUseCase{ - repo: repo, - log: l, - } -} - -func (uc *UserUseCase) Get(ctx context.Context, req *v1.GetUserRequest) (*v1.User, error) { - user, err := uc.repo.Get(ctx, req) - if user != nil { - user.Password = nil - } - return user, err -} - -func (uc *UserUseCase) List(ctx context.Context, req *pagination.PagingRequest) (*v1.ListUserResponse, error) { - return uc.repo.List(ctx, req) -} - -func (uc *UserUseCase) Create(ctx context.Context, req *v1.CreateUserRequest) (*v1.User, error) { - return uc.repo.Create(ctx, req) -} - -func (uc *UserUseCase) Update(ctx context.Context, req *v1.UpdateUserRequest) (*v1.User, error) { - return uc.repo.Update(ctx, req) -} - -func (uc *UserUseCase) Delete(ctx context.Context, req *v1.DeleteUserRequest) (bool, error) { - return uc.repo.Delete(ctx, req) -} - -func (uc *UserUseCase) GetUserByUserName(ctx context.Context, userName string) (*v1.User, error) { - return uc.repo.GetUserByUserName(ctx, userName) -} - -func (uc *UserUseCase) VerifyPassword(ctx context.Context, req *v1.VerifyPasswordRequest) (bool, error) { - return uc.repo.VerifyPassword(ctx, req) -} diff --git a/blog-backend/app/core/service/internal/data/attachment.go b/blog-backend/app/core/service/internal/data/attachment.go index 11a5f2fb..379b800d 100644 --- a/blog-backend/app/core/service/internal/data/attachment.go +++ b/blog-backend/app/core/service/internal/data/attachment.go @@ -10,22 +10,19 @@ import ( entgo "github.com/tx7do/go-utils/entgo/query" util "github.com/tx7do/go-utils/time" - "kratos-cms/app/core/service/internal/biz" "kratos-cms/app/core/service/internal/data/ent" "kratos-cms/app/core/service/internal/data/ent/attachment" - "kratos-cms/gen/api/go/common/pagination" + pagination "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" v1 "kratos-cms/gen/api/go/file/service/v1" ) -var _ biz.AttachmentRepo = (*AttachmentRepo)(nil) - type AttachmentRepo struct { data *Data log *log.Helper } -func NewAttachmentRepo(data *Data, logger log.Logger) biz.AttachmentRepo { +func NewAttachmentRepo(data *Data, logger log.Logger) *AttachmentRepo { l := log.NewHelper(log.With(logger, "module", "attachment/repo/core-service")) return &AttachmentRepo{ data: data, @@ -71,7 +68,7 @@ func (r *AttachmentRepo) Count(ctx context.Context, whereCond []func(s *sql.Sele func (r *AttachmentRepo) List(ctx context.Context, req *pagination.PagingRequest) (*v1.ListAttachmentResponse, error) { builder := r.data.db.Client().Attachment.Query() - err, whereSelectors, querySelectors := entgo.BuildQuerySelector(r.data.db.Driver().Dialect(), + err, whereSelectors, querySelectors := entgo.BuildQuerySelector( req.GetQuery(), req.GetOrQuery(), req.GetPage(), req.GetPageSize(), req.GetNoPaging(), req.GetOrderBy(), attachment.FieldCreateTime) diff --git a/blog-backend/app/core/service/internal/data/category.go b/blog-backend/app/core/service/internal/data/category.go index 60d67e05..4bc0f1f5 100644 --- a/blog-backend/app/core/service/internal/data/category.go +++ b/blog-backend/app/core/service/internal/data/category.go @@ -2,6 +2,7 @@ package data import ( "context" + v1 "kratos-cms/gen/api/go/content/service/v1" "time" "entgo.io/ent/dialect/sql" @@ -9,22 +10,18 @@ import ( entgo "github.com/tx7do/go-utils/entgo/query" util "github.com/tx7do/go-utils/time" - "kratos-cms/app/core/service/internal/biz" "kratos-cms/app/core/service/internal/data/ent" "kratos-cms/app/core/service/internal/data/ent/category" - "kratos-cms/gen/api/go/common/pagination" - "kratos-cms/gen/api/go/content/service/v1" + pagination "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" ) -var _ biz.CategoryRepo = (*CategoryRepo)(nil) - type CategoryRepo struct { data *Data log *log.Helper } -func NewCategoryRepo(data *Data, logger log.Logger) biz.CategoryRepo { +func NewCategoryRepo(data *Data, logger log.Logger) *CategoryRepo { l := log.NewHelper(log.With(logger, "module", "category/repo/core-service")) return &CategoryRepo{ data: data, @@ -69,7 +66,7 @@ func (r *CategoryRepo) Count(ctx context.Context, whereCond []func(s *sql.Select func (r *CategoryRepo) List(ctx context.Context, req *pagination.PagingRequest) (*v1.ListCategoryResponse, error) { builder := r.data.db.Client().Category.Query() - err, whereSelectors, querySelectors := entgo.BuildQuerySelector(r.data.db.Driver().Dialect(), + err, whereSelectors, querySelectors := entgo.BuildQuerySelector( req.GetQuery(), req.GetOrQuery(), req.GetPage(), req.GetPageSize(), req.GetNoPaging(), req.GetOrderBy(), category.FieldCreateTime) diff --git a/blog-backend/app/core/service/internal/data/comment.go b/blog-backend/app/core/service/internal/data/comment.go index a0a0c611..96db50e9 100644 --- a/blog-backend/app/core/service/internal/data/comment.go +++ b/blog-backend/app/core/service/internal/data/comment.go @@ -9,22 +9,19 @@ import ( entgo "github.com/tx7do/go-utils/entgo/query" util "github.com/tx7do/go-utils/time" - "kratos-cms/app/core/service/internal/biz" "kratos-cms/app/core/service/internal/data/ent" "kratos-cms/app/core/service/internal/data/ent/comment" + pagination "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" v1 "kratos-cms/gen/api/go/comment/service/v1" - "kratos-cms/gen/api/go/common/pagination" ) -var _ biz.CommentRepo = (*CommentRepo)(nil) - type CommentRepo struct { data *Data log *log.Helper } -func NewCommentRepo(data *Data, logger log.Logger) biz.CommentRepo { +func NewCommentRepo(data *Data, logger log.Logger) *CommentRepo { l := log.NewHelper(log.With(logger, "module", "comment/repo/core-service")) return &CommentRepo{ data: data, @@ -72,7 +69,7 @@ func (r *CommentRepo) Count(ctx context.Context, whereCond []func(s *sql.Selecto func (r *CommentRepo) List(ctx context.Context, req *pagination.PagingRequest) (*v1.ListCommentResponse, error) { builder := r.data.db.Client().Comment.Query() - err, whereSelectors, querySelectors := entgo.BuildQuerySelector(r.data.db.Driver().Dialect(), + err, whereSelectors, querySelectors := entgo.BuildQuerySelector( req.GetQuery(), req.GetOrQuery(), req.GetPage(), req.GetPageSize(), req.GetNoPaging(), req.GetOrderBy(), comment.FieldCreateTime) diff --git a/blog-backend/app/core/service/internal/data/data.go b/blog-backend/app/core/service/internal/data/data.go index 86016e7e..e5d7ca4c 100644 --- a/blog-backend/app/core/service/internal/data/data.go +++ b/blog-backend/app/core/service/internal/data/data.go @@ -10,7 +10,7 @@ import ( _ "github.com/lib/pq" "github.com/tx7do/kratos-bootstrap" - "github.com/tx7do/kratos-bootstrap/gen/api/go/conf/v1" + conf "github.com/tx7do/kratos-bootstrap/gen/api/go/conf/v1" "kratos-cms/app/core/service/internal/data/ent" ) diff --git a/blog-backend/app/core/service/internal/data/ent_client.go b/blog-backend/app/core/service/internal/data/ent_client.go index 24c7681f..c94a43ec 100644 --- a/blog-backend/app/core/service/internal/data/ent_client.go +++ b/blog-backend/app/core/service/internal/data/ent_client.go @@ -13,7 +13,7 @@ import ( "kratos-cms/app/core/service/internal/data/ent" "kratos-cms/app/core/service/internal/data/ent/migrate" - "github.com/tx7do/kratos-bootstrap/gen/api/go/conf/v1" + conf "github.com/tx7do/kratos-bootstrap/gen/api/go/conf/v1" ) // NewEntClient 创建Ent ORM数据库客户端 diff --git a/blog-backend/app/core/service/internal/data/link.go b/blog-backend/app/core/service/internal/data/link.go index 6f1986b2..af267922 100644 --- a/blog-backend/app/core/service/internal/data/link.go +++ b/blog-backend/app/core/service/internal/data/link.go @@ -9,22 +9,19 @@ import ( entgo "github.com/tx7do/go-utils/entgo/query" util "github.com/tx7do/go-utils/time" - "kratos-cms/gen/api/go/common/pagination" - "kratos-cms/gen/api/go/content/service/v1" + pagination "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" + v1 "kratos-cms/gen/api/go/content/service/v1" - "kratos-cms/app/core/service/internal/biz" "kratos-cms/app/core/service/internal/data/ent" "kratos-cms/app/core/service/internal/data/ent/link" ) -var _ biz.LinkRepo = (*LinkRepo)(nil) - type LinkRepo struct { data *Data log *log.Helper } -func NewLinkRepo(data *Data, logger log.Logger) biz.LinkRepo { +func NewLinkRepo(data *Data, logger log.Logger) *LinkRepo { l := log.NewHelper(log.With(logger, "module", "link/repo/core-service")) return &LinkRepo{ data: data, @@ -66,7 +63,7 @@ func (r *LinkRepo) Count(ctx context.Context, whereCond []func(s *sql.Selector)) func (r *LinkRepo) List(ctx context.Context, req *pagination.PagingRequest) (*v1.ListLinkResponse, error) { builder := r.data.db.Client().Link.Query() - err, whereSelectors, querySelectors := entgo.BuildQuerySelector(r.data.db.Driver().Dialect(), + err, whereSelectors, querySelectors := entgo.BuildQuerySelector( req.GetQuery(), req.GetOrQuery(), req.GetPage(), req.GetPageSize(), req.GetNoPaging(), req.GetOrderBy(), link.FieldCreateTime) diff --git a/blog-backend/app/core/service/internal/data/post.go b/blog-backend/app/core/service/internal/data/post.go index 0b12142a..6f4d8d25 100644 --- a/blog-backend/app/core/service/internal/data/post.go +++ b/blog-backend/app/core/service/internal/data/post.go @@ -9,22 +9,19 @@ import ( entgo "github.com/tx7do/go-utils/entgo/query" util "github.com/tx7do/go-utils/time" - "kratos-cms/app/core/service/internal/biz" "kratos-cms/app/core/service/internal/data/ent" "kratos-cms/app/core/service/internal/data/ent/post" - "kratos-cms/gen/api/go/common/pagination" - "kratos-cms/gen/api/go/content/service/v1" + pagination "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" + v1 "kratos-cms/gen/api/go/content/service/v1" ) -var _ biz.PostRepo = (*PostRepo)(nil) - type PostRepo struct { data *Data log *log.Helper } -func NewPostRepo(data *Data, logger log.Logger) biz.PostRepo { +func NewPostRepo(data *Data, logger log.Logger) *PostRepo { l := log.NewHelper(log.With(logger, "module", "post/repo/core-service")) return &PostRepo{ data: data, @@ -81,7 +78,7 @@ func (r *PostRepo) Count(ctx context.Context, whereCond []func(s *sql.Selector)) func (r *PostRepo) List(ctx context.Context, req *pagination.PagingRequest) (*v1.ListPostResponse, error) { builder := r.data.db.Client().Post.Query() - err, whereSelectors, querySelectors := entgo.BuildQuerySelector(r.data.db.Driver().Dialect(), + err, whereSelectors, querySelectors := entgo.BuildQuerySelector( req.GetQuery(), req.GetOrQuery(), req.GetPage(), req.GetPageSize(), req.GetNoPaging(), req.GetOrderBy(), post.FieldCreateTime) diff --git a/blog-backend/app/core/service/internal/data/tag.go b/blog-backend/app/core/service/internal/data/tag.go index 17e22d99..b79ef0d2 100644 --- a/blog-backend/app/core/service/internal/data/tag.go +++ b/blog-backend/app/core/service/internal/data/tag.go @@ -9,22 +9,19 @@ import ( entgo "github.com/tx7do/go-utils/entgo/query" util "github.com/tx7do/go-utils/time" - "kratos-cms/app/core/service/internal/biz" "kratos-cms/app/core/service/internal/data/ent" "kratos-cms/app/core/service/internal/data/ent/tag" - "kratos-cms/gen/api/go/common/pagination" - "kratos-cms/gen/api/go/content/service/v1" + pagination "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" + v1 "kratos-cms/gen/api/go/content/service/v1" ) -var _ biz.TagRepo = (*TagRepo)(nil) - type TagRepo struct { data *Data log *log.Helper } -func NewTagRepo(data *Data, logger log.Logger) biz.TagRepo { +func NewTagRepo(data *Data, logger log.Logger) *TagRepo { l := log.NewHelper(log.With(logger, "module", "tag/repo/core-service")) return &TagRepo{ data: data, @@ -66,7 +63,7 @@ func (r *TagRepo) Count(ctx context.Context, whereCond []func(s *sql.Selector)) func (r *TagRepo) List(ctx context.Context, req *pagination.PagingRequest) (*v1.ListTagResponse, error) { builder := r.data.db.Client().Tag.Query() - err, whereSelectors, querySelectors := entgo.BuildQuerySelector(r.data.db.Driver().Dialect(), + err, whereSelectors, querySelectors := entgo.BuildQuerySelector( req.GetQuery(), req.GetOrQuery(), req.GetPage(), req.GetPageSize(), req.GetNoPaging(), req.GetOrderBy(), tag.FieldCreateTime) diff --git a/blog-backend/app/core/service/internal/data/user.go b/blog-backend/app/core/service/internal/data/user.go index 517891ba..bfbbd271 100644 --- a/blog-backend/app/core/service/internal/data/user.go +++ b/blog-backend/app/core/service/internal/data/user.go @@ -11,22 +11,19 @@ import ( util "github.com/tx7do/go-utils/time" "github.com/tx7do/go-utils/trans" - "kratos-cms/app/core/service/internal/biz" "kratos-cms/app/core/service/internal/data/ent" "kratos-cms/app/core/service/internal/data/ent/user" - "kratos-cms/gen/api/go/common/pagination" + pagination "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" v1 "kratos-cms/gen/api/go/user/service/v1" ) -var _ biz.UserRepo = (*UserRepo)(nil) - type UserRepo struct { data *Data log *log.Helper } -func NewUserRepo(data *Data, logger log.Logger) biz.UserRepo { +func NewUserRepo(data *Data, logger log.Logger) *UserRepo { l := log.NewHelper(log.With(logger, "module", "user/repo/core-service")) return &UserRepo{ data: data, @@ -75,7 +72,7 @@ func (r *UserRepo) Count(ctx context.Context, whereCond []func(s *sql.Selector)) func (r *UserRepo) List(ctx context.Context, req *pagination.PagingRequest) (*v1.ListUserResponse, error) { builder := r.data.db.Client().User.Query() - err, whereSelectors, querySelectors := entgo.BuildQuerySelector(r.data.db.Driver().Dialect(), + err, whereSelectors, querySelectors := entgo.BuildQuerySelector( req.GetQuery(), req.GetOrQuery(), req.GetPage(), req.GetPageSize(), req.GetNoPaging(), req.GetOrderBy(), user.FieldCreateTime) diff --git a/blog-backend/app/core/service/internal/server/grpc.go b/blog-backend/app/core/service/internal/server/grpc.go index 5ef89f8c..44349bc7 100644 --- a/blog-backend/app/core/service/internal/server/grpc.go +++ b/blog-backend/app/core/service/internal/server/grpc.go @@ -6,7 +6,7 @@ import ( "github.com/go-kratos/kratos/v2/transport/grpc" bootstrap "github.com/tx7do/kratos-bootstrap" - "github.com/tx7do/kratos-bootstrap/gen/api/go/conf/v1" + conf "github.com/tx7do/kratos-bootstrap/gen/api/go/conf/v1" "kratos-cms/app/core/service/internal/service" diff --git a/blog-backend/app/core/service/internal/service/attachment.go b/blog-backend/app/core/service/internal/service/attachment.go index e7d8a0b5..c984841f 100644 --- a/blog-backend/app/core/service/internal/service/attachment.go +++ b/blog-backend/app/core/service/internal/service/attachment.go @@ -6,20 +6,20 @@ import ( "github.com/go-kratos/kratos/v2/log" "google.golang.org/protobuf/types/known/emptypb" - "kratos-cms/app/core/service/internal/biz" + "kratos-cms/app/core/service/internal/data" - "kratos-cms/gen/api/go/common/pagination" + pagination "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" v1 "kratos-cms/gen/api/go/file/service/v1" ) type AttachmentService struct { v1.UnimplementedAttachmentServiceServer - uc *biz.AttachmentUseCase + uc *data.AttachmentRepo log *log.Helper } -func NewAttachmentService(logger log.Logger, uc *biz.AttachmentUseCase) *AttachmentService { +func NewAttachmentService(logger log.Logger, uc *data.AttachmentRepo) *AttachmentService { l := log.NewHelper(log.With(logger, "module", "attachment/service/core-service")) return &AttachmentService{ log: l, diff --git a/blog-backend/app/core/service/internal/service/category.go b/blog-backend/app/core/service/internal/service/category.go index 37a820bc..ae6afcb2 100644 --- a/blog-backend/app/core/service/internal/service/category.go +++ b/blog-backend/app/core/service/internal/service/category.go @@ -6,20 +6,20 @@ import ( "github.com/go-kratos/kratos/v2/log" "google.golang.org/protobuf/types/known/emptypb" - "kratos-cms/gen/api/go/common/pagination" - v1 "kratos-cms/gen/api/go/content/service/v1" + "kratos-cms/app/core/service/internal/data" - "kratos-cms/app/core/service/internal/biz" + pagination "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" + v1 "kratos-cms/gen/api/go/content/service/v1" ) type CategoryService struct { v1.UnimplementedCategoryServiceServer - uc *biz.CategoryUseCase + uc *data.CategoryRepo log *log.Helper } -func NewCategoryService(logger log.Logger, uc *biz.CategoryUseCase) *CategoryService { +func NewCategoryService(logger log.Logger, uc *data.CategoryRepo) *CategoryService { l := log.NewHelper(log.With(logger, "module", "category/service/core-service")) return &CategoryService{ log: l, diff --git a/blog-backend/app/core/service/internal/service/comment.go b/blog-backend/app/core/service/internal/service/comment.go index 7a10b097..26660558 100644 --- a/blog-backend/app/core/service/internal/service/comment.go +++ b/blog-backend/app/core/service/internal/service/comment.go @@ -6,20 +6,20 @@ import ( "github.com/go-kratos/kratos/v2/log" "google.golang.org/protobuf/types/known/emptypb" - "kratos-cms/app/core/service/internal/biz" + "kratos-cms/app/core/service/internal/data" + pagination "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" v1 "kratos-cms/gen/api/go/comment/service/v1" - "kratos-cms/gen/api/go/common/pagination" ) type CommentService struct { v1.UnimplementedCommentServiceServer - uc *biz.CommentUseCase + uc *data.CommentRepo log *log.Helper } -func NewCommentService(logger log.Logger, uc *biz.CommentUseCase) *CommentService { +func NewCommentService(logger log.Logger, uc *data.CommentRepo) *CommentService { l := log.NewHelper(log.With(logger, "module", "service/comment/core-service")) return &CommentService{ log: l, diff --git a/blog-backend/app/core/service/internal/service/link.go b/blog-backend/app/core/service/internal/service/link.go index 0763aafd..eb0f010e 100644 --- a/blog-backend/app/core/service/internal/service/link.go +++ b/blog-backend/app/core/service/internal/service/link.go @@ -6,20 +6,20 @@ import ( "github.com/go-kratos/kratos/v2/log" "google.golang.org/protobuf/types/known/emptypb" - "kratos-cms/app/core/service/internal/biz" + "kratos-cms/app/core/service/internal/data" - "kratos-cms/gen/api/go/common/pagination" - "kratos-cms/gen/api/go/content/service/v1" + pagination "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" + v1 "kratos-cms/gen/api/go/content/service/v1" ) type LinkService struct { v1.UnimplementedLinkServiceServer - uc *biz.LinkUseCase + uc *data.LinkRepo log *log.Helper } -func NewLinkService(logger log.Logger, uc *biz.LinkUseCase) *LinkService { +func NewLinkService(logger log.Logger, uc *data.LinkRepo) *LinkService { l := log.NewHelper(log.With(logger, "module", "link/service/core-service")) return &LinkService{ log: l, diff --git a/blog-backend/app/core/service/internal/service/post.go b/blog-backend/app/core/service/internal/service/post.go index 5bc4ba5b..be73f80e 100644 --- a/blog-backend/app/core/service/internal/service/post.go +++ b/blog-backend/app/core/service/internal/service/post.go @@ -6,20 +6,20 @@ import ( "github.com/go-kratos/kratos/v2/log" "google.golang.org/protobuf/types/known/emptypb" - "kratos-cms/app/core/service/internal/biz" + "kratos-cms/app/core/service/internal/data" - "kratos-cms/gen/api/go/common/pagination" - "kratos-cms/gen/api/go/content/service/v1" + pagination "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" + v1 "kratos-cms/gen/api/go/content/service/v1" ) type PostService struct { v1.UnimplementedPostServiceServer - uc *biz.PostUseCase + uc *data.PostRepo log *log.Helper } -func NewPostService(logger log.Logger, uc *biz.PostUseCase) *PostService { +func NewPostService(logger log.Logger, uc *data.PostRepo) *PostService { l := log.NewHelper(log.With(logger, "module", "post/service/core-service")) return &PostService{ log: l, diff --git a/blog-backend/app/core/service/internal/service/tag.go b/blog-backend/app/core/service/internal/service/tag.go index db0b7e78..74fc1ee9 100644 --- a/blog-backend/app/core/service/internal/service/tag.go +++ b/blog-backend/app/core/service/internal/service/tag.go @@ -6,20 +6,20 @@ import ( "github.com/go-kratos/kratos/v2/log" "google.golang.org/protobuf/types/known/emptypb" - "kratos-cms/app/core/service/internal/biz" + "kratos-cms/app/core/service/internal/data" - "kratos-cms/gen/api/go/common/pagination" + pagination "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" v1 "kratos-cms/gen/api/go/content/service/v1" ) type TagService struct { v1.UnimplementedTagServiceServer - uc *biz.TagUseCase + uc *data.TagRepo log *log.Helper } -func NewTagService(logger log.Logger, uc *biz.TagUseCase) *TagService { +func NewTagService(logger log.Logger, uc *data.TagRepo) *TagService { l := log.NewHelper(log.With(logger, "module", "tag/service/core-service")) return &TagService{ log: l, diff --git a/blog-backend/app/core/service/internal/service/user.go b/blog-backend/app/core/service/internal/service/user.go index c70d92bb..9cb51955 100644 --- a/blog-backend/app/core/service/internal/service/user.go +++ b/blog-backend/app/core/service/internal/service/user.go @@ -7,20 +7,20 @@ import ( "github.com/tx7do/go-utils/trans" "google.golang.org/protobuf/types/known/emptypb" - "kratos-cms/app/core/service/internal/biz" + "kratos-cms/app/core/service/internal/data" - "kratos-cms/gen/api/go/common/pagination" + pagination "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" v1 "kratos-cms/gen/api/go/user/service/v1" ) type UserService struct { v1.UnimplementedUserServiceServer - uc *biz.UserUseCase + uc *data.UserRepo log *log.Helper } -func NewUserService(logger log.Logger, uc *biz.UserUseCase) *UserService { +func NewUserService(logger log.Logger, uc *data.UserRepo) *UserService { l := log.NewHelper(log.With(logger, "module", "user/service/core-service")) return &UserService{ log: l, diff --git a/blog-backend/app/front/service/cmd/server/assets/openapi.yaml b/blog-backend/app/front/service/cmd/server/assets/openapi.yaml index b5d98d8f..4b9cd0b0 100644 --- a/blog-backend/app/front/service/cmd/server/assets/openapi.yaml +++ b/blog-backend/app/front/service/cmd/server/assets/openapi.yaml @@ -55,13 +55,19 @@ paths: description: 是否不分页 schema: type: boolean + - name: fieldMask + in: query + description: 字段掩码 + schema: + type: string + format: field-mask responses: "200": description: OK content: application/json: schema: - $ref: '#/components/schemas/file.service.v1.ListAttachmentResponse' + $ref: '#/components/schemas/ListAttachmentResponse' security: - OAuth2PasswordBearer: [] post: @@ -73,7 +79,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/file.service.v1.CreateAttachmentRequest' + $ref: '#/components/schemas/CreateAttachmentRequest' required: true responses: "200": @@ -81,7 +87,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/file.service.v1.Attachment' + $ref: '#/components/schemas/Attachment' security: - OAuth2PasswordBearer: [] /blog/v1/attachments/{id}: @@ -103,7 +109,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/file.service.v1.Attachment' + $ref: '#/components/schemas/Attachment' security: - OAuth2PasswordBearer: [] put: @@ -127,7 +133,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/file.service.v1.Attachment' + $ref: '#/components/schemas/Attachment' required: true responses: "200": @@ -135,7 +141,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/file.service.v1.Attachment' + $ref: '#/components/schemas/Attachment' security: - OAuth2PasswordBearer: [] delete: @@ -202,13 +208,19 @@ paths: description: 是否不分页 schema: type: boolean + - name: fieldMask + in: query + description: 字段掩码 + schema: + type: string + format: field-mask responses: "200": description: OK content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.ListCategoryResponse' + $ref: '#/components/schemas/ListCategoryResponse' security: - OAuth2PasswordBearer: [] post: @@ -220,7 +232,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.CreateCategoryRequest' + $ref: '#/components/schemas/CreateCategoryRequest' required: true responses: "200": @@ -228,7 +240,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.Category' + $ref: '#/components/schemas/Category' security: - OAuth2PasswordBearer: [] /blog/v1/categories/{id}: @@ -255,7 +267,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.Category' + $ref: '#/components/schemas/Category' security: - OAuth2PasswordBearer: [] put: @@ -279,7 +291,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.Category' + $ref: '#/components/schemas/Category' required: true responses: "200": @@ -287,7 +299,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.Category' + $ref: '#/components/schemas/Category' security: - OAuth2PasswordBearer: [] delete: @@ -354,13 +366,19 @@ paths: description: 是否不分页 schema: type: boolean + - name: fieldMask + in: query + description: 字段掩码 + schema: + type: string + format: field-mask responses: "200": description: OK content: application/json: schema: - $ref: '#/components/schemas/comment.service.v1.ListCommentResponse' + $ref: '#/components/schemas/ListCommentResponse' security: - OAuth2PasswordBearer: [] post: @@ -372,7 +390,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/comment.service.v1.CreateCommentRequest' + $ref: '#/components/schemas/CreateCommentRequest' required: true responses: "200": @@ -380,7 +398,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/comment.service.v1.Comment' + $ref: '#/components/schemas/Comment' security: - OAuth2PasswordBearer: [] /blog/v1/comments/{id}: @@ -402,7 +420,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/comment.service.v1.Comment' + $ref: '#/components/schemas/Comment' security: - OAuth2PasswordBearer: [] put: @@ -426,7 +444,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/comment.service.v1.Comment' + $ref: '#/components/schemas/Comment' required: true responses: "200": @@ -434,7 +452,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/comment.service.v1.Comment' + $ref: '#/components/schemas/Comment' security: - OAuth2PasswordBearer: [] delete: @@ -501,13 +519,19 @@ paths: description: 是否不分页 schema: type: boolean + - name: fieldMask + in: query + description: 字段掩码 + schema: + type: string + format: field-mask responses: "200": description: OK content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.ListLinkResponse' + $ref: '#/components/schemas/ListLinkResponse' security: - OAuth2PasswordBearer: [] post: @@ -519,7 +543,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.CreateLinkRequest' + $ref: '#/components/schemas/CreateLinkRequest' required: true responses: "200": @@ -527,7 +551,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.Link' + $ref: '#/components/schemas/Link' security: - OAuth2PasswordBearer: [] /blog/v1/links/{id}: @@ -549,7 +573,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.Link' + $ref: '#/components/schemas/Link' security: - OAuth2PasswordBearer: [] put: @@ -573,7 +597,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.Link' + $ref: '#/components/schemas/Link' required: true responses: "200": @@ -581,7 +605,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.Link' + $ref: '#/components/schemas/Link' security: - OAuth2PasswordBearer: [] delete: @@ -617,7 +641,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/front.service.v1.LoginRequest' + $ref: '#/components/schemas/LoginRequest' required: true responses: "200": @@ -625,7 +649,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/front.service.v1.LoginResponse' + $ref: '#/components/schemas/LoginResponse' /blog/v1/logout: post: tags: @@ -636,7 +660,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/front.service.v1.LogoutRequest' + $ref: '#/components/schemas/LogoutRequest' required: true responses: "200": @@ -662,7 +686,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/user.service.v1.User' + $ref: '#/components/schemas/User' security: - OAuth2PasswordBearer: [] /blog/v1/menus: @@ -706,13 +730,19 @@ paths: description: 是否不分页 schema: type: boolean + - name: fieldMask + in: query + description: 字段掩码 + schema: + type: string + format: field-mask responses: "200": description: OK content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.ListMenuResponse' + $ref: '#/components/schemas/ListMenuResponse' security: - OAuth2PasswordBearer: [] post: @@ -724,7 +754,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.CreateMenuRequest' + $ref: '#/components/schemas/CreateMenuRequest' required: true responses: "200": @@ -732,7 +762,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.Menu' + $ref: '#/components/schemas/Menu' security: - OAuth2PasswordBearer: [] /blog/v1/menus/{id}: @@ -754,7 +784,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.Menu' + $ref: '#/components/schemas/Menu' security: - OAuth2PasswordBearer: [] put: @@ -778,7 +808,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.Menu' + $ref: '#/components/schemas/Menu' required: true responses: "200": @@ -786,7 +816,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.Menu' + $ref: '#/components/schemas/Menu' security: - OAuth2PasswordBearer: [] delete: @@ -853,13 +883,19 @@ paths: description: 是否不分页 schema: type: boolean + - name: fieldMask + in: query + description: 字段掩码 + schema: + type: string + format: field-mask responses: "200": description: OK content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.ListPhotoResponse' + $ref: '#/components/schemas/ListPhotoResponse' security: - OAuth2PasswordBearer: [] post: @@ -871,7 +907,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.CreatePhotoRequest' + $ref: '#/components/schemas/CreatePhotoRequest' required: true responses: "200": @@ -879,7 +915,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.Photo' + $ref: '#/components/schemas/Photo' security: - OAuth2PasswordBearer: [] /blog/v1/photos/{id}: @@ -901,7 +937,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.Photo' + $ref: '#/components/schemas/Photo' security: - OAuth2PasswordBearer: [] put: @@ -925,7 +961,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.Photo' + $ref: '#/components/schemas/Photo' required: true responses: "200": @@ -933,7 +969,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.Photo' + $ref: '#/components/schemas/Photo' security: - OAuth2PasswordBearer: [] delete: @@ -1000,13 +1036,19 @@ paths: description: 是否不分页 schema: type: boolean + - name: fieldMask + in: query + description: 字段掩码 + schema: + type: string + format: field-mask responses: "200": description: OK content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.ListPostResponse' + $ref: '#/components/schemas/ListPostResponse' security: - OAuth2PasswordBearer: [] post: @@ -1018,7 +1060,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.CreatePostRequest' + $ref: '#/components/schemas/CreatePostRequest' required: true responses: "200": @@ -1026,7 +1068,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.Post' + $ref: '#/components/schemas/Post' security: - OAuth2PasswordBearer: [] /blog/v1/posts/{id}: @@ -1048,7 +1090,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.Post' + $ref: '#/components/schemas/Post' security: - OAuth2PasswordBearer: [] put: @@ -1072,7 +1114,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.Post' + $ref: '#/components/schemas/Post' required: true responses: "200": @@ -1080,7 +1122,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.Post' + $ref: '#/components/schemas/Post' security: - OAuth2PasswordBearer: [] delete: @@ -1147,13 +1189,19 @@ paths: description: 是否不分页 schema: type: boolean + - name: fieldMask + in: query + description: 字段掩码 + schema: + type: string + format: field-mask responses: "200": description: OK content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.ListTagResponse' + $ref: '#/components/schemas/ListTagResponse' security: - OAuth2PasswordBearer: [] post: @@ -1165,7 +1213,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.CreateTagRequest' + $ref: '#/components/schemas/CreateTagRequest' required: true responses: "200": @@ -1173,7 +1221,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.Tag' + $ref: '#/components/schemas/Tag' security: - OAuth2PasswordBearer: [] /blog/v1/tags/{id}: @@ -1195,7 +1243,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.Tag' + $ref: '#/components/schemas/Tag' security: - OAuth2PasswordBearer: [] put: @@ -1219,7 +1267,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.Tag' + $ref: '#/components/schemas/Tag' required: true responses: "200": @@ -1227,7 +1275,7 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/content.service.v1.Tag' + $ref: '#/components/schemas/Tag' security: - OAuth2PasswordBearer: [] delete: @@ -1255,81 +1303,57 @@ paths: - OAuth2PasswordBearer: [] components: schemas: - KratosStatus: + Any: type: object properties: - code: - type: number - description: 错误码 - format: int32 - message: - type: string - description: 错误消息 - reason: + value: + $ref: '#/components/schemas/GoogleProtobufAny' + yaml: type: string - description: 错误原因 - metadata: - type: object - description: 元数据 - description: Kratos错误返回 - comment.service.v1.Comment: + AnyOrExpression: + type: object + properties: + any: + $ref: '#/components/schemas/Any' + expression: + $ref: '#/components/schemas/Expression' + Attachment: type: object properties: id: type: integer format: uint32 - author: + name: type: string - email: + path: type: string - ipAddress: + fileKey: type: string - authorUrl: + thumbPath: type: string - gravatarMd5: + mediaType: type: string - content: + suffix: type: string - status: + width: type: integer - format: uint32 - userAgent: - type: string - parentId: + format: int32 + height: type: integer - format: uint32 - isAdmin: - type: boolean - allowNotification: - type: boolean - avatar: + format: int32 + size: type: string + type: + type: integer + format: int32 createTime: type: string updateTime: type: string - description: 评论 - comment.service.v1.CreateCommentRequest: - type: object - properties: - comment: - $ref: '#/components/schemas/comment.service.v1.Comment' - operatorId: - type: integer - format: uint32 - description: 请求 - 创建评论 - comment.service.v1.ListCommentResponse: - type: object - properties: - items: - type: array - items: - $ref: '#/components/schemas/comment.service.v1.Comment' - total: - type: integer - format: int32 - description: 回应 - 评论列表 - content.service.v1.Category: + deleteTime: + type: string + description: 附件 + Category: type: object properties: id: @@ -1361,151 +1385,300 @@ components: type: integer format: uint32 description: 类别 - content.service.v1.CreateCategoryRequest: + Comment: + type: object + properties: + id: + type: integer + format: uint32 + author: + type: string + email: + type: string + ipAddress: + type: string + authorUrl: + type: string + gravatarMd5: + type: string + content: + type: string + status: + type: integer + format: uint32 + userAgent: + type: string + parentId: + type: integer + format: uint32 + isAdmin: + type: boolean + allowNotification: + type: boolean + avatar: + type: string + createTime: + type: string + updateTime: + type: string + description: 评论 + CreateAttachmentRequest: + type: object + properties: + attachment: + $ref: '#/components/schemas/Attachment' + operatorId: + type: integer + format: uint32 + description: 创建附件 - 请求 + CreateCategoryRequest: type: object properties: category: - $ref: '#/components/schemas/content.service.v1.Category' + $ref: '#/components/schemas/Category' operatorId: type: integer format: uint32 description: 请求 - 创建类别 - content.service.v1.CreateLinkRequest: + CreateCommentRequest: + type: object + properties: + comment: + $ref: '#/components/schemas/Comment' + operatorId: + type: integer + format: uint32 + description: 请求 - 创建评论 + CreateLinkRequest: type: object properties: link: - $ref: '#/components/schemas/content.service.v1.Link' + $ref: '#/components/schemas/Link' operatorId: type: integer format: uint32 description: 请求 - 创建链接 - content.service.v1.CreateMenuRequest: + CreateMenuRequest: type: object properties: menu: - $ref: '#/components/schemas/content.service.v1.Menu' + $ref: '#/components/schemas/Menu' operatorId: type: integer format: uint32 description: 请求 - 创建菜单 - content.service.v1.CreatePhotoRequest: + CreatePhotoRequest: type: object properties: photo: - $ref: '#/components/schemas/content.service.v1.Photo' + $ref: '#/components/schemas/Photo' operatorId: type: integer format: uint32 description: 请求 - 创建照片 - content.service.v1.CreatePostRequest: + CreatePostRequest: type: object properties: post: - $ref: '#/components/schemas/content.service.v1.Post' + $ref: '#/components/schemas/Post' operatorId: type: integer format: uint32 description: 请求 - 创建帖子 - content.service.v1.CreateTagRequest: + CreateTagRequest: type: object properties: tag: - $ref: '#/components/schemas/content.service.v1.Tag' + $ref: '#/components/schemas/Tag' operatorId: type: integer format: uint32 description: 请求 - 创建标签 - content.service.v1.Link: + Expression: type: object properties: - id: - type: integer - format: uint32 - name: + additionalProperties: + type: array + items: + $ref: '#/components/schemas/NamedAny' + ExternalDocs: + type: object + properties: + description: type: string url: type: string - logo: + specificationExtension: + type: array + items: + $ref: '#/components/schemas/NamedAny' + description: Allows referencing an external resource for extended documentation. + GoogleProtobufAny: + type: object + properties: + '@type': type: string - description: + description: The type of the serialized message. + additionalProperties: true + description: Contains an arbitrary serialized message along with a @type that describes the type of the serialized message. + KratosStatus: + type: object + properties: + code: + type: number + description: 错误码 + format: int32 + message: type: string - team: + description: 错误消息 + reason: type: string - priority: - type: integer - format: int32 - createTime: + description: 错误原因 + metadata: + type: object + description: 元数据 + description: Kratos错误返回 + Link: + type: object + properties: + operationRef: type: string - updateTime: + operationId: type: string - description: 链接 - content.service.v1.ListCategoryResponse: + parameters: + $ref: '#/components/schemas/AnyOrExpression' + requestBody: + $ref: '#/components/schemas/AnyOrExpression' + description: + type: string + server: + $ref: '#/components/schemas/Server' + specificationExtension: + type: array + items: + $ref: '#/components/schemas/NamedAny' + description: The `Link object` represents a possible design-time link for a response. The presence of a link does not guarantee the caller's ability to successfully invoke it, rather it provides a known relationship and traversal mechanism between responses and other operations. Unlike _dynamic_ links (i.e. links provided **in** the response payload), the OAS linking mechanism does not require link information in the runtime response. For computing links, and providing instructions to execute them, a runtime expression is used for accessing values in an operation and using them as parameters while invoking the linked operation. + ListAttachmentResponse: + type: object + properties: + items: + type: array + items: + $ref: '#/components/schemas/Attachment' + total: + type: integer + format: int32 + description: 附件列表 - 回应 + ListCategoryResponse: type: object properties: items: type: array items: - $ref: '#/components/schemas/content.service.v1.Category' + $ref: '#/components/schemas/Category' total: type: integer format: int32 description: 回应 - 类别列表 - content.service.v1.ListLinkResponse: + ListCommentResponse: + type: object + properties: + items: + type: array + items: + $ref: '#/components/schemas/Comment' + total: + type: integer + format: int32 + description: 回应 - 评论列表 + ListLinkResponse: type: object properties: items: type: array items: - $ref: '#/components/schemas/content.service.v1.Link' + $ref: '#/components/schemas/Link' total: type: integer format: int32 description: 回应 - 链接列表 - content.service.v1.ListMenuResponse: + ListMenuResponse: type: object properties: items: type: array items: - $ref: '#/components/schemas/content.service.v1.Menu' + $ref: '#/components/schemas/Menu' total: type: integer format: int32 description: 回应 - 菜单列表 - content.service.v1.ListPhotoResponse: + ListPhotoResponse: type: object properties: items: type: array items: - $ref: '#/components/schemas/content.service.v1.Photo' + $ref: '#/components/schemas/Photo' total: type: integer format: int32 description: 回应 - 照片列表 - content.service.v1.ListPostResponse: + ListPostResponse: type: object properties: items: type: array items: - $ref: '#/components/schemas/content.service.v1.Post' + $ref: '#/components/schemas/Post' total: type: integer format: int32 description: 回应 - 帖子列表 - content.service.v1.ListTagResponse: + ListTagResponse: type: object properties: items: type: array items: - $ref: '#/components/schemas/content.service.v1.Tag' + $ref: '#/components/schemas/Tag' total: type: integer format: int32 description: 回应 - 标签列表 - content.service.v1.Menu: + LoginRequest: + type: object + properties: + username: + type: string + password: + type: string + grand_type: + type: string + description: 用户APP登陆 - 请求 + LoginResponse: + type: object + properties: + id: + type: integer + format: uint32 + username: + type: string + token_type: + type: string + access_token: + type: string + refresh_token: + type: string + description: 用户APP登陆 - 回应 + LogoutRequest: + type: object + properties: + id: + type: integer + format: uint32 + description: 用户APP登出 - 请求 + Menu: type: object properties: id: @@ -1532,7 +1705,29 @@ components: updateTime: type: string description: 菜单 - content.service.v1.Photo: + NamedAny: + type: object + properties: + name: + type: string + description: Map key + value: + allOf: + - $ref: '#/components/schemas/Any' + description: Mapped value + description: Automatically-generated message used to represent maps of Any as ordered (name,value) pairs. + NamedServerVariable: + type: object + properties: + name: + type: string + description: Map key + value: + allOf: + - $ref: '#/components/schemas/ServerVariable' + description: Mapped value + description: Automatically-generated message used to represent maps of ServerVariable as ordered (name,value) pairs. + Photo: type: object properties: id: @@ -1558,7 +1753,7 @@ components: createTime: type: string description: 照片 - content.service.v1.Post: + Post: type: object properties: id: @@ -1618,121 +1813,58 @@ components: editTime: type: string description: 帖子 - content.service.v1.Tag: + Server: type: object properties: - id: - type: integer - format: uint32 - name: - type: string - slug: - type: string - slugName: - type: string - color: - type: string - thumbnail: - type: string - createTime: - type: string - updateTime: + url: type: string - postCount: - type: integer - format: uint32 - fullPath: + description: type: string - description: 标签 - file.service.v1.Attachment: + variables: + $ref: '#/components/schemas/ServerVariables' + specificationExtension: + type: array + items: + $ref: '#/components/schemas/NamedAny' + description: An object representing a Server. + ServerVariable: type: object properties: - id: - type: integer - format: uint32 - name: - type: string - path: - type: string - fileKey: - type: string - thumbPath: - type: string - mediaType: - type: string - suffix: - type: string - width: - type: integer - format: int32 - height: - type: integer - format: int32 - size: - type: string - type: - type: integer - format: int32 - createTime: - type: string - updateTime: + enum: + type: array + items: + type: string + default: type: string - deleteTime: + description: type: string - description: 附件 - file.service.v1.CreateAttachmentRequest: - type: object - properties: - attachment: - $ref: '#/components/schemas/file.service.v1.Attachment' - operatorId: - type: integer - format: uint32 - description: 创建附件 - 请求 - file.service.v1.ListAttachmentResponse: - type: object - properties: - items: + specificationExtension: type: array items: - $ref: '#/components/schemas/file.service.v1.Attachment' - total: - type: integer - format: int32 - description: 附件列表 - 回应 - front.service.v1.LoginRequest: + $ref: '#/components/schemas/NamedAny' + description: An object representing a Server Variable for server URL template substitution. + ServerVariables: type: object properties: - username: - type: string - password: - type: string - grand_type: - type: string - description: 用户APP登陆 - 请求 - front.service.v1.LoginResponse: + additionalProperties: + type: array + items: + $ref: '#/components/schemas/NamedServerVariable' + Tag: type: object properties: - id: - type: integer - format: uint32 - username: - type: string - token_type: - type: string - access_token: + name: type: string - refresh_token: + description: type: string - description: 用户APP登陆 - 回应 - front.service.v1.LogoutRequest: - type: object - properties: - id: - type: integer - format: uint32 - description: 用户APP登出 - 请求 - user.service.v1.User: + externalDocs: + $ref: '#/components/schemas/ExternalDocs' + specificationExtension: + type: array + items: + $ref: '#/components/schemas/NamedAny' + description: Adds metadata to a single tag that is used by the Operation Object. It is not mandatory to have a Tag Object per tag defined in the Operation Object instances. + User: type: object properties: id: diff --git a/blog-backend/app/front/service/cmd/server/wire.go b/blog-backend/app/front/service/cmd/server/wire.go index e1ebecfc..826bb63f 100644 --- a/blog-backend/app/front/service/cmd/server/wire.go +++ b/blog-backend/app/front/service/cmd/server/wire.go @@ -12,7 +12,6 @@ import ( "github.com/go-kratos/kratos/v2/log" "github.com/go-kratos/kratos/v2/registry" - "kratos-cms/app/front/service/internal/biz" "kratos-cms/app/front/service/internal/data" "kratos-cms/app/front/service/internal/server" "kratos-cms/app/front/service/internal/service" @@ -22,5 +21,5 @@ import ( // initApp init kratos application. func initApp(log.Logger, registry.Registrar, *conf.Bootstrap) (*kratos.App, func(), error) { - panic(wire.Build(server.ProviderSet, service.ProviderSet, biz.ProviderSet, data.ProviderSet, newApp)) + panic(wire.Build(server.ProviderSet, service.ProviderSet, data.ProviderSet, newApp)) } diff --git a/blog-backend/app/front/service/cmd/server/wire_gen.go b/blog-backend/app/front/service/cmd/server/wire_gen.go index 202852d6..cc653c59 100644 --- a/blog-backend/app/front/service/cmd/server/wire_gen.go +++ b/blog-backend/app/front/service/cmd/server/wire_gen.go @@ -11,7 +11,6 @@ import ( "github.com/go-kratos/kratos/v2/log" "github.com/go-kratos/kratos/v2/registry" "github.com/tx7do/kratos-bootstrap/gen/api/go/conf/v1" - "kratos-cms/app/front/service/internal/biz" "kratos-cms/app/front/service/internal/data" "kratos-cms/app/front/service/internal/server" "kratos-cms/app/front/service/internal/service" @@ -20,7 +19,7 @@ import ( // Injectors from wire.go: // initApp init kratos application. -func initApp(logger log.Logger, registrar registry.Registrar, bootstrap *conf.Bootstrap) (*kratos.App, func(), error) { +func initApp(logger log.Logger, registrar registry.Registrar, bootstrap *v1.Bootstrap) (*kratos.App, func(), error) { authenticator := data.NewAuthenticator(bootstrap) engine := data.NewAuthorizer() discovery := data.NewDiscovery(bootstrap) @@ -37,8 +36,7 @@ func initApp(logger log.Logger, registrar registry.Registrar, bootstrap *conf.Bo return nil, nil, err } userTokenRepo := data.NewUserTokenRepo(dataData, authenticator, logger) - userTokenUseCase := biz.NewUserAuthUseCase(userTokenRepo) - authenticationService := service.NewAuthenticationService(logger, userServiceClient, userTokenUseCase) + authenticationService := service.NewAuthenticationService(logger, userServiceClient, userTokenRepo) postService := service.NewPostService(logger, postServiceClient) linkService := service.NewLinkService(logger, linkServiceClient) categoryService := service.NewCategoryService(logger, categoryServiceClient) diff --git a/blog-backend/app/front/service/internal/biz/README.md b/blog-backend/app/front/service/internal/biz/README.md deleted file mode 100644 index 26a66b63..00000000 --- a/blog-backend/app/front/service/internal/biz/README.md +++ /dev/null @@ -1 +0,0 @@ -# Biz diff --git a/blog-backend/app/front/service/internal/biz/init.go b/blog-backend/app/front/service/internal/biz/init.go deleted file mode 100644 index 5b3bbcf1..00000000 --- a/blog-backend/app/front/service/internal/biz/init.go +++ /dev/null @@ -1,11 +0,0 @@ -//go:build wireinject -// +build wireinject - -package biz - -import "github.com/google/wire" - -// ProviderSet is biz providers. -var ProviderSet = wire.NewSet( - NewUserAuthUseCase, -) diff --git a/blog-backend/app/front/service/internal/biz/user_token.go b/blog-backend/app/front/service/internal/biz/user_token.go deleted file mode 100644 index 7a364300..00000000 --- a/blog-backend/app/front/service/internal/biz/user_token.go +++ /dev/null @@ -1,35 +0,0 @@ -package biz - -import ( - "context" - - v1 "kratos-cms/gen/api/go/user/service/v1" -) - -type UserTokenRepo interface { - GetToken(ctx context.Context, userId uint32) string - GenerateToken(ctx context.Context, user *v1.User) (string, error) - RemoveToken(ctx context.Context, userId uint32) error -} - -type UserTokenUseCase struct { - repo UserTokenRepo -} - -func NewUserAuthUseCase(repo UserTokenRepo) *UserTokenUseCase { - return &UserTokenUseCase{ - repo: repo, - } -} - -func (uc *UserTokenUseCase) GenerateToken(ctx context.Context, user *v1.User) (string, error) { - return uc.repo.GenerateToken(ctx, user) -} - -func (uc *UserTokenUseCase) GetToken(ctx context.Context, userId uint32) string { - return uc.repo.GetToken(ctx, userId) -} - -func (uc *UserTokenUseCase) RemoveToken(ctx context.Context, userId uint32) error { - return uc.repo.RemoveToken(ctx, userId) -} diff --git a/blog-backend/app/front/service/internal/data/data.go b/blog-backend/app/front/service/internal/data/data.go index 42fcb7fb..07d27660 100644 --- a/blog-backend/app/front/service/internal/data/data.go +++ b/blog-backend/app/front/service/internal/data/data.go @@ -15,7 +15,7 @@ import ( "github.com/go-kratos/kratos/v2/registry" "github.com/tx7do/kratos-bootstrap" - "github.com/tx7do/kratos-bootstrap/gen/api/go/conf/v1" + conf "github.com/tx7do/kratos-bootstrap/gen/api/go/conf/v1" commentV1 "kratos-cms/gen/api/go/comment/service/v1" contentV1 "kratos-cms/gen/api/go/content/service/v1" diff --git a/blog-backend/app/front/service/internal/data/user_token.go b/blog-backend/app/front/service/internal/data/user_token.go index f81423b7..356d7646 100644 --- a/blog-backend/app/front/service/internal/data/user_token.go +++ b/blog-backend/app/front/service/internal/data/user_token.go @@ -8,29 +8,29 @@ import ( "github.com/go-kratos/kratos/v2/log" "github.com/go-redis/redis/v8" + authn "github.com/tx7do/kratos-authn/engine" authnEngine "github.com/tx7do/kratos-authn/engine" - "kratos-cms/app/front/service/internal/biz" v1 "kratos-cms/gen/api/go/user/service/v1" ) -type userTokenRepo struct { +type UserTokenRepo struct { data *Data log *log.Helper authenticator authnEngine.Authenticator } -func NewUserTokenRepo(data *Data, authenticator authnEngine.Authenticator, logger log.Logger) biz.UserTokenRepo { +func NewUserTokenRepo(data *Data, authenticator authnEngine.Authenticator, logger log.Logger) *UserTokenRepo { l := log.NewHelper(log.With(logger, "module", "user-token/repo/user-service")) - return &userTokenRepo{ + return &UserTokenRepo{ data: data, log: l, authenticator: authenticator, } } -func (r *userTokenRepo) createAccessJwtToken(_ string, userId uint32) string { +func (r *UserTokenRepo) createAccessJwtToken(_ string, userId uint32) string { principal := authn.AuthClaims{ Subject: strconv.FormatUint(uint64(userId), 10), Scopes: make(authn.ScopeSet), @@ -44,7 +44,7 @@ func (r *userTokenRepo) createAccessJwtToken(_ string, userId uint32) string { return signedToken } -func (r *userTokenRepo) GenerateToken(ctx context.Context, user *v1.User) (string, error) { +func (r *UserTokenRepo) GenerateToken(ctx context.Context, user *v1.User) (string, error) { token := r.createAccessJwtToken(user.GetUserName(), user.GetId()) if token == "" { return "", errors.New("create token failed") @@ -58,11 +58,11 @@ func (r *userTokenRepo) GenerateToken(ctx context.Context, user *v1.User) (strin return token, nil } -func (r *userTokenRepo) GetToken(ctx context.Context, userId uint32) string { +func (r *UserTokenRepo) GetToken(ctx context.Context, userId uint32) string { return r.getToken(ctx, userId) } -func (r *userTokenRepo) RemoveToken(ctx context.Context, userId uint32) error { +func (r *UserTokenRepo) RemoveToken(ctx context.Context, userId uint32) error { validToken := r.getToken(ctx, userId) if validToken == "" { return v1.ErrorTokenNotExist("令牌不存在") @@ -71,7 +71,7 @@ func (r *userTokenRepo) RemoveToken(ctx context.Context, userId uint32) error { return r.deleteToken(ctx, userId) } -func (r *userTokenRepo) RemoveUserToken(ctx context.Context, userId uint32) error { +func (r *UserTokenRepo) RemoveUserToken(ctx context.Context, userId uint32) error { validToken := r.getToken(ctx, userId) if validToken == "" { return v1.ErrorTokenNotExist("令牌不存在") @@ -82,12 +82,12 @@ func (r *userTokenRepo) RemoveUserToken(ctx context.Context, userId uint32) erro const userTokenKeyPrefix = "ut_" -func (r *userTokenRepo) setToken(ctx context.Context, userId uint32, token string) error { +func (r *UserTokenRepo) setToken(ctx context.Context, userId uint32, token string) error { key := fmt.Sprintf("%s%d", userTokenKeyPrefix, userId) return r.data.rdb.Set(ctx, key, token, 0).Err() } -func (r *userTokenRepo) getToken(ctx context.Context, userId uint32) string { +func (r *UserTokenRepo) getToken(ctx context.Context, userId uint32) string { key := fmt.Sprintf("%s%d", userTokenKeyPrefix, userId) result, err := r.data.rdb.Get(ctx, key).Result() if err != nil { @@ -99,7 +99,7 @@ func (r *userTokenRepo) getToken(ctx context.Context, userId uint32) string { return result } -func (r *userTokenRepo) deleteToken(ctx context.Context, userId uint32) error { +func (r *UserTokenRepo) deleteToken(ctx context.Context, userId uint32) error { key := fmt.Sprintf("%s%d", userTokenKeyPrefix, userId) return r.data.rdb.Del(ctx, key).Err() } diff --git a/blog-backend/app/front/service/internal/server/rest.go b/blog-backend/app/front/service/internal/server/rest.go index 2116bf1a..0f0fa121 100644 --- a/blog-backend/app/front/service/internal/server/rest.go +++ b/blog-backend/app/front/service/internal/server/rest.go @@ -18,12 +18,12 @@ import ( swaggerUI "github.com/tx7do/kratos-swagger-ui" "github.com/tx7do/kratos-bootstrap" - "github.com/tx7do/kratos-bootstrap/gen/api/go/conf/v1" + conf "github.com/tx7do/kratos-bootstrap/gen/api/go/conf/v1" "kratos-cms/app/front/service/cmd/server/assets" "kratos-cms/app/front/service/internal/service" - v1 "kratos-cms/gen/api/go/front/service/v1" + frontV1 "kratos-cms/gen/api/go/front/service/v1" "kratos-cms/pkg/middleware/auth" ) @@ -64,13 +64,13 @@ func NewHTTPServer( ) *http.Server { srv := bootstrap.CreateRestServer(cfg, newRestMiddleware(authenticator, authorizer, logger)...) - v1.RegisterAuthenticationServiceHTTPServer(srv, authnSvc) - v1.RegisterPostServiceHTTPServer(srv, postSvc) - v1.RegisterCategoryServiceHTTPServer(srv, cateSvc) - v1.RegisterTagServiceHTTPServer(srv, tagSvc) - v1.RegisterLinkServiceHTTPServer(srv, linkSvc) - v1.RegisterAttachmentServiceHTTPServer(srv, attachmentSvc) - v1.RegisterCommentServiceHTTPServer(srv, commentSvc) + frontV1.RegisterAuthenticationServiceHTTPServer(srv, authnSvc) + frontV1.RegisterPostServiceHTTPServer(srv, postSvc) + frontV1.RegisterCategoryServiceHTTPServer(srv, cateSvc) + frontV1.RegisterTagServiceHTTPServer(srv, tagSvc) + frontV1.RegisterLinkServiceHTTPServer(srv, linkSvc) + frontV1.RegisterAttachmentServiceHTTPServer(srv, attachmentSvc) + frontV1.RegisterCommentServiceHTTPServer(srv, commentSvc) if cfg.GetServer().GetRest().GetEnableSwagger() { swaggerUI.RegisterSwaggerUIServerWithOption( diff --git a/blog-backend/app/front/service/internal/service/attachment.go b/blog-backend/app/front/service/internal/service/attachment.go index 871fb8ff..6a9f4f7e 100644 --- a/blog-backend/app/front/service/internal/service/attachment.go +++ b/blog-backend/app/front/service/internal/service/attachment.go @@ -6,7 +6,7 @@ import ( "github.com/go-kratos/kratos/v2/log" "google.golang.org/protobuf/types/known/emptypb" - "kratos-cms/gen/api/go/common/pagination" + pagination "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" fileV1 "kratos-cms/gen/api/go/file/service/v1" v1 "kratos-cms/gen/api/go/front/service/v1" ) diff --git a/blog-backend/app/front/service/internal/service/authentication.go b/blog-backend/app/front/service/internal/service/authentication.go index bd03f93a..56bee3c0 100644 --- a/blog-backend/app/front/service/internal/service/authentication.go +++ b/blog-backend/app/front/service/internal/service/authentication.go @@ -6,7 +6,7 @@ import ( "github.com/go-kratos/kratos/v2/log" "google.golang.org/protobuf/types/known/emptypb" - "kratos-cms/app/front/service/internal/biz" + "kratos-cms/app/front/service/internal/data" v1 "kratos-cms/gen/api/go/front/service/v1" userV1 "kratos-cms/gen/api/go/user/service/v1" @@ -18,12 +18,12 @@ type AuthenticationService struct { v1.AuthenticationServiceHTTPServer sc userV1.UserServiceClient - utuc *biz.UserTokenUseCase + utuc *data.UserTokenRepo log *log.Helper } -func NewAuthenticationService(logger log.Logger, sc userV1.UserServiceClient, utuc *biz.UserTokenUseCase) *AuthenticationService { +func NewAuthenticationService(logger log.Logger, sc userV1.UserServiceClient, utuc *data.UserTokenRepo) *AuthenticationService { l := log.NewHelper(log.With(logger, "module", "authn/service/front-service")) return &AuthenticationService{ log: l, diff --git a/blog-backend/app/front/service/internal/service/category.go b/blog-backend/app/front/service/internal/service/category.go index 11a1cb5b..fa200757 100644 --- a/blog-backend/app/front/service/internal/service/category.go +++ b/blog-backend/app/front/service/internal/service/category.go @@ -6,7 +6,7 @@ import ( "github.com/go-kratos/kratos/v2/log" "google.golang.org/protobuf/types/known/emptypb" - "kratos-cms/gen/api/go/common/pagination" + pagination "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" contentV1 "kratos-cms/gen/api/go/content/service/v1" v1 "kratos-cms/gen/api/go/front/service/v1" ) diff --git a/blog-backend/app/front/service/internal/service/comment.go b/blog-backend/app/front/service/internal/service/comment.go index fd71a3e4..290117ae 100644 --- a/blog-backend/app/front/service/internal/service/comment.go +++ b/blog-backend/app/front/service/internal/service/comment.go @@ -6,8 +6,8 @@ import ( "github.com/go-kratos/kratos/v2/log" "google.golang.org/protobuf/types/known/emptypb" + pagination "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" commentV1 "kratos-cms/gen/api/go/comment/service/v1" - "kratos-cms/gen/api/go/common/pagination" v1 "kratos-cms/gen/api/go/front/service/v1" ) diff --git a/blog-backend/app/front/service/internal/service/link.go b/blog-backend/app/front/service/internal/service/link.go index abcab4ac..ab4b2657 100644 --- a/blog-backend/app/front/service/internal/service/link.go +++ b/blog-backend/app/front/service/internal/service/link.go @@ -6,7 +6,7 @@ import ( "github.com/go-kratos/kratos/v2/log" "google.golang.org/protobuf/types/known/emptypb" - "kratos-cms/gen/api/go/common/pagination" + pagination "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" contentV1 "kratos-cms/gen/api/go/content/service/v1" v1 "kratos-cms/gen/api/go/front/service/v1" ) diff --git a/blog-backend/app/front/service/internal/service/post.go b/blog-backend/app/front/service/internal/service/post.go index 6a888e5f..52e9a8c5 100644 --- a/blog-backend/app/front/service/internal/service/post.go +++ b/blog-backend/app/front/service/internal/service/post.go @@ -6,7 +6,7 @@ import ( "github.com/go-kratos/kratos/v2/log" "google.golang.org/protobuf/types/known/emptypb" - "kratos-cms/gen/api/go/common/pagination" + pagination "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" contentV1 "kratos-cms/gen/api/go/content/service/v1" v1 "kratos-cms/gen/api/go/front/service/v1" ) diff --git a/blog-backend/app/front/service/internal/service/tag.go b/blog-backend/app/front/service/internal/service/tag.go index eec4377f..ea7e5d85 100644 --- a/blog-backend/app/front/service/internal/service/tag.go +++ b/blog-backend/app/front/service/internal/service/tag.go @@ -6,7 +6,7 @@ import ( "github.com/go-kratos/kratos/v2/log" "google.golang.org/protobuf/types/known/emptypb" - "kratos-cms/gen/api/go/common/pagination" + pagination "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" contentV1 "kratos-cms/gen/api/go/content/service/v1" v1 "kratos-cms/gen/api/go/front/service/v1" ) diff --git a/blog-backend/buf.gen.yaml b/blog-backend/buf.gen.yaml index d2bd232a..6b00df8d 100644 --- a/blog-backend/buf.gen.yaml +++ b/blog-backend/buf.gen.yaml @@ -1,37 +1,50 @@ # 配置protoc生成规则 version: v1 + managed: - enabled: false + enabled: true + optimize_for: SPEED + + go_package_prefix: + default: kratos-cms/gen/api/go + except: + - 'buf.build/googleapis/googleapis' + - 'buf.build/envoyproxy/protoc-gen-validate' + - 'buf.build/kratos/apis' + - 'buf.build/gnostic/gnostic' + - 'buf.build/gogo/protobuf' + - 'buf.build/tx7do/pagination' + plugins: - # generate go struct code + # 使用go插件生成go代码 #- plugin: buf.build/protocolbuffers/go - name: go out: gen/api/go - opt: paths=source_relative + opt: paths=source_relative # 使用相对路径 - # generate grpc service code + # 使用go-grpc插件生成gRPC服务代码 #- plugin: buf.build/grpc/go - name: go-grpc out: gen/api/go opt: - - paths=source_relative + - paths=source_relative # 使用相对路径 # generate rest service code - name: go-http out: gen/api/go opt: - - paths=source_relative + - paths=source_relative # 使用相对路径 # generate kratos errors code - name: go-errors out: gen/api/go opt: - - paths=source_relative + - paths=source_relative # 使用相对路径 # generate message validator code #- plugin: buf.build/bufbuild/validate-go - name: validate out: gen/api/go opt: - - paths=source_relative + - paths=source_relative # 使用相对路径 - lang=go diff --git a/blog-backend/buf.work.yaml b/blog-backend/buf.work.yaml index 1cd05238..f8a436c6 100644 --- a/blog-backend/buf.work.yaml +++ b/blog-backend/buf.work.yaml @@ -1,3 +1,4 @@ version: v1 + directories: - api \ No newline at end of file diff --git a/blog-backend/buf.yaml b/blog-backend/buf.yaml index 1a519456..e98a7915 100644 --- a/blog-backend/buf.yaml +++ b/blog-backend/buf.yaml @@ -1,7 +1,9 @@ version: v1 + breaking: use: - FILE + lint: use: - DEFAULT diff --git a/blog-backend/gen/api/go/admin/service/v1/admin_error.pb.go b/blog-backend/gen/api/go/admin/service/v1/admin_error.pb.go index 706cfa4d..80651420 100644 --- a/blog-backend/gen/api/go/admin/service/v1/admin_error.pb.go +++ b/blog-backend/gen/api/go/admin/service/v1/admin_error.pb.go @@ -4,7 +4,7 @@ // protoc (unknown) // source: admin/service/v1/admin_error.proto -package v1 +package servicev1 import ( _ "github.com/go-kratos/kratos/v2/errors" @@ -159,10 +159,19 @@ var file_admin_service_v1_admin_error_proto_rawDesc = []byte{ 0x17, 0x0a, 0x0e, 0x55, 0x53, 0x45, 0x52, 0x5f, 0x4e, 0x4f, 0x54, 0x5f, 0x45, 0x58, 0x49, 0x53, 0x54, 0x10, 0x19, 0x1a, 0x03, 0xa8, 0x45, 0x6a, 0x12, 0x14, 0x0a, 0x0b, 0x55, 0x53, 0x45, 0x52, 0x5f, 0x46, 0x52, 0x45, 0x45, 0x5a, 0x45, 0x10, 0x1a, 0x1a, 0x03, 0xa8, 0x45, 0x6b, 0x1a, 0x04, - 0xa0, 0x45, 0xf4, 0x03, 0x42, 0x2b, 0x5a, 0x29, 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x63, - 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x61, 0x64, - 0x6d, 0x69, 0x6e, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x76, - 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0xa0, 0x45, 0xf4, 0x03, 0x42, 0xbb, 0x01, 0x0a, 0x14, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x64, 0x6d, + 0x69, 0x6e, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x42, 0x0f, 0x41, + 0x64, 0x6d, 0x69, 0x6e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, + 0x5a, 0x30, 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x63, 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, + 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x73, 0x65, + 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, + 0x76, 0x31, 0xa2, 0x02, 0x03, 0x41, 0x53, 0x58, 0xaa, 0x02, 0x10, 0x41, 0x64, 0x6d, 0x69, 0x6e, + 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x10, 0x41, 0x64, + 0x6d, 0x69, 0x6e, 0x5c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x56, 0x31, 0xe2, 0x02, + 0x1c, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x5c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x56, + 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x12, + 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x3a, 0x3a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x3a, 0x3a, + 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/blog-backend/gen/api/go/admin/service/v1/admin_error.pb.validate.go b/blog-backend/gen/api/go/admin/service/v1/admin_error.pb.validate.go index 33148caa..6dd3deda 100644 --- a/blog-backend/gen/api/go/admin/service/v1/admin_error.pb.validate.go +++ b/blog-backend/gen/api/go/admin/service/v1/admin_error.pb.validate.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-validate. DO NOT EDIT. // source: admin/service/v1/admin_error.proto -package v1 +package servicev1 import ( "bytes" diff --git a/blog-backend/gen/api/go/admin/service/v1/admin_error_errors.pb.go b/blog-backend/gen/api/go/admin/service/v1/admin_error_errors.pb.go index 5c400bd4..5bceccb5 100644 --- a/blog-backend/gen/api/go/admin/service/v1/admin_error_errors.pb.go +++ b/blog-backend/gen/api/go/admin/service/v1/admin_error_errors.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go-errors. DO NOT EDIT. -package v1 +package servicev1 import ( fmt "fmt" diff --git a/blog-backend/gen/api/go/admin/service/v1/i_admin.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_admin.pb.go index 4d3062f9..b35f8324 100644 --- a/blog-backend/gen/api/go/admin/service/v1/i_admin.pb.go +++ b/blog-backend/gen/api/go/admin/service/v1/i_admin.pb.go @@ -4,7 +4,7 @@ // protoc (unknown) // source: admin/service/v1/i_admin.proto -package v1 +package servicev1 import ( _ "github.com/google/gnostic/openapiv3" @@ -28,7 +28,7 @@ var file_admin_service_v1_i_admin_proto_rawDesc = []byte{ 0x12, 0x10, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x1a, 0x24, 0x67, 0x6e, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x2f, 0x6f, 0x70, 0x65, 0x6e, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x33, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x42, 0xfa, 0x04, 0xba, 0x47, 0xcb, 0x04, 0x12, + 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x42, 0x86, 0x06, 0xba, 0x47, 0xcb, 0x04, 0x12, 0xc8, 0x01, 0x0a, 0x1a, 0x4b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x43, 0x4d, 0x53, 0x20, 0xe5, 0x90, 0x8e, 0xe5, 0x8f, 0xb0, 0xe7, 0xae, 0xa1, 0xe7, 0x90, 0x86, 0x41, 0x50, 0x49, 0x12, 0x1a, 0x4b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x43, 0x4d, 0x53, 0x20, 0xe5, 0x90, 0x8e, 0xe5, 0x8f, @@ -65,10 +65,19 @@ var file_admin_service_v1_i_admin_proto_rawDesc = []byte{ 0x39, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x21, 0x0a, 0x1f, 0x0a, 0x06, 0x6f, 0x61, 0x75, 0x74, 0x68, 0x32, 0x3a, 0x15, 0x12, 0x13, 0x12, 0x0f, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, - 0x76, 0x31, 0x2f, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x22, 0x00, 0x5a, 0x29, 0x6b, 0x72, 0x61, 0x74, - 0x6f, 0x73, 0x2d, 0x63, 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, - 0x6f, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, - 0x76, 0x31, 0x3b, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x76, 0x31, 0x2f, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x22, 0x00, 0x0a, 0x14, 0x63, 0x6f, 0x6d, 0x2e, + 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, + 0x42, 0x0b, 0x49, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, + 0x30, 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x63, 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, + 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x73, 0x65, 0x72, + 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x76, + 0x31, 0xa2, 0x02, 0x03, 0x41, 0x53, 0x58, 0xaa, 0x02, 0x10, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x2e, + 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x10, 0x41, 0x64, 0x6d, + 0x69, 0x6e, 0x5c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1c, + 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x5c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x56, 0x31, + 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x12, 0x41, + 0x64, 0x6d, 0x69, 0x6e, 0x3a, 0x3a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x3a, 0x3a, 0x56, + 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var file_admin_service_v1_i_admin_proto_goTypes = []interface{}{} diff --git a/blog-backend/gen/api/go/admin/service/v1/i_admin.pb.validate.go b/blog-backend/gen/api/go/admin/service/v1/i_admin.pb.validate.go index fb567548..001c7d8a 100644 --- a/blog-backend/gen/api/go/admin/service/v1/i_admin.pb.validate.go +++ b/blog-backend/gen/api/go/admin/service/v1/i_admin.pb.validate.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-validate. DO NOT EDIT. // source: admin/service/v1/i_admin.proto -package v1 +package servicev1 import ( "bytes" diff --git a/blog-backend/gen/api/go/admin/service/v1/i_attachment.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_attachment.pb.go index 9902dc51..26c65311 100644 --- a/blog-backend/gen/api/go/admin/service/v1/i_attachment.pb.go +++ b/blog-backend/gen/api/go/admin/service/v1/i_attachment.pb.go @@ -4,16 +4,16 @@ // protoc (unknown) // source: admin/service/v1/i_attachment.proto -package v1 +package servicev1 import ( _ "github.com/google/gnostic/openapiv3" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" - v1 "kratos-cms/gen/api/go/file/service/v1" + v11 "kratos-cms/gen/api/go/file/service/v1" reflect "reflect" ) @@ -36,76 +36,85 @@ var file_admin_service_v1_i_attachment_proto_rawDesc = []byte{ 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, - 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x22, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, - 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x70, 0x61, 0x67, 0x69, - 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x20, 0x66, 0x69, - 0x6c, 0x65, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0xa3, - 0x06, 0x0a, 0x11, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x53, 0x65, 0x72, - 0x76, 0x69, 0x63, 0x65, 0x12, 0x92, 0x01, 0x0a, 0x0e, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x19, 0x2e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, - 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, - 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x3c, 0xba, 0x47, 0x1c, - 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, - 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, - 0x02, 0x17, 0x12, 0x15, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x96, 0x01, 0x0a, 0x0d, 0x47, 0x65, - 0x74, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x25, 0x2e, 0x66, 0x69, - 0x6c, 0x65, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, - 0x74, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x1a, 0x1b, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, - 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x22, - 0x41, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, - 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, - 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1c, 0x12, 0x1a, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, - 0x31, 0x2f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2f, 0x7b, 0x69, - 0x64, 0x7d, 0x12, 0x9a, 0x01, 0x0a, 0x10, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x41, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x28, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x2e, 0x73, - 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, - 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x1a, 0x1b, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, - 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3f, - 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, - 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, - 0xd3, 0xe4, 0x93, 0x02, 0x1a, 0x3a, 0x01, 0x2a, 0x22, 0x15, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, - 0x2f, 0x76, 0x31, 0x2f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x12, - 0xa8, 0x01, 0x0a, 0x10, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, - 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x28, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x2e, 0x73, 0x65, 0x72, 0x76, - 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x41, 0x74, 0x74, + 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x20, 0x66, 0x69, 0x6c, 0x65, 0x2f, 0x73, + 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0xa3, 0x06, 0x0a, 0x11, 0x41, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, + 0x12, 0x92, 0x01, 0x0a, 0x0e, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, + 0x65, 0x6e, 0x74, 0x12, 0x19, 0x2e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x2e, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, + 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, + 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x3c, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, + 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, + 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x17, 0x12, 0x15, + 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x96, 0x01, 0x0a, 0x0d, 0x47, 0x65, 0x74, 0x41, 0x74, 0x74, + 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x25, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x2e, 0x73, + 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1b, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, - 0x2e, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x4d, 0xba, 0x47, 0x1c, + 0x2e, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x41, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, - 0x02, 0x28, 0x3a, 0x0a, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x1a, 0x1a, - 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, - 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x97, 0x01, 0x0a, 0x10, 0x44, - 0x65, 0x6c, 0x65, 0x74, 0x65, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x12, - 0x28, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, - 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, - 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, - 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, - 0x79, 0x22, 0x41, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, - 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, - 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1c, 0x2a, 0x1a, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, - 0x2f, 0x76, 0x31, 0x2f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2f, - 0x7b, 0x69, 0x64, 0x7d, 0x42, 0x2b, 0x5a, 0x29, 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x63, - 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x61, 0x64, - 0x6d, 0x69, 0x6e, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x76, - 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x02, 0x1c, 0x12, 0x1a, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x61, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x9a, + 0x01, 0x0a, 0x10, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, + 0x65, 0x6e, 0x74, 0x12, 0x28, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, + 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x41, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1b, 0x2e, + 0x66, 0x69, 0x6c, 0x65, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, + 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3f, 0xba, 0x47, 0x1c, 0x5a, + 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, + 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, + 0x1a, 0x3a, 0x01, 0x2a, 0x22, 0x15, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x12, 0xa8, 0x01, 0x0a, 0x10, + 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, + 0x12, 0x28, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, + 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, + 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1b, 0x2e, 0x66, 0x69, 0x6c, + 0x65, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x74, 0x74, + 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x4d, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, + 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, + 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x28, 0x3a, 0x0a, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x1a, 0x1a, 0x2f, 0x61, 0x64, 0x6d, + 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, + 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x97, 0x01, 0x0a, 0x10, 0x44, 0x65, 0x6c, 0x65, 0x74, + 0x65, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x28, 0x2e, 0x66, 0x69, + 0x6c, 0x65, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, + 0x6c, 0x65, 0x74, 0x65, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x41, 0xba, + 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, + 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, + 0xe4, 0x93, 0x02, 0x1c, 0x2a, 0x1a, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, + 0x42, 0xbc, 0x01, 0x0a, 0x14, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x73, + 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x42, 0x10, 0x49, 0x41, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x30, 0x6b, + 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x63, 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x70, + 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, + 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x76, 0x31, 0xa2, + 0x02, 0x03, 0x41, 0x53, 0x58, 0xaa, 0x02, 0x10, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x53, 0x65, + 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x10, 0x41, 0x64, 0x6d, 0x69, 0x6e, + 0x5c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1c, 0x41, 0x64, + 0x6d, 0x69, 0x6e, 0x5c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x56, 0x31, 0x5c, 0x47, + 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x12, 0x41, 0x64, 0x6d, + 0x69, 0x6e, 0x3a, 0x3a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x3a, 0x3a, 0x56, 0x31, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var file_admin_service_v1_i_attachment_proto_goTypes = []interface{}{ - (*pagination.PagingRequest)(nil), // 0: pagination.PagingRequest - (*v1.GetAttachmentRequest)(nil), // 1: file.service.v1.GetAttachmentRequest - (*v1.CreateAttachmentRequest)(nil), // 2: file.service.v1.CreateAttachmentRequest - (*v1.UpdateAttachmentRequest)(nil), // 3: file.service.v1.UpdateAttachmentRequest - (*v1.DeleteAttachmentRequest)(nil), // 4: file.service.v1.DeleteAttachmentRequest - (*v1.ListAttachmentResponse)(nil), // 5: file.service.v1.ListAttachmentResponse - (*v1.Attachment)(nil), // 6: file.service.v1.Attachment - (*emptypb.Empty)(nil), // 7: google.protobuf.Empty + (*v1.PagingRequest)(nil), // 0: pagination.PagingRequest + (*v11.GetAttachmentRequest)(nil), // 1: file.service.v1.GetAttachmentRequest + (*v11.CreateAttachmentRequest)(nil), // 2: file.service.v1.CreateAttachmentRequest + (*v11.UpdateAttachmentRequest)(nil), // 3: file.service.v1.UpdateAttachmentRequest + (*v11.DeleteAttachmentRequest)(nil), // 4: file.service.v1.DeleteAttachmentRequest + (*v11.ListAttachmentResponse)(nil), // 5: file.service.v1.ListAttachmentResponse + (*v11.Attachment)(nil), // 6: file.service.v1.Attachment + (*emptypb.Empty)(nil), // 7: google.protobuf.Empty } var file_admin_service_v1_i_attachment_proto_depIdxs = []int32{ 0, // 0: admin.service.v1.AttachmentService.ListAttachment:input_type -> pagination.PagingRequest diff --git a/blog-backend/gen/api/go/admin/service/v1/i_attachment.pb.validate.go b/blog-backend/gen/api/go/admin/service/v1/i_attachment.pb.validate.go index 3fc2a10e..1e111381 100644 --- a/blog-backend/gen/api/go/admin/service/v1/i_attachment.pb.validate.go +++ b/blog-backend/gen/api/go/admin/service/v1/i_attachment.pb.validate.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-validate. DO NOT EDIT. // source: admin/service/v1/i_attachment.proto -package v1 +package servicev1 import ( "bytes" diff --git a/blog-backend/gen/api/go/admin/service/v1/i_attachment_grpc.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_attachment_grpc.pb.go index 3ef7ee76..ae7db069 100644 --- a/blog-backend/gen/api/go/admin/service/v1/i_attachment_grpc.pb.go +++ b/blog-backend/gen/api/go/admin/service/v1/i_attachment_grpc.pb.go @@ -4,16 +4,16 @@ // - protoc (unknown) // source: admin/service/v1/i_attachment.proto -package v1 +package servicev1 import ( context "context" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" - v1 "kratos-cms/gen/api/go/file/service/v1" + v11 "kratos-cms/gen/api/go/file/service/v1" ) // This is a compile-time assertion to ensure that this generated file @@ -34,15 +34,15 @@ const ( // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type AttachmentServiceClient interface { // 获取附件列表 - ListAttachment(ctx context.Context, in *pagination.PagingRequest, opts ...grpc.CallOption) (*v1.ListAttachmentResponse, error) + ListAttachment(ctx context.Context, in *v1.PagingRequest, opts ...grpc.CallOption) (*v11.ListAttachmentResponse, error) // 获取附件数据 - GetAttachment(ctx context.Context, in *v1.GetAttachmentRequest, opts ...grpc.CallOption) (*v1.Attachment, error) + GetAttachment(ctx context.Context, in *v11.GetAttachmentRequest, opts ...grpc.CallOption) (*v11.Attachment, error) // 创建附件 - CreateAttachment(ctx context.Context, in *v1.CreateAttachmentRequest, opts ...grpc.CallOption) (*v1.Attachment, error) + CreateAttachment(ctx context.Context, in *v11.CreateAttachmentRequest, opts ...grpc.CallOption) (*v11.Attachment, error) // 更新附件 - UpdateAttachment(ctx context.Context, in *v1.UpdateAttachmentRequest, opts ...grpc.CallOption) (*v1.Attachment, error) + UpdateAttachment(ctx context.Context, in *v11.UpdateAttachmentRequest, opts ...grpc.CallOption) (*v11.Attachment, error) // 删除附件 - DeleteAttachment(ctx context.Context, in *v1.DeleteAttachmentRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) + DeleteAttachment(ctx context.Context, in *v11.DeleteAttachmentRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) } type attachmentServiceClient struct { @@ -53,8 +53,8 @@ func NewAttachmentServiceClient(cc grpc.ClientConnInterface) AttachmentServiceCl return &attachmentServiceClient{cc} } -func (c *attachmentServiceClient) ListAttachment(ctx context.Context, in *pagination.PagingRequest, opts ...grpc.CallOption) (*v1.ListAttachmentResponse, error) { - out := new(v1.ListAttachmentResponse) +func (c *attachmentServiceClient) ListAttachment(ctx context.Context, in *v1.PagingRequest, opts ...grpc.CallOption) (*v11.ListAttachmentResponse, error) { + out := new(v11.ListAttachmentResponse) err := c.cc.Invoke(ctx, AttachmentService_ListAttachment_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -62,8 +62,8 @@ func (c *attachmentServiceClient) ListAttachment(ctx context.Context, in *pagina return out, nil } -func (c *attachmentServiceClient) GetAttachment(ctx context.Context, in *v1.GetAttachmentRequest, opts ...grpc.CallOption) (*v1.Attachment, error) { - out := new(v1.Attachment) +func (c *attachmentServiceClient) GetAttachment(ctx context.Context, in *v11.GetAttachmentRequest, opts ...grpc.CallOption) (*v11.Attachment, error) { + out := new(v11.Attachment) err := c.cc.Invoke(ctx, AttachmentService_GetAttachment_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -71,8 +71,8 @@ func (c *attachmentServiceClient) GetAttachment(ctx context.Context, in *v1.GetA return out, nil } -func (c *attachmentServiceClient) CreateAttachment(ctx context.Context, in *v1.CreateAttachmentRequest, opts ...grpc.CallOption) (*v1.Attachment, error) { - out := new(v1.Attachment) +func (c *attachmentServiceClient) CreateAttachment(ctx context.Context, in *v11.CreateAttachmentRequest, opts ...grpc.CallOption) (*v11.Attachment, error) { + out := new(v11.Attachment) err := c.cc.Invoke(ctx, AttachmentService_CreateAttachment_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -80,8 +80,8 @@ func (c *attachmentServiceClient) CreateAttachment(ctx context.Context, in *v1.C return out, nil } -func (c *attachmentServiceClient) UpdateAttachment(ctx context.Context, in *v1.UpdateAttachmentRequest, opts ...grpc.CallOption) (*v1.Attachment, error) { - out := new(v1.Attachment) +func (c *attachmentServiceClient) UpdateAttachment(ctx context.Context, in *v11.UpdateAttachmentRequest, opts ...grpc.CallOption) (*v11.Attachment, error) { + out := new(v11.Attachment) err := c.cc.Invoke(ctx, AttachmentService_UpdateAttachment_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -89,7 +89,7 @@ func (c *attachmentServiceClient) UpdateAttachment(ctx context.Context, in *v1.U return out, nil } -func (c *attachmentServiceClient) DeleteAttachment(ctx context.Context, in *v1.DeleteAttachmentRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { +func (c *attachmentServiceClient) DeleteAttachment(ctx context.Context, in *v11.DeleteAttachmentRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { out := new(emptypb.Empty) err := c.cc.Invoke(ctx, AttachmentService_DeleteAttachment_FullMethodName, in, out, opts...) if err != nil { @@ -103,15 +103,15 @@ func (c *attachmentServiceClient) DeleteAttachment(ctx context.Context, in *v1.D // for forward compatibility type AttachmentServiceServer interface { // 获取附件列表 - ListAttachment(context.Context, *pagination.PagingRequest) (*v1.ListAttachmentResponse, error) + ListAttachment(context.Context, *v1.PagingRequest) (*v11.ListAttachmentResponse, error) // 获取附件数据 - GetAttachment(context.Context, *v1.GetAttachmentRequest) (*v1.Attachment, error) + GetAttachment(context.Context, *v11.GetAttachmentRequest) (*v11.Attachment, error) // 创建附件 - CreateAttachment(context.Context, *v1.CreateAttachmentRequest) (*v1.Attachment, error) + CreateAttachment(context.Context, *v11.CreateAttachmentRequest) (*v11.Attachment, error) // 更新附件 - UpdateAttachment(context.Context, *v1.UpdateAttachmentRequest) (*v1.Attachment, error) + UpdateAttachment(context.Context, *v11.UpdateAttachmentRequest) (*v11.Attachment, error) // 删除附件 - DeleteAttachment(context.Context, *v1.DeleteAttachmentRequest) (*emptypb.Empty, error) + DeleteAttachment(context.Context, *v11.DeleteAttachmentRequest) (*emptypb.Empty, error) mustEmbedUnimplementedAttachmentServiceServer() } @@ -119,19 +119,19 @@ type AttachmentServiceServer interface { type UnimplementedAttachmentServiceServer struct { } -func (UnimplementedAttachmentServiceServer) ListAttachment(context.Context, *pagination.PagingRequest) (*v1.ListAttachmentResponse, error) { +func (UnimplementedAttachmentServiceServer) ListAttachment(context.Context, *v1.PagingRequest) (*v11.ListAttachmentResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListAttachment not implemented") } -func (UnimplementedAttachmentServiceServer) GetAttachment(context.Context, *v1.GetAttachmentRequest) (*v1.Attachment, error) { +func (UnimplementedAttachmentServiceServer) GetAttachment(context.Context, *v11.GetAttachmentRequest) (*v11.Attachment, error) { return nil, status.Errorf(codes.Unimplemented, "method GetAttachment not implemented") } -func (UnimplementedAttachmentServiceServer) CreateAttachment(context.Context, *v1.CreateAttachmentRequest) (*v1.Attachment, error) { +func (UnimplementedAttachmentServiceServer) CreateAttachment(context.Context, *v11.CreateAttachmentRequest) (*v11.Attachment, error) { return nil, status.Errorf(codes.Unimplemented, "method CreateAttachment not implemented") } -func (UnimplementedAttachmentServiceServer) UpdateAttachment(context.Context, *v1.UpdateAttachmentRequest) (*v1.Attachment, error) { +func (UnimplementedAttachmentServiceServer) UpdateAttachment(context.Context, *v11.UpdateAttachmentRequest) (*v11.Attachment, error) { return nil, status.Errorf(codes.Unimplemented, "method UpdateAttachment not implemented") } -func (UnimplementedAttachmentServiceServer) DeleteAttachment(context.Context, *v1.DeleteAttachmentRequest) (*emptypb.Empty, error) { +func (UnimplementedAttachmentServiceServer) DeleteAttachment(context.Context, *v11.DeleteAttachmentRequest) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method DeleteAttachment not implemented") } func (UnimplementedAttachmentServiceServer) mustEmbedUnimplementedAttachmentServiceServer() {} @@ -148,7 +148,7 @@ func RegisterAttachmentServiceServer(s grpc.ServiceRegistrar, srv AttachmentServ } func _AttachmentService_ListAttachment_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(pagination.PagingRequest) + in := new(v1.PagingRequest) if err := dec(in); err != nil { return nil, err } @@ -160,13 +160,13 @@ func _AttachmentService_ListAttachment_Handler(srv interface{}, ctx context.Cont FullMethod: AttachmentService_ListAttachment_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(AttachmentServiceServer).ListAttachment(ctx, req.(*pagination.PagingRequest)) + return srv.(AttachmentServiceServer).ListAttachment(ctx, req.(*v1.PagingRequest)) } return interceptor(ctx, in, info, handler) } func _AttachmentService_GetAttachment_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.GetAttachmentRequest) + in := new(v11.GetAttachmentRequest) if err := dec(in); err != nil { return nil, err } @@ -178,13 +178,13 @@ func _AttachmentService_GetAttachment_Handler(srv interface{}, ctx context.Conte FullMethod: AttachmentService_GetAttachment_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(AttachmentServiceServer).GetAttachment(ctx, req.(*v1.GetAttachmentRequest)) + return srv.(AttachmentServiceServer).GetAttachment(ctx, req.(*v11.GetAttachmentRequest)) } return interceptor(ctx, in, info, handler) } func _AttachmentService_CreateAttachment_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.CreateAttachmentRequest) + in := new(v11.CreateAttachmentRequest) if err := dec(in); err != nil { return nil, err } @@ -196,13 +196,13 @@ func _AttachmentService_CreateAttachment_Handler(srv interface{}, ctx context.Co FullMethod: AttachmentService_CreateAttachment_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(AttachmentServiceServer).CreateAttachment(ctx, req.(*v1.CreateAttachmentRequest)) + return srv.(AttachmentServiceServer).CreateAttachment(ctx, req.(*v11.CreateAttachmentRequest)) } return interceptor(ctx, in, info, handler) } func _AttachmentService_UpdateAttachment_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.UpdateAttachmentRequest) + in := new(v11.UpdateAttachmentRequest) if err := dec(in); err != nil { return nil, err } @@ -214,13 +214,13 @@ func _AttachmentService_UpdateAttachment_Handler(srv interface{}, ctx context.Co FullMethod: AttachmentService_UpdateAttachment_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(AttachmentServiceServer).UpdateAttachment(ctx, req.(*v1.UpdateAttachmentRequest)) + return srv.(AttachmentServiceServer).UpdateAttachment(ctx, req.(*v11.UpdateAttachmentRequest)) } return interceptor(ctx, in, info, handler) } func _AttachmentService_DeleteAttachment_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.DeleteAttachmentRequest) + in := new(v11.DeleteAttachmentRequest) if err := dec(in); err != nil { return nil, err } @@ -232,7 +232,7 @@ func _AttachmentService_DeleteAttachment_Handler(srv interface{}, ctx context.Co FullMethod: AttachmentService_DeleteAttachment_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(AttachmentServiceServer).DeleteAttachment(ctx, req.(*v1.DeleteAttachmentRequest)) + return srv.(AttachmentServiceServer).DeleteAttachment(ctx, req.(*v11.DeleteAttachmentRequest)) } return interceptor(ctx, in, info, handler) } diff --git a/blog-backend/gen/api/go/admin/service/v1/i_attachment_http.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_attachment_http.pb.go index a8577a22..2c28991f 100644 --- a/blog-backend/gen/api/go/admin/service/v1/i_attachment_http.pb.go +++ b/blog-backend/gen/api/go/admin/service/v1/i_attachment_http.pb.go @@ -4,15 +4,15 @@ // - protoc (unknown) // source: admin/service/v1/i_attachment.proto -package v1 +package servicev1 import ( context "context" http "github.com/go-kratos/kratos/v2/transport/http" binding "github.com/go-kratos/kratos/v2/transport/http/binding" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" - v1 "kratos-cms/gen/api/go/file/service/v1" + v11 "kratos-cms/gen/api/go/file/service/v1" ) // This is a compile-time assertion to ensure that this generated file @@ -30,15 +30,15 @@ const OperationAttachmentServiceUpdateAttachment = "/admin.service.v1.Attachment type AttachmentServiceHTTPServer interface { // CreateAttachment 创建附件 - CreateAttachment(context.Context, *v1.CreateAttachmentRequest) (*v1.Attachment, error) + CreateAttachment(context.Context, *v11.CreateAttachmentRequest) (*v11.Attachment, error) // DeleteAttachment 删除附件 - DeleteAttachment(context.Context, *v1.DeleteAttachmentRequest) (*emptypb.Empty, error) + DeleteAttachment(context.Context, *v11.DeleteAttachmentRequest) (*emptypb.Empty, error) // GetAttachment 获取附件数据 - GetAttachment(context.Context, *v1.GetAttachmentRequest) (*v1.Attachment, error) + GetAttachment(context.Context, *v11.GetAttachmentRequest) (*v11.Attachment, error) // ListAttachment 获取附件列表 - ListAttachment(context.Context, *pagination.PagingRequest) (*v1.ListAttachmentResponse, error) + ListAttachment(context.Context, *v1.PagingRequest) (*v11.ListAttachmentResponse, error) // UpdateAttachment 更新附件 - UpdateAttachment(context.Context, *v1.UpdateAttachmentRequest) (*v1.Attachment, error) + UpdateAttachment(context.Context, *v11.UpdateAttachmentRequest) (*v11.Attachment, error) } func RegisterAttachmentServiceHTTPServer(s *http.Server, srv AttachmentServiceHTTPServer) { @@ -52,26 +52,26 @@ func RegisterAttachmentServiceHTTPServer(s *http.Server, srv AttachmentServiceHT func _AttachmentService_ListAttachment0_HTTP_Handler(srv AttachmentServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in pagination.PagingRequest + var in v1.PagingRequest if err := ctx.BindQuery(&in); err != nil { return err } http.SetOperation(ctx, OperationAttachmentServiceListAttachment) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.ListAttachment(ctx, req.(*pagination.PagingRequest)) + return srv.ListAttachment(ctx, req.(*v1.PagingRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.ListAttachmentResponse) + reply := out.(*v11.ListAttachmentResponse) return ctx.Result(200, reply) } } func _AttachmentService_GetAttachment0_HTTP_Handler(srv AttachmentServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.GetAttachmentRequest + var in v11.GetAttachmentRequest if err := ctx.BindQuery(&in); err != nil { return err } @@ -80,20 +80,20 @@ func _AttachmentService_GetAttachment0_HTTP_Handler(srv AttachmentServiceHTTPSer } http.SetOperation(ctx, OperationAttachmentServiceGetAttachment) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.GetAttachment(ctx, req.(*v1.GetAttachmentRequest)) + return srv.GetAttachment(ctx, req.(*v11.GetAttachmentRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.Attachment) + reply := out.(*v11.Attachment) return ctx.Result(200, reply) } } func _AttachmentService_CreateAttachment0_HTTP_Handler(srv AttachmentServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.CreateAttachmentRequest + var in v11.CreateAttachmentRequest if err := ctx.Bind(&in); err != nil { return err } @@ -102,20 +102,20 @@ func _AttachmentService_CreateAttachment0_HTTP_Handler(srv AttachmentServiceHTTP } http.SetOperation(ctx, OperationAttachmentServiceCreateAttachment) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.CreateAttachment(ctx, req.(*v1.CreateAttachmentRequest)) + return srv.CreateAttachment(ctx, req.(*v11.CreateAttachmentRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.Attachment) + reply := out.(*v11.Attachment) return ctx.Result(200, reply) } } func _AttachmentService_UpdateAttachment0_HTTP_Handler(srv AttachmentServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.UpdateAttachmentRequest + var in v11.UpdateAttachmentRequest if err := ctx.Bind(&in.Attachment); err != nil { return err } @@ -127,20 +127,20 @@ func _AttachmentService_UpdateAttachment0_HTTP_Handler(srv AttachmentServiceHTTP } http.SetOperation(ctx, OperationAttachmentServiceUpdateAttachment) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.UpdateAttachment(ctx, req.(*v1.UpdateAttachmentRequest)) + return srv.UpdateAttachment(ctx, req.(*v11.UpdateAttachmentRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.Attachment) + reply := out.(*v11.Attachment) return ctx.Result(200, reply) } } func _AttachmentService_DeleteAttachment0_HTTP_Handler(srv AttachmentServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.DeleteAttachmentRequest + var in v11.DeleteAttachmentRequest if err := ctx.BindQuery(&in); err != nil { return err } @@ -149,7 +149,7 @@ func _AttachmentService_DeleteAttachment0_HTTP_Handler(srv AttachmentServiceHTTP } http.SetOperation(ctx, OperationAttachmentServiceDeleteAttachment) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.DeleteAttachment(ctx, req.(*v1.DeleteAttachmentRequest)) + return srv.DeleteAttachment(ctx, req.(*v11.DeleteAttachmentRequest)) }) out, err := h(ctx, &in) if err != nil { @@ -161,11 +161,11 @@ func _AttachmentService_DeleteAttachment0_HTTP_Handler(srv AttachmentServiceHTTP } type AttachmentServiceHTTPClient interface { - CreateAttachment(ctx context.Context, req *v1.CreateAttachmentRequest, opts ...http.CallOption) (rsp *v1.Attachment, err error) - DeleteAttachment(ctx context.Context, req *v1.DeleteAttachmentRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error) - GetAttachment(ctx context.Context, req *v1.GetAttachmentRequest, opts ...http.CallOption) (rsp *v1.Attachment, err error) - ListAttachment(ctx context.Context, req *pagination.PagingRequest, opts ...http.CallOption) (rsp *v1.ListAttachmentResponse, err error) - UpdateAttachment(ctx context.Context, req *v1.UpdateAttachmentRequest, opts ...http.CallOption) (rsp *v1.Attachment, err error) + CreateAttachment(ctx context.Context, req *v11.CreateAttachmentRequest, opts ...http.CallOption) (rsp *v11.Attachment, err error) + DeleteAttachment(ctx context.Context, req *v11.DeleteAttachmentRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error) + GetAttachment(ctx context.Context, req *v11.GetAttachmentRequest, opts ...http.CallOption) (rsp *v11.Attachment, err error) + ListAttachment(ctx context.Context, req *v1.PagingRequest, opts ...http.CallOption) (rsp *v11.ListAttachmentResponse, err error) + UpdateAttachment(ctx context.Context, req *v11.UpdateAttachmentRequest, opts ...http.CallOption) (rsp *v11.Attachment, err error) } type AttachmentServiceHTTPClientImpl struct { @@ -176,8 +176,8 @@ func NewAttachmentServiceHTTPClient(client *http.Client) AttachmentServiceHTTPCl return &AttachmentServiceHTTPClientImpl{client} } -func (c *AttachmentServiceHTTPClientImpl) CreateAttachment(ctx context.Context, in *v1.CreateAttachmentRequest, opts ...http.CallOption) (*v1.Attachment, error) { - var out v1.Attachment +func (c *AttachmentServiceHTTPClientImpl) CreateAttachment(ctx context.Context, in *v11.CreateAttachmentRequest, opts ...http.CallOption) (*v11.Attachment, error) { + var out v11.Attachment pattern := "/admin/v1/attachments" path := binding.EncodeURL(pattern, in, false) opts = append(opts, http.Operation(OperationAttachmentServiceCreateAttachment)) @@ -189,7 +189,7 @@ func (c *AttachmentServiceHTTPClientImpl) CreateAttachment(ctx context.Context, return &out, err } -func (c *AttachmentServiceHTTPClientImpl) DeleteAttachment(ctx context.Context, in *v1.DeleteAttachmentRequest, opts ...http.CallOption) (*emptypb.Empty, error) { +func (c *AttachmentServiceHTTPClientImpl) DeleteAttachment(ctx context.Context, in *v11.DeleteAttachmentRequest, opts ...http.CallOption) (*emptypb.Empty, error) { var out emptypb.Empty pattern := "/admin/v1/attachments/{id}" path := binding.EncodeURL(pattern, in, true) @@ -202,8 +202,8 @@ func (c *AttachmentServiceHTTPClientImpl) DeleteAttachment(ctx context.Context, return &out, err } -func (c *AttachmentServiceHTTPClientImpl) GetAttachment(ctx context.Context, in *v1.GetAttachmentRequest, opts ...http.CallOption) (*v1.Attachment, error) { - var out v1.Attachment +func (c *AttachmentServiceHTTPClientImpl) GetAttachment(ctx context.Context, in *v11.GetAttachmentRequest, opts ...http.CallOption) (*v11.Attachment, error) { + var out v11.Attachment pattern := "/admin/v1/attachments/{id}" path := binding.EncodeURL(pattern, in, true) opts = append(opts, http.Operation(OperationAttachmentServiceGetAttachment)) @@ -215,8 +215,8 @@ func (c *AttachmentServiceHTTPClientImpl) GetAttachment(ctx context.Context, in return &out, err } -func (c *AttachmentServiceHTTPClientImpl) ListAttachment(ctx context.Context, in *pagination.PagingRequest, opts ...http.CallOption) (*v1.ListAttachmentResponse, error) { - var out v1.ListAttachmentResponse +func (c *AttachmentServiceHTTPClientImpl) ListAttachment(ctx context.Context, in *v1.PagingRequest, opts ...http.CallOption) (*v11.ListAttachmentResponse, error) { + var out v11.ListAttachmentResponse pattern := "/admin/v1/attachments" path := binding.EncodeURL(pattern, in, true) opts = append(opts, http.Operation(OperationAttachmentServiceListAttachment)) @@ -228,8 +228,8 @@ func (c *AttachmentServiceHTTPClientImpl) ListAttachment(ctx context.Context, in return &out, err } -func (c *AttachmentServiceHTTPClientImpl) UpdateAttachment(ctx context.Context, in *v1.UpdateAttachmentRequest, opts ...http.CallOption) (*v1.Attachment, error) { - var out v1.Attachment +func (c *AttachmentServiceHTTPClientImpl) UpdateAttachment(ctx context.Context, in *v11.UpdateAttachmentRequest, opts ...http.CallOption) (*v11.Attachment, error) { + var out v11.Attachment pattern := "/admin/v1/attachments/{id}" path := binding.EncodeURL(pattern, in, false) opts = append(opts, http.Operation(OperationAttachmentServiceUpdateAttachment)) diff --git a/blog-backend/gen/api/go/admin/service/v1/i_authentication.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_authentication.pb.go index 734e93db..93214b0b 100644 --- a/blog-backend/gen/api/go/admin/service/v1/i_authentication.pb.go +++ b/blog-backend/gen/api/go/admin/service/v1/i_authentication.pb.go @@ -4,7 +4,7 @@ // protoc (unknown) // source: admin/service/v1/i_authentication.proto -package v1 +package servicev1 import ( _ "github.com/google/gnostic/openapiv3" @@ -323,11 +323,20 @@ var file_admin_service_v1_i_authentication_proto_rawDesc = []byte{ 0x76, 0x31, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x22, 0x33, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x0e, 0x12, 0x0c, - 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x6d, 0x65, 0x42, 0x2b, 0x5a, 0x29, - 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x63, 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, - 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x73, 0x65, 0x72, 0x76, - 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x6d, 0x65, 0x42, 0xc0, 0x01, 0x0a, + 0x14, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, + 0x63, 0x65, 0x2e, 0x76, 0x31, 0x42, 0x14, 0x49, 0x41, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, + 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x30, 0x6b, + 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x63, 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x70, + 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, + 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x76, 0x31, 0xa2, + 0x02, 0x03, 0x41, 0x53, 0x58, 0xaa, 0x02, 0x10, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x53, 0x65, + 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x10, 0x41, 0x64, 0x6d, 0x69, 0x6e, + 0x5c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1c, 0x41, 0x64, + 0x6d, 0x69, 0x6e, 0x5c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x56, 0x31, 0x5c, 0x47, + 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x12, 0x41, 0x64, 0x6d, + 0x69, 0x6e, 0x3a, 0x3a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x3a, 0x3a, 0x56, 0x31, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/blog-backend/gen/api/go/admin/service/v1/i_authentication.pb.validate.go b/blog-backend/gen/api/go/admin/service/v1/i_authentication.pb.validate.go index 8aae7513..7f18e144 100644 --- a/blog-backend/gen/api/go/admin/service/v1/i_authentication.pb.validate.go +++ b/blog-backend/gen/api/go/admin/service/v1/i_authentication.pb.validate.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-validate. DO NOT EDIT. // source: admin/service/v1/i_authentication.proto -package v1 +package servicev1 import ( "bytes" diff --git a/blog-backend/gen/api/go/admin/service/v1/i_authentication_grpc.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_authentication_grpc.pb.go index 8e21e4d7..0e300667 100644 --- a/blog-backend/gen/api/go/admin/service/v1/i_authentication_grpc.pb.go +++ b/blog-backend/gen/api/go/admin/service/v1/i_authentication_grpc.pb.go @@ -4,7 +4,7 @@ // - protoc (unknown) // source: admin/service/v1/i_authentication.proto -package v1 +package servicev1 import ( context "context" diff --git a/blog-backend/gen/api/go/admin/service/v1/i_authentication_http.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_authentication_http.pb.go index 5d208f9c..7a568010 100644 --- a/blog-backend/gen/api/go/admin/service/v1/i_authentication_http.pb.go +++ b/blog-backend/gen/api/go/admin/service/v1/i_authentication_http.pb.go @@ -4,7 +4,7 @@ // - protoc (unknown) // source: admin/service/v1/i_authentication.proto -package v1 +package servicev1 import ( context "context" diff --git a/blog-backend/gen/api/go/admin/service/v1/i_category.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_category.pb.go index d579fdfc..23c8ec00 100644 --- a/blog-backend/gen/api/go/admin/service/v1/i_category.pb.go +++ b/blog-backend/gen/api/go/admin/service/v1/i_category.pb.go @@ -4,16 +4,16 @@ // protoc (unknown) // source: admin/service/v1/i_category.proto -package v1 +package servicev1 import ( _ "github.com/google/gnostic/openapiv3" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" - v1 "kratos-cms/gen/api/go/content/service/v1" + v11 "kratos-cms/gen/api/go/content/service/v1" reflect "reflect" ) @@ -36,75 +36,84 @@ var file_admin_service_v1_i_category_proto_rawDesc = []byte{ 0x67, 0x6c, 0x65, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x22, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, - 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x21, 0x63, 0x6f, 0x6e, 0x74, - 0x65, 0x6e, 0x74, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x63, - 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0x98, 0x06, - 0x0a, 0x0f, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, - 0x65, 0x12, 0x90, 0x01, 0x0a, 0x0c, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, - 0x72, 0x79, 0x12, 0x19, 0x2e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, - 0x50, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x28, 0x2e, - 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, - 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x52, - 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x3b, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, - 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, - 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x16, 0x12, 0x14, - 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, - 0x72, 0x69, 0x65, 0x73, 0x12, 0x95, 0x01, 0x0a, 0x0b, 0x47, 0x65, 0x74, 0x43, 0x61, 0x74, 0x65, - 0x67, 0x6f, 0x72, 0x79, 0x12, 0x26, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, - 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x43, 0x61, 0x74, - 0x65, 0x67, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x63, - 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, - 0x31, 0x2e, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x22, 0x40, 0xba, 0x47, 0x1c, 0x5a, - 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, - 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, - 0x1b, 0x12, 0x19, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x61, 0x74, - 0x65, 0x67, 0x6f, 0x72, 0x69, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x99, 0x01, 0x0a, - 0x0e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x12, - 0x29, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, - 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x43, 0x61, 0x74, 0x65, 0x67, - 0x6f, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x63, 0x6f, 0x6e, - 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, - 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x22, 0x3e, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, - 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, - 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x19, 0x3a, - 0x01, 0x2a, 0x22, 0x14, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x61, - 0x74, 0x65, 0x67, 0x6f, 0x72, 0x69, 0x65, 0x73, 0x12, 0xa5, 0x01, 0x0a, 0x0e, 0x55, 0x70, 0x64, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x21, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2f, + 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x61, 0x74, 0x65, 0x67, + 0x6f, 0x72, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0x98, 0x06, 0x0a, 0x0f, 0x43, 0x61, + 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x90, 0x01, + 0x0a, 0x0c, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x12, 0x19, + 0x2e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x50, 0x61, 0x67, 0x69, + 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x28, 0x2e, 0x63, 0x6f, 0x6e, 0x74, + 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, + 0x69, 0x73, 0x74, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, + 0x6e, 0x73, 0x65, 0x22, 0x3b, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, + 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, + 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x16, 0x12, 0x14, 0x2f, 0x61, 0x64, 0x6d, + 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x69, 0x65, 0x73, + 0x12, 0x95, 0x01, 0x0a, 0x0b, 0x47, 0x65, 0x74, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, + 0x12, 0x26, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, + 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, + 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, + 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x61, + 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x22, 0x40, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, + 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, + 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1b, 0x12, 0x19, 0x2f, + 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, + 0x69, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x99, 0x01, 0x0a, 0x0e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x12, 0x29, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, - 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x52, + 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x61, 0x74, 0x65, - 0x67, 0x6f, 0x72, 0x79, 0x22, 0x4a, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, + 0x67, 0x6f, 0x72, 0x79, 0x22, 0x3e, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, - 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x25, 0x3a, 0x08, 0x63, 0x61, 0x74, - 0x65, 0x67, 0x6f, 0x72, 0x79, 0x1a, 0x19, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, - 0x2f, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x69, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, - 0x12, 0x95, 0x01, 0x0a, 0x0e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x61, 0x74, 0x65, 0x67, - 0x6f, 0x72, 0x79, 0x12, 0x29, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, - 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x43, - 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, - 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, - 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x40, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, - 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, - 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1b, 0x2a, 0x19, 0x2f, - 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, - 0x69, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x42, 0x2b, 0x5a, 0x29, 0x6b, 0x72, 0x61, 0x74, - 0x6f, 0x73, 0x2d, 0x63, 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, - 0x6f, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, - 0x76, 0x31, 0x3b, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x19, 0x3a, 0x01, 0x2a, 0x22, 0x14, + 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, + 0x72, 0x69, 0x65, 0x73, 0x12, 0xa5, 0x01, 0x0a, 0x0e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, + 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x12, 0x29, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, + 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, + 0x61, 0x74, 0x65, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, + 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, + 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, + 0x22, 0x4a, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, + 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, + 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x25, 0x3a, 0x08, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, + 0x79, 0x1a, 0x19, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x61, 0x74, + 0x65, 0x67, 0x6f, 0x72, 0x69, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x95, 0x01, 0x0a, + 0x0e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x12, + 0x29, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x61, 0x74, 0x65, 0x67, + 0x6f, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, + 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, + 0x74, 0x79, 0x22, 0x40, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, + 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, + 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1b, 0x2a, 0x19, 0x2f, 0x61, 0x64, 0x6d, 0x69, + 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x69, 0x65, 0x73, 0x2f, + 0x7b, 0x69, 0x64, 0x7d, 0x42, 0xba, 0x01, 0x0a, 0x14, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x64, 0x6d, + 0x69, 0x6e, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x42, 0x0e, 0x49, + 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, + 0x30, 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x63, 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, + 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x73, 0x65, 0x72, + 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x76, + 0x31, 0xa2, 0x02, 0x03, 0x41, 0x53, 0x58, 0xaa, 0x02, 0x10, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x2e, + 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x10, 0x41, 0x64, 0x6d, + 0x69, 0x6e, 0x5c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1c, + 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x5c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x56, 0x31, + 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x12, 0x41, + 0x64, 0x6d, 0x69, 0x6e, 0x3a, 0x3a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x3a, 0x3a, 0x56, + 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var file_admin_service_v1_i_category_proto_goTypes = []interface{}{ - (*pagination.PagingRequest)(nil), // 0: pagination.PagingRequest - (*v1.GetCategoryRequest)(nil), // 1: content.service.v1.GetCategoryRequest - (*v1.CreateCategoryRequest)(nil), // 2: content.service.v1.CreateCategoryRequest - (*v1.UpdateCategoryRequest)(nil), // 3: content.service.v1.UpdateCategoryRequest - (*v1.DeleteCategoryRequest)(nil), // 4: content.service.v1.DeleteCategoryRequest - (*v1.ListCategoryResponse)(nil), // 5: content.service.v1.ListCategoryResponse - (*v1.Category)(nil), // 6: content.service.v1.Category - (*emptypb.Empty)(nil), // 7: google.protobuf.Empty + (*v1.PagingRequest)(nil), // 0: pagination.PagingRequest + (*v11.GetCategoryRequest)(nil), // 1: content.service.v1.GetCategoryRequest + (*v11.CreateCategoryRequest)(nil), // 2: content.service.v1.CreateCategoryRequest + (*v11.UpdateCategoryRequest)(nil), // 3: content.service.v1.UpdateCategoryRequest + (*v11.DeleteCategoryRequest)(nil), // 4: content.service.v1.DeleteCategoryRequest + (*v11.ListCategoryResponse)(nil), // 5: content.service.v1.ListCategoryResponse + (*v11.Category)(nil), // 6: content.service.v1.Category + (*emptypb.Empty)(nil), // 7: google.protobuf.Empty } var file_admin_service_v1_i_category_proto_depIdxs = []int32{ 0, // 0: admin.service.v1.CategoryService.ListCategory:input_type -> pagination.PagingRequest diff --git a/blog-backend/gen/api/go/admin/service/v1/i_category.pb.validate.go b/blog-backend/gen/api/go/admin/service/v1/i_category.pb.validate.go index 12499d0d..7840f4fc 100644 --- a/blog-backend/gen/api/go/admin/service/v1/i_category.pb.validate.go +++ b/blog-backend/gen/api/go/admin/service/v1/i_category.pb.validate.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-validate. DO NOT EDIT. // source: admin/service/v1/i_category.proto -package v1 +package servicev1 import ( "bytes" diff --git a/blog-backend/gen/api/go/admin/service/v1/i_category_grpc.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_category_grpc.pb.go index f0b67ee8..631eecc8 100644 --- a/blog-backend/gen/api/go/admin/service/v1/i_category_grpc.pb.go +++ b/blog-backend/gen/api/go/admin/service/v1/i_category_grpc.pb.go @@ -4,16 +4,16 @@ // - protoc (unknown) // source: admin/service/v1/i_category.proto -package v1 +package servicev1 import ( context "context" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" - v1 "kratos-cms/gen/api/go/content/service/v1" + v11 "kratos-cms/gen/api/go/content/service/v1" ) // This is a compile-time assertion to ensure that this generated file @@ -34,15 +34,15 @@ const ( // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type CategoryServiceClient interface { // 获取类别列表 - ListCategory(ctx context.Context, in *pagination.PagingRequest, opts ...grpc.CallOption) (*v1.ListCategoryResponse, error) + ListCategory(ctx context.Context, in *v1.PagingRequest, opts ...grpc.CallOption) (*v11.ListCategoryResponse, error) // 获取类别数据 - GetCategory(ctx context.Context, in *v1.GetCategoryRequest, opts ...grpc.CallOption) (*v1.Category, error) + GetCategory(ctx context.Context, in *v11.GetCategoryRequest, opts ...grpc.CallOption) (*v11.Category, error) // 创建类别 - CreateCategory(ctx context.Context, in *v1.CreateCategoryRequest, opts ...grpc.CallOption) (*v1.Category, error) + CreateCategory(ctx context.Context, in *v11.CreateCategoryRequest, opts ...grpc.CallOption) (*v11.Category, error) // 更新类别 - UpdateCategory(ctx context.Context, in *v1.UpdateCategoryRequest, opts ...grpc.CallOption) (*v1.Category, error) + UpdateCategory(ctx context.Context, in *v11.UpdateCategoryRequest, opts ...grpc.CallOption) (*v11.Category, error) // 删除类别 - DeleteCategory(ctx context.Context, in *v1.DeleteCategoryRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) + DeleteCategory(ctx context.Context, in *v11.DeleteCategoryRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) } type categoryServiceClient struct { @@ -53,8 +53,8 @@ func NewCategoryServiceClient(cc grpc.ClientConnInterface) CategoryServiceClient return &categoryServiceClient{cc} } -func (c *categoryServiceClient) ListCategory(ctx context.Context, in *pagination.PagingRequest, opts ...grpc.CallOption) (*v1.ListCategoryResponse, error) { - out := new(v1.ListCategoryResponse) +func (c *categoryServiceClient) ListCategory(ctx context.Context, in *v1.PagingRequest, opts ...grpc.CallOption) (*v11.ListCategoryResponse, error) { + out := new(v11.ListCategoryResponse) err := c.cc.Invoke(ctx, CategoryService_ListCategory_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -62,8 +62,8 @@ func (c *categoryServiceClient) ListCategory(ctx context.Context, in *pagination return out, nil } -func (c *categoryServiceClient) GetCategory(ctx context.Context, in *v1.GetCategoryRequest, opts ...grpc.CallOption) (*v1.Category, error) { - out := new(v1.Category) +func (c *categoryServiceClient) GetCategory(ctx context.Context, in *v11.GetCategoryRequest, opts ...grpc.CallOption) (*v11.Category, error) { + out := new(v11.Category) err := c.cc.Invoke(ctx, CategoryService_GetCategory_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -71,8 +71,8 @@ func (c *categoryServiceClient) GetCategory(ctx context.Context, in *v1.GetCateg return out, nil } -func (c *categoryServiceClient) CreateCategory(ctx context.Context, in *v1.CreateCategoryRequest, opts ...grpc.CallOption) (*v1.Category, error) { - out := new(v1.Category) +func (c *categoryServiceClient) CreateCategory(ctx context.Context, in *v11.CreateCategoryRequest, opts ...grpc.CallOption) (*v11.Category, error) { + out := new(v11.Category) err := c.cc.Invoke(ctx, CategoryService_CreateCategory_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -80,8 +80,8 @@ func (c *categoryServiceClient) CreateCategory(ctx context.Context, in *v1.Creat return out, nil } -func (c *categoryServiceClient) UpdateCategory(ctx context.Context, in *v1.UpdateCategoryRequest, opts ...grpc.CallOption) (*v1.Category, error) { - out := new(v1.Category) +func (c *categoryServiceClient) UpdateCategory(ctx context.Context, in *v11.UpdateCategoryRequest, opts ...grpc.CallOption) (*v11.Category, error) { + out := new(v11.Category) err := c.cc.Invoke(ctx, CategoryService_UpdateCategory_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -89,7 +89,7 @@ func (c *categoryServiceClient) UpdateCategory(ctx context.Context, in *v1.Updat return out, nil } -func (c *categoryServiceClient) DeleteCategory(ctx context.Context, in *v1.DeleteCategoryRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { +func (c *categoryServiceClient) DeleteCategory(ctx context.Context, in *v11.DeleteCategoryRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { out := new(emptypb.Empty) err := c.cc.Invoke(ctx, CategoryService_DeleteCategory_FullMethodName, in, out, opts...) if err != nil { @@ -103,15 +103,15 @@ func (c *categoryServiceClient) DeleteCategory(ctx context.Context, in *v1.Delet // for forward compatibility type CategoryServiceServer interface { // 获取类别列表 - ListCategory(context.Context, *pagination.PagingRequest) (*v1.ListCategoryResponse, error) + ListCategory(context.Context, *v1.PagingRequest) (*v11.ListCategoryResponse, error) // 获取类别数据 - GetCategory(context.Context, *v1.GetCategoryRequest) (*v1.Category, error) + GetCategory(context.Context, *v11.GetCategoryRequest) (*v11.Category, error) // 创建类别 - CreateCategory(context.Context, *v1.CreateCategoryRequest) (*v1.Category, error) + CreateCategory(context.Context, *v11.CreateCategoryRequest) (*v11.Category, error) // 更新类别 - UpdateCategory(context.Context, *v1.UpdateCategoryRequest) (*v1.Category, error) + UpdateCategory(context.Context, *v11.UpdateCategoryRequest) (*v11.Category, error) // 删除类别 - DeleteCategory(context.Context, *v1.DeleteCategoryRequest) (*emptypb.Empty, error) + DeleteCategory(context.Context, *v11.DeleteCategoryRequest) (*emptypb.Empty, error) mustEmbedUnimplementedCategoryServiceServer() } @@ -119,19 +119,19 @@ type CategoryServiceServer interface { type UnimplementedCategoryServiceServer struct { } -func (UnimplementedCategoryServiceServer) ListCategory(context.Context, *pagination.PagingRequest) (*v1.ListCategoryResponse, error) { +func (UnimplementedCategoryServiceServer) ListCategory(context.Context, *v1.PagingRequest) (*v11.ListCategoryResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListCategory not implemented") } -func (UnimplementedCategoryServiceServer) GetCategory(context.Context, *v1.GetCategoryRequest) (*v1.Category, error) { +func (UnimplementedCategoryServiceServer) GetCategory(context.Context, *v11.GetCategoryRequest) (*v11.Category, error) { return nil, status.Errorf(codes.Unimplemented, "method GetCategory not implemented") } -func (UnimplementedCategoryServiceServer) CreateCategory(context.Context, *v1.CreateCategoryRequest) (*v1.Category, error) { +func (UnimplementedCategoryServiceServer) CreateCategory(context.Context, *v11.CreateCategoryRequest) (*v11.Category, error) { return nil, status.Errorf(codes.Unimplemented, "method CreateCategory not implemented") } -func (UnimplementedCategoryServiceServer) UpdateCategory(context.Context, *v1.UpdateCategoryRequest) (*v1.Category, error) { +func (UnimplementedCategoryServiceServer) UpdateCategory(context.Context, *v11.UpdateCategoryRequest) (*v11.Category, error) { return nil, status.Errorf(codes.Unimplemented, "method UpdateCategory not implemented") } -func (UnimplementedCategoryServiceServer) DeleteCategory(context.Context, *v1.DeleteCategoryRequest) (*emptypb.Empty, error) { +func (UnimplementedCategoryServiceServer) DeleteCategory(context.Context, *v11.DeleteCategoryRequest) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method DeleteCategory not implemented") } func (UnimplementedCategoryServiceServer) mustEmbedUnimplementedCategoryServiceServer() {} @@ -148,7 +148,7 @@ func RegisterCategoryServiceServer(s grpc.ServiceRegistrar, srv CategoryServiceS } func _CategoryService_ListCategory_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(pagination.PagingRequest) + in := new(v1.PagingRequest) if err := dec(in); err != nil { return nil, err } @@ -160,13 +160,13 @@ func _CategoryService_ListCategory_Handler(srv interface{}, ctx context.Context, FullMethod: CategoryService_ListCategory_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(CategoryServiceServer).ListCategory(ctx, req.(*pagination.PagingRequest)) + return srv.(CategoryServiceServer).ListCategory(ctx, req.(*v1.PagingRequest)) } return interceptor(ctx, in, info, handler) } func _CategoryService_GetCategory_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.GetCategoryRequest) + in := new(v11.GetCategoryRequest) if err := dec(in); err != nil { return nil, err } @@ -178,13 +178,13 @@ func _CategoryService_GetCategory_Handler(srv interface{}, ctx context.Context, FullMethod: CategoryService_GetCategory_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(CategoryServiceServer).GetCategory(ctx, req.(*v1.GetCategoryRequest)) + return srv.(CategoryServiceServer).GetCategory(ctx, req.(*v11.GetCategoryRequest)) } return interceptor(ctx, in, info, handler) } func _CategoryService_CreateCategory_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.CreateCategoryRequest) + in := new(v11.CreateCategoryRequest) if err := dec(in); err != nil { return nil, err } @@ -196,13 +196,13 @@ func _CategoryService_CreateCategory_Handler(srv interface{}, ctx context.Contex FullMethod: CategoryService_CreateCategory_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(CategoryServiceServer).CreateCategory(ctx, req.(*v1.CreateCategoryRequest)) + return srv.(CategoryServiceServer).CreateCategory(ctx, req.(*v11.CreateCategoryRequest)) } return interceptor(ctx, in, info, handler) } func _CategoryService_UpdateCategory_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.UpdateCategoryRequest) + in := new(v11.UpdateCategoryRequest) if err := dec(in); err != nil { return nil, err } @@ -214,13 +214,13 @@ func _CategoryService_UpdateCategory_Handler(srv interface{}, ctx context.Contex FullMethod: CategoryService_UpdateCategory_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(CategoryServiceServer).UpdateCategory(ctx, req.(*v1.UpdateCategoryRequest)) + return srv.(CategoryServiceServer).UpdateCategory(ctx, req.(*v11.UpdateCategoryRequest)) } return interceptor(ctx, in, info, handler) } func _CategoryService_DeleteCategory_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.DeleteCategoryRequest) + in := new(v11.DeleteCategoryRequest) if err := dec(in); err != nil { return nil, err } @@ -232,7 +232,7 @@ func _CategoryService_DeleteCategory_Handler(srv interface{}, ctx context.Contex FullMethod: CategoryService_DeleteCategory_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(CategoryServiceServer).DeleteCategory(ctx, req.(*v1.DeleteCategoryRequest)) + return srv.(CategoryServiceServer).DeleteCategory(ctx, req.(*v11.DeleteCategoryRequest)) } return interceptor(ctx, in, info, handler) } diff --git a/blog-backend/gen/api/go/admin/service/v1/i_category_http.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_category_http.pb.go index 9539fb1a..91d836d8 100644 --- a/blog-backend/gen/api/go/admin/service/v1/i_category_http.pb.go +++ b/blog-backend/gen/api/go/admin/service/v1/i_category_http.pb.go @@ -4,15 +4,15 @@ // - protoc (unknown) // source: admin/service/v1/i_category.proto -package v1 +package servicev1 import ( context "context" http "github.com/go-kratos/kratos/v2/transport/http" binding "github.com/go-kratos/kratos/v2/transport/http/binding" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" - v1 "kratos-cms/gen/api/go/content/service/v1" + v11 "kratos-cms/gen/api/go/content/service/v1" ) // This is a compile-time assertion to ensure that this generated file @@ -30,15 +30,15 @@ const OperationCategoryServiceUpdateCategory = "/admin.service.v1.CategoryServic type CategoryServiceHTTPServer interface { // CreateCategory 创建类别 - CreateCategory(context.Context, *v1.CreateCategoryRequest) (*v1.Category, error) + CreateCategory(context.Context, *v11.CreateCategoryRequest) (*v11.Category, error) // DeleteCategory 删除类别 - DeleteCategory(context.Context, *v1.DeleteCategoryRequest) (*emptypb.Empty, error) + DeleteCategory(context.Context, *v11.DeleteCategoryRequest) (*emptypb.Empty, error) // GetCategory 获取类别数据 - GetCategory(context.Context, *v1.GetCategoryRequest) (*v1.Category, error) + GetCategory(context.Context, *v11.GetCategoryRequest) (*v11.Category, error) // ListCategory 获取类别列表 - ListCategory(context.Context, *pagination.PagingRequest) (*v1.ListCategoryResponse, error) + ListCategory(context.Context, *v1.PagingRequest) (*v11.ListCategoryResponse, error) // UpdateCategory 更新类别 - UpdateCategory(context.Context, *v1.UpdateCategoryRequest) (*v1.Category, error) + UpdateCategory(context.Context, *v11.UpdateCategoryRequest) (*v11.Category, error) } func RegisterCategoryServiceHTTPServer(s *http.Server, srv CategoryServiceHTTPServer) { @@ -52,26 +52,26 @@ func RegisterCategoryServiceHTTPServer(s *http.Server, srv CategoryServiceHTTPSe func _CategoryService_ListCategory0_HTTP_Handler(srv CategoryServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in pagination.PagingRequest + var in v1.PagingRequest if err := ctx.BindQuery(&in); err != nil { return err } http.SetOperation(ctx, OperationCategoryServiceListCategory) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.ListCategory(ctx, req.(*pagination.PagingRequest)) + return srv.ListCategory(ctx, req.(*v1.PagingRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.ListCategoryResponse) + reply := out.(*v11.ListCategoryResponse) return ctx.Result(200, reply) } } func _CategoryService_GetCategory0_HTTP_Handler(srv CategoryServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.GetCategoryRequest + var in v11.GetCategoryRequest if err := ctx.BindQuery(&in); err != nil { return err } @@ -80,20 +80,20 @@ func _CategoryService_GetCategory0_HTTP_Handler(srv CategoryServiceHTTPServer) f } http.SetOperation(ctx, OperationCategoryServiceGetCategory) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.GetCategory(ctx, req.(*v1.GetCategoryRequest)) + return srv.GetCategory(ctx, req.(*v11.GetCategoryRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.Category) + reply := out.(*v11.Category) return ctx.Result(200, reply) } } func _CategoryService_CreateCategory0_HTTP_Handler(srv CategoryServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.CreateCategoryRequest + var in v11.CreateCategoryRequest if err := ctx.Bind(&in); err != nil { return err } @@ -102,20 +102,20 @@ func _CategoryService_CreateCategory0_HTTP_Handler(srv CategoryServiceHTTPServer } http.SetOperation(ctx, OperationCategoryServiceCreateCategory) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.CreateCategory(ctx, req.(*v1.CreateCategoryRequest)) + return srv.CreateCategory(ctx, req.(*v11.CreateCategoryRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.Category) + reply := out.(*v11.Category) return ctx.Result(200, reply) } } func _CategoryService_UpdateCategory0_HTTP_Handler(srv CategoryServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.UpdateCategoryRequest + var in v11.UpdateCategoryRequest if err := ctx.Bind(&in.Category); err != nil { return err } @@ -127,20 +127,20 @@ func _CategoryService_UpdateCategory0_HTTP_Handler(srv CategoryServiceHTTPServer } http.SetOperation(ctx, OperationCategoryServiceUpdateCategory) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.UpdateCategory(ctx, req.(*v1.UpdateCategoryRequest)) + return srv.UpdateCategory(ctx, req.(*v11.UpdateCategoryRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.Category) + reply := out.(*v11.Category) return ctx.Result(200, reply) } } func _CategoryService_DeleteCategory0_HTTP_Handler(srv CategoryServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.DeleteCategoryRequest + var in v11.DeleteCategoryRequest if err := ctx.BindQuery(&in); err != nil { return err } @@ -149,7 +149,7 @@ func _CategoryService_DeleteCategory0_HTTP_Handler(srv CategoryServiceHTTPServer } http.SetOperation(ctx, OperationCategoryServiceDeleteCategory) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.DeleteCategory(ctx, req.(*v1.DeleteCategoryRequest)) + return srv.DeleteCategory(ctx, req.(*v11.DeleteCategoryRequest)) }) out, err := h(ctx, &in) if err != nil { @@ -161,11 +161,11 @@ func _CategoryService_DeleteCategory0_HTTP_Handler(srv CategoryServiceHTTPServer } type CategoryServiceHTTPClient interface { - CreateCategory(ctx context.Context, req *v1.CreateCategoryRequest, opts ...http.CallOption) (rsp *v1.Category, err error) - DeleteCategory(ctx context.Context, req *v1.DeleteCategoryRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error) - GetCategory(ctx context.Context, req *v1.GetCategoryRequest, opts ...http.CallOption) (rsp *v1.Category, err error) - ListCategory(ctx context.Context, req *pagination.PagingRequest, opts ...http.CallOption) (rsp *v1.ListCategoryResponse, err error) - UpdateCategory(ctx context.Context, req *v1.UpdateCategoryRequest, opts ...http.CallOption) (rsp *v1.Category, err error) + CreateCategory(ctx context.Context, req *v11.CreateCategoryRequest, opts ...http.CallOption) (rsp *v11.Category, err error) + DeleteCategory(ctx context.Context, req *v11.DeleteCategoryRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error) + GetCategory(ctx context.Context, req *v11.GetCategoryRequest, opts ...http.CallOption) (rsp *v11.Category, err error) + ListCategory(ctx context.Context, req *v1.PagingRequest, opts ...http.CallOption) (rsp *v11.ListCategoryResponse, err error) + UpdateCategory(ctx context.Context, req *v11.UpdateCategoryRequest, opts ...http.CallOption) (rsp *v11.Category, err error) } type CategoryServiceHTTPClientImpl struct { @@ -176,8 +176,8 @@ func NewCategoryServiceHTTPClient(client *http.Client) CategoryServiceHTTPClient return &CategoryServiceHTTPClientImpl{client} } -func (c *CategoryServiceHTTPClientImpl) CreateCategory(ctx context.Context, in *v1.CreateCategoryRequest, opts ...http.CallOption) (*v1.Category, error) { - var out v1.Category +func (c *CategoryServiceHTTPClientImpl) CreateCategory(ctx context.Context, in *v11.CreateCategoryRequest, opts ...http.CallOption) (*v11.Category, error) { + var out v11.Category pattern := "/admin/v1/categories" path := binding.EncodeURL(pattern, in, false) opts = append(opts, http.Operation(OperationCategoryServiceCreateCategory)) @@ -189,7 +189,7 @@ func (c *CategoryServiceHTTPClientImpl) CreateCategory(ctx context.Context, in * return &out, err } -func (c *CategoryServiceHTTPClientImpl) DeleteCategory(ctx context.Context, in *v1.DeleteCategoryRequest, opts ...http.CallOption) (*emptypb.Empty, error) { +func (c *CategoryServiceHTTPClientImpl) DeleteCategory(ctx context.Context, in *v11.DeleteCategoryRequest, opts ...http.CallOption) (*emptypb.Empty, error) { var out emptypb.Empty pattern := "/admin/v1/categories/{id}" path := binding.EncodeURL(pattern, in, true) @@ -202,8 +202,8 @@ func (c *CategoryServiceHTTPClientImpl) DeleteCategory(ctx context.Context, in * return &out, err } -func (c *CategoryServiceHTTPClientImpl) GetCategory(ctx context.Context, in *v1.GetCategoryRequest, opts ...http.CallOption) (*v1.Category, error) { - var out v1.Category +func (c *CategoryServiceHTTPClientImpl) GetCategory(ctx context.Context, in *v11.GetCategoryRequest, opts ...http.CallOption) (*v11.Category, error) { + var out v11.Category pattern := "/admin/v1/categories/{id}" path := binding.EncodeURL(pattern, in, true) opts = append(opts, http.Operation(OperationCategoryServiceGetCategory)) @@ -215,8 +215,8 @@ func (c *CategoryServiceHTTPClientImpl) GetCategory(ctx context.Context, in *v1. return &out, err } -func (c *CategoryServiceHTTPClientImpl) ListCategory(ctx context.Context, in *pagination.PagingRequest, opts ...http.CallOption) (*v1.ListCategoryResponse, error) { - var out v1.ListCategoryResponse +func (c *CategoryServiceHTTPClientImpl) ListCategory(ctx context.Context, in *v1.PagingRequest, opts ...http.CallOption) (*v11.ListCategoryResponse, error) { + var out v11.ListCategoryResponse pattern := "/admin/v1/categories" path := binding.EncodeURL(pattern, in, true) opts = append(opts, http.Operation(OperationCategoryServiceListCategory)) @@ -228,8 +228,8 @@ func (c *CategoryServiceHTTPClientImpl) ListCategory(ctx context.Context, in *pa return &out, err } -func (c *CategoryServiceHTTPClientImpl) UpdateCategory(ctx context.Context, in *v1.UpdateCategoryRequest, opts ...http.CallOption) (*v1.Category, error) { - var out v1.Category +func (c *CategoryServiceHTTPClientImpl) UpdateCategory(ctx context.Context, in *v11.UpdateCategoryRequest, opts ...http.CallOption) (*v11.Category, error) { + var out v11.Category pattern := "/admin/v1/categories/{id}" path := binding.EncodeURL(pattern, in, false) opts = append(opts, http.Operation(OperationCategoryServiceUpdateCategory)) diff --git a/blog-backend/gen/api/go/admin/service/v1/i_comment.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_comment.pb.go index 9174743d..219f4f14 100644 --- a/blog-backend/gen/api/go/admin/service/v1/i_comment.pb.go +++ b/blog-backend/gen/api/go/admin/service/v1/i_comment.pb.go @@ -4,16 +4,16 @@ // protoc (unknown) // source: admin/service/v1/i_comment.proto -package v1 +package servicev1 import ( _ "github.com/google/gnostic/openapiv3" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" emptypb "google.golang.org/protobuf/types/known/emptypb" - v1 "kratos-cms/gen/api/go/comment/service/v1" - pagination "kratos-cms/gen/api/go/common/pagination" + v11 "kratos-cms/gen/api/go/comment/service/v1" reflect "reflect" ) @@ -36,73 +36,81 @@ var file_admin_service_v1_i_comment_proto_rawDesc = []byte{ 0x6c, 0x65, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x22, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x61, - 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, - 0x6e, 0x74, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x6f, - 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0xff, 0x05, 0x0a, 0x0e, - 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x8c, - 0x01, 0x0a, 0x0b, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x19, - 0x2e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x50, 0x61, 0x67, 0x69, - 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, - 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, - 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, - 0x73, 0x65, 0x22, 0x39, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, - 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, - 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x14, 0x12, 0x12, 0x2f, 0x61, 0x64, 0x6d, 0x69, - 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x90, 0x01, - 0x0a, 0x0a, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x25, 0x2e, 0x63, - 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, - 0x31, 0x2e, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x1a, 0x1b, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, - 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, - 0x22, 0x3e, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, - 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, - 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x19, 0x12, 0x17, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, - 0x76, 0x31, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, - 0x12, 0x94, 0x01, 0x0a, 0x0d, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x6d, 0x6d, 0x65, - 0x6e, 0x74, 0x12, 0x28, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, - 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x43, 0x6f, - 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1b, 0x2e, 0x63, - 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, - 0x31, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3c, 0xba, 0x47, 0x1c, 0x5a, 0x1a, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x2f, 0x73, + 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, + 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0xff, 0x05, 0x0a, 0x0e, 0x43, 0x6f, 0x6d, 0x6d, + 0x65, 0x6e, 0x74, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x8c, 0x01, 0x0a, 0x0b, 0x4c, + 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x19, 0x2e, 0x70, 0x61, 0x67, + 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x2e, + 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x43, + 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x39, + 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, + 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, + 0xd3, 0xe4, 0x93, 0x02, 0x14, 0x12, 0x12, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, + 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x90, 0x01, 0x0a, 0x0a, 0x47, 0x65, + 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x25, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x65, + 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, + 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, + 0x1b, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3e, 0xba, 0x47, + 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, + 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, + 0x93, 0x02, 0x19, 0x12, 0x17, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x63, + 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x94, 0x01, 0x0a, + 0x0d, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x28, + 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, + 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, + 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1b, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x65, + 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, + 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3c, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, + 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, + 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x17, 0x3a, 0x01, 0x2a, 0x22, + 0x12, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x65, + 0x6e, 0x74, 0x73, 0x12, 0x9f, 0x01, 0x0a, 0x0d, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x6f, + 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x28, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x2e, + 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, + 0x65, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, + 0x1b, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x47, 0xba, 0x47, + 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, + 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, + 0x93, 0x02, 0x22, 0x3a, 0x07, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x1a, 0x17, 0x2f, 0x61, + 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, + 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x91, 0x01, 0x0a, 0x0d, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, + 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x28, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, + 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, + 0x65, 0x74, 0x65, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x3e, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, - 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x17, - 0x3a, 0x01, 0x2a, 0x22, 0x12, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x63, - 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x9f, 0x01, 0x0a, 0x0d, 0x55, 0x70, 0x64, 0x61, - 0x74, 0x65, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x28, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, - 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, - 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x1a, 0x1b, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, - 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, - 0x22, 0x47, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, - 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, - 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x22, 0x3a, 0x07, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, - 0x1a, 0x17, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, - 0x65, 0x6e, 0x74, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x91, 0x01, 0x0a, 0x0d, 0x44, 0x65, - 0x6c, 0x65, 0x74, 0x65, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x28, 0x2e, 0x63, 0x6f, - 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, - 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x3e, 0xba, - 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, - 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, - 0xe4, 0x93, 0x02, 0x19, 0x2a, 0x17, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, - 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x42, 0x2b, 0x5a, - 0x29, 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x63, 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, - 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x73, 0x65, 0x72, - 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x33, + 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x19, + 0x2a, 0x17, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, + 0x65, 0x6e, 0x74, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x42, 0xb9, 0x01, 0x0a, 0x14, 0x63, 0x6f, + 0x6d, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, + 0x76, 0x31, 0x42, 0x0d, 0x49, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x50, 0x01, 0x5a, 0x30, 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x63, 0x6d, 0x73, 0x2f, + 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, + 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x73, 0x65, 0x72, 0x76, + 0x69, 0x63, 0x65, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x41, 0x53, 0x58, 0xaa, 0x02, 0x10, 0x41, 0x64, + 0x6d, 0x69, 0x6e, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02, + 0x10, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x5c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x56, + 0x31, 0xe2, 0x02, 0x1c, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x5c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, + 0xea, 0x02, 0x12, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x3a, 0x3a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var file_admin_service_v1_i_comment_proto_goTypes = []interface{}{ - (*pagination.PagingRequest)(nil), // 0: pagination.PagingRequest - (*v1.GetCommentRequest)(nil), // 1: comment.service.v1.GetCommentRequest - (*v1.CreateCommentRequest)(nil), // 2: comment.service.v1.CreateCommentRequest - (*v1.UpdateCommentRequest)(nil), // 3: comment.service.v1.UpdateCommentRequest - (*v1.DeleteCommentRequest)(nil), // 4: comment.service.v1.DeleteCommentRequest - (*v1.ListCommentResponse)(nil), // 5: comment.service.v1.ListCommentResponse - (*v1.Comment)(nil), // 6: comment.service.v1.Comment + (*v1.PagingRequest)(nil), // 0: pagination.PagingRequest + (*v11.GetCommentRequest)(nil), // 1: comment.service.v1.GetCommentRequest + (*v11.CreateCommentRequest)(nil), // 2: comment.service.v1.CreateCommentRequest + (*v11.UpdateCommentRequest)(nil), // 3: comment.service.v1.UpdateCommentRequest + (*v11.DeleteCommentRequest)(nil), // 4: comment.service.v1.DeleteCommentRequest + (*v11.ListCommentResponse)(nil), // 5: comment.service.v1.ListCommentResponse + (*v11.Comment)(nil), // 6: comment.service.v1.Comment (*emptypb.Empty)(nil), // 7: google.protobuf.Empty } var file_admin_service_v1_i_comment_proto_depIdxs = []int32{ diff --git a/blog-backend/gen/api/go/admin/service/v1/i_comment.pb.validate.go b/blog-backend/gen/api/go/admin/service/v1/i_comment.pb.validate.go index 9607ea26..f75f3839 100644 --- a/blog-backend/gen/api/go/admin/service/v1/i_comment.pb.validate.go +++ b/blog-backend/gen/api/go/admin/service/v1/i_comment.pb.validate.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-validate. DO NOT EDIT. // source: admin/service/v1/i_comment.proto -package v1 +package servicev1 import ( "bytes" diff --git a/blog-backend/gen/api/go/admin/service/v1/i_comment_grpc.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_comment_grpc.pb.go index 0c5e02b6..d378abe0 100644 --- a/blog-backend/gen/api/go/admin/service/v1/i_comment_grpc.pb.go +++ b/blog-backend/gen/api/go/admin/service/v1/i_comment_grpc.pb.go @@ -4,16 +4,16 @@ // - protoc (unknown) // source: admin/service/v1/i_comment.proto -package v1 +package servicev1 import ( context "context" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" emptypb "google.golang.org/protobuf/types/known/emptypb" - v1 "kratos-cms/gen/api/go/comment/service/v1" - pagination "kratos-cms/gen/api/go/common/pagination" + v11 "kratos-cms/gen/api/go/comment/service/v1" ) // This is a compile-time assertion to ensure that this generated file @@ -34,15 +34,15 @@ const ( // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type CommentServiceClient interface { // 获取评论列表 - ListComment(ctx context.Context, in *pagination.PagingRequest, opts ...grpc.CallOption) (*v1.ListCommentResponse, error) + ListComment(ctx context.Context, in *v1.PagingRequest, opts ...grpc.CallOption) (*v11.ListCommentResponse, error) // 获取评论数据 - GetComment(ctx context.Context, in *v1.GetCommentRequest, opts ...grpc.CallOption) (*v1.Comment, error) + GetComment(ctx context.Context, in *v11.GetCommentRequest, opts ...grpc.CallOption) (*v11.Comment, error) // 创建评论 - CreateComment(ctx context.Context, in *v1.CreateCommentRequest, opts ...grpc.CallOption) (*v1.Comment, error) + CreateComment(ctx context.Context, in *v11.CreateCommentRequest, opts ...grpc.CallOption) (*v11.Comment, error) // 更新评论 - UpdateComment(ctx context.Context, in *v1.UpdateCommentRequest, opts ...grpc.CallOption) (*v1.Comment, error) + UpdateComment(ctx context.Context, in *v11.UpdateCommentRequest, opts ...grpc.CallOption) (*v11.Comment, error) // 删除评论 - DeleteComment(ctx context.Context, in *v1.DeleteCommentRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) + DeleteComment(ctx context.Context, in *v11.DeleteCommentRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) } type commentServiceClient struct { @@ -53,8 +53,8 @@ func NewCommentServiceClient(cc grpc.ClientConnInterface) CommentServiceClient { return &commentServiceClient{cc} } -func (c *commentServiceClient) ListComment(ctx context.Context, in *pagination.PagingRequest, opts ...grpc.CallOption) (*v1.ListCommentResponse, error) { - out := new(v1.ListCommentResponse) +func (c *commentServiceClient) ListComment(ctx context.Context, in *v1.PagingRequest, opts ...grpc.CallOption) (*v11.ListCommentResponse, error) { + out := new(v11.ListCommentResponse) err := c.cc.Invoke(ctx, CommentService_ListComment_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -62,8 +62,8 @@ func (c *commentServiceClient) ListComment(ctx context.Context, in *pagination.P return out, nil } -func (c *commentServiceClient) GetComment(ctx context.Context, in *v1.GetCommentRequest, opts ...grpc.CallOption) (*v1.Comment, error) { - out := new(v1.Comment) +func (c *commentServiceClient) GetComment(ctx context.Context, in *v11.GetCommentRequest, opts ...grpc.CallOption) (*v11.Comment, error) { + out := new(v11.Comment) err := c.cc.Invoke(ctx, CommentService_GetComment_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -71,8 +71,8 @@ func (c *commentServiceClient) GetComment(ctx context.Context, in *v1.GetComment return out, nil } -func (c *commentServiceClient) CreateComment(ctx context.Context, in *v1.CreateCommentRequest, opts ...grpc.CallOption) (*v1.Comment, error) { - out := new(v1.Comment) +func (c *commentServiceClient) CreateComment(ctx context.Context, in *v11.CreateCommentRequest, opts ...grpc.CallOption) (*v11.Comment, error) { + out := new(v11.Comment) err := c.cc.Invoke(ctx, CommentService_CreateComment_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -80,8 +80,8 @@ func (c *commentServiceClient) CreateComment(ctx context.Context, in *v1.CreateC return out, nil } -func (c *commentServiceClient) UpdateComment(ctx context.Context, in *v1.UpdateCommentRequest, opts ...grpc.CallOption) (*v1.Comment, error) { - out := new(v1.Comment) +func (c *commentServiceClient) UpdateComment(ctx context.Context, in *v11.UpdateCommentRequest, opts ...grpc.CallOption) (*v11.Comment, error) { + out := new(v11.Comment) err := c.cc.Invoke(ctx, CommentService_UpdateComment_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -89,7 +89,7 @@ func (c *commentServiceClient) UpdateComment(ctx context.Context, in *v1.UpdateC return out, nil } -func (c *commentServiceClient) DeleteComment(ctx context.Context, in *v1.DeleteCommentRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { +func (c *commentServiceClient) DeleteComment(ctx context.Context, in *v11.DeleteCommentRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { out := new(emptypb.Empty) err := c.cc.Invoke(ctx, CommentService_DeleteComment_FullMethodName, in, out, opts...) if err != nil { @@ -103,15 +103,15 @@ func (c *commentServiceClient) DeleteComment(ctx context.Context, in *v1.DeleteC // for forward compatibility type CommentServiceServer interface { // 获取评论列表 - ListComment(context.Context, *pagination.PagingRequest) (*v1.ListCommentResponse, error) + ListComment(context.Context, *v1.PagingRequest) (*v11.ListCommentResponse, error) // 获取评论数据 - GetComment(context.Context, *v1.GetCommentRequest) (*v1.Comment, error) + GetComment(context.Context, *v11.GetCommentRequest) (*v11.Comment, error) // 创建评论 - CreateComment(context.Context, *v1.CreateCommentRequest) (*v1.Comment, error) + CreateComment(context.Context, *v11.CreateCommentRequest) (*v11.Comment, error) // 更新评论 - UpdateComment(context.Context, *v1.UpdateCommentRequest) (*v1.Comment, error) + UpdateComment(context.Context, *v11.UpdateCommentRequest) (*v11.Comment, error) // 删除评论 - DeleteComment(context.Context, *v1.DeleteCommentRequest) (*emptypb.Empty, error) + DeleteComment(context.Context, *v11.DeleteCommentRequest) (*emptypb.Empty, error) mustEmbedUnimplementedCommentServiceServer() } @@ -119,19 +119,19 @@ type CommentServiceServer interface { type UnimplementedCommentServiceServer struct { } -func (UnimplementedCommentServiceServer) ListComment(context.Context, *pagination.PagingRequest) (*v1.ListCommentResponse, error) { +func (UnimplementedCommentServiceServer) ListComment(context.Context, *v1.PagingRequest) (*v11.ListCommentResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListComment not implemented") } -func (UnimplementedCommentServiceServer) GetComment(context.Context, *v1.GetCommentRequest) (*v1.Comment, error) { +func (UnimplementedCommentServiceServer) GetComment(context.Context, *v11.GetCommentRequest) (*v11.Comment, error) { return nil, status.Errorf(codes.Unimplemented, "method GetComment not implemented") } -func (UnimplementedCommentServiceServer) CreateComment(context.Context, *v1.CreateCommentRequest) (*v1.Comment, error) { +func (UnimplementedCommentServiceServer) CreateComment(context.Context, *v11.CreateCommentRequest) (*v11.Comment, error) { return nil, status.Errorf(codes.Unimplemented, "method CreateComment not implemented") } -func (UnimplementedCommentServiceServer) UpdateComment(context.Context, *v1.UpdateCommentRequest) (*v1.Comment, error) { +func (UnimplementedCommentServiceServer) UpdateComment(context.Context, *v11.UpdateCommentRequest) (*v11.Comment, error) { return nil, status.Errorf(codes.Unimplemented, "method UpdateComment not implemented") } -func (UnimplementedCommentServiceServer) DeleteComment(context.Context, *v1.DeleteCommentRequest) (*emptypb.Empty, error) { +func (UnimplementedCommentServiceServer) DeleteComment(context.Context, *v11.DeleteCommentRequest) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method DeleteComment not implemented") } func (UnimplementedCommentServiceServer) mustEmbedUnimplementedCommentServiceServer() {} @@ -148,7 +148,7 @@ func RegisterCommentServiceServer(s grpc.ServiceRegistrar, srv CommentServiceSer } func _CommentService_ListComment_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(pagination.PagingRequest) + in := new(v1.PagingRequest) if err := dec(in); err != nil { return nil, err } @@ -160,13 +160,13 @@ func _CommentService_ListComment_Handler(srv interface{}, ctx context.Context, d FullMethod: CommentService_ListComment_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(CommentServiceServer).ListComment(ctx, req.(*pagination.PagingRequest)) + return srv.(CommentServiceServer).ListComment(ctx, req.(*v1.PagingRequest)) } return interceptor(ctx, in, info, handler) } func _CommentService_GetComment_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.GetCommentRequest) + in := new(v11.GetCommentRequest) if err := dec(in); err != nil { return nil, err } @@ -178,13 +178,13 @@ func _CommentService_GetComment_Handler(srv interface{}, ctx context.Context, de FullMethod: CommentService_GetComment_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(CommentServiceServer).GetComment(ctx, req.(*v1.GetCommentRequest)) + return srv.(CommentServiceServer).GetComment(ctx, req.(*v11.GetCommentRequest)) } return interceptor(ctx, in, info, handler) } func _CommentService_CreateComment_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.CreateCommentRequest) + in := new(v11.CreateCommentRequest) if err := dec(in); err != nil { return nil, err } @@ -196,13 +196,13 @@ func _CommentService_CreateComment_Handler(srv interface{}, ctx context.Context, FullMethod: CommentService_CreateComment_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(CommentServiceServer).CreateComment(ctx, req.(*v1.CreateCommentRequest)) + return srv.(CommentServiceServer).CreateComment(ctx, req.(*v11.CreateCommentRequest)) } return interceptor(ctx, in, info, handler) } func _CommentService_UpdateComment_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.UpdateCommentRequest) + in := new(v11.UpdateCommentRequest) if err := dec(in); err != nil { return nil, err } @@ -214,13 +214,13 @@ func _CommentService_UpdateComment_Handler(srv interface{}, ctx context.Context, FullMethod: CommentService_UpdateComment_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(CommentServiceServer).UpdateComment(ctx, req.(*v1.UpdateCommentRequest)) + return srv.(CommentServiceServer).UpdateComment(ctx, req.(*v11.UpdateCommentRequest)) } return interceptor(ctx, in, info, handler) } func _CommentService_DeleteComment_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.DeleteCommentRequest) + in := new(v11.DeleteCommentRequest) if err := dec(in); err != nil { return nil, err } @@ -232,7 +232,7 @@ func _CommentService_DeleteComment_Handler(srv interface{}, ctx context.Context, FullMethod: CommentService_DeleteComment_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(CommentServiceServer).DeleteComment(ctx, req.(*v1.DeleteCommentRequest)) + return srv.(CommentServiceServer).DeleteComment(ctx, req.(*v11.DeleteCommentRequest)) } return interceptor(ctx, in, info, handler) } diff --git a/blog-backend/gen/api/go/admin/service/v1/i_comment_http.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_comment_http.pb.go index de292168..9508e875 100644 --- a/blog-backend/gen/api/go/admin/service/v1/i_comment_http.pb.go +++ b/blog-backend/gen/api/go/admin/service/v1/i_comment_http.pb.go @@ -4,15 +4,15 @@ // - protoc (unknown) // source: admin/service/v1/i_comment.proto -package v1 +package servicev1 import ( context "context" http "github.com/go-kratos/kratos/v2/transport/http" binding "github.com/go-kratos/kratos/v2/transport/http/binding" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" emptypb "google.golang.org/protobuf/types/known/emptypb" - v1 "kratos-cms/gen/api/go/comment/service/v1" - pagination "kratos-cms/gen/api/go/common/pagination" + v11 "kratos-cms/gen/api/go/comment/service/v1" ) // This is a compile-time assertion to ensure that this generated file @@ -30,15 +30,15 @@ const OperationCommentServiceUpdateComment = "/admin.service.v1.CommentService/U type CommentServiceHTTPServer interface { // CreateComment 创建评论 - CreateComment(context.Context, *v1.CreateCommentRequest) (*v1.Comment, error) + CreateComment(context.Context, *v11.CreateCommentRequest) (*v11.Comment, error) // DeleteComment 删除评论 - DeleteComment(context.Context, *v1.DeleteCommentRequest) (*emptypb.Empty, error) + DeleteComment(context.Context, *v11.DeleteCommentRequest) (*emptypb.Empty, error) // GetComment 获取评论数据 - GetComment(context.Context, *v1.GetCommentRequest) (*v1.Comment, error) + GetComment(context.Context, *v11.GetCommentRequest) (*v11.Comment, error) // ListComment 获取评论列表 - ListComment(context.Context, *pagination.PagingRequest) (*v1.ListCommentResponse, error) + ListComment(context.Context, *v1.PagingRequest) (*v11.ListCommentResponse, error) // UpdateComment 更新评论 - UpdateComment(context.Context, *v1.UpdateCommentRequest) (*v1.Comment, error) + UpdateComment(context.Context, *v11.UpdateCommentRequest) (*v11.Comment, error) } func RegisterCommentServiceHTTPServer(s *http.Server, srv CommentServiceHTTPServer) { @@ -52,26 +52,26 @@ func RegisterCommentServiceHTTPServer(s *http.Server, srv CommentServiceHTTPServ func _CommentService_ListComment0_HTTP_Handler(srv CommentServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in pagination.PagingRequest + var in v1.PagingRequest if err := ctx.BindQuery(&in); err != nil { return err } http.SetOperation(ctx, OperationCommentServiceListComment) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.ListComment(ctx, req.(*pagination.PagingRequest)) + return srv.ListComment(ctx, req.(*v1.PagingRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.ListCommentResponse) + reply := out.(*v11.ListCommentResponse) return ctx.Result(200, reply) } } func _CommentService_GetComment0_HTTP_Handler(srv CommentServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.GetCommentRequest + var in v11.GetCommentRequest if err := ctx.BindQuery(&in); err != nil { return err } @@ -80,20 +80,20 @@ func _CommentService_GetComment0_HTTP_Handler(srv CommentServiceHTTPServer) func } http.SetOperation(ctx, OperationCommentServiceGetComment) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.GetComment(ctx, req.(*v1.GetCommentRequest)) + return srv.GetComment(ctx, req.(*v11.GetCommentRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.Comment) + reply := out.(*v11.Comment) return ctx.Result(200, reply) } } func _CommentService_CreateComment0_HTTP_Handler(srv CommentServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.CreateCommentRequest + var in v11.CreateCommentRequest if err := ctx.Bind(&in); err != nil { return err } @@ -102,20 +102,20 @@ func _CommentService_CreateComment0_HTTP_Handler(srv CommentServiceHTTPServer) f } http.SetOperation(ctx, OperationCommentServiceCreateComment) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.CreateComment(ctx, req.(*v1.CreateCommentRequest)) + return srv.CreateComment(ctx, req.(*v11.CreateCommentRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.Comment) + reply := out.(*v11.Comment) return ctx.Result(200, reply) } } func _CommentService_UpdateComment0_HTTP_Handler(srv CommentServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.UpdateCommentRequest + var in v11.UpdateCommentRequest if err := ctx.Bind(&in.Comment); err != nil { return err } @@ -127,20 +127,20 @@ func _CommentService_UpdateComment0_HTTP_Handler(srv CommentServiceHTTPServer) f } http.SetOperation(ctx, OperationCommentServiceUpdateComment) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.UpdateComment(ctx, req.(*v1.UpdateCommentRequest)) + return srv.UpdateComment(ctx, req.(*v11.UpdateCommentRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.Comment) + reply := out.(*v11.Comment) return ctx.Result(200, reply) } } func _CommentService_DeleteComment0_HTTP_Handler(srv CommentServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.DeleteCommentRequest + var in v11.DeleteCommentRequest if err := ctx.BindQuery(&in); err != nil { return err } @@ -149,7 +149,7 @@ func _CommentService_DeleteComment0_HTTP_Handler(srv CommentServiceHTTPServer) f } http.SetOperation(ctx, OperationCommentServiceDeleteComment) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.DeleteComment(ctx, req.(*v1.DeleteCommentRequest)) + return srv.DeleteComment(ctx, req.(*v11.DeleteCommentRequest)) }) out, err := h(ctx, &in) if err != nil { @@ -161,11 +161,11 @@ func _CommentService_DeleteComment0_HTTP_Handler(srv CommentServiceHTTPServer) f } type CommentServiceHTTPClient interface { - CreateComment(ctx context.Context, req *v1.CreateCommentRequest, opts ...http.CallOption) (rsp *v1.Comment, err error) - DeleteComment(ctx context.Context, req *v1.DeleteCommentRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error) - GetComment(ctx context.Context, req *v1.GetCommentRequest, opts ...http.CallOption) (rsp *v1.Comment, err error) - ListComment(ctx context.Context, req *pagination.PagingRequest, opts ...http.CallOption) (rsp *v1.ListCommentResponse, err error) - UpdateComment(ctx context.Context, req *v1.UpdateCommentRequest, opts ...http.CallOption) (rsp *v1.Comment, err error) + CreateComment(ctx context.Context, req *v11.CreateCommentRequest, opts ...http.CallOption) (rsp *v11.Comment, err error) + DeleteComment(ctx context.Context, req *v11.DeleteCommentRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error) + GetComment(ctx context.Context, req *v11.GetCommentRequest, opts ...http.CallOption) (rsp *v11.Comment, err error) + ListComment(ctx context.Context, req *v1.PagingRequest, opts ...http.CallOption) (rsp *v11.ListCommentResponse, err error) + UpdateComment(ctx context.Context, req *v11.UpdateCommentRequest, opts ...http.CallOption) (rsp *v11.Comment, err error) } type CommentServiceHTTPClientImpl struct { @@ -176,8 +176,8 @@ func NewCommentServiceHTTPClient(client *http.Client) CommentServiceHTTPClient { return &CommentServiceHTTPClientImpl{client} } -func (c *CommentServiceHTTPClientImpl) CreateComment(ctx context.Context, in *v1.CreateCommentRequest, opts ...http.CallOption) (*v1.Comment, error) { - var out v1.Comment +func (c *CommentServiceHTTPClientImpl) CreateComment(ctx context.Context, in *v11.CreateCommentRequest, opts ...http.CallOption) (*v11.Comment, error) { + var out v11.Comment pattern := "/admin/v1/comments" path := binding.EncodeURL(pattern, in, false) opts = append(opts, http.Operation(OperationCommentServiceCreateComment)) @@ -189,7 +189,7 @@ func (c *CommentServiceHTTPClientImpl) CreateComment(ctx context.Context, in *v1 return &out, err } -func (c *CommentServiceHTTPClientImpl) DeleteComment(ctx context.Context, in *v1.DeleteCommentRequest, opts ...http.CallOption) (*emptypb.Empty, error) { +func (c *CommentServiceHTTPClientImpl) DeleteComment(ctx context.Context, in *v11.DeleteCommentRequest, opts ...http.CallOption) (*emptypb.Empty, error) { var out emptypb.Empty pattern := "/admin/v1/comments/{id}" path := binding.EncodeURL(pattern, in, true) @@ -202,8 +202,8 @@ func (c *CommentServiceHTTPClientImpl) DeleteComment(ctx context.Context, in *v1 return &out, err } -func (c *CommentServiceHTTPClientImpl) GetComment(ctx context.Context, in *v1.GetCommentRequest, opts ...http.CallOption) (*v1.Comment, error) { - var out v1.Comment +func (c *CommentServiceHTTPClientImpl) GetComment(ctx context.Context, in *v11.GetCommentRequest, opts ...http.CallOption) (*v11.Comment, error) { + var out v11.Comment pattern := "/admin/v1/comments/{id}" path := binding.EncodeURL(pattern, in, true) opts = append(opts, http.Operation(OperationCommentServiceGetComment)) @@ -215,8 +215,8 @@ func (c *CommentServiceHTTPClientImpl) GetComment(ctx context.Context, in *v1.Ge return &out, err } -func (c *CommentServiceHTTPClientImpl) ListComment(ctx context.Context, in *pagination.PagingRequest, opts ...http.CallOption) (*v1.ListCommentResponse, error) { - var out v1.ListCommentResponse +func (c *CommentServiceHTTPClientImpl) ListComment(ctx context.Context, in *v1.PagingRequest, opts ...http.CallOption) (*v11.ListCommentResponse, error) { + var out v11.ListCommentResponse pattern := "/admin/v1/comments" path := binding.EncodeURL(pattern, in, true) opts = append(opts, http.Operation(OperationCommentServiceListComment)) @@ -228,8 +228,8 @@ func (c *CommentServiceHTTPClientImpl) ListComment(ctx context.Context, in *pagi return &out, err } -func (c *CommentServiceHTTPClientImpl) UpdateComment(ctx context.Context, in *v1.UpdateCommentRequest, opts ...http.CallOption) (*v1.Comment, error) { - var out v1.Comment +func (c *CommentServiceHTTPClientImpl) UpdateComment(ctx context.Context, in *v11.UpdateCommentRequest, opts ...http.CallOption) (*v11.Comment, error) { + var out v11.Comment pattern := "/admin/v1/comments/{id}" path := binding.EncodeURL(pattern, in, false) opts = append(opts, http.Operation(OperationCommentServiceUpdateComment)) diff --git a/blog-backend/gen/api/go/admin/service/v1/i_link.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_link.pb.go index 808399eb..d9cc730d 100644 --- a/blog-backend/gen/api/go/admin/service/v1/i_link.pb.go +++ b/blog-backend/gen/api/go/admin/service/v1/i_link.pb.go @@ -4,16 +4,16 @@ // protoc (unknown) // source: admin/service/v1/i_link.proto -package v1 +package servicev1 import ( _ "github.com/google/gnostic/openapiv3" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" - v1 "kratos-cms/gen/api/go/content/service/v1" + v11 "kratos-cms/gen/api/go/content/service/v1" reflect "reflect" ) @@ -36,69 +36,78 @@ var file_admin_service_v1_i_link_proto_rawDesc = []byte{ 0x61, 0x70, 0x69, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x1a, 0x22, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2f, - 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x6c, 0x69, 0x6e, 0x6b, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0xc3, 0x05, 0x0a, 0x0b, 0x4c, 0x69, 0x6e, 0x6b, 0x53, 0x65, - 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x83, 0x01, 0x0a, 0x08, 0x4c, 0x69, 0x73, 0x74, 0x4c, 0x69, - 0x6e, 0x6b, 0x12, 0x19, 0x2e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, - 0x50, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, + 0x74, 0x6f, 0x1a, 0x1e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x76, + 0x31, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x1a, 0x1d, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2f, 0x73, 0x65, 0x72, 0x76, + 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x6c, 0x69, 0x6e, 0x6b, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x32, 0xc3, 0x05, 0x0a, 0x0b, 0x4c, 0x69, 0x6e, 0x6b, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x12, 0x83, 0x01, 0x0a, 0x08, 0x4c, 0x69, 0x73, 0x74, 0x4c, 0x69, 0x6e, 0x6b, 0x12, 0x19, + 0x2e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x50, 0x61, 0x67, 0x69, + 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x63, 0x6f, 0x6e, 0x74, + 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, + 0x69, 0x73, 0x74, 0x4c, 0x69, 0x6e, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, + 0x36, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, + 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, + 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x11, 0x12, 0x0f, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, + 0x31, 0x2f, 0x6c, 0x69, 0x6e, 0x6b, 0x73, 0x12, 0x84, 0x01, 0x0a, 0x07, 0x47, 0x65, 0x74, 0x4c, + 0x69, 0x6e, 0x6b, 0x12, 0x22, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, + 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x6e, 0x6b, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, + 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x6e, + 0x6b, 0x22, 0x3b, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, + 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, + 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x16, 0x12, 0x14, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, + 0x2f, 0x76, 0x31, 0x2f, 0x6c, 0x69, 0x6e, 0x6b, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x88, + 0x01, 0x0a, 0x0a, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6e, 0x6b, 0x12, 0x25, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, - 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4c, 0x69, 0x6e, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, - 0x6e, 0x73, 0x65, 0x22, 0x36, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, - 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, - 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x11, 0x12, 0x0f, 0x2f, 0x61, 0x64, 0x6d, - 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x6c, 0x69, 0x6e, 0x6b, 0x73, 0x12, 0x84, 0x01, 0x0a, 0x07, - 0x47, 0x65, 0x74, 0x4c, 0x69, 0x6e, 0x6b, 0x12, 0x22, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, - 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, - 0x4c, 0x69, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x63, 0x6f, - 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, - 0x2e, 0x4c, 0x69, 0x6e, 0x6b, 0x22, 0x3b, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, - 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, - 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x16, 0x12, 0x14, 0x2f, 0x61, - 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x6c, 0x69, 0x6e, 0x6b, 0x73, 0x2f, 0x7b, 0x69, - 0x64, 0x7d, 0x12, 0x88, 0x01, 0x0a, 0x0a, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6e, - 0x6b, 0x12, 0x25, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, - 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6e, - 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, - 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, - 0x6e, 0x6b, 0x22, 0x39, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, - 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, - 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x14, 0x3a, 0x01, 0x2a, 0x22, 0x0f, 0x2f, 0x61, - 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x6c, 0x69, 0x6e, 0x6b, 0x73, 0x12, 0x90, 0x01, - 0x0a, 0x0a, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6e, 0x6b, 0x12, 0x25, 0x2e, 0x63, - 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, - 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, - 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x6e, 0x6b, 0x22, 0x41, 0xba, - 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, - 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, - 0xe4, 0x93, 0x02, 0x1c, 0x3a, 0x04, 0x6c, 0x69, 0x6e, 0x6b, 0x1a, 0x14, 0x2f, 0x61, 0x64, 0x6d, - 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x6c, 0x69, 0x6e, 0x6b, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, - 0x12, 0x88, 0x01, 0x0a, 0x0a, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4c, 0x69, 0x6e, 0x6b, 0x12, - 0x25, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, - 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4c, 0x69, 0x6e, 0x6b, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x3b, + 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6e, 0x6b, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, + 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x6e, 0x6b, 0x22, 0x39, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, - 0xd3, 0xe4, 0x93, 0x02, 0x16, 0x2a, 0x14, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, - 0x2f, 0x6c, 0x69, 0x6e, 0x6b, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x42, 0x2b, 0x5a, 0x29, 0x6b, - 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x63, 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x70, - 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, - 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0xd3, 0xe4, 0x93, 0x02, 0x14, 0x3a, 0x01, 0x2a, 0x22, 0x0f, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, + 0x2f, 0x76, 0x31, 0x2f, 0x6c, 0x69, 0x6e, 0x6b, 0x73, 0x12, 0x90, 0x01, 0x0a, 0x0a, 0x55, 0x70, + 0x64, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6e, 0x6b, 0x12, 0x25, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, + 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, + 0x64, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, + 0x18, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x6e, 0x6b, 0x22, 0x41, 0xba, 0x47, 0x1c, 0x5a, 0x1a, + 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, + 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1c, + 0x3a, 0x04, 0x6c, 0x69, 0x6e, 0x6b, 0x1a, 0x14, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, + 0x31, 0x2f, 0x6c, 0x69, 0x6e, 0x6b, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x88, 0x01, 0x0a, + 0x0a, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4c, 0x69, 0x6e, 0x6b, 0x12, 0x25, 0x2e, 0x63, 0x6f, + 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, + 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4c, 0x69, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, + 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x3b, 0xba, 0x47, 0x1c, 0x5a, + 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, + 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, + 0x16, 0x2a, 0x14, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x6c, 0x69, 0x6e, + 0x6b, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x42, 0xb6, 0x01, 0x0a, 0x14, 0x63, 0x6f, 0x6d, 0x2e, + 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, + 0x42, 0x0a, 0x49, 0x4c, 0x69, 0x6e, 0x6b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x30, + 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x63, 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, + 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x73, 0x65, 0x72, 0x76, + 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x76, 0x31, + 0xa2, 0x02, 0x03, 0x41, 0x53, 0x58, 0xaa, 0x02, 0x10, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x53, + 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x10, 0x41, 0x64, 0x6d, 0x69, + 0x6e, 0x5c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1c, 0x41, + 0x64, 0x6d, 0x69, 0x6e, 0x5c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x56, 0x31, 0x5c, + 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x12, 0x41, 0x64, + 0x6d, 0x69, 0x6e, 0x3a, 0x3a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x3a, 0x3a, 0x56, 0x31, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var file_admin_service_v1_i_link_proto_goTypes = []interface{}{ - (*pagination.PagingRequest)(nil), // 0: pagination.PagingRequest - (*v1.GetLinkRequest)(nil), // 1: content.service.v1.GetLinkRequest - (*v1.CreateLinkRequest)(nil), // 2: content.service.v1.CreateLinkRequest - (*v1.UpdateLinkRequest)(nil), // 3: content.service.v1.UpdateLinkRequest - (*v1.DeleteLinkRequest)(nil), // 4: content.service.v1.DeleteLinkRequest - (*v1.ListLinkResponse)(nil), // 5: content.service.v1.ListLinkResponse - (*v1.Link)(nil), // 6: content.service.v1.Link - (*emptypb.Empty)(nil), // 7: google.protobuf.Empty + (*v1.PagingRequest)(nil), // 0: pagination.PagingRequest + (*v11.GetLinkRequest)(nil), // 1: content.service.v1.GetLinkRequest + (*v11.CreateLinkRequest)(nil), // 2: content.service.v1.CreateLinkRequest + (*v11.UpdateLinkRequest)(nil), // 3: content.service.v1.UpdateLinkRequest + (*v11.DeleteLinkRequest)(nil), // 4: content.service.v1.DeleteLinkRequest + (*v11.ListLinkResponse)(nil), // 5: content.service.v1.ListLinkResponse + (*v11.Link)(nil), // 6: content.service.v1.Link + (*emptypb.Empty)(nil), // 7: google.protobuf.Empty } var file_admin_service_v1_i_link_proto_depIdxs = []int32{ 0, // 0: admin.service.v1.LinkService.ListLink:input_type -> pagination.PagingRequest diff --git a/blog-backend/gen/api/go/admin/service/v1/i_link.pb.validate.go b/blog-backend/gen/api/go/admin/service/v1/i_link.pb.validate.go index c986826c..4ca94e89 100644 --- a/blog-backend/gen/api/go/admin/service/v1/i_link.pb.validate.go +++ b/blog-backend/gen/api/go/admin/service/v1/i_link.pb.validate.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-validate. DO NOT EDIT. // source: admin/service/v1/i_link.proto -package v1 +package servicev1 import ( "bytes" diff --git a/blog-backend/gen/api/go/admin/service/v1/i_link_grpc.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_link_grpc.pb.go index 115e7a23..43330b28 100644 --- a/blog-backend/gen/api/go/admin/service/v1/i_link_grpc.pb.go +++ b/blog-backend/gen/api/go/admin/service/v1/i_link_grpc.pb.go @@ -4,16 +4,16 @@ // - protoc (unknown) // source: admin/service/v1/i_link.proto -package v1 +package servicev1 import ( context "context" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" - v1 "kratos-cms/gen/api/go/content/service/v1" + v11 "kratos-cms/gen/api/go/content/service/v1" ) // This is a compile-time assertion to ensure that this generated file @@ -34,15 +34,15 @@ const ( // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type LinkServiceClient interface { // 获取链接列表 - ListLink(ctx context.Context, in *pagination.PagingRequest, opts ...grpc.CallOption) (*v1.ListLinkResponse, error) + ListLink(ctx context.Context, in *v1.PagingRequest, opts ...grpc.CallOption) (*v11.ListLinkResponse, error) // 获取链接数据 - GetLink(ctx context.Context, in *v1.GetLinkRequest, opts ...grpc.CallOption) (*v1.Link, error) + GetLink(ctx context.Context, in *v11.GetLinkRequest, opts ...grpc.CallOption) (*v11.Link, error) // 创建链接 - CreateLink(ctx context.Context, in *v1.CreateLinkRequest, opts ...grpc.CallOption) (*v1.Link, error) + CreateLink(ctx context.Context, in *v11.CreateLinkRequest, opts ...grpc.CallOption) (*v11.Link, error) // 更新链接 - UpdateLink(ctx context.Context, in *v1.UpdateLinkRequest, opts ...grpc.CallOption) (*v1.Link, error) + UpdateLink(ctx context.Context, in *v11.UpdateLinkRequest, opts ...grpc.CallOption) (*v11.Link, error) // 删除链接 - DeleteLink(ctx context.Context, in *v1.DeleteLinkRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) + DeleteLink(ctx context.Context, in *v11.DeleteLinkRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) } type linkServiceClient struct { @@ -53,8 +53,8 @@ func NewLinkServiceClient(cc grpc.ClientConnInterface) LinkServiceClient { return &linkServiceClient{cc} } -func (c *linkServiceClient) ListLink(ctx context.Context, in *pagination.PagingRequest, opts ...grpc.CallOption) (*v1.ListLinkResponse, error) { - out := new(v1.ListLinkResponse) +func (c *linkServiceClient) ListLink(ctx context.Context, in *v1.PagingRequest, opts ...grpc.CallOption) (*v11.ListLinkResponse, error) { + out := new(v11.ListLinkResponse) err := c.cc.Invoke(ctx, LinkService_ListLink_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -62,8 +62,8 @@ func (c *linkServiceClient) ListLink(ctx context.Context, in *pagination.PagingR return out, nil } -func (c *linkServiceClient) GetLink(ctx context.Context, in *v1.GetLinkRequest, opts ...grpc.CallOption) (*v1.Link, error) { - out := new(v1.Link) +func (c *linkServiceClient) GetLink(ctx context.Context, in *v11.GetLinkRequest, opts ...grpc.CallOption) (*v11.Link, error) { + out := new(v11.Link) err := c.cc.Invoke(ctx, LinkService_GetLink_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -71,8 +71,8 @@ func (c *linkServiceClient) GetLink(ctx context.Context, in *v1.GetLinkRequest, return out, nil } -func (c *linkServiceClient) CreateLink(ctx context.Context, in *v1.CreateLinkRequest, opts ...grpc.CallOption) (*v1.Link, error) { - out := new(v1.Link) +func (c *linkServiceClient) CreateLink(ctx context.Context, in *v11.CreateLinkRequest, opts ...grpc.CallOption) (*v11.Link, error) { + out := new(v11.Link) err := c.cc.Invoke(ctx, LinkService_CreateLink_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -80,8 +80,8 @@ func (c *linkServiceClient) CreateLink(ctx context.Context, in *v1.CreateLinkReq return out, nil } -func (c *linkServiceClient) UpdateLink(ctx context.Context, in *v1.UpdateLinkRequest, opts ...grpc.CallOption) (*v1.Link, error) { - out := new(v1.Link) +func (c *linkServiceClient) UpdateLink(ctx context.Context, in *v11.UpdateLinkRequest, opts ...grpc.CallOption) (*v11.Link, error) { + out := new(v11.Link) err := c.cc.Invoke(ctx, LinkService_UpdateLink_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -89,7 +89,7 @@ func (c *linkServiceClient) UpdateLink(ctx context.Context, in *v1.UpdateLinkReq return out, nil } -func (c *linkServiceClient) DeleteLink(ctx context.Context, in *v1.DeleteLinkRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { +func (c *linkServiceClient) DeleteLink(ctx context.Context, in *v11.DeleteLinkRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { out := new(emptypb.Empty) err := c.cc.Invoke(ctx, LinkService_DeleteLink_FullMethodName, in, out, opts...) if err != nil { @@ -103,15 +103,15 @@ func (c *linkServiceClient) DeleteLink(ctx context.Context, in *v1.DeleteLinkReq // for forward compatibility type LinkServiceServer interface { // 获取链接列表 - ListLink(context.Context, *pagination.PagingRequest) (*v1.ListLinkResponse, error) + ListLink(context.Context, *v1.PagingRequest) (*v11.ListLinkResponse, error) // 获取链接数据 - GetLink(context.Context, *v1.GetLinkRequest) (*v1.Link, error) + GetLink(context.Context, *v11.GetLinkRequest) (*v11.Link, error) // 创建链接 - CreateLink(context.Context, *v1.CreateLinkRequest) (*v1.Link, error) + CreateLink(context.Context, *v11.CreateLinkRequest) (*v11.Link, error) // 更新链接 - UpdateLink(context.Context, *v1.UpdateLinkRequest) (*v1.Link, error) + UpdateLink(context.Context, *v11.UpdateLinkRequest) (*v11.Link, error) // 删除链接 - DeleteLink(context.Context, *v1.DeleteLinkRequest) (*emptypb.Empty, error) + DeleteLink(context.Context, *v11.DeleteLinkRequest) (*emptypb.Empty, error) mustEmbedUnimplementedLinkServiceServer() } @@ -119,19 +119,19 @@ type LinkServiceServer interface { type UnimplementedLinkServiceServer struct { } -func (UnimplementedLinkServiceServer) ListLink(context.Context, *pagination.PagingRequest) (*v1.ListLinkResponse, error) { +func (UnimplementedLinkServiceServer) ListLink(context.Context, *v1.PagingRequest) (*v11.ListLinkResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListLink not implemented") } -func (UnimplementedLinkServiceServer) GetLink(context.Context, *v1.GetLinkRequest) (*v1.Link, error) { +func (UnimplementedLinkServiceServer) GetLink(context.Context, *v11.GetLinkRequest) (*v11.Link, error) { return nil, status.Errorf(codes.Unimplemented, "method GetLink not implemented") } -func (UnimplementedLinkServiceServer) CreateLink(context.Context, *v1.CreateLinkRequest) (*v1.Link, error) { +func (UnimplementedLinkServiceServer) CreateLink(context.Context, *v11.CreateLinkRequest) (*v11.Link, error) { return nil, status.Errorf(codes.Unimplemented, "method CreateLink not implemented") } -func (UnimplementedLinkServiceServer) UpdateLink(context.Context, *v1.UpdateLinkRequest) (*v1.Link, error) { +func (UnimplementedLinkServiceServer) UpdateLink(context.Context, *v11.UpdateLinkRequest) (*v11.Link, error) { return nil, status.Errorf(codes.Unimplemented, "method UpdateLink not implemented") } -func (UnimplementedLinkServiceServer) DeleteLink(context.Context, *v1.DeleteLinkRequest) (*emptypb.Empty, error) { +func (UnimplementedLinkServiceServer) DeleteLink(context.Context, *v11.DeleteLinkRequest) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method DeleteLink not implemented") } func (UnimplementedLinkServiceServer) mustEmbedUnimplementedLinkServiceServer() {} @@ -148,7 +148,7 @@ func RegisterLinkServiceServer(s grpc.ServiceRegistrar, srv LinkServiceServer) { } func _LinkService_ListLink_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(pagination.PagingRequest) + in := new(v1.PagingRequest) if err := dec(in); err != nil { return nil, err } @@ -160,13 +160,13 @@ func _LinkService_ListLink_Handler(srv interface{}, ctx context.Context, dec fun FullMethod: LinkService_ListLink_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(LinkServiceServer).ListLink(ctx, req.(*pagination.PagingRequest)) + return srv.(LinkServiceServer).ListLink(ctx, req.(*v1.PagingRequest)) } return interceptor(ctx, in, info, handler) } func _LinkService_GetLink_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.GetLinkRequest) + in := new(v11.GetLinkRequest) if err := dec(in); err != nil { return nil, err } @@ -178,13 +178,13 @@ func _LinkService_GetLink_Handler(srv interface{}, ctx context.Context, dec func FullMethod: LinkService_GetLink_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(LinkServiceServer).GetLink(ctx, req.(*v1.GetLinkRequest)) + return srv.(LinkServiceServer).GetLink(ctx, req.(*v11.GetLinkRequest)) } return interceptor(ctx, in, info, handler) } func _LinkService_CreateLink_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.CreateLinkRequest) + in := new(v11.CreateLinkRequest) if err := dec(in); err != nil { return nil, err } @@ -196,13 +196,13 @@ func _LinkService_CreateLink_Handler(srv interface{}, ctx context.Context, dec f FullMethod: LinkService_CreateLink_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(LinkServiceServer).CreateLink(ctx, req.(*v1.CreateLinkRequest)) + return srv.(LinkServiceServer).CreateLink(ctx, req.(*v11.CreateLinkRequest)) } return interceptor(ctx, in, info, handler) } func _LinkService_UpdateLink_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.UpdateLinkRequest) + in := new(v11.UpdateLinkRequest) if err := dec(in); err != nil { return nil, err } @@ -214,13 +214,13 @@ func _LinkService_UpdateLink_Handler(srv interface{}, ctx context.Context, dec f FullMethod: LinkService_UpdateLink_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(LinkServiceServer).UpdateLink(ctx, req.(*v1.UpdateLinkRequest)) + return srv.(LinkServiceServer).UpdateLink(ctx, req.(*v11.UpdateLinkRequest)) } return interceptor(ctx, in, info, handler) } func _LinkService_DeleteLink_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.DeleteLinkRequest) + in := new(v11.DeleteLinkRequest) if err := dec(in); err != nil { return nil, err } @@ -232,7 +232,7 @@ func _LinkService_DeleteLink_Handler(srv interface{}, ctx context.Context, dec f FullMethod: LinkService_DeleteLink_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(LinkServiceServer).DeleteLink(ctx, req.(*v1.DeleteLinkRequest)) + return srv.(LinkServiceServer).DeleteLink(ctx, req.(*v11.DeleteLinkRequest)) } return interceptor(ctx, in, info, handler) } diff --git a/blog-backend/gen/api/go/admin/service/v1/i_link_http.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_link_http.pb.go index 9121a0f2..fbf559d7 100644 --- a/blog-backend/gen/api/go/admin/service/v1/i_link_http.pb.go +++ b/blog-backend/gen/api/go/admin/service/v1/i_link_http.pb.go @@ -4,15 +4,15 @@ // - protoc (unknown) // source: admin/service/v1/i_link.proto -package v1 +package servicev1 import ( context "context" http "github.com/go-kratos/kratos/v2/transport/http" binding "github.com/go-kratos/kratos/v2/transport/http/binding" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" - v1 "kratos-cms/gen/api/go/content/service/v1" + v11 "kratos-cms/gen/api/go/content/service/v1" ) // This is a compile-time assertion to ensure that this generated file @@ -30,15 +30,15 @@ const OperationLinkServiceUpdateLink = "/admin.service.v1.LinkService/UpdateLink type LinkServiceHTTPServer interface { // CreateLink 创建链接 - CreateLink(context.Context, *v1.CreateLinkRequest) (*v1.Link, error) + CreateLink(context.Context, *v11.CreateLinkRequest) (*v11.Link, error) // DeleteLink 删除链接 - DeleteLink(context.Context, *v1.DeleteLinkRequest) (*emptypb.Empty, error) + DeleteLink(context.Context, *v11.DeleteLinkRequest) (*emptypb.Empty, error) // GetLink 获取链接数据 - GetLink(context.Context, *v1.GetLinkRequest) (*v1.Link, error) + GetLink(context.Context, *v11.GetLinkRequest) (*v11.Link, error) // ListLink 获取链接列表 - ListLink(context.Context, *pagination.PagingRequest) (*v1.ListLinkResponse, error) + ListLink(context.Context, *v1.PagingRequest) (*v11.ListLinkResponse, error) // UpdateLink 更新链接 - UpdateLink(context.Context, *v1.UpdateLinkRequest) (*v1.Link, error) + UpdateLink(context.Context, *v11.UpdateLinkRequest) (*v11.Link, error) } func RegisterLinkServiceHTTPServer(s *http.Server, srv LinkServiceHTTPServer) { @@ -52,26 +52,26 @@ func RegisterLinkServiceHTTPServer(s *http.Server, srv LinkServiceHTTPServer) { func _LinkService_ListLink0_HTTP_Handler(srv LinkServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in pagination.PagingRequest + var in v1.PagingRequest if err := ctx.BindQuery(&in); err != nil { return err } http.SetOperation(ctx, OperationLinkServiceListLink) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.ListLink(ctx, req.(*pagination.PagingRequest)) + return srv.ListLink(ctx, req.(*v1.PagingRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.ListLinkResponse) + reply := out.(*v11.ListLinkResponse) return ctx.Result(200, reply) } } func _LinkService_GetLink0_HTTP_Handler(srv LinkServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.GetLinkRequest + var in v11.GetLinkRequest if err := ctx.BindQuery(&in); err != nil { return err } @@ -80,20 +80,20 @@ func _LinkService_GetLink0_HTTP_Handler(srv LinkServiceHTTPServer) func(ctx http } http.SetOperation(ctx, OperationLinkServiceGetLink) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.GetLink(ctx, req.(*v1.GetLinkRequest)) + return srv.GetLink(ctx, req.(*v11.GetLinkRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.Link) + reply := out.(*v11.Link) return ctx.Result(200, reply) } } func _LinkService_CreateLink0_HTTP_Handler(srv LinkServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.CreateLinkRequest + var in v11.CreateLinkRequest if err := ctx.Bind(&in); err != nil { return err } @@ -102,20 +102,20 @@ func _LinkService_CreateLink0_HTTP_Handler(srv LinkServiceHTTPServer) func(ctx h } http.SetOperation(ctx, OperationLinkServiceCreateLink) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.CreateLink(ctx, req.(*v1.CreateLinkRequest)) + return srv.CreateLink(ctx, req.(*v11.CreateLinkRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.Link) + reply := out.(*v11.Link) return ctx.Result(200, reply) } } func _LinkService_UpdateLink0_HTTP_Handler(srv LinkServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.UpdateLinkRequest + var in v11.UpdateLinkRequest if err := ctx.Bind(&in.Link); err != nil { return err } @@ -127,20 +127,20 @@ func _LinkService_UpdateLink0_HTTP_Handler(srv LinkServiceHTTPServer) func(ctx h } http.SetOperation(ctx, OperationLinkServiceUpdateLink) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.UpdateLink(ctx, req.(*v1.UpdateLinkRequest)) + return srv.UpdateLink(ctx, req.(*v11.UpdateLinkRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.Link) + reply := out.(*v11.Link) return ctx.Result(200, reply) } } func _LinkService_DeleteLink0_HTTP_Handler(srv LinkServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.DeleteLinkRequest + var in v11.DeleteLinkRequest if err := ctx.BindQuery(&in); err != nil { return err } @@ -149,7 +149,7 @@ func _LinkService_DeleteLink0_HTTP_Handler(srv LinkServiceHTTPServer) func(ctx h } http.SetOperation(ctx, OperationLinkServiceDeleteLink) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.DeleteLink(ctx, req.(*v1.DeleteLinkRequest)) + return srv.DeleteLink(ctx, req.(*v11.DeleteLinkRequest)) }) out, err := h(ctx, &in) if err != nil { @@ -161,11 +161,11 @@ func _LinkService_DeleteLink0_HTTP_Handler(srv LinkServiceHTTPServer) func(ctx h } type LinkServiceHTTPClient interface { - CreateLink(ctx context.Context, req *v1.CreateLinkRequest, opts ...http.CallOption) (rsp *v1.Link, err error) - DeleteLink(ctx context.Context, req *v1.DeleteLinkRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error) - GetLink(ctx context.Context, req *v1.GetLinkRequest, opts ...http.CallOption) (rsp *v1.Link, err error) - ListLink(ctx context.Context, req *pagination.PagingRequest, opts ...http.CallOption) (rsp *v1.ListLinkResponse, err error) - UpdateLink(ctx context.Context, req *v1.UpdateLinkRequest, opts ...http.CallOption) (rsp *v1.Link, err error) + CreateLink(ctx context.Context, req *v11.CreateLinkRequest, opts ...http.CallOption) (rsp *v11.Link, err error) + DeleteLink(ctx context.Context, req *v11.DeleteLinkRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error) + GetLink(ctx context.Context, req *v11.GetLinkRequest, opts ...http.CallOption) (rsp *v11.Link, err error) + ListLink(ctx context.Context, req *v1.PagingRequest, opts ...http.CallOption) (rsp *v11.ListLinkResponse, err error) + UpdateLink(ctx context.Context, req *v11.UpdateLinkRequest, opts ...http.CallOption) (rsp *v11.Link, err error) } type LinkServiceHTTPClientImpl struct { @@ -176,8 +176,8 @@ func NewLinkServiceHTTPClient(client *http.Client) LinkServiceHTTPClient { return &LinkServiceHTTPClientImpl{client} } -func (c *LinkServiceHTTPClientImpl) CreateLink(ctx context.Context, in *v1.CreateLinkRequest, opts ...http.CallOption) (*v1.Link, error) { - var out v1.Link +func (c *LinkServiceHTTPClientImpl) CreateLink(ctx context.Context, in *v11.CreateLinkRequest, opts ...http.CallOption) (*v11.Link, error) { + var out v11.Link pattern := "/admin/v1/links" path := binding.EncodeURL(pattern, in, false) opts = append(opts, http.Operation(OperationLinkServiceCreateLink)) @@ -189,7 +189,7 @@ func (c *LinkServiceHTTPClientImpl) CreateLink(ctx context.Context, in *v1.Creat return &out, err } -func (c *LinkServiceHTTPClientImpl) DeleteLink(ctx context.Context, in *v1.DeleteLinkRequest, opts ...http.CallOption) (*emptypb.Empty, error) { +func (c *LinkServiceHTTPClientImpl) DeleteLink(ctx context.Context, in *v11.DeleteLinkRequest, opts ...http.CallOption) (*emptypb.Empty, error) { var out emptypb.Empty pattern := "/admin/v1/links/{id}" path := binding.EncodeURL(pattern, in, true) @@ -202,8 +202,8 @@ func (c *LinkServiceHTTPClientImpl) DeleteLink(ctx context.Context, in *v1.Delet return &out, err } -func (c *LinkServiceHTTPClientImpl) GetLink(ctx context.Context, in *v1.GetLinkRequest, opts ...http.CallOption) (*v1.Link, error) { - var out v1.Link +func (c *LinkServiceHTTPClientImpl) GetLink(ctx context.Context, in *v11.GetLinkRequest, opts ...http.CallOption) (*v11.Link, error) { + var out v11.Link pattern := "/admin/v1/links/{id}" path := binding.EncodeURL(pattern, in, true) opts = append(opts, http.Operation(OperationLinkServiceGetLink)) @@ -215,8 +215,8 @@ func (c *LinkServiceHTTPClientImpl) GetLink(ctx context.Context, in *v1.GetLinkR return &out, err } -func (c *LinkServiceHTTPClientImpl) ListLink(ctx context.Context, in *pagination.PagingRequest, opts ...http.CallOption) (*v1.ListLinkResponse, error) { - var out v1.ListLinkResponse +func (c *LinkServiceHTTPClientImpl) ListLink(ctx context.Context, in *v1.PagingRequest, opts ...http.CallOption) (*v11.ListLinkResponse, error) { + var out v11.ListLinkResponse pattern := "/admin/v1/links" path := binding.EncodeURL(pattern, in, true) opts = append(opts, http.Operation(OperationLinkServiceListLink)) @@ -228,8 +228,8 @@ func (c *LinkServiceHTTPClientImpl) ListLink(ctx context.Context, in *pagination return &out, err } -func (c *LinkServiceHTTPClientImpl) UpdateLink(ctx context.Context, in *v1.UpdateLinkRequest, opts ...http.CallOption) (*v1.Link, error) { - var out v1.Link +func (c *LinkServiceHTTPClientImpl) UpdateLink(ctx context.Context, in *v11.UpdateLinkRequest, opts ...http.CallOption) (*v11.Link, error) { + var out v11.Link pattern := "/admin/v1/links/{id}" path := binding.EncodeURL(pattern, in, false) opts = append(opts, http.Operation(OperationLinkServiceUpdateLink)) diff --git a/blog-backend/gen/api/go/admin/service/v1/i_menu.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_menu.pb.go index f6f0b37d..2657d976 100644 --- a/blog-backend/gen/api/go/admin/service/v1/i_menu.pb.go +++ b/blog-backend/gen/api/go/admin/service/v1/i_menu.pb.go @@ -4,16 +4,16 @@ // protoc (unknown) // source: admin/service/v1/i_menu.proto -package v1 +package servicev1 import ( _ "github.com/google/gnostic/openapiv3" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" - v1 "kratos-cms/gen/api/go/content/service/v1" + v11 "kratos-cms/gen/api/go/content/service/v1" reflect "reflect" ) @@ -36,69 +36,78 @@ var file_admin_service_v1_i_menu_proto_rawDesc = []byte{ 0x61, 0x70, 0x69, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x1a, 0x22, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2f, - 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x6d, 0x65, 0x6e, 0x75, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0xc3, 0x05, 0x0a, 0x0b, 0x4d, 0x65, 0x6e, 0x75, 0x53, 0x65, - 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x83, 0x01, 0x0a, 0x08, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, - 0x6e, 0x75, 0x12, 0x19, 0x2e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, - 0x50, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, + 0x74, 0x6f, 0x1a, 0x1e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x76, + 0x31, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x1a, 0x1d, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2f, 0x73, 0x65, 0x72, 0x76, + 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x6d, 0x65, 0x6e, 0x75, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x32, 0xc3, 0x05, 0x0a, 0x0b, 0x4d, 0x65, 0x6e, 0x75, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x12, 0x83, 0x01, 0x0a, 0x08, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6e, 0x75, 0x12, 0x19, + 0x2e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x50, 0x61, 0x67, 0x69, + 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x63, 0x6f, 0x6e, 0x74, + 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, + 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6e, 0x75, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, + 0x36, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, + 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, + 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x11, 0x12, 0x0f, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, + 0x31, 0x2f, 0x6d, 0x65, 0x6e, 0x75, 0x73, 0x12, 0x84, 0x01, 0x0a, 0x07, 0x47, 0x65, 0x74, 0x4d, + 0x65, 0x6e, 0x75, 0x12, 0x22, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, + 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x4d, 0x65, 0x6e, 0x75, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, + 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x65, 0x6e, + 0x75, 0x22, 0x3b, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, + 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, + 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x16, 0x12, 0x14, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, + 0x2f, 0x76, 0x31, 0x2f, 0x6d, 0x65, 0x6e, 0x75, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x88, + 0x01, 0x0a, 0x0a, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x12, 0x25, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, - 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6e, 0x75, 0x52, 0x65, 0x73, 0x70, 0x6f, - 0x6e, 0x73, 0x65, 0x22, 0x36, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, - 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, - 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x11, 0x12, 0x0f, 0x2f, 0x61, 0x64, 0x6d, - 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x6d, 0x65, 0x6e, 0x75, 0x73, 0x12, 0x84, 0x01, 0x0a, 0x07, - 0x47, 0x65, 0x74, 0x4d, 0x65, 0x6e, 0x75, 0x12, 0x22, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, - 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, - 0x4d, 0x65, 0x6e, 0x75, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x63, 0x6f, - 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, - 0x2e, 0x4d, 0x65, 0x6e, 0x75, 0x22, 0x3b, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, - 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, - 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x16, 0x12, 0x14, 0x2f, 0x61, - 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x6d, 0x65, 0x6e, 0x75, 0x73, 0x2f, 0x7b, 0x69, - 0x64, 0x7d, 0x12, 0x88, 0x01, 0x0a, 0x0a, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6e, - 0x75, 0x12, 0x25, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, - 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6e, - 0x75, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, - 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x65, - 0x6e, 0x75, 0x22, 0x39, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, - 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, - 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x14, 0x3a, 0x01, 0x2a, 0x22, 0x0f, 0x2f, 0x61, - 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x6d, 0x65, 0x6e, 0x75, 0x73, 0x12, 0x90, 0x01, - 0x0a, 0x0a, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x12, 0x25, 0x2e, 0x63, - 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, - 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, - 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x65, 0x6e, 0x75, 0x22, 0x41, 0xba, - 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, - 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, - 0xe4, 0x93, 0x02, 0x1c, 0x3a, 0x04, 0x6d, 0x65, 0x6e, 0x75, 0x1a, 0x14, 0x2f, 0x61, 0x64, 0x6d, - 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x6d, 0x65, 0x6e, 0x75, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, - 0x12, 0x88, 0x01, 0x0a, 0x0a, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x12, - 0x25, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, - 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x3b, + 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, + 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x65, 0x6e, 0x75, 0x22, 0x39, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, - 0xd3, 0xe4, 0x93, 0x02, 0x16, 0x2a, 0x14, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, - 0x2f, 0x6d, 0x65, 0x6e, 0x75, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x42, 0x2b, 0x5a, 0x29, 0x6b, - 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x63, 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x70, - 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, - 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0xd3, 0xe4, 0x93, 0x02, 0x14, 0x3a, 0x01, 0x2a, 0x22, 0x0f, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, + 0x2f, 0x76, 0x31, 0x2f, 0x6d, 0x65, 0x6e, 0x75, 0x73, 0x12, 0x90, 0x01, 0x0a, 0x0a, 0x55, 0x70, + 0x64, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x12, 0x25, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, + 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, + 0x64, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, + 0x18, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x65, 0x6e, 0x75, 0x22, 0x41, 0xba, 0x47, 0x1c, 0x5a, 0x1a, + 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, + 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1c, + 0x3a, 0x04, 0x6d, 0x65, 0x6e, 0x75, 0x1a, 0x14, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, + 0x31, 0x2f, 0x6d, 0x65, 0x6e, 0x75, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x88, 0x01, 0x0a, + 0x0a, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x12, 0x25, 0x2e, 0x63, 0x6f, + 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, + 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x52, 0x65, 0x71, 0x75, 0x65, + 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x3b, 0xba, 0x47, 0x1c, 0x5a, + 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, + 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, + 0x16, 0x2a, 0x14, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x6d, 0x65, 0x6e, + 0x75, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x42, 0xb6, 0x01, 0x0a, 0x14, 0x63, 0x6f, 0x6d, 0x2e, + 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, + 0x42, 0x0a, 0x49, 0x4d, 0x65, 0x6e, 0x75, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x30, + 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x63, 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, + 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x73, 0x65, 0x72, 0x76, + 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x76, 0x31, + 0xa2, 0x02, 0x03, 0x41, 0x53, 0x58, 0xaa, 0x02, 0x10, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x53, + 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x10, 0x41, 0x64, 0x6d, 0x69, + 0x6e, 0x5c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1c, 0x41, + 0x64, 0x6d, 0x69, 0x6e, 0x5c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x56, 0x31, 0x5c, + 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x12, 0x41, 0x64, + 0x6d, 0x69, 0x6e, 0x3a, 0x3a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x3a, 0x3a, 0x56, 0x31, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var file_admin_service_v1_i_menu_proto_goTypes = []interface{}{ - (*pagination.PagingRequest)(nil), // 0: pagination.PagingRequest - (*v1.GetMenuRequest)(nil), // 1: content.service.v1.GetMenuRequest - (*v1.CreateMenuRequest)(nil), // 2: content.service.v1.CreateMenuRequest - (*v1.UpdateMenuRequest)(nil), // 3: content.service.v1.UpdateMenuRequest - (*v1.DeleteMenuRequest)(nil), // 4: content.service.v1.DeleteMenuRequest - (*v1.ListMenuResponse)(nil), // 5: content.service.v1.ListMenuResponse - (*v1.Menu)(nil), // 6: content.service.v1.Menu - (*emptypb.Empty)(nil), // 7: google.protobuf.Empty + (*v1.PagingRequest)(nil), // 0: pagination.PagingRequest + (*v11.GetMenuRequest)(nil), // 1: content.service.v1.GetMenuRequest + (*v11.CreateMenuRequest)(nil), // 2: content.service.v1.CreateMenuRequest + (*v11.UpdateMenuRequest)(nil), // 3: content.service.v1.UpdateMenuRequest + (*v11.DeleteMenuRequest)(nil), // 4: content.service.v1.DeleteMenuRequest + (*v11.ListMenuResponse)(nil), // 5: content.service.v1.ListMenuResponse + (*v11.Menu)(nil), // 6: content.service.v1.Menu + (*emptypb.Empty)(nil), // 7: google.protobuf.Empty } var file_admin_service_v1_i_menu_proto_depIdxs = []int32{ 0, // 0: admin.service.v1.MenuService.ListMenu:input_type -> pagination.PagingRequest diff --git a/blog-backend/gen/api/go/admin/service/v1/i_menu.pb.validate.go b/blog-backend/gen/api/go/admin/service/v1/i_menu.pb.validate.go index 12a14338..036e2823 100644 --- a/blog-backend/gen/api/go/admin/service/v1/i_menu.pb.validate.go +++ b/blog-backend/gen/api/go/admin/service/v1/i_menu.pb.validate.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-validate. DO NOT EDIT. // source: admin/service/v1/i_menu.proto -package v1 +package servicev1 import ( "bytes" diff --git a/blog-backend/gen/api/go/admin/service/v1/i_menu_grpc.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_menu_grpc.pb.go index d04a3c05..5a8f23e8 100644 --- a/blog-backend/gen/api/go/admin/service/v1/i_menu_grpc.pb.go +++ b/blog-backend/gen/api/go/admin/service/v1/i_menu_grpc.pb.go @@ -4,16 +4,16 @@ // - protoc (unknown) // source: admin/service/v1/i_menu.proto -package v1 +package servicev1 import ( context "context" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" - v1 "kratos-cms/gen/api/go/content/service/v1" + v11 "kratos-cms/gen/api/go/content/service/v1" ) // This is a compile-time assertion to ensure that this generated file @@ -34,15 +34,15 @@ const ( // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type MenuServiceClient interface { // 获取目录列表 - ListMenu(ctx context.Context, in *pagination.PagingRequest, opts ...grpc.CallOption) (*v1.ListMenuResponse, error) + ListMenu(ctx context.Context, in *v1.PagingRequest, opts ...grpc.CallOption) (*v11.ListMenuResponse, error) // 获取目录数据 - GetMenu(ctx context.Context, in *v1.GetMenuRequest, opts ...grpc.CallOption) (*v1.Menu, error) + GetMenu(ctx context.Context, in *v11.GetMenuRequest, opts ...grpc.CallOption) (*v11.Menu, error) // 创建目录 - CreateMenu(ctx context.Context, in *v1.CreateMenuRequest, opts ...grpc.CallOption) (*v1.Menu, error) + CreateMenu(ctx context.Context, in *v11.CreateMenuRequest, opts ...grpc.CallOption) (*v11.Menu, error) // 更新目录 - UpdateMenu(ctx context.Context, in *v1.UpdateMenuRequest, opts ...grpc.CallOption) (*v1.Menu, error) + UpdateMenu(ctx context.Context, in *v11.UpdateMenuRequest, opts ...grpc.CallOption) (*v11.Menu, error) // 删除目录 - DeleteMenu(ctx context.Context, in *v1.DeleteMenuRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) + DeleteMenu(ctx context.Context, in *v11.DeleteMenuRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) } type menuServiceClient struct { @@ -53,8 +53,8 @@ func NewMenuServiceClient(cc grpc.ClientConnInterface) MenuServiceClient { return &menuServiceClient{cc} } -func (c *menuServiceClient) ListMenu(ctx context.Context, in *pagination.PagingRequest, opts ...grpc.CallOption) (*v1.ListMenuResponse, error) { - out := new(v1.ListMenuResponse) +func (c *menuServiceClient) ListMenu(ctx context.Context, in *v1.PagingRequest, opts ...grpc.CallOption) (*v11.ListMenuResponse, error) { + out := new(v11.ListMenuResponse) err := c.cc.Invoke(ctx, MenuService_ListMenu_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -62,8 +62,8 @@ func (c *menuServiceClient) ListMenu(ctx context.Context, in *pagination.PagingR return out, nil } -func (c *menuServiceClient) GetMenu(ctx context.Context, in *v1.GetMenuRequest, opts ...grpc.CallOption) (*v1.Menu, error) { - out := new(v1.Menu) +func (c *menuServiceClient) GetMenu(ctx context.Context, in *v11.GetMenuRequest, opts ...grpc.CallOption) (*v11.Menu, error) { + out := new(v11.Menu) err := c.cc.Invoke(ctx, MenuService_GetMenu_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -71,8 +71,8 @@ func (c *menuServiceClient) GetMenu(ctx context.Context, in *v1.GetMenuRequest, return out, nil } -func (c *menuServiceClient) CreateMenu(ctx context.Context, in *v1.CreateMenuRequest, opts ...grpc.CallOption) (*v1.Menu, error) { - out := new(v1.Menu) +func (c *menuServiceClient) CreateMenu(ctx context.Context, in *v11.CreateMenuRequest, opts ...grpc.CallOption) (*v11.Menu, error) { + out := new(v11.Menu) err := c.cc.Invoke(ctx, MenuService_CreateMenu_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -80,8 +80,8 @@ func (c *menuServiceClient) CreateMenu(ctx context.Context, in *v1.CreateMenuReq return out, nil } -func (c *menuServiceClient) UpdateMenu(ctx context.Context, in *v1.UpdateMenuRequest, opts ...grpc.CallOption) (*v1.Menu, error) { - out := new(v1.Menu) +func (c *menuServiceClient) UpdateMenu(ctx context.Context, in *v11.UpdateMenuRequest, opts ...grpc.CallOption) (*v11.Menu, error) { + out := new(v11.Menu) err := c.cc.Invoke(ctx, MenuService_UpdateMenu_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -89,7 +89,7 @@ func (c *menuServiceClient) UpdateMenu(ctx context.Context, in *v1.UpdateMenuReq return out, nil } -func (c *menuServiceClient) DeleteMenu(ctx context.Context, in *v1.DeleteMenuRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { +func (c *menuServiceClient) DeleteMenu(ctx context.Context, in *v11.DeleteMenuRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { out := new(emptypb.Empty) err := c.cc.Invoke(ctx, MenuService_DeleteMenu_FullMethodName, in, out, opts...) if err != nil { @@ -103,15 +103,15 @@ func (c *menuServiceClient) DeleteMenu(ctx context.Context, in *v1.DeleteMenuReq // for forward compatibility type MenuServiceServer interface { // 获取目录列表 - ListMenu(context.Context, *pagination.PagingRequest) (*v1.ListMenuResponse, error) + ListMenu(context.Context, *v1.PagingRequest) (*v11.ListMenuResponse, error) // 获取目录数据 - GetMenu(context.Context, *v1.GetMenuRequest) (*v1.Menu, error) + GetMenu(context.Context, *v11.GetMenuRequest) (*v11.Menu, error) // 创建目录 - CreateMenu(context.Context, *v1.CreateMenuRequest) (*v1.Menu, error) + CreateMenu(context.Context, *v11.CreateMenuRequest) (*v11.Menu, error) // 更新目录 - UpdateMenu(context.Context, *v1.UpdateMenuRequest) (*v1.Menu, error) + UpdateMenu(context.Context, *v11.UpdateMenuRequest) (*v11.Menu, error) // 删除目录 - DeleteMenu(context.Context, *v1.DeleteMenuRequest) (*emptypb.Empty, error) + DeleteMenu(context.Context, *v11.DeleteMenuRequest) (*emptypb.Empty, error) mustEmbedUnimplementedMenuServiceServer() } @@ -119,19 +119,19 @@ type MenuServiceServer interface { type UnimplementedMenuServiceServer struct { } -func (UnimplementedMenuServiceServer) ListMenu(context.Context, *pagination.PagingRequest) (*v1.ListMenuResponse, error) { +func (UnimplementedMenuServiceServer) ListMenu(context.Context, *v1.PagingRequest) (*v11.ListMenuResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListMenu not implemented") } -func (UnimplementedMenuServiceServer) GetMenu(context.Context, *v1.GetMenuRequest) (*v1.Menu, error) { +func (UnimplementedMenuServiceServer) GetMenu(context.Context, *v11.GetMenuRequest) (*v11.Menu, error) { return nil, status.Errorf(codes.Unimplemented, "method GetMenu not implemented") } -func (UnimplementedMenuServiceServer) CreateMenu(context.Context, *v1.CreateMenuRequest) (*v1.Menu, error) { +func (UnimplementedMenuServiceServer) CreateMenu(context.Context, *v11.CreateMenuRequest) (*v11.Menu, error) { return nil, status.Errorf(codes.Unimplemented, "method CreateMenu not implemented") } -func (UnimplementedMenuServiceServer) UpdateMenu(context.Context, *v1.UpdateMenuRequest) (*v1.Menu, error) { +func (UnimplementedMenuServiceServer) UpdateMenu(context.Context, *v11.UpdateMenuRequest) (*v11.Menu, error) { return nil, status.Errorf(codes.Unimplemented, "method UpdateMenu not implemented") } -func (UnimplementedMenuServiceServer) DeleteMenu(context.Context, *v1.DeleteMenuRequest) (*emptypb.Empty, error) { +func (UnimplementedMenuServiceServer) DeleteMenu(context.Context, *v11.DeleteMenuRequest) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method DeleteMenu not implemented") } func (UnimplementedMenuServiceServer) mustEmbedUnimplementedMenuServiceServer() {} @@ -148,7 +148,7 @@ func RegisterMenuServiceServer(s grpc.ServiceRegistrar, srv MenuServiceServer) { } func _MenuService_ListMenu_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(pagination.PagingRequest) + in := new(v1.PagingRequest) if err := dec(in); err != nil { return nil, err } @@ -160,13 +160,13 @@ func _MenuService_ListMenu_Handler(srv interface{}, ctx context.Context, dec fun FullMethod: MenuService_ListMenu_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MenuServiceServer).ListMenu(ctx, req.(*pagination.PagingRequest)) + return srv.(MenuServiceServer).ListMenu(ctx, req.(*v1.PagingRequest)) } return interceptor(ctx, in, info, handler) } func _MenuService_GetMenu_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.GetMenuRequest) + in := new(v11.GetMenuRequest) if err := dec(in); err != nil { return nil, err } @@ -178,13 +178,13 @@ func _MenuService_GetMenu_Handler(srv interface{}, ctx context.Context, dec func FullMethod: MenuService_GetMenu_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MenuServiceServer).GetMenu(ctx, req.(*v1.GetMenuRequest)) + return srv.(MenuServiceServer).GetMenu(ctx, req.(*v11.GetMenuRequest)) } return interceptor(ctx, in, info, handler) } func _MenuService_CreateMenu_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.CreateMenuRequest) + in := new(v11.CreateMenuRequest) if err := dec(in); err != nil { return nil, err } @@ -196,13 +196,13 @@ func _MenuService_CreateMenu_Handler(srv interface{}, ctx context.Context, dec f FullMethod: MenuService_CreateMenu_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MenuServiceServer).CreateMenu(ctx, req.(*v1.CreateMenuRequest)) + return srv.(MenuServiceServer).CreateMenu(ctx, req.(*v11.CreateMenuRequest)) } return interceptor(ctx, in, info, handler) } func _MenuService_UpdateMenu_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.UpdateMenuRequest) + in := new(v11.UpdateMenuRequest) if err := dec(in); err != nil { return nil, err } @@ -214,13 +214,13 @@ func _MenuService_UpdateMenu_Handler(srv interface{}, ctx context.Context, dec f FullMethod: MenuService_UpdateMenu_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MenuServiceServer).UpdateMenu(ctx, req.(*v1.UpdateMenuRequest)) + return srv.(MenuServiceServer).UpdateMenu(ctx, req.(*v11.UpdateMenuRequest)) } return interceptor(ctx, in, info, handler) } func _MenuService_DeleteMenu_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.DeleteMenuRequest) + in := new(v11.DeleteMenuRequest) if err := dec(in); err != nil { return nil, err } @@ -232,7 +232,7 @@ func _MenuService_DeleteMenu_Handler(srv interface{}, ctx context.Context, dec f FullMethod: MenuService_DeleteMenu_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MenuServiceServer).DeleteMenu(ctx, req.(*v1.DeleteMenuRequest)) + return srv.(MenuServiceServer).DeleteMenu(ctx, req.(*v11.DeleteMenuRequest)) } return interceptor(ctx, in, info, handler) } diff --git a/blog-backend/gen/api/go/admin/service/v1/i_menu_http.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_menu_http.pb.go index 86c4d588..2a81f41f 100644 --- a/blog-backend/gen/api/go/admin/service/v1/i_menu_http.pb.go +++ b/blog-backend/gen/api/go/admin/service/v1/i_menu_http.pb.go @@ -4,15 +4,15 @@ // - protoc (unknown) // source: admin/service/v1/i_menu.proto -package v1 +package servicev1 import ( context "context" http "github.com/go-kratos/kratos/v2/transport/http" binding "github.com/go-kratos/kratos/v2/transport/http/binding" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" - v1 "kratos-cms/gen/api/go/content/service/v1" + v11 "kratos-cms/gen/api/go/content/service/v1" ) // This is a compile-time assertion to ensure that this generated file @@ -30,15 +30,15 @@ const OperationMenuServiceUpdateMenu = "/admin.service.v1.MenuService/UpdateMenu type MenuServiceHTTPServer interface { // CreateMenu 创建目录 - CreateMenu(context.Context, *v1.CreateMenuRequest) (*v1.Menu, error) + CreateMenu(context.Context, *v11.CreateMenuRequest) (*v11.Menu, error) // DeleteMenu 删除目录 - DeleteMenu(context.Context, *v1.DeleteMenuRequest) (*emptypb.Empty, error) + DeleteMenu(context.Context, *v11.DeleteMenuRequest) (*emptypb.Empty, error) // GetMenu 获取目录数据 - GetMenu(context.Context, *v1.GetMenuRequest) (*v1.Menu, error) + GetMenu(context.Context, *v11.GetMenuRequest) (*v11.Menu, error) // ListMenu 获取目录列表 - ListMenu(context.Context, *pagination.PagingRequest) (*v1.ListMenuResponse, error) + ListMenu(context.Context, *v1.PagingRequest) (*v11.ListMenuResponse, error) // UpdateMenu 更新目录 - UpdateMenu(context.Context, *v1.UpdateMenuRequest) (*v1.Menu, error) + UpdateMenu(context.Context, *v11.UpdateMenuRequest) (*v11.Menu, error) } func RegisterMenuServiceHTTPServer(s *http.Server, srv MenuServiceHTTPServer) { @@ -52,26 +52,26 @@ func RegisterMenuServiceHTTPServer(s *http.Server, srv MenuServiceHTTPServer) { func _MenuService_ListMenu0_HTTP_Handler(srv MenuServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in pagination.PagingRequest + var in v1.PagingRequest if err := ctx.BindQuery(&in); err != nil { return err } http.SetOperation(ctx, OperationMenuServiceListMenu) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.ListMenu(ctx, req.(*pagination.PagingRequest)) + return srv.ListMenu(ctx, req.(*v1.PagingRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.ListMenuResponse) + reply := out.(*v11.ListMenuResponse) return ctx.Result(200, reply) } } func _MenuService_GetMenu0_HTTP_Handler(srv MenuServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.GetMenuRequest + var in v11.GetMenuRequest if err := ctx.BindQuery(&in); err != nil { return err } @@ -80,20 +80,20 @@ func _MenuService_GetMenu0_HTTP_Handler(srv MenuServiceHTTPServer) func(ctx http } http.SetOperation(ctx, OperationMenuServiceGetMenu) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.GetMenu(ctx, req.(*v1.GetMenuRequest)) + return srv.GetMenu(ctx, req.(*v11.GetMenuRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.Menu) + reply := out.(*v11.Menu) return ctx.Result(200, reply) } } func _MenuService_CreateMenu0_HTTP_Handler(srv MenuServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.CreateMenuRequest + var in v11.CreateMenuRequest if err := ctx.Bind(&in); err != nil { return err } @@ -102,20 +102,20 @@ func _MenuService_CreateMenu0_HTTP_Handler(srv MenuServiceHTTPServer) func(ctx h } http.SetOperation(ctx, OperationMenuServiceCreateMenu) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.CreateMenu(ctx, req.(*v1.CreateMenuRequest)) + return srv.CreateMenu(ctx, req.(*v11.CreateMenuRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.Menu) + reply := out.(*v11.Menu) return ctx.Result(200, reply) } } func _MenuService_UpdateMenu0_HTTP_Handler(srv MenuServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.UpdateMenuRequest + var in v11.UpdateMenuRequest if err := ctx.Bind(&in.Menu); err != nil { return err } @@ -127,20 +127,20 @@ func _MenuService_UpdateMenu0_HTTP_Handler(srv MenuServiceHTTPServer) func(ctx h } http.SetOperation(ctx, OperationMenuServiceUpdateMenu) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.UpdateMenu(ctx, req.(*v1.UpdateMenuRequest)) + return srv.UpdateMenu(ctx, req.(*v11.UpdateMenuRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.Menu) + reply := out.(*v11.Menu) return ctx.Result(200, reply) } } func _MenuService_DeleteMenu0_HTTP_Handler(srv MenuServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.DeleteMenuRequest + var in v11.DeleteMenuRequest if err := ctx.BindQuery(&in); err != nil { return err } @@ -149,7 +149,7 @@ func _MenuService_DeleteMenu0_HTTP_Handler(srv MenuServiceHTTPServer) func(ctx h } http.SetOperation(ctx, OperationMenuServiceDeleteMenu) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.DeleteMenu(ctx, req.(*v1.DeleteMenuRequest)) + return srv.DeleteMenu(ctx, req.(*v11.DeleteMenuRequest)) }) out, err := h(ctx, &in) if err != nil { @@ -161,11 +161,11 @@ func _MenuService_DeleteMenu0_HTTP_Handler(srv MenuServiceHTTPServer) func(ctx h } type MenuServiceHTTPClient interface { - CreateMenu(ctx context.Context, req *v1.CreateMenuRequest, opts ...http.CallOption) (rsp *v1.Menu, err error) - DeleteMenu(ctx context.Context, req *v1.DeleteMenuRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error) - GetMenu(ctx context.Context, req *v1.GetMenuRequest, opts ...http.CallOption) (rsp *v1.Menu, err error) - ListMenu(ctx context.Context, req *pagination.PagingRequest, opts ...http.CallOption) (rsp *v1.ListMenuResponse, err error) - UpdateMenu(ctx context.Context, req *v1.UpdateMenuRequest, opts ...http.CallOption) (rsp *v1.Menu, err error) + CreateMenu(ctx context.Context, req *v11.CreateMenuRequest, opts ...http.CallOption) (rsp *v11.Menu, err error) + DeleteMenu(ctx context.Context, req *v11.DeleteMenuRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error) + GetMenu(ctx context.Context, req *v11.GetMenuRequest, opts ...http.CallOption) (rsp *v11.Menu, err error) + ListMenu(ctx context.Context, req *v1.PagingRequest, opts ...http.CallOption) (rsp *v11.ListMenuResponse, err error) + UpdateMenu(ctx context.Context, req *v11.UpdateMenuRequest, opts ...http.CallOption) (rsp *v11.Menu, err error) } type MenuServiceHTTPClientImpl struct { @@ -176,8 +176,8 @@ func NewMenuServiceHTTPClient(client *http.Client) MenuServiceHTTPClient { return &MenuServiceHTTPClientImpl{client} } -func (c *MenuServiceHTTPClientImpl) CreateMenu(ctx context.Context, in *v1.CreateMenuRequest, opts ...http.CallOption) (*v1.Menu, error) { - var out v1.Menu +func (c *MenuServiceHTTPClientImpl) CreateMenu(ctx context.Context, in *v11.CreateMenuRequest, opts ...http.CallOption) (*v11.Menu, error) { + var out v11.Menu pattern := "/admin/v1/menus" path := binding.EncodeURL(pattern, in, false) opts = append(opts, http.Operation(OperationMenuServiceCreateMenu)) @@ -189,7 +189,7 @@ func (c *MenuServiceHTTPClientImpl) CreateMenu(ctx context.Context, in *v1.Creat return &out, err } -func (c *MenuServiceHTTPClientImpl) DeleteMenu(ctx context.Context, in *v1.DeleteMenuRequest, opts ...http.CallOption) (*emptypb.Empty, error) { +func (c *MenuServiceHTTPClientImpl) DeleteMenu(ctx context.Context, in *v11.DeleteMenuRequest, opts ...http.CallOption) (*emptypb.Empty, error) { var out emptypb.Empty pattern := "/admin/v1/menus/{id}" path := binding.EncodeURL(pattern, in, true) @@ -202,8 +202,8 @@ func (c *MenuServiceHTTPClientImpl) DeleteMenu(ctx context.Context, in *v1.Delet return &out, err } -func (c *MenuServiceHTTPClientImpl) GetMenu(ctx context.Context, in *v1.GetMenuRequest, opts ...http.CallOption) (*v1.Menu, error) { - var out v1.Menu +func (c *MenuServiceHTTPClientImpl) GetMenu(ctx context.Context, in *v11.GetMenuRequest, opts ...http.CallOption) (*v11.Menu, error) { + var out v11.Menu pattern := "/admin/v1/menus/{id}" path := binding.EncodeURL(pattern, in, true) opts = append(opts, http.Operation(OperationMenuServiceGetMenu)) @@ -215,8 +215,8 @@ func (c *MenuServiceHTTPClientImpl) GetMenu(ctx context.Context, in *v1.GetMenuR return &out, err } -func (c *MenuServiceHTTPClientImpl) ListMenu(ctx context.Context, in *pagination.PagingRequest, opts ...http.CallOption) (*v1.ListMenuResponse, error) { - var out v1.ListMenuResponse +func (c *MenuServiceHTTPClientImpl) ListMenu(ctx context.Context, in *v1.PagingRequest, opts ...http.CallOption) (*v11.ListMenuResponse, error) { + var out v11.ListMenuResponse pattern := "/admin/v1/menus" path := binding.EncodeURL(pattern, in, true) opts = append(opts, http.Operation(OperationMenuServiceListMenu)) @@ -228,8 +228,8 @@ func (c *MenuServiceHTTPClientImpl) ListMenu(ctx context.Context, in *pagination return &out, err } -func (c *MenuServiceHTTPClientImpl) UpdateMenu(ctx context.Context, in *v1.UpdateMenuRequest, opts ...http.CallOption) (*v1.Menu, error) { - var out v1.Menu +func (c *MenuServiceHTTPClientImpl) UpdateMenu(ctx context.Context, in *v11.UpdateMenuRequest, opts ...http.CallOption) (*v11.Menu, error) { + var out v11.Menu pattern := "/admin/v1/menus/{id}" path := binding.EncodeURL(pattern, in, false) opts = append(opts, http.Operation(OperationMenuServiceUpdateMenu)) diff --git a/blog-backend/gen/api/go/admin/service/v1/i_photo.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_photo.pb.go index 8813c7f3..142680b1 100644 --- a/blog-backend/gen/api/go/admin/service/v1/i_photo.pb.go +++ b/blog-backend/gen/api/go/admin/service/v1/i_photo.pb.go @@ -4,16 +4,16 @@ // protoc (unknown) // source: admin/service/v1/i_photo.proto -package v1 +package servicev1 import ( _ "github.com/google/gnostic/openapiv3" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" - v1 "kratos-cms/gen/api/go/content/service/v1" + v11 "kratos-cms/gen/api/go/content/service/v1" reflect "reflect" ) @@ -36,71 +36,79 @@ var file_admin_service_v1_i_photo_proto_rawDesc = []byte{ 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x1a, 0x22, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x61, 0x67, 0x69, - 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, - 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x68, 0x6f, 0x74, - 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0xd7, 0x05, 0x0a, 0x0c, 0x50, 0x68, 0x6f, 0x74, - 0x6f, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x86, 0x01, 0x0a, 0x09, 0x4c, 0x69, 0x73, - 0x74, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x12, 0x19, 0x2e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x2e, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x1a, 0x25, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, - 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x68, 0x6f, 0x74, 0x6f, - 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x37, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, - 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, - 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x12, 0x12, - 0x10, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x68, 0x6f, 0x74, 0x6f, - 0x73, 0x12, 0x88, 0x01, 0x0a, 0x08, 0x47, 0x65, 0x74, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x12, 0x23, - 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, - 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x1a, 0x19, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, - 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x22, 0x3c, - 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, - 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, - 0xd3, 0xe4, 0x93, 0x02, 0x17, 0x12, 0x15, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, - 0x2f, 0x70, 0x68, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x8c, 0x01, 0x0a, - 0x0b, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x12, 0x26, 0x2e, 0x63, - 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, - 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x1a, 0x19, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, - 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x22, - 0x3a, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, + 0x6f, 0x74, 0x6f, 0x1a, 0x1e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, + 0x76, 0x31, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x1a, 0x1e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2f, 0x73, 0x65, 0x72, + 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x68, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x32, 0xd7, 0x05, 0x0a, 0x0c, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x53, 0x65, 0x72, + 0x76, 0x69, 0x63, 0x65, 0x12, 0x86, 0x01, 0x0a, 0x09, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x68, 0x6f, + 0x74, 0x6f, 0x12, 0x19, 0x2e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, + 0x50, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x25, 0x2e, + 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, + 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x37, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, + 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, + 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x12, 0x12, 0x10, 0x2f, 0x61, 0x64, + 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x68, 0x6f, 0x74, 0x6f, 0x73, 0x12, 0x88, 0x01, + 0x0a, 0x08, 0x47, 0x65, 0x74, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x12, 0x23, 0x2e, 0x63, 0x6f, 0x6e, + 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, + 0x47, 0x65, 0x74, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, + 0x19, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x22, 0x3c, 0xba, 0x47, 0x1c, 0x5a, + 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, + 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, + 0x17, 0x12, 0x15, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x68, 0x6f, + 0x74, 0x6f, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x8c, 0x01, 0x0a, 0x0b, 0x43, 0x72, 0x65, + 0x61, 0x74, 0x65, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x12, 0x26, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, + 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, + 0x65, 0x61, 0x74, 0x65, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x1a, 0x19, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, + 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x22, 0x3a, 0xba, 0x47, 0x1c, + 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, + 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, + 0x02, 0x15, 0x3a, 0x01, 0x2a, 0x22, 0x10, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, + 0x2f, 0x70, 0x68, 0x6f, 0x74, 0x6f, 0x73, 0x12, 0x95, 0x01, 0x0a, 0x0b, 0x55, 0x70, 0x64, 0x61, + 0x74, 0x65, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x12, 0x26, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, + 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, + 0x61, 0x74, 0x65, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, + 0x19, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x22, 0x43, 0xba, 0x47, 0x1c, 0x5a, + 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, + 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, + 0x1e, 0x3a, 0x05, 0x70, 0x68, 0x6f, 0x74, 0x6f, 0x1a, 0x15, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, + 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x68, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, + 0x8b, 0x01, 0x0a, 0x0b, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x12, + 0x26, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x50, 0x68, 0x6f, 0x74, 0x6f, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, + 0x3c, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, - 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x15, 0x3a, 0x01, 0x2a, 0x22, 0x10, 0x2f, 0x61, 0x64, 0x6d, 0x69, - 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x68, 0x6f, 0x74, 0x6f, 0x73, 0x12, 0x95, 0x01, 0x0a, 0x0b, - 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x12, 0x26, 0x2e, 0x63, 0x6f, - 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, - 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x1a, 0x19, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, - 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x22, 0x43, - 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, - 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, - 0xd3, 0xe4, 0x93, 0x02, 0x1e, 0x3a, 0x05, 0x70, 0x68, 0x6f, 0x74, 0x6f, 0x1a, 0x15, 0x2f, 0x61, - 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x68, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x7b, - 0x69, 0x64, 0x7d, 0x12, 0x8b, 0x01, 0x0a, 0x0b, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x50, 0x68, - 0x6f, 0x74, 0x6f, 0x12, 0x26, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, - 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x50, - 0x68, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, - 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, - 0x70, 0x74, 0x79, 0x22, 0x3c, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, - 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, - 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x17, 0x2a, 0x15, 0x2f, 0x61, 0x64, 0x6d, - 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x68, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x7b, 0x69, 0x64, - 0x7d, 0x42, 0x2b, 0x5a, 0x29, 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x63, 0x6d, 0x73, 0x2f, - 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, - 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x76, 0x31, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x17, 0x2a, 0x15, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, + 0x31, 0x2f, 0x70, 0x68, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x42, 0xb7, 0x01, + 0x0a, 0x14, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x73, 0x65, 0x72, 0x76, + 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x42, 0x0b, 0x49, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x30, 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x63, 0x6d, + 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x61, 0x64, 0x6d, + 0x69, 0x6e, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x73, 0x65, + 0x72, 0x76, 0x69, 0x63, 0x65, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x41, 0x53, 0x58, 0xaa, 0x02, 0x10, + 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x56, 0x31, + 0xca, 0x02, 0x10, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x5c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, + 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1c, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x5c, 0x53, 0x65, 0x72, 0x76, + 0x69, 0x63, 0x65, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, + 0x74, 0x61, 0xea, 0x02, 0x12, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x3a, 0x3a, 0x53, 0x65, 0x72, 0x76, + 0x69, 0x63, 0x65, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var file_admin_service_v1_i_photo_proto_goTypes = []interface{}{ - (*pagination.PagingRequest)(nil), // 0: pagination.PagingRequest - (*v1.GetPhotoRequest)(nil), // 1: content.service.v1.GetPhotoRequest - (*v1.CreatePhotoRequest)(nil), // 2: content.service.v1.CreatePhotoRequest - (*v1.UpdatePhotoRequest)(nil), // 3: content.service.v1.UpdatePhotoRequest - (*v1.DeletePhotoRequest)(nil), // 4: content.service.v1.DeletePhotoRequest - (*v1.ListPhotoResponse)(nil), // 5: content.service.v1.ListPhotoResponse - (*v1.Photo)(nil), // 6: content.service.v1.Photo - (*emptypb.Empty)(nil), // 7: google.protobuf.Empty + (*v1.PagingRequest)(nil), // 0: pagination.PagingRequest + (*v11.GetPhotoRequest)(nil), // 1: content.service.v1.GetPhotoRequest + (*v11.CreatePhotoRequest)(nil), // 2: content.service.v1.CreatePhotoRequest + (*v11.UpdatePhotoRequest)(nil), // 3: content.service.v1.UpdatePhotoRequest + (*v11.DeletePhotoRequest)(nil), // 4: content.service.v1.DeletePhotoRequest + (*v11.ListPhotoResponse)(nil), // 5: content.service.v1.ListPhotoResponse + (*v11.Photo)(nil), // 6: content.service.v1.Photo + (*emptypb.Empty)(nil), // 7: google.protobuf.Empty } var file_admin_service_v1_i_photo_proto_depIdxs = []int32{ 0, // 0: admin.service.v1.PhotoService.ListPhoto:input_type -> pagination.PagingRequest diff --git a/blog-backend/gen/api/go/admin/service/v1/i_photo.pb.validate.go b/blog-backend/gen/api/go/admin/service/v1/i_photo.pb.validate.go index 13b99f2e..8522cd4f 100644 --- a/blog-backend/gen/api/go/admin/service/v1/i_photo.pb.validate.go +++ b/blog-backend/gen/api/go/admin/service/v1/i_photo.pb.validate.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-validate. DO NOT EDIT. // source: admin/service/v1/i_photo.proto -package v1 +package servicev1 import ( "bytes" diff --git a/blog-backend/gen/api/go/admin/service/v1/i_photo_grpc.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_photo_grpc.pb.go index c2fc3196..ff5204c6 100644 --- a/blog-backend/gen/api/go/admin/service/v1/i_photo_grpc.pb.go +++ b/blog-backend/gen/api/go/admin/service/v1/i_photo_grpc.pb.go @@ -4,16 +4,16 @@ // - protoc (unknown) // source: admin/service/v1/i_photo.proto -package v1 +package servicev1 import ( context "context" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" - v1 "kratos-cms/gen/api/go/content/service/v1" + v11 "kratos-cms/gen/api/go/content/service/v1" ) // This is a compile-time assertion to ensure that this generated file @@ -34,15 +34,15 @@ const ( // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type PhotoServiceClient interface { // 获取照片列表 - ListPhoto(ctx context.Context, in *pagination.PagingRequest, opts ...grpc.CallOption) (*v1.ListPhotoResponse, error) + ListPhoto(ctx context.Context, in *v1.PagingRequest, opts ...grpc.CallOption) (*v11.ListPhotoResponse, error) // 获取照片数据 - GetPhoto(ctx context.Context, in *v1.GetPhotoRequest, opts ...grpc.CallOption) (*v1.Photo, error) + GetPhoto(ctx context.Context, in *v11.GetPhotoRequest, opts ...grpc.CallOption) (*v11.Photo, error) // 创建照片 - CreatePhoto(ctx context.Context, in *v1.CreatePhotoRequest, opts ...grpc.CallOption) (*v1.Photo, error) + CreatePhoto(ctx context.Context, in *v11.CreatePhotoRequest, opts ...grpc.CallOption) (*v11.Photo, error) // 更新照片 - UpdatePhoto(ctx context.Context, in *v1.UpdatePhotoRequest, opts ...grpc.CallOption) (*v1.Photo, error) + UpdatePhoto(ctx context.Context, in *v11.UpdatePhotoRequest, opts ...grpc.CallOption) (*v11.Photo, error) // 删除照片 - DeletePhoto(ctx context.Context, in *v1.DeletePhotoRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) + DeletePhoto(ctx context.Context, in *v11.DeletePhotoRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) } type photoServiceClient struct { @@ -53,8 +53,8 @@ func NewPhotoServiceClient(cc grpc.ClientConnInterface) PhotoServiceClient { return &photoServiceClient{cc} } -func (c *photoServiceClient) ListPhoto(ctx context.Context, in *pagination.PagingRequest, opts ...grpc.CallOption) (*v1.ListPhotoResponse, error) { - out := new(v1.ListPhotoResponse) +func (c *photoServiceClient) ListPhoto(ctx context.Context, in *v1.PagingRequest, opts ...grpc.CallOption) (*v11.ListPhotoResponse, error) { + out := new(v11.ListPhotoResponse) err := c.cc.Invoke(ctx, PhotoService_ListPhoto_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -62,8 +62,8 @@ func (c *photoServiceClient) ListPhoto(ctx context.Context, in *pagination.Pagin return out, nil } -func (c *photoServiceClient) GetPhoto(ctx context.Context, in *v1.GetPhotoRequest, opts ...grpc.CallOption) (*v1.Photo, error) { - out := new(v1.Photo) +func (c *photoServiceClient) GetPhoto(ctx context.Context, in *v11.GetPhotoRequest, opts ...grpc.CallOption) (*v11.Photo, error) { + out := new(v11.Photo) err := c.cc.Invoke(ctx, PhotoService_GetPhoto_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -71,8 +71,8 @@ func (c *photoServiceClient) GetPhoto(ctx context.Context, in *v1.GetPhotoReques return out, nil } -func (c *photoServiceClient) CreatePhoto(ctx context.Context, in *v1.CreatePhotoRequest, opts ...grpc.CallOption) (*v1.Photo, error) { - out := new(v1.Photo) +func (c *photoServiceClient) CreatePhoto(ctx context.Context, in *v11.CreatePhotoRequest, opts ...grpc.CallOption) (*v11.Photo, error) { + out := new(v11.Photo) err := c.cc.Invoke(ctx, PhotoService_CreatePhoto_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -80,8 +80,8 @@ func (c *photoServiceClient) CreatePhoto(ctx context.Context, in *v1.CreatePhoto return out, nil } -func (c *photoServiceClient) UpdatePhoto(ctx context.Context, in *v1.UpdatePhotoRequest, opts ...grpc.CallOption) (*v1.Photo, error) { - out := new(v1.Photo) +func (c *photoServiceClient) UpdatePhoto(ctx context.Context, in *v11.UpdatePhotoRequest, opts ...grpc.CallOption) (*v11.Photo, error) { + out := new(v11.Photo) err := c.cc.Invoke(ctx, PhotoService_UpdatePhoto_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -89,7 +89,7 @@ func (c *photoServiceClient) UpdatePhoto(ctx context.Context, in *v1.UpdatePhoto return out, nil } -func (c *photoServiceClient) DeletePhoto(ctx context.Context, in *v1.DeletePhotoRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { +func (c *photoServiceClient) DeletePhoto(ctx context.Context, in *v11.DeletePhotoRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { out := new(emptypb.Empty) err := c.cc.Invoke(ctx, PhotoService_DeletePhoto_FullMethodName, in, out, opts...) if err != nil { @@ -103,15 +103,15 @@ func (c *photoServiceClient) DeletePhoto(ctx context.Context, in *v1.DeletePhoto // for forward compatibility type PhotoServiceServer interface { // 获取照片列表 - ListPhoto(context.Context, *pagination.PagingRequest) (*v1.ListPhotoResponse, error) + ListPhoto(context.Context, *v1.PagingRequest) (*v11.ListPhotoResponse, error) // 获取照片数据 - GetPhoto(context.Context, *v1.GetPhotoRequest) (*v1.Photo, error) + GetPhoto(context.Context, *v11.GetPhotoRequest) (*v11.Photo, error) // 创建照片 - CreatePhoto(context.Context, *v1.CreatePhotoRequest) (*v1.Photo, error) + CreatePhoto(context.Context, *v11.CreatePhotoRequest) (*v11.Photo, error) // 更新照片 - UpdatePhoto(context.Context, *v1.UpdatePhotoRequest) (*v1.Photo, error) + UpdatePhoto(context.Context, *v11.UpdatePhotoRequest) (*v11.Photo, error) // 删除照片 - DeletePhoto(context.Context, *v1.DeletePhotoRequest) (*emptypb.Empty, error) + DeletePhoto(context.Context, *v11.DeletePhotoRequest) (*emptypb.Empty, error) mustEmbedUnimplementedPhotoServiceServer() } @@ -119,19 +119,19 @@ type PhotoServiceServer interface { type UnimplementedPhotoServiceServer struct { } -func (UnimplementedPhotoServiceServer) ListPhoto(context.Context, *pagination.PagingRequest) (*v1.ListPhotoResponse, error) { +func (UnimplementedPhotoServiceServer) ListPhoto(context.Context, *v1.PagingRequest) (*v11.ListPhotoResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListPhoto not implemented") } -func (UnimplementedPhotoServiceServer) GetPhoto(context.Context, *v1.GetPhotoRequest) (*v1.Photo, error) { +func (UnimplementedPhotoServiceServer) GetPhoto(context.Context, *v11.GetPhotoRequest) (*v11.Photo, error) { return nil, status.Errorf(codes.Unimplemented, "method GetPhoto not implemented") } -func (UnimplementedPhotoServiceServer) CreatePhoto(context.Context, *v1.CreatePhotoRequest) (*v1.Photo, error) { +func (UnimplementedPhotoServiceServer) CreatePhoto(context.Context, *v11.CreatePhotoRequest) (*v11.Photo, error) { return nil, status.Errorf(codes.Unimplemented, "method CreatePhoto not implemented") } -func (UnimplementedPhotoServiceServer) UpdatePhoto(context.Context, *v1.UpdatePhotoRequest) (*v1.Photo, error) { +func (UnimplementedPhotoServiceServer) UpdatePhoto(context.Context, *v11.UpdatePhotoRequest) (*v11.Photo, error) { return nil, status.Errorf(codes.Unimplemented, "method UpdatePhoto not implemented") } -func (UnimplementedPhotoServiceServer) DeletePhoto(context.Context, *v1.DeletePhotoRequest) (*emptypb.Empty, error) { +func (UnimplementedPhotoServiceServer) DeletePhoto(context.Context, *v11.DeletePhotoRequest) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method DeletePhoto not implemented") } func (UnimplementedPhotoServiceServer) mustEmbedUnimplementedPhotoServiceServer() {} @@ -148,7 +148,7 @@ func RegisterPhotoServiceServer(s grpc.ServiceRegistrar, srv PhotoServiceServer) } func _PhotoService_ListPhoto_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(pagination.PagingRequest) + in := new(v1.PagingRequest) if err := dec(in); err != nil { return nil, err } @@ -160,13 +160,13 @@ func _PhotoService_ListPhoto_Handler(srv interface{}, ctx context.Context, dec f FullMethod: PhotoService_ListPhoto_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(PhotoServiceServer).ListPhoto(ctx, req.(*pagination.PagingRequest)) + return srv.(PhotoServiceServer).ListPhoto(ctx, req.(*v1.PagingRequest)) } return interceptor(ctx, in, info, handler) } func _PhotoService_GetPhoto_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.GetPhotoRequest) + in := new(v11.GetPhotoRequest) if err := dec(in); err != nil { return nil, err } @@ -178,13 +178,13 @@ func _PhotoService_GetPhoto_Handler(srv interface{}, ctx context.Context, dec fu FullMethod: PhotoService_GetPhoto_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(PhotoServiceServer).GetPhoto(ctx, req.(*v1.GetPhotoRequest)) + return srv.(PhotoServiceServer).GetPhoto(ctx, req.(*v11.GetPhotoRequest)) } return interceptor(ctx, in, info, handler) } func _PhotoService_CreatePhoto_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.CreatePhotoRequest) + in := new(v11.CreatePhotoRequest) if err := dec(in); err != nil { return nil, err } @@ -196,13 +196,13 @@ func _PhotoService_CreatePhoto_Handler(srv interface{}, ctx context.Context, dec FullMethod: PhotoService_CreatePhoto_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(PhotoServiceServer).CreatePhoto(ctx, req.(*v1.CreatePhotoRequest)) + return srv.(PhotoServiceServer).CreatePhoto(ctx, req.(*v11.CreatePhotoRequest)) } return interceptor(ctx, in, info, handler) } func _PhotoService_UpdatePhoto_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.UpdatePhotoRequest) + in := new(v11.UpdatePhotoRequest) if err := dec(in); err != nil { return nil, err } @@ -214,13 +214,13 @@ func _PhotoService_UpdatePhoto_Handler(srv interface{}, ctx context.Context, dec FullMethod: PhotoService_UpdatePhoto_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(PhotoServiceServer).UpdatePhoto(ctx, req.(*v1.UpdatePhotoRequest)) + return srv.(PhotoServiceServer).UpdatePhoto(ctx, req.(*v11.UpdatePhotoRequest)) } return interceptor(ctx, in, info, handler) } func _PhotoService_DeletePhoto_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.DeletePhotoRequest) + in := new(v11.DeletePhotoRequest) if err := dec(in); err != nil { return nil, err } @@ -232,7 +232,7 @@ func _PhotoService_DeletePhoto_Handler(srv interface{}, ctx context.Context, dec FullMethod: PhotoService_DeletePhoto_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(PhotoServiceServer).DeletePhoto(ctx, req.(*v1.DeletePhotoRequest)) + return srv.(PhotoServiceServer).DeletePhoto(ctx, req.(*v11.DeletePhotoRequest)) } return interceptor(ctx, in, info, handler) } diff --git a/blog-backend/gen/api/go/admin/service/v1/i_photo_http.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_photo_http.pb.go index 021b2302..69c85403 100644 --- a/blog-backend/gen/api/go/admin/service/v1/i_photo_http.pb.go +++ b/blog-backend/gen/api/go/admin/service/v1/i_photo_http.pb.go @@ -4,15 +4,15 @@ // - protoc (unknown) // source: admin/service/v1/i_photo.proto -package v1 +package servicev1 import ( context "context" http "github.com/go-kratos/kratos/v2/transport/http" binding "github.com/go-kratos/kratos/v2/transport/http/binding" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" - v1 "kratos-cms/gen/api/go/content/service/v1" + v11 "kratos-cms/gen/api/go/content/service/v1" ) // This is a compile-time assertion to ensure that this generated file @@ -30,15 +30,15 @@ const OperationPhotoServiceUpdatePhoto = "/admin.service.v1.PhotoService/UpdateP type PhotoServiceHTTPServer interface { // CreatePhoto 创建照片 - CreatePhoto(context.Context, *v1.CreatePhotoRequest) (*v1.Photo, error) + CreatePhoto(context.Context, *v11.CreatePhotoRequest) (*v11.Photo, error) // DeletePhoto 删除照片 - DeletePhoto(context.Context, *v1.DeletePhotoRequest) (*emptypb.Empty, error) + DeletePhoto(context.Context, *v11.DeletePhotoRequest) (*emptypb.Empty, error) // GetPhoto 获取照片数据 - GetPhoto(context.Context, *v1.GetPhotoRequest) (*v1.Photo, error) + GetPhoto(context.Context, *v11.GetPhotoRequest) (*v11.Photo, error) // ListPhoto 获取照片列表 - ListPhoto(context.Context, *pagination.PagingRequest) (*v1.ListPhotoResponse, error) + ListPhoto(context.Context, *v1.PagingRequest) (*v11.ListPhotoResponse, error) // UpdatePhoto 更新照片 - UpdatePhoto(context.Context, *v1.UpdatePhotoRequest) (*v1.Photo, error) + UpdatePhoto(context.Context, *v11.UpdatePhotoRequest) (*v11.Photo, error) } func RegisterPhotoServiceHTTPServer(s *http.Server, srv PhotoServiceHTTPServer) { @@ -52,26 +52,26 @@ func RegisterPhotoServiceHTTPServer(s *http.Server, srv PhotoServiceHTTPServer) func _PhotoService_ListPhoto0_HTTP_Handler(srv PhotoServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in pagination.PagingRequest + var in v1.PagingRequest if err := ctx.BindQuery(&in); err != nil { return err } http.SetOperation(ctx, OperationPhotoServiceListPhoto) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.ListPhoto(ctx, req.(*pagination.PagingRequest)) + return srv.ListPhoto(ctx, req.(*v1.PagingRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.ListPhotoResponse) + reply := out.(*v11.ListPhotoResponse) return ctx.Result(200, reply) } } func _PhotoService_GetPhoto0_HTTP_Handler(srv PhotoServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.GetPhotoRequest + var in v11.GetPhotoRequest if err := ctx.BindQuery(&in); err != nil { return err } @@ -80,20 +80,20 @@ func _PhotoService_GetPhoto0_HTTP_Handler(srv PhotoServiceHTTPServer) func(ctx h } http.SetOperation(ctx, OperationPhotoServiceGetPhoto) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.GetPhoto(ctx, req.(*v1.GetPhotoRequest)) + return srv.GetPhoto(ctx, req.(*v11.GetPhotoRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.Photo) + reply := out.(*v11.Photo) return ctx.Result(200, reply) } } func _PhotoService_CreatePhoto0_HTTP_Handler(srv PhotoServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.CreatePhotoRequest + var in v11.CreatePhotoRequest if err := ctx.Bind(&in); err != nil { return err } @@ -102,20 +102,20 @@ func _PhotoService_CreatePhoto0_HTTP_Handler(srv PhotoServiceHTTPServer) func(ct } http.SetOperation(ctx, OperationPhotoServiceCreatePhoto) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.CreatePhoto(ctx, req.(*v1.CreatePhotoRequest)) + return srv.CreatePhoto(ctx, req.(*v11.CreatePhotoRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.Photo) + reply := out.(*v11.Photo) return ctx.Result(200, reply) } } func _PhotoService_UpdatePhoto0_HTTP_Handler(srv PhotoServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.UpdatePhotoRequest + var in v11.UpdatePhotoRequest if err := ctx.Bind(&in.Photo); err != nil { return err } @@ -127,20 +127,20 @@ func _PhotoService_UpdatePhoto0_HTTP_Handler(srv PhotoServiceHTTPServer) func(ct } http.SetOperation(ctx, OperationPhotoServiceUpdatePhoto) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.UpdatePhoto(ctx, req.(*v1.UpdatePhotoRequest)) + return srv.UpdatePhoto(ctx, req.(*v11.UpdatePhotoRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.Photo) + reply := out.(*v11.Photo) return ctx.Result(200, reply) } } func _PhotoService_DeletePhoto0_HTTP_Handler(srv PhotoServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.DeletePhotoRequest + var in v11.DeletePhotoRequest if err := ctx.BindQuery(&in); err != nil { return err } @@ -149,7 +149,7 @@ func _PhotoService_DeletePhoto0_HTTP_Handler(srv PhotoServiceHTTPServer) func(ct } http.SetOperation(ctx, OperationPhotoServiceDeletePhoto) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.DeletePhoto(ctx, req.(*v1.DeletePhotoRequest)) + return srv.DeletePhoto(ctx, req.(*v11.DeletePhotoRequest)) }) out, err := h(ctx, &in) if err != nil { @@ -161,11 +161,11 @@ func _PhotoService_DeletePhoto0_HTTP_Handler(srv PhotoServiceHTTPServer) func(ct } type PhotoServiceHTTPClient interface { - CreatePhoto(ctx context.Context, req *v1.CreatePhotoRequest, opts ...http.CallOption) (rsp *v1.Photo, err error) - DeletePhoto(ctx context.Context, req *v1.DeletePhotoRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error) - GetPhoto(ctx context.Context, req *v1.GetPhotoRequest, opts ...http.CallOption) (rsp *v1.Photo, err error) - ListPhoto(ctx context.Context, req *pagination.PagingRequest, opts ...http.CallOption) (rsp *v1.ListPhotoResponse, err error) - UpdatePhoto(ctx context.Context, req *v1.UpdatePhotoRequest, opts ...http.CallOption) (rsp *v1.Photo, err error) + CreatePhoto(ctx context.Context, req *v11.CreatePhotoRequest, opts ...http.CallOption) (rsp *v11.Photo, err error) + DeletePhoto(ctx context.Context, req *v11.DeletePhotoRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error) + GetPhoto(ctx context.Context, req *v11.GetPhotoRequest, opts ...http.CallOption) (rsp *v11.Photo, err error) + ListPhoto(ctx context.Context, req *v1.PagingRequest, opts ...http.CallOption) (rsp *v11.ListPhotoResponse, err error) + UpdatePhoto(ctx context.Context, req *v11.UpdatePhotoRequest, opts ...http.CallOption) (rsp *v11.Photo, err error) } type PhotoServiceHTTPClientImpl struct { @@ -176,8 +176,8 @@ func NewPhotoServiceHTTPClient(client *http.Client) PhotoServiceHTTPClient { return &PhotoServiceHTTPClientImpl{client} } -func (c *PhotoServiceHTTPClientImpl) CreatePhoto(ctx context.Context, in *v1.CreatePhotoRequest, opts ...http.CallOption) (*v1.Photo, error) { - var out v1.Photo +func (c *PhotoServiceHTTPClientImpl) CreatePhoto(ctx context.Context, in *v11.CreatePhotoRequest, opts ...http.CallOption) (*v11.Photo, error) { + var out v11.Photo pattern := "/admin/v1/photos" path := binding.EncodeURL(pattern, in, false) opts = append(opts, http.Operation(OperationPhotoServiceCreatePhoto)) @@ -189,7 +189,7 @@ func (c *PhotoServiceHTTPClientImpl) CreatePhoto(ctx context.Context, in *v1.Cre return &out, err } -func (c *PhotoServiceHTTPClientImpl) DeletePhoto(ctx context.Context, in *v1.DeletePhotoRequest, opts ...http.CallOption) (*emptypb.Empty, error) { +func (c *PhotoServiceHTTPClientImpl) DeletePhoto(ctx context.Context, in *v11.DeletePhotoRequest, opts ...http.CallOption) (*emptypb.Empty, error) { var out emptypb.Empty pattern := "/admin/v1/photos/{id}" path := binding.EncodeURL(pattern, in, true) @@ -202,8 +202,8 @@ func (c *PhotoServiceHTTPClientImpl) DeletePhoto(ctx context.Context, in *v1.Del return &out, err } -func (c *PhotoServiceHTTPClientImpl) GetPhoto(ctx context.Context, in *v1.GetPhotoRequest, opts ...http.CallOption) (*v1.Photo, error) { - var out v1.Photo +func (c *PhotoServiceHTTPClientImpl) GetPhoto(ctx context.Context, in *v11.GetPhotoRequest, opts ...http.CallOption) (*v11.Photo, error) { + var out v11.Photo pattern := "/admin/v1/photos/{id}" path := binding.EncodeURL(pattern, in, true) opts = append(opts, http.Operation(OperationPhotoServiceGetPhoto)) @@ -215,8 +215,8 @@ func (c *PhotoServiceHTTPClientImpl) GetPhoto(ctx context.Context, in *v1.GetPho return &out, err } -func (c *PhotoServiceHTTPClientImpl) ListPhoto(ctx context.Context, in *pagination.PagingRequest, opts ...http.CallOption) (*v1.ListPhotoResponse, error) { - var out v1.ListPhotoResponse +func (c *PhotoServiceHTTPClientImpl) ListPhoto(ctx context.Context, in *v1.PagingRequest, opts ...http.CallOption) (*v11.ListPhotoResponse, error) { + var out v11.ListPhotoResponse pattern := "/admin/v1/photos" path := binding.EncodeURL(pattern, in, true) opts = append(opts, http.Operation(OperationPhotoServiceListPhoto)) @@ -228,8 +228,8 @@ func (c *PhotoServiceHTTPClientImpl) ListPhoto(ctx context.Context, in *paginati return &out, err } -func (c *PhotoServiceHTTPClientImpl) UpdatePhoto(ctx context.Context, in *v1.UpdatePhotoRequest, opts ...http.CallOption) (*v1.Photo, error) { - var out v1.Photo +func (c *PhotoServiceHTTPClientImpl) UpdatePhoto(ctx context.Context, in *v11.UpdatePhotoRequest, opts ...http.CallOption) (*v11.Photo, error) { + var out v11.Photo pattern := "/admin/v1/photos/{id}" path := binding.EncodeURL(pattern, in, false) opts = append(opts, http.Operation(OperationPhotoServiceUpdatePhoto)) diff --git a/blog-backend/gen/api/go/admin/service/v1/i_post.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_post.pb.go index 66bd3fe6..a481a8a1 100644 --- a/blog-backend/gen/api/go/admin/service/v1/i_post.pb.go +++ b/blog-backend/gen/api/go/admin/service/v1/i_post.pb.go @@ -4,16 +4,16 @@ // protoc (unknown) // source: admin/service/v1/i_post.proto -package v1 +package servicev1 import ( _ "github.com/google/gnostic/openapiv3" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" - v1 "kratos-cms/gen/api/go/content/service/v1" + v11 "kratos-cms/gen/api/go/content/service/v1" reflect "reflect" ) @@ -36,69 +36,78 @@ var file_admin_service_v1_i_post_proto_rawDesc = []byte{ 0x61, 0x70, 0x69, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x1a, 0x22, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2f, - 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x6f, 0x73, 0x74, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0xc3, 0x05, 0x0a, 0x0b, 0x50, 0x6f, 0x73, 0x74, 0x53, 0x65, - 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x83, 0x01, 0x0a, 0x08, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x6f, - 0x73, 0x74, 0x12, 0x19, 0x2e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, - 0x50, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, + 0x74, 0x6f, 0x1a, 0x1e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x76, + 0x31, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x1a, 0x1d, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2f, 0x73, 0x65, 0x72, 0x76, + 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x6f, 0x73, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x32, 0xc3, 0x05, 0x0a, 0x0b, 0x50, 0x6f, 0x73, 0x74, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x12, 0x83, 0x01, 0x0a, 0x08, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x6f, 0x73, 0x74, 0x12, 0x19, + 0x2e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x50, 0x61, 0x67, 0x69, + 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x63, 0x6f, 0x6e, 0x74, + 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, + 0x69, 0x73, 0x74, 0x50, 0x6f, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, + 0x36, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, + 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, + 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x11, 0x12, 0x0f, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, + 0x31, 0x2f, 0x70, 0x6f, 0x73, 0x74, 0x73, 0x12, 0x84, 0x01, 0x0a, 0x07, 0x47, 0x65, 0x74, 0x50, + 0x6f, 0x73, 0x74, 0x12, 0x22, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, + 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x50, 0x6f, 0x73, 0x74, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, + 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x6f, 0x73, + 0x74, 0x22, 0x3b, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, + 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, + 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x16, 0x12, 0x14, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, + 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x6f, 0x73, 0x74, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x88, + 0x01, 0x0a, 0x0a, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x6f, 0x73, 0x74, 0x12, 0x25, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, - 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x6f, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, - 0x6e, 0x73, 0x65, 0x22, 0x36, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, - 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, - 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x11, 0x12, 0x0f, 0x2f, 0x61, 0x64, 0x6d, - 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x6f, 0x73, 0x74, 0x73, 0x12, 0x84, 0x01, 0x0a, 0x07, - 0x47, 0x65, 0x74, 0x50, 0x6f, 0x73, 0x74, 0x12, 0x22, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, - 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, - 0x50, 0x6f, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x63, 0x6f, - 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, - 0x2e, 0x50, 0x6f, 0x73, 0x74, 0x22, 0x3b, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, - 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, - 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x16, 0x12, 0x14, 0x2f, 0x61, - 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x6f, 0x73, 0x74, 0x73, 0x2f, 0x7b, 0x69, - 0x64, 0x7d, 0x12, 0x88, 0x01, 0x0a, 0x0a, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x6f, 0x73, - 0x74, 0x12, 0x25, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, - 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x6f, 0x73, - 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, - 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x6f, - 0x73, 0x74, 0x22, 0x39, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, - 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, - 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x14, 0x3a, 0x01, 0x2a, 0x22, 0x0f, 0x2f, 0x61, - 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x6f, 0x73, 0x74, 0x73, 0x12, 0x90, 0x01, - 0x0a, 0x0a, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x6f, 0x73, 0x74, 0x12, 0x25, 0x2e, 0x63, - 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, - 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x6f, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, - 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x6f, 0x73, 0x74, 0x22, 0x41, 0xba, - 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, - 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, - 0xe4, 0x93, 0x02, 0x1c, 0x3a, 0x04, 0x70, 0x6f, 0x73, 0x74, 0x1a, 0x14, 0x2f, 0x61, 0x64, 0x6d, - 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x6f, 0x73, 0x74, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, - 0x12, 0x88, 0x01, 0x0a, 0x0a, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x50, 0x6f, 0x73, 0x74, 0x12, - 0x25, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, - 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x50, 0x6f, 0x73, 0x74, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x3b, + 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x6f, 0x73, 0x74, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, + 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x6f, 0x73, 0x74, 0x22, 0x39, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, - 0xd3, 0xe4, 0x93, 0x02, 0x16, 0x2a, 0x14, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, - 0x2f, 0x70, 0x6f, 0x73, 0x74, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x42, 0x2b, 0x5a, 0x29, 0x6b, - 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x63, 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x70, - 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, - 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0xd3, 0xe4, 0x93, 0x02, 0x14, 0x3a, 0x01, 0x2a, 0x22, 0x0f, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, + 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x6f, 0x73, 0x74, 0x73, 0x12, 0x90, 0x01, 0x0a, 0x0a, 0x55, 0x70, + 0x64, 0x61, 0x74, 0x65, 0x50, 0x6f, 0x73, 0x74, 0x12, 0x25, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, + 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, + 0x64, 0x61, 0x74, 0x65, 0x50, 0x6f, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, + 0x18, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x6f, 0x73, 0x74, 0x22, 0x41, 0xba, 0x47, 0x1c, 0x5a, 0x1a, + 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, + 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1c, + 0x3a, 0x04, 0x70, 0x6f, 0x73, 0x74, 0x1a, 0x14, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, + 0x31, 0x2f, 0x70, 0x6f, 0x73, 0x74, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x88, 0x01, 0x0a, + 0x0a, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x50, 0x6f, 0x73, 0x74, 0x12, 0x25, 0x2e, 0x63, 0x6f, + 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, + 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x50, 0x6f, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, + 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x3b, 0xba, 0x47, 0x1c, 0x5a, + 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, + 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, + 0x16, 0x2a, 0x14, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x6f, 0x73, + 0x74, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x42, 0xb6, 0x01, 0x0a, 0x14, 0x63, 0x6f, 0x6d, 0x2e, + 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, + 0x42, 0x0a, 0x49, 0x50, 0x6f, 0x73, 0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x30, + 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x63, 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, + 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x73, 0x65, 0x72, 0x76, + 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x76, 0x31, + 0xa2, 0x02, 0x03, 0x41, 0x53, 0x58, 0xaa, 0x02, 0x10, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x53, + 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x10, 0x41, 0x64, 0x6d, 0x69, + 0x6e, 0x5c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1c, 0x41, + 0x64, 0x6d, 0x69, 0x6e, 0x5c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x56, 0x31, 0x5c, + 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x12, 0x41, 0x64, + 0x6d, 0x69, 0x6e, 0x3a, 0x3a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x3a, 0x3a, 0x56, 0x31, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var file_admin_service_v1_i_post_proto_goTypes = []interface{}{ - (*pagination.PagingRequest)(nil), // 0: pagination.PagingRequest - (*v1.GetPostRequest)(nil), // 1: content.service.v1.GetPostRequest - (*v1.CreatePostRequest)(nil), // 2: content.service.v1.CreatePostRequest - (*v1.UpdatePostRequest)(nil), // 3: content.service.v1.UpdatePostRequest - (*v1.DeletePostRequest)(nil), // 4: content.service.v1.DeletePostRequest - (*v1.ListPostResponse)(nil), // 5: content.service.v1.ListPostResponse - (*v1.Post)(nil), // 6: content.service.v1.Post - (*emptypb.Empty)(nil), // 7: google.protobuf.Empty + (*v1.PagingRequest)(nil), // 0: pagination.PagingRequest + (*v11.GetPostRequest)(nil), // 1: content.service.v1.GetPostRequest + (*v11.CreatePostRequest)(nil), // 2: content.service.v1.CreatePostRequest + (*v11.UpdatePostRequest)(nil), // 3: content.service.v1.UpdatePostRequest + (*v11.DeletePostRequest)(nil), // 4: content.service.v1.DeletePostRequest + (*v11.ListPostResponse)(nil), // 5: content.service.v1.ListPostResponse + (*v11.Post)(nil), // 6: content.service.v1.Post + (*emptypb.Empty)(nil), // 7: google.protobuf.Empty } var file_admin_service_v1_i_post_proto_depIdxs = []int32{ 0, // 0: admin.service.v1.PostService.ListPost:input_type -> pagination.PagingRequest diff --git a/blog-backend/gen/api/go/admin/service/v1/i_post.pb.validate.go b/blog-backend/gen/api/go/admin/service/v1/i_post.pb.validate.go index b4acc069..e1181e1d 100644 --- a/blog-backend/gen/api/go/admin/service/v1/i_post.pb.validate.go +++ b/blog-backend/gen/api/go/admin/service/v1/i_post.pb.validate.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-validate. DO NOT EDIT. // source: admin/service/v1/i_post.proto -package v1 +package servicev1 import ( "bytes" diff --git a/blog-backend/gen/api/go/admin/service/v1/i_post_grpc.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_post_grpc.pb.go index b24cb5cb..29fc93fc 100644 --- a/blog-backend/gen/api/go/admin/service/v1/i_post_grpc.pb.go +++ b/blog-backend/gen/api/go/admin/service/v1/i_post_grpc.pb.go @@ -4,16 +4,16 @@ // - protoc (unknown) // source: admin/service/v1/i_post.proto -package v1 +package servicev1 import ( context "context" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" - v1 "kratos-cms/gen/api/go/content/service/v1" + v11 "kratos-cms/gen/api/go/content/service/v1" ) // This is a compile-time assertion to ensure that this generated file @@ -34,15 +34,15 @@ const ( // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type PostServiceClient interface { // 获取帖子列表 - ListPost(ctx context.Context, in *pagination.PagingRequest, opts ...grpc.CallOption) (*v1.ListPostResponse, error) + ListPost(ctx context.Context, in *v1.PagingRequest, opts ...grpc.CallOption) (*v11.ListPostResponse, error) // 获取帖子数据 - GetPost(ctx context.Context, in *v1.GetPostRequest, opts ...grpc.CallOption) (*v1.Post, error) + GetPost(ctx context.Context, in *v11.GetPostRequest, opts ...grpc.CallOption) (*v11.Post, error) // 创建帖子 - CreatePost(ctx context.Context, in *v1.CreatePostRequest, opts ...grpc.CallOption) (*v1.Post, error) + CreatePost(ctx context.Context, in *v11.CreatePostRequest, opts ...grpc.CallOption) (*v11.Post, error) // 更新帖子 - UpdatePost(ctx context.Context, in *v1.UpdatePostRequest, opts ...grpc.CallOption) (*v1.Post, error) + UpdatePost(ctx context.Context, in *v11.UpdatePostRequest, opts ...grpc.CallOption) (*v11.Post, error) // 删除帖子 - DeletePost(ctx context.Context, in *v1.DeletePostRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) + DeletePost(ctx context.Context, in *v11.DeletePostRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) } type postServiceClient struct { @@ -53,8 +53,8 @@ func NewPostServiceClient(cc grpc.ClientConnInterface) PostServiceClient { return &postServiceClient{cc} } -func (c *postServiceClient) ListPost(ctx context.Context, in *pagination.PagingRequest, opts ...grpc.CallOption) (*v1.ListPostResponse, error) { - out := new(v1.ListPostResponse) +func (c *postServiceClient) ListPost(ctx context.Context, in *v1.PagingRequest, opts ...grpc.CallOption) (*v11.ListPostResponse, error) { + out := new(v11.ListPostResponse) err := c.cc.Invoke(ctx, PostService_ListPost_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -62,8 +62,8 @@ func (c *postServiceClient) ListPost(ctx context.Context, in *pagination.PagingR return out, nil } -func (c *postServiceClient) GetPost(ctx context.Context, in *v1.GetPostRequest, opts ...grpc.CallOption) (*v1.Post, error) { - out := new(v1.Post) +func (c *postServiceClient) GetPost(ctx context.Context, in *v11.GetPostRequest, opts ...grpc.CallOption) (*v11.Post, error) { + out := new(v11.Post) err := c.cc.Invoke(ctx, PostService_GetPost_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -71,8 +71,8 @@ func (c *postServiceClient) GetPost(ctx context.Context, in *v1.GetPostRequest, return out, nil } -func (c *postServiceClient) CreatePost(ctx context.Context, in *v1.CreatePostRequest, opts ...grpc.CallOption) (*v1.Post, error) { - out := new(v1.Post) +func (c *postServiceClient) CreatePost(ctx context.Context, in *v11.CreatePostRequest, opts ...grpc.CallOption) (*v11.Post, error) { + out := new(v11.Post) err := c.cc.Invoke(ctx, PostService_CreatePost_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -80,8 +80,8 @@ func (c *postServiceClient) CreatePost(ctx context.Context, in *v1.CreatePostReq return out, nil } -func (c *postServiceClient) UpdatePost(ctx context.Context, in *v1.UpdatePostRequest, opts ...grpc.CallOption) (*v1.Post, error) { - out := new(v1.Post) +func (c *postServiceClient) UpdatePost(ctx context.Context, in *v11.UpdatePostRequest, opts ...grpc.CallOption) (*v11.Post, error) { + out := new(v11.Post) err := c.cc.Invoke(ctx, PostService_UpdatePost_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -89,7 +89,7 @@ func (c *postServiceClient) UpdatePost(ctx context.Context, in *v1.UpdatePostReq return out, nil } -func (c *postServiceClient) DeletePost(ctx context.Context, in *v1.DeletePostRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { +func (c *postServiceClient) DeletePost(ctx context.Context, in *v11.DeletePostRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { out := new(emptypb.Empty) err := c.cc.Invoke(ctx, PostService_DeletePost_FullMethodName, in, out, opts...) if err != nil { @@ -103,15 +103,15 @@ func (c *postServiceClient) DeletePost(ctx context.Context, in *v1.DeletePostReq // for forward compatibility type PostServiceServer interface { // 获取帖子列表 - ListPost(context.Context, *pagination.PagingRequest) (*v1.ListPostResponse, error) + ListPost(context.Context, *v1.PagingRequest) (*v11.ListPostResponse, error) // 获取帖子数据 - GetPost(context.Context, *v1.GetPostRequest) (*v1.Post, error) + GetPost(context.Context, *v11.GetPostRequest) (*v11.Post, error) // 创建帖子 - CreatePost(context.Context, *v1.CreatePostRequest) (*v1.Post, error) + CreatePost(context.Context, *v11.CreatePostRequest) (*v11.Post, error) // 更新帖子 - UpdatePost(context.Context, *v1.UpdatePostRequest) (*v1.Post, error) + UpdatePost(context.Context, *v11.UpdatePostRequest) (*v11.Post, error) // 删除帖子 - DeletePost(context.Context, *v1.DeletePostRequest) (*emptypb.Empty, error) + DeletePost(context.Context, *v11.DeletePostRequest) (*emptypb.Empty, error) mustEmbedUnimplementedPostServiceServer() } @@ -119,19 +119,19 @@ type PostServiceServer interface { type UnimplementedPostServiceServer struct { } -func (UnimplementedPostServiceServer) ListPost(context.Context, *pagination.PagingRequest) (*v1.ListPostResponse, error) { +func (UnimplementedPostServiceServer) ListPost(context.Context, *v1.PagingRequest) (*v11.ListPostResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListPost not implemented") } -func (UnimplementedPostServiceServer) GetPost(context.Context, *v1.GetPostRequest) (*v1.Post, error) { +func (UnimplementedPostServiceServer) GetPost(context.Context, *v11.GetPostRequest) (*v11.Post, error) { return nil, status.Errorf(codes.Unimplemented, "method GetPost not implemented") } -func (UnimplementedPostServiceServer) CreatePost(context.Context, *v1.CreatePostRequest) (*v1.Post, error) { +func (UnimplementedPostServiceServer) CreatePost(context.Context, *v11.CreatePostRequest) (*v11.Post, error) { return nil, status.Errorf(codes.Unimplemented, "method CreatePost not implemented") } -func (UnimplementedPostServiceServer) UpdatePost(context.Context, *v1.UpdatePostRequest) (*v1.Post, error) { +func (UnimplementedPostServiceServer) UpdatePost(context.Context, *v11.UpdatePostRequest) (*v11.Post, error) { return nil, status.Errorf(codes.Unimplemented, "method UpdatePost not implemented") } -func (UnimplementedPostServiceServer) DeletePost(context.Context, *v1.DeletePostRequest) (*emptypb.Empty, error) { +func (UnimplementedPostServiceServer) DeletePost(context.Context, *v11.DeletePostRequest) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method DeletePost not implemented") } func (UnimplementedPostServiceServer) mustEmbedUnimplementedPostServiceServer() {} @@ -148,7 +148,7 @@ func RegisterPostServiceServer(s grpc.ServiceRegistrar, srv PostServiceServer) { } func _PostService_ListPost_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(pagination.PagingRequest) + in := new(v1.PagingRequest) if err := dec(in); err != nil { return nil, err } @@ -160,13 +160,13 @@ func _PostService_ListPost_Handler(srv interface{}, ctx context.Context, dec fun FullMethod: PostService_ListPost_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(PostServiceServer).ListPost(ctx, req.(*pagination.PagingRequest)) + return srv.(PostServiceServer).ListPost(ctx, req.(*v1.PagingRequest)) } return interceptor(ctx, in, info, handler) } func _PostService_GetPost_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.GetPostRequest) + in := new(v11.GetPostRequest) if err := dec(in); err != nil { return nil, err } @@ -178,13 +178,13 @@ func _PostService_GetPost_Handler(srv interface{}, ctx context.Context, dec func FullMethod: PostService_GetPost_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(PostServiceServer).GetPost(ctx, req.(*v1.GetPostRequest)) + return srv.(PostServiceServer).GetPost(ctx, req.(*v11.GetPostRequest)) } return interceptor(ctx, in, info, handler) } func _PostService_CreatePost_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.CreatePostRequest) + in := new(v11.CreatePostRequest) if err := dec(in); err != nil { return nil, err } @@ -196,13 +196,13 @@ func _PostService_CreatePost_Handler(srv interface{}, ctx context.Context, dec f FullMethod: PostService_CreatePost_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(PostServiceServer).CreatePost(ctx, req.(*v1.CreatePostRequest)) + return srv.(PostServiceServer).CreatePost(ctx, req.(*v11.CreatePostRequest)) } return interceptor(ctx, in, info, handler) } func _PostService_UpdatePost_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.UpdatePostRequest) + in := new(v11.UpdatePostRequest) if err := dec(in); err != nil { return nil, err } @@ -214,13 +214,13 @@ func _PostService_UpdatePost_Handler(srv interface{}, ctx context.Context, dec f FullMethod: PostService_UpdatePost_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(PostServiceServer).UpdatePost(ctx, req.(*v1.UpdatePostRequest)) + return srv.(PostServiceServer).UpdatePost(ctx, req.(*v11.UpdatePostRequest)) } return interceptor(ctx, in, info, handler) } func _PostService_DeletePost_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.DeletePostRequest) + in := new(v11.DeletePostRequest) if err := dec(in); err != nil { return nil, err } @@ -232,7 +232,7 @@ func _PostService_DeletePost_Handler(srv interface{}, ctx context.Context, dec f FullMethod: PostService_DeletePost_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(PostServiceServer).DeletePost(ctx, req.(*v1.DeletePostRequest)) + return srv.(PostServiceServer).DeletePost(ctx, req.(*v11.DeletePostRequest)) } return interceptor(ctx, in, info, handler) } diff --git a/blog-backend/gen/api/go/admin/service/v1/i_post_http.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_post_http.pb.go index 3f2ae861..b10be173 100644 --- a/blog-backend/gen/api/go/admin/service/v1/i_post_http.pb.go +++ b/blog-backend/gen/api/go/admin/service/v1/i_post_http.pb.go @@ -4,15 +4,15 @@ // - protoc (unknown) // source: admin/service/v1/i_post.proto -package v1 +package servicev1 import ( context "context" http "github.com/go-kratos/kratos/v2/transport/http" binding "github.com/go-kratos/kratos/v2/transport/http/binding" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" - v1 "kratos-cms/gen/api/go/content/service/v1" + v11 "kratos-cms/gen/api/go/content/service/v1" ) // This is a compile-time assertion to ensure that this generated file @@ -30,15 +30,15 @@ const OperationPostServiceUpdatePost = "/admin.service.v1.PostService/UpdatePost type PostServiceHTTPServer interface { // CreatePost 创建帖子 - CreatePost(context.Context, *v1.CreatePostRequest) (*v1.Post, error) + CreatePost(context.Context, *v11.CreatePostRequest) (*v11.Post, error) // DeletePost 删除帖子 - DeletePost(context.Context, *v1.DeletePostRequest) (*emptypb.Empty, error) + DeletePost(context.Context, *v11.DeletePostRequest) (*emptypb.Empty, error) // GetPost 获取帖子数据 - GetPost(context.Context, *v1.GetPostRequest) (*v1.Post, error) + GetPost(context.Context, *v11.GetPostRequest) (*v11.Post, error) // ListPost 获取帖子列表 - ListPost(context.Context, *pagination.PagingRequest) (*v1.ListPostResponse, error) + ListPost(context.Context, *v1.PagingRequest) (*v11.ListPostResponse, error) // UpdatePost 更新帖子 - UpdatePost(context.Context, *v1.UpdatePostRequest) (*v1.Post, error) + UpdatePost(context.Context, *v11.UpdatePostRequest) (*v11.Post, error) } func RegisterPostServiceHTTPServer(s *http.Server, srv PostServiceHTTPServer) { @@ -52,26 +52,26 @@ func RegisterPostServiceHTTPServer(s *http.Server, srv PostServiceHTTPServer) { func _PostService_ListPost0_HTTP_Handler(srv PostServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in pagination.PagingRequest + var in v1.PagingRequest if err := ctx.BindQuery(&in); err != nil { return err } http.SetOperation(ctx, OperationPostServiceListPost) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.ListPost(ctx, req.(*pagination.PagingRequest)) + return srv.ListPost(ctx, req.(*v1.PagingRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.ListPostResponse) + reply := out.(*v11.ListPostResponse) return ctx.Result(200, reply) } } func _PostService_GetPost0_HTTP_Handler(srv PostServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.GetPostRequest + var in v11.GetPostRequest if err := ctx.BindQuery(&in); err != nil { return err } @@ -80,20 +80,20 @@ func _PostService_GetPost0_HTTP_Handler(srv PostServiceHTTPServer) func(ctx http } http.SetOperation(ctx, OperationPostServiceGetPost) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.GetPost(ctx, req.(*v1.GetPostRequest)) + return srv.GetPost(ctx, req.(*v11.GetPostRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.Post) + reply := out.(*v11.Post) return ctx.Result(200, reply) } } func _PostService_CreatePost0_HTTP_Handler(srv PostServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.CreatePostRequest + var in v11.CreatePostRequest if err := ctx.Bind(&in); err != nil { return err } @@ -102,20 +102,20 @@ func _PostService_CreatePost0_HTTP_Handler(srv PostServiceHTTPServer) func(ctx h } http.SetOperation(ctx, OperationPostServiceCreatePost) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.CreatePost(ctx, req.(*v1.CreatePostRequest)) + return srv.CreatePost(ctx, req.(*v11.CreatePostRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.Post) + reply := out.(*v11.Post) return ctx.Result(200, reply) } } func _PostService_UpdatePost0_HTTP_Handler(srv PostServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.UpdatePostRequest + var in v11.UpdatePostRequest if err := ctx.Bind(&in.Post); err != nil { return err } @@ -127,20 +127,20 @@ func _PostService_UpdatePost0_HTTP_Handler(srv PostServiceHTTPServer) func(ctx h } http.SetOperation(ctx, OperationPostServiceUpdatePost) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.UpdatePost(ctx, req.(*v1.UpdatePostRequest)) + return srv.UpdatePost(ctx, req.(*v11.UpdatePostRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.Post) + reply := out.(*v11.Post) return ctx.Result(200, reply) } } func _PostService_DeletePost0_HTTP_Handler(srv PostServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.DeletePostRequest + var in v11.DeletePostRequest if err := ctx.BindQuery(&in); err != nil { return err } @@ -149,7 +149,7 @@ func _PostService_DeletePost0_HTTP_Handler(srv PostServiceHTTPServer) func(ctx h } http.SetOperation(ctx, OperationPostServiceDeletePost) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.DeletePost(ctx, req.(*v1.DeletePostRequest)) + return srv.DeletePost(ctx, req.(*v11.DeletePostRequest)) }) out, err := h(ctx, &in) if err != nil { @@ -161,11 +161,11 @@ func _PostService_DeletePost0_HTTP_Handler(srv PostServiceHTTPServer) func(ctx h } type PostServiceHTTPClient interface { - CreatePost(ctx context.Context, req *v1.CreatePostRequest, opts ...http.CallOption) (rsp *v1.Post, err error) - DeletePost(ctx context.Context, req *v1.DeletePostRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error) - GetPost(ctx context.Context, req *v1.GetPostRequest, opts ...http.CallOption) (rsp *v1.Post, err error) - ListPost(ctx context.Context, req *pagination.PagingRequest, opts ...http.CallOption) (rsp *v1.ListPostResponse, err error) - UpdatePost(ctx context.Context, req *v1.UpdatePostRequest, opts ...http.CallOption) (rsp *v1.Post, err error) + CreatePost(ctx context.Context, req *v11.CreatePostRequest, opts ...http.CallOption) (rsp *v11.Post, err error) + DeletePost(ctx context.Context, req *v11.DeletePostRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error) + GetPost(ctx context.Context, req *v11.GetPostRequest, opts ...http.CallOption) (rsp *v11.Post, err error) + ListPost(ctx context.Context, req *v1.PagingRequest, opts ...http.CallOption) (rsp *v11.ListPostResponse, err error) + UpdatePost(ctx context.Context, req *v11.UpdatePostRequest, opts ...http.CallOption) (rsp *v11.Post, err error) } type PostServiceHTTPClientImpl struct { @@ -176,8 +176,8 @@ func NewPostServiceHTTPClient(client *http.Client) PostServiceHTTPClient { return &PostServiceHTTPClientImpl{client} } -func (c *PostServiceHTTPClientImpl) CreatePost(ctx context.Context, in *v1.CreatePostRequest, opts ...http.CallOption) (*v1.Post, error) { - var out v1.Post +func (c *PostServiceHTTPClientImpl) CreatePost(ctx context.Context, in *v11.CreatePostRequest, opts ...http.CallOption) (*v11.Post, error) { + var out v11.Post pattern := "/admin/v1/posts" path := binding.EncodeURL(pattern, in, false) opts = append(opts, http.Operation(OperationPostServiceCreatePost)) @@ -189,7 +189,7 @@ func (c *PostServiceHTTPClientImpl) CreatePost(ctx context.Context, in *v1.Creat return &out, err } -func (c *PostServiceHTTPClientImpl) DeletePost(ctx context.Context, in *v1.DeletePostRequest, opts ...http.CallOption) (*emptypb.Empty, error) { +func (c *PostServiceHTTPClientImpl) DeletePost(ctx context.Context, in *v11.DeletePostRequest, opts ...http.CallOption) (*emptypb.Empty, error) { var out emptypb.Empty pattern := "/admin/v1/posts/{id}" path := binding.EncodeURL(pattern, in, true) @@ -202,8 +202,8 @@ func (c *PostServiceHTTPClientImpl) DeletePost(ctx context.Context, in *v1.Delet return &out, err } -func (c *PostServiceHTTPClientImpl) GetPost(ctx context.Context, in *v1.GetPostRequest, opts ...http.CallOption) (*v1.Post, error) { - var out v1.Post +func (c *PostServiceHTTPClientImpl) GetPost(ctx context.Context, in *v11.GetPostRequest, opts ...http.CallOption) (*v11.Post, error) { + var out v11.Post pattern := "/admin/v1/posts/{id}" path := binding.EncodeURL(pattern, in, true) opts = append(opts, http.Operation(OperationPostServiceGetPost)) @@ -215,8 +215,8 @@ func (c *PostServiceHTTPClientImpl) GetPost(ctx context.Context, in *v1.GetPostR return &out, err } -func (c *PostServiceHTTPClientImpl) ListPost(ctx context.Context, in *pagination.PagingRequest, opts ...http.CallOption) (*v1.ListPostResponse, error) { - var out v1.ListPostResponse +func (c *PostServiceHTTPClientImpl) ListPost(ctx context.Context, in *v1.PagingRequest, opts ...http.CallOption) (*v11.ListPostResponse, error) { + var out v11.ListPostResponse pattern := "/admin/v1/posts" path := binding.EncodeURL(pattern, in, true) opts = append(opts, http.Operation(OperationPostServiceListPost)) @@ -228,8 +228,8 @@ func (c *PostServiceHTTPClientImpl) ListPost(ctx context.Context, in *pagination return &out, err } -func (c *PostServiceHTTPClientImpl) UpdatePost(ctx context.Context, in *v1.UpdatePostRequest, opts ...http.CallOption) (*v1.Post, error) { - var out v1.Post +func (c *PostServiceHTTPClientImpl) UpdatePost(ctx context.Context, in *v11.UpdatePostRequest, opts ...http.CallOption) (*v11.Post, error) { + var out v11.Post pattern := "/admin/v1/posts/{id}" path := binding.EncodeURL(pattern, in, false) opts = append(opts, http.Operation(OperationPostServiceUpdatePost)) diff --git a/blog-backend/gen/api/go/admin/service/v1/i_system.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_system.pb.go index 106df1c6..5cde5638 100644 --- a/blog-backend/gen/api/go/admin/service/v1/i_system.pb.go +++ b/blog-backend/gen/api/go/admin/service/v1/i_system.pb.go @@ -4,15 +4,15 @@ // protoc (unknown) // source: admin/service/v1/i_system.proto -package v1 +package servicev1 import ( _ "github.com/google/gnostic/openapiv3" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" reflect "reflect" sync "sync" ) @@ -403,104 +403,113 @@ var file_admin_service_v1_i_system_proto_rawDesc = []byte{ 0x65, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x22, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x61, 0x67, - 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x81, 0x02, 0x0a, 0x06, 0x53, 0x79, 0x73, - 0x74, 0x65, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, - 0x02, 0x69, 0x64, 0x12, 0x19, 0x0a, 0x05, 0x74, 0x68, 0x65, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x05, 0x48, 0x00, 0x52, 0x05, 0x74, 0x68, 0x65, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x12, 0x19, - 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, 0x01, 0x52, - 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x12, 0x1f, 0x0a, 0x08, 0x6b, 0x65, 0x79, - 0x77, 0x6f, 0x72, 0x64, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x48, 0x02, 0x52, 0x08, 0x6b, - 0x65, 0x79, 0x77, 0x6f, 0x72, 0x64, 0x73, 0x88, 0x01, 0x01, 0x12, 0x25, 0x0a, 0x0b, 0x64, 0x65, - 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x48, - 0x03, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x88, 0x01, - 0x01, 0x12, 0x27, 0x0a, 0x0c, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x4e, 0x75, 0x6d, 0x62, 0x65, - 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x48, 0x04, 0x52, 0x0c, 0x72, 0x65, 0x63, 0x6f, 0x72, - 0x64, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x88, 0x01, 0x01, 0x42, 0x08, 0x0a, 0x06, 0x5f, 0x74, - 0x68, 0x65, 0x6d, 0x65, 0x42, 0x08, 0x0a, 0x06, 0x5f, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x42, 0x0b, - 0x0a, 0x09, 0x5f, 0x6b, 0x65, 0x79, 0x77, 0x6f, 0x72, 0x64, 0x73, 0x42, 0x0e, 0x0a, 0x0c, 0x5f, - 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x0f, 0x0a, 0x0d, 0x5f, - 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22, 0x5a, 0x0a, 0x12, - 0x4c, 0x69, 0x73, 0x74, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, - 0x73, 0x65, 0x12, 0x2e, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x18, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, - 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x69, 0x74, 0x65, - 0x6d, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x22, 0x22, 0x0a, 0x10, 0x47, 0x65, 0x74, 0x53, - 0x79, 0x73, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, - 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02, 0x69, 0x64, 0x22, 0x7b, 0x0a, 0x13, - 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x12, 0x30, 0x0a, 0x06, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x73, 0x65, 0x72, 0x76, - 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x52, 0x06, 0x73, - 0x79, 0x73, 0x74, 0x65, 0x6d, 0x12, 0x23, 0x0a, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, - 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x48, 0x00, 0x52, 0x0a, 0x6f, 0x70, 0x65, - 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x88, 0x01, 0x01, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x6f, - 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x22, 0x8b, 0x01, 0x0a, 0x13, 0x55, 0x70, - 0x64, 0x61, 0x74, 0x65, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02, 0x69, - 0x64, 0x12, 0x30, 0x0a, 0x06, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x18, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, - 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x52, 0x06, 0x73, 0x79, 0x73, - 0x74, 0x65, 0x6d, 0x12, 0x23, 0x0a, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, - 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x48, 0x00, 0x52, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, - 0x74, 0x6f, 0x72, 0x49, 0x64, 0x88, 0x01, 0x01, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x6f, 0x70, 0x65, - 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x22, 0x59, 0x0a, 0x13, 0x44, 0x65, 0x6c, 0x65, 0x74, - 0x65, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, - 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02, 0x69, 0x64, 0x12, 0x23, - 0x0a, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x04, 0x48, 0x00, 0x52, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, - 0x88, 0x01, 0x01, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, - 0x49, 0x64, 0x32, 0xd6, 0x05, 0x0a, 0x0d, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x53, 0x65, 0x72, - 0x76, 0x69, 0x63, 0x65, 0x12, 0x86, 0x01, 0x0a, 0x0a, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x79, 0x73, - 0x74, 0x65, 0x6d, 0x12, 0x19, 0x2e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x2e, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, - 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, - 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x37, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, - 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, - 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x12, 0x12, 0x10, 0x2f, 0x61, 0x64, - 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x12, 0x87, 0x01, - 0x0a, 0x09, 0x47, 0x65, 0x74, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x12, 0x22, 0x2e, 0x61, 0x64, - 0x6d, 0x69, 0x6e, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, - 0x65, 0x74, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, + 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x81, 0x02, 0x0a, 0x06, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x12, + 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02, 0x69, 0x64, 0x12, + 0x19, 0x0a, 0x05, 0x74, 0x68, 0x65, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x48, 0x00, + 0x52, 0x05, 0x74, 0x68, 0x65, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x12, 0x19, 0x0a, 0x05, 0x74, 0x69, + 0x74, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, 0x01, 0x52, 0x05, 0x74, 0x69, 0x74, + 0x6c, 0x65, 0x88, 0x01, 0x01, 0x12, 0x1f, 0x0a, 0x08, 0x6b, 0x65, 0x79, 0x77, 0x6f, 0x72, 0x64, + 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x48, 0x02, 0x52, 0x08, 0x6b, 0x65, 0x79, 0x77, 0x6f, + 0x72, 0x64, 0x73, 0x88, 0x01, 0x01, 0x12, 0x25, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, + 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x48, 0x03, 0x52, 0x0b, 0x64, + 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x27, 0x0a, + 0x0c, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x06, 0x20, + 0x01, 0x28, 0x09, 0x48, 0x04, 0x52, 0x0c, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x4e, 0x75, 0x6d, + 0x62, 0x65, 0x72, 0x88, 0x01, 0x01, 0x42, 0x08, 0x0a, 0x06, 0x5f, 0x74, 0x68, 0x65, 0x6d, 0x65, + 0x42, 0x08, 0x0a, 0x06, 0x5f, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x6b, + 0x65, 0x79, 0x77, 0x6f, 0x72, 0x64, 0x73, 0x42, 0x0e, 0x0a, 0x0c, 0x5f, 0x64, 0x65, 0x73, 0x63, + 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x0f, 0x0a, 0x0d, 0x5f, 0x72, 0x65, 0x63, 0x6f, + 0x72, 0x64, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22, 0x5a, 0x0a, 0x12, 0x4c, 0x69, 0x73, 0x74, + 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2e, + 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, + 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, + 0x2e, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x14, + 0x0a, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x74, + 0x6f, 0x74, 0x61, 0x6c, 0x22, 0x22, 0x0a, 0x10, 0x47, 0x65, 0x74, 0x53, 0x79, 0x73, 0x74, 0x65, + 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x04, 0x52, 0x02, 0x69, 0x64, 0x22, 0x7b, 0x0a, 0x13, 0x43, 0x72, 0x65, 0x61, + 0x74, 0x65, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, + 0x30, 0x0a, 0x06, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, - 0x76, 0x31, 0x2e, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x22, 0x3c, 0xba, 0x47, 0x1c, 0x5a, 0x1a, + 0x76, 0x31, 0x2e, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x52, 0x06, 0x73, 0x79, 0x73, 0x74, 0x65, + 0x6d, 0x12, 0x23, 0x0a, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x04, 0x48, 0x00, 0x52, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, + 0x72, 0x49, 0x64, 0x88, 0x01, 0x01, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x6f, 0x70, 0x65, 0x72, 0x61, + 0x74, 0x6f, 0x72, 0x49, 0x64, 0x22, 0x8b, 0x01, 0x0a, 0x13, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, + 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, + 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02, 0x69, 0x64, 0x12, 0x30, 0x0a, + 0x06, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, + 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, + 0x2e, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x52, 0x06, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x12, + 0x23, 0x0a, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x04, 0x48, 0x00, 0x52, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, + 0x64, 0x88, 0x01, 0x01, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, + 0x72, 0x49, 0x64, 0x22, 0x59, 0x0a, 0x13, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x79, 0x73, + 0x74, 0x65, 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02, 0x69, 0x64, 0x12, 0x23, 0x0a, 0x0a, 0x6f, 0x70, + 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x48, 0x00, + 0x52, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x88, 0x01, 0x01, 0x42, + 0x0d, 0x0a, 0x0b, 0x5f, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x32, 0xd6, + 0x05, 0x0a, 0x0d, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, + 0x12, 0x86, 0x01, 0x0a, 0x0a, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x12, + 0x19, 0x2e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x50, 0x61, 0x67, + 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x61, 0x64, 0x6d, + 0x69, 0x6e, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, + 0x73, 0x74, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, + 0x22, 0x37, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, + 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, + 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x12, 0x12, 0x10, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, + 0x76, 0x31, 0x2f, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x12, 0x87, 0x01, 0x0a, 0x09, 0x47, 0x65, + 0x74, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x12, 0x22, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, + 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x79, + 0x73, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x61, 0x64, + 0x6d, 0x69, 0x6e, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x53, + 0x79, 0x73, 0x74, 0x65, 0x6d, 0x22, 0x3c, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, + 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, + 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x17, 0x12, 0x15, 0x2f, 0x61, + 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2f, 0x7b, + 0x69, 0x64, 0x7d, 0x12, 0x8b, 0x01, 0x0a, 0x0c, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x79, + 0x73, 0x74, 0x65, 0x6d, 0x12, 0x25, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x73, 0x65, 0x72, + 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x53, 0x79, + 0x73, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x61, 0x64, + 0x6d, 0x69, 0x6e, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x53, + 0x79, 0x73, 0x74, 0x65, 0x6d, 0x22, 0x3a, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, + 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, + 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x15, 0x3a, 0x01, 0x2a, 0x22, + 0x10, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x73, 0x79, 0x73, 0x74, 0x65, + 0x6d, 0x12, 0x95, 0x01, 0x0a, 0x0c, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x79, 0x73, 0x74, + 0x65, 0x6d, 0x12, 0x25, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, + 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x79, 0x73, 0x74, + 0x65, 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x61, 0x64, 0x6d, 0x69, + 0x6e, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x79, 0x73, + 0x74, 0x65, 0x6d, 0x22, 0x44, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, + 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, + 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1f, 0x3a, 0x06, 0x73, 0x79, 0x73, 0x74, + 0x65, 0x6d, 0x1a, 0x15, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x73, 0x79, + 0x73, 0x74, 0x65, 0x6d, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x8b, 0x01, 0x0a, 0x0c, 0x44, 0x65, + 0x6c, 0x65, 0x74, 0x65, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x12, 0x25, 0x2e, 0x61, 0x64, 0x6d, + 0x69, 0x6e, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, + 0x6c, 0x65, 0x74, 0x65, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x3c, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x17, - 0x12, 0x15, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x73, 0x79, 0x73, 0x74, - 0x65, 0x6d, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x8b, 0x01, 0x0a, 0x0c, 0x43, 0x72, 0x65, 0x61, - 0x74, 0x65, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x12, 0x25, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, - 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, - 0x74, 0x65, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, - 0x18, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, - 0x76, 0x31, 0x2e, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x22, 0x3a, 0xba, 0x47, 0x1c, 0x5a, 0x1a, - 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, - 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x15, - 0x3a, 0x01, 0x2a, 0x22, 0x10, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x73, - 0x79, 0x73, 0x74, 0x65, 0x6d, 0x12, 0x95, 0x01, 0x0a, 0x0c, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, - 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x12, 0x25, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x73, - 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, - 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, + 0x2a, 0x15, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x73, 0x79, 0x73, 0x74, + 0x65, 0x6d, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x42, 0xb8, 0x01, 0x0a, 0x14, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, - 0x2e, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x22, 0x44, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, - 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, - 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1f, 0x3a, 0x06, - 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x1a, 0x15, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, - 0x31, 0x2f, 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x8b, 0x01, - 0x0a, 0x0c, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x12, 0x25, - 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, - 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x3c, 0xba, - 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, - 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, - 0xe4, 0x93, 0x02, 0x17, 0x2a, 0x15, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, - 0x73, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x42, 0x2b, 0x5a, 0x29, 0x6b, - 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x63, 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x70, - 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, - 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x42, 0x0c, 0x49, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, + 0x5a, 0x30, 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x63, 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, + 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x73, 0x65, + 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, + 0x76, 0x31, 0xa2, 0x02, 0x03, 0x41, 0x53, 0x58, 0xaa, 0x02, 0x10, 0x41, 0x64, 0x6d, 0x69, 0x6e, + 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x10, 0x41, 0x64, + 0x6d, 0x69, 0x6e, 0x5c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x56, 0x31, 0xe2, 0x02, + 0x1c, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x5c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x56, + 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x12, + 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x3a, 0x3a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x3a, 0x3a, + 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -517,14 +526,14 @@ func file_admin_service_v1_i_system_proto_rawDescGZIP() []byte { var file_admin_service_v1_i_system_proto_msgTypes = make([]protoimpl.MessageInfo, 6) var file_admin_service_v1_i_system_proto_goTypes = []interface{}{ - (*System)(nil), // 0: admin.service.v1.System - (*ListSystemResponse)(nil), // 1: admin.service.v1.ListSystemResponse - (*GetSystemRequest)(nil), // 2: admin.service.v1.GetSystemRequest - (*CreateSystemRequest)(nil), // 3: admin.service.v1.CreateSystemRequest - (*UpdateSystemRequest)(nil), // 4: admin.service.v1.UpdateSystemRequest - (*DeleteSystemRequest)(nil), // 5: admin.service.v1.DeleteSystemRequest - (*pagination.PagingRequest)(nil), // 6: pagination.PagingRequest - (*emptypb.Empty)(nil), // 7: google.protobuf.Empty + (*System)(nil), // 0: admin.service.v1.System + (*ListSystemResponse)(nil), // 1: admin.service.v1.ListSystemResponse + (*GetSystemRequest)(nil), // 2: admin.service.v1.GetSystemRequest + (*CreateSystemRequest)(nil), // 3: admin.service.v1.CreateSystemRequest + (*UpdateSystemRequest)(nil), // 4: admin.service.v1.UpdateSystemRequest + (*DeleteSystemRequest)(nil), // 5: admin.service.v1.DeleteSystemRequest + (*v1.PagingRequest)(nil), // 6: pagination.PagingRequest + (*emptypb.Empty)(nil), // 7: google.protobuf.Empty } var file_admin_service_v1_i_system_proto_depIdxs = []int32{ 0, // 0: admin.service.v1.ListSystemResponse.items:type_name -> admin.service.v1.System diff --git a/blog-backend/gen/api/go/admin/service/v1/i_system.pb.validate.go b/blog-backend/gen/api/go/admin/service/v1/i_system.pb.validate.go index 85f4a969..0e115d6c 100644 --- a/blog-backend/gen/api/go/admin/service/v1/i_system.pb.validate.go +++ b/blog-backend/gen/api/go/admin/service/v1/i_system.pb.validate.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-validate. DO NOT EDIT. // source: admin/service/v1/i_system.proto -package v1 +package servicev1 import ( "bytes" diff --git a/blog-backend/gen/api/go/admin/service/v1/i_system_grpc.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_system_grpc.pb.go index 7f0a952d..e04cbc47 100644 --- a/blog-backend/gen/api/go/admin/service/v1/i_system_grpc.pb.go +++ b/blog-backend/gen/api/go/admin/service/v1/i_system_grpc.pb.go @@ -4,15 +4,15 @@ // - protoc (unknown) // source: admin/service/v1/i_system.proto -package v1 +package servicev1 import ( context "context" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" ) // This is a compile-time assertion to ensure that this generated file @@ -33,7 +33,7 @@ const ( // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type SystemServiceClient interface { // 获取系统设置列表 - ListSystem(ctx context.Context, in *pagination.PagingRequest, opts ...grpc.CallOption) (*ListSystemResponse, error) + ListSystem(ctx context.Context, in *v1.PagingRequest, opts ...grpc.CallOption) (*ListSystemResponse, error) // 获取系统设置数据 GetSystem(ctx context.Context, in *GetSystemRequest, opts ...grpc.CallOption) (*System, error) // 创建系统设置 @@ -52,7 +52,7 @@ func NewSystemServiceClient(cc grpc.ClientConnInterface) SystemServiceClient { return &systemServiceClient{cc} } -func (c *systemServiceClient) ListSystem(ctx context.Context, in *pagination.PagingRequest, opts ...grpc.CallOption) (*ListSystemResponse, error) { +func (c *systemServiceClient) ListSystem(ctx context.Context, in *v1.PagingRequest, opts ...grpc.CallOption) (*ListSystemResponse, error) { out := new(ListSystemResponse) err := c.cc.Invoke(ctx, SystemService_ListSystem_FullMethodName, in, out, opts...) if err != nil { @@ -102,7 +102,7 @@ func (c *systemServiceClient) DeleteSystem(ctx context.Context, in *DeleteSystem // for forward compatibility type SystemServiceServer interface { // 获取系统设置列表 - ListSystem(context.Context, *pagination.PagingRequest) (*ListSystemResponse, error) + ListSystem(context.Context, *v1.PagingRequest) (*ListSystemResponse, error) // 获取系统设置数据 GetSystem(context.Context, *GetSystemRequest) (*System, error) // 创建系统设置 @@ -118,7 +118,7 @@ type SystemServiceServer interface { type UnimplementedSystemServiceServer struct { } -func (UnimplementedSystemServiceServer) ListSystem(context.Context, *pagination.PagingRequest) (*ListSystemResponse, error) { +func (UnimplementedSystemServiceServer) ListSystem(context.Context, *v1.PagingRequest) (*ListSystemResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListSystem not implemented") } func (UnimplementedSystemServiceServer) GetSystem(context.Context, *GetSystemRequest) (*System, error) { @@ -147,7 +147,7 @@ func RegisterSystemServiceServer(s grpc.ServiceRegistrar, srv SystemServiceServe } func _SystemService_ListSystem_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(pagination.PagingRequest) + in := new(v1.PagingRequest) if err := dec(in); err != nil { return nil, err } @@ -159,7 +159,7 @@ func _SystemService_ListSystem_Handler(srv interface{}, ctx context.Context, dec FullMethod: SystemService_ListSystem_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(SystemServiceServer).ListSystem(ctx, req.(*pagination.PagingRequest)) + return srv.(SystemServiceServer).ListSystem(ctx, req.(*v1.PagingRequest)) } return interceptor(ctx, in, info, handler) } diff --git a/blog-backend/gen/api/go/admin/service/v1/i_system_http.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_system_http.pb.go index de3df286..b64f6d42 100644 --- a/blog-backend/gen/api/go/admin/service/v1/i_system_http.pb.go +++ b/blog-backend/gen/api/go/admin/service/v1/i_system_http.pb.go @@ -4,14 +4,14 @@ // - protoc (unknown) // source: admin/service/v1/i_system.proto -package v1 +package servicev1 import ( context "context" http "github.com/go-kratos/kratos/v2/transport/http" binding "github.com/go-kratos/kratos/v2/transport/http/binding" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" ) // This is a compile-time assertion to ensure that this generated file @@ -35,7 +35,7 @@ type SystemServiceHTTPServer interface { // GetSystem 获取系统设置数据 GetSystem(context.Context, *GetSystemRequest) (*System, error) // ListSystem 获取系统设置列表 - ListSystem(context.Context, *pagination.PagingRequest) (*ListSystemResponse, error) + ListSystem(context.Context, *v1.PagingRequest) (*ListSystemResponse, error) // UpdateSystem 更新系统设置 UpdateSystem(context.Context, *UpdateSystemRequest) (*System, error) } @@ -51,13 +51,13 @@ func RegisterSystemServiceHTTPServer(s *http.Server, srv SystemServiceHTTPServer func _SystemService_ListSystem0_HTTP_Handler(srv SystemServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in pagination.PagingRequest + var in v1.PagingRequest if err := ctx.BindQuery(&in); err != nil { return err } http.SetOperation(ctx, OperationSystemServiceListSystem) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.ListSystem(ctx, req.(*pagination.PagingRequest)) + return srv.ListSystem(ctx, req.(*v1.PagingRequest)) }) out, err := h(ctx, &in) if err != nil { @@ -163,7 +163,7 @@ type SystemServiceHTTPClient interface { CreateSystem(ctx context.Context, req *CreateSystemRequest, opts ...http.CallOption) (rsp *System, err error) DeleteSystem(ctx context.Context, req *DeleteSystemRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error) GetSystem(ctx context.Context, req *GetSystemRequest, opts ...http.CallOption) (rsp *System, err error) - ListSystem(ctx context.Context, req *pagination.PagingRequest, opts ...http.CallOption) (rsp *ListSystemResponse, err error) + ListSystem(ctx context.Context, req *v1.PagingRequest, opts ...http.CallOption) (rsp *ListSystemResponse, err error) UpdateSystem(ctx context.Context, req *UpdateSystemRequest, opts ...http.CallOption) (rsp *System, err error) } @@ -214,7 +214,7 @@ func (c *SystemServiceHTTPClientImpl) GetSystem(ctx context.Context, in *GetSyst return &out, err } -func (c *SystemServiceHTTPClientImpl) ListSystem(ctx context.Context, in *pagination.PagingRequest, opts ...http.CallOption) (*ListSystemResponse, error) { +func (c *SystemServiceHTTPClientImpl) ListSystem(ctx context.Context, in *v1.PagingRequest, opts ...http.CallOption) (*ListSystemResponse, error) { var out ListSystemResponse pattern := "/admin/v1/system" path := binding.EncodeURL(pattern, in, true) diff --git a/blog-backend/gen/api/go/admin/service/v1/i_tag.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_tag.pb.go index f2300673..5031f1d2 100644 --- a/blog-backend/gen/api/go/admin/service/v1/i_tag.pb.go +++ b/blog-backend/gen/api/go/admin/service/v1/i_tag.pb.go @@ -4,16 +4,16 @@ // protoc (unknown) // source: admin/service/v1/i_tag.proto -package v1 +package servicev1 import ( _ "github.com/google/gnostic/openapiv3" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" - v1 "kratos-cms/gen/api/go/content/service/v1" + v11 "kratos-cms/gen/api/go/content/service/v1" reflect "reflect" ) @@ -36,68 +36,77 @@ var file_admin_service_v1_i_tag_proto_rawDesc = []byte{ 0x70, 0x69, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x1a, 0x22, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1c, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2f, 0x73, - 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x61, 0x67, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x32, 0xaf, 0x05, 0x0a, 0x0a, 0x54, 0x61, 0x67, 0x53, 0x65, 0x72, 0x76, 0x69, - 0x63, 0x65, 0x12, 0x80, 0x01, 0x0a, 0x07, 0x4c, 0x69, 0x73, 0x74, 0x54, 0x61, 0x67, 0x12, 0x19, - 0x2e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x50, 0x61, 0x67, 0x69, - 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x63, 0x6f, 0x6e, 0x74, - 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, - 0x69, 0x73, 0x74, 0x54, 0x61, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x35, - 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, - 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, - 0xd3, 0xe4, 0x93, 0x02, 0x10, 0x12, 0x0e, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, - 0x2f, 0x74, 0x61, 0x67, 0x73, 0x12, 0x80, 0x01, 0x0a, 0x06, 0x47, 0x65, 0x74, 0x54, 0x61, 0x67, - 0x12, 0x21, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, - 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x54, 0x61, 0x67, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x1a, 0x17, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, - 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x61, 0x67, 0x22, 0x3a, 0xba, 0x47, - 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, - 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, - 0x93, 0x02, 0x15, 0x12, 0x13, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x74, - 0x61, 0x67, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x84, 0x01, 0x0a, 0x09, 0x43, 0x72, 0x65, - 0x61, 0x74, 0x65, 0x54, 0x61, 0x67, 0x12, 0x24, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, - 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, - 0x74, 0x65, 0x54, 0x61, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x17, 0x2e, 0x63, + 0x6f, 0x1a, 0x1e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x76, 0x31, + 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x1a, 0x1c, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, + 0x63, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x61, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, + 0xaf, 0x05, 0x0a, 0x0a, 0x54, 0x61, 0x67, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x80, + 0x01, 0x0a, 0x07, 0x4c, 0x69, 0x73, 0x74, 0x54, 0x61, 0x67, 0x12, 0x19, 0x2e, 0x70, 0x61, 0x67, + 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, + 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x54, + 0x61, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x35, 0xba, 0x47, 0x1c, 0x5a, + 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, + 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, + 0x10, 0x12, 0x0e, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x61, 0x67, + 0x73, 0x12, 0x80, 0x01, 0x0a, 0x06, 0x47, 0x65, 0x74, 0x54, 0x61, 0x67, 0x12, 0x21, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, - 0x31, 0x2e, 0x54, 0x61, 0x67, 0x22, 0x38, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, + 0x31, 0x2e, 0x47, 0x65, 0x74, 0x54, 0x61, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, + 0x17, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x61, 0x67, 0x22, 0x3a, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, + 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, + 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x15, 0x12, + 0x13, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x61, 0x67, 0x73, 0x2f, + 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x84, 0x01, 0x0a, 0x09, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, + 0x61, 0x67, 0x12, 0x24, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, + 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x61, + 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x17, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, + 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x61, + 0x67, 0x22, 0x38, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, + 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, + 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x13, 0x3a, 0x01, 0x2a, 0x22, 0x0e, 0x2f, 0x61, 0x64, + 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x61, 0x67, 0x73, 0x12, 0x8b, 0x01, 0x0a, 0x09, + 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x61, 0x67, 0x12, 0x24, 0x2e, 0x63, 0x6f, 0x6e, 0x74, + 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, + 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x61, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, + 0x17, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x61, 0x67, 0x22, 0x3f, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, + 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, + 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1a, 0x3a, + 0x03, 0x74, 0x61, 0x67, 0x1a, 0x13, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, + 0x74, 0x61, 0x67, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x85, 0x01, 0x0a, 0x09, 0x44, 0x65, + 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x67, 0x12, 0x24, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, + 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, + 0x65, 0x74, 0x65, 0x54, 0x61, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, + 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, + 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x3a, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, - 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x13, 0x3a, 0x01, 0x2a, 0x22, - 0x0e, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x61, 0x67, 0x73, 0x12, - 0x8b, 0x01, 0x0a, 0x09, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x61, 0x67, 0x12, 0x24, 0x2e, - 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, - 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x61, 0x67, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x1a, 0x17, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, - 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x61, 0x67, 0x22, 0x3f, 0xba, 0x47, - 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, - 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, - 0x93, 0x02, 0x1a, 0x3a, 0x03, 0x74, 0x61, 0x67, 0x1a, 0x13, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, - 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x61, 0x67, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x85, 0x01, - 0x0a, 0x09, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x67, 0x12, 0x24, 0x2e, 0x63, 0x6f, - 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, - 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x3a, 0xba, 0x47, 0x1c, 0x5a, 0x1a, - 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, - 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x15, - 0x2a, 0x13, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x61, 0x67, 0x73, - 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x42, 0x2b, 0x5a, 0x29, 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, + 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x15, 0x2a, 0x13, 0x2f, 0x61, + 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x61, 0x67, 0x73, 0x2f, 0x7b, 0x69, 0x64, + 0x7d, 0x42, 0xb5, 0x01, 0x0a, 0x14, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, + 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x42, 0x09, 0x49, 0x54, 0x61, 0x67, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x30, 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x63, 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, - 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x41, 0x53, 0x58, 0xaa, + 0x02, 0x10, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, + 0x56, 0x31, 0xca, 0x02, 0x10, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x5c, 0x53, 0x65, 0x72, 0x76, 0x69, + 0x63, 0x65, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1c, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x5c, 0x53, 0x65, + 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, + 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x12, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x3a, 0x3a, 0x53, 0x65, + 0x72, 0x76, 0x69, 0x63, 0x65, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, } var file_admin_service_v1_i_tag_proto_goTypes = []interface{}{ - (*pagination.PagingRequest)(nil), // 0: pagination.PagingRequest - (*v1.GetTagRequest)(nil), // 1: content.service.v1.GetTagRequest - (*v1.CreateTagRequest)(nil), // 2: content.service.v1.CreateTagRequest - (*v1.UpdateTagRequest)(nil), // 3: content.service.v1.UpdateTagRequest - (*v1.DeleteTagRequest)(nil), // 4: content.service.v1.DeleteTagRequest - (*v1.ListTagResponse)(nil), // 5: content.service.v1.ListTagResponse - (*v1.Tag)(nil), // 6: content.service.v1.Tag - (*emptypb.Empty)(nil), // 7: google.protobuf.Empty + (*v1.PagingRequest)(nil), // 0: pagination.PagingRequest + (*v11.GetTagRequest)(nil), // 1: content.service.v1.GetTagRequest + (*v11.CreateTagRequest)(nil), // 2: content.service.v1.CreateTagRequest + (*v11.UpdateTagRequest)(nil), // 3: content.service.v1.UpdateTagRequest + (*v11.DeleteTagRequest)(nil), // 4: content.service.v1.DeleteTagRequest + (*v11.ListTagResponse)(nil), // 5: content.service.v1.ListTagResponse + (*v11.Tag)(nil), // 6: content.service.v1.Tag + (*emptypb.Empty)(nil), // 7: google.protobuf.Empty } var file_admin_service_v1_i_tag_proto_depIdxs = []int32{ 0, // 0: admin.service.v1.TagService.ListTag:input_type -> pagination.PagingRequest diff --git a/blog-backend/gen/api/go/admin/service/v1/i_tag.pb.validate.go b/blog-backend/gen/api/go/admin/service/v1/i_tag.pb.validate.go index 5a9b7915..390a6395 100644 --- a/blog-backend/gen/api/go/admin/service/v1/i_tag.pb.validate.go +++ b/blog-backend/gen/api/go/admin/service/v1/i_tag.pb.validate.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-validate. DO NOT EDIT. // source: admin/service/v1/i_tag.proto -package v1 +package servicev1 import ( "bytes" diff --git a/blog-backend/gen/api/go/admin/service/v1/i_tag_grpc.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_tag_grpc.pb.go index 7b5debaa..ac5b5658 100644 --- a/blog-backend/gen/api/go/admin/service/v1/i_tag_grpc.pb.go +++ b/blog-backend/gen/api/go/admin/service/v1/i_tag_grpc.pb.go @@ -4,16 +4,16 @@ // - protoc (unknown) // source: admin/service/v1/i_tag.proto -package v1 +package servicev1 import ( context "context" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" - v1 "kratos-cms/gen/api/go/content/service/v1" + v11 "kratos-cms/gen/api/go/content/service/v1" ) // This is a compile-time assertion to ensure that this generated file @@ -34,15 +34,15 @@ const ( // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type TagServiceClient interface { // 获取标签列表 - ListTag(ctx context.Context, in *pagination.PagingRequest, opts ...grpc.CallOption) (*v1.ListTagResponse, error) + ListTag(ctx context.Context, in *v1.PagingRequest, opts ...grpc.CallOption) (*v11.ListTagResponse, error) // 获取标签数据 - GetTag(ctx context.Context, in *v1.GetTagRequest, opts ...grpc.CallOption) (*v1.Tag, error) + GetTag(ctx context.Context, in *v11.GetTagRequest, opts ...grpc.CallOption) (*v11.Tag, error) // 创建标签 - CreateTag(ctx context.Context, in *v1.CreateTagRequest, opts ...grpc.CallOption) (*v1.Tag, error) + CreateTag(ctx context.Context, in *v11.CreateTagRequest, opts ...grpc.CallOption) (*v11.Tag, error) // 更新标签 - UpdateTag(ctx context.Context, in *v1.UpdateTagRequest, opts ...grpc.CallOption) (*v1.Tag, error) + UpdateTag(ctx context.Context, in *v11.UpdateTagRequest, opts ...grpc.CallOption) (*v11.Tag, error) // 删除标签 - DeleteTag(ctx context.Context, in *v1.DeleteTagRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) + DeleteTag(ctx context.Context, in *v11.DeleteTagRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) } type tagServiceClient struct { @@ -53,8 +53,8 @@ func NewTagServiceClient(cc grpc.ClientConnInterface) TagServiceClient { return &tagServiceClient{cc} } -func (c *tagServiceClient) ListTag(ctx context.Context, in *pagination.PagingRequest, opts ...grpc.CallOption) (*v1.ListTagResponse, error) { - out := new(v1.ListTagResponse) +func (c *tagServiceClient) ListTag(ctx context.Context, in *v1.PagingRequest, opts ...grpc.CallOption) (*v11.ListTagResponse, error) { + out := new(v11.ListTagResponse) err := c.cc.Invoke(ctx, TagService_ListTag_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -62,8 +62,8 @@ func (c *tagServiceClient) ListTag(ctx context.Context, in *pagination.PagingReq return out, nil } -func (c *tagServiceClient) GetTag(ctx context.Context, in *v1.GetTagRequest, opts ...grpc.CallOption) (*v1.Tag, error) { - out := new(v1.Tag) +func (c *tagServiceClient) GetTag(ctx context.Context, in *v11.GetTagRequest, opts ...grpc.CallOption) (*v11.Tag, error) { + out := new(v11.Tag) err := c.cc.Invoke(ctx, TagService_GetTag_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -71,8 +71,8 @@ func (c *tagServiceClient) GetTag(ctx context.Context, in *v1.GetTagRequest, opt return out, nil } -func (c *tagServiceClient) CreateTag(ctx context.Context, in *v1.CreateTagRequest, opts ...grpc.CallOption) (*v1.Tag, error) { - out := new(v1.Tag) +func (c *tagServiceClient) CreateTag(ctx context.Context, in *v11.CreateTagRequest, opts ...grpc.CallOption) (*v11.Tag, error) { + out := new(v11.Tag) err := c.cc.Invoke(ctx, TagService_CreateTag_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -80,8 +80,8 @@ func (c *tagServiceClient) CreateTag(ctx context.Context, in *v1.CreateTagReques return out, nil } -func (c *tagServiceClient) UpdateTag(ctx context.Context, in *v1.UpdateTagRequest, opts ...grpc.CallOption) (*v1.Tag, error) { - out := new(v1.Tag) +func (c *tagServiceClient) UpdateTag(ctx context.Context, in *v11.UpdateTagRequest, opts ...grpc.CallOption) (*v11.Tag, error) { + out := new(v11.Tag) err := c.cc.Invoke(ctx, TagService_UpdateTag_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -89,7 +89,7 @@ func (c *tagServiceClient) UpdateTag(ctx context.Context, in *v1.UpdateTagReques return out, nil } -func (c *tagServiceClient) DeleteTag(ctx context.Context, in *v1.DeleteTagRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { +func (c *tagServiceClient) DeleteTag(ctx context.Context, in *v11.DeleteTagRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { out := new(emptypb.Empty) err := c.cc.Invoke(ctx, TagService_DeleteTag_FullMethodName, in, out, opts...) if err != nil { @@ -103,15 +103,15 @@ func (c *tagServiceClient) DeleteTag(ctx context.Context, in *v1.DeleteTagReques // for forward compatibility type TagServiceServer interface { // 获取标签列表 - ListTag(context.Context, *pagination.PagingRequest) (*v1.ListTagResponse, error) + ListTag(context.Context, *v1.PagingRequest) (*v11.ListTagResponse, error) // 获取标签数据 - GetTag(context.Context, *v1.GetTagRequest) (*v1.Tag, error) + GetTag(context.Context, *v11.GetTagRequest) (*v11.Tag, error) // 创建标签 - CreateTag(context.Context, *v1.CreateTagRequest) (*v1.Tag, error) + CreateTag(context.Context, *v11.CreateTagRequest) (*v11.Tag, error) // 更新标签 - UpdateTag(context.Context, *v1.UpdateTagRequest) (*v1.Tag, error) + UpdateTag(context.Context, *v11.UpdateTagRequest) (*v11.Tag, error) // 删除标签 - DeleteTag(context.Context, *v1.DeleteTagRequest) (*emptypb.Empty, error) + DeleteTag(context.Context, *v11.DeleteTagRequest) (*emptypb.Empty, error) mustEmbedUnimplementedTagServiceServer() } @@ -119,19 +119,19 @@ type TagServiceServer interface { type UnimplementedTagServiceServer struct { } -func (UnimplementedTagServiceServer) ListTag(context.Context, *pagination.PagingRequest) (*v1.ListTagResponse, error) { +func (UnimplementedTagServiceServer) ListTag(context.Context, *v1.PagingRequest) (*v11.ListTagResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListTag not implemented") } -func (UnimplementedTagServiceServer) GetTag(context.Context, *v1.GetTagRequest) (*v1.Tag, error) { +func (UnimplementedTagServiceServer) GetTag(context.Context, *v11.GetTagRequest) (*v11.Tag, error) { return nil, status.Errorf(codes.Unimplemented, "method GetTag not implemented") } -func (UnimplementedTagServiceServer) CreateTag(context.Context, *v1.CreateTagRequest) (*v1.Tag, error) { +func (UnimplementedTagServiceServer) CreateTag(context.Context, *v11.CreateTagRequest) (*v11.Tag, error) { return nil, status.Errorf(codes.Unimplemented, "method CreateTag not implemented") } -func (UnimplementedTagServiceServer) UpdateTag(context.Context, *v1.UpdateTagRequest) (*v1.Tag, error) { +func (UnimplementedTagServiceServer) UpdateTag(context.Context, *v11.UpdateTagRequest) (*v11.Tag, error) { return nil, status.Errorf(codes.Unimplemented, "method UpdateTag not implemented") } -func (UnimplementedTagServiceServer) DeleteTag(context.Context, *v1.DeleteTagRequest) (*emptypb.Empty, error) { +func (UnimplementedTagServiceServer) DeleteTag(context.Context, *v11.DeleteTagRequest) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method DeleteTag not implemented") } func (UnimplementedTagServiceServer) mustEmbedUnimplementedTagServiceServer() {} @@ -148,7 +148,7 @@ func RegisterTagServiceServer(s grpc.ServiceRegistrar, srv TagServiceServer) { } func _TagService_ListTag_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(pagination.PagingRequest) + in := new(v1.PagingRequest) if err := dec(in); err != nil { return nil, err } @@ -160,13 +160,13 @@ func _TagService_ListTag_Handler(srv interface{}, ctx context.Context, dec func( FullMethod: TagService_ListTag_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TagServiceServer).ListTag(ctx, req.(*pagination.PagingRequest)) + return srv.(TagServiceServer).ListTag(ctx, req.(*v1.PagingRequest)) } return interceptor(ctx, in, info, handler) } func _TagService_GetTag_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.GetTagRequest) + in := new(v11.GetTagRequest) if err := dec(in); err != nil { return nil, err } @@ -178,13 +178,13 @@ func _TagService_GetTag_Handler(srv interface{}, ctx context.Context, dec func(i FullMethod: TagService_GetTag_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TagServiceServer).GetTag(ctx, req.(*v1.GetTagRequest)) + return srv.(TagServiceServer).GetTag(ctx, req.(*v11.GetTagRequest)) } return interceptor(ctx, in, info, handler) } func _TagService_CreateTag_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.CreateTagRequest) + in := new(v11.CreateTagRequest) if err := dec(in); err != nil { return nil, err } @@ -196,13 +196,13 @@ func _TagService_CreateTag_Handler(srv interface{}, ctx context.Context, dec fun FullMethod: TagService_CreateTag_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TagServiceServer).CreateTag(ctx, req.(*v1.CreateTagRequest)) + return srv.(TagServiceServer).CreateTag(ctx, req.(*v11.CreateTagRequest)) } return interceptor(ctx, in, info, handler) } func _TagService_UpdateTag_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.UpdateTagRequest) + in := new(v11.UpdateTagRequest) if err := dec(in); err != nil { return nil, err } @@ -214,13 +214,13 @@ func _TagService_UpdateTag_Handler(srv interface{}, ctx context.Context, dec fun FullMethod: TagService_UpdateTag_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TagServiceServer).UpdateTag(ctx, req.(*v1.UpdateTagRequest)) + return srv.(TagServiceServer).UpdateTag(ctx, req.(*v11.UpdateTagRequest)) } return interceptor(ctx, in, info, handler) } func _TagService_DeleteTag_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.DeleteTagRequest) + in := new(v11.DeleteTagRequest) if err := dec(in); err != nil { return nil, err } @@ -232,7 +232,7 @@ func _TagService_DeleteTag_Handler(srv interface{}, ctx context.Context, dec fun FullMethod: TagService_DeleteTag_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TagServiceServer).DeleteTag(ctx, req.(*v1.DeleteTagRequest)) + return srv.(TagServiceServer).DeleteTag(ctx, req.(*v11.DeleteTagRequest)) } return interceptor(ctx, in, info, handler) } diff --git a/blog-backend/gen/api/go/admin/service/v1/i_tag_http.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_tag_http.pb.go index f042363b..e29ba02c 100644 --- a/blog-backend/gen/api/go/admin/service/v1/i_tag_http.pb.go +++ b/blog-backend/gen/api/go/admin/service/v1/i_tag_http.pb.go @@ -4,15 +4,15 @@ // - protoc (unknown) // source: admin/service/v1/i_tag.proto -package v1 +package servicev1 import ( context "context" http "github.com/go-kratos/kratos/v2/transport/http" binding "github.com/go-kratos/kratos/v2/transport/http/binding" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" - v1 "kratos-cms/gen/api/go/content/service/v1" + v11 "kratos-cms/gen/api/go/content/service/v1" ) // This is a compile-time assertion to ensure that this generated file @@ -30,15 +30,15 @@ const OperationTagServiceUpdateTag = "/admin.service.v1.TagService/UpdateTag" type TagServiceHTTPServer interface { // CreateTag 创建标签 - CreateTag(context.Context, *v1.CreateTagRequest) (*v1.Tag, error) + CreateTag(context.Context, *v11.CreateTagRequest) (*v11.Tag, error) // DeleteTag 删除标签 - DeleteTag(context.Context, *v1.DeleteTagRequest) (*emptypb.Empty, error) + DeleteTag(context.Context, *v11.DeleteTagRequest) (*emptypb.Empty, error) // GetTag 获取标签数据 - GetTag(context.Context, *v1.GetTagRequest) (*v1.Tag, error) + GetTag(context.Context, *v11.GetTagRequest) (*v11.Tag, error) // ListTag 获取标签列表 - ListTag(context.Context, *pagination.PagingRequest) (*v1.ListTagResponse, error) + ListTag(context.Context, *v1.PagingRequest) (*v11.ListTagResponse, error) // UpdateTag 更新标签 - UpdateTag(context.Context, *v1.UpdateTagRequest) (*v1.Tag, error) + UpdateTag(context.Context, *v11.UpdateTagRequest) (*v11.Tag, error) } func RegisterTagServiceHTTPServer(s *http.Server, srv TagServiceHTTPServer) { @@ -52,26 +52,26 @@ func RegisterTagServiceHTTPServer(s *http.Server, srv TagServiceHTTPServer) { func _TagService_ListTag0_HTTP_Handler(srv TagServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in pagination.PagingRequest + var in v1.PagingRequest if err := ctx.BindQuery(&in); err != nil { return err } http.SetOperation(ctx, OperationTagServiceListTag) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.ListTag(ctx, req.(*pagination.PagingRequest)) + return srv.ListTag(ctx, req.(*v1.PagingRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.ListTagResponse) + reply := out.(*v11.ListTagResponse) return ctx.Result(200, reply) } } func _TagService_GetTag0_HTTP_Handler(srv TagServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.GetTagRequest + var in v11.GetTagRequest if err := ctx.BindQuery(&in); err != nil { return err } @@ -80,20 +80,20 @@ func _TagService_GetTag0_HTTP_Handler(srv TagServiceHTTPServer) func(ctx http.Co } http.SetOperation(ctx, OperationTagServiceGetTag) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.GetTag(ctx, req.(*v1.GetTagRequest)) + return srv.GetTag(ctx, req.(*v11.GetTagRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.Tag) + reply := out.(*v11.Tag) return ctx.Result(200, reply) } } func _TagService_CreateTag0_HTTP_Handler(srv TagServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.CreateTagRequest + var in v11.CreateTagRequest if err := ctx.Bind(&in); err != nil { return err } @@ -102,20 +102,20 @@ func _TagService_CreateTag0_HTTP_Handler(srv TagServiceHTTPServer) func(ctx http } http.SetOperation(ctx, OperationTagServiceCreateTag) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.CreateTag(ctx, req.(*v1.CreateTagRequest)) + return srv.CreateTag(ctx, req.(*v11.CreateTagRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.Tag) + reply := out.(*v11.Tag) return ctx.Result(200, reply) } } func _TagService_UpdateTag0_HTTP_Handler(srv TagServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.UpdateTagRequest + var in v11.UpdateTagRequest if err := ctx.Bind(&in.Tag); err != nil { return err } @@ -127,20 +127,20 @@ func _TagService_UpdateTag0_HTTP_Handler(srv TagServiceHTTPServer) func(ctx http } http.SetOperation(ctx, OperationTagServiceUpdateTag) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.UpdateTag(ctx, req.(*v1.UpdateTagRequest)) + return srv.UpdateTag(ctx, req.(*v11.UpdateTagRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.Tag) + reply := out.(*v11.Tag) return ctx.Result(200, reply) } } func _TagService_DeleteTag0_HTTP_Handler(srv TagServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.DeleteTagRequest + var in v11.DeleteTagRequest if err := ctx.BindQuery(&in); err != nil { return err } @@ -149,7 +149,7 @@ func _TagService_DeleteTag0_HTTP_Handler(srv TagServiceHTTPServer) func(ctx http } http.SetOperation(ctx, OperationTagServiceDeleteTag) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.DeleteTag(ctx, req.(*v1.DeleteTagRequest)) + return srv.DeleteTag(ctx, req.(*v11.DeleteTagRequest)) }) out, err := h(ctx, &in) if err != nil { @@ -161,11 +161,11 @@ func _TagService_DeleteTag0_HTTP_Handler(srv TagServiceHTTPServer) func(ctx http } type TagServiceHTTPClient interface { - CreateTag(ctx context.Context, req *v1.CreateTagRequest, opts ...http.CallOption) (rsp *v1.Tag, err error) - DeleteTag(ctx context.Context, req *v1.DeleteTagRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error) - GetTag(ctx context.Context, req *v1.GetTagRequest, opts ...http.CallOption) (rsp *v1.Tag, err error) - ListTag(ctx context.Context, req *pagination.PagingRequest, opts ...http.CallOption) (rsp *v1.ListTagResponse, err error) - UpdateTag(ctx context.Context, req *v1.UpdateTagRequest, opts ...http.CallOption) (rsp *v1.Tag, err error) + CreateTag(ctx context.Context, req *v11.CreateTagRequest, opts ...http.CallOption) (rsp *v11.Tag, err error) + DeleteTag(ctx context.Context, req *v11.DeleteTagRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error) + GetTag(ctx context.Context, req *v11.GetTagRequest, opts ...http.CallOption) (rsp *v11.Tag, err error) + ListTag(ctx context.Context, req *v1.PagingRequest, opts ...http.CallOption) (rsp *v11.ListTagResponse, err error) + UpdateTag(ctx context.Context, req *v11.UpdateTagRequest, opts ...http.CallOption) (rsp *v11.Tag, err error) } type TagServiceHTTPClientImpl struct { @@ -176,8 +176,8 @@ func NewTagServiceHTTPClient(client *http.Client) TagServiceHTTPClient { return &TagServiceHTTPClientImpl{client} } -func (c *TagServiceHTTPClientImpl) CreateTag(ctx context.Context, in *v1.CreateTagRequest, opts ...http.CallOption) (*v1.Tag, error) { - var out v1.Tag +func (c *TagServiceHTTPClientImpl) CreateTag(ctx context.Context, in *v11.CreateTagRequest, opts ...http.CallOption) (*v11.Tag, error) { + var out v11.Tag pattern := "/admin/v1/tags" path := binding.EncodeURL(pattern, in, false) opts = append(opts, http.Operation(OperationTagServiceCreateTag)) @@ -189,7 +189,7 @@ func (c *TagServiceHTTPClientImpl) CreateTag(ctx context.Context, in *v1.CreateT return &out, err } -func (c *TagServiceHTTPClientImpl) DeleteTag(ctx context.Context, in *v1.DeleteTagRequest, opts ...http.CallOption) (*emptypb.Empty, error) { +func (c *TagServiceHTTPClientImpl) DeleteTag(ctx context.Context, in *v11.DeleteTagRequest, opts ...http.CallOption) (*emptypb.Empty, error) { var out emptypb.Empty pattern := "/admin/v1/tags/{id}" path := binding.EncodeURL(pattern, in, true) @@ -202,8 +202,8 @@ func (c *TagServiceHTTPClientImpl) DeleteTag(ctx context.Context, in *v1.DeleteT return &out, err } -func (c *TagServiceHTTPClientImpl) GetTag(ctx context.Context, in *v1.GetTagRequest, opts ...http.CallOption) (*v1.Tag, error) { - var out v1.Tag +func (c *TagServiceHTTPClientImpl) GetTag(ctx context.Context, in *v11.GetTagRequest, opts ...http.CallOption) (*v11.Tag, error) { + var out v11.Tag pattern := "/admin/v1/tags/{id}" path := binding.EncodeURL(pattern, in, true) opts = append(opts, http.Operation(OperationTagServiceGetTag)) @@ -215,8 +215,8 @@ func (c *TagServiceHTTPClientImpl) GetTag(ctx context.Context, in *v1.GetTagRequ return &out, err } -func (c *TagServiceHTTPClientImpl) ListTag(ctx context.Context, in *pagination.PagingRequest, opts ...http.CallOption) (*v1.ListTagResponse, error) { - var out v1.ListTagResponse +func (c *TagServiceHTTPClientImpl) ListTag(ctx context.Context, in *v1.PagingRequest, opts ...http.CallOption) (*v11.ListTagResponse, error) { + var out v11.ListTagResponse pattern := "/admin/v1/tags" path := binding.EncodeURL(pattern, in, true) opts = append(opts, http.Operation(OperationTagServiceListTag)) @@ -228,8 +228,8 @@ func (c *TagServiceHTTPClientImpl) ListTag(ctx context.Context, in *pagination.P return &out, err } -func (c *TagServiceHTTPClientImpl) UpdateTag(ctx context.Context, in *v1.UpdateTagRequest, opts ...http.CallOption) (*v1.Tag, error) { - var out v1.Tag +func (c *TagServiceHTTPClientImpl) UpdateTag(ctx context.Context, in *v11.UpdateTagRequest, opts ...http.CallOption) (*v11.Tag, error) { + var out v11.Tag pattern := "/admin/v1/tags/{id}" path := binding.EncodeURL(pattern, in, false) opts = append(opts, http.Operation(OperationTagServiceUpdateTag)) diff --git a/blog-backend/gen/api/go/admin/service/v1/i_user.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_user.pb.go index 8dd93b6d..4d0c098f 100644 --- a/blog-backend/gen/api/go/admin/service/v1/i_user.pb.go +++ b/blog-backend/gen/api/go/admin/service/v1/i_user.pb.go @@ -4,16 +4,16 @@ // protoc (unknown) // source: admin/service/v1/i_user.proto -package v1 +package servicev1 import ( _ "github.com/google/gnostic/openapiv3" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" - v1 "kratos-cms/gen/api/go/user/service/v1" + v11 "kratos-cms/gen/api/go/user/service/v1" reflect "reflect" ) @@ -37,67 +37,75 @@ var file_admin_service_v1_i_user_proto_rawDesc = []byte{ 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1a, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, - 0x2f, 0x76, 0x31, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x22, - 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x32, 0xad, 0x05, 0x0a, 0x0b, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x72, 0x76, 0x69, - 0x63, 0x65, 0x12, 0x80, 0x01, 0x0a, 0x08, 0x4c, 0x69, 0x73, 0x74, 0x55, 0x73, 0x65, 0x72, 0x12, - 0x19, 0x2e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x50, 0x61, 0x67, - 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x75, 0x73, 0x65, - 0x72, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, - 0x74, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x36, 0xba, - 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, - 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, - 0xe4, 0x93, 0x02, 0x11, 0x12, 0x0f, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, - 0x75, 0x73, 0x65, 0x72, 0x73, 0x12, 0x7e, 0x0a, 0x07, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, - 0x12, 0x1f, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, - 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x1a, 0x15, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, - 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x22, 0x3b, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, - 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, - 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x16, 0x12, - 0x14, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x73, - 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x85, 0x01, 0x0a, 0x0a, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, - 0x55, 0x73, 0x65, 0x72, 0x12, 0x22, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x73, 0x65, 0x72, 0x76, - 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, - 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x15, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, - 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x22, - 0x3c, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, - 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, - 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x17, 0x3a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x22, 0x0f, 0x2f, 0x61, - 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x73, 0x12, 0x8a, 0x01, - 0x0a, 0x0a, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x12, 0x22, 0x2e, 0x75, + 0x2f, 0x76, 0x31, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1e, + 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x61, + 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0xad, + 0x05, 0x0a, 0x0b, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x80, + 0x01, 0x0a, 0x08, 0x4c, 0x69, 0x73, 0x74, 0x55, 0x73, 0x65, 0x72, 0x12, 0x19, 0x2e, 0x70, 0x61, + 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x73, 0x65, + 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x55, 0x73, 0x65, + 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x36, 0xba, 0x47, 0x1c, 0x5a, 0x1a, + 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, + 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x11, + 0x12, 0x0f, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x75, 0x73, 0x65, 0x72, + 0x73, 0x12, 0x7e, 0x0a, 0x07, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x12, 0x1f, 0x2e, 0x75, + 0x73, 0x65, 0x72, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, + 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x15, 0x2e, + 0x75, 0x73, 0x65, 0x72, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, + 0x55, 0x73, 0x65, 0x72, 0x22, 0x3b, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, + 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, + 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x16, 0x12, 0x14, 0x2f, 0x61, 0x64, + 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x73, 0x2f, 0x7b, 0x69, 0x64, + 0x7d, 0x12, 0x85, 0x01, 0x0a, 0x0a, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, + 0x12, 0x22, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, + 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x1a, 0x15, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x73, 0x65, 0x72, 0x76, + 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x22, 0x3c, 0xba, 0x47, 0x1c, + 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, + 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, + 0x02, 0x17, 0x3a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x22, 0x0f, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, + 0x2f, 0x76, 0x31, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x73, 0x12, 0x8a, 0x01, 0x0a, 0x0a, 0x55, 0x70, + 0x64, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x12, 0x22, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, + 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, + 0x65, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x15, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, - 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x1a, 0x15, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, - 0x76, 0x31, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x22, 0x41, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, - 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, - 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1c, 0x3a, 0x04, - 0x75, 0x73, 0x65, 0x72, 0x1a, 0x14, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, - 0x75, 0x73, 0x65, 0x72, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x85, 0x01, 0x0a, 0x0a, 0x44, - 0x65, 0x6c, 0x65, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x12, 0x22, 0x2e, 0x75, 0x73, 0x65, 0x72, - 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, - 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, - 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, - 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x3b, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, - 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, - 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x16, 0x2a, 0x14, 0x2f, 0x61, - 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x73, 0x2f, 0x7b, 0x69, - 0x64, 0x7d, 0x42, 0x2b, 0x5a, 0x29, 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x63, 0x6d, 0x73, - 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x61, 0x64, 0x6d, 0x69, - 0x6e, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x76, 0x31, 0x62, - 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x73, 0x65, 0x72, 0x22, 0x41, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, + 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, + 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1c, 0x3a, 0x04, 0x75, 0x73, 0x65, 0x72, + 0x1a, 0x14, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x75, 0x73, 0x65, 0x72, + 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x85, 0x01, 0x0a, 0x0a, 0x44, 0x65, 0x6c, 0x65, 0x74, + 0x65, 0x55, 0x73, 0x65, 0x72, 0x12, 0x22, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x73, 0x65, 0x72, + 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x55, 0x73, + 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, + 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, + 0x79, 0x22, 0x3b, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, + 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, + 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x16, 0x2a, 0x14, 0x2f, 0x61, 0x64, 0x6d, 0x69, 0x6e, + 0x2f, 0x76, 0x31, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x42, 0xb6, + 0x01, 0x0a, 0x14, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x73, 0x65, 0x72, + 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x42, 0x0a, 0x49, 0x55, 0x73, 0x65, 0x72, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x30, 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x63, 0x6d, + 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x61, 0x64, 0x6d, + 0x69, 0x6e, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x73, 0x65, + 0x72, 0x76, 0x69, 0x63, 0x65, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x41, 0x53, 0x58, 0xaa, 0x02, 0x10, + 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x56, 0x31, + 0xca, 0x02, 0x10, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x5c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, + 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1c, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x5c, 0x53, 0x65, 0x72, 0x76, + 0x69, 0x63, 0x65, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, + 0x74, 0x61, 0xea, 0x02, 0x12, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x3a, 0x3a, 0x53, 0x65, 0x72, 0x76, + 0x69, 0x63, 0x65, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var file_admin_service_v1_i_user_proto_goTypes = []interface{}{ - (*pagination.PagingRequest)(nil), // 0: pagination.PagingRequest - (*v1.GetUserRequest)(nil), // 1: user.service.v1.GetUserRequest - (*v1.CreateUserRequest)(nil), // 2: user.service.v1.CreateUserRequest - (*v1.UpdateUserRequest)(nil), // 3: user.service.v1.UpdateUserRequest - (*v1.DeleteUserRequest)(nil), // 4: user.service.v1.DeleteUserRequest - (*v1.ListUserResponse)(nil), // 5: user.service.v1.ListUserResponse - (*v1.User)(nil), // 6: user.service.v1.User - (*emptypb.Empty)(nil), // 7: google.protobuf.Empty + (*v1.PagingRequest)(nil), // 0: pagination.PagingRequest + (*v11.GetUserRequest)(nil), // 1: user.service.v1.GetUserRequest + (*v11.CreateUserRequest)(nil), // 2: user.service.v1.CreateUserRequest + (*v11.UpdateUserRequest)(nil), // 3: user.service.v1.UpdateUserRequest + (*v11.DeleteUserRequest)(nil), // 4: user.service.v1.DeleteUserRequest + (*v11.ListUserResponse)(nil), // 5: user.service.v1.ListUserResponse + (*v11.User)(nil), // 6: user.service.v1.User + (*emptypb.Empty)(nil), // 7: google.protobuf.Empty } var file_admin_service_v1_i_user_proto_depIdxs = []int32{ 0, // 0: admin.service.v1.UserService.ListUser:input_type -> pagination.PagingRequest diff --git a/blog-backend/gen/api/go/admin/service/v1/i_user.pb.validate.go b/blog-backend/gen/api/go/admin/service/v1/i_user.pb.validate.go index 62974d81..a821285e 100644 --- a/blog-backend/gen/api/go/admin/service/v1/i_user.pb.validate.go +++ b/blog-backend/gen/api/go/admin/service/v1/i_user.pb.validate.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-validate. DO NOT EDIT. // source: admin/service/v1/i_user.proto -package v1 +package servicev1 import ( "bytes" diff --git a/blog-backend/gen/api/go/admin/service/v1/i_user_grpc.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_user_grpc.pb.go index de5440b2..444416f8 100644 --- a/blog-backend/gen/api/go/admin/service/v1/i_user_grpc.pb.go +++ b/blog-backend/gen/api/go/admin/service/v1/i_user_grpc.pb.go @@ -4,16 +4,16 @@ // - protoc (unknown) // source: admin/service/v1/i_user.proto -package v1 +package servicev1 import ( context "context" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" - v1 "kratos-cms/gen/api/go/user/service/v1" + v11 "kratos-cms/gen/api/go/user/service/v1" ) // This is a compile-time assertion to ensure that this generated file @@ -34,15 +34,15 @@ const ( // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type UserServiceClient interface { // 获取用户列表 - ListUser(ctx context.Context, in *pagination.PagingRequest, opts ...grpc.CallOption) (*v1.ListUserResponse, error) + ListUser(ctx context.Context, in *v1.PagingRequest, opts ...grpc.CallOption) (*v11.ListUserResponse, error) // 获取用户数据 - GetUser(ctx context.Context, in *v1.GetUserRequest, opts ...grpc.CallOption) (*v1.User, error) + GetUser(ctx context.Context, in *v11.GetUserRequest, opts ...grpc.CallOption) (*v11.User, error) // 创建用户 - CreateUser(ctx context.Context, in *v1.CreateUserRequest, opts ...grpc.CallOption) (*v1.User, error) + CreateUser(ctx context.Context, in *v11.CreateUserRequest, opts ...grpc.CallOption) (*v11.User, error) // 更新用户 - UpdateUser(ctx context.Context, in *v1.UpdateUserRequest, opts ...grpc.CallOption) (*v1.User, error) + UpdateUser(ctx context.Context, in *v11.UpdateUserRequest, opts ...grpc.CallOption) (*v11.User, error) // 删除用户 - DeleteUser(ctx context.Context, in *v1.DeleteUserRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) + DeleteUser(ctx context.Context, in *v11.DeleteUserRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) } type userServiceClient struct { @@ -53,8 +53,8 @@ func NewUserServiceClient(cc grpc.ClientConnInterface) UserServiceClient { return &userServiceClient{cc} } -func (c *userServiceClient) ListUser(ctx context.Context, in *pagination.PagingRequest, opts ...grpc.CallOption) (*v1.ListUserResponse, error) { - out := new(v1.ListUserResponse) +func (c *userServiceClient) ListUser(ctx context.Context, in *v1.PagingRequest, opts ...grpc.CallOption) (*v11.ListUserResponse, error) { + out := new(v11.ListUserResponse) err := c.cc.Invoke(ctx, UserService_ListUser_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -62,8 +62,8 @@ func (c *userServiceClient) ListUser(ctx context.Context, in *pagination.PagingR return out, nil } -func (c *userServiceClient) GetUser(ctx context.Context, in *v1.GetUserRequest, opts ...grpc.CallOption) (*v1.User, error) { - out := new(v1.User) +func (c *userServiceClient) GetUser(ctx context.Context, in *v11.GetUserRequest, opts ...grpc.CallOption) (*v11.User, error) { + out := new(v11.User) err := c.cc.Invoke(ctx, UserService_GetUser_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -71,8 +71,8 @@ func (c *userServiceClient) GetUser(ctx context.Context, in *v1.GetUserRequest, return out, nil } -func (c *userServiceClient) CreateUser(ctx context.Context, in *v1.CreateUserRequest, opts ...grpc.CallOption) (*v1.User, error) { - out := new(v1.User) +func (c *userServiceClient) CreateUser(ctx context.Context, in *v11.CreateUserRequest, opts ...grpc.CallOption) (*v11.User, error) { + out := new(v11.User) err := c.cc.Invoke(ctx, UserService_CreateUser_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -80,8 +80,8 @@ func (c *userServiceClient) CreateUser(ctx context.Context, in *v1.CreateUserReq return out, nil } -func (c *userServiceClient) UpdateUser(ctx context.Context, in *v1.UpdateUserRequest, opts ...grpc.CallOption) (*v1.User, error) { - out := new(v1.User) +func (c *userServiceClient) UpdateUser(ctx context.Context, in *v11.UpdateUserRequest, opts ...grpc.CallOption) (*v11.User, error) { + out := new(v11.User) err := c.cc.Invoke(ctx, UserService_UpdateUser_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -89,7 +89,7 @@ func (c *userServiceClient) UpdateUser(ctx context.Context, in *v1.UpdateUserReq return out, nil } -func (c *userServiceClient) DeleteUser(ctx context.Context, in *v1.DeleteUserRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { +func (c *userServiceClient) DeleteUser(ctx context.Context, in *v11.DeleteUserRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { out := new(emptypb.Empty) err := c.cc.Invoke(ctx, UserService_DeleteUser_FullMethodName, in, out, opts...) if err != nil { @@ -103,15 +103,15 @@ func (c *userServiceClient) DeleteUser(ctx context.Context, in *v1.DeleteUserReq // for forward compatibility type UserServiceServer interface { // 获取用户列表 - ListUser(context.Context, *pagination.PagingRequest) (*v1.ListUserResponse, error) + ListUser(context.Context, *v1.PagingRequest) (*v11.ListUserResponse, error) // 获取用户数据 - GetUser(context.Context, *v1.GetUserRequest) (*v1.User, error) + GetUser(context.Context, *v11.GetUserRequest) (*v11.User, error) // 创建用户 - CreateUser(context.Context, *v1.CreateUserRequest) (*v1.User, error) + CreateUser(context.Context, *v11.CreateUserRequest) (*v11.User, error) // 更新用户 - UpdateUser(context.Context, *v1.UpdateUserRequest) (*v1.User, error) + UpdateUser(context.Context, *v11.UpdateUserRequest) (*v11.User, error) // 删除用户 - DeleteUser(context.Context, *v1.DeleteUserRequest) (*emptypb.Empty, error) + DeleteUser(context.Context, *v11.DeleteUserRequest) (*emptypb.Empty, error) mustEmbedUnimplementedUserServiceServer() } @@ -119,19 +119,19 @@ type UserServiceServer interface { type UnimplementedUserServiceServer struct { } -func (UnimplementedUserServiceServer) ListUser(context.Context, *pagination.PagingRequest) (*v1.ListUserResponse, error) { +func (UnimplementedUserServiceServer) ListUser(context.Context, *v1.PagingRequest) (*v11.ListUserResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListUser not implemented") } -func (UnimplementedUserServiceServer) GetUser(context.Context, *v1.GetUserRequest) (*v1.User, error) { +func (UnimplementedUserServiceServer) GetUser(context.Context, *v11.GetUserRequest) (*v11.User, error) { return nil, status.Errorf(codes.Unimplemented, "method GetUser not implemented") } -func (UnimplementedUserServiceServer) CreateUser(context.Context, *v1.CreateUserRequest) (*v1.User, error) { +func (UnimplementedUserServiceServer) CreateUser(context.Context, *v11.CreateUserRequest) (*v11.User, error) { return nil, status.Errorf(codes.Unimplemented, "method CreateUser not implemented") } -func (UnimplementedUserServiceServer) UpdateUser(context.Context, *v1.UpdateUserRequest) (*v1.User, error) { +func (UnimplementedUserServiceServer) UpdateUser(context.Context, *v11.UpdateUserRequest) (*v11.User, error) { return nil, status.Errorf(codes.Unimplemented, "method UpdateUser not implemented") } -func (UnimplementedUserServiceServer) DeleteUser(context.Context, *v1.DeleteUserRequest) (*emptypb.Empty, error) { +func (UnimplementedUserServiceServer) DeleteUser(context.Context, *v11.DeleteUserRequest) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method DeleteUser not implemented") } func (UnimplementedUserServiceServer) mustEmbedUnimplementedUserServiceServer() {} @@ -148,7 +148,7 @@ func RegisterUserServiceServer(s grpc.ServiceRegistrar, srv UserServiceServer) { } func _UserService_ListUser_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(pagination.PagingRequest) + in := new(v1.PagingRequest) if err := dec(in); err != nil { return nil, err } @@ -160,13 +160,13 @@ func _UserService_ListUser_Handler(srv interface{}, ctx context.Context, dec fun FullMethod: UserService_ListUser_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(UserServiceServer).ListUser(ctx, req.(*pagination.PagingRequest)) + return srv.(UserServiceServer).ListUser(ctx, req.(*v1.PagingRequest)) } return interceptor(ctx, in, info, handler) } func _UserService_GetUser_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.GetUserRequest) + in := new(v11.GetUserRequest) if err := dec(in); err != nil { return nil, err } @@ -178,13 +178,13 @@ func _UserService_GetUser_Handler(srv interface{}, ctx context.Context, dec func FullMethod: UserService_GetUser_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(UserServiceServer).GetUser(ctx, req.(*v1.GetUserRequest)) + return srv.(UserServiceServer).GetUser(ctx, req.(*v11.GetUserRequest)) } return interceptor(ctx, in, info, handler) } func _UserService_CreateUser_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.CreateUserRequest) + in := new(v11.CreateUserRequest) if err := dec(in); err != nil { return nil, err } @@ -196,13 +196,13 @@ func _UserService_CreateUser_Handler(srv interface{}, ctx context.Context, dec f FullMethod: UserService_CreateUser_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(UserServiceServer).CreateUser(ctx, req.(*v1.CreateUserRequest)) + return srv.(UserServiceServer).CreateUser(ctx, req.(*v11.CreateUserRequest)) } return interceptor(ctx, in, info, handler) } func _UserService_UpdateUser_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.UpdateUserRequest) + in := new(v11.UpdateUserRequest) if err := dec(in); err != nil { return nil, err } @@ -214,13 +214,13 @@ func _UserService_UpdateUser_Handler(srv interface{}, ctx context.Context, dec f FullMethod: UserService_UpdateUser_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(UserServiceServer).UpdateUser(ctx, req.(*v1.UpdateUserRequest)) + return srv.(UserServiceServer).UpdateUser(ctx, req.(*v11.UpdateUserRequest)) } return interceptor(ctx, in, info, handler) } func _UserService_DeleteUser_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.DeleteUserRequest) + in := new(v11.DeleteUserRequest) if err := dec(in); err != nil { return nil, err } @@ -232,7 +232,7 @@ func _UserService_DeleteUser_Handler(srv interface{}, ctx context.Context, dec f FullMethod: UserService_DeleteUser_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(UserServiceServer).DeleteUser(ctx, req.(*v1.DeleteUserRequest)) + return srv.(UserServiceServer).DeleteUser(ctx, req.(*v11.DeleteUserRequest)) } return interceptor(ctx, in, info, handler) } diff --git a/blog-backend/gen/api/go/admin/service/v1/i_user_http.pb.go b/blog-backend/gen/api/go/admin/service/v1/i_user_http.pb.go index 253c43d9..729018b4 100644 --- a/blog-backend/gen/api/go/admin/service/v1/i_user_http.pb.go +++ b/blog-backend/gen/api/go/admin/service/v1/i_user_http.pb.go @@ -4,15 +4,15 @@ // - protoc (unknown) // source: admin/service/v1/i_user.proto -package v1 +package servicev1 import ( context "context" http "github.com/go-kratos/kratos/v2/transport/http" binding "github.com/go-kratos/kratos/v2/transport/http/binding" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" - v1 "kratos-cms/gen/api/go/user/service/v1" + v11 "kratos-cms/gen/api/go/user/service/v1" ) // This is a compile-time assertion to ensure that this generated file @@ -30,15 +30,15 @@ const OperationUserServiceUpdateUser = "/admin.service.v1.UserService/UpdateUser type UserServiceHTTPServer interface { // CreateUser 创建用户 - CreateUser(context.Context, *v1.CreateUserRequest) (*v1.User, error) + CreateUser(context.Context, *v11.CreateUserRequest) (*v11.User, error) // DeleteUser 删除用户 - DeleteUser(context.Context, *v1.DeleteUserRequest) (*emptypb.Empty, error) + DeleteUser(context.Context, *v11.DeleteUserRequest) (*emptypb.Empty, error) // GetUser 获取用户数据 - GetUser(context.Context, *v1.GetUserRequest) (*v1.User, error) + GetUser(context.Context, *v11.GetUserRequest) (*v11.User, error) // ListUser 获取用户列表 - ListUser(context.Context, *pagination.PagingRequest) (*v1.ListUserResponse, error) + ListUser(context.Context, *v1.PagingRequest) (*v11.ListUserResponse, error) // UpdateUser 更新用户 - UpdateUser(context.Context, *v1.UpdateUserRequest) (*v1.User, error) + UpdateUser(context.Context, *v11.UpdateUserRequest) (*v11.User, error) } func RegisterUserServiceHTTPServer(s *http.Server, srv UserServiceHTTPServer) { @@ -52,26 +52,26 @@ func RegisterUserServiceHTTPServer(s *http.Server, srv UserServiceHTTPServer) { func _UserService_ListUser0_HTTP_Handler(srv UserServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in pagination.PagingRequest + var in v1.PagingRequest if err := ctx.BindQuery(&in); err != nil { return err } http.SetOperation(ctx, OperationUserServiceListUser) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.ListUser(ctx, req.(*pagination.PagingRequest)) + return srv.ListUser(ctx, req.(*v1.PagingRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.ListUserResponse) + reply := out.(*v11.ListUserResponse) return ctx.Result(200, reply) } } func _UserService_GetUser0_HTTP_Handler(srv UserServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.GetUserRequest + var in v11.GetUserRequest if err := ctx.BindQuery(&in); err != nil { return err } @@ -80,20 +80,20 @@ func _UserService_GetUser0_HTTP_Handler(srv UserServiceHTTPServer) func(ctx http } http.SetOperation(ctx, OperationUserServiceGetUser) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.GetUser(ctx, req.(*v1.GetUserRequest)) + return srv.GetUser(ctx, req.(*v11.GetUserRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.User) + reply := out.(*v11.User) return ctx.Result(200, reply) } } func _UserService_CreateUser0_HTTP_Handler(srv UserServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.CreateUserRequest + var in v11.CreateUserRequest if err := ctx.Bind(&in.User); err != nil { return err } @@ -102,20 +102,20 @@ func _UserService_CreateUser0_HTTP_Handler(srv UserServiceHTTPServer) func(ctx h } http.SetOperation(ctx, OperationUserServiceCreateUser) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.CreateUser(ctx, req.(*v1.CreateUserRequest)) + return srv.CreateUser(ctx, req.(*v11.CreateUserRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.User) + reply := out.(*v11.User) return ctx.Result(200, reply) } } func _UserService_UpdateUser0_HTTP_Handler(srv UserServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.UpdateUserRequest + var in v11.UpdateUserRequest if err := ctx.Bind(&in.User); err != nil { return err } @@ -127,20 +127,20 @@ func _UserService_UpdateUser0_HTTP_Handler(srv UserServiceHTTPServer) func(ctx h } http.SetOperation(ctx, OperationUserServiceUpdateUser) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.UpdateUser(ctx, req.(*v1.UpdateUserRequest)) + return srv.UpdateUser(ctx, req.(*v11.UpdateUserRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.User) + reply := out.(*v11.User) return ctx.Result(200, reply) } } func _UserService_DeleteUser0_HTTP_Handler(srv UserServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.DeleteUserRequest + var in v11.DeleteUserRequest if err := ctx.BindQuery(&in); err != nil { return err } @@ -149,7 +149,7 @@ func _UserService_DeleteUser0_HTTP_Handler(srv UserServiceHTTPServer) func(ctx h } http.SetOperation(ctx, OperationUserServiceDeleteUser) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.DeleteUser(ctx, req.(*v1.DeleteUserRequest)) + return srv.DeleteUser(ctx, req.(*v11.DeleteUserRequest)) }) out, err := h(ctx, &in) if err != nil { @@ -161,11 +161,11 @@ func _UserService_DeleteUser0_HTTP_Handler(srv UserServiceHTTPServer) func(ctx h } type UserServiceHTTPClient interface { - CreateUser(ctx context.Context, req *v1.CreateUserRequest, opts ...http.CallOption) (rsp *v1.User, err error) - DeleteUser(ctx context.Context, req *v1.DeleteUserRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error) - GetUser(ctx context.Context, req *v1.GetUserRequest, opts ...http.CallOption) (rsp *v1.User, err error) - ListUser(ctx context.Context, req *pagination.PagingRequest, opts ...http.CallOption) (rsp *v1.ListUserResponse, err error) - UpdateUser(ctx context.Context, req *v1.UpdateUserRequest, opts ...http.CallOption) (rsp *v1.User, err error) + CreateUser(ctx context.Context, req *v11.CreateUserRequest, opts ...http.CallOption) (rsp *v11.User, err error) + DeleteUser(ctx context.Context, req *v11.DeleteUserRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error) + GetUser(ctx context.Context, req *v11.GetUserRequest, opts ...http.CallOption) (rsp *v11.User, err error) + ListUser(ctx context.Context, req *v1.PagingRequest, opts ...http.CallOption) (rsp *v11.ListUserResponse, err error) + UpdateUser(ctx context.Context, req *v11.UpdateUserRequest, opts ...http.CallOption) (rsp *v11.User, err error) } type UserServiceHTTPClientImpl struct { @@ -176,8 +176,8 @@ func NewUserServiceHTTPClient(client *http.Client) UserServiceHTTPClient { return &UserServiceHTTPClientImpl{client} } -func (c *UserServiceHTTPClientImpl) CreateUser(ctx context.Context, in *v1.CreateUserRequest, opts ...http.CallOption) (*v1.User, error) { - var out v1.User +func (c *UserServiceHTTPClientImpl) CreateUser(ctx context.Context, in *v11.CreateUserRequest, opts ...http.CallOption) (*v11.User, error) { + var out v11.User pattern := "/admin/v1/users" path := binding.EncodeURL(pattern, in, false) opts = append(opts, http.Operation(OperationUserServiceCreateUser)) @@ -189,7 +189,7 @@ func (c *UserServiceHTTPClientImpl) CreateUser(ctx context.Context, in *v1.Creat return &out, err } -func (c *UserServiceHTTPClientImpl) DeleteUser(ctx context.Context, in *v1.DeleteUserRequest, opts ...http.CallOption) (*emptypb.Empty, error) { +func (c *UserServiceHTTPClientImpl) DeleteUser(ctx context.Context, in *v11.DeleteUserRequest, opts ...http.CallOption) (*emptypb.Empty, error) { var out emptypb.Empty pattern := "/admin/v1/users/{id}" path := binding.EncodeURL(pattern, in, true) @@ -202,8 +202,8 @@ func (c *UserServiceHTTPClientImpl) DeleteUser(ctx context.Context, in *v1.Delet return &out, err } -func (c *UserServiceHTTPClientImpl) GetUser(ctx context.Context, in *v1.GetUserRequest, opts ...http.CallOption) (*v1.User, error) { - var out v1.User +func (c *UserServiceHTTPClientImpl) GetUser(ctx context.Context, in *v11.GetUserRequest, opts ...http.CallOption) (*v11.User, error) { + var out v11.User pattern := "/admin/v1/users/{id}" path := binding.EncodeURL(pattern, in, true) opts = append(opts, http.Operation(OperationUserServiceGetUser)) @@ -215,8 +215,8 @@ func (c *UserServiceHTTPClientImpl) GetUser(ctx context.Context, in *v1.GetUserR return &out, err } -func (c *UserServiceHTTPClientImpl) ListUser(ctx context.Context, in *pagination.PagingRequest, opts ...http.CallOption) (*v1.ListUserResponse, error) { - var out v1.ListUserResponse +func (c *UserServiceHTTPClientImpl) ListUser(ctx context.Context, in *v1.PagingRequest, opts ...http.CallOption) (*v11.ListUserResponse, error) { + var out v11.ListUserResponse pattern := "/admin/v1/users" path := binding.EncodeURL(pattern, in, true) opts = append(opts, http.Operation(OperationUserServiceListUser)) @@ -228,8 +228,8 @@ func (c *UserServiceHTTPClientImpl) ListUser(ctx context.Context, in *pagination return &out, err } -func (c *UserServiceHTTPClientImpl) UpdateUser(ctx context.Context, in *v1.UpdateUserRequest, opts ...http.CallOption) (*v1.User, error) { - var out v1.User +func (c *UserServiceHTTPClientImpl) UpdateUser(ctx context.Context, in *v11.UpdateUserRequest, opts ...http.CallOption) (*v11.User, error) { + var out v11.User pattern := "/admin/v1/users/{id}" path := binding.EncodeURL(pattern, in, false) opts = append(opts, http.Operation(OperationUserServiceUpdateUser)) diff --git a/blog-backend/gen/api/go/comment/service/v1/comment.pb.go b/blog-backend/gen/api/go/comment/service/v1/comment.pb.go index f7550851..445e9901 100644 --- a/blog-backend/gen/api/go/comment/service/v1/comment.pb.go +++ b/blog-backend/gen/api/go/comment/service/v1/comment.pb.go @@ -4,13 +4,13 @@ // protoc (unknown) // source: comment/service/v1/comment.proto -package v1 +package servicev1 import ( + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" reflect "reflect" sync "sync" ) @@ -470,116 +470,125 @@ var file_comment_service_v1_comment_proto_rawDesc = []byte{ 0x74, 0x6f, 0x12, 0x12, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x1a, 0x22, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x61, 0x67, 0x69, - 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xb5, 0x05, 0x0a, 0x07, 0x43, 0x6f, 0x6d, 0x6d, - 0x65, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, - 0x02, 0x69, 0x64, 0x12, 0x1b, 0x0a, 0x06, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x06, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x88, 0x01, 0x01, - 0x12, 0x19, 0x0a, 0x05, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, - 0x01, 0x52, 0x05, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x88, 0x01, 0x01, 0x12, 0x21, 0x0a, 0x09, 0x69, - 0x70, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x48, 0x02, - 0x52, 0x09, 0x69, 0x70, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x88, 0x01, 0x01, 0x12, 0x21, - 0x0a, 0x09, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x55, 0x72, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, - 0x09, 0x48, 0x03, 0x52, 0x09, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x55, 0x72, 0x6c, 0x88, 0x01, - 0x01, 0x12, 0x25, 0x0a, 0x0b, 0x67, 0x72, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x4d, 0x64, 0x35, - 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x48, 0x04, 0x52, 0x0b, 0x67, 0x72, 0x61, 0x76, 0x61, 0x74, - 0x61, 0x72, 0x4d, 0x64, 0x35, 0x88, 0x01, 0x01, 0x12, 0x1d, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, - 0x65, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x48, 0x05, 0x52, 0x07, 0x63, 0x6f, 0x6e, - 0x74, 0x65, 0x6e, 0x74, 0x88, 0x01, 0x01, 0x12, 0x1b, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, - 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x06, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, - 0x73, 0x88, 0x01, 0x01, 0x12, 0x21, 0x0a, 0x09, 0x75, 0x73, 0x65, 0x72, 0x41, 0x67, 0x65, 0x6e, - 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x48, 0x07, 0x52, 0x09, 0x75, 0x73, 0x65, 0x72, 0x41, - 0x67, 0x65, 0x6e, 0x74, 0x88, 0x01, 0x01, 0x12, 0x1f, 0x0a, 0x08, 0x70, 0x61, 0x72, 0x65, 0x6e, - 0x74, 0x49, 0x64, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x08, 0x52, 0x08, 0x70, 0x61, 0x72, - 0x65, 0x6e, 0x74, 0x49, 0x64, 0x88, 0x01, 0x01, 0x12, 0x1d, 0x0a, 0x07, 0x69, 0x73, 0x41, 0x64, - 0x6d, 0x69, 0x6e, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x08, 0x48, 0x09, 0x52, 0x07, 0x69, 0x73, 0x41, - 0x64, 0x6d, 0x69, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x31, 0x0a, 0x11, 0x61, 0x6c, 0x6c, 0x6f, 0x77, - 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x0c, 0x20, 0x01, - 0x28, 0x08, 0x48, 0x0a, 0x52, 0x11, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x4e, 0x6f, 0x74, 0x69, 0x66, - 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x1b, 0x0a, 0x06, 0x61, 0x76, - 0x61, 0x74, 0x61, 0x72, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x48, 0x0b, 0x52, 0x06, 0x61, 0x76, - 0x61, 0x74, 0x61, 0x72, 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, - 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x48, 0x0c, 0x52, 0x0a, 0x63, - 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, 0x0a, - 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x09, - 0x48, 0x0d, 0x52, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x88, 0x01, - 0x01, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x42, 0x08, 0x0a, 0x06, - 0x5f, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x69, 0x70, 0x41, 0x64, 0x64, - 0x72, 0x65, 0x73, 0x73, 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x55, - 0x72, 0x6c, 0x42, 0x0e, 0x0a, 0x0c, 0x5f, 0x67, 0x72, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x4d, - 0x64, 0x35, 0x42, 0x0a, 0x0a, 0x08, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x42, 0x09, - 0x0a, 0x07, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x75, 0x73, - 0x65, 0x72, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x70, 0x61, 0x72, 0x65, - 0x6e, 0x74, 0x49, 0x64, 0x42, 0x0a, 0x0a, 0x08, 0x5f, 0x69, 0x73, 0x41, 0x64, 0x6d, 0x69, 0x6e, - 0x42, 0x14, 0x0a, 0x12, 0x5f, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69, - 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x61, 0x76, 0x61, 0x74, 0x61, - 0x72, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, - 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x22, - 0x5e, 0x0a, 0x13, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x31, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, - 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x2e, - 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x65, - 0x6e, 0x74, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x74, - 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x22, - 0x23, 0x0a, 0x11, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, - 0x52, 0x02, 0x69, 0x64, 0x22, 0x81, 0x01, 0x0a, 0x14, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x43, - 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x35, 0x0a, - 0x07, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, + 0x6f, 0x74, 0x6f, 0x1a, 0x1e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, + 0x76, 0x31, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x22, 0xb5, 0x05, 0x0a, 0x07, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x12, + 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, + 0x1b, 0x0a, 0x06, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, + 0x00, 0x52, 0x06, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x88, 0x01, 0x01, 0x12, 0x19, 0x0a, 0x05, + 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, 0x01, 0x52, 0x05, 0x65, + 0x6d, 0x61, 0x69, 0x6c, 0x88, 0x01, 0x01, 0x12, 0x21, 0x0a, 0x09, 0x69, 0x70, 0x41, 0x64, 0x64, + 0x72, 0x65, 0x73, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x48, 0x02, 0x52, 0x09, 0x69, 0x70, + 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x88, 0x01, 0x01, 0x12, 0x21, 0x0a, 0x09, 0x61, 0x75, + 0x74, 0x68, 0x6f, 0x72, 0x55, 0x72, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x48, 0x03, 0x52, + 0x09, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x55, 0x72, 0x6c, 0x88, 0x01, 0x01, 0x12, 0x25, 0x0a, + 0x0b, 0x67, 0x72, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x4d, 0x64, 0x35, 0x18, 0x06, 0x20, 0x01, + 0x28, 0x09, 0x48, 0x04, 0x52, 0x0b, 0x67, 0x72, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x4d, 0x64, + 0x35, 0x88, 0x01, 0x01, 0x12, 0x1d, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, + 0x07, 0x20, 0x01, 0x28, 0x09, 0x48, 0x05, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, + 0x88, 0x01, 0x01, 0x12, 0x1b, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x08, 0x20, + 0x01, 0x28, 0x0d, 0x48, 0x06, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x88, 0x01, 0x01, + 0x12, 0x21, 0x0a, 0x09, 0x75, 0x73, 0x65, 0x72, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x18, 0x09, 0x20, + 0x01, 0x28, 0x09, 0x48, 0x07, 0x52, 0x09, 0x75, 0x73, 0x65, 0x72, 0x41, 0x67, 0x65, 0x6e, 0x74, + 0x88, 0x01, 0x01, 0x12, 0x1f, 0x0a, 0x08, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x18, + 0x0a, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x08, 0x52, 0x08, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x49, + 0x64, 0x88, 0x01, 0x01, 0x12, 0x1d, 0x0a, 0x07, 0x69, 0x73, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x18, + 0x0b, 0x20, 0x01, 0x28, 0x08, 0x48, 0x09, 0x52, 0x07, 0x69, 0x73, 0x41, 0x64, 0x6d, 0x69, 0x6e, + 0x88, 0x01, 0x01, 0x12, 0x31, 0x0a, 0x11, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x4e, 0x6f, 0x74, 0x69, + 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x08, 0x48, 0x0a, + 0x52, 0x11, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x1b, 0x0a, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, + 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x48, 0x0b, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, + 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, + 0x65, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x48, 0x0c, 0x52, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, + 0x65, 0x54, 0x69, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, 0x0a, 0x75, 0x70, 0x64, 0x61, + 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x48, 0x0d, 0x52, 0x0a, + 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x42, 0x09, 0x0a, + 0x07, 0x5f, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x42, 0x08, 0x0a, 0x06, 0x5f, 0x65, 0x6d, 0x61, + 0x69, 0x6c, 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x69, 0x70, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, + 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x55, 0x72, 0x6c, 0x42, 0x0e, + 0x0a, 0x0c, 0x5f, 0x67, 0x72, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x4d, 0x64, 0x35, 0x42, 0x0a, + 0x0a, 0x08, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x73, + 0x74, 0x61, 0x74, 0x75, 0x73, 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x41, 0x67, + 0x65, 0x6e, 0x74, 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x49, 0x64, + 0x42, 0x0a, 0x0a, 0x08, 0x5f, 0x69, 0x73, 0x41, 0x64, 0x6d, 0x69, 0x6e, 0x42, 0x14, 0x0a, 0x12, + 0x5f, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x42, 0x0d, 0x0a, + 0x0b, 0x5f, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x42, 0x0d, 0x0a, 0x0b, + 0x5f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x5e, 0x0a, 0x13, 0x4c, + 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x73, 0x65, 0x12, 0x31, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x1b, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, + 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x05, + 0x69, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x22, 0x23, 0x0a, 0x11, 0x47, + 0x65, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, + 0x22, 0x81, 0x01, 0x0a, 0x14, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x6d, 0x6d, 0x65, + 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x35, 0x0a, 0x07, 0x63, 0x6f, 0x6d, + 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x63, 0x6f, 0x6d, + 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, + 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x07, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, + 0x12, 0x23, 0x0a, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x0d, 0x48, 0x00, 0x52, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, + 0x49, 0x64, 0x88, 0x01, 0x01, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, + 0x6f, 0x72, 0x49, 0x64, 0x22, 0x91, 0x01, 0x0a, 0x14, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, + 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, + 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x35, 0x0a, + 0x07, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x07, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x23, 0x0a, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, - 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x00, 0x52, 0x0a, 0x6f, 0x70, 0x65, 0x72, - 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x88, 0x01, 0x01, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x6f, 0x70, - 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x22, 0x91, 0x01, 0x0a, 0x14, 0x55, 0x70, 0x64, - 0x61, 0x74, 0x65, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, - 0x64, 0x12, 0x35, 0x0a, 0x07, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, - 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x52, - 0x07, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x23, 0x0a, 0x0a, 0x6f, 0x70, 0x65, 0x72, - 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x00, 0x52, 0x0a, - 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x88, 0x01, 0x01, 0x42, 0x0d, 0x0a, - 0x0b, 0x5f, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x22, 0x5a, 0x0a, 0x14, - 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, - 0x52, 0x02, 0x69, 0x64, 0x12, 0x23, 0x0a, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, - 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x00, 0x52, 0x0a, 0x6f, 0x70, 0x65, 0x72, + 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x00, 0x52, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x88, 0x01, 0x01, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x6f, 0x70, - 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x32, 0xc2, 0x03, 0x0a, 0x0e, 0x43, 0x6f, 0x6d, - 0x6d, 0x65, 0x6e, 0x74, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x53, 0x0a, 0x0b, 0x4c, - 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x19, 0x2e, 0x70, 0x61, 0x67, - 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x2e, - 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x43, - 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, - 0x12, 0x52, 0x0a, 0x0a, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x25, - 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, - 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, + 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x22, 0x5a, 0x0a, 0x14, 0x44, 0x65, 0x6c, 0x65, + 0x74, 0x65, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, + 0x12, 0x23, 0x0a, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x0d, 0x48, 0x00, 0x52, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, + 0x49, 0x64, 0x88, 0x01, 0x01, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, + 0x6f, 0x72, 0x49, 0x64, 0x32, 0xc2, 0x03, 0x0a, 0x0e, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, + 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x53, 0x0a, 0x0b, 0x4c, 0x69, 0x73, 0x74, 0x43, + 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x19, 0x2e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x2e, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x1a, 0x27, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, + 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x65, + 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x52, 0x0a, 0x0a, + 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x25, 0x2e, 0x63, 0x6f, 0x6d, + 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, + 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x1a, 0x1b, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, + 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x00, + 0x12, 0x58, 0x0a, 0x0d, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, + 0x74, 0x12, 0x28, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, + 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x6d, + 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1b, 0x2e, 0x63, 0x6f, + 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, + 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x00, 0x12, 0x58, 0x0a, 0x0d, 0x55, 0x70, + 0x64, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x28, 0x2e, 0x63, 0x6f, + 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, + 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1b, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x65, - 0x6e, 0x74, 0x22, 0x00, 0x12, 0x58, 0x0a, 0x0d, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x43, 0x6f, + 0x6e, 0x74, 0x22, 0x00, 0x12, 0x53, 0x0a, 0x0d, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x28, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x2e, - 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, + 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, - 0x1b, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, - 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x00, 0x12, 0x58, - 0x0a, 0x0d, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x12, - 0x28, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, - 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x6d, 0x6d, 0x65, - 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1b, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, - 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, - 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x00, 0x12, 0x53, 0x0a, 0x0d, 0x44, 0x65, 0x6c, 0x65, - 0x74, 0x65, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x28, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, - 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x44, - 0x65, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x42, 0x2d, 0x5a, - 0x2b, 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x63, 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, - 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x2f, 0x73, - 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, + 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, + 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x42, 0xc4, 0x01, 0x0a, 0x16, 0x63, 0x6f, + 0x6d, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x2e, 0x76, 0x31, 0x42, 0x0c, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x32, 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x63, 0x6d, 0x73, + 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, + 0x65, 0x6e, 0x74, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x73, + 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x43, 0x53, 0x58, 0xaa, 0x02, + 0x12, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, + 0x2e, 0x56, 0x31, 0xca, 0x02, 0x12, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x5c, 0x53, 0x65, + 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1e, 0x43, 0x6f, 0x6d, 0x6d, 0x65, + 0x6e, 0x74, 0x5c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, + 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x14, 0x43, 0x6f, 0x6d, 0x6d, + 0x65, 0x6e, 0x74, 0x3a, 0x3a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x3a, 0x3a, 0x56, 0x31, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -596,14 +605,14 @@ func file_comment_service_v1_comment_proto_rawDescGZIP() []byte { var file_comment_service_v1_comment_proto_msgTypes = make([]protoimpl.MessageInfo, 6) var file_comment_service_v1_comment_proto_goTypes = []interface{}{ - (*Comment)(nil), // 0: comment.service.v1.Comment - (*ListCommentResponse)(nil), // 1: comment.service.v1.ListCommentResponse - (*GetCommentRequest)(nil), // 2: comment.service.v1.GetCommentRequest - (*CreateCommentRequest)(nil), // 3: comment.service.v1.CreateCommentRequest - (*UpdateCommentRequest)(nil), // 4: comment.service.v1.UpdateCommentRequest - (*DeleteCommentRequest)(nil), // 5: comment.service.v1.DeleteCommentRequest - (*pagination.PagingRequest)(nil), // 6: pagination.PagingRequest - (*emptypb.Empty)(nil), // 7: google.protobuf.Empty + (*Comment)(nil), // 0: comment.service.v1.Comment + (*ListCommentResponse)(nil), // 1: comment.service.v1.ListCommentResponse + (*GetCommentRequest)(nil), // 2: comment.service.v1.GetCommentRequest + (*CreateCommentRequest)(nil), // 3: comment.service.v1.CreateCommentRequest + (*UpdateCommentRequest)(nil), // 4: comment.service.v1.UpdateCommentRequest + (*DeleteCommentRequest)(nil), // 5: comment.service.v1.DeleteCommentRequest + (*v1.PagingRequest)(nil), // 6: pagination.PagingRequest + (*emptypb.Empty)(nil), // 7: google.protobuf.Empty } var file_comment_service_v1_comment_proto_depIdxs = []int32{ 0, // 0: comment.service.v1.ListCommentResponse.items:type_name -> comment.service.v1.Comment diff --git a/blog-backend/gen/api/go/comment/service/v1/comment.pb.validate.go b/blog-backend/gen/api/go/comment/service/v1/comment.pb.validate.go index 1679acdc..d986f4fe 100644 --- a/blog-backend/gen/api/go/comment/service/v1/comment.pb.validate.go +++ b/blog-backend/gen/api/go/comment/service/v1/comment.pb.validate.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-validate. DO NOT EDIT. // source: comment/service/v1/comment.proto -package v1 +package servicev1 import ( "bytes" diff --git a/blog-backend/gen/api/go/comment/service/v1/comment_grpc.pb.go b/blog-backend/gen/api/go/comment/service/v1/comment_grpc.pb.go index 274c3e33..427e01a4 100644 --- a/blog-backend/gen/api/go/comment/service/v1/comment_grpc.pb.go +++ b/blog-backend/gen/api/go/comment/service/v1/comment_grpc.pb.go @@ -4,15 +4,15 @@ // - protoc (unknown) // source: comment/service/v1/comment.proto -package v1 +package servicev1 import ( context "context" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" ) // This is a compile-time assertion to ensure that this generated file @@ -33,7 +33,7 @@ const ( // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type CommentServiceClient interface { // 获取评论列表 - ListComment(ctx context.Context, in *pagination.PagingRequest, opts ...grpc.CallOption) (*ListCommentResponse, error) + ListComment(ctx context.Context, in *v1.PagingRequest, opts ...grpc.CallOption) (*ListCommentResponse, error) // 获取评论数据 GetComment(ctx context.Context, in *GetCommentRequest, opts ...grpc.CallOption) (*Comment, error) // 创建评论 @@ -52,7 +52,7 @@ func NewCommentServiceClient(cc grpc.ClientConnInterface) CommentServiceClient { return &commentServiceClient{cc} } -func (c *commentServiceClient) ListComment(ctx context.Context, in *pagination.PagingRequest, opts ...grpc.CallOption) (*ListCommentResponse, error) { +func (c *commentServiceClient) ListComment(ctx context.Context, in *v1.PagingRequest, opts ...grpc.CallOption) (*ListCommentResponse, error) { out := new(ListCommentResponse) err := c.cc.Invoke(ctx, CommentService_ListComment_FullMethodName, in, out, opts...) if err != nil { @@ -102,7 +102,7 @@ func (c *commentServiceClient) DeleteComment(ctx context.Context, in *DeleteComm // for forward compatibility type CommentServiceServer interface { // 获取评论列表 - ListComment(context.Context, *pagination.PagingRequest) (*ListCommentResponse, error) + ListComment(context.Context, *v1.PagingRequest) (*ListCommentResponse, error) // 获取评论数据 GetComment(context.Context, *GetCommentRequest) (*Comment, error) // 创建评论 @@ -118,7 +118,7 @@ type CommentServiceServer interface { type UnimplementedCommentServiceServer struct { } -func (UnimplementedCommentServiceServer) ListComment(context.Context, *pagination.PagingRequest) (*ListCommentResponse, error) { +func (UnimplementedCommentServiceServer) ListComment(context.Context, *v1.PagingRequest) (*ListCommentResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListComment not implemented") } func (UnimplementedCommentServiceServer) GetComment(context.Context, *GetCommentRequest) (*Comment, error) { @@ -147,7 +147,7 @@ func RegisterCommentServiceServer(s grpc.ServiceRegistrar, srv CommentServiceSer } func _CommentService_ListComment_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(pagination.PagingRequest) + in := new(v1.PagingRequest) if err := dec(in); err != nil { return nil, err } @@ -159,7 +159,7 @@ func _CommentService_ListComment_Handler(srv interface{}, ctx context.Context, d FullMethod: CommentService_ListComment_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(CommentServiceServer).ListComment(ctx, req.(*pagination.PagingRequest)) + return srv.(CommentServiceServer).ListComment(ctx, req.(*v1.PagingRequest)) } return interceptor(ctx, in, info, handler) } diff --git a/blog-backend/gen/api/go/common/pagination/pagination.pb.go b/blog-backend/gen/api/go/common/pagination/pagination.pb.go deleted file mode 100644 index 1048f537..00000000 --- a/blog-backend/gen/api/go/common/pagination/pagination.pb.go +++ /dev/null @@ -1,369 +0,0 @@ -// Code generated by protoc-gen-go. DO NOT EDIT. -// versions: -// protoc-gen-go v1.31.0 -// protoc (unknown) -// source: common/pagination/pagination.proto - -package pagination - -import ( - _ "github.com/google/gnostic/openapiv3" - protoreflect "google.golang.org/protobuf/reflect/protoreflect" - protoimpl "google.golang.org/protobuf/runtime/protoimpl" - anypb "google.golang.org/protobuf/types/known/anypb" - reflect "reflect" - sync "sync" -) - -const ( - // Verify that this generated code is sufficiently up-to-date. - _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) - // Verify that runtime/protoimpl is sufficiently up-to-date. - _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) -) - -// 排序类型 -type SortOrder int32 - -const ( - // 不排序 - SortOrder_UNSORTED SortOrder = 0 - // 升序 - SortOrder_ASCENDING SortOrder = 1 - // 降序 - SortOrder_DESCENDING SortOrder = 2 -) - -// Enum value maps for SortOrder. -var ( - SortOrder_name = map[int32]string{ - 0: "UNSORTED", - 1: "ASCENDING", - 2: "DESCENDING", - } - SortOrder_value = map[string]int32{ - "UNSORTED": 0, - "ASCENDING": 1, - "DESCENDING": 2, - } -) - -func (x SortOrder) Enum() *SortOrder { - p := new(SortOrder) - *p = x - return p -} - -func (x SortOrder) String() string { - return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x)) -} - -func (SortOrder) Descriptor() protoreflect.EnumDescriptor { - return file_common_pagination_pagination_proto_enumTypes[0].Descriptor() -} - -func (SortOrder) Type() protoreflect.EnumType { - return &file_common_pagination_pagination_proto_enumTypes[0] -} - -func (x SortOrder) Number() protoreflect.EnumNumber { - return protoreflect.EnumNumber(x) -} - -// Deprecated: Use SortOrder.Descriptor instead. -func (SortOrder) EnumDescriptor() ([]byte, []int) { - return file_common_pagination_pagination_proto_rawDescGZIP(), []int{0} -} - -// 分页通用请求 -type PagingRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // 当前页码 - Page *int32 `protobuf:"varint,1,opt,name=page,proto3,oneof" json:"page,omitempty"` - // 每页的行数 - PageSize *int32 `protobuf:"varint,2,opt,name=pageSize,proto3,oneof" json:"pageSize,omitempty"` - // 与过滤参数 - Query *string `protobuf:"bytes,3,opt,name=query,proto3,oneof" json:"query,omitempty"` - // 或过滤参数 - OrQuery *string `protobuf:"bytes,4,opt,name=orQuery,json=or,proto3,oneof" json:"orQuery,omitempty"` - // 排序条件 - OrderBy []string `protobuf:"bytes,5,rep,name=orderBy,proto3" json:"orderBy,omitempty"` - // 是否不分页 - NoPaging *bool `protobuf:"varint,6,opt,name=noPaging,json=nopaging,proto3,oneof" json:"noPaging,omitempty"` -} - -func (x *PagingRequest) Reset() { - *x = PagingRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_common_pagination_pagination_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *PagingRequest) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*PagingRequest) ProtoMessage() {} - -func (x *PagingRequest) ProtoReflect() protoreflect.Message { - mi := &file_common_pagination_pagination_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use PagingRequest.ProtoReflect.Descriptor instead. -func (*PagingRequest) Descriptor() ([]byte, []int) { - return file_common_pagination_pagination_proto_rawDescGZIP(), []int{0} -} - -func (x *PagingRequest) GetPage() int32 { - if x != nil && x.Page != nil { - return *x.Page - } - return 0 -} - -func (x *PagingRequest) GetPageSize() int32 { - if x != nil && x.PageSize != nil { - return *x.PageSize - } - return 0 -} - -func (x *PagingRequest) GetQuery() string { - if x != nil && x.Query != nil { - return *x.Query - } - return "" -} - -func (x *PagingRequest) GetOrQuery() string { - if x != nil && x.OrQuery != nil { - return *x.OrQuery - } - return "" -} - -func (x *PagingRequest) GetOrderBy() []string { - if x != nil { - return x.OrderBy - } - return nil -} - -func (x *PagingRequest) GetNoPaging() bool { - if x != nil && x.NoPaging != nil { - return *x.NoPaging - } - return false -} - -// 分页通用结果 -type PagingResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - // 总数 - Total int32 `protobuf:"varint,1,opt,name=total,proto3" json:"total,omitempty"` - // 分页数据 - Items []*anypb.Any `protobuf:"bytes,2,rep,name=items,proto3" json:"items,omitempty"` -} - -func (x *PagingResponse) Reset() { - *x = PagingResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_common_pagination_pagination_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *PagingResponse) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*PagingResponse) ProtoMessage() {} - -func (x *PagingResponse) ProtoReflect() protoreflect.Message { - mi := &file_common_pagination_pagination_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use PagingResponse.ProtoReflect.Descriptor instead. -func (*PagingResponse) Descriptor() ([]byte, []int) { - return file_common_pagination_pagination_proto_rawDescGZIP(), []int{1} -} - -func (x *PagingResponse) GetTotal() int32 { - if x != nil { - return x.Total - } - return 0 -} - -func (x *PagingResponse) GetItems() []*anypb.Any { - if x != nil { - return x.Items - } - return nil -} - -var File_common_pagination_pagination_proto protoreflect.FileDescriptor - -var file_common_pagination_pagination_proto_rawDesc = []byte{ - 0x0a, 0x22, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0a, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x1a, 0x19, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, - 0x66, 0x2f, 0x61, 0x6e, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x24, 0x67, 0x6e, 0x6f, - 0x73, 0x74, 0x69, 0x63, 0x2f, 0x6f, 0x70, 0x65, 0x6e, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x33, 0x2f, - 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x22, 0x9b, 0x04, 0x0a, 0x0d, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x12, 0x37, 0x0a, 0x04, 0x70, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x05, 0x42, 0x1e, 0xba, 0x47, 0x1b, 0x8a, 0x02, 0x09, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0xf0, 0x3f, 0x92, 0x02, 0x0c, 0xe5, 0xbd, 0x93, 0xe5, 0x89, 0x8d, 0xe9, 0xa1, 0xb5, 0xe7, 0xa0, - 0x81, 0x48, 0x00, 0x52, 0x04, 0x70, 0x61, 0x67, 0x65, 0x88, 0x01, 0x01, 0x12, 0x45, 0x0a, 0x08, - 0x70, 0x61, 0x67, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x42, 0x24, - 0xba, 0x47, 0x21, 0x8a, 0x02, 0x09, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x40, 0x92, - 0x02, 0x12, 0xe6, 0xaf, 0x8f, 0xe4, 0xb8, 0x80, 0xe9, 0xa1, 0xb5, 0xe7, 0x9a, 0x84, 0xe8, 0xa1, - 0x8c, 0xe6, 0x95, 0xb0, 0x48, 0x01, 0x52, 0x08, 0x70, 0x61, 0x67, 0x65, 0x53, 0x69, 0x7a, 0x65, - 0x88, 0x01, 0x01, 0x12, 0x51, 0x0a, 0x05, 0x71, 0x75, 0x65, 0x72, 0x79, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x09, 0x42, 0x36, 0xba, 0x47, 0x33, 0x3a, 0x1f, 0x12, 0x1d, 0x7b, 0x22, 0x6b, 0x65, 0x79, - 0x31, 0x22, 0x3a, 0x22, 0x76, 0x61, 0x6c, 0x31, 0x22, 0x2c, 0x22, 0x6b, 0x65, 0x79, 0x32, 0x22, - 0x3a, 0x22, 0x76, 0x61, 0x6c, 0x32, 0x22, 0x7d, 0x92, 0x02, 0x0f, 0xe4, 0xb8, 0x8e, 0xe8, 0xbf, - 0x87, 0xe6, 0xbb, 0xa4, 0xe5, 0x8f, 0x82, 0xe6, 0x95, 0xb0, 0x48, 0x02, 0x52, 0x05, 0x71, 0x75, - 0x65, 0x72, 0x79, 0x88, 0x01, 0x01, 0x12, 0x50, 0x0a, 0x07, 0x6f, 0x72, 0x51, 0x75, 0x65, 0x72, - 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x42, 0x36, 0xba, 0x47, 0x33, 0x3a, 0x1f, 0x12, 0x1d, - 0x7b, 0x22, 0x6b, 0x65, 0x79, 0x31, 0x22, 0x3a, 0x22, 0x76, 0x61, 0x6c, 0x31, 0x22, 0x2c, 0x22, - 0x6b, 0x65, 0x79, 0x32, 0x22, 0x3a, 0x22, 0x76, 0x61, 0x6c, 0x32, 0x22, 0x7d, 0x92, 0x02, 0x0f, - 0xe6, 0x88, 0x96, 0xe8, 0xbf, 0x87, 0xe6, 0xbb, 0xa4, 0xe5, 0x8f, 0x82, 0xe6, 0x95, 0xb0, 0x48, - 0x03, 0x52, 0x02, 0x6f, 0x72, 0x88, 0x01, 0x01, 0x12, 0x74, 0x0a, 0x07, 0x6f, 0x72, 0x64, 0x65, - 0x72, 0x42, 0x79, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x42, 0x5a, 0xba, 0x47, 0x57, 0x3a, 0x13, - 0x12, 0x11, 0x7b, 0x22, 0x76, 0x61, 0x6c, 0x31, 0x22, 0x2c, 0x20, 0x22, 0x2d, 0x76, 0x61, 0x6c, - 0x32, 0x22, 0x7d, 0x92, 0x02, 0x3f, 0xe6, 0x8e, 0x92, 0xe5, 0xba, 0x8f, 0xe6, 0x9d, 0xa1, 0xe4, - 0xbb, 0xb6, 0xef, 0xbc, 0x8c, 0xe5, 0xad, 0x97, 0xe6, 0xae, 0xb5, 0xe5, 0x90, 0x8d, 0xe5, 0x89, - 0x8d, 0xe5, 0x8a, 0xa0, 0x27, 0x2d, 0x27, 0xe4, 0xb8, 0xba, 0xe9, 0x99, 0x8d, 0xe5, 0xba, 0x8f, - 0xef, 0xbc, 0x8c, 0xe5, 0x90, 0xa6, 0xe5, 0x88, 0x99, 0xe4, 0xb8, 0xba, 0xe5, 0x8d, 0x87, 0xe5, - 0xba, 0x8f, 0xe3, 0x80, 0x82, 0x52, 0x07, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x42, 0x79, 0x12, 0x36, - 0x0a, 0x08, 0x6e, 0x6f, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, - 0x42, 0x15, 0xba, 0x47, 0x12, 0x92, 0x02, 0x0f, 0xe6, 0x98, 0xaf, 0xe5, 0x90, 0xa6, 0xe4, 0xb8, - 0x8d, 0xe5, 0x88, 0x86, 0xe9, 0xa1, 0xb5, 0x48, 0x04, 0x52, 0x08, 0x6e, 0x6f, 0x70, 0x61, 0x67, - 0x69, 0x6e, 0x67, 0x88, 0x01, 0x01, 0x42, 0x07, 0x0a, 0x05, 0x5f, 0x70, 0x61, 0x67, 0x65, 0x42, - 0x0b, 0x0a, 0x09, 0x5f, 0x70, 0x61, 0x67, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x42, 0x08, 0x0a, 0x06, - 0x5f, 0x71, 0x75, 0x65, 0x72, 0x79, 0x42, 0x0a, 0x0a, 0x08, 0x5f, 0x6f, 0x72, 0x51, 0x75, 0x65, - 0x72, 0x79, 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x6e, 0x6f, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x22, - 0x52, 0x0a, 0x0e, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, - 0x65, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x12, 0x2a, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, - 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x41, 0x6e, 0x79, 0x52, 0x05, 0x69, 0x74, - 0x65, 0x6d, 0x73, 0x2a, 0x38, 0x0a, 0x09, 0x53, 0x6f, 0x72, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, - 0x12, 0x0c, 0x0a, 0x08, 0x55, 0x4e, 0x53, 0x4f, 0x52, 0x54, 0x45, 0x44, 0x10, 0x00, 0x12, 0x0d, - 0x0a, 0x09, 0x41, 0x53, 0x43, 0x45, 0x4e, 0x44, 0x49, 0x4e, 0x47, 0x10, 0x01, 0x12, 0x0e, 0x0a, - 0x0a, 0x44, 0x45, 0x53, 0x43, 0x45, 0x4e, 0x44, 0x49, 0x4e, 0x47, 0x10, 0x02, 0x42, 0x34, 0x5a, - 0x32, 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x63, 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, - 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x61, - 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x3b, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} - -var ( - file_common_pagination_pagination_proto_rawDescOnce sync.Once - file_common_pagination_pagination_proto_rawDescData = file_common_pagination_pagination_proto_rawDesc -) - -func file_common_pagination_pagination_proto_rawDescGZIP() []byte { - file_common_pagination_pagination_proto_rawDescOnce.Do(func() { - file_common_pagination_pagination_proto_rawDescData = protoimpl.X.CompressGZIP(file_common_pagination_pagination_proto_rawDescData) - }) - return file_common_pagination_pagination_proto_rawDescData -} - -var file_common_pagination_pagination_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_common_pagination_pagination_proto_msgTypes = make([]protoimpl.MessageInfo, 2) -var file_common_pagination_pagination_proto_goTypes = []interface{}{ - (SortOrder)(0), // 0: pagination.SortOrder - (*PagingRequest)(nil), // 1: pagination.PagingRequest - (*PagingResponse)(nil), // 2: pagination.PagingResponse - (*anypb.Any)(nil), // 3: google.protobuf.Any -} -var file_common_pagination_pagination_proto_depIdxs = []int32{ - 3, // 0: pagination.PagingResponse.items:type_name -> google.protobuf.Any - 1, // [1:1] is the sub-list for method output_type - 1, // [1:1] is the sub-list for method input_type - 1, // [1:1] is the sub-list for extension type_name - 1, // [1:1] is the sub-list for extension extendee - 0, // [0:1] is the sub-list for field type_name -} - -func init() { file_common_pagination_pagination_proto_init() } -func file_common_pagination_pagination_proto_init() { - if File_common_pagination_pagination_proto != nil { - return - } - if !protoimpl.UnsafeEnabled { - file_common_pagination_pagination_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PagingRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_common_pagination_pagination_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*PagingResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - } - file_common_pagination_pagination_proto_msgTypes[0].OneofWrappers = []interface{}{} - type x struct{} - out := protoimpl.TypeBuilder{ - File: protoimpl.DescBuilder{ - GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_common_pagination_pagination_proto_rawDesc, - NumEnums: 1, - NumMessages: 2, - NumExtensions: 0, - NumServices: 0, - }, - GoTypes: file_common_pagination_pagination_proto_goTypes, - DependencyIndexes: file_common_pagination_pagination_proto_depIdxs, - EnumInfos: file_common_pagination_pagination_proto_enumTypes, - MessageInfos: file_common_pagination_pagination_proto_msgTypes, - }.Build() - File_common_pagination_pagination_proto = out.File - file_common_pagination_pagination_proto_rawDesc = nil - file_common_pagination_pagination_proto_goTypes = nil - file_common_pagination_pagination_proto_depIdxs = nil -} diff --git a/blog-backend/gen/api/go/common/pagination/pagination.pb.validate.go b/blog-backend/gen/api/go/common/pagination/pagination.pb.validate.go deleted file mode 100644 index db5fc817..00000000 --- a/blog-backend/gen/api/go/common/pagination/pagination.pb.validate.go +++ /dev/null @@ -1,292 +0,0 @@ -// Code generated by protoc-gen-validate. DO NOT EDIT. -// source: common/pagination/pagination.proto - -package pagination - -import ( - "bytes" - "errors" - "fmt" - "net" - "net/mail" - "net/url" - "regexp" - "sort" - "strings" - "time" - "unicode/utf8" - - "google.golang.org/protobuf/types/known/anypb" -) - -// ensure the imports are used -var ( - _ = bytes.MinRead - _ = errors.New("") - _ = fmt.Print - _ = utf8.UTFMax - _ = (*regexp.Regexp)(nil) - _ = (*strings.Reader)(nil) - _ = net.IPv4len - _ = time.Duration(0) - _ = (*url.URL)(nil) - _ = (*mail.Address)(nil) - _ = anypb.Any{} - _ = sort.Sort -) - -// Validate checks the field values on PagingRequest with the rules defined in -// the proto definition for this message. If any rules are violated, the first -// error encountered is returned, or nil if there are no violations. -func (m *PagingRequest) Validate() error { - return m.validate(false) -} - -// ValidateAll checks the field values on PagingRequest with the rules defined -// in the proto definition for this message. If any rules are violated, the -// result is a list of violation errors wrapped in PagingRequestMultiError, or -// nil if none found. -func (m *PagingRequest) ValidateAll() error { - return m.validate(true) -} - -func (m *PagingRequest) validate(all bool) error { - if m == nil { - return nil - } - - var errors []error - - if m.Page != nil { - // no validation rules for Page - } - - if m.PageSize != nil { - // no validation rules for PageSize - } - - if m.Query != nil { - // no validation rules for Query - } - - if m.OrQuery != nil { - // no validation rules for OrQuery - } - - if m.NoPaging != nil { - // no validation rules for NoPaging - } - - if len(errors) > 0 { - return PagingRequestMultiError(errors) - } - - return nil -} - -// PagingRequestMultiError is an error wrapping multiple validation errors -// returned by PagingRequest.ValidateAll() if the designated constraints -// aren't met. -type PagingRequestMultiError []error - -// Error returns a concatenation of all the error messages it wraps. -func (m PagingRequestMultiError) Error() string { - var msgs []string - for _, err := range m { - msgs = append(msgs, err.Error()) - } - return strings.Join(msgs, "; ") -} - -// AllErrors returns a list of validation violation errors. -func (m PagingRequestMultiError) AllErrors() []error { return m } - -// PagingRequestValidationError is the validation error returned by -// PagingRequest.Validate if the designated constraints aren't met. -type PagingRequestValidationError struct { - field string - reason string - cause error - key bool -} - -// Field function returns field value. -func (e PagingRequestValidationError) Field() string { return e.field } - -// Reason function returns reason value. -func (e PagingRequestValidationError) Reason() string { return e.reason } - -// Cause function returns cause value. -func (e PagingRequestValidationError) Cause() error { return e.cause } - -// Key function returns key value. -func (e PagingRequestValidationError) Key() bool { return e.key } - -// ErrorName returns error name. -func (e PagingRequestValidationError) ErrorName() string { return "PagingRequestValidationError" } - -// Error satisfies the builtin error interface -func (e PagingRequestValidationError) Error() string { - cause := "" - if e.cause != nil { - cause = fmt.Sprintf(" | caused by: %v", e.cause) - } - - key := "" - if e.key { - key = "key for " - } - - return fmt.Sprintf( - "invalid %sPagingRequest.%s: %s%s", - key, - e.field, - e.reason, - cause) -} - -var _ error = PagingRequestValidationError{} - -var _ interface { - Field() string - Reason() string - Key() bool - Cause() error - ErrorName() string -} = PagingRequestValidationError{} - -// Validate checks the field values on PagingResponse with the rules defined in -// the proto definition for this message. If any rules are violated, the first -// error encountered is returned, or nil if there are no violations. -func (m *PagingResponse) Validate() error { - return m.validate(false) -} - -// ValidateAll checks the field values on PagingResponse with the rules defined -// in the proto definition for this message. If any rules are violated, the -// result is a list of violation errors wrapped in PagingResponseMultiError, -// or nil if none found. -func (m *PagingResponse) ValidateAll() error { - return m.validate(true) -} - -func (m *PagingResponse) validate(all bool) error { - if m == nil { - return nil - } - - var errors []error - - // no validation rules for Total - - for idx, item := range m.GetItems() { - _, _ = idx, item - - if all { - switch v := interface{}(item).(type) { - case interface{ ValidateAll() error }: - if err := v.ValidateAll(); err != nil { - errors = append(errors, PagingResponseValidationError{ - field: fmt.Sprintf("Items[%v]", idx), - reason: "embedded message failed validation", - cause: err, - }) - } - case interface{ Validate() error }: - if err := v.Validate(); err != nil { - errors = append(errors, PagingResponseValidationError{ - field: fmt.Sprintf("Items[%v]", idx), - reason: "embedded message failed validation", - cause: err, - }) - } - } - } else if v, ok := interface{}(item).(interface{ Validate() error }); ok { - if err := v.Validate(); err != nil { - return PagingResponseValidationError{ - field: fmt.Sprintf("Items[%v]", idx), - reason: "embedded message failed validation", - cause: err, - } - } - } - - } - - if len(errors) > 0 { - return PagingResponseMultiError(errors) - } - - return nil -} - -// PagingResponseMultiError is an error wrapping multiple validation errors -// returned by PagingResponse.ValidateAll() if the designated constraints -// aren't met. -type PagingResponseMultiError []error - -// Error returns a concatenation of all the error messages it wraps. -func (m PagingResponseMultiError) Error() string { - var msgs []string - for _, err := range m { - msgs = append(msgs, err.Error()) - } - return strings.Join(msgs, "; ") -} - -// AllErrors returns a list of validation violation errors. -func (m PagingResponseMultiError) AllErrors() []error { return m } - -// PagingResponseValidationError is the validation error returned by -// PagingResponse.Validate if the designated constraints aren't met. -type PagingResponseValidationError struct { - field string - reason string - cause error - key bool -} - -// Field function returns field value. -func (e PagingResponseValidationError) Field() string { return e.field } - -// Reason function returns reason value. -func (e PagingResponseValidationError) Reason() string { return e.reason } - -// Cause function returns cause value. -func (e PagingResponseValidationError) Cause() error { return e.cause } - -// Key function returns key value. -func (e PagingResponseValidationError) Key() bool { return e.key } - -// ErrorName returns error name. -func (e PagingResponseValidationError) ErrorName() string { return "PagingResponseValidationError" } - -// Error satisfies the builtin error interface -func (e PagingResponseValidationError) Error() string { - cause := "" - if e.cause != nil { - cause = fmt.Sprintf(" | caused by: %v", e.cause) - } - - key := "" - if e.key { - key = "key for " - } - - return fmt.Sprintf( - "invalid %sPagingResponse.%s: %s%s", - key, - e.field, - e.reason, - cause) -} - -var _ error = PagingResponseValidationError{} - -var _ interface { - Field() string - Reason() string - Key() bool - Cause() error - ErrorName() string -} = PagingResponseValidationError{} diff --git a/blog-backend/gen/api/go/content/service/v1/category.pb.go b/blog-backend/gen/api/go/content/service/v1/category.pb.go index 2a8969ad..ff429c8c 100644 --- a/blog-backend/gen/api/go/content/service/v1/category.pb.go +++ b/blog-backend/gen/api/go/content/service/v1/category.pb.go @@ -4,14 +4,14 @@ // protoc (unknown) // source: content/service/v1/category.proto -package v1 +package servicev1 import ( + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" emptypb "google.golang.org/protobuf/types/known/emptypb" fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb" - pagination "kratos-cms/gen/api/go/common/pagination" reflect "reflect" sync "sync" ) @@ -457,111 +457,121 @@ var file_content_service_v1_category_proto_rawDesc = []byte{ 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x20, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x5f, 0x6d, 0x61, 0x73, 0x6b, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x22, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, - 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x97, 0x04, 0x0a, 0x08, 0x43, - 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1f, 0x0a, 0x08, 0x70, 0x61, 0x72, 0x65, 0x6e, - 0x74, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x00, 0x52, 0x08, 0x70, 0x61, 0x72, - 0x65, 0x6e, 0x74, 0x49, 0x64, 0x88, 0x01, 0x01, 0x12, 0x17, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x88, 0x01, - 0x01, 0x12, 0x17, 0x0a, 0x04, 0x73, 0x6c, 0x75, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x48, - 0x02, 0x52, 0x04, 0x73, 0x6c, 0x75, 0x67, 0x88, 0x01, 0x01, 0x12, 0x25, 0x0a, 0x0b, 0x64, 0x65, - 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x48, - 0x03, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x88, 0x01, - 0x01, 0x12, 0x21, 0x0a, 0x09, 0x74, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x18, 0x06, - 0x20, 0x01, 0x28, 0x09, 0x48, 0x04, 0x52, 0x09, 0x74, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, - 0x6c, 0x88, 0x01, 0x01, 0x12, 0x1f, 0x0a, 0x08, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, - 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x48, 0x05, 0x52, 0x08, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, - 0x72, 0x64, 0x88, 0x01, 0x01, 0x12, 0x1f, 0x0a, 0x08, 0x66, 0x75, 0x6c, 0x6c, 0x50, 0x61, 0x74, - 0x68, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x48, 0x06, 0x52, 0x08, 0x66, 0x75, 0x6c, 0x6c, 0x50, - 0x61, 0x74, 0x68, 0x88, 0x01, 0x01, 0x12, 0x1f, 0x0a, 0x08, 0x70, 0x72, 0x69, 0x6f, 0x72, 0x69, - 0x74, 0x79, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x48, 0x07, 0x52, 0x08, 0x70, 0x72, 0x69, 0x6f, - 0x72, 0x69, 0x74, 0x79, 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, - 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x48, 0x08, 0x52, 0x0a, 0x63, - 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, 0x0a, - 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, - 0x48, 0x09, 0x52, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x88, 0x01, - 0x01, 0x12, 0x21, 0x0a, 0x09, 0x70, 0x6f, 0x73, 0x74, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0c, - 0x20, 0x01, 0x28, 0x0d, 0x48, 0x0a, 0x52, 0x09, 0x70, 0x6f, 0x73, 0x74, 0x43, 0x6f, 0x75, 0x6e, - 0x74, 0x88, 0x01, 0x01, 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x49, - 0x64, 0x42, 0x07, 0x0a, 0x05, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x42, 0x07, 0x0a, 0x05, 0x5f, 0x73, - 0x6c, 0x75, 0x67, 0x42, 0x0e, 0x0a, 0x0c, 0x5f, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, - 0x69, 0x6f, 0x6e, 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x74, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, - 0x6c, 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x0b, - 0x0a, 0x09, 0x5f, 0x66, 0x75, 0x6c, 0x6c, 0x50, 0x61, 0x74, 0x68, 0x42, 0x0b, 0x0a, 0x09, 0x5f, - 0x70, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x63, 0x72, 0x65, - 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x75, 0x70, 0x64, 0x61, - 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x70, 0x6f, 0x73, 0x74, 0x43, - 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x60, 0x0a, 0x14, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x61, 0x74, 0x65, - 0x67, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x32, 0x0a, 0x05, - 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x63, 0x6f, - 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, - 0x2e, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, - 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x22, 0x5f, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x43, 0x61, 0x74, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x97, 0x04, 0x0a, 0x08, 0x43, 0x61, 0x74, 0x65, 0x67, + 0x6f, 0x72, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, + 0x02, 0x69, 0x64, 0x12, 0x1f, 0x0a, 0x08, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x00, 0x52, 0x08, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x49, + 0x64, 0x88, 0x01, 0x01, 0x12, 0x17, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x09, 0x48, 0x01, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x12, 0x17, 0x0a, + 0x04, 0x73, 0x6c, 0x75, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x48, 0x02, 0x52, 0x04, 0x73, + 0x6c, 0x75, 0x67, 0x88, 0x01, 0x01, 0x12, 0x25, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, + 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x48, 0x03, 0x52, 0x0b, 0x64, + 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x21, 0x0a, + 0x09, 0x74, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, + 0x48, 0x04, 0x52, 0x09, 0x74, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x88, 0x01, 0x01, + 0x12, 0x1f, 0x0a, 0x08, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x07, 0x20, 0x01, + 0x28, 0x09, 0x48, 0x05, 0x52, 0x08, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x88, 0x01, + 0x01, 0x12, 0x1f, 0x0a, 0x08, 0x66, 0x75, 0x6c, 0x6c, 0x50, 0x61, 0x74, 0x68, 0x18, 0x08, 0x20, + 0x01, 0x28, 0x09, 0x48, 0x06, 0x52, 0x08, 0x66, 0x75, 0x6c, 0x6c, 0x50, 0x61, 0x74, 0x68, 0x88, + 0x01, 0x01, 0x12, 0x1f, 0x0a, 0x08, 0x70, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x18, 0x09, + 0x20, 0x01, 0x28, 0x05, 0x48, 0x07, 0x52, 0x08, 0x70, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, + 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, + 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x48, 0x08, 0x52, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, + 0x65, 0x54, 0x69, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, 0x0a, 0x75, 0x70, 0x64, 0x61, + 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x48, 0x09, 0x52, 0x0a, + 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x12, 0x21, 0x0a, + 0x09, 0x70, 0x6f, 0x73, 0x74, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0d, + 0x48, 0x0a, 0x52, 0x09, 0x70, 0x6f, 0x73, 0x74, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x88, 0x01, 0x01, + 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x42, 0x07, 0x0a, + 0x05, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x42, 0x07, 0x0a, 0x05, 0x5f, 0x73, 0x6c, 0x75, 0x67, 0x42, + 0x0e, 0x0a, 0x0c, 0x5f, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x42, + 0x0c, 0x0a, 0x0a, 0x5f, 0x74, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x42, 0x0b, 0x0a, + 0x09, 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x66, + 0x75, 0x6c, 0x6c, 0x50, 0x61, 0x74, 0x68, 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x70, 0x72, 0x69, 0x6f, + 0x72, 0x69, 0x74, 0x79, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, + 0x69, 0x6d, 0x65, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, + 0x6d, 0x65, 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x70, 0x6f, 0x73, 0x74, 0x43, 0x6f, 0x75, 0x6e, 0x74, + 0x22, 0x60, 0x0a, 0x14, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, + 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x32, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, + 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, + 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x61, 0x74, + 0x65, 0x67, 0x6f, 0x72, 0x79, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x14, 0x0a, 0x05, + 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x74, 0x6f, 0x74, + 0x61, 0x6c, 0x22, 0x5f, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, + 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x39, 0x0a, 0x0a, 0x66, 0x69, 0x65, 0x6c, + 0x64, 0x5f, 0x6d, 0x61, 0x73, 0x6b, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, + 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x46, + 0x69, 0x65, 0x6c, 0x64, 0x4d, 0x61, 0x73, 0x6b, 0x52, 0x09, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x4d, + 0x61, 0x73, 0x6b, 0x22, 0x85, 0x01, 0x0a, 0x15, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x43, 0x61, + 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x38, 0x0a, + 0x08, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x1c, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x52, 0x08, 0x63, + 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x12, 0x23, 0x0a, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, + 0x74, 0x6f, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x00, 0x52, 0x0a, 0x6f, + 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x88, 0x01, 0x01, 0x42, 0x0d, 0x0a, 0x0b, + 0x5f, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x22, 0x95, 0x01, 0x0a, 0x15, + 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x38, 0x0a, 0x08, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, + 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, + 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x61, 0x74, + 0x65, 0x67, 0x6f, 0x72, 0x79, 0x52, 0x08, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x12, + 0x23, 0x0a, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x0d, 0x48, 0x00, 0x52, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, + 0x64, 0x88, 0x01, 0x01, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, + 0x72, 0x49, 0x64, 0x22, 0x5b, 0x0a, 0x15, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, - 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x39, 0x0a, 0x0a, - 0x66, 0x69, 0x65, 0x6c, 0x64, 0x5f, 0x6d, 0x61, 0x73, 0x6b, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, - 0x75, 0x66, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x4d, 0x61, 0x73, 0x6b, 0x52, 0x09, 0x66, 0x69, - 0x65, 0x6c, 0x64, 0x4d, 0x61, 0x73, 0x6b, 0x22, 0x85, 0x01, 0x0a, 0x15, 0x43, 0x72, 0x65, 0x61, - 0x74, 0x65, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x12, 0x38, 0x0a, 0x08, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, - 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, - 0x79, 0x52, 0x08, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x12, 0x23, 0x0a, 0x0a, 0x6f, - 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x48, - 0x00, 0x52, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x88, 0x01, 0x01, - 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x22, - 0x95, 0x01, 0x0a, 0x15, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, - 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x38, 0x0a, 0x08, 0x63, 0x61, 0x74, - 0x65, 0x67, 0x6f, 0x72, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x63, 0x6f, - 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, - 0x2e, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x52, 0x08, 0x63, 0x61, 0x74, 0x65, 0x67, - 0x6f, 0x72, 0x79, 0x12, 0x23, 0x0a, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, - 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x00, 0x52, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, - 0x74, 0x6f, 0x72, 0x49, 0x64, 0x88, 0x01, 0x01, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x6f, 0x70, 0x65, - 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x22, 0x5b, 0x0a, 0x15, 0x44, 0x65, 0x6c, 0x65, 0x74, - 0x65, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, - 0x12, 0x23, 0x0a, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x0d, 0x48, 0x00, 0x52, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, - 0x49, 0x64, 0x88, 0x01, 0x01, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, - 0x6f, 0x72, 0x49, 0x64, 0x32, 0xd0, 0x03, 0x0a, 0x0f, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, - 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x55, 0x0a, 0x0c, 0x4c, 0x69, 0x73, 0x74, - 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x12, 0x19, 0x2e, 0x70, 0x61, 0x67, 0x69, 0x6e, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x1a, 0x28, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, - 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x61, 0x74, - 0x65, 0x67, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, - 0x55, 0x0a, 0x0b, 0x47, 0x65, 0x74, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x12, 0x26, + 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x23, 0x0a, 0x0a, + 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, + 0x48, 0x00, 0x52, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x88, 0x01, + 0x01, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, + 0x32, 0xd0, 0x03, 0x0a, 0x0f, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x53, 0x65, 0x72, + 0x76, 0x69, 0x63, 0x65, 0x12, 0x55, 0x0a, 0x0c, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x61, 0x74, 0x65, + 0x67, 0x6f, 0x72, 0x79, 0x12, 0x19, 0x2e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x2e, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, + 0x28, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, + 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x55, 0x0a, 0x0b, 0x47, + 0x65, 0x74, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x12, 0x26, 0x2e, 0x63, 0x6f, 0x6e, + 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, + 0x47, 0x65, 0x74, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, + 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, + 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, + 0x22, 0x00, 0x12, 0x5b, 0x0a, 0x0e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x43, 0x61, 0x74, 0x65, + 0x67, 0x6f, 0x72, 0x79, 0x12, 0x29, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, + 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, + 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, + 0x1c, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x22, 0x00, 0x12, + 0x5b, 0x0a, 0x0e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, + 0x79, 0x12, 0x29, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, + 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x61, 0x74, + 0x65, 0x67, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x63, + 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, + 0x31, 0x2e, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x22, 0x00, 0x12, 0x55, 0x0a, 0x0e, + 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x12, 0x29, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, - 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, - 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x61, 0x74, 0x65, - 0x67, 0x6f, 0x72, 0x79, 0x22, 0x00, 0x12, 0x5b, 0x0a, 0x0e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, - 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x12, 0x29, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, - 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, - 0x65, 0x61, 0x74, 0x65, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, - 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, - 0x79, 0x22, 0x00, 0x12, 0x5b, 0x0a, 0x0e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x61, 0x74, - 0x65, 0x67, 0x6f, 0x72, 0x79, 0x12, 0x29, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, - 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, - 0x65, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x1a, 0x1c, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, - 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x22, 0x00, - 0x12, 0x55, 0x0a, 0x0e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, - 0x72, 0x79, 0x12, 0x29, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, - 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x61, - 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, - 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, - 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x42, 0x2d, 0x5a, 0x2b, 0x6b, 0x72, 0x61, 0x74, 0x6f, - 0x73, 0x2d, 0x63, 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, - 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, - 0x2f, 0x76, 0x31, 0x3b, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, + 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, + 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, + 0x79, 0x22, 0x00, 0x42, 0xc5, 0x01, 0x0a, 0x16, 0x63, 0x6f, 0x6d, 0x2e, 0x63, 0x6f, 0x6e, 0x74, + 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x42, 0x0d, + 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, + 0x32, 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x63, 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, + 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2f, 0x73, + 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x43, 0x53, 0x58, 0xaa, 0x02, 0x12, 0x43, 0x6f, 0x6e, 0x74, + 0x65, 0x6e, 0x74, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02, + 0x12, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x5c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, + 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x5c, 0x53, 0x65, + 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, + 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x14, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x3a, 0x3a, + 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( @@ -578,15 +588,15 @@ func file_content_service_v1_category_proto_rawDescGZIP() []byte { var file_content_service_v1_category_proto_msgTypes = make([]protoimpl.MessageInfo, 6) var file_content_service_v1_category_proto_goTypes = []interface{}{ - (*Category)(nil), // 0: content.service.v1.Category - (*ListCategoryResponse)(nil), // 1: content.service.v1.ListCategoryResponse - (*GetCategoryRequest)(nil), // 2: content.service.v1.GetCategoryRequest - (*CreateCategoryRequest)(nil), // 3: content.service.v1.CreateCategoryRequest - (*UpdateCategoryRequest)(nil), // 4: content.service.v1.UpdateCategoryRequest - (*DeleteCategoryRequest)(nil), // 5: content.service.v1.DeleteCategoryRequest - (*fieldmaskpb.FieldMask)(nil), // 6: google.protobuf.FieldMask - (*pagination.PagingRequest)(nil), // 7: pagination.PagingRequest - (*emptypb.Empty)(nil), // 8: google.protobuf.Empty + (*Category)(nil), // 0: content.service.v1.Category + (*ListCategoryResponse)(nil), // 1: content.service.v1.ListCategoryResponse + (*GetCategoryRequest)(nil), // 2: content.service.v1.GetCategoryRequest + (*CreateCategoryRequest)(nil), // 3: content.service.v1.CreateCategoryRequest + (*UpdateCategoryRequest)(nil), // 4: content.service.v1.UpdateCategoryRequest + (*DeleteCategoryRequest)(nil), // 5: content.service.v1.DeleteCategoryRequest + (*fieldmaskpb.FieldMask)(nil), // 6: google.protobuf.FieldMask + (*v1.PagingRequest)(nil), // 7: pagination.PagingRequest + (*emptypb.Empty)(nil), // 8: google.protobuf.Empty } var file_content_service_v1_category_proto_depIdxs = []int32{ 0, // 0: content.service.v1.ListCategoryResponse.items:type_name -> content.service.v1.Category diff --git a/blog-backend/gen/api/go/content/service/v1/category.pb.validate.go b/blog-backend/gen/api/go/content/service/v1/category.pb.validate.go index 7c6380a0..02684a90 100644 --- a/blog-backend/gen/api/go/content/service/v1/category.pb.validate.go +++ b/blog-backend/gen/api/go/content/service/v1/category.pb.validate.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-validate. DO NOT EDIT. // source: content/service/v1/category.proto -package v1 +package servicev1 import ( "bytes" diff --git a/blog-backend/gen/api/go/content/service/v1/category_grpc.pb.go b/blog-backend/gen/api/go/content/service/v1/category_grpc.pb.go index 32e697a0..ad67c3c0 100644 --- a/blog-backend/gen/api/go/content/service/v1/category_grpc.pb.go +++ b/blog-backend/gen/api/go/content/service/v1/category_grpc.pb.go @@ -4,15 +4,15 @@ // - protoc (unknown) // source: content/service/v1/category.proto -package v1 +package servicev1 import ( context "context" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" ) // This is a compile-time assertion to ensure that this generated file @@ -33,7 +33,7 @@ const ( // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type CategoryServiceClient interface { // 获取类别列表 - ListCategory(ctx context.Context, in *pagination.PagingRequest, opts ...grpc.CallOption) (*ListCategoryResponse, error) + ListCategory(ctx context.Context, in *v1.PagingRequest, opts ...grpc.CallOption) (*ListCategoryResponse, error) // 获取类别数据 GetCategory(ctx context.Context, in *GetCategoryRequest, opts ...grpc.CallOption) (*Category, error) // 创建类别 @@ -52,7 +52,7 @@ func NewCategoryServiceClient(cc grpc.ClientConnInterface) CategoryServiceClient return &categoryServiceClient{cc} } -func (c *categoryServiceClient) ListCategory(ctx context.Context, in *pagination.PagingRequest, opts ...grpc.CallOption) (*ListCategoryResponse, error) { +func (c *categoryServiceClient) ListCategory(ctx context.Context, in *v1.PagingRequest, opts ...grpc.CallOption) (*ListCategoryResponse, error) { out := new(ListCategoryResponse) err := c.cc.Invoke(ctx, CategoryService_ListCategory_FullMethodName, in, out, opts...) if err != nil { @@ -102,7 +102,7 @@ func (c *categoryServiceClient) DeleteCategory(ctx context.Context, in *DeleteCa // for forward compatibility type CategoryServiceServer interface { // 获取类别列表 - ListCategory(context.Context, *pagination.PagingRequest) (*ListCategoryResponse, error) + ListCategory(context.Context, *v1.PagingRequest) (*ListCategoryResponse, error) // 获取类别数据 GetCategory(context.Context, *GetCategoryRequest) (*Category, error) // 创建类别 @@ -118,7 +118,7 @@ type CategoryServiceServer interface { type UnimplementedCategoryServiceServer struct { } -func (UnimplementedCategoryServiceServer) ListCategory(context.Context, *pagination.PagingRequest) (*ListCategoryResponse, error) { +func (UnimplementedCategoryServiceServer) ListCategory(context.Context, *v1.PagingRequest) (*ListCategoryResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListCategory not implemented") } func (UnimplementedCategoryServiceServer) GetCategory(context.Context, *GetCategoryRequest) (*Category, error) { @@ -147,7 +147,7 @@ func RegisterCategoryServiceServer(s grpc.ServiceRegistrar, srv CategoryServiceS } func _CategoryService_ListCategory_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(pagination.PagingRequest) + in := new(v1.PagingRequest) if err := dec(in); err != nil { return nil, err } @@ -159,7 +159,7 @@ func _CategoryService_ListCategory_Handler(srv interface{}, ctx context.Context, FullMethod: CategoryService_ListCategory_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(CategoryServiceServer).ListCategory(ctx, req.(*pagination.PagingRequest)) + return srv.(CategoryServiceServer).ListCategory(ctx, req.(*v1.PagingRequest)) } return interceptor(ctx, in, info, handler) } diff --git a/blog-backend/gen/api/go/content/service/v1/link.pb.go b/blog-backend/gen/api/go/content/service/v1/link.pb.go index d5a2a71f..ded7de9a 100644 --- a/blog-backend/gen/api/go/content/service/v1/link.pb.go +++ b/blog-backend/gen/api/go/content/service/v1/link.pb.go @@ -4,13 +4,13 @@ // protoc (unknown) // source: content/service/v1/link.proto -package v1 +package servicev1 import ( + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" reflect "reflect" sync "sync" ) @@ -422,90 +422,99 @@ var file_content_service_v1_link_proto_rawDesc = []byte{ 0x12, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x1a, 0x22, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xe8, 0x02, 0x0a, 0x04, 0x4c, 0x69, 0x6e, 0x6b, 0x12, 0x0e, 0x0a, - 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x17, 0x0a, - 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x04, 0x6e, - 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x12, 0x15, 0x0a, 0x03, 0x75, 0x72, 0x6c, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x09, 0x48, 0x01, 0x52, 0x03, 0x75, 0x72, 0x6c, 0x88, 0x01, 0x01, 0x12, 0x17, 0x0a, - 0x04, 0x6c, 0x6f, 0x67, 0x6f, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x48, 0x02, 0x52, 0x04, 0x6c, - 0x6f, 0x67, 0x6f, 0x88, 0x01, 0x01, 0x12, 0x25, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, - 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x48, 0x03, 0x52, 0x0b, 0x64, - 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x17, 0x0a, - 0x04, 0x74, 0x65, 0x61, 0x6d, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x48, 0x04, 0x52, 0x04, 0x74, - 0x65, 0x61, 0x6d, 0x88, 0x01, 0x01, 0x12, 0x1f, 0x0a, 0x08, 0x70, 0x72, 0x69, 0x6f, 0x72, 0x69, - 0x74, 0x79, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x48, 0x05, 0x52, 0x08, 0x70, 0x72, 0x69, 0x6f, - 0x72, 0x69, 0x74, 0x79, 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, - 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x48, 0x06, 0x52, 0x0a, 0x63, - 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, 0x0a, - 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, - 0x48, 0x07, 0x52, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x88, 0x01, - 0x01, 0x42, 0x07, 0x0a, 0x05, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x42, 0x06, 0x0a, 0x04, 0x5f, 0x75, - 0x72, 0x6c, 0x42, 0x07, 0x0a, 0x05, 0x5f, 0x6c, 0x6f, 0x67, 0x6f, 0x42, 0x0e, 0x0a, 0x0c, 0x5f, - 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x07, 0x0a, 0x05, 0x5f, - 0x74, 0x65, 0x61, 0x6d, 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x70, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, - 0x79, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, - 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x22, - 0x58, 0x0a, 0x10, 0x4c, 0x69, 0x73, 0x74, 0x4c, 0x69, 0x6e, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, - 0x6e, 0x73, 0x65, 0x12, 0x2e, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, - 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x6e, 0x6b, 0x52, 0x05, 0x69, 0x74, - 0x65, 0x6d, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x22, 0x20, 0x0a, 0x0e, 0x47, 0x65, 0x74, - 0x4c, 0x69, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x22, 0x75, 0x0a, 0x11, 0x43, - 0x72, 0x65, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x12, 0x2c, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x6b, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, + 0x1a, 0x1e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x76, 0x31, 0x2f, + 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x22, 0xe8, 0x02, 0x0a, 0x04, 0x4c, 0x69, 0x6e, 0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x17, 0x0a, 0x04, 0x6e, 0x61, 0x6d, + 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x88, + 0x01, 0x01, 0x12, 0x15, 0x0a, 0x03, 0x75, 0x72, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, + 0x01, 0x52, 0x03, 0x75, 0x72, 0x6c, 0x88, 0x01, 0x01, 0x12, 0x17, 0x0a, 0x04, 0x6c, 0x6f, 0x67, + 0x6f, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x48, 0x02, 0x52, 0x04, 0x6c, 0x6f, 0x67, 0x6f, 0x88, + 0x01, 0x01, 0x12, 0x25, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, + 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x48, 0x03, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, + 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x17, 0x0a, 0x04, 0x74, 0x65, 0x61, + 0x6d, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x48, 0x04, 0x52, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x88, + 0x01, 0x01, 0x12, 0x1f, 0x0a, 0x08, 0x70, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x18, 0x07, + 0x20, 0x01, 0x28, 0x05, 0x48, 0x05, 0x52, 0x08, 0x70, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, + 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, + 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x48, 0x06, 0x52, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, + 0x65, 0x54, 0x69, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, 0x0a, 0x75, 0x70, 0x64, 0x61, + 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x48, 0x07, 0x52, 0x0a, + 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x42, 0x07, 0x0a, + 0x05, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x42, 0x06, 0x0a, 0x04, 0x5f, 0x75, 0x72, 0x6c, 0x42, 0x07, + 0x0a, 0x05, 0x5f, 0x6c, 0x6f, 0x67, 0x6f, 0x42, 0x0e, 0x0a, 0x0c, 0x5f, 0x64, 0x65, 0x73, 0x63, + 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x07, 0x0a, 0x05, 0x5f, 0x74, 0x65, 0x61, 0x6d, + 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x70, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x42, 0x0d, 0x0a, + 0x0b, 0x5f, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x42, 0x0d, 0x0a, 0x0b, + 0x5f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x58, 0x0a, 0x10, 0x4c, + 0x69, 0x73, 0x74, 0x4c, 0x69, 0x6e, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, + 0x2e, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, - 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x6e, 0x6b, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x6b, 0x12, 0x23, - 0x0a, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x0d, 0x48, 0x00, 0x52, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, - 0x88, 0x01, 0x01, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, - 0x49, 0x64, 0x22, 0x85, 0x01, 0x0a, 0x11, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6e, - 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x2c, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x6b, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, - 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x6e, 0x6b, - 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x6b, 0x12, 0x23, 0x0a, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, - 0x6f, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x00, 0x52, 0x0a, 0x6f, 0x70, - 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x88, 0x01, 0x01, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, - 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x22, 0x57, 0x0a, 0x11, 0x44, 0x65, - 0x6c, 0x65, 0x74, 0x65, 0x4c, 0x69, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, - 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, - 0x23, 0x0a, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x0d, 0x48, 0x00, 0x52, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, - 0x64, 0x88, 0x01, 0x01, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, - 0x72, 0x49, 0x64, 0x32, 0x98, 0x03, 0x0a, 0x0b, 0x4c, 0x69, 0x6e, 0x6b, 0x53, 0x65, 0x72, 0x76, - 0x69, 0x63, 0x65, 0x12, 0x4d, 0x0a, 0x08, 0x4c, 0x69, 0x73, 0x74, 0x4c, 0x69, 0x6e, 0x6b, 0x12, - 0x19, 0x2e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x50, 0x61, 0x67, - 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x63, 0x6f, 0x6e, + 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x6e, 0x6b, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x12, + 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, + 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x22, 0x20, 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x6e, 0x6b, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x22, 0x75, 0x0a, 0x11, 0x43, 0x72, 0x65, 0x61, 0x74, + 0x65, 0x4c, 0x69, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x2c, 0x0a, 0x04, + 0x6c, 0x69, 0x6e, 0x6b, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, - 0x4c, 0x69, 0x73, 0x74, 0x4c, 0x69, 0x6e, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x22, 0x00, 0x12, 0x49, 0x0a, 0x07, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x6e, 0x6b, 0x12, 0x22, 0x2e, - 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, - 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x1a, 0x18, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, - 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x6e, 0x6b, 0x22, 0x00, 0x12, 0x4f, 0x0a, - 0x0a, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6e, 0x6b, 0x12, 0x25, 0x2e, 0x63, 0x6f, - 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, - 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, - 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x6e, 0x6b, 0x22, 0x00, 0x12, 0x4f, - 0x0a, 0x0a, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6e, 0x6b, 0x12, 0x25, 0x2e, 0x63, - 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, - 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, - 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x6e, 0x6b, 0x22, 0x00, 0x12, - 0x4d, 0x0a, 0x0a, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4c, 0x69, 0x6e, 0x6b, 0x12, 0x25, 0x2e, + 0x4c, 0x69, 0x6e, 0x6b, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x6b, 0x12, 0x23, 0x0a, 0x0a, 0x6f, 0x70, + 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x00, + 0x52, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x88, 0x01, 0x01, 0x42, + 0x0d, 0x0a, 0x0b, 0x5f, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x22, 0x85, + 0x01, 0x0a, 0x11, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6e, 0x6b, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, + 0x52, 0x02, 0x69, 0x64, 0x12, 0x2c, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x6b, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, + 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x6e, 0x6b, 0x52, 0x04, 0x6c, 0x69, + 0x6e, 0x6b, 0x12, 0x23, 0x0a, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x00, 0x52, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, + 0x6f, 0x72, 0x49, 0x64, 0x88, 0x01, 0x01, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x6f, 0x70, 0x65, 0x72, + 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x22, 0x57, 0x0a, 0x11, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, + 0x4c, 0x69, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x23, 0x0a, 0x0a, 0x6f, + 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x48, + 0x00, 0x52, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x88, 0x01, 0x01, + 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x32, + 0x98, 0x03, 0x0a, 0x0b, 0x4c, 0x69, 0x6e, 0x6b, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, + 0x4d, 0x0a, 0x08, 0x4c, 0x69, 0x73, 0x74, 0x4c, 0x69, 0x6e, 0x6b, 0x12, 0x19, 0x2e, 0x70, 0x61, + 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, + 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, + 0x4c, 0x69, 0x6e, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x49, + 0x0a, 0x07, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x6e, 0x6b, 0x12, 0x22, 0x2e, 0x63, 0x6f, 0x6e, 0x74, + 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, + 0x65, 0x74, 0x4c, 0x69, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, - 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4c, 0x69, 0x6e, 0x6b, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x42, 0x2d, - 0x5a, 0x2b, 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x63, 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, - 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2f, - 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x76, 0x31, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x6e, 0x6b, 0x22, 0x00, 0x12, 0x4f, 0x0a, 0x0a, 0x43, 0x72, 0x65, + 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6e, 0x6b, 0x12, 0x25, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, + 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, + 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, + 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, + 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x6e, 0x6b, 0x22, 0x00, 0x12, 0x4f, 0x0a, 0x0a, 0x55, 0x70, + 0x64, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6e, 0x6b, 0x12, 0x25, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, + 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, + 0x64, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, + 0x18, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x6e, 0x6b, 0x22, 0x00, 0x12, 0x4d, 0x0a, 0x0a, 0x44, + 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4c, 0x69, 0x6e, 0x6b, 0x12, 0x25, 0x2e, 0x63, 0x6f, 0x6e, 0x74, + 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x44, + 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4c, 0x69, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, + 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x42, 0xc1, 0x01, 0x0a, 0x16, 0x63, + 0x6f, 0x6d, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, + 0x63, 0x65, 0x2e, 0x76, 0x31, 0x42, 0x09, 0x4c, 0x69, 0x6e, 0x6b, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x50, 0x01, 0x5a, 0x32, 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x63, 0x6d, 0x73, 0x2f, 0x67, + 0x65, 0x6e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, + 0x74, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x73, 0x65, 0x72, + 0x76, 0x69, 0x63, 0x65, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x43, 0x53, 0x58, 0xaa, 0x02, 0x12, 0x43, + 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x56, + 0x31, 0xca, 0x02, 0x12, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x5c, 0x53, 0x65, 0x72, 0x76, + 0x69, 0x63, 0x65, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, + 0x5c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, + 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x14, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, + 0x74, 0x3a, 0x3a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -522,14 +531,14 @@ func file_content_service_v1_link_proto_rawDescGZIP() []byte { var file_content_service_v1_link_proto_msgTypes = make([]protoimpl.MessageInfo, 6) var file_content_service_v1_link_proto_goTypes = []interface{}{ - (*Link)(nil), // 0: content.service.v1.Link - (*ListLinkResponse)(nil), // 1: content.service.v1.ListLinkResponse - (*GetLinkRequest)(nil), // 2: content.service.v1.GetLinkRequest - (*CreateLinkRequest)(nil), // 3: content.service.v1.CreateLinkRequest - (*UpdateLinkRequest)(nil), // 4: content.service.v1.UpdateLinkRequest - (*DeleteLinkRequest)(nil), // 5: content.service.v1.DeleteLinkRequest - (*pagination.PagingRequest)(nil), // 6: pagination.PagingRequest - (*emptypb.Empty)(nil), // 7: google.protobuf.Empty + (*Link)(nil), // 0: content.service.v1.Link + (*ListLinkResponse)(nil), // 1: content.service.v1.ListLinkResponse + (*GetLinkRequest)(nil), // 2: content.service.v1.GetLinkRequest + (*CreateLinkRequest)(nil), // 3: content.service.v1.CreateLinkRequest + (*UpdateLinkRequest)(nil), // 4: content.service.v1.UpdateLinkRequest + (*DeleteLinkRequest)(nil), // 5: content.service.v1.DeleteLinkRequest + (*v1.PagingRequest)(nil), // 6: pagination.PagingRequest + (*emptypb.Empty)(nil), // 7: google.protobuf.Empty } var file_content_service_v1_link_proto_depIdxs = []int32{ 0, // 0: content.service.v1.ListLinkResponse.items:type_name -> content.service.v1.Link diff --git a/blog-backend/gen/api/go/content/service/v1/link.pb.validate.go b/blog-backend/gen/api/go/content/service/v1/link.pb.validate.go index ef08b7f2..954dafa6 100644 --- a/blog-backend/gen/api/go/content/service/v1/link.pb.validate.go +++ b/blog-backend/gen/api/go/content/service/v1/link.pb.validate.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-validate. DO NOT EDIT. // source: content/service/v1/link.proto -package v1 +package servicev1 import ( "bytes" diff --git a/blog-backend/gen/api/go/content/service/v1/link_grpc.pb.go b/blog-backend/gen/api/go/content/service/v1/link_grpc.pb.go index fff93de9..253add51 100644 --- a/blog-backend/gen/api/go/content/service/v1/link_grpc.pb.go +++ b/blog-backend/gen/api/go/content/service/v1/link_grpc.pb.go @@ -4,15 +4,15 @@ // - protoc (unknown) // source: content/service/v1/link.proto -package v1 +package servicev1 import ( context "context" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" ) // This is a compile-time assertion to ensure that this generated file @@ -33,7 +33,7 @@ const ( // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type LinkServiceClient interface { // 获取链接列表 - ListLink(ctx context.Context, in *pagination.PagingRequest, opts ...grpc.CallOption) (*ListLinkResponse, error) + ListLink(ctx context.Context, in *v1.PagingRequest, opts ...grpc.CallOption) (*ListLinkResponse, error) // 获取链接数据 GetLink(ctx context.Context, in *GetLinkRequest, opts ...grpc.CallOption) (*Link, error) // 创建链接 @@ -52,7 +52,7 @@ func NewLinkServiceClient(cc grpc.ClientConnInterface) LinkServiceClient { return &linkServiceClient{cc} } -func (c *linkServiceClient) ListLink(ctx context.Context, in *pagination.PagingRequest, opts ...grpc.CallOption) (*ListLinkResponse, error) { +func (c *linkServiceClient) ListLink(ctx context.Context, in *v1.PagingRequest, opts ...grpc.CallOption) (*ListLinkResponse, error) { out := new(ListLinkResponse) err := c.cc.Invoke(ctx, LinkService_ListLink_FullMethodName, in, out, opts...) if err != nil { @@ -102,7 +102,7 @@ func (c *linkServiceClient) DeleteLink(ctx context.Context, in *DeleteLinkReques // for forward compatibility type LinkServiceServer interface { // 获取链接列表 - ListLink(context.Context, *pagination.PagingRequest) (*ListLinkResponse, error) + ListLink(context.Context, *v1.PagingRequest) (*ListLinkResponse, error) // 获取链接数据 GetLink(context.Context, *GetLinkRequest) (*Link, error) // 创建链接 @@ -118,7 +118,7 @@ type LinkServiceServer interface { type UnimplementedLinkServiceServer struct { } -func (UnimplementedLinkServiceServer) ListLink(context.Context, *pagination.PagingRequest) (*ListLinkResponse, error) { +func (UnimplementedLinkServiceServer) ListLink(context.Context, *v1.PagingRequest) (*ListLinkResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListLink not implemented") } func (UnimplementedLinkServiceServer) GetLink(context.Context, *GetLinkRequest) (*Link, error) { @@ -147,7 +147,7 @@ func RegisterLinkServiceServer(s grpc.ServiceRegistrar, srv LinkServiceServer) { } func _LinkService_ListLink_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(pagination.PagingRequest) + in := new(v1.PagingRequest) if err := dec(in); err != nil { return nil, err } @@ -159,7 +159,7 @@ func _LinkService_ListLink_Handler(srv interface{}, ctx context.Context, dec fun FullMethod: LinkService_ListLink_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(LinkServiceServer).ListLink(ctx, req.(*pagination.PagingRequest)) + return srv.(LinkServiceServer).ListLink(ctx, req.(*v1.PagingRequest)) } return interceptor(ctx, in, info, handler) } diff --git a/blog-backend/gen/api/go/content/service/v1/menu.pb.go b/blog-backend/gen/api/go/content/service/v1/menu.pb.go index e6ea59ed..cba88a8b 100644 --- a/blog-backend/gen/api/go/content/service/v1/menu.pb.go +++ b/blog-backend/gen/api/go/content/service/v1/menu.pb.go @@ -4,13 +4,13 @@ // protoc (unknown) // source: content/service/v1/menu.proto -package v1 +package servicev1 import ( + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" reflect "reflect" sync "sync" ) @@ -430,92 +430,101 @@ var file_content_service_v1_menu_proto_rawDesc = []byte{ 0x12, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x1a, 0x22, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x87, 0x03, 0x0a, 0x04, 0x4d, 0x65, 0x6e, 0x75, 0x12, 0x0e, 0x0a, - 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x17, 0x0a, - 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x04, 0x6e, - 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x12, 0x15, 0x0a, 0x03, 0x75, 0x72, 0x6c, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x09, 0x48, 0x01, 0x52, 0x03, 0x75, 0x72, 0x6c, 0x88, 0x01, 0x01, 0x12, 0x1f, 0x0a, - 0x08, 0x70, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x48, - 0x02, 0x52, 0x08, 0x70, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x88, 0x01, 0x01, 0x12, 0x1b, - 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x48, 0x03, - 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x88, 0x01, 0x01, 0x12, 0x17, 0x0a, 0x04, 0x69, - 0x63, 0x6f, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x48, 0x04, 0x52, 0x04, 0x69, 0x63, 0x6f, - 0x6e, 0x88, 0x01, 0x01, 0x12, 0x1f, 0x0a, 0x08, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x49, 0x64, - 0x18, 0x07, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x05, 0x52, 0x08, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, - 0x49, 0x64, 0x88, 0x01, 0x01, 0x12, 0x17, 0x0a, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x18, 0x08, 0x20, - 0x01, 0x28, 0x09, 0x48, 0x06, 0x52, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x88, 0x01, 0x01, 0x12, 0x23, - 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, - 0x28, 0x09, 0x48, 0x07, 0x52, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, - 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, - 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x48, 0x08, 0x52, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, - 0x65, 0x54, 0x69, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x42, 0x07, 0x0a, 0x05, 0x5f, 0x6e, 0x61, 0x6d, - 0x65, 0x42, 0x06, 0x0a, 0x04, 0x5f, 0x75, 0x72, 0x6c, 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x70, 0x72, - 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x74, 0x61, 0x72, 0x67, 0x65, - 0x74, 0x42, 0x07, 0x0a, 0x05, 0x5f, 0x69, 0x63, 0x6f, 0x6e, 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x70, - 0x61, 0x72, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x42, 0x07, 0x0a, 0x05, 0x5f, 0x74, 0x65, 0x61, 0x6d, - 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x42, - 0x0d, 0x0a, 0x0b, 0x5f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x58, - 0x0a, 0x10, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6e, 0x75, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, - 0x73, 0x65, 0x12, 0x2e, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, + 0x1a, 0x1e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x76, 0x31, 0x2f, + 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x22, 0x87, 0x03, 0x0a, 0x04, 0x4d, 0x65, 0x6e, 0x75, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x17, 0x0a, 0x04, 0x6e, 0x61, 0x6d, + 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x88, + 0x01, 0x01, 0x12, 0x15, 0x0a, 0x03, 0x75, 0x72, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, + 0x01, 0x52, 0x03, 0x75, 0x72, 0x6c, 0x88, 0x01, 0x01, 0x12, 0x1f, 0x0a, 0x08, 0x70, 0x72, 0x69, + 0x6f, 0x72, 0x69, 0x74, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x48, 0x02, 0x52, 0x08, 0x70, + 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x88, 0x01, 0x01, 0x12, 0x1b, 0x0a, 0x06, 0x74, 0x61, + 0x72, 0x67, 0x65, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x48, 0x03, 0x52, 0x06, 0x74, 0x61, + 0x72, 0x67, 0x65, 0x74, 0x88, 0x01, 0x01, 0x12, 0x17, 0x0a, 0x04, 0x69, 0x63, 0x6f, 0x6e, 0x18, + 0x06, 0x20, 0x01, 0x28, 0x09, 0x48, 0x04, 0x52, 0x04, 0x69, 0x63, 0x6f, 0x6e, 0x88, 0x01, 0x01, + 0x12, 0x1f, 0x0a, 0x08, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x07, 0x20, 0x01, + 0x28, 0x0d, 0x48, 0x05, 0x52, 0x08, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x88, 0x01, + 0x01, 0x12, 0x17, 0x0a, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x48, + 0x06, 0x52, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, 0x0a, 0x63, 0x72, + 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x48, 0x07, + 0x52, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x12, + 0x23, 0x0a, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0a, 0x20, + 0x01, 0x28, 0x09, 0x48, 0x08, 0x52, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, + 0x65, 0x88, 0x01, 0x01, 0x42, 0x07, 0x0a, 0x05, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x42, 0x06, 0x0a, + 0x04, 0x5f, 0x75, 0x72, 0x6c, 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x70, 0x72, 0x69, 0x6f, 0x72, 0x69, + 0x74, 0x79, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x42, 0x07, 0x0a, + 0x05, 0x5f, 0x69, 0x63, 0x6f, 0x6e, 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x70, 0x61, 0x72, 0x65, 0x6e, + 0x74, 0x49, 0x64, 0x42, 0x07, 0x0a, 0x05, 0x5f, 0x74, 0x65, 0x61, 0x6d, 0x42, 0x0d, 0x0a, 0x0b, + 0x5f, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, + 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x58, 0x0a, 0x10, 0x4c, 0x69, + 0x73, 0x74, 0x4d, 0x65, 0x6e, 0x75, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2e, + 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, + 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, + 0x76, 0x31, 0x2e, 0x4d, 0x65, 0x6e, 0x75, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x14, + 0x0a, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x74, + 0x6f, 0x74, 0x61, 0x6c, 0x22, 0x20, 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x4d, 0x65, 0x6e, 0x75, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x22, 0x75, 0x0a, 0x11, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, + 0x4d, 0x65, 0x6e, 0x75, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x2c, 0x0a, 0x04, 0x6d, + 0x65, 0x6e, 0x75, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x63, 0x6f, 0x6e, 0x74, + 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4d, + 0x65, 0x6e, 0x75, 0x52, 0x04, 0x6d, 0x65, 0x6e, 0x75, 0x12, 0x23, 0x0a, 0x0a, 0x6f, 0x70, 0x65, + 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x00, 0x52, + 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x88, 0x01, 0x01, 0x42, 0x0d, + 0x0a, 0x0b, 0x5f, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x22, 0x85, 0x01, + 0x0a, 0x11, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, + 0x02, 0x69, 0x64, 0x12, 0x2c, 0x0a, 0x04, 0x6d, 0x65, 0x6e, 0x75, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, - 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x65, 0x6e, 0x75, 0x52, 0x05, 0x69, 0x74, 0x65, - 0x6d, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x22, 0x20, 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x4d, + 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x65, 0x6e, 0x75, 0x52, 0x04, 0x6d, 0x65, 0x6e, + 0x75, 0x12, 0x23, 0x0a, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x00, 0x52, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, + 0x72, 0x49, 0x64, 0x88, 0x01, 0x01, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x6f, 0x70, 0x65, 0x72, 0x61, + 0x74, 0x6f, 0x72, 0x49, 0x64, 0x22, 0x57, 0x0a, 0x11, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x22, 0x75, 0x0a, 0x11, 0x43, 0x72, - 0x65, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, - 0x2c, 0x0a, 0x04, 0x6d, 0x65, 0x6e, 0x75, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, - 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, - 0x76, 0x31, 0x2e, 0x4d, 0x65, 0x6e, 0x75, 0x52, 0x04, 0x6d, 0x65, 0x6e, 0x75, 0x12, 0x23, 0x0a, - 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x0d, 0x48, 0x00, 0x52, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x88, - 0x01, 0x01, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, - 0x64, 0x22, 0x85, 0x01, 0x0a, 0x11, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6e, 0x75, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x2c, 0x0a, 0x04, 0x6d, 0x65, 0x6e, 0x75, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, - 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x65, 0x6e, 0x75, 0x52, - 0x04, 0x6d, 0x65, 0x6e, 0x75, 0x12, 0x23, 0x0a, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, - 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x00, 0x52, 0x0a, 0x6f, 0x70, 0x65, - 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x88, 0x01, 0x01, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x6f, - 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x22, 0x57, 0x0a, 0x11, 0x44, 0x65, 0x6c, - 0x65, 0x74, 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, - 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x23, - 0x0a, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x0d, 0x48, 0x00, 0x52, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, - 0x88, 0x01, 0x01, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, - 0x49, 0x64, 0x32, 0x98, 0x03, 0x0a, 0x0b, 0x4d, 0x65, 0x6e, 0x75, 0x53, 0x65, 0x72, 0x76, 0x69, - 0x63, 0x65, 0x12, 0x4d, 0x0a, 0x08, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6e, 0x75, 0x12, 0x19, - 0x2e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x50, 0x61, 0x67, 0x69, - 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x63, 0x6f, 0x6e, 0x74, - 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, - 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6e, 0x75, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, - 0x00, 0x12, 0x49, 0x0a, 0x07, 0x47, 0x65, 0x74, 0x4d, 0x65, 0x6e, 0x75, 0x12, 0x22, 0x2e, 0x63, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x23, 0x0a, 0x0a, 0x6f, 0x70, + 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x00, + 0x52, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x88, 0x01, 0x01, 0x42, + 0x0d, 0x0a, 0x0b, 0x5f, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x32, 0x98, + 0x03, 0x0a, 0x0b, 0x4d, 0x65, 0x6e, 0x75, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x4d, + 0x0a, 0x08, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6e, 0x75, 0x12, 0x19, 0x2e, 0x70, 0x61, 0x67, + 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, + 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4d, + 0x65, 0x6e, 0x75, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x49, 0x0a, + 0x07, 0x47, 0x65, 0x74, 0x4d, 0x65, 0x6e, 0x75, 0x12, 0x22, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, + 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, + 0x74, 0x4d, 0x65, 0x6e, 0x75, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, - 0x31, 0x2e, 0x47, 0x65, 0x74, 0x4d, 0x65, 0x6e, 0x75, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x1a, 0x18, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, - 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x65, 0x6e, 0x75, 0x22, 0x00, 0x12, 0x4f, 0x0a, 0x0a, - 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x12, 0x25, 0x2e, 0x63, 0x6f, 0x6e, - 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, - 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x1a, 0x18, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, - 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x65, 0x6e, 0x75, 0x22, 0x00, 0x12, 0x4f, 0x0a, - 0x0a, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x12, 0x25, 0x2e, 0x63, 0x6f, - 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, - 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, - 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x65, 0x6e, 0x75, 0x22, 0x00, 0x12, 0x4d, - 0x0a, 0x0a, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x12, 0x25, 0x2e, 0x63, - 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, - 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x42, 0x2d, 0x5a, - 0x2b, 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x63, 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, - 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2f, 0x73, - 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, + 0x31, 0x2e, 0x4d, 0x65, 0x6e, 0x75, 0x22, 0x00, 0x12, 0x4f, 0x0a, 0x0a, 0x43, 0x72, 0x65, 0x61, + 0x74, 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x12, 0x25, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, + 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, + 0x74, 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, + 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, + 0x76, 0x31, 0x2e, 0x4d, 0x65, 0x6e, 0x75, 0x22, 0x00, 0x12, 0x4f, 0x0a, 0x0a, 0x55, 0x70, 0x64, + 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x12, 0x25, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, + 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, + 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, + 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, + 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x65, 0x6e, 0x75, 0x22, 0x00, 0x12, 0x4d, 0x0a, 0x0a, 0x44, 0x65, + 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x12, 0x25, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, + 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, + 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, + 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, + 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x42, 0xc1, 0x01, 0x0a, 0x16, 0x63, 0x6f, + 0x6d, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x2e, 0x76, 0x31, 0x42, 0x09, 0x4d, 0x65, 0x6e, 0x75, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, + 0x01, 0x5a, 0x32, 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x63, 0x6d, 0x73, 0x2f, 0x67, 0x65, + 0x6e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, + 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x73, 0x65, 0x72, 0x76, + 0x69, 0x63, 0x65, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x43, 0x53, 0x58, 0xaa, 0x02, 0x12, 0x43, 0x6f, + 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x56, 0x31, + 0xca, 0x02, 0x12, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x5c, 0x53, 0x65, 0x72, 0x76, 0x69, + 0x63, 0x65, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x5c, + 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, + 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x14, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, + 0x3a, 0x3a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -532,14 +541,14 @@ func file_content_service_v1_menu_proto_rawDescGZIP() []byte { var file_content_service_v1_menu_proto_msgTypes = make([]protoimpl.MessageInfo, 6) var file_content_service_v1_menu_proto_goTypes = []interface{}{ - (*Menu)(nil), // 0: content.service.v1.Menu - (*ListMenuResponse)(nil), // 1: content.service.v1.ListMenuResponse - (*GetMenuRequest)(nil), // 2: content.service.v1.GetMenuRequest - (*CreateMenuRequest)(nil), // 3: content.service.v1.CreateMenuRequest - (*UpdateMenuRequest)(nil), // 4: content.service.v1.UpdateMenuRequest - (*DeleteMenuRequest)(nil), // 5: content.service.v1.DeleteMenuRequest - (*pagination.PagingRequest)(nil), // 6: pagination.PagingRequest - (*emptypb.Empty)(nil), // 7: google.protobuf.Empty + (*Menu)(nil), // 0: content.service.v1.Menu + (*ListMenuResponse)(nil), // 1: content.service.v1.ListMenuResponse + (*GetMenuRequest)(nil), // 2: content.service.v1.GetMenuRequest + (*CreateMenuRequest)(nil), // 3: content.service.v1.CreateMenuRequest + (*UpdateMenuRequest)(nil), // 4: content.service.v1.UpdateMenuRequest + (*DeleteMenuRequest)(nil), // 5: content.service.v1.DeleteMenuRequest + (*v1.PagingRequest)(nil), // 6: pagination.PagingRequest + (*emptypb.Empty)(nil), // 7: google.protobuf.Empty } var file_content_service_v1_menu_proto_depIdxs = []int32{ 0, // 0: content.service.v1.ListMenuResponse.items:type_name -> content.service.v1.Menu diff --git a/blog-backend/gen/api/go/content/service/v1/menu.pb.validate.go b/blog-backend/gen/api/go/content/service/v1/menu.pb.validate.go index 48aba63c..20c4918d 100644 --- a/blog-backend/gen/api/go/content/service/v1/menu.pb.validate.go +++ b/blog-backend/gen/api/go/content/service/v1/menu.pb.validate.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-validate. DO NOT EDIT. // source: content/service/v1/menu.proto -package v1 +package servicev1 import ( "bytes" diff --git a/blog-backend/gen/api/go/content/service/v1/menu_grpc.pb.go b/blog-backend/gen/api/go/content/service/v1/menu_grpc.pb.go index 41f7c557..3cd63ce8 100644 --- a/blog-backend/gen/api/go/content/service/v1/menu_grpc.pb.go +++ b/blog-backend/gen/api/go/content/service/v1/menu_grpc.pb.go @@ -4,15 +4,15 @@ // - protoc (unknown) // source: content/service/v1/menu.proto -package v1 +package servicev1 import ( context "context" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" ) // This is a compile-time assertion to ensure that this generated file @@ -33,7 +33,7 @@ const ( // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type MenuServiceClient interface { // 获取菜单列表 - ListMenu(ctx context.Context, in *pagination.PagingRequest, opts ...grpc.CallOption) (*ListMenuResponse, error) + ListMenu(ctx context.Context, in *v1.PagingRequest, opts ...grpc.CallOption) (*ListMenuResponse, error) // 获取菜单数据 GetMenu(ctx context.Context, in *GetMenuRequest, opts ...grpc.CallOption) (*Menu, error) // 创建菜单 @@ -52,7 +52,7 @@ func NewMenuServiceClient(cc grpc.ClientConnInterface) MenuServiceClient { return &menuServiceClient{cc} } -func (c *menuServiceClient) ListMenu(ctx context.Context, in *pagination.PagingRequest, opts ...grpc.CallOption) (*ListMenuResponse, error) { +func (c *menuServiceClient) ListMenu(ctx context.Context, in *v1.PagingRequest, opts ...grpc.CallOption) (*ListMenuResponse, error) { out := new(ListMenuResponse) err := c.cc.Invoke(ctx, MenuService_ListMenu_FullMethodName, in, out, opts...) if err != nil { @@ -102,7 +102,7 @@ func (c *menuServiceClient) DeleteMenu(ctx context.Context, in *DeleteMenuReques // for forward compatibility type MenuServiceServer interface { // 获取菜单列表 - ListMenu(context.Context, *pagination.PagingRequest) (*ListMenuResponse, error) + ListMenu(context.Context, *v1.PagingRequest) (*ListMenuResponse, error) // 获取菜单数据 GetMenu(context.Context, *GetMenuRequest) (*Menu, error) // 创建菜单 @@ -118,7 +118,7 @@ type MenuServiceServer interface { type UnimplementedMenuServiceServer struct { } -func (UnimplementedMenuServiceServer) ListMenu(context.Context, *pagination.PagingRequest) (*ListMenuResponse, error) { +func (UnimplementedMenuServiceServer) ListMenu(context.Context, *v1.PagingRequest) (*ListMenuResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListMenu not implemented") } func (UnimplementedMenuServiceServer) GetMenu(context.Context, *GetMenuRequest) (*Menu, error) { @@ -147,7 +147,7 @@ func RegisterMenuServiceServer(s grpc.ServiceRegistrar, srv MenuServiceServer) { } func _MenuService_ListMenu_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(pagination.PagingRequest) + in := new(v1.PagingRequest) if err := dec(in); err != nil { return nil, err } @@ -159,7 +159,7 @@ func _MenuService_ListMenu_Handler(srv interface{}, ctx context.Context, dec fun FullMethod: MenuService_ListMenu_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MenuServiceServer).ListMenu(ctx, req.(*pagination.PagingRequest)) + return srv.(MenuServiceServer).ListMenu(ctx, req.(*v1.PagingRequest)) } return interceptor(ctx, in, info, handler) } diff --git a/blog-backend/gen/api/go/content/service/v1/photo.pb.go b/blog-backend/gen/api/go/content/service/v1/photo.pb.go index fa0165fe..e3fe76a5 100644 --- a/blog-backend/gen/api/go/content/service/v1/photo.pb.go +++ b/blog-backend/gen/api/go/content/service/v1/photo.pb.go @@ -4,13 +4,13 @@ // protoc (unknown) // source: content/service/v1/photo.proto -package v1 +package servicev1 import ( + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" reflect "reflect" sync "sync" ) @@ -430,94 +430,104 @@ var file_content_service_v1_photo_proto_rawDesc = []byte{ 0x12, 0x12, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x1a, 0x22, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x97, 0x03, 0x0a, 0x05, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x12, - 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, - 0x17, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, - 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x12, 0x21, 0x0a, 0x09, 0x74, 0x68, 0x75, 0x6d, - 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, 0x01, 0x52, 0x09, 0x74, - 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x88, 0x01, 0x01, 0x12, 0x15, 0x0a, 0x03, 0x75, - 0x72, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x48, 0x02, 0x52, 0x03, 0x75, 0x72, 0x6c, 0x88, - 0x01, 0x01, 0x12, 0x17, 0x0a, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, - 0x48, 0x03, 0x52, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x88, 0x01, 0x01, 0x12, 0x1f, 0x0a, 0x08, 0x6c, - 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x48, 0x04, 0x52, - 0x08, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x25, 0x0a, 0x0b, - 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x08, 0x20, 0x01, 0x28, - 0x09, 0x48, 0x05, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, - 0x88, 0x01, 0x01, 0x12, 0x19, 0x0a, 0x05, 0x6c, 0x69, 0x6b, 0x65, 0x73, 0x18, 0x09, 0x20, 0x01, - 0x28, 0x05, 0x48, 0x06, 0x52, 0x05, 0x6c, 0x69, 0x6b, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x1f, - 0x0a, 0x08, 0x74, 0x61, 0x6b, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, - 0x48, 0x07, 0x52, 0x08, 0x74, 0x61, 0x6b, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x12, - 0x23, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0b, 0x20, - 0x01, 0x28, 0x09, 0x48, 0x08, 0x52, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, - 0x65, 0x88, 0x01, 0x01, 0x42, 0x07, 0x0a, 0x05, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x42, 0x0c, 0x0a, - 0x0a, 0x5f, 0x74, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x42, 0x06, 0x0a, 0x04, 0x5f, - 0x75, 0x72, 0x6c, 0x42, 0x07, 0x0a, 0x05, 0x5f, 0x74, 0x65, 0x61, 0x6d, 0x42, 0x0b, 0x0a, 0x09, - 0x5f, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x0e, 0x0a, 0x0c, 0x5f, 0x64, 0x65, - 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x08, 0x0a, 0x06, 0x5f, 0x6c, 0x69, - 0x6b, 0x65, 0x73, 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x74, 0x61, 0x6b, 0x65, 0x54, 0x69, 0x6d, 0x65, - 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x22, - 0x5a, 0x0a, 0x11, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2f, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x01, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, - 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x52, 0x05, - 0x69, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x22, 0x21, 0x0a, 0x0f, 0x47, - 0x65, 0x74, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, - 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x22, 0x79, - 0x0a, 0x12, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x12, 0x2f, 0x0a, 0x05, 0x70, 0x68, 0x6f, 0x74, 0x6f, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, - 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x52, 0x05, - 0x70, 0x68, 0x6f, 0x74, 0x6f, 0x12, 0x23, 0x0a, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, - 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x00, 0x52, 0x0a, 0x6f, 0x70, 0x65, - 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x88, 0x01, 0x01, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x6f, - 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x22, 0x89, 0x01, 0x0a, 0x12, 0x55, 0x70, - 0x64, 0x61, 0x74, 0x65, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, - 0x12, 0x2f, 0x0a, 0x05, 0x70, 0x68, 0x6f, 0x74, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x6f, 0x1a, 0x1e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x76, 0x31, + 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x22, 0x97, 0x03, 0x0a, 0x05, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x17, 0x0a, 0x04, 0x6e, + 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x04, 0x6e, 0x61, 0x6d, + 0x65, 0x88, 0x01, 0x01, 0x12, 0x21, 0x0a, 0x09, 0x74, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, + 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, 0x01, 0x52, 0x09, 0x74, 0x68, 0x75, 0x6d, 0x62, + 0x6e, 0x61, 0x69, 0x6c, 0x88, 0x01, 0x01, 0x12, 0x15, 0x0a, 0x03, 0x75, 0x72, 0x6c, 0x18, 0x05, + 0x20, 0x01, 0x28, 0x09, 0x48, 0x02, 0x52, 0x03, 0x75, 0x72, 0x6c, 0x88, 0x01, 0x01, 0x12, 0x17, + 0x0a, 0x04, 0x74, 0x65, 0x61, 0x6d, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x48, 0x03, 0x52, 0x04, + 0x74, 0x65, 0x61, 0x6d, 0x88, 0x01, 0x01, 0x12, 0x1f, 0x0a, 0x08, 0x6c, 0x6f, 0x63, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x48, 0x04, 0x52, 0x08, 0x6c, 0x6f, 0x63, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x25, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, + 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x48, 0x05, 0x52, + 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x88, 0x01, 0x01, 0x12, + 0x19, 0x0a, 0x05, 0x6c, 0x69, 0x6b, 0x65, 0x73, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x48, 0x06, + 0x52, 0x05, 0x6c, 0x69, 0x6b, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x1f, 0x0a, 0x08, 0x74, 0x61, + 0x6b, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x48, 0x07, 0x52, 0x08, + 0x74, 0x61, 0x6b, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, 0x0a, 0x63, + 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x48, + 0x08, 0x52, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x88, 0x01, 0x01, + 0x42, 0x07, 0x0a, 0x05, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x74, 0x68, + 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x42, 0x06, 0x0a, 0x04, 0x5f, 0x75, 0x72, 0x6c, 0x42, + 0x07, 0x0a, 0x05, 0x5f, 0x74, 0x65, 0x61, 0x6d, 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x6c, 0x6f, 0x63, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x0e, 0x0a, 0x0c, 0x5f, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, + 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x08, 0x0a, 0x06, 0x5f, 0x6c, 0x69, 0x6b, 0x65, 0x73, 0x42, + 0x0b, 0x0a, 0x09, 0x5f, 0x74, 0x61, 0x6b, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x42, 0x0d, 0x0a, 0x0b, + 0x5f, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x5a, 0x0a, 0x11, 0x4c, + 0x69, 0x73, 0x74, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, + 0x12, 0x2f, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x19, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, + 0x73, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x22, 0x21, 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x50, 0x68, + 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x22, 0x79, 0x0a, 0x12, 0x43, 0x72, + 0x65, 0x61, 0x74, 0x65, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x12, 0x2f, 0x0a, 0x05, 0x70, 0x68, 0x6f, 0x74, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x52, 0x05, 0x70, 0x68, 0x6f, 0x74, 0x6f, 0x12, 0x23, 0x0a, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x00, 0x52, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, + 0x02, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x00, 0x52, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x88, 0x01, 0x01, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x6f, 0x70, 0x65, 0x72, 0x61, - 0x74, 0x6f, 0x72, 0x49, 0x64, 0x22, 0x58, 0x0a, 0x12, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x50, - 0x68, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x23, 0x0a, 0x0a, 0x6f, - 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x48, - 0x00, 0x52, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x88, 0x01, 0x01, - 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x32, - 0xa6, 0x03, 0x0a, 0x0c, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, - 0x12, 0x4f, 0x0a, 0x09, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x12, 0x19, 0x2e, - 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x50, 0x61, 0x67, 0x69, 0x6e, - 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x25, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, - 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, - 0x73, 0x74, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, - 0x00, 0x12, 0x4c, 0x0a, 0x08, 0x47, 0x65, 0x74, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x12, 0x23, 0x2e, - 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, - 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, + 0x74, 0x6f, 0x72, 0x49, 0x64, 0x22, 0x89, 0x01, 0x0a, 0x12, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, + 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, + 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x2f, 0x0a, 0x05, + 0x70, 0x68, 0x6f, 0x74, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x63, 0x6f, + 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, + 0x2e, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x52, 0x05, 0x70, 0x68, 0x6f, 0x74, 0x6f, 0x12, 0x23, 0x0a, + 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x0d, 0x48, 0x00, 0x52, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x88, + 0x01, 0x01, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, + 0x64, 0x22, 0x58, 0x0a, 0x12, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x50, 0x68, 0x6f, 0x74, 0x6f, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x23, 0x0a, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, + 0x74, 0x6f, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x00, 0x52, 0x0a, 0x6f, + 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x88, 0x01, 0x01, 0x42, 0x0d, 0x0a, 0x0b, + 0x5f, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x32, 0xa6, 0x03, 0x0a, 0x0c, + 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x4f, 0x0a, 0x09, + 0x4c, 0x69, 0x73, 0x74, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x12, 0x19, 0x2e, 0x70, 0x61, 0x67, 0x69, + 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x1a, 0x25, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, + 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x68, + 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x4c, 0x0a, + 0x08, 0x47, 0x65, 0x74, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x12, 0x23, 0x2e, 0x63, 0x6f, 0x6e, 0x74, + 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, + 0x65, 0x74, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x19, + 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, + 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x22, 0x00, 0x12, 0x52, 0x0a, 0x0b, 0x43, + 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x12, 0x26, 0x2e, 0x63, 0x6f, 0x6e, + 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, + 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x19, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x22, 0x00, 0x12, - 0x52, 0x0a, 0x0b, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x12, 0x26, + 0x52, 0x0a, 0x0b, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x12, 0x26, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, - 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x52, + 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x19, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x68, 0x6f, 0x74, - 0x6f, 0x22, 0x00, 0x12, 0x52, 0x0a, 0x0b, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x68, 0x6f, + 0x6f, 0x22, 0x00, 0x12, 0x4f, 0x0a, 0x0b, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x12, 0x26, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, - 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x68, - 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x19, 0x2e, 0x63, 0x6f, 0x6e, - 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, - 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x22, 0x00, 0x12, 0x4f, 0x0a, 0x0b, 0x44, 0x65, 0x6c, 0x65, 0x74, - 0x65, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x12, 0x26, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, - 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, - 0x74, 0x65, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, - 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, - 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x42, 0x2d, 0x5a, 0x2b, 0x6b, 0x72, 0x61, 0x74, - 0x6f, 0x73, 0x2d, 0x63, 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, - 0x6f, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, - 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x50, 0x68, + 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, + 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, + 0x74, 0x79, 0x22, 0x00, 0x42, 0xc2, 0x01, 0x0a, 0x16, 0x63, 0x6f, 0x6d, 0x2e, 0x63, 0x6f, 0x6e, + 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x42, + 0x0a, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x32, 0x6b, + 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x63, 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x70, + 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2f, 0x73, 0x65, 0x72, + 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x76, + 0x31, 0xa2, 0x02, 0x03, 0x43, 0x53, 0x58, 0xaa, 0x02, 0x12, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, + 0x74, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x12, 0x43, + 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x5c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x56, + 0x31, 0xe2, 0x02, 0x1e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x5c, 0x53, 0x65, 0x72, 0x76, + 0x69, 0x63, 0x65, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, + 0x74, 0x61, 0xea, 0x02, 0x14, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x3a, 0x3a, 0x53, 0x65, + 0x72, 0x76, 0x69, 0x63, 0x65, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, } var ( @@ -534,14 +544,14 @@ func file_content_service_v1_photo_proto_rawDescGZIP() []byte { var file_content_service_v1_photo_proto_msgTypes = make([]protoimpl.MessageInfo, 6) var file_content_service_v1_photo_proto_goTypes = []interface{}{ - (*Photo)(nil), // 0: content.service.v1.Photo - (*ListPhotoResponse)(nil), // 1: content.service.v1.ListPhotoResponse - (*GetPhotoRequest)(nil), // 2: content.service.v1.GetPhotoRequest - (*CreatePhotoRequest)(nil), // 3: content.service.v1.CreatePhotoRequest - (*UpdatePhotoRequest)(nil), // 4: content.service.v1.UpdatePhotoRequest - (*DeletePhotoRequest)(nil), // 5: content.service.v1.DeletePhotoRequest - (*pagination.PagingRequest)(nil), // 6: pagination.PagingRequest - (*emptypb.Empty)(nil), // 7: google.protobuf.Empty + (*Photo)(nil), // 0: content.service.v1.Photo + (*ListPhotoResponse)(nil), // 1: content.service.v1.ListPhotoResponse + (*GetPhotoRequest)(nil), // 2: content.service.v1.GetPhotoRequest + (*CreatePhotoRequest)(nil), // 3: content.service.v1.CreatePhotoRequest + (*UpdatePhotoRequest)(nil), // 4: content.service.v1.UpdatePhotoRequest + (*DeletePhotoRequest)(nil), // 5: content.service.v1.DeletePhotoRequest + (*v1.PagingRequest)(nil), // 6: pagination.PagingRequest + (*emptypb.Empty)(nil), // 7: google.protobuf.Empty } var file_content_service_v1_photo_proto_depIdxs = []int32{ 0, // 0: content.service.v1.ListPhotoResponse.items:type_name -> content.service.v1.Photo diff --git a/blog-backend/gen/api/go/content/service/v1/photo.pb.validate.go b/blog-backend/gen/api/go/content/service/v1/photo.pb.validate.go index 62292b5a..f10f985c 100644 --- a/blog-backend/gen/api/go/content/service/v1/photo.pb.validate.go +++ b/blog-backend/gen/api/go/content/service/v1/photo.pb.validate.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-validate. DO NOT EDIT. // source: content/service/v1/photo.proto -package v1 +package servicev1 import ( "bytes" diff --git a/blog-backend/gen/api/go/content/service/v1/photo_grpc.pb.go b/blog-backend/gen/api/go/content/service/v1/photo_grpc.pb.go index 772eea5a..fc2106ea 100644 --- a/blog-backend/gen/api/go/content/service/v1/photo_grpc.pb.go +++ b/blog-backend/gen/api/go/content/service/v1/photo_grpc.pb.go @@ -4,15 +4,15 @@ // - protoc (unknown) // source: content/service/v1/photo.proto -package v1 +package servicev1 import ( context "context" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" ) // This is a compile-time assertion to ensure that this generated file @@ -33,7 +33,7 @@ const ( // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type PhotoServiceClient interface { // 获取照片列表 - ListPhoto(ctx context.Context, in *pagination.PagingRequest, opts ...grpc.CallOption) (*ListPhotoResponse, error) + ListPhoto(ctx context.Context, in *v1.PagingRequest, opts ...grpc.CallOption) (*ListPhotoResponse, error) // 获取照片数据 GetPhoto(ctx context.Context, in *GetPhotoRequest, opts ...grpc.CallOption) (*Photo, error) // 创建照片 @@ -52,7 +52,7 @@ func NewPhotoServiceClient(cc grpc.ClientConnInterface) PhotoServiceClient { return &photoServiceClient{cc} } -func (c *photoServiceClient) ListPhoto(ctx context.Context, in *pagination.PagingRequest, opts ...grpc.CallOption) (*ListPhotoResponse, error) { +func (c *photoServiceClient) ListPhoto(ctx context.Context, in *v1.PagingRequest, opts ...grpc.CallOption) (*ListPhotoResponse, error) { out := new(ListPhotoResponse) err := c.cc.Invoke(ctx, PhotoService_ListPhoto_FullMethodName, in, out, opts...) if err != nil { @@ -102,7 +102,7 @@ func (c *photoServiceClient) DeletePhoto(ctx context.Context, in *DeletePhotoReq // for forward compatibility type PhotoServiceServer interface { // 获取照片列表 - ListPhoto(context.Context, *pagination.PagingRequest) (*ListPhotoResponse, error) + ListPhoto(context.Context, *v1.PagingRequest) (*ListPhotoResponse, error) // 获取照片数据 GetPhoto(context.Context, *GetPhotoRequest) (*Photo, error) // 创建照片 @@ -118,7 +118,7 @@ type PhotoServiceServer interface { type UnimplementedPhotoServiceServer struct { } -func (UnimplementedPhotoServiceServer) ListPhoto(context.Context, *pagination.PagingRequest) (*ListPhotoResponse, error) { +func (UnimplementedPhotoServiceServer) ListPhoto(context.Context, *v1.PagingRequest) (*ListPhotoResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListPhoto not implemented") } func (UnimplementedPhotoServiceServer) GetPhoto(context.Context, *GetPhotoRequest) (*Photo, error) { @@ -147,7 +147,7 @@ func RegisterPhotoServiceServer(s grpc.ServiceRegistrar, srv PhotoServiceServer) } func _PhotoService_ListPhoto_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(pagination.PagingRequest) + in := new(v1.PagingRequest) if err := dec(in); err != nil { return nil, err } @@ -159,7 +159,7 @@ func _PhotoService_ListPhoto_Handler(srv interface{}, ctx context.Context, dec f FullMethod: PhotoService_ListPhoto_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(PhotoServiceServer).ListPhoto(ctx, req.(*pagination.PagingRequest)) + return srv.(PhotoServiceServer).ListPhoto(ctx, req.(*v1.PagingRequest)) } return interceptor(ctx, in, info, handler) } diff --git a/blog-backend/gen/api/go/content/service/v1/post.pb.go b/blog-backend/gen/api/go/content/service/v1/post.pb.go index 8e0106df..c49a2ff2 100644 --- a/blog-backend/gen/api/go/content/service/v1/post.pb.go +++ b/blog-backend/gen/api/go/content/service/v1/post.pb.go @@ -4,13 +4,13 @@ // protoc (unknown) // source: content/service/v1/post.proto -package v1 +package servicev1 import ( + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" reflect "reflect" sync "sync" ) @@ -542,140 +542,149 @@ var file_content_service_v1_post_proto_rawDesc = []byte{ 0x12, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x1a, 0x22, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x86, 0x09, 0x0a, 0x04, 0x50, 0x6f, 0x73, 0x74, 0x12, 0x0e, 0x0a, - 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x19, 0x0a, - 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x05, - 0x74, 0x69, 0x74, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x12, 0x1b, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, - 0x75, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x48, 0x01, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, - 0x75, 0x73, 0x88, 0x01, 0x01, 0x12, 0x17, 0x0a, 0x04, 0x73, 0x6c, 0x75, 0x67, 0x18, 0x04, 0x20, - 0x01, 0x28, 0x09, 0x48, 0x02, 0x52, 0x04, 0x73, 0x6c, 0x75, 0x67, 0x88, 0x01, 0x01, 0x12, 0x23, - 0x0a, 0x0a, 0x65, 0x64, 0x69, 0x74, 0x6f, 0x72, 0x54, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01, - 0x28, 0x05, 0x48, 0x03, 0x52, 0x0a, 0x65, 0x64, 0x69, 0x74, 0x6f, 0x72, 0x54, 0x79, 0x70, 0x65, - 0x88, 0x01, 0x01, 0x12, 0x27, 0x0a, 0x0c, 0x6d, 0x65, 0x74, 0x61, 0x4b, 0x65, 0x79, 0x77, 0x6f, - 0x72, 0x64, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x48, 0x04, 0x52, 0x0c, 0x6d, 0x65, 0x74, - 0x61, 0x4b, 0x65, 0x79, 0x77, 0x6f, 0x72, 0x64, 0x73, 0x88, 0x01, 0x01, 0x12, 0x2d, 0x0a, 0x0f, - 0x6d, 0x65, 0x74, 0x61, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, - 0x07, 0x20, 0x01, 0x28, 0x09, 0x48, 0x05, 0x52, 0x0f, 0x6d, 0x65, 0x74, 0x61, 0x44, 0x65, 0x73, - 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x1f, 0x0a, 0x08, 0x66, - 0x75, 0x6c, 0x6c, 0x50, 0x61, 0x74, 0x68, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x48, 0x06, 0x52, - 0x08, 0x66, 0x75, 0x6c, 0x6c, 0x50, 0x61, 0x74, 0x68, 0x88, 0x01, 0x01, 0x12, 0x1d, 0x0a, 0x07, - 0x73, 0x75, 0x6d, 0x6d, 0x61, 0x72, 0x79, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x48, 0x07, 0x52, - 0x07, 0x73, 0x75, 0x6d, 0x6d, 0x61, 0x72, 0x79, 0x88, 0x01, 0x01, 0x12, 0x21, 0x0a, 0x09, 0x74, - 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x48, 0x08, - 0x52, 0x09, 0x74, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x88, 0x01, 0x01, 0x12, 0x1f, - 0x0a, 0x08, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, - 0x48, 0x09, 0x52, 0x08, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x88, 0x01, 0x01, 0x12, - 0x1f, 0x0a, 0x08, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, - 0x09, 0x48, 0x0a, 0x52, 0x08, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x88, 0x01, 0x01, - 0x12, 0x1d, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x0d, 0x20, 0x01, 0x28, - 0x09, 0x48, 0x0b, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x88, 0x01, 0x01, 0x12, - 0x2d, 0x0a, 0x0f, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x6c, 0x43, 0x6f, 0x6e, 0x74, 0x65, - 0x6e, 0x74, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x48, 0x0c, 0x52, 0x0f, 0x6f, 0x72, 0x69, 0x67, - 0x69, 0x6e, 0x61, 0x6c, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x88, 0x01, 0x01, 0x12, 0x1b, - 0x0a, 0x06, 0x76, 0x69, 0x73, 0x69, 0x74, 0x73, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x05, 0x48, 0x0d, - 0x52, 0x06, 0x76, 0x69, 0x73, 0x69, 0x74, 0x73, 0x88, 0x01, 0x01, 0x12, 0x25, 0x0a, 0x0b, 0x74, - 0x6f, 0x70, 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x18, 0x10, 0x20, 0x01, 0x28, 0x05, - 0x48, 0x0e, 0x52, 0x0b, 0x74, 0x6f, 0x70, 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x88, - 0x01, 0x01, 0x12, 0x19, 0x0a, 0x05, 0x6c, 0x69, 0x6b, 0x65, 0x73, 0x18, 0x11, 0x20, 0x01, 0x28, - 0x05, 0x48, 0x0f, 0x52, 0x05, 0x6c, 0x69, 0x6b, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x21, 0x0a, - 0x09, 0x77, 0x6f, 0x72, 0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x12, 0x20, 0x01, 0x28, 0x05, - 0x48, 0x10, 0x52, 0x09, 0x77, 0x6f, 0x72, 0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x88, 0x01, 0x01, - 0x12, 0x27, 0x0a, 0x0c, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x43, 0x6f, 0x75, 0x6e, 0x74, - 0x18, 0x13, 0x20, 0x01, 0x28, 0x05, 0x48, 0x11, 0x52, 0x0c, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, - 0x74, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x88, 0x01, 0x01, 0x12, 0x2d, 0x0a, 0x0f, 0x64, 0x69, 0x73, - 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x14, 0x20, 0x01, - 0x28, 0x08, 0x48, 0x12, 0x52, 0x0f, 0x64, 0x69, 0x73, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x43, 0x6f, - 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, 0x0a, 0x69, 0x6e, 0x50, 0x72, - 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x18, 0x15, 0x20, 0x01, 0x28, 0x08, 0x48, 0x13, 0x52, 0x0a, - 0x69, 0x6e, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, - 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x16, 0x20, 0x01, 0x28, - 0x09, 0x48, 0x14, 0x52, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x88, - 0x01, 0x01, 0x12, 0x23, 0x0a, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, - 0x18, 0x17, 0x20, 0x01, 0x28, 0x09, 0x48, 0x15, 0x52, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, - 0x54, 0x69, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x12, 0x1f, 0x0a, 0x08, 0x65, 0x64, 0x69, 0x74, 0x54, - 0x69, 0x6d, 0x65, 0x18, 0x18, 0x20, 0x01, 0x28, 0x09, 0x48, 0x16, 0x52, 0x08, 0x65, 0x64, 0x69, - 0x74, 0x54, 0x69, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x42, 0x08, 0x0a, 0x06, 0x5f, 0x74, 0x69, 0x74, - 0x6c, 0x65, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x42, 0x07, 0x0a, - 0x05, 0x5f, 0x73, 0x6c, 0x75, 0x67, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x65, 0x64, 0x69, 0x74, 0x6f, - 0x72, 0x54, 0x79, 0x70, 0x65, 0x42, 0x0f, 0x0a, 0x0d, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x4b, 0x65, - 0x79, 0x77, 0x6f, 0x72, 0x64, 0x73, 0x42, 0x12, 0x0a, 0x10, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x44, - 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x66, - 0x75, 0x6c, 0x6c, 0x50, 0x61, 0x74, 0x68, 0x42, 0x0a, 0x0a, 0x08, 0x5f, 0x73, 0x75, 0x6d, 0x6d, - 0x61, 0x72, 0x79, 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x74, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, - 0x6c, 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x0b, - 0x0a, 0x09, 0x5f, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x42, 0x0a, 0x0a, 0x08, 0x5f, - 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x42, 0x12, 0x0a, 0x10, 0x5f, 0x6f, 0x72, 0x69, 0x67, - 0x69, 0x6e, 0x61, 0x6c, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x42, 0x09, 0x0a, 0x07, 0x5f, - 0x76, 0x69, 0x73, 0x69, 0x74, 0x73, 0x42, 0x0e, 0x0a, 0x0c, 0x5f, 0x74, 0x6f, 0x70, 0x50, 0x72, - 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x42, 0x08, 0x0a, 0x06, 0x5f, 0x6c, 0x69, 0x6b, 0x65, 0x73, - 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x77, 0x6f, 0x72, 0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x0f, - 0x0a, 0x0d, 0x5f, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x42, - 0x12, 0x0a, 0x10, 0x5f, 0x64, 0x69, 0x73, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x43, 0x6f, 0x6d, 0x6d, - 0x65, 0x6e, 0x74, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x69, 0x6e, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, - 0x73, 0x73, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, - 0x65, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, - 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x65, 0x64, 0x69, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x58, 0x0a, - 0x10, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x6f, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, - 0x65, 0x12, 0x2e, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, + 0x1a, 0x1e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x76, 0x31, 0x2f, + 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x22, 0x86, 0x09, 0x0a, 0x04, 0x50, 0x6f, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x19, 0x0a, 0x05, 0x74, 0x69, 0x74, + 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, + 0x65, 0x88, 0x01, 0x01, 0x12, 0x1b, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x03, + 0x20, 0x01, 0x28, 0x05, 0x48, 0x01, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x88, 0x01, + 0x01, 0x12, 0x17, 0x0a, 0x04, 0x73, 0x6c, 0x75, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x48, + 0x02, 0x52, 0x04, 0x73, 0x6c, 0x75, 0x67, 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, 0x0a, 0x65, 0x64, + 0x69, 0x74, 0x6f, 0x72, 0x54, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x48, 0x03, + 0x52, 0x0a, 0x65, 0x64, 0x69, 0x74, 0x6f, 0x72, 0x54, 0x79, 0x70, 0x65, 0x88, 0x01, 0x01, 0x12, + 0x27, 0x0a, 0x0c, 0x6d, 0x65, 0x74, 0x61, 0x4b, 0x65, 0x79, 0x77, 0x6f, 0x72, 0x64, 0x73, 0x18, + 0x06, 0x20, 0x01, 0x28, 0x09, 0x48, 0x04, 0x52, 0x0c, 0x6d, 0x65, 0x74, 0x61, 0x4b, 0x65, 0x79, + 0x77, 0x6f, 0x72, 0x64, 0x73, 0x88, 0x01, 0x01, 0x12, 0x2d, 0x0a, 0x0f, 0x6d, 0x65, 0x74, 0x61, + 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, + 0x09, 0x48, 0x05, 0x52, 0x0f, 0x6d, 0x65, 0x74, 0x61, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, + 0x74, 0x69, 0x6f, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x1f, 0x0a, 0x08, 0x66, 0x75, 0x6c, 0x6c, 0x50, + 0x61, 0x74, 0x68, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x48, 0x06, 0x52, 0x08, 0x66, 0x75, 0x6c, + 0x6c, 0x50, 0x61, 0x74, 0x68, 0x88, 0x01, 0x01, 0x12, 0x1d, 0x0a, 0x07, 0x73, 0x75, 0x6d, 0x6d, + 0x61, 0x72, 0x79, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x48, 0x07, 0x52, 0x07, 0x73, 0x75, 0x6d, + 0x6d, 0x61, 0x72, 0x79, 0x88, 0x01, 0x01, 0x12, 0x21, 0x0a, 0x09, 0x74, 0x68, 0x75, 0x6d, 0x62, + 0x6e, 0x61, 0x69, 0x6c, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x48, 0x08, 0x52, 0x09, 0x74, 0x68, + 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x88, 0x01, 0x01, 0x12, 0x1f, 0x0a, 0x08, 0x70, 0x61, + 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x48, 0x09, 0x52, 0x08, + 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x88, 0x01, 0x01, 0x12, 0x1f, 0x0a, 0x08, 0x74, + 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x48, 0x0a, 0x52, + 0x08, 0x74, 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x88, 0x01, 0x01, 0x12, 0x1d, 0x0a, 0x07, + 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x48, 0x0b, 0x52, + 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x88, 0x01, 0x01, 0x12, 0x2d, 0x0a, 0x0f, 0x6f, + 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x6c, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x0e, + 0x20, 0x01, 0x28, 0x09, 0x48, 0x0c, 0x52, 0x0f, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x6c, + 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x88, 0x01, 0x01, 0x12, 0x1b, 0x0a, 0x06, 0x76, 0x69, + 0x73, 0x69, 0x74, 0x73, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x05, 0x48, 0x0d, 0x52, 0x06, 0x76, 0x69, + 0x73, 0x69, 0x74, 0x73, 0x88, 0x01, 0x01, 0x12, 0x25, 0x0a, 0x0b, 0x74, 0x6f, 0x70, 0x50, 0x72, + 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x18, 0x10, 0x20, 0x01, 0x28, 0x05, 0x48, 0x0e, 0x52, 0x0b, + 0x74, 0x6f, 0x70, 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x88, 0x01, 0x01, 0x12, 0x19, + 0x0a, 0x05, 0x6c, 0x69, 0x6b, 0x65, 0x73, 0x18, 0x11, 0x20, 0x01, 0x28, 0x05, 0x48, 0x0f, 0x52, + 0x05, 0x6c, 0x69, 0x6b, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x21, 0x0a, 0x09, 0x77, 0x6f, 0x72, + 0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x12, 0x20, 0x01, 0x28, 0x05, 0x48, 0x10, 0x52, 0x09, + 0x77, 0x6f, 0x72, 0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x88, 0x01, 0x01, 0x12, 0x27, 0x0a, 0x0c, + 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x13, 0x20, 0x01, + 0x28, 0x05, 0x48, 0x11, 0x52, 0x0c, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x43, 0x6f, 0x75, + 0x6e, 0x74, 0x88, 0x01, 0x01, 0x12, 0x2d, 0x0a, 0x0f, 0x64, 0x69, 0x73, 0x61, 0x6c, 0x6c, 0x6f, + 0x77, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x14, 0x20, 0x01, 0x28, 0x08, 0x48, 0x12, + 0x52, 0x0f, 0x64, 0x69, 0x73, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, + 0x74, 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, 0x0a, 0x69, 0x6e, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, + 0x73, 0x73, 0x18, 0x15, 0x20, 0x01, 0x28, 0x08, 0x48, 0x13, 0x52, 0x0a, 0x69, 0x6e, 0x50, 0x72, + 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, 0x0a, 0x63, 0x72, 0x65, + 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x16, 0x20, 0x01, 0x28, 0x09, 0x48, 0x14, 0x52, + 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x12, 0x23, + 0x0a, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x17, 0x20, 0x01, + 0x28, 0x09, 0x48, 0x15, 0x52, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, + 0x88, 0x01, 0x01, 0x12, 0x1f, 0x0a, 0x08, 0x65, 0x64, 0x69, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18, + 0x18, 0x20, 0x01, 0x28, 0x09, 0x48, 0x16, 0x52, 0x08, 0x65, 0x64, 0x69, 0x74, 0x54, 0x69, 0x6d, + 0x65, 0x88, 0x01, 0x01, 0x42, 0x08, 0x0a, 0x06, 0x5f, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x42, 0x09, + 0x0a, 0x07, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x42, 0x07, 0x0a, 0x05, 0x5f, 0x73, 0x6c, + 0x75, 0x67, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x65, 0x64, 0x69, 0x74, 0x6f, 0x72, 0x54, 0x79, 0x70, + 0x65, 0x42, 0x0f, 0x0a, 0x0d, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x4b, 0x65, 0x79, 0x77, 0x6f, 0x72, + 0x64, 0x73, 0x42, 0x12, 0x0a, 0x10, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x44, 0x65, 0x73, 0x63, 0x72, + 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x66, 0x75, 0x6c, 0x6c, 0x50, + 0x61, 0x74, 0x68, 0x42, 0x0a, 0x0a, 0x08, 0x5f, 0x73, 0x75, 0x6d, 0x6d, 0x61, 0x72, 0x79, 0x42, + 0x0c, 0x0a, 0x0a, 0x5f, 0x74, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x42, 0x0b, 0x0a, + 0x09, 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x74, + 0x65, 0x6d, 0x70, 0x6c, 0x61, 0x74, 0x65, 0x42, 0x0a, 0x0a, 0x08, 0x5f, 0x63, 0x6f, 0x6e, 0x74, + 0x65, 0x6e, 0x74, 0x42, 0x12, 0x0a, 0x10, 0x5f, 0x6f, 0x72, 0x69, 0x67, 0x69, 0x6e, 0x61, 0x6c, + 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x76, 0x69, 0x73, 0x69, + 0x74, 0x73, 0x42, 0x0e, 0x0a, 0x0c, 0x5f, 0x74, 0x6f, 0x70, 0x50, 0x72, 0x69, 0x6f, 0x72, 0x69, + 0x74, 0x79, 0x42, 0x08, 0x0a, 0x06, 0x5f, 0x6c, 0x69, 0x6b, 0x65, 0x73, 0x42, 0x0c, 0x0a, 0x0a, + 0x5f, 0x77, 0x6f, 0x72, 0x64, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x0f, 0x0a, 0x0d, 0x5f, 0x63, + 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x12, 0x0a, 0x10, 0x5f, + 0x64, 0x69, 0x73, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x42, + 0x0d, 0x0a, 0x0b, 0x5f, 0x69, 0x6e, 0x50, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x42, 0x0d, + 0x0a, 0x0b, 0x5f, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x42, 0x0d, 0x0a, + 0x0b, 0x5f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x42, 0x0b, 0x0a, 0x09, + 0x5f, 0x65, 0x64, 0x69, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x58, 0x0a, 0x10, 0x4c, 0x69, 0x73, + 0x74, 0x50, 0x6f, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2e, 0x0a, + 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x63, + 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, + 0x31, 0x2e, 0x50, 0x6f, 0x73, 0x74, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x14, 0x0a, + 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x74, 0x6f, + 0x74, 0x61, 0x6c, 0x22, 0x20, 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x50, 0x6f, 0x73, 0x74, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x0d, 0x52, 0x02, 0x69, 0x64, 0x22, 0x75, 0x0a, 0x11, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, + 0x6f, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x2c, 0x0a, 0x04, 0x70, 0x6f, + 0x73, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, + 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x6f, + 0x73, 0x74, 0x52, 0x04, 0x70, 0x6f, 0x73, 0x74, 0x12, 0x23, 0x0a, 0x0a, 0x6f, 0x70, 0x65, 0x72, + 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x00, 0x52, 0x0a, + 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x88, 0x01, 0x01, 0x42, 0x0d, 0x0a, + 0x0b, 0x5f, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x22, 0x85, 0x01, 0x0a, + 0x11, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x6f, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, + 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, + 0x69, 0x64, 0x12, 0x2c, 0x0a, 0x04, 0x70, 0x6f, 0x73, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, - 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x6f, 0x73, 0x74, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, - 0x73, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x22, 0x20, 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x50, 0x6f, + 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x6f, 0x73, 0x74, 0x52, 0x04, 0x70, 0x6f, 0x73, 0x74, + 0x12, 0x23, 0x0a, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x18, 0x03, + 0x20, 0x01, 0x28, 0x0d, 0x48, 0x00, 0x52, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, + 0x49, 0x64, 0x88, 0x01, 0x01, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, + 0x6f, 0x72, 0x49, 0x64, 0x22, 0x57, 0x0a, 0x11, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x50, 0x6f, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x22, 0x75, 0x0a, 0x11, 0x43, 0x72, 0x65, - 0x61, 0x74, 0x65, 0x50, 0x6f, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x2c, - 0x0a, 0x04, 0x70, 0x6f, 0x73, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x63, - 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, - 0x31, 0x2e, 0x50, 0x6f, 0x73, 0x74, 0x52, 0x04, 0x70, 0x6f, 0x73, 0x74, 0x12, 0x23, 0x0a, 0x0a, - 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, - 0x48, 0x00, 0x52, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x88, 0x01, - 0x01, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, - 0x22, 0x85, 0x01, 0x0a, 0x11, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x6f, 0x73, 0x74, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x2c, 0x0a, 0x04, 0x70, 0x6f, 0x73, 0x74, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, - 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x6f, 0x73, 0x74, 0x52, 0x04, - 0x70, 0x6f, 0x73, 0x74, 0x12, 0x23, 0x0a, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, - 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x00, 0x52, 0x0a, 0x6f, 0x70, 0x65, 0x72, - 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x88, 0x01, 0x01, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x6f, 0x70, - 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x22, 0x57, 0x0a, 0x11, 0x44, 0x65, 0x6c, 0x65, - 0x74, 0x65, 0x50, 0x6f, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, - 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x23, 0x0a, - 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x0d, 0x48, 0x00, 0x52, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x88, - 0x01, 0x01, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, - 0x64, 0x32, 0x98, 0x03, 0x0a, 0x0b, 0x50, 0x6f, 0x73, 0x74, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, - 0x65, 0x12, 0x4d, 0x0a, 0x08, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x6f, 0x73, 0x74, 0x12, 0x19, 0x2e, - 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x50, 0x61, 0x67, 0x69, 0x6e, - 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, - 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, - 0x73, 0x74, 0x50, 0x6f, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, - 0x12, 0x49, 0x0a, 0x07, 0x47, 0x65, 0x74, 0x50, 0x6f, 0x73, 0x74, 0x12, 0x22, 0x2e, 0x63, 0x6f, + 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x23, 0x0a, 0x0a, 0x6f, 0x70, 0x65, + 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x00, 0x52, + 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x88, 0x01, 0x01, 0x42, 0x0d, + 0x0a, 0x0b, 0x5f, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x32, 0x98, 0x03, + 0x0a, 0x0b, 0x50, 0x6f, 0x73, 0x74, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x4d, 0x0a, + 0x08, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x6f, 0x73, 0x74, 0x12, 0x19, 0x2e, 0x70, 0x61, 0x67, 0x69, + 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, + 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x6f, + 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x49, 0x0a, 0x07, + 0x47, 0x65, 0x74, 0x50, 0x6f, 0x73, 0x74, 0x12, 0x22, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, + 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, + 0x50, 0x6f, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, - 0x2e, 0x47, 0x65, 0x74, 0x50, 0x6f, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, - 0x18, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, - 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x6f, 0x73, 0x74, 0x22, 0x00, 0x12, 0x4f, 0x0a, 0x0a, 0x43, - 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x6f, 0x73, 0x74, 0x12, 0x25, 0x2e, 0x63, 0x6f, 0x6e, 0x74, - 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, - 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x6f, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x1a, 0x18, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, - 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x6f, 0x73, 0x74, 0x22, 0x00, 0x12, 0x4f, 0x0a, 0x0a, - 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x6f, 0x73, 0x74, 0x12, 0x25, 0x2e, 0x63, 0x6f, 0x6e, - 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, - 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x6f, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x1a, 0x18, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, - 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x6f, 0x73, 0x74, 0x22, 0x00, 0x12, 0x4d, 0x0a, - 0x0a, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x50, 0x6f, 0x73, 0x74, 0x12, 0x25, 0x2e, 0x63, 0x6f, - 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, - 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x50, 0x6f, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x42, 0x2d, 0x5a, 0x2b, - 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x63, 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, - 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2f, 0x73, 0x65, - 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, + 0x2e, 0x50, 0x6f, 0x73, 0x74, 0x22, 0x00, 0x12, 0x4f, 0x0a, 0x0a, 0x43, 0x72, 0x65, 0x61, 0x74, + 0x65, 0x50, 0x6f, 0x73, 0x74, 0x12, 0x25, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, + 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, + 0x65, 0x50, 0x6f, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x63, + 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, + 0x31, 0x2e, 0x50, 0x6f, 0x73, 0x74, 0x22, 0x00, 0x12, 0x4f, 0x0a, 0x0a, 0x55, 0x70, 0x64, 0x61, + 0x74, 0x65, 0x50, 0x6f, 0x73, 0x74, 0x12, 0x25, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, + 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, + 0x74, 0x65, 0x50, 0x6f, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, + 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, + 0x76, 0x31, 0x2e, 0x50, 0x6f, 0x73, 0x74, 0x22, 0x00, 0x12, 0x4d, 0x0a, 0x0a, 0x44, 0x65, 0x6c, + 0x65, 0x74, 0x65, 0x50, 0x6f, 0x73, 0x74, 0x12, 0x25, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, + 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, + 0x65, 0x74, 0x65, 0x50, 0x6f, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, + 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, + 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x42, 0xc1, 0x01, 0x0a, 0x16, 0x63, 0x6f, 0x6d, + 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, + 0x2e, 0x76, 0x31, 0x42, 0x09, 0x50, 0x6f, 0x73, 0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, + 0x5a, 0x32, 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x63, 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, + 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2f, + 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x73, 0x65, 0x72, 0x76, 0x69, + 0x63, 0x65, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x43, 0x53, 0x58, 0xaa, 0x02, 0x12, 0x43, 0x6f, 0x6e, + 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x56, 0x31, 0xca, + 0x02, 0x12, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x5c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x5c, 0x53, + 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, + 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x14, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x3a, + 0x3a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -692,14 +701,14 @@ func file_content_service_v1_post_proto_rawDescGZIP() []byte { var file_content_service_v1_post_proto_msgTypes = make([]protoimpl.MessageInfo, 6) var file_content_service_v1_post_proto_goTypes = []interface{}{ - (*Post)(nil), // 0: content.service.v1.Post - (*ListPostResponse)(nil), // 1: content.service.v1.ListPostResponse - (*GetPostRequest)(nil), // 2: content.service.v1.GetPostRequest - (*CreatePostRequest)(nil), // 3: content.service.v1.CreatePostRequest - (*UpdatePostRequest)(nil), // 4: content.service.v1.UpdatePostRequest - (*DeletePostRequest)(nil), // 5: content.service.v1.DeletePostRequest - (*pagination.PagingRequest)(nil), // 6: pagination.PagingRequest - (*emptypb.Empty)(nil), // 7: google.protobuf.Empty + (*Post)(nil), // 0: content.service.v1.Post + (*ListPostResponse)(nil), // 1: content.service.v1.ListPostResponse + (*GetPostRequest)(nil), // 2: content.service.v1.GetPostRequest + (*CreatePostRequest)(nil), // 3: content.service.v1.CreatePostRequest + (*UpdatePostRequest)(nil), // 4: content.service.v1.UpdatePostRequest + (*DeletePostRequest)(nil), // 5: content.service.v1.DeletePostRequest + (*v1.PagingRequest)(nil), // 6: pagination.PagingRequest + (*emptypb.Empty)(nil), // 7: google.protobuf.Empty } var file_content_service_v1_post_proto_depIdxs = []int32{ 0, // 0: content.service.v1.ListPostResponse.items:type_name -> content.service.v1.Post diff --git a/blog-backend/gen/api/go/content/service/v1/post.pb.validate.go b/blog-backend/gen/api/go/content/service/v1/post.pb.validate.go index 0848aab0..e97c291d 100644 --- a/blog-backend/gen/api/go/content/service/v1/post.pb.validate.go +++ b/blog-backend/gen/api/go/content/service/v1/post.pb.validate.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-validate. DO NOT EDIT. // source: content/service/v1/post.proto -package v1 +package servicev1 import ( "bytes" diff --git a/blog-backend/gen/api/go/content/service/v1/post_grpc.pb.go b/blog-backend/gen/api/go/content/service/v1/post_grpc.pb.go index db88307e..874e9199 100644 --- a/blog-backend/gen/api/go/content/service/v1/post_grpc.pb.go +++ b/blog-backend/gen/api/go/content/service/v1/post_grpc.pb.go @@ -4,15 +4,15 @@ // - protoc (unknown) // source: content/service/v1/post.proto -package v1 +package servicev1 import ( context "context" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" ) // This is a compile-time assertion to ensure that this generated file @@ -33,7 +33,7 @@ const ( // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type PostServiceClient interface { // 获取帖子列表 - ListPost(ctx context.Context, in *pagination.PagingRequest, opts ...grpc.CallOption) (*ListPostResponse, error) + ListPost(ctx context.Context, in *v1.PagingRequest, opts ...grpc.CallOption) (*ListPostResponse, error) // 获取帖子数据 GetPost(ctx context.Context, in *GetPostRequest, opts ...grpc.CallOption) (*Post, error) // 创建帖子 @@ -52,7 +52,7 @@ func NewPostServiceClient(cc grpc.ClientConnInterface) PostServiceClient { return &postServiceClient{cc} } -func (c *postServiceClient) ListPost(ctx context.Context, in *pagination.PagingRequest, opts ...grpc.CallOption) (*ListPostResponse, error) { +func (c *postServiceClient) ListPost(ctx context.Context, in *v1.PagingRequest, opts ...grpc.CallOption) (*ListPostResponse, error) { out := new(ListPostResponse) err := c.cc.Invoke(ctx, PostService_ListPost_FullMethodName, in, out, opts...) if err != nil { @@ -102,7 +102,7 @@ func (c *postServiceClient) DeletePost(ctx context.Context, in *DeletePostReques // for forward compatibility type PostServiceServer interface { // 获取帖子列表 - ListPost(context.Context, *pagination.PagingRequest) (*ListPostResponse, error) + ListPost(context.Context, *v1.PagingRequest) (*ListPostResponse, error) // 获取帖子数据 GetPost(context.Context, *GetPostRequest) (*Post, error) // 创建帖子 @@ -118,7 +118,7 @@ type PostServiceServer interface { type UnimplementedPostServiceServer struct { } -func (UnimplementedPostServiceServer) ListPost(context.Context, *pagination.PagingRequest) (*ListPostResponse, error) { +func (UnimplementedPostServiceServer) ListPost(context.Context, *v1.PagingRequest) (*ListPostResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListPost not implemented") } func (UnimplementedPostServiceServer) GetPost(context.Context, *GetPostRequest) (*Post, error) { @@ -147,7 +147,7 @@ func RegisterPostServiceServer(s grpc.ServiceRegistrar, srv PostServiceServer) { } func _PostService_ListPost_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(pagination.PagingRequest) + in := new(v1.PagingRequest) if err := dec(in); err != nil { return nil, err } @@ -159,7 +159,7 @@ func _PostService_ListPost_Handler(srv interface{}, ctx context.Context, dec fun FullMethod: PostService_ListPost_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(PostServiceServer).ListPost(ctx, req.(*pagination.PagingRequest)) + return srv.(PostServiceServer).ListPost(ctx, req.(*v1.PagingRequest)) } return interceptor(ctx, in, info, handler) } diff --git a/blog-backend/gen/api/go/content/service/v1/tag.pb.go b/blog-backend/gen/api/go/content/service/v1/tag.pb.go index 85b9f162..80b6fa18 100644 --- a/blog-backend/gen/api/go/content/service/v1/tag.pb.go +++ b/blog-backend/gen/api/go/content/service/v1/tag.pb.go @@ -4,13 +4,13 @@ // protoc (unknown) // source: content/service/v1/tag.proto -package v1 +package servicev1 import ( + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" reflect "reflect" sync "sync" ) @@ -430,91 +430,100 @@ var file_content_service_v1_tag_proto_rawDesc = []byte{ 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, - 0x22, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x22, 0xa4, 0x03, 0x0a, 0x03, 0x54, 0x61, 0x67, 0x12, 0x0e, 0x0a, 0x02, 0x69, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x17, 0x0a, 0x04, 0x6e, - 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x04, 0x6e, 0x61, 0x6d, - 0x65, 0x88, 0x01, 0x01, 0x12, 0x17, 0x0a, 0x04, 0x73, 0x6c, 0x75, 0x67, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x09, 0x48, 0x01, 0x52, 0x04, 0x73, 0x6c, 0x75, 0x67, 0x88, 0x01, 0x01, 0x12, 0x1f, 0x0a, - 0x08, 0x73, 0x6c, 0x75, 0x67, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x48, - 0x02, 0x52, 0x08, 0x73, 0x6c, 0x75, 0x67, 0x4e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x12, 0x19, - 0x0a, 0x05, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x48, 0x03, 0x52, - 0x05, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x88, 0x01, 0x01, 0x12, 0x21, 0x0a, 0x09, 0x74, 0x68, 0x75, - 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x48, 0x04, 0x52, 0x09, - 0x74, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, 0x0a, - 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, - 0x48, 0x05, 0x52, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x88, 0x01, - 0x01, 0x12, 0x23, 0x0a, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, - 0x08, 0x20, 0x01, 0x28, 0x09, 0x48, 0x06, 0x52, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, - 0x69, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x12, 0x21, 0x0a, 0x09, 0x70, 0x6f, 0x73, 0x74, 0x43, 0x6f, - 0x75, 0x6e, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x07, 0x52, 0x09, 0x70, 0x6f, 0x73, - 0x74, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x88, 0x01, 0x01, 0x12, 0x1f, 0x0a, 0x08, 0x66, 0x75, 0x6c, - 0x6c, 0x50, 0x61, 0x74, 0x68, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x48, 0x08, 0x52, 0x08, 0x66, - 0x75, 0x6c, 0x6c, 0x50, 0x61, 0x74, 0x68, 0x88, 0x01, 0x01, 0x42, 0x07, 0x0a, 0x05, 0x5f, 0x6e, - 0x61, 0x6d, 0x65, 0x42, 0x07, 0x0a, 0x05, 0x5f, 0x73, 0x6c, 0x75, 0x67, 0x42, 0x0b, 0x0a, 0x09, - 0x5f, 0x73, 0x6c, 0x75, 0x67, 0x4e, 0x61, 0x6d, 0x65, 0x42, 0x08, 0x0a, 0x06, 0x5f, 0x63, 0x6f, - 0x6c, 0x6f, 0x72, 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x74, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, - 0x6c, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, - 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x42, - 0x0c, 0x0a, 0x0a, 0x5f, 0x70, 0x6f, 0x73, 0x74, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x0b, 0x0a, - 0x09, 0x5f, 0x66, 0x75, 0x6c, 0x6c, 0x50, 0x61, 0x74, 0x68, 0x22, 0x56, 0x0a, 0x0f, 0x4c, 0x69, - 0x73, 0x74, 0x54, 0x61, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2d, 0x0a, - 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x63, - 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, - 0x31, 0x2e, 0x54, 0x61, 0x67, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x14, 0x0a, 0x05, - 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x74, 0x6f, 0x74, - 0x61, 0x6c, 0x22, 0x1f, 0x0a, 0x0d, 0x47, 0x65, 0x74, 0x54, 0x61, 0x67, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, - 0x02, 0x69, 0x64, 0x22, 0x71, 0x0a, 0x10, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x61, 0x67, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x29, 0x0a, 0x03, 0x74, 0x61, 0x67, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, - 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x61, 0x67, 0x52, 0x03, 0x74, - 0x61, 0x67, 0x12, 0x23, 0x0a, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x00, 0x52, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, - 0x6f, 0x72, 0x49, 0x64, 0x88, 0x01, 0x01, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x6f, 0x70, 0x65, 0x72, - 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x22, 0x81, 0x01, 0x0a, 0x10, 0x55, 0x70, 0x64, 0x61, 0x74, - 0x65, 0x54, 0x61, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x29, 0x0a, 0x03, 0x74, - 0x61, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, + 0x1e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x70, + 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, + 0xa4, 0x03, 0x0a, 0x03, 0x54, 0x61, 0x67, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x17, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, + 0x12, 0x17, 0x0a, 0x04, 0x73, 0x6c, 0x75, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, 0x01, + 0x52, 0x04, 0x73, 0x6c, 0x75, 0x67, 0x88, 0x01, 0x01, 0x12, 0x1f, 0x0a, 0x08, 0x73, 0x6c, 0x75, + 0x67, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x48, 0x02, 0x52, 0x08, 0x73, + 0x6c, 0x75, 0x67, 0x4e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x12, 0x19, 0x0a, 0x05, 0x63, 0x6f, + 0x6c, 0x6f, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x48, 0x03, 0x52, 0x05, 0x63, 0x6f, 0x6c, + 0x6f, 0x72, 0x88, 0x01, 0x01, 0x12, 0x21, 0x0a, 0x09, 0x74, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, + 0x69, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x48, 0x04, 0x52, 0x09, 0x74, 0x68, 0x75, 0x6d, + 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, + 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x48, 0x05, 0x52, 0x0a, + 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, + 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, + 0x09, 0x48, 0x06, 0x52, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x88, + 0x01, 0x01, 0x12, 0x21, 0x0a, 0x09, 0x70, 0x6f, 0x73, 0x74, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, + 0x09, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x07, 0x52, 0x09, 0x70, 0x6f, 0x73, 0x74, 0x43, 0x6f, 0x75, + 0x6e, 0x74, 0x88, 0x01, 0x01, 0x12, 0x1f, 0x0a, 0x08, 0x66, 0x75, 0x6c, 0x6c, 0x50, 0x61, 0x74, + 0x68, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x48, 0x08, 0x52, 0x08, 0x66, 0x75, 0x6c, 0x6c, 0x50, + 0x61, 0x74, 0x68, 0x88, 0x01, 0x01, 0x42, 0x07, 0x0a, 0x05, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x42, + 0x07, 0x0a, 0x05, 0x5f, 0x73, 0x6c, 0x75, 0x67, 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x73, 0x6c, 0x75, + 0x67, 0x4e, 0x61, 0x6d, 0x65, 0x42, 0x08, 0x0a, 0x06, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x42, + 0x0c, 0x0a, 0x0a, 0x5f, 0x74, 0x68, 0x75, 0x6d, 0x62, 0x6e, 0x61, 0x69, 0x6c, 0x42, 0x0d, 0x0a, + 0x0b, 0x5f, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x42, 0x0d, 0x0a, 0x0b, + 0x5f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x42, 0x0c, 0x0a, 0x0a, 0x5f, + 0x70, 0x6f, 0x73, 0x74, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x66, 0x75, + 0x6c, 0x6c, 0x50, 0x61, 0x74, 0x68, 0x22, 0x56, 0x0a, 0x0f, 0x4c, 0x69, 0x73, 0x74, 0x54, 0x61, + 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2d, 0x0a, 0x05, 0x69, 0x74, 0x65, + 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x61, - 0x67, 0x52, 0x03, 0x74, 0x61, 0x67, 0x12, 0x23, 0x0a, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, - 0x6f, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x00, 0x52, 0x0a, 0x6f, 0x70, - 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x88, 0x01, 0x01, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, - 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x22, 0x56, 0x0a, 0x10, 0x44, 0x65, - 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, - 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x23, + 0x67, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x74, 0x61, + 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x22, 0x1f, + 0x0a, 0x0d, 0x47, 0x65, 0x74, 0x54, 0x61, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, + 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x22, + 0x71, 0x0a, 0x10, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x61, 0x67, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x12, 0x29, 0x0a, 0x03, 0x74, 0x61, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x17, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, + 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x61, 0x67, 0x52, 0x03, 0x74, 0x61, 0x67, 0x12, 0x23, 0x0a, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x00, 0x52, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x88, 0x01, 0x01, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, - 0x49, 0x64, 0x32, 0x8a, 0x03, 0x0a, 0x0a, 0x54, 0x61, 0x67, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, - 0x65, 0x12, 0x4b, 0x0a, 0x07, 0x4c, 0x69, 0x73, 0x74, 0x54, 0x61, 0x67, 0x12, 0x19, 0x2e, 0x70, - 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x67, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, - 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, - 0x74, 0x54, 0x61, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x46, - 0x0a, 0x06, 0x47, 0x65, 0x74, 0x54, 0x61, 0x67, 0x12, 0x21, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, - 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, - 0x74, 0x54, 0x61, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x17, 0x2e, 0x63, 0x6f, - 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, - 0x2e, 0x54, 0x61, 0x67, 0x22, 0x00, 0x12, 0x4c, 0x0a, 0x09, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, - 0x54, 0x61, 0x67, 0x12, 0x24, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, - 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, - 0x61, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x17, 0x2e, 0x63, 0x6f, 0x6e, 0x74, - 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x54, - 0x61, 0x67, 0x22, 0x00, 0x12, 0x4c, 0x0a, 0x09, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x61, - 0x67, 0x12, 0x24, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, - 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x61, 0x67, + 0x49, 0x64, 0x22, 0x81, 0x01, 0x0a, 0x10, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x61, 0x67, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x29, 0x0a, 0x03, 0x74, 0x61, 0x67, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, + 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x61, 0x67, 0x52, 0x03, 0x74, + 0x61, 0x67, 0x12, 0x23, 0x0a, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x00, 0x52, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, + 0x6f, 0x72, 0x49, 0x64, 0x88, 0x01, 0x01, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x6f, 0x70, 0x65, 0x72, + 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x22, 0x56, 0x0a, 0x10, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, + 0x54, 0x61, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x23, 0x0a, 0x0a, 0x6f, 0x70, + 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x00, + 0x52, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x88, 0x01, 0x01, 0x42, + 0x0d, 0x0a, 0x0b, 0x5f, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x32, 0x8a, + 0x03, 0x0a, 0x0a, 0x54, 0x61, 0x67, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x4b, 0x0a, + 0x07, 0x4c, 0x69, 0x73, 0x74, 0x54, 0x61, 0x67, 0x12, 0x19, 0x2e, 0x70, 0x61, 0x67, 0x69, 0x6e, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, + 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x54, 0x61, 0x67, + 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x46, 0x0a, 0x06, 0x47, 0x65, + 0x74, 0x54, 0x61, 0x67, 0x12, 0x21, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, + 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x54, 0x61, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x17, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x61, 0x67, - 0x22, 0x00, 0x12, 0x4b, 0x0a, 0x09, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x67, 0x12, + 0x22, 0x00, 0x12, 0x4c, 0x0a, 0x09, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x61, 0x67, 0x12, 0x24, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, - 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x67, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x42, - 0x2d, 0x5a, 0x2b, 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x63, 0x6d, 0x73, 0x2f, 0x67, 0x65, - 0x6e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, - 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x76, 0x31, 0x62, 0x06, + 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x61, 0x67, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x17, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, + 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x61, 0x67, 0x22, 0x00, + 0x12, 0x4c, 0x0a, 0x09, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x61, 0x67, 0x12, 0x24, 0x2e, + 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, + 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x61, 0x67, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x1a, 0x17, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, + 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x61, 0x67, 0x22, 0x00, 0x12, 0x4b, + 0x0a, 0x09, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x67, 0x12, 0x24, 0x2e, 0x63, 0x6f, + 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, + 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x42, 0xc0, 0x01, 0x0a, 0x16, + 0x63, 0x6f, 0x6d, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, + 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x42, 0x08, 0x54, 0x61, 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x50, 0x01, 0x5a, 0x32, 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x63, 0x6d, 0x73, 0x2f, 0x67, + 0x65, 0x6e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, + 0x74, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x73, 0x65, 0x72, + 0x76, 0x69, 0x63, 0x65, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x43, 0x53, 0x58, 0xaa, 0x02, 0x12, 0x43, + 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x56, + 0x31, 0xca, 0x02, 0x12, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x5c, 0x53, 0x65, 0x72, 0x76, + 0x69, 0x63, 0x65, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, + 0x5c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, + 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x14, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, + 0x74, 0x3a, 0x3a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } @@ -532,14 +541,14 @@ func file_content_service_v1_tag_proto_rawDescGZIP() []byte { var file_content_service_v1_tag_proto_msgTypes = make([]protoimpl.MessageInfo, 6) var file_content_service_v1_tag_proto_goTypes = []interface{}{ - (*Tag)(nil), // 0: content.service.v1.Tag - (*ListTagResponse)(nil), // 1: content.service.v1.ListTagResponse - (*GetTagRequest)(nil), // 2: content.service.v1.GetTagRequest - (*CreateTagRequest)(nil), // 3: content.service.v1.CreateTagRequest - (*UpdateTagRequest)(nil), // 4: content.service.v1.UpdateTagRequest - (*DeleteTagRequest)(nil), // 5: content.service.v1.DeleteTagRequest - (*pagination.PagingRequest)(nil), // 6: pagination.PagingRequest - (*emptypb.Empty)(nil), // 7: google.protobuf.Empty + (*Tag)(nil), // 0: content.service.v1.Tag + (*ListTagResponse)(nil), // 1: content.service.v1.ListTagResponse + (*GetTagRequest)(nil), // 2: content.service.v1.GetTagRequest + (*CreateTagRequest)(nil), // 3: content.service.v1.CreateTagRequest + (*UpdateTagRequest)(nil), // 4: content.service.v1.UpdateTagRequest + (*DeleteTagRequest)(nil), // 5: content.service.v1.DeleteTagRequest + (*v1.PagingRequest)(nil), // 6: pagination.PagingRequest + (*emptypb.Empty)(nil), // 7: google.protobuf.Empty } var file_content_service_v1_tag_proto_depIdxs = []int32{ 0, // 0: content.service.v1.ListTagResponse.items:type_name -> content.service.v1.Tag diff --git a/blog-backend/gen/api/go/content/service/v1/tag.pb.validate.go b/blog-backend/gen/api/go/content/service/v1/tag.pb.validate.go index 6fea1f8a..5ea1367e 100644 --- a/blog-backend/gen/api/go/content/service/v1/tag.pb.validate.go +++ b/blog-backend/gen/api/go/content/service/v1/tag.pb.validate.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-validate. DO NOT EDIT. // source: content/service/v1/tag.proto -package v1 +package servicev1 import ( "bytes" diff --git a/blog-backend/gen/api/go/content/service/v1/tag_grpc.pb.go b/blog-backend/gen/api/go/content/service/v1/tag_grpc.pb.go index f91dfdc9..11f44098 100644 --- a/blog-backend/gen/api/go/content/service/v1/tag_grpc.pb.go +++ b/blog-backend/gen/api/go/content/service/v1/tag_grpc.pb.go @@ -4,15 +4,15 @@ // - protoc (unknown) // source: content/service/v1/tag.proto -package v1 +package servicev1 import ( context "context" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" ) // This is a compile-time assertion to ensure that this generated file @@ -33,7 +33,7 @@ const ( // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type TagServiceClient interface { // 获取标签列表 - ListTag(ctx context.Context, in *pagination.PagingRequest, opts ...grpc.CallOption) (*ListTagResponse, error) + ListTag(ctx context.Context, in *v1.PagingRequest, opts ...grpc.CallOption) (*ListTagResponse, error) // 获取标签数据 GetTag(ctx context.Context, in *GetTagRequest, opts ...grpc.CallOption) (*Tag, error) // 创建标签 @@ -52,7 +52,7 @@ func NewTagServiceClient(cc grpc.ClientConnInterface) TagServiceClient { return &tagServiceClient{cc} } -func (c *tagServiceClient) ListTag(ctx context.Context, in *pagination.PagingRequest, opts ...grpc.CallOption) (*ListTagResponse, error) { +func (c *tagServiceClient) ListTag(ctx context.Context, in *v1.PagingRequest, opts ...grpc.CallOption) (*ListTagResponse, error) { out := new(ListTagResponse) err := c.cc.Invoke(ctx, TagService_ListTag_FullMethodName, in, out, opts...) if err != nil { @@ -102,7 +102,7 @@ func (c *tagServiceClient) DeleteTag(ctx context.Context, in *DeleteTagRequest, // for forward compatibility type TagServiceServer interface { // 获取标签列表 - ListTag(context.Context, *pagination.PagingRequest) (*ListTagResponse, error) + ListTag(context.Context, *v1.PagingRequest) (*ListTagResponse, error) // 获取标签数据 GetTag(context.Context, *GetTagRequest) (*Tag, error) // 创建标签 @@ -118,7 +118,7 @@ type TagServiceServer interface { type UnimplementedTagServiceServer struct { } -func (UnimplementedTagServiceServer) ListTag(context.Context, *pagination.PagingRequest) (*ListTagResponse, error) { +func (UnimplementedTagServiceServer) ListTag(context.Context, *v1.PagingRequest) (*ListTagResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListTag not implemented") } func (UnimplementedTagServiceServer) GetTag(context.Context, *GetTagRequest) (*Tag, error) { @@ -147,7 +147,7 @@ func RegisterTagServiceServer(s grpc.ServiceRegistrar, srv TagServiceServer) { } func _TagService_ListTag_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(pagination.PagingRequest) + in := new(v1.PagingRequest) if err := dec(in); err != nil { return nil, err } @@ -159,7 +159,7 @@ func _TagService_ListTag_Handler(srv interface{}, ctx context.Context, dec func( FullMethod: TagService_ListTag_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TagServiceServer).ListTag(ctx, req.(*pagination.PagingRequest)) + return srv.(TagServiceServer).ListTag(ctx, req.(*v1.PagingRequest)) } return interceptor(ctx, in, info, handler) } diff --git a/blog-backend/gen/api/go/file/service/v1/attachment.pb.go b/blog-backend/gen/api/go/file/service/v1/attachment.pb.go index 9b02a53d..2b68f9aa 100644 --- a/blog-backend/gen/api/go/file/service/v1/attachment.pb.go +++ b/blog-backend/gen/api/go/file/service/v1/attachment.pb.go @@ -4,13 +4,13 @@ // protoc (unknown) // source: file/service/v1/attachment.proto -package v1 +package servicev1 import ( + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" reflect "reflect" sync "sync" ) @@ -462,111 +462,119 @@ var file_file_service_v1_attachment_proto_rawDesc = []byte{ 0x74, 0x6f, 0x12, 0x0f, 0x66, 0x69, 0x6c, 0x65, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x1a, 0x22, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xc2, 0x04, 0x0a, 0x0a, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, - 0x65, 0x6e, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, - 0x02, 0x69, 0x64, 0x12, 0x17, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x09, 0x48, 0x00, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x12, 0x17, 0x0a, 0x04, - 0x70, 0x61, 0x74, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, 0x01, 0x52, 0x04, 0x70, 0x61, - 0x74, 0x68, 0x88, 0x01, 0x01, 0x12, 0x1d, 0x0a, 0x07, 0x66, 0x69, 0x6c, 0x65, 0x4b, 0x65, 0x79, - 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x48, 0x02, 0x52, 0x07, 0x66, 0x69, 0x6c, 0x65, 0x4b, 0x65, - 0x79, 0x88, 0x01, 0x01, 0x12, 0x21, 0x0a, 0x09, 0x74, 0x68, 0x75, 0x6d, 0x62, 0x50, 0x61, 0x74, - 0x68, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x48, 0x03, 0x52, 0x09, 0x74, 0x68, 0x75, 0x6d, 0x62, - 0x50, 0x61, 0x74, 0x68, 0x88, 0x01, 0x01, 0x12, 0x21, 0x0a, 0x09, 0x6d, 0x65, 0x64, 0x69, 0x61, - 0x54, 0x79, 0x70, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x48, 0x04, 0x52, 0x09, 0x6d, 0x65, - 0x64, 0x69, 0x61, 0x54, 0x79, 0x70, 0x65, 0x88, 0x01, 0x01, 0x12, 0x1b, 0x0a, 0x06, 0x73, 0x75, - 0x66, 0x66, 0x69, 0x78, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x48, 0x05, 0x52, 0x06, 0x73, 0x75, - 0x66, 0x66, 0x69, 0x78, 0x88, 0x01, 0x01, 0x12, 0x19, 0x0a, 0x05, 0x77, 0x69, 0x64, 0x74, 0x68, - 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x48, 0x06, 0x52, 0x05, 0x77, 0x69, 0x64, 0x74, 0x68, 0x88, - 0x01, 0x01, 0x12, 0x1b, 0x0a, 0x06, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x09, 0x20, 0x01, - 0x28, 0x05, 0x48, 0x07, 0x52, 0x06, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x88, 0x01, 0x01, 0x12, - 0x17, 0x0a, 0x04, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x04, 0x48, 0x08, 0x52, - 0x04, 0x73, 0x69, 0x7a, 0x65, 0x88, 0x01, 0x01, 0x12, 0x17, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, - 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x48, 0x09, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x88, 0x01, - 0x01, 0x12, 0x23, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, - 0x0c, 0x20, 0x01, 0x28, 0x09, 0x48, 0x0a, 0x52, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, - 0x69, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, - 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x48, 0x0b, 0x52, 0x0a, 0x75, 0x70, - 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, 0x0a, 0x64, - 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x48, - 0x0c, 0x52, 0x0a, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x88, 0x01, 0x01, - 0x42, 0x07, 0x0a, 0x05, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x42, 0x07, 0x0a, 0x05, 0x5f, 0x70, 0x61, - 0x74, 0x68, 0x42, 0x0a, 0x0a, 0x08, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x4b, 0x65, 0x79, 0x42, 0x0c, - 0x0a, 0x0a, 0x5f, 0x74, 0x68, 0x75, 0x6d, 0x62, 0x50, 0x61, 0x74, 0x68, 0x42, 0x0c, 0x0a, 0x0a, - 0x5f, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x54, 0x79, 0x70, 0x65, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x73, - 0x75, 0x66, 0x66, 0x69, 0x78, 0x42, 0x08, 0x0a, 0x06, 0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, 0x42, - 0x09, 0x0a, 0x07, 0x5f, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x42, 0x07, 0x0a, 0x05, 0x5f, 0x73, - 0x69, 0x7a, 0x65, 0x42, 0x07, 0x0a, 0x05, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x42, 0x0d, 0x0a, 0x0b, - 0x5f, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, - 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x64, - 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x61, 0x0a, 0x16, 0x4c, 0x69, 0x73, - 0x74, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, - 0x6e, 0x73, 0x65, 0x12, 0x31, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, - 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, - 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x22, 0x26, 0x0a, 0x14, - 0x47, 0x65, 0x74, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, - 0x52, 0x02, 0x69, 0x64, 0x22, 0x8a, 0x01, 0x0a, 0x17, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x41, + 0x1a, 0x1e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x76, 0x31, 0x2f, + 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x22, 0xc2, 0x04, 0x0a, 0x0a, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x12, + 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, + 0x17, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, + 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x12, 0x17, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, 0x01, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x88, 0x01, + 0x01, 0x12, 0x1d, 0x0a, 0x07, 0x66, 0x69, 0x6c, 0x65, 0x4b, 0x65, 0x79, 0x18, 0x04, 0x20, 0x01, + 0x28, 0x09, 0x48, 0x02, 0x52, 0x07, 0x66, 0x69, 0x6c, 0x65, 0x4b, 0x65, 0x79, 0x88, 0x01, 0x01, + 0x12, 0x21, 0x0a, 0x09, 0x74, 0x68, 0x75, 0x6d, 0x62, 0x50, 0x61, 0x74, 0x68, 0x18, 0x05, 0x20, + 0x01, 0x28, 0x09, 0x48, 0x03, 0x52, 0x09, 0x74, 0x68, 0x75, 0x6d, 0x62, 0x50, 0x61, 0x74, 0x68, + 0x88, 0x01, 0x01, 0x12, 0x21, 0x0a, 0x09, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x54, 0x79, 0x70, 0x65, + 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x48, 0x04, 0x52, 0x09, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x54, + 0x79, 0x70, 0x65, 0x88, 0x01, 0x01, 0x12, 0x1b, 0x0a, 0x06, 0x73, 0x75, 0x66, 0x66, 0x69, 0x78, + 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x48, 0x05, 0x52, 0x06, 0x73, 0x75, 0x66, 0x66, 0x69, 0x78, + 0x88, 0x01, 0x01, 0x12, 0x19, 0x0a, 0x05, 0x77, 0x69, 0x64, 0x74, 0x68, 0x18, 0x08, 0x20, 0x01, + 0x28, 0x05, 0x48, 0x06, 0x52, 0x05, 0x77, 0x69, 0x64, 0x74, 0x68, 0x88, 0x01, 0x01, 0x12, 0x1b, + 0x0a, 0x06, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x48, 0x07, + 0x52, 0x06, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x88, 0x01, 0x01, 0x12, 0x17, 0x0a, 0x04, 0x73, + 0x69, 0x7a, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x04, 0x48, 0x08, 0x52, 0x04, 0x73, 0x69, 0x7a, + 0x65, 0x88, 0x01, 0x01, 0x12, 0x17, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x0b, 0x20, 0x01, + 0x28, 0x05, 0x48, 0x09, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, + 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, + 0x09, 0x48, 0x0a, 0x52, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x88, + 0x01, 0x01, 0x12, 0x23, 0x0a, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, + 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x48, 0x0b, 0x52, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, + 0x54, 0x69, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, 0x0a, 0x64, 0x65, 0x6c, 0x65, 0x74, + 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x48, 0x0c, 0x52, 0x0a, 0x64, + 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x42, 0x07, 0x0a, 0x05, + 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x42, 0x07, 0x0a, 0x05, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x42, 0x0a, + 0x0a, 0x08, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x4b, 0x65, 0x79, 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x74, + 0x68, 0x75, 0x6d, 0x62, 0x50, 0x61, 0x74, 0x68, 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x6d, 0x65, 0x64, + 0x69, 0x61, 0x54, 0x79, 0x70, 0x65, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x73, 0x75, 0x66, 0x66, 0x69, + 0x78, 0x42, 0x08, 0x0a, 0x06, 0x5f, 0x77, 0x69, 0x64, 0x74, 0x68, 0x42, 0x09, 0x0a, 0x07, 0x5f, + 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x42, 0x07, 0x0a, 0x05, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x42, + 0x07, 0x0a, 0x05, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x63, 0x72, 0x65, + 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x75, 0x70, 0x64, 0x61, + 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x64, 0x65, 0x6c, 0x65, 0x74, + 0x65, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x61, 0x0a, 0x16, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x74, 0x74, + 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, + 0x31, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1b, + 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, + 0x2e, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x05, 0x69, 0x74, 0x65, + 0x6d, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x22, 0x26, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x12, 0x3b, 0x0a, 0x0a, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x2e, 0x73, 0x65, 0x72, 0x76, - 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, - 0x74, 0x52, 0x0a, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x23, 0x0a, - 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x0d, 0x48, 0x00, 0x52, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x88, - 0x01, 0x01, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, - 0x64, 0x22, 0x9a, 0x01, 0x0a, 0x17, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x41, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, - 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x3b, 0x0a, - 0x0a, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x1b, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, - 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x0a, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x23, 0x0a, 0x0a, 0x6f, 0x70, - 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x00, - 0x52, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x88, 0x01, 0x01, 0x42, - 0x0d, 0x0a, 0x0b, 0x5f, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x22, 0x5d, - 0x0a, 0x17, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, - 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x23, 0x0a, 0x0a, 0x6f, 0x70, 0x65, + 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, + 0x22, 0x8a, 0x01, 0x0a, 0x17, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x41, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x3b, 0x0a, 0x0a, + 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x1b, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, + 0x76, 0x31, 0x2e, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x0a, 0x61, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x23, 0x0a, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x00, 0x52, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x88, 0x01, 0x01, 0x42, 0x0d, - 0x0a, 0x0b, 0x5f, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x32, 0xd4, 0x03, - 0x0a, 0x11, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x53, 0x65, 0x72, 0x76, - 0x69, 0x63, 0x65, 0x12, 0x56, 0x0a, 0x0e, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x19, 0x2e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x2e, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x1a, 0x27, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, - 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, - 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x55, 0x0a, 0x0d, 0x47, - 0x65, 0x74, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x25, 0x2e, 0x66, - 0x69, 0x6c, 0x65, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, - 0x65, 0x74, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x1a, 0x1b, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, - 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, - 0x22, 0x00, 0x12, 0x5b, 0x0a, 0x10, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x41, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x28, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x2e, 0x73, 0x65, - 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x41, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x1a, 0x1b, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, - 0x76, 0x31, 0x2e, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x00, 0x12, - 0x5b, 0x0a, 0x10, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, - 0x65, 0x6e, 0x74, 0x12, 0x28, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, - 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x41, 0x74, 0x74, 0x61, - 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1b, 0x2e, + 0x0a, 0x0b, 0x5f, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x22, 0x9a, 0x01, + 0x0a, 0x17, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, + 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x3b, 0x0a, 0x0a, 0x61, 0x74, 0x74, + 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, - 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x00, 0x12, 0x56, 0x0a, 0x10, - 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, - 0x12, 0x28, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, - 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, - 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, - 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, - 0x74, 0x79, 0x22, 0x00, 0x42, 0x27, 0x5a, 0x25, 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x63, - 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x66, 0x69, - 0x6c, 0x65, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x0a, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x23, 0x0a, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, + 0x6f, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x00, 0x52, 0x0a, 0x6f, 0x70, + 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x88, 0x01, 0x01, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, + 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x22, 0x5d, 0x0a, 0x17, 0x44, 0x65, + 0x6c, 0x65, 0x74, 0x65, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, + 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x23, 0x0a, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, + 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x00, 0x52, 0x0a, 0x6f, 0x70, 0x65, + 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x88, 0x01, 0x01, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x6f, + 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x32, 0xd4, 0x03, 0x0a, 0x11, 0x41, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, + 0x56, 0x0a, 0x0e, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, + 0x74, 0x12, 0x19, 0x2e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x50, + 0x61, 0x67, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x66, + 0x69, 0x6c, 0x65, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, + 0x69, 0x73, 0x74, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, + 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x55, 0x0a, 0x0d, 0x47, 0x65, 0x74, 0x41, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x25, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x2e, + 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x41, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, + 0x1b, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, + 0x31, 0x2e, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x00, 0x12, 0x5b, + 0x0a, 0x10, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, + 0x6e, 0x74, 0x12, 0x28, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x41, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1b, 0x2e, 0x66, + 0x69, 0x6c, 0x65, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x00, 0x12, 0x5b, 0x0a, 0x10, 0x55, + 0x70, 0x64, 0x61, 0x74, 0x65, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x12, + 0x28, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, + 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, + 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1b, 0x2e, 0x66, 0x69, 0x6c, 0x65, + 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x00, 0x12, 0x56, 0x0a, 0x10, 0x44, 0x65, 0x6c, 0x65, + 0x74, 0x65, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x28, 0x2e, 0x66, + 0x69, 0x6c, 0x65, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x44, + 0x65, 0x6c, 0x65, 0x74, 0x65, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, + 0x42, 0xb5, 0x01, 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x2e, 0x73, 0x65, + 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x42, 0x0f, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x6d, 0x65, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2f, 0x6b, 0x72, 0x61, + 0x74, 0x6f, 0x73, 0x2d, 0x63, 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x70, 0x69, 0x2f, + 0x67, 0x6f, 0x2f, 0x66, 0x69, 0x6c, 0x65, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, + 0x76, 0x31, 0x3b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x46, + 0x53, 0x58, 0xaa, 0x02, 0x0f, 0x46, 0x69, 0x6c, 0x65, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0f, 0x46, 0x69, 0x6c, 0x65, 0x5c, 0x53, 0x65, 0x72, 0x76, + 0x69, 0x63, 0x65, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1b, 0x46, 0x69, 0x6c, 0x65, 0x5c, 0x53, 0x65, + 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, + 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x11, 0x46, 0x69, 0x6c, 0x65, 0x3a, 0x3a, 0x53, 0x65, 0x72, + 0x76, 0x69, 0x63, 0x65, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -583,14 +591,14 @@ func file_file_service_v1_attachment_proto_rawDescGZIP() []byte { var file_file_service_v1_attachment_proto_msgTypes = make([]protoimpl.MessageInfo, 6) var file_file_service_v1_attachment_proto_goTypes = []interface{}{ - (*Attachment)(nil), // 0: file.service.v1.Attachment - (*ListAttachmentResponse)(nil), // 1: file.service.v1.ListAttachmentResponse - (*GetAttachmentRequest)(nil), // 2: file.service.v1.GetAttachmentRequest - (*CreateAttachmentRequest)(nil), // 3: file.service.v1.CreateAttachmentRequest - (*UpdateAttachmentRequest)(nil), // 4: file.service.v1.UpdateAttachmentRequest - (*DeleteAttachmentRequest)(nil), // 5: file.service.v1.DeleteAttachmentRequest - (*pagination.PagingRequest)(nil), // 6: pagination.PagingRequest - (*emptypb.Empty)(nil), // 7: google.protobuf.Empty + (*Attachment)(nil), // 0: file.service.v1.Attachment + (*ListAttachmentResponse)(nil), // 1: file.service.v1.ListAttachmentResponse + (*GetAttachmentRequest)(nil), // 2: file.service.v1.GetAttachmentRequest + (*CreateAttachmentRequest)(nil), // 3: file.service.v1.CreateAttachmentRequest + (*UpdateAttachmentRequest)(nil), // 4: file.service.v1.UpdateAttachmentRequest + (*DeleteAttachmentRequest)(nil), // 5: file.service.v1.DeleteAttachmentRequest + (*v1.PagingRequest)(nil), // 6: pagination.PagingRequest + (*emptypb.Empty)(nil), // 7: google.protobuf.Empty } var file_file_service_v1_attachment_proto_depIdxs = []int32{ 0, // 0: file.service.v1.ListAttachmentResponse.items:type_name -> file.service.v1.Attachment diff --git a/blog-backend/gen/api/go/file/service/v1/attachment.pb.validate.go b/blog-backend/gen/api/go/file/service/v1/attachment.pb.validate.go index 165973bd..885c7812 100644 --- a/blog-backend/gen/api/go/file/service/v1/attachment.pb.validate.go +++ b/blog-backend/gen/api/go/file/service/v1/attachment.pb.validate.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-validate. DO NOT EDIT. // source: file/service/v1/attachment.proto -package v1 +package servicev1 import ( "bytes" diff --git a/blog-backend/gen/api/go/file/service/v1/attachment_grpc.pb.go b/blog-backend/gen/api/go/file/service/v1/attachment_grpc.pb.go index e0470e75..f39fcf28 100644 --- a/blog-backend/gen/api/go/file/service/v1/attachment_grpc.pb.go +++ b/blog-backend/gen/api/go/file/service/v1/attachment_grpc.pb.go @@ -4,15 +4,15 @@ // - protoc (unknown) // source: file/service/v1/attachment.proto -package v1 +package servicev1 import ( context "context" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" ) // This is a compile-time assertion to ensure that this generated file @@ -33,7 +33,7 @@ const ( // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type AttachmentServiceClient interface { // 获取附件列表 - ListAttachment(ctx context.Context, in *pagination.PagingRequest, opts ...grpc.CallOption) (*ListAttachmentResponse, error) + ListAttachment(ctx context.Context, in *v1.PagingRequest, opts ...grpc.CallOption) (*ListAttachmentResponse, error) // 获取附件数据 GetAttachment(ctx context.Context, in *GetAttachmentRequest, opts ...grpc.CallOption) (*Attachment, error) // 创建附件 @@ -52,7 +52,7 @@ func NewAttachmentServiceClient(cc grpc.ClientConnInterface) AttachmentServiceCl return &attachmentServiceClient{cc} } -func (c *attachmentServiceClient) ListAttachment(ctx context.Context, in *pagination.PagingRequest, opts ...grpc.CallOption) (*ListAttachmentResponse, error) { +func (c *attachmentServiceClient) ListAttachment(ctx context.Context, in *v1.PagingRequest, opts ...grpc.CallOption) (*ListAttachmentResponse, error) { out := new(ListAttachmentResponse) err := c.cc.Invoke(ctx, AttachmentService_ListAttachment_FullMethodName, in, out, opts...) if err != nil { @@ -102,7 +102,7 @@ func (c *attachmentServiceClient) DeleteAttachment(ctx context.Context, in *Dele // for forward compatibility type AttachmentServiceServer interface { // 获取附件列表 - ListAttachment(context.Context, *pagination.PagingRequest) (*ListAttachmentResponse, error) + ListAttachment(context.Context, *v1.PagingRequest) (*ListAttachmentResponse, error) // 获取附件数据 GetAttachment(context.Context, *GetAttachmentRequest) (*Attachment, error) // 创建附件 @@ -118,7 +118,7 @@ type AttachmentServiceServer interface { type UnimplementedAttachmentServiceServer struct { } -func (UnimplementedAttachmentServiceServer) ListAttachment(context.Context, *pagination.PagingRequest) (*ListAttachmentResponse, error) { +func (UnimplementedAttachmentServiceServer) ListAttachment(context.Context, *v1.PagingRequest) (*ListAttachmentResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListAttachment not implemented") } func (UnimplementedAttachmentServiceServer) GetAttachment(context.Context, *GetAttachmentRequest) (*Attachment, error) { @@ -147,7 +147,7 @@ func RegisterAttachmentServiceServer(s grpc.ServiceRegistrar, srv AttachmentServ } func _AttachmentService_ListAttachment_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(pagination.PagingRequest) + in := new(v1.PagingRequest) if err := dec(in); err != nil { return nil, err } @@ -159,7 +159,7 @@ func _AttachmentService_ListAttachment_Handler(srv interface{}, ctx context.Cont FullMethod: AttachmentService_ListAttachment_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(AttachmentServiceServer).ListAttachment(ctx, req.(*pagination.PagingRequest)) + return srv.(AttachmentServiceServer).ListAttachment(ctx, req.(*v1.PagingRequest)) } return interceptor(ctx, in, info, handler) } diff --git a/blog-backend/gen/api/go/front/service/v1/front_error.pb.go b/blog-backend/gen/api/go/front/service/v1/front_error.pb.go index 9c621c4a..cb925d29 100644 --- a/blog-backend/gen/api/go/front/service/v1/front_error.pb.go +++ b/blog-backend/gen/api/go/front/service/v1/front_error.pb.go @@ -4,7 +4,7 @@ // protoc (unknown) // source: front/service/v1/front_error.proto -package v1 +package servicev1 import ( _ "github.com/go-kratos/kratos/v2/errors" @@ -159,10 +159,19 @@ var file_front_service_v1_front_error_proto_rawDesc = []byte{ 0x17, 0x0a, 0x0e, 0x55, 0x53, 0x45, 0x52, 0x5f, 0x4e, 0x4f, 0x54, 0x5f, 0x45, 0x58, 0x49, 0x53, 0x54, 0x10, 0x19, 0x1a, 0x03, 0xa8, 0x45, 0x6a, 0x12, 0x14, 0x0a, 0x0b, 0x55, 0x53, 0x45, 0x52, 0x5f, 0x46, 0x52, 0x45, 0x45, 0x5a, 0x45, 0x10, 0x1a, 0x1a, 0x03, 0xa8, 0x45, 0x6b, 0x1a, 0x04, - 0xa0, 0x45, 0xf4, 0x03, 0x42, 0x2b, 0x5a, 0x29, 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x63, - 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x66, 0x72, - 0x6f, 0x6e, 0x74, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x76, - 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0xa0, 0x45, 0xf4, 0x03, 0x42, 0xbb, 0x01, 0x0a, 0x14, 0x63, 0x6f, 0x6d, 0x2e, 0x66, 0x72, 0x6f, + 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x42, 0x0f, 0x46, + 0x72, 0x6f, 0x6e, 0x74, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, + 0x5a, 0x30, 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x63, 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, + 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x66, 0x72, 0x6f, 0x6e, 0x74, 0x2f, 0x73, 0x65, + 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, + 0x76, 0x31, 0xa2, 0x02, 0x03, 0x46, 0x53, 0x58, 0xaa, 0x02, 0x10, 0x46, 0x72, 0x6f, 0x6e, 0x74, + 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x10, 0x46, 0x72, + 0x6f, 0x6e, 0x74, 0x5c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x56, 0x31, 0xe2, 0x02, + 0x1c, 0x46, 0x72, 0x6f, 0x6e, 0x74, 0x5c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x56, + 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x12, + 0x46, 0x72, 0x6f, 0x6e, 0x74, 0x3a, 0x3a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x3a, 0x3a, + 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/blog-backend/gen/api/go/front/service/v1/front_error.pb.validate.go b/blog-backend/gen/api/go/front/service/v1/front_error.pb.validate.go index f512f833..48704f03 100644 --- a/blog-backend/gen/api/go/front/service/v1/front_error.pb.validate.go +++ b/blog-backend/gen/api/go/front/service/v1/front_error.pb.validate.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-validate. DO NOT EDIT. // source: front/service/v1/front_error.proto -package v1 +package servicev1 import ( "bytes" diff --git a/blog-backend/gen/api/go/front/service/v1/front_error_errors.pb.go b/blog-backend/gen/api/go/front/service/v1/front_error_errors.pb.go index 5c400bd4..5bceccb5 100644 --- a/blog-backend/gen/api/go/front/service/v1/front_error_errors.pb.go +++ b/blog-backend/gen/api/go/front/service/v1/front_error_errors.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go-errors. DO NOT EDIT. -package v1 +package servicev1 import ( fmt "fmt" diff --git a/blog-backend/gen/api/go/front/service/v1/i_attachment.pb.go b/blog-backend/gen/api/go/front/service/v1/i_attachment.pb.go index 2562c5be..bd642578 100644 --- a/blog-backend/gen/api/go/front/service/v1/i_attachment.pb.go +++ b/blog-backend/gen/api/go/front/service/v1/i_attachment.pb.go @@ -4,16 +4,16 @@ // protoc (unknown) // source: front/service/v1/i_attachment.proto -package v1 +package servicev1 import ( _ "github.com/google/gnostic/openapiv3" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" - v1 "kratos-cms/gen/api/go/file/service/v1" + v11 "kratos-cms/gen/api/go/file/service/v1" reflect "reflect" ) @@ -36,76 +36,85 @@ var file_front_service_v1_i_attachment_proto_rawDesc = []byte{ 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, - 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x22, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, - 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x70, 0x61, 0x67, 0x69, - 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x20, 0x66, 0x69, - 0x6c, 0x65, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x61, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0x9e, - 0x06, 0x0a, 0x11, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x53, 0x65, 0x72, - 0x76, 0x69, 0x63, 0x65, 0x12, 0x91, 0x01, 0x0a, 0x0e, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x19, 0x2e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, - 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, - 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x3b, 0xba, 0x47, 0x1c, - 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, - 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, - 0x02, 0x16, 0x12, 0x14, 0x2f, 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x61, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x95, 0x01, 0x0a, 0x0d, 0x47, 0x65, 0x74, - 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x25, 0x2e, 0x66, 0x69, 0x6c, - 0x65, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, - 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x1a, 0x1b, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, - 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x40, - 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, - 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, - 0xd3, 0xe4, 0x93, 0x02, 0x1b, 0x12, 0x19, 0x2f, 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, 0x2f, - 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, - 0x12, 0x99, 0x01, 0x0a, 0x10, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x41, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x28, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x2e, 0x73, 0x65, 0x72, - 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x41, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, - 0x1b, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, - 0x31, 0x2e, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3e, 0xba, 0x47, - 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, - 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, - 0x93, 0x02, 0x19, 0x3a, 0x01, 0x2a, 0x22, 0x14, 0x2f, 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, - 0x2f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x12, 0xa7, 0x01, 0x0a, - 0x10, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, + 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x20, 0x66, 0x69, 0x6c, 0x65, 0x2f, 0x73, + 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0x9e, 0x06, 0x0a, 0x11, 0x41, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, + 0x12, 0x91, 0x01, 0x0a, 0x0e, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, + 0x65, 0x6e, 0x74, 0x12, 0x19, 0x2e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x2e, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, + 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, + 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x3b, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, + 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, + 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x16, 0x12, 0x14, + 0x2f, 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, + 0x65, 0x6e, 0x74, 0x73, 0x12, 0x95, 0x01, 0x0a, 0x0d, 0x47, 0x65, 0x74, 0x41, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x25, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x2e, 0x73, 0x65, + 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x41, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1b, 0x2e, + 0x66, 0x69, 0x6c, 0x65, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, + 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x40, 0xba, 0x47, 0x1c, 0x5a, + 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, + 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, + 0x1b, 0x12, 0x19, 0x2f, 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x61, 0x74, 0x74, 0x61, + 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x99, 0x01, 0x0a, + 0x10, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x28, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, - 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1b, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x74, - 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x4c, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, + 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3e, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, - 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x27, 0x3a, - 0x0a, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x1a, 0x19, 0x2f, 0x62, 0x6c, - 0x6f, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, - 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x96, 0x01, 0x0a, 0x10, 0x44, 0x65, 0x6c, 0x65, 0x74, - 0x65, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x28, 0x2e, 0x66, 0x69, - 0x6c, 0x65, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, - 0x6c, 0x65, 0x74, 0x65, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x40, 0xba, - 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, - 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, - 0xe4, 0x93, 0x02, 0x1b, 0x2a, 0x19, 0x2f, 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x61, - 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x42, - 0x2b, 0x5a, 0x29, 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x63, 0x6d, 0x73, 0x2f, 0x67, 0x65, - 0x6e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x66, 0x72, 0x6f, 0x6e, 0x74, 0x2f, 0x73, - 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, + 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x19, 0x3a, + 0x01, 0x2a, 0x22, 0x14, 0x2f, 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x61, 0x74, 0x74, + 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x12, 0xa7, 0x01, 0x0a, 0x10, 0x55, 0x70, 0x64, + 0x61, 0x74, 0x65, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x28, 0x2e, + 0x66, 0x69, 0x6c, 0x65, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, + 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1b, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x2e, 0x73, + 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, + 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x4c, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, + 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, + 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x27, 0x3a, 0x0a, 0x61, 0x74, 0x74, + 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x1a, 0x19, 0x2f, 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, + 0x31, 0x2f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2f, 0x7b, 0x69, + 0x64, 0x7d, 0x12, 0x96, 0x01, 0x0a, 0x10, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x41, 0x74, 0x74, + 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x28, 0x2e, 0x66, 0x69, 0x6c, 0x65, 0x2e, 0x73, + 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, + 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x40, 0xba, 0x47, 0x1c, 0x5a, 0x1a, + 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, + 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1b, + 0x2a, 0x19, 0x2f, 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x61, 0x74, 0x74, 0x61, 0x63, + 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x42, 0xbc, 0x01, 0x0a, 0x14, + 0x63, 0x6f, 0x6d, 0x2e, 0x66, 0x72, 0x6f, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x2e, 0x76, 0x31, 0x42, 0x10, 0x49, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, + 0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x30, 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, + 0x2d, 0x63, 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, + 0x66, 0x72, 0x6f, 0x6e, 0x74, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, + 0x3b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x46, 0x53, 0x58, + 0xaa, 0x02, 0x10, 0x46, 0x72, 0x6f, 0x6e, 0x74, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, + 0x2e, 0x56, 0x31, 0xca, 0x02, 0x10, 0x46, 0x72, 0x6f, 0x6e, 0x74, 0x5c, 0x53, 0x65, 0x72, 0x76, + 0x69, 0x63, 0x65, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1c, 0x46, 0x72, 0x6f, 0x6e, 0x74, 0x5c, 0x53, + 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, + 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x12, 0x46, 0x72, 0x6f, 0x6e, 0x74, 0x3a, 0x3a, 0x53, + 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var file_front_service_v1_i_attachment_proto_goTypes = []interface{}{ - (*pagination.PagingRequest)(nil), // 0: pagination.PagingRequest - (*v1.GetAttachmentRequest)(nil), // 1: file.service.v1.GetAttachmentRequest - (*v1.CreateAttachmentRequest)(nil), // 2: file.service.v1.CreateAttachmentRequest - (*v1.UpdateAttachmentRequest)(nil), // 3: file.service.v1.UpdateAttachmentRequest - (*v1.DeleteAttachmentRequest)(nil), // 4: file.service.v1.DeleteAttachmentRequest - (*v1.ListAttachmentResponse)(nil), // 5: file.service.v1.ListAttachmentResponse - (*v1.Attachment)(nil), // 6: file.service.v1.Attachment - (*emptypb.Empty)(nil), // 7: google.protobuf.Empty + (*v1.PagingRequest)(nil), // 0: pagination.PagingRequest + (*v11.GetAttachmentRequest)(nil), // 1: file.service.v1.GetAttachmentRequest + (*v11.CreateAttachmentRequest)(nil), // 2: file.service.v1.CreateAttachmentRequest + (*v11.UpdateAttachmentRequest)(nil), // 3: file.service.v1.UpdateAttachmentRequest + (*v11.DeleteAttachmentRequest)(nil), // 4: file.service.v1.DeleteAttachmentRequest + (*v11.ListAttachmentResponse)(nil), // 5: file.service.v1.ListAttachmentResponse + (*v11.Attachment)(nil), // 6: file.service.v1.Attachment + (*emptypb.Empty)(nil), // 7: google.protobuf.Empty } var file_front_service_v1_i_attachment_proto_depIdxs = []int32{ 0, // 0: front.service.v1.AttachmentService.ListAttachment:input_type -> pagination.PagingRequest diff --git a/blog-backend/gen/api/go/front/service/v1/i_attachment.pb.validate.go b/blog-backend/gen/api/go/front/service/v1/i_attachment.pb.validate.go index 52569f47..cecfdd8d 100644 --- a/blog-backend/gen/api/go/front/service/v1/i_attachment.pb.validate.go +++ b/blog-backend/gen/api/go/front/service/v1/i_attachment.pb.validate.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-validate. DO NOT EDIT. // source: front/service/v1/i_attachment.proto -package v1 +package servicev1 import ( "bytes" diff --git a/blog-backend/gen/api/go/front/service/v1/i_attachment_grpc.pb.go b/blog-backend/gen/api/go/front/service/v1/i_attachment_grpc.pb.go index c762ad54..a08820f1 100644 --- a/blog-backend/gen/api/go/front/service/v1/i_attachment_grpc.pb.go +++ b/blog-backend/gen/api/go/front/service/v1/i_attachment_grpc.pb.go @@ -4,16 +4,16 @@ // - protoc (unknown) // source: front/service/v1/i_attachment.proto -package v1 +package servicev1 import ( context "context" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" - v1 "kratos-cms/gen/api/go/file/service/v1" + v11 "kratos-cms/gen/api/go/file/service/v1" ) // This is a compile-time assertion to ensure that this generated file @@ -34,15 +34,15 @@ const ( // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type AttachmentServiceClient interface { // 获取附件列表 - ListAttachment(ctx context.Context, in *pagination.PagingRequest, opts ...grpc.CallOption) (*v1.ListAttachmentResponse, error) + ListAttachment(ctx context.Context, in *v1.PagingRequest, opts ...grpc.CallOption) (*v11.ListAttachmentResponse, error) // 获取附件数据 - GetAttachment(ctx context.Context, in *v1.GetAttachmentRequest, opts ...grpc.CallOption) (*v1.Attachment, error) + GetAttachment(ctx context.Context, in *v11.GetAttachmentRequest, opts ...grpc.CallOption) (*v11.Attachment, error) // 创建附件 - CreateAttachment(ctx context.Context, in *v1.CreateAttachmentRequest, opts ...grpc.CallOption) (*v1.Attachment, error) + CreateAttachment(ctx context.Context, in *v11.CreateAttachmentRequest, opts ...grpc.CallOption) (*v11.Attachment, error) // 更新附件 - UpdateAttachment(ctx context.Context, in *v1.UpdateAttachmentRequest, opts ...grpc.CallOption) (*v1.Attachment, error) + UpdateAttachment(ctx context.Context, in *v11.UpdateAttachmentRequest, opts ...grpc.CallOption) (*v11.Attachment, error) // 删除附件 - DeleteAttachment(ctx context.Context, in *v1.DeleteAttachmentRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) + DeleteAttachment(ctx context.Context, in *v11.DeleteAttachmentRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) } type attachmentServiceClient struct { @@ -53,8 +53,8 @@ func NewAttachmentServiceClient(cc grpc.ClientConnInterface) AttachmentServiceCl return &attachmentServiceClient{cc} } -func (c *attachmentServiceClient) ListAttachment(ctx context.Context, in *pagination.PagingRequest, opts ...grpc.CallOption) (*v1.ListAttachmentResponse, error) { - out := new(v1.ListAttachmentResponse) +func (c *attachmentServiceClient) ListAttachment(ctx context.Context, in *v1.PagingRequest, opts ...grpc.CallOption) (*v11.ListAttachmentResponse, error) { + out := new(v11.ListAttachmentResponse) err := c.cc.Invoke(ctx, AttachmentService_ListAttachment_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -62,8 +62,8 @@ func (c *attachmentServiceClient) ListAttachment(ctx context.Context, in *pagina return out, nil } -func (c *attachmentServiceClient) GetAttachment(ctx context.Context, in *v1.GetAttachmentRequest, opts ...grpc.CallOption) (*v1.Attachment, error) { - out := new(v1.Attachment) +func (c *attachmentServiceClient) GetAttachment(ctx context.Context, in *v11.GetAttachmentRequest, opts ...grpc.CallOption) (*v11.Attachment, error) { + out := new(v11.Attachment) err := c.cc.Invoke(ctx, AttachmentService_GetAttachment_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -71,8 +71,8 @@ func (c *attachmentServiceClient) GetAttachment(ctx context.Context, in *v1.GetA return out, nil } -func (c *attachmentServiceClient) CreateAttachment(ctx context.Context, in *v1.CreateAttachmentRequest, opts ...grpc.CallOption) (*v1.Attachment, error) { - out := new(v1.Attachment) +func (c *attachmentServiceClient) CreateAttachment(ctx context.Context, in *v11.CreateAttachmentRequest, opts ...grpc.CallOption) (*v11.Attachment, error) { + out := new(v11.Attachment) err := c.cc.Invoke(ctx, AttachmentService_CreateAttachment_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -80,8 +80,8 @@ func (c *attachmentServiceClient) CreateAttachment(ctx context.Context, in *v1.C return out, nil } -func (c *attachmentServiceClient) UpdateAttachment(ctx context.Context, in *v1.UpdateAttachmentRequest, opts ...grpc.CallOption) (*v1.Attachment, error) { - out := new(v1.Attachment) +func (c *attachmentServiceClient) UpdateAttachment(ctx context.Context, in *v11.UpdateAttachmentRequest, opts ...grpc.CallOption) (*v11.Attachment, error) { + out := new(v11.Attachment) err := c.cc.Invoke(ctx, AttachmentService_UpdateAttachment_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -89,7 +89,7 @@ func (c *attachmentServiceClient) UpdateAttachment(ctx context.Context, in *v1.U return out, nil } -func (c *attachmentServiceClient) DeleteAttachment(ctx context.Context, in *v1.DeleteAttachmentRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { +func (c *attachmentServiceClient) DeleteAttachment(ctx context.Context, in *v11.DeleteAttachmentRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { out := new(emptypb.Empty) err := c.cc.Invoke(ctx, AttachmentService_DeleteAttachment_FullMethodName, in, out, opts...) if err != nil { @@ -103,15 +103,15 @@ func (c *attachmentServiceClient) DeleteAttachment(ctx context.Context, in *v1.D // for forward compatibility type AttachmentServiceServer interface { // 获取附件列表 - ListAttachment(context.Context, *pagination.PagingRequest) (*v1.ListAttachmentResponse, error) + ListAttachment(context.Context, *v1.PagingRequest) (*v11.ListAttachmentResponse, error) // 获取附件数据 - GetAttachment(context.Context, *v1.GetAttachmentRequest) (*v1.Attachment, error) + GetAttachment(context.Context, *v11.GetAttachmentRequest) (*v11.Attachment, error) // 创建附件 - CreateAttachment(context.Context, *v1.CreateAttachmentRequest) (*v1.Attachment, error) + CreateAttachment(context.Context, *v11.CreateAttachmentRequest) (*v11.Attachment, error) // 更新附件 - UpdateAttachment(context.Context, *v1.UpdateAttachmentRequest) (*v1.Attachment, error) + UpdateAttachment(context.Context, *v11.UpdateAttachmentRequest) (*v11.Attachment, error) // 删除附件 - DeleteAttachment(context.Context, *v1.DeleteAttachmentRequest) (*emptypb.Empty, error) + DeleteAttachment(context.Context, *v11.DeleteAttachmentRequest) (*emptypb.Empty, error) mustEmbedUnimplementedAttachmentServiceServer() } @@ -119,19 +119,19 @@ type AttachmentServiceServer interface { type UnimplementedAttachmentServiceServer struct { } -func (UnimplementedAttachmentServiceServer) ListAttachment(context.Context, *pagination.PagingRequest) (*v1.ListAttachmentResponse, error) { +func (UnimplementedAttachmentServiceServer) ListAttachment(context.Context, *v1.PagingRequest) (*v11.ListAttachmentResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListAttachment not implemented") } -func (UnimplementedAttachmentServiceServer) GetAttachment(context.Context, *v1.GetAttachmentRequest) (*v1.Attachment, error) { +func (UnimplementedAttachmentServiceServer) GetAttachment(context.Context, *v11.GetAttachmentRequest) (*v11.Attachment, error) { return nil, status.Errorf(codes.Unimplemented, "method GetAttachment not implemented") } -func (UnimplementedAttachmentServiceServer) CreateAttachment(context.Context, *v1.CreateAttachmentRequest) (*v1.Attachment, error) { +func (UnimplementedAttachmentServiceServer) CreateAttachment(context.Context, *v11.CreateAttachmentRequest) (*v11.Attachment, error) { return nil, status.Errorf(codes.Unimplemented, "method CreateAttachment not implemented") } -func (UnimplementedAttachmentServiceServer) UpdateAttachment(context.Context, *v1.UpdateAttachmentRequest) (*v1.Attachment, error) { +func (UnimplementedAttachmentServiceServer) UpdateAttachment(context.Context, *v11.UpdateAttachmentRequest) (*v11.Attachment, error) { return nil, status.Errorf(codes.Unimplemented, "method UpdateAttachment not implemented") } -func (UnimplementedAttachmentServiceServer) DeleteAttachment(context.Context, *v1.DeleteAttachmentRequest) (*emptypb.Empty, error) { +func (UnimplementedAttachmentServiceServer) DeleteAttachment(context.Context, *v11.DeleteAttachmentRequest) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method DeleteAttachment not implemented") } func (UnimplementedAttachmentServiceServer) mustEmbedUnimplementedAttachmentServiceServer() {} @@ -148,7 +148,7 @@ func RegisterAttachmentServiceServer(s grpc.ServiceRegistrar, srv AttachmentServ } func _AttachmentService_ListAttachment_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(pagination.PagingRequest) + in := new(v1.PagingRequest) if err := dec(in); err != nil { return nil, err } @@ -160,13 +160,13 @@ func _AttachmentService_ListAttachment_Handler(srv interface{}, ctx context.Cont FullMethod: AttachmentService_ListAttachment_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(AttachmentServiceServer).ListAttachment(ctx, req.(*pagination.PagingRequest)) + return srv.(AttachmentServiceServer).ListAttachment(ctx, req.(*v1.PagingRequest)) } return interceptor(ctx, in, info, handler) } func _AttachmentService_GetAttachment_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.GetAttachmentRequest) + in := new(v11.GetAttachmentRequest) if err := dec(in); err != nil { return nil, err } @@ -178,13 +178,13 @@ func _AttachmentService_GetAttachment_Handler(srv interface{}, ctx context.Conte FullMethod: AttachmentService_GetAttachment_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(AttachmentServiceServer).GetAttachment(ctx, req.(*v1.GetAttachmentRequest)) + return srv.(AttachmentServiceServer).GetAttachment(ctx, req.(*v11.GetAttachmentRequest)) } return interceptor(ctx, in, info, handler) } func _AttachmentService_CreateAttachment_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.CreateAttachmentRequest) + in := new(v11.CreateAttachmentRequest) if err := dec(in); err != nil { return nil, err } @@ -196,13 +196,13 @@ func _AttachmentService_CreateAttachment_Handler(srv interface{}, ctx context.Co FullMethod: AttachmentService_CreateAttachment_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(AttachmentServiceServer).CreateAttachment(ctx, req.(*v1.CreateAttachmentRequest)) + return srv.(AttachmentServiceServer).CreateAttachment(ctx, req.(*v11.CreateAttachmentRequest)) } return interceptor(ctx, in, info, handler) } func _AttachmentService_UpdateAttachment_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.UpdateAttachmentRequest) + in := new(v11.UpdateAttachmentRequest) if err := dec(in); err != nil { return nil, err } @@ -214,13 +214,13 @@ func _AttachmentService_UpdateAttachment_Handler(srv interface{}, ctx context.Co FullMethod: AttachmentService_UpdateAttachment_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(AttachmentServiceServer).UpdateAttachment(ctx, req.(*v1.UpdateAttachmentRequest)) + return srv.(AttachmentServiceServer).UpdateAttachment(ctx, req.(*v11.UpdateAttachmentRequest)) } return interceptor(ctx, in, info, handler) } func _AttachmentService_DeleteAttachment_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.DeleteAttachmentRequest) + in := new(v11.DeleteAttachmentRequest) if err := dec(in); err != nil { return nil, err } @@ -232,7 +232,7 @@ func _AttachmentService_DeleteAttachment_Handler(srv interface{}, ctx context.Co FullMethod: AttachmentService_DeleteAttachment_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(AttachmentServiceServer).DeleteAttachment(ctx, req.(*v1.DeleteAttachmentRequest)) + return srv.(AttachmentServiceServer).DeleteAttachment(ctx, req.(*v11.DeleteAttachmentRequest)) } return interceptor(ctx, in, info, handler) } diff --git a/blog-backend/gen/api/go/front/service/v1/i_attachment_http.pb.go b/blog-backend/gen/api/go/front/service/v1/i_attachment_http.pb.go index 417e60ff..b980a848 100644 --- a/blog-backend/gen/api/go/front/service/v1/i_attachment_http.pb.go +++ b/blog-backend/gen/api/go/front/service/v1/i_attachment_http.pb.go @@ -4,15 +4,15 @@ // - protoc (unknown) // source: front/service/v1/i_attachment.proto -package v1 +package servicev1 import ( context "context" http "github.com/go-kratos/kratos/v2/transport/http" binding "github.com/go-kratos/kratos/v2/transport/http/binding" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" - v1 "kratos-cms/gen/api/go/file/service/v1" + v11 "kratos-cms/gen/api/go/file/service/v1" ) // This is a compile-time assertion to ensure that this generated file @@ -30,15 +30,15 @@ const OperationAttachmentServiceUpdateAttachment = "/front.service.v1.Attachment type AttachmentServiceHTTPServer interface { // CreateAttachment 创建附件 - CreateAttachment(context.Context, *v1.CreateAttachmentRequest) (*v1.Attachment, error) + CreateAttachment(context.Context, *v11.CreateAttachmentRequest) (*v11.Attachment, error) // DeleteAttachment 删除附件 - DeleteAttachment(context.Context, *v1.DeleteAttachmentRequest) (*emptypb.Empty, error) + DeleteAttachment(context.Context, *v11.DeleteAttachmentRequest) (*emptypb.Empty, error) // GetAttachment 获取附件数据 - GetAttachment(context.Context, *v1.GetAttachmentRequest) (*v1.Attachment, error) + GetAttachment(context.Context, *v11.GetAttachmentRequest) (*v11.Attachment, error) // ListAttachment 获取附件列表 - ListAttachment(context.Context, *pagination.PagingRequest) (*v1.ListAttachmentResponse, error) + ListAttachment(context.Context, *v1.PagingRequest) (*v11.ListAttachmentResponse, error) // UpdateAttachment 更新附件 - UpdateAttachment(context.Context, *v1.UpdateAttachmentRequest) (*v1.Attachment, error) + UpdateAttachment(context.Context, *v11.UpdateAttachmentRequest) (*v11.Attachment, error) } func RegisterAttachmentServiceHTTPServer(s *http.Server, srv AttachmentServiceHTTPServer) { @@ -52,26 +52,26 @@ func RegisterAttachmentServiceHTTPServer(s *http.Server, srv AttachmentServiceHT func _AttachmentService_ListAttachment0_HTTP_Handler(srv AttachmentServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in pagination.PagingRequest + var in v1.PagingRequest if err := ctx.BindQuery(&in); err != nil { return err } http.SetOperation(ctx, OperationAttachmentServiceListAttachment) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.ListAttachment(ctx, req.(*pagination.PagingRequest)) + return srv.ListAttachment(ctx, req.(*v1.PagingRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.ListAttachmentResponse) + reply := out.(*v11.ListAttachmentResponse) return ctx.Result(200, reply) } } func _AttachmentService_GetAttachment0_HTTP_Handler(srv AttachmentServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.GetAttachmentRequest + var in v11.GetAttachmentRequest if err := ctx.BindQuery(&in); err != nil { return err } @@ -80,20 +80,20 @@ func _AttachmentService_GetAttachment0_HTTP_Handler(srv AttachmentServiceHTTPSer } http.SetOperation(ctx, OperationAttachmentServiceGetAttachment) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.GetAttachment(ctx, req.(*v1.GetAttachmentRequest)) + return srv.GetAttachment(ctx, req.(*v11.GetAttachmentRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.Attachment) + reply := out.(*v11.Attachment) return ctx.Result(200, reply) } } func _AttachmentService_CreateAttachment0_HTTP_Handler(srv AttachmentServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.CreateAttachmentRequest + var in v11.CreateAttachmentRequest if err := ctx.Bind(&in); err != nil { return err } @@ -102,20 +102,20 @@ func _AttachmentService_CreateAttachment0_HTTP_Handler(srv AttachmentServiceHTTP } http.SetOperation(ctx, OperationAttachmentServiceCreateAttachment) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.CreateAttachment(ctx, req.(*v1.CreateAttachmentRequest)) + return srv.CreateAttachment(ctx, req.(*v11.CreateAttachmentRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.Attachment) + reply := out.(*v11.Attachment) return ctx.Result(200, reply) } } func _AttachmentService_UpdateAttachment0_HTTP_Handler(srv AttachmentServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.UpdateAttachmentRequest + var in v11.UpdateAttachmentRequest if err := ctx.Bind(&in.Attachment); err != nil { return err } @@ -127,20 +127,20 @@ func _AttachmentService_UpdateAttachment0_HTTP_Handler(srv AttachmentServiceHTTP } http.SetOperation(ctx, OperationAttachmentServiceUpdateAttachment) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.UpdateAttachment(ctx, req.(*v1.UpdateAttachmentRequest)) + return srv.UpdateAttachment(ctx, req.(*v11.UpdateAttachmentRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.Attachment) + reply := out.(*v11.Attachment) return ctx.Result(200, reply) } } func _AttachmentService_DeleteAttachment0_HTTP_Handler(srv AttachmentServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.DeleteAttachmentRequest + var in v11.DeleteAttachmentRequest if err := ctx.BindQuery(&in); err != nil { return err } @@ -149,7 +149,7 @@ func _AttachmentService_DeleteAttachment0_HTTP_Handler(srv AttachmentServiceHTTP } http.SetOperation(ctx, OperationAttachmentServiceDeleteAttachment) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.DeleteAttachment(ctx, req.(*v1.DeleteAttachmentRequest)) + return srv.DeleteAttachment(ctx, req.(*v11.DeleteAttachmentRequest)) }) out, err := h(ctx, &in) if err != nil { @@ -161,11 +161,11 @@ func _AttachmentService_DeleteAttachment0_HTTP_Handler(srv AttachmentServiceHTTP } type AttachmentServiceHTTPClient interface { - CreateAttachment(ctx context.Context, req *v1.CreateAttachmentRequest, opts ...http.CallOption) (rsp *v1.Attachment, err error) - DeleteAttachment(ctx context.Context, req *v1.DeleteAttachmentRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error) - GetAttachment(ctx context.Context, req *v1.GetAttachmentRequest, opts ...http.CallOption) (rsp *v1.Attachment, err error) - ListAttachment(ctx context.Context, req *pagination.PagingRequest, opts ...http.CallOption) (rsp *v1.ListAttachmentResponse, err error) - UpdateAttachment(ctx context.Context, req *v1.UpdateAttachmentRequest, opts ...http.CallOption) (rsp *v1.Attachment, err error) + CreateAttachment(ctx context.Context, req *v11.CreateAttachmentRequest, opts ...http.CallOption) (rsp *v11.Attachment, err error) + DeleteAttachment(ctx context.Context, req *v11.DeleteAttachmentRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error) + GetAttachment(ctx context.Context, req *v11.GetAttachmentRequest, opts ...http.CallOption) (rsp *v11.Attachment, err error) + ListAttachment(ctx context.Context, req *v1.PagingRequest, opts ...http.CallOption) (rsp *v11.ListAttachmentResponse, err error) + UpdateAttachment(ctx context.Context, req *v11.UpdateAttachmentRequest, opts ...http.CallOption) (rsp *v11.Attachment, err error) } type AttachmentServiceHTTPClientImpl struct { @@ -176,8 +176,8 @@ func NewAttachmentServiceHTTPClient(client *http.Client) AttachmentServiceHTTPCl return &AttachmentServiceHTTPClientImpl{client} } -func (c *AttachmentServiceHTTPClientImpl) CreateAttachment(ctx context.Context, in *v1.CreateAttachmentRequest, opts ...http.CallOption) (*v1.Attachment, error) { - var out v1.Attachment +func (c *AttachmentServiceHTTPClientImpl) CreateAttachment(ctx context.Context, in *v11.CreateAttachmentRequest, opts ...http.CallOption) (*v11.Attachment, error) { + var out v11.Attachment pattern := "/blog/v1/attachments" path := binding.EncodeURL(pattern, in, false) opts = append(opts, http.Operation(OperationAttachmentServiceCreateAttachment)) @@ -189,7 +189,7 @@ func (c *AttachmentServiceHTTPClientImpl) CreateAttachment(ctx context.Context, return &out, err } -func (c *AttachmentServiceHTTPClientImpl) DeleteAttachment(ctx context.Context, in *v1.DeleteAttachmentRequest, opts ...http.CallOption) (*emptypb.Empty, error) { +func (c *AttachmentServiceHTTPClientImpl) DeleteAttachment(ctx context.Context, in *v11.DeleteAttachmentRequest, opts ...http.CallOption) (*emptypb.Empty, error) { var out emptypb.Empty pattern := "/blog/v1/attachments/{id}" path := binding.EncodeURL(pattern, in, true) @@ -202,8 +202,8 @@ func (c *AttachmentServiceHTTPClientImpl) DeleteAttachment(ctx context.Context, return &out, err } -func (c *AttachmentServiceHTTPClientImpl) GetAttachment(ctx context.Context, in *v1.GetAttachmentRequest, opts ...http.CallOption) (*v1.Attachment, error) { - var out v1.Attachment +func (c *AttachmentServiceHTTPClientImpl) GetAttachment(ctx context.Context, in *v11.GetAttachmentRequest, opts ...http.CallOption) (*v11.Attachment, error) { + var out v11.Attachment pattern := "/blog/v1/attachments/{id}" path := binding.EncodeURL(pattern, in, true) opts = append(opts, http.Operation(OperationAttachmentServiceGetAttachment)) @@ -215,8 +215,8 @@ func (c *AttachmentServiceHTTPClientImpl) GetAttachment(ctx context.Context, in return &out, err } -func (c *AttachmentServiceHTTPClientImpl) ListAttachment(ctx context.Context, in *pagination.PagingRequest, opts ...http.CallOption) (*v1.ListAttachmentResponse, error) { - var out v1.ListAttachmentResponse +func (c *AttachmentServiceHTTPClientImpl) ListAttachment(ctx context.Context, in *v1.PagingRequest, opts ...http.CallOption) (*v11.ListAttachmentResponse, error) { + var out v11.ListAttachmentResponse pattern := "/blog/v1/attachments" path := binding.EncodeURL(pattern, in, true) opts = append(opts, http.Operation(OperationAttachmentServiceListAttachment)) @@ -228,8 +228,8 @@ func (c *AttachmentServiceHTTPClientImpl) ListAttachment(ctx context.Context, in return &out, err } -func (c *AttachmentServiceHTTPClientImpl) UpdateAttachment(ctx context.Context, in *v1.UpdateAttachmentRequest, opts ...http.CallOption) (*v1.Attachment, error) { - var out v1.Attachment +func (c *AttachmentServiceHTTPClientImpl) UpdateAttachment(ctx context.Context, in *v11.UpdateAttachmentRequest, opts ...http.CallOption) (*v11.Attachment, error) { + var out v11.Attachment pattern := "/blog/v1/attachments/{id}" path := binding.EncodeURL(pattern, in, false) opts = append(opts, http.Operation(OperationAttachmentServiceUpdateAttachment)) diff --git a/blog-backend/gen/api/go/front/service/v1/i_authentication.pb.go b/blog-backend/gen/api/go/front/service/v1/i_authentication.pb.go index 4d77d18b..82ba6da8 100644 --- a/blog-backend/gen/api/go/front/service/v1/i_authentication.pb.go +++ b/blog-backend/gen/api/go/front/service/v1/i_authentication.pb.go @@ -4,7 +4,7 @@ // protoc (unknown) // source: front/service/v1/i_authentication.proto -package v1 +package servicev1 import ( _ "github.com/google/gnostic/openapiv3" @@ -323,10 +323,20 @@ var file_front_service_v1_i_authentication_proto_rawDesc = []byte{ 0x2e, 0x55, 0x73, 0x65, 0x72, 0x22, 0x32, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x0d, 0x12, 0x0b, 0x2f, 0x62, - 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x6d, 0x65, 0x42, 0x2b, 0x5a, 0x29, 0x6b, 0x72, 0x61, - 0x74, 0x6f, 0x73, 0x2d, 0x63, 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x70, 0x69, 0x2f, - 0x67, 0x6f, 0x2f, 0x66, 0x72, 0x6f, 0x6e, 0x74, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, - 0x2f, 0x76, 0x31, 0x3b, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x6d, 0x65, 0x42, 0xc0, 0x01, 0x0a, 0x14, 0x63, 0x6f, + 0x6d, 0x2e, 0x66, 0x72, 0x6f, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, + 0x76, 0x31, 0x42, 0x14, 0x49, 0x41, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x30, 0x6b, 0x72, 0x61, 0x74, + 0x6f, 0x73, 0x2d, 0x63, 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, + 0x6f, 0x2f, 0x66, 0x72, 0x6f, 0x6e, 0x74, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, + 0x76, 0x31, 0x3b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x46, + 0x53, 0x58, 0xaa, 0x02, 0x10, 0x46, 0x72, 0x6f, 0x6e, 0x74, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, + 0x63, 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x10, 0x46, 0x72, 0x6f, 0x6e, 0x74, 0x5c, 0x53, 0x65, + 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1c, 0x46, 0x72, 0x6f, 0x6e, 0x74, + 0x5c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, + 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x12, 0x46, 0x72, 0x6f, 0x6e, 0x74, 0x3a, + 0x3a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/blog-backend/gen/api/go/front/service/v1/i_authentication.pb.validate.go b/blog-backend/gen/api/go/front/service/v1/i_authentication.pb.validate.go index c59511bc..dfcba69f 100644 --- a/blog-backend/gen/api/go/front/service/v1/i_authentication.pb.validate.go +++ b/blog-backend/gen/api/go/front/service/v1/i_authentication.pb.validate.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-validate. DO NOT EDIT. // source: front/service/v1/i_authentication.proto -package v1 +package servicev1 import ( "bytes" diff --git a/blog-backend/gen/api/go/front/service/v1/i_authentication_grpc.pb.go b/blog-backend/gen/api/go/front/service/v1/i_authentication_grpc.pb.go index 8a056104..dba064fa 100644 --- a/blog-backend/gen/api/go/front/service/v1/i_authentication_grpc.pb.go +++ b/blog-backend/gen/api/go/front/service/v1/i_authentication_grpc.pb.go @@ -4,7 +4,7 @@ // - protoc (unknown) // source: front/service/v1/i_authentication.proto -package v1 +package servicev1 import ( context "context" diff --git a/blog-backend/gen/api/go/front/service/v1/i_authentication_http.pb.go b/blog-backend/gen/api/go/front/service/v1/i_authentication_http.pb.go index 2a0aa93d..cb654978 100644 --- a/blog-backend/gen/api/go/front/service/v1/i_authentication_http.pb.go +++ b/blog-backend/gen/api/go/front/service/v1/i_authentication_http.pb.go @@ -4,7 +4,7 @@ // - protoc (unknown) // source: front/service/v1/i_authentication.proto -package v1 +package servicev1 import ( context "context" diff --git a/blog-backend/gen/api/go/front/service/v1/i_category.pb.go b/blog-backend/gen/api/go/front/service/v1/i_category.pb.go index b4f483f9..c63887eb 100644 --- a/blog-backend/gen/api/go/front/service/v1/i_category.pb.go +++ b/blog-backend/gen/api/go/front/service/v1/i_category.pb.go @@ -4,16 +4,16 @@ // protoc (unknown) // source: front/service/v1/i_category.proto -package v1 +package servicev1 import ( _ "github.com/google/gnostic/openapiv3" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" - v1 "kratos-cms/gen/api/go/content/service/v1" + v11 "kratos-cms/gen/api/go/content/service/v1" reflect "reflect" ) @@ -36,75 +36,84 @@ var file_front_service_v1_i_category_proto_rawDesc = []byte{ 0x67, 0x6c, 0x65, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x22, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, - 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x21, 0x63, 0x6f, 0x6e, 0x74, - 0x65, 0x6e, 0x74, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x63, - 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0x93, 0x06, - 0x0a, 0x0f, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, - 0x65, 0x12, 0x8f, 0x01, 0x0a, 0x0c, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, - 0x72, 0x79, 0x12, 0x19, 0x2e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, - 0x50, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x28, 0x2e, - 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, - 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x52, - 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x3a, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, - 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, - 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x15, 0x12, 0x13, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x21, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2f, + 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x61, 0x74, 0x65, 0x67, + 0x6f, 0x72, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0x93, 0x06, 0x0a, 0x0f, 0x43, 0x61, + 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x8f, 0x01, + 0x0a, 0x0c, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x12, 0x19, + 0x2e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x50, 0x61, 0x67, 0x69, + 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x28, 0x2e, 0x63, 0x6f, 0x6e, 0x74, + 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, + 0x69, 0x73, 0x74, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, + 0x6e, 0x73, 0x65, 0x22, 0x3a, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, + 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, + 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x15, 0x12, 0x13, 0x2f, 0x62, 0x6c, 0x6f, + 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x69, 0x65, 0x73, 0x12, + 0x94, 0x01, 0x0a, 0x0b, 0x47, 0x65, 0x74, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x12, + 0x26, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, + 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x61, 0x74, + 0x65, 0x67, 0x6f, 0x72, 0x79, 0x22, 0x3f, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, + 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, + 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1a, 0x12, 0x18, 0x2f, 0x62, + 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x69, 0x65, + 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x98, 0x01, 0x0a, 0x0e, 0x43, 0x72, 0x65, 0x61, 0x74, + 0x65, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x12, 0x29, 0x2e, 0x63, 0x6f, 0x6e, 0x74, + 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, + 0x72, 0x65, 0x61, 0x74, 0x65, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, + 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, + 0x72, 0x79, 0x22, 0x3d, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, + 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, + 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x18, 0x3a, 0x01, 0x2a, 0x22, 0x13, 0x2f, 0x62, + 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x69, 0x65, + 0x73, 0x12, 0xa4, 0x01, 0x0a, 0x0e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x61, 0x74, 0x65, + 0x67, 0x6f, 0x72, 0x79, 0x12, 0x29, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, + 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, + 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, + 0x1c, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x22, 0x49, 0xba, + 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, + 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, + 0xe4, 0x93, 0x02, 0x24, 0x3a, 0x08, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x1a, 0x18, 0x2f, 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, - 0x69, 0x65, 0x73, 0x12, 0x94, 0x01, 0x0a, 0x0b, 0x47, 0x65, 0x74, 0x43, 0x61, 0x74, 0x65, 0x67, - 0x6f, 0x72, 0x79, 0x12, 0x26, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, - 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x43, 0x61, 0x74, 0x65, - 0x67, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x63, 0x6f, + 0x69, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x94, 0x01, 0x0a, 0x0e, 0x44, 0x65, 0x6c, + 0x65, 0x74, 0x65, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x12, 0x29, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, - 0x2e, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x22, 0x3f, 0xba, 0x47, 0x1c, 0x5a, 0x1a, - 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, - 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1a, - 0x12, 0x18, 0x2f, 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x61, 0x74, 0x65, 0x67, - 0x6f, 0x72, 0x69, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x98, 0x01, 0x0a, 0x0e, 0x43, - 0x72, 0x65, 0x61, 0x74, 0x65, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x12, 0x29, 0x2e, - 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, - 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, - 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, - 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x61, - 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x22, 0x3d, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, - 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, - 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x18, 0x3a, 0x01, 0x2a, - 0x22, 0x13, 0x2f, 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x61, 0x74, 0x65, 0x67, - 0x6f, 0x72, 0x69, 0x65, 0x73, 0x12, 0xa4, 0x01, 0x0a, 0x0e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, - 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x12, 0x29, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, - 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, - 0x64, 0x61, 0x74, 0x65, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, - 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, - 0x79, 0x22, 0x49, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, - 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, - 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x24, 0x3a, 0x08, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, - 0x72, 0x79, 0x1a, 0x18, 0x2f, 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x61, 0x74, - 0x65, 0x67, 0x6f, 0x72, 0x69, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x94, 0x01, 0x0a, - 0x0e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x12, - 0x29, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, - 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x61, 0x74, 0x65, 0x67, - 0x6f, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, - 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, - 0x74, 0x79, 0x22, 0x3f, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, - 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, - 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1a, 0x2a, 0x18, 0x2f, 0x62, 0x6c, 0x6f, 0x67, - 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x69, 0x65, 0x73, 0x2f, 0x7b, - 0x69, 0x64, 0x7d, 0x42, 0x2b, 0x5a, 0x29, 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x63, 0x6d, - 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x66, 0x72, 0x6f, - 0x6e, 0x74, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x76, 0x31, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x79, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x3f, + 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, + 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, + 0xd3, 0xe4, 0x93, 0x02, 0x1a, 0x2a, 0x18, 0x2f, 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, 0x2f, + 0x63, 0x61, 0x74, 0x65, 0x67, 0x6f, 0x72, 0x69, 0x65, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x42, + 0xba, 0x01, 0x0a, 0x14, 0x63, 0x6f, 0x6d, 0x2e, 0x66, 0x72, 0x6f, 0x6e, 0x74, 0x2e, 0x73, 0x65, + 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x42, 0x0e, 0x49, 0x43, 0x61, 0x74, 0x65, 0x67, + 0x6f, 0x72, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x30, 0x6b, 0x72, 0x61, 0x74, + 0x6f, 0x73, 0x2d, 0x63, 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, + 0x6f, 0x2f, 0x66, 0x72, 0x6f, 0x6e, 0x74, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, + 0x76, 0x31, 0x3b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x46, + 0x53, 0x58, 0xaa, 0x02, 0x10, 0x46, 0x72, 0x6f, 0x6e, 0x74, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, + 0x63, 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x10, 0x46, 0x72, 0x6f, 0x6e, 0x74, 0x5c, 0x53, 0x65, + 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1c, 0x46, 0x72, 0x6f, 0x6e, 0x74, + 0x5c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, + 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x12, 0x46, 0x72, 0x6f, 0x6e, 0x74, 0x3a, + 0x3a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var file_front_service_v1_i_category_proto_goTypes = []interface{}{ - (*pagination.PagingRequest)(nil), // 0: pagination.PagingRequest - (*v1.GetCategoryRequest)(nil), // 1: content.service.v1.GetCategoryRequest - (*v1.CreateCategoryRequest)(nil), // 2: content.service.v1.CreateCategoryRequest - (*v1.UpdateCategoryRequest)(nil), // 3: content.service.v1.UpdateCategoryRequest - (*v1.DeleteCategoryRequest)(nil), // 4: content.service.v1.DeleteCategoryRequest - (*v1.ListCategoryResponse)(nil), // 5: content.service.v1.ListCategoryResponse - (*v1.Category)(nil), // 6: content.service.v1.Category - (*emptypb.Empty)(nil), // 7: google.protobuf.Empty + (*v1.PagingRequest)(nil), // 0: pagination.PagingRequest + (*v11.GetCategoryRequest)(nil), // 1: content.service.v1.GetCategoryRequest + (*v11.CreateCategoryRequest)(nil), // 2: content.service.v1.CreateCategoryRequest + (*v11.UpdateCategoryRequest)(nil), // 3: content.service.v1.UpdateCategoryRequest + (*v11.DeleteCategoryRequest)(nil), // 4: content.service.v1.DeleteCategoryRequest + (*v11.ListCategoryResponse)(nil), // 5: content.service.v1.ListCategoryResponse + (*v11.Category)(nil), // 6: content.service.v1.Category + (*emptypb.Empty)(nil), // 7: google.protobuf.Empty } var file_front_service_v1_i_category_proto_depIdxs = []int32{ 0, // 0: front.service.v1.CategoryService.ListCategory:input_type -> pagination.PagingRequest diff --git a/blog-backend/gen/api/go/front/service/v1/i_category.pb.validate.go b/blog-backend/gen/api/go/front/service/v1/i_category.pb.validate.go index 3b9867e1..bbaa2a69 100644 --- a/blog-backend/gen/api/go/front/service/v1/i_category.pb.validate.go +++ b/blog-backend/gen/api/go/front/service/v1/i_category.pb.validate.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-validate. DO NOT EDIT. // source: front/service/v1/i_category.proto -package v1 +package servicev1 import ( "bytes" diff --git a/blog-backend/gen/api/go/front/service/v1/i_category_grpc.pb.go b/blog-backend/gen/api/go/front/service/v1/i_category_grpc.pb.go index 926ebe8a..3e04f808 100644 --- a/blog-backend/gen/api/go/front/service/v1/i_category_grpc.pb.go +++ b/blog-backend/gen/api/go/front/service/v1/i_category_grpc.pb.go @@ -4,16 +4,16 @@ // - protoc (unknown) // source: front/service/v1/i_category.proto -package v1 +package servicev1 import ( context "context" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" - v1 "kratos-cms/gen/api/go/content/service/v1" + v11 "kratos-cms/gen/api/go/content/service/v1" ) // This is a compile-time assertion to ensure that this generated file @@ -34,15 +34,15 @@ const ( // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type CategoryServiceClient interface { // 获取类别列表 - ListCategory(ctx context.Context, in *pagination.PagingRequest, opts ...grpc.CallOption) (*v1.ListCategoryResponse, error) + ListCategory(ctx context.Context, in *v1.PagingRequest, opts ...grpc.CallOption) (*v11.ListCategoryResponse, error) // 获取类别数据 - GetCategory(ctx context.Context, in *v1.GetCategoryRequest, opts ...grpc.CallOption) (*v1.Category, error) + GetCategory(ctx context.Context, in *v11.GetCategoryRequest, opts ...grpc.CallOption) (*v11.Category, error) // 创建类别 - CreateCategory(ctx context.Context, in *v1.CreateCategoryRequest, opts ...grpc.CallOption) (*v1.Category, error) + CreateCategory(ctx context.Context, in *v11.CreateCategoryRequest, opts ...grpc.CallOption) (*v11.Category, error) // 更新类别 - UpdateCategory(ctx context.Context, in *v1.UpdateCategoryRequest, opts ...grpc.CallOption) (*v1.Category, error) + UpdateCategory(ctx context.Context, in *v11.UpdateCategoryRequest, opts ...grpc.CallOption) (*v11.Category, error) // 删除类别 - DeleteCategory(ctx context.Context, in *v1.DeleteCategoryRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) + DeleteCategory(ctx context.Context, in *v11.DeleteCategoryRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) } type categoryServiceClient struct { @@ -53,8 +53,8 @@ func NewCategoryServiceClient(cc grpc.ClientConnInterface) CategoryServiceClient return &categoryServiceClient{cc} } -func (c *categoryServiceClient) ListCategory(ctx context.Context, in *pagination.PagingRequest, opts ...grpc.CallOption) (*v1.ListCategoryResponse, error) { - out := new(v1.ListCategoryResponse) +func (c *categoryServiceClient) ListCategory(ctx context.Context, in *v1.PagingRequest, opts ...grpc.CallOption) (*v11.ListCategoryResponse, error) { + out := new(v11.ListCategoryResponse) err := c.cc.Invoke(ctx, CategoryService_ListCategory_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -62,8 +62,8 @@ func (c *categoryServiceClient) ListCategory(ctx context.Context, in *pagination return out, nil } -func (c *categoryServiceClient) GetCategory(ctx context.Context, in *v1.GetCategoryRequest, opts ...grpc.CallOption) (*v1.Category, error) { - out := new(v1.Category) +func (c *categoryServiceClient) GetCategory(ctx context.Context, in *v11.GetCategoryRequest, opts ...grpc.CallOption) (*v11.Category, error) { + out := new(v11.Category) err := c.cc.Invoke(ctx, CategoryService_GetCategory_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -71,8 +71,8 @@ func (c *categoryServiceClient) GetCategory(ctx context.Context, in *v1.GetCateg return out, nil } -func (c *categoryServiceClient) CreateCategory(ctx context.Context, in *v1.CreateCategoryRequest, opts ...grpc.CallOption) (*v1.Category, error) { - out := new(v1.Category) +func (c *categoryServiceClient) CreateCategory(ctx context.Context, in *v11.CreateCategoryRequest, opts ...grpc.CallOption) (*v11.Category, error) { + out := new(v11.Category) err := c.cc.Invoke(ctx, CategoryService_CreateCategory_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -80,8 +80,8 @@ func (c *categoryServiceClient) CreateCategory(ctx context.Context, in *v1.Creat return out, nil } -func (c *categoryServiceClient) UpdateCategory(ctx context.Context, in *v1.UpdateCategoryRequest, opts ...grpc.CallOption) (*v1.Category, error) { - out := new(v1.Category) +func (c *categoryServiceClient) UpdateCategory(ctx context.Context, in *v11.UpdateCategoryRequest, opts ...grpc.CallOption) (*v11.Category, error) { + out := new(v11.Category) err := c.cc.Invoke(ctx, CategoryService_UpdateCategory_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -89,7 +89,7 @@ func (c *categoryServiceClient) UpdateCategory(ctx context.Context, in *v1.Updat return out, nil } -func (c *categoryServiceClient) DeleteCategory(ctx context.Context, in *v1.DeleteCategoryRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { +func (c *categoryServiceClient) DeleteCategory(ctx context.Context, in *v11.DeleteCategoryRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { out := new(emptypb.Empty) err := c.cc.Invoke(ctx, CategoryService_DeleteCategory_FullMethodName, in, out, opts...) if err != nil { @@ -103,15 +103,15 @@ func (c *categoryServiceClient) DeleteCategory(ctx context.Context, in *v1.Delet // for forward compatibility type CategoryServiceServer interface { // 获取类别列表 - ListCategory(context.Context, *pagination.PagingRequest) (*v1.ListCategoryResponse, error) + ListCategory(context.Context, *v1.PagingRequest) (*v11.ListCategoryResponse, error) // 获取类别数据 - GetCategory(context.Context, *v1.GetCategoryRequest) (*v1.Category, error) + GetCategory(context.Context, *v11.GetCategoryRequest) (*v11.Category, error) // 创建类别 - CreateCategory(context.Context, *v1.CreateCategoryRequest) (*v1.Category, error) + CreateCategory(context.Context, *v11.CreateCategoryRequest) (*v11.Category, error) // 更新类别 - UpdateCategory(context.Context, *v1.UpdateCategoryRequest) (*v1.Category, error) + UpdateCategory(context.Context, *v11.UpdateCategoryRequest) (*v11.Category, error) // 删除类别 - DeleteCategory(context.Context, *v1.DeleteCategoryRequest) (*emptypb.Empty, error) + DeleteCategory(context.Context, *v11.DeleteCategoryRequest) (*emptypb.Empty, error) mustEmbedUnimplementedCategoryServiceServer() } @@ -119,19 +119,19 @@ type CategoryServiceServer interface { type UnimplementedCategoryServiceServer struct { } -func (UnimplementedCategoryServiceServer) ListCategory(context.Context, *pagination.PagingRequest) (*v1.ListCategoryResponse, error) { +func (UnimplementedCategoryServiceServer) ListCategory(context.Context, *v1.PagingRequest) (*v11.ListCategoryResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListCategory not implemented") } -func (UnimplementedCategoryServiceServer) GetCategory(context.Context, *v1.GetCategoryRequest) (*v1.Category, error) { +func (UnimplementedCategoryServiceServer) GetCategory(context.Context, *v11.GetCategoryRequest) (*v11.Category, error) { return nil, status.Errorf(codes.Unimplemented, "method GetCategory not implemented") } -func (UnimplementedCategoryServiceServer) CreateCategory(context.Context, *v1.CreateCategoryRequest) (*v1.Category, error) { +func (UnimplementedCategoryServiceServer) CreateCategory(context.Context, *v11.CreateCategoryRequest) (*v11.Category, error) { return nil, status.Errorf(codes.Unimplemented, "method CreateCategory not implemented") } -func (UnimplementedCategoryServiceServer) UpdateCategory(context.Context, *v1.UpdateCategoryRequest) (*v1.Category, error) { +func (UnimplementedCategoryServiceServer) UpdateCategory(context.Context, *v11.UpdateCategoryRequest) (*v11.Category, error) { return nil, status.Errorf(codes.Unimplemented, "method UpdateCategory not implemented") } -func (UnimplementedCategoryServiceServer) DeleteCategory(context.Context, *v1.DeleteCategoryRequest) (*emptypb.Empty, error) { +func (UnimplementedCategoryServiceServer) DeleteCategory(context.Context, *v11.DeleteCategoryRequest) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method DeleteCategory not implemented") } func (UnimplementedCategoryServiceServer) mustEmbedUnimplementedCategoryServiceServer() {} @@ -148,7 +148,7 @@ func RegisterCategoryServiceServer(s grpc.ServiceRegistrar, srv CategoryServiceS } func _CategoryService_ListCategory_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(pagination.PagingRequest) + in := new(v1.PagingRequest) if err := dec(in); err != nil { return nil, err } @@ -160,13 +160,13 @@ func _CategoryService_ListCategory_Handler(srv interface{}, ctx context.Context, FullMethod: CategoryService_ListCategory_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(CategoryServiceServer).ListCategory(ctx, req.(*pagination.PagingRequest)) + return srv.(CategoryServiceServer).ListCategory(ctx, req.(*v1.PagingRequest)) } return interceptor(ctx, in, info, handler) } func _CategoryService_GetCategory_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.GetCategoryRequest) + in := new(v11.GetCategoryRequest) if err := dec(in); err != nil { return nil, err } @@ -178,13 +178,13 @@ func _CategoryService_GetCategory_Handler(srv interface{}, ctx context.Context, FullMethod: CategoryService_GetCategory_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(CategoryServiceServer).GetCategory(ctx, req.(*v1.GetCategoryRequest)) + return srv.(CategoryServiceServer).GetCategory(ctx, req.(*v11.GetCategoryRequest)) } return interceptor(ctx, in, info, handler) } func _CategoryService_CreateCategory_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.CreateCategoryRequest) + in := new(v11.CreateCategoryRequest) if err := dec(in); err != nil { return nil, err } @@ -196,13 +196,13 @@ func _CategoryService_CreateCategory_Handler(srv interface{}, ctx context.Contex FullMethod: CategoryService_CreateCategory_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(CategoryServiceServer).CreateCategory(ctx, req.(*v1.CreateCategoryRequest)) + return srv.(CategoryServiceServer).CreateCategory(ctx, req.(*v11.CreateCategoryRequest)) } return interceptor(ctx, in, info, handler) } func _CategoryService_UpdateCategory_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.UpdateCategoryRequest) + in := new(v11.UpdateCategoryRequest) if err := dec(in); err != nil { return nil, err } @@ -214,13 +214,13 @@ func _CategoryService_UpdateCategory_Handler(srv interface{}, ctx context.Contex FullMethod: CategoryService_UpdateCategory_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(CategoryServiceServer).UpdateCategory(ctx, req.(*v1.UpdateCategoryRequest)) + return srv.(CategoryServiceServer).UpdateCategory(ctx, req.(*v11.UpdateCategoryRequest)) } return interceptor(ctx, in, info, handler) } func _CategoryService_DeleteCategory_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.DeleteCategoryRequest) + in := new(v11.DeleteCategoryRequest) if err := dec(in); err != nil { return nil, err } @@ -232,7 +232,7 @@ func _CategoryService_DeleteCategory_Handler(srv interface{}, ctx context.Contex FullMethod: CategoryService_DeleteCategory_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(CategoryServiceServer).DeleteCategory(ctx, req.(*v1.DeleteCategoryRequest)) + return srv.(CategoryServiceServer).DeleteCategory(ctx, req.(*v11.DeleteCategoryRequest)) } return interceptor(ctx, in, info, handler) } diff --git a/blog-backend/gen/api/go/front/service/v1/i_category_http.pb.go b/blog-backend/gen/api/go/front/service/v1/i_category_http.pb.go index 02446fa9..91d50bf6 100644 --- a/blog-backend/gen/api/go/front/service/v1/i_category_http.pb.go +++ b/blog-backend/gen/api/go/front/service/v1/i_category_http.pb.go @@ -4,15 +4,15 @@ // - protoc (unknown) // source: front/service/v1/i_category.proto -package v1 +package servicev1 import ( context "context" http "github.com/go-kratos/kratos/v2/transport/http" binding "github.com/go-kratos/kratos/v2/transport/http/binding" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" - v1 "kratos-cms/gen/api/go/content/service/v1" + v11 "kratos-cms/gen/api/go/content/service/v1" ) // This is a compile-time assertion to ensure that this generated file @@ -30,15 +30,15 @@ const OperationCategoryServiceUpdateCategory = "/front.service.v1.CategoryServic type CategoryServiceHTTPServer interface { // CreateCategory 创建类别 - CreateCategory(context.Context, *v1.CreateCategoryRequest) (*v1.Category, error) + CreateCategory(context.Context, *v11.CreateCategoryRequest) (*v11.Category, error) // DeleteCategory 删除类别 - DeleteCategory(context.Context, *v1.DeleteCategoryRequest) (*emptypb.Empty, error) + DeleteCategory(context.Context, *v11.DeleteCategoryRequest) (*emptypb.Empty, error) // GetCategory 获取类别数据 - GetCategory(context.Context, *v1.GetCategoryRequest) (*v1.Category, error) + GetCategory(context.Context, *v11.GetCategoryRequest) (*v11.Category, error) // ListCategory 获取类别列表 - ListCategory(context.Context, *pagination.PagingRequest) (*v1.ListCategoryResponse, error) + ListCategory(context.Context, *v1.PagingRequest) (*v11.ListCategoryResponse, error) // UpdateCategory 更新类别 - UpdateCategory(context.Context, *v1.UpdateCategoryRequest) (*v1.Category, error) + UpdateCategory(context.Context, *v11.UpdateCategoryRequest) (*v11.Category, error) } func RegisterCategoryServiceHTTPServer(s *http.Server, srv CategoryServiceHTTPServer) { @@ -52,26 +52,26 @@ func RegisterCategoryServiceHTTPServer(s *http.Server, srv CategoryServiceHTTPSe func _CategoryService_ListCategory0_HTTP_Handler(srv CategoryServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in pagination.PagingRequest + var in v1.PagingRequest if err := ctx.BindQuery(&in); err != nil { return err } http.SetOperation(ctx, OperationCategoryServiceListCategory) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.ListCategory(ctx, req.(*pagination.PagingRequest)) + return srv.ListCategory(ctx, req.(*v1.PagingRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.ListCategoryResponse) + reply := out.(*v11.ListCategoryResponse) return ctx.Result(200, reply) } } func _CategoryService_GetCategory0_HTTP_Handler(srv CategoryServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.GetCategoryRequest + var in v11.GetCategoryRequest if err := ctx.BindQuery(&in); err != nil { return err } @@ -80,20 +80,20 @@ func _CategoryService_GetCategory0_HTTP_Handler(srv CategoryServiceHTTPServer) f } http.SetOperation(ctx, OperationCategoryServiceGetCategory) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.GetCategory(ctx, req.(*v1.GetCategoryRequest)) + return srv.GetCategory(ctx, req.(*v11.GetCategoryRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.Category) + reply := out.(*v11.Category) return ctx.Result(200, reply) } } func _CategoryService_CreateCategory0_HTTP_Handler(srv CategoryServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.CreateCategoryRequest + var in v11.CreateCategoryRequest if err := ctx.Bind(&in); err != nil { return err } @@ -102,20 +102,20 @@ func _CategoryService_CreateCategory0_HTTP_Handler(srv CategoryServiceHTTPServer } http.SetOperation(ctx, OperationCategoryServiceCreateCategory) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.CreateCategory(ctx, req.(*v1.CreateCategoryRequest)) + return srv.CreateCategory(ctx, req.(*v11.CreateCategoryRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.Category) + reply := out.(*v11.Category) return ctx.Result(200, reply) } } func _CategoryService_UpdateCategory0_HTTP_Handler(srv CategoryServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.UpdateCategoryRequest + var in v11.UpdateCategoryRequest if err := ctx.Bind(&in.Category); err != nil { return err } @@ -127,20 +127,20 @@ func _CategoryService_UpdateCategory0_HTTP_Handler(srv CategoryServiceHTTPServer } http.SetOperation(ctx, OperationCategoryServiceUpdateCategory) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.UpdateCategory(ctx, req.(*v1.UpdateCategoryRequest)) + return srv.UpdateCategory(ctx, req.(*v11.UpdateCategoryRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.Category) + reply := out.(*v11.Category) return ctx.Result(200, reply) } } func _CategoryService_DeleteCategory0_HTTP_Handler(srv CategoryServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.DeleteCategoryRequest + var in v11.DeleteCategoryRequest if err := ctx.BindQuery(&in); err != nil { return err } @@ -149,7 +149,7 @@ func _CategoryService_DeleteCategory0_HTTP_Handler(srv CategoryServiceHTTPServer } http.SetOperation(ctx, OperationCategoryServiceDeleteCategory) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.DeleteCategory(ctx, req.(*v1.DeleteCategoryRequest)) + return srv.DeleteCategory(ctx, req.(*v11.DeleteCategoryRequest)) }) out, err := h(ctx, &in) if err != nil { @@ -161,11 +161,11 @@ func _CategoryService_DeleteCategory0_HTTP_Handler(srv CategoryServiceHTTPServer } type CategoryServiceHTTPClient interface { - CreateCategory(ctx context.Context, req *v1.CreateCategoryRequest, opts ...http.CallOption) (rsp *v1.Category, err error) - DeleteCategory(ctx context.Context, req *v1.DeleteCategoryRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error) - GetCategory(ctx context.Context, req *v1.GetCategoryRequest, opts ...http.CallOption) (rsp *v1.Category, err error) - ListCategory(ctx context.Context, req *pagination.PagingRequest, opts ...http.CallOption) (rsp *v1.ListCategoryResponse, err error) - UpdateCategory(ctx context.Context, req *v1.UpdateCategoryRequest, opts ...http.CallOption) (rsp *v1.Category, err error) + CreateCategory(ctx context.Context, req *v11.CreateCategoryRequest, opts ...http.CallOption) (rsp *v11.Category, err error) + DeleteCategory(ctx context.Context, req *v11.DeleteCategoryRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error) + GetCategory(ctx context.Context, req *v11.GetCategoryRequest, opts ...http.CallOption) (rsp *v11.Category, err error) + ListCategory(ctx context.Context, req *v1.PagingRequest, opts ...http.CallOption) (rsp *v11.ListCategoryResponse, err error) + UpdateCategory(ctx context.Context, req *v11.UpdateCategoryRequest, opts ...http.CallOption) (rsp *v11.Category, err error) } type CategoryServiceHTTPClientImpl struct { @@ -176,8 +176,8 @@ func NewCategoryServiceHTTPClient(client *http.Client) CategoryServiceHTTPClient return &CategoryServiceHTTPClientImpl{client} } -func (c *CategoryServiceHTTPClientImpl) CreateCategory(ctx context.Context, in *v1.CreateCategoryRequest, opts ...http.CallOption) (*v1.Category, error) { - var out v1.Category +func (c *CategoryServiceHTTPClientImpl) CreateCategory(ctx context.Context, in *v11.CreateCategoryRequest, opts ...http.CallOption) (*v11.Category, error) { + var out v11.Category pattern := "/blog/v1/categories" path := binding.EncodeURL(pattern, in, false) opts = append(opts, http.Operation(OperationCategoryServiceCreateCategory)) @@ -189,7 +189,7 @@ func (c *CategoryServiceHTTPClientImpl) CreateCategory(ctx context.Context, in * return &out, err } -func (c *CategoryServiceHTTPClientImpl) DeleteCategory(ctx context.Context, in *v1.DeleteCategoryRequest, opts ...http.CallOption) (*emptypb.Empty, error) { +func (c *CategoryServiceHTTPClientImpl) DeleteCategory(ctx context.Context, in *v11.DeleteCategoryRequest, opts ...http.CallOption) (*emptypb.Empty, error) { var out emptypb.Empty pattern := "/blog/v1/categories/{id}" path := binding.EncodeURL(pattern, in, true) @@ -202,8 +202,8 @@ func (c *CategoryServiceHTTPClientImpl) DeleteCategory(ctx context.Context, in * return &out, err } -func (c *CategoryServiceHTTPClientImpl) GetCategory(ctx context.Context, in *v1.GetCategoryRequest, opts ...http.CallOption) (*v1.Category, error) { - var out v1.Category +func (c *CategoryServiceHTTPClientImpl) GetCategory(ctx context.Context, in *v11.GetCategoryRequest, opts ...http.CallOption) (*v11.Category, error) { + var out v11.Category pattern := "/blog/v1/categories/{id}" path := binding.EncodeURL(pattern, in, true) opts = append(opts, http.Operation(OperationCategoryServiceGetCategory)) @@ -215,8 +215,8 @@ func (c *CategoryServiceHTTPClientImpl) GetCategory(ctx context.Context, in *v1. return &out, err } -func (c *CategoryServiceHTTPClientImpl) ListCategory(ctx context.Context, in *pagination.PagingRequest, opts ...http.CallOption) (*v1.ListCategoryResponse, error) { - var out v1.ListCategoryResponse +func (c *CategoryServiceHTTPClientImpl) ListCategory(ctx context.Context, in *v1.PagingRequest, opts ...http.CallOption) (*v11.ListCategoryResponse, error) { + var out v11.ListCategoryResponse pattern := "/blog/v1/categories" path := binding.EncodeURL(pattern, in, true) opts = append(opts, http.Operation(OperationCategoryServiceListCategory)) @@ -228,8 +228,8 @@ func (c *CategoryServiceHTTPClientImpl) ListCategory(ctx context.Context, in *pa return &out, err } -func (c *CategoryServiceHTTPClientImpl) UpdateCategory(ctx context.Context, in *v1.UpdateCategoryRequest, opts ...http.CallOption) (*v1.Category, error) { - var out v1.Category +func (c *CategoryServiceHTTPClientImpl) UpdateCategory(ctx context.Context, in *v11.UpdateCategoryRequest, opts ...http.CallOption) (*v11.Category, error) { + var out v11.Category pattern := "/blog/v1/categories/{id}" path := binding.EncodeURL(pattern, in, false) opts = append(opts, http.Operation(OperationCategoryServiceUpdateCategory)) diff --git a/blog-backend/gen/api/go/front/service/v1/i_comment.pb.go b/blog-backend/gen/api/go/front/service/v1/i_comment.pb.go index 58ec8535..3e5c054c 100644 --- a/blog-backend/gen/api/go/front/service/v1/i_comment.pb.go +++ b/blog-backend/gen/api/go/front/service/v1/i_comment.pb.go @@ -4,16 +4,16 @@ // protoc (unknown) // source: front/service/v1/i_comment.proto -package v1 +package servicev1 import ( _ "github.com/google/gnostic/openapiv3" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" emptypb "google.golang.org/protobuf/types/known/emptypb" - v1 "kratos-cms/gen/api/go/comment/service/v1" - pagination "kratos-cms/gen/api/go/common/pagination" + v11 "kratos-cms/gen/api/go/comment/service/v1" reflect "reflect" ) @@ -36,72 +36,81 @@ var file_front_service_v1_i_comment_proto_rawDesc = []byte{ 0x6c, 0x65, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x22, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x61, - 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, - 0x6e, 0x74, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x6f, - 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0xfa, 0x05, 0x0a, 0x0e, - 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x8b, - 0x01, 0x0a, 0x0b, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x19, - 0x2e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x50, 0x61, 0x67, 0x69, - 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, - 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, - 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, - 0x73, 0x65, 0x22, 0x38, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, - 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, - 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x13, 0x12, 0x11, 0x2f, 0x62, 0x6c, 0x6f, 0x67, - 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x8f, 0x01, 0x0a, - 0x0a, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x25, 0x2e, 0x63, 0x6f, - 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, - 0x2e, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x1a, 0x1b, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, - 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x22, - 0x3d, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, - 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, - 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x18, 0x12, 0x16, 0x2f, 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, - 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x93, - 0x01, 0x0a, 0x0d, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, - 0x12, 0x28, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, - 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x6d, 0x6d, - 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1b, 0x2e, 0x63, 0x6f, 0x6d, - 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, - 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3b, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, - 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, - 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x16, 0x3a, 0x01, - 0x2a, 0x22, 0x11, 0x2f, 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, - 0x65, 0x6e, 0x74, 0x73, 0x12, 0x9e, 0x01, 0x0a, 0x0d, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, - 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x28, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, - 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, - 0x74, 0x65, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x1a, 0x1b, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, - 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x46, 0xba, - 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, - 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, - 0xe4, 0x93, 0x02, 0x21, 0x3a, 0x07, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x1a, 0x16, 0x2f, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x20, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x2f, 0x73, + 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, + 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0xfa, 0x05, 0x0a, 0x0e, 0x43, 0x6f, 0x6d, 0x6d, + 0x65, 0x6e, 0x74, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x8b, 0x01, 0x0a, 0x0b, 0x4c, + 0x69, 0x73, 0x74, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x19, 0x2e, 0x70, 0x61, 0x67, + 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x2e, + 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x43, + 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x38, + 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, + 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, + 0xd3, 0xe4, 0x93, 0x02, 0x13, 0x12, 0x11, 0x2f, 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, 0x2f, + 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x8f, 0x01, 0x0a, 0x0a, 0x47, 0x65, 0x74, + 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x25, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, + 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, + 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1b, + 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, + 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x3d, 0xba, 0x47, 0x1c, + 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, + 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, + 0x02, 0x18, 0x12, 0x16, 0x2f, 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x6f, 0x6d, + 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x93, 0x01, 0x0a, 0x0d, 0x43, + 0x72, 0x65, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x28, 0x2e, 0x63, + 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, + 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1b, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, + 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, + 0x65, 0x6e, 0x74, 0x22, 0x3b, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, + 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, + 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x16, 0x3a, 0x01, 0x2a, 0x22, 0x11, 0x2f, 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, - 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x90, 0x01, 0x0a, 0x0d, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, - 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x28, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, - 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, - 0x65, 0x74, 0x65, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x3d, 0xba, 0x47, 0x1c, 0x5a, 0x1a, + 0x12, 0x9e, 0x01, 0x0a, 0x0d, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x6d, 0x6d, 0x65, + 0x6e, 0x74, 0x12, 0x28, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, + 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x6f, + 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1b, 0x2e, 0x63, + 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, + 0x31, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x46, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, - 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x18, - 0x2a, 0x16, 0x2f, 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x65, - 0x6e, 0x74, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x42, 0x2b, 0x5a, 0x29, 0x6b, 0x72, 0x61, 0x74, - 0x6f, 0x73, 0x2d, 0x63, 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, - 0x6f, 0x2f, 0x66, 0x72, 0x6f, 0x6e, 0x74, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, - 0x76, 0x31, 0x3b, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x21, + 0x3a, 0x07, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x1a, 0x16, 0x2f, 0x62, 0x6c, 0x6f, 0x67, + 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2f, 0x7b, 0x69, 0x64, + 0x7d, 0x12, 0x90, 0x01, 0x0a, 0x0d, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x43, 0x6f, 0x6d, 0x6d, + 0x65, 0x6e, 0x74, 0x12, 0x28, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, + 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x43, + 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, + 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, + 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x3d, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, + 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, + 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x18, 0x2a, 0x16, 0x2f, 0x62, + 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x2f, + 0x7b, 0x69, 0x64, 0x7d, 0x42, 0xb9, 0x01, 0x0a, 0x14, 0x63, 0x6f, 0x6d, 0x2e, 0x66, 0x72, 0x6f, + 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x42, 0x0d, 0x49, + 0x43, 0x6f, 0x6d, 0x6d, 0x65, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x30, + 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x63, 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, + 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x66, 0x72, 0x6f, 0x6e, 0x74, 0x2f, 0x73, 0x65, 0x72, 0x76, + 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x76, 0x31, + 0xa2, 0x02, 0x03, 0x46, 0x53, 0x58, 0xaa, 0x02, 0x10, 0x46, 0x72, 0x6f, 0x6e, 0x74, 0x2e, 0x53, + 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x10, 0x46, 0x72, 0x6f, 0x6e, + 0x74, 0x5c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1c, 0x46, + 0x72, 0x6f, 0x6e, 0x74, 0x5c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x56, 0x31, 0x5c, + 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x12, 0x46, 0x72, + 0x6f, 0x6e, 0x74, 0x3a, 0x3a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x3a, 0x3a, 0x56, 0x31, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var file_front_service_v1_i_comment_proto_goTypes = []interface{}{ - (*pagination.PagingRequest)(nil), // 0: pagination.PagingRequest - (*v1.GetCommentRequest)(nil), // 1: comment.service.v1.GetCommentRequest - (*v1.CreateCommentRequest)(nil), // 2: comment.service.v1.CreateCommentRequest - (*v1.UpdateCommentRequest)(nil), // 3: comment.service.v1.UpdateCommentRequest - (*v1.DeleteCommentRequest)(nil), // 4: comment.service.v1.DeleteCommentRequest - (*v1.ListCommentResponse)(nil), // 5: comment.service.v1.ListCommentResponse - (*v1.Comment)(nil), // 6: comment.service.v1.Comment + (*v1.PagingRequest)(nil), // 0: pagination.PagingRequest + (*v11.GetCommentRequest)(nil), // 1: comment.service.v1.GetCommentRequest + (*v11.CreateCommentRequest)(nil), // 2: comment.service.v1.CreateCommentRequest + (*v11.UpdateCommentRequest)(nil), // 3: comment.service.v1.UpdateCommentRequest + (*v11.DeleteCommentRequest)(nil), // 4: comment.service.v1.DeleteCommentRequest + (*v11.ListCommentResponse)(nil), // 5: comment.service.v1.ListCommentResponse + (*v11.Comment)(nil), // 6: comment.service.v1.Comment (*emptypb.Empty)(nil), // 7: google.protobuf.Empty } var file_front_service_v1_i_comment_proto_depIdxs = []int32{ diff --git a/blog-backend/gen/api/go/front/service/v1/i_comment.pb.validate.go b/blog-backend/gen/api/go/front/service/v1/i_comment.pb.validate.go index d142590a..94a99cc9 100644 --- a/blog-backend/gen/api/go/front/service/v1/i_comment.pb.validate.go +++ b/blog-backend/gen/api/go/front/service/v1/i_comment.pb.validate.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-validate. DO NOT EDIT. // source: front/service/v1/i_comment.proto -package v1 +package servicev1 import ( "bytes" diff --git a/blog-backend/gen/api/go/front/service/v1/i_comment_grpc.pb.go b/blog-backend/gen/api/go/front/service/v1/i_comment_grpc.pb.go index 5a8686fa..93bbd2d6 100644 --- a/blog-backend/gen/api/go/front/service/v1/i_comment_grpc.pb.go +++ b/blog-backend/gen/api/go/front/service/v1/i_comment_grpc.pb.go @@ -4,16 +4,16 @@ // - protoc (unknown) // source: front/service/v1/i_comment.proto -package v1 +package servicev1 import ( context "context" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" emptypb "google.golang.org/protobuf/types/known/emptypb" - v1 "kratos-cms/gen/api/go/comment/service/v1" - pagination "kratos-cms/gen/api/go/common/pagination" + v11 "kratos-cms/gen/api/go/comment/service/v1" ) // This is a compile-time assertion to ensure that this generated file @@ -34,15 +34,15 @@ const ( // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type CommentServiceClient interface { // 获取评论列表 - ListComment(ctx context.Context, in *pagination.PagingRequest, opts ...grpc.CallOption) (*v1.ListCommentResponse, error) + ListComment(ctx context.Context, in *v1.PagingRequest, opts ...grpc.CallOption) (*v11.ListCommentResponse, error) // 获取评论数据 - GetComment(ctx context.Context, in *v1.GetCommentRequest, opts ...grpc.CallOption) (*v1.Comment, error) + GetComment(ctx context.Context, in *v11.GetCommentRequest, opts ...grpc.CallOption) (*v11.Comment, error) // 创建评论 - CreateComment(ctx context.Context, in *v1.CreateCommentRequest, opts ...grpc.CallOption) (*v1.Comment, error) + CreateComment(ctx context.Context, in *v11.CreateCommentRequest, opts ...grpc.CallOption) (*v11.Comment, error) // 更新评论 - UpdateComment(ctx context.Context, in *v1.UpdateCommentRequest, opts ...grpc.CallOption) (*v1.Comment, error) + UpdateComment(ctx context.Context, in *v11.UpdateCommentRequest, opts ...grpc.CallOption) (*v11.Comment, error) // 删除评论 - DeleteComment(ctx context.Context, in *v1.DeleteCommentRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) + DeleteComment(ctx context.Context, in *v11.DeleteCommentRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) } type commentServiceClient struct { @@ -53,8 +53,8 @@ func NewCommentServiceClient(cc grpc.ClientConnInterface) CommentServiceClient { return &commentServiceClient{cc} } -func (c *commentServiceClient) ListComment(ctx context.Context, in *pagination.PagingRequest, opts ...grpc.CallOption) (*v1.ListCommentResponse, error) { - out := new(v1.ListCommentResponse) +func (c *commentServiceClient) ListComment(ctx context.Context, in *v1.PagingRequest, opts ...grpc.CallOption) (*v11.ListCommentResponse, error) { + out := new(v11.ListCommentResponse) err := c.cc.Invoke(ctx, CommentService_ListComment_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -62,8 +62,8 @@ func (c *commentServiceClient) ListComment(ctx context.Context, in *pagination.P return out, nil } -func (c *commentServiceClient) GetComment(ctx context.Context, in *v1.GetCommentRequest, opts ...grpc.CallOption) (*v1.Comment, error) { - out := new(v1.Comment) +func (c *commentServiceClient) GetComment(ctx context.Context, in *v11.GetCommentRequest, opts ...grpc.CallOption) (*v11.Comment, error) { + out := new(v11.Comment) err := c.cc.Invoke(ctx, CommentService_GetComment_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -71,8 +71,8 @@ func (c *commentServiceClient) GetComment(ctx context.Context, in *v1.GetComment return out, nil } -func (c *commentServiceClient) CreateComment(ctx context.Context, in *v1.CreateCommentRequest, opts ...grpc.CallOption) (*v1.Comment, error) { - out := new(v1.Comment) +func (c *commentServiceClient) CreateComment(ctx context.Context, in *v11.CreateCommentRequest, opts ...grpc.CallOption) (*v11.Comment, error) { + out := new(v11.Comment) err := c.cc.Invoke(ctx, CommentService_CreateComment_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -80,8 +80,8 @@ func (c *commentServiceClient) CreateComment(ctx context.Context, in *v1.CreateC return out, nil } -func (c *commentServiceClient) UpdateComment(ctx context.Context, in *v1.UpdateCommentRequest, opts ...grpc.CallOption) (*v1.Comment, error) { - out := new(v1.Comment) +func (c *commentServiceClient) UpdateComment(ctx context.Context, in *v11.UpdateCommentRequest, opts ...grpc.CallOption) (*v11.Comment, error) { + out := new(v11.Comment) err := c.cc.Invoke(ctx, CommentService_UpdateComment_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -89,7 +89,7 @@ func (c *commentServiceClient) UpdateComment(ctx context.Context, in *v1.UpdateC return out, nil } -func (c *commentServiceClient) DeleteComment(ctx context.Context, in *v1.DeleteCommentRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { +func (c *commentServiceClient) DeleteComment(ctx context.Context, in *v11.DeleteCommentRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { out := new(emptypb.Empty) err := c.cc.Invoke(ctx, CommentService_DeleteComment_FullMethodName, in, out, opts...) if err != nil { @@ -103,15 +103,15 @@ func (c *commentServiceClient) DeleteComment(ctx context.Context, in *v1.DeleteC // for forward compatibility type CommentServiceServer interface { // 获取评论列表 - ListComment(context.Context, *pagination.PagingRequest) (*v1.ListCommentResponse, error) + ListComment(context.Context, *v1.PagingRequest) (*v11.ListCommentResponse, error) // 获取评论数据 - GetComment(context.Context, *v1.GetCommentRequest) (*v1.Comment, error) + GetComment(context.Context, *v11.GetCommentRequest) (*v11.Comment, error) // 创建评论 - CreateComment(context.Context, *v1.CreateCommentRequest) (*v1.Comment, error) + CreateComment(context.Context, *v11.CreateCommentRequest) (*v11.Comment, error) // 更新评论 - UpdateComment(context.Context, *v1.UpdateCommentRequest) (*v1.Comment, error) + UpdateComment(context.Context, *v11.UpdateCommentRequest) (*v11.Comment, error) // 删除评论 - DeleteComment(context.Context, *v1.DeleteCommentRequest) (*emptypb.Empty, error) + DeleteComment(context.Context, *v11.DeleteCommentRequest) (*emptypb.Empty, error) mustEmbedUnimplementedCommentServiceServer() } @@ -119,19 +119,19 @@ type CommentServiceServer interface { type UnimplementedCommentServiceServer struct { } -func (UnimplementedCommentServiceServer) ListComment(context.Context, *pagination.PagingRequest) (*v1.ListCommentResponse, error) { +func (UnimplementedCommentServiceServer) ListComment(context.Context, *v1.PagingRequest) (*v11.ListCommentResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListComment not implemented") } -func (UnimplementedCommentServiceServer) GetComment(context.Context, *v1.GetCommentRequest) (*v1.Comment, error) { +func (UnimplementedCommentServiceServer) GetComment(context.Context, *v11.GetCommentRequest) (*v11.Comment, error) { return nil, status.Errorf(codes.Unimplemented, "method GetComment not implemented") } -func (UnimplementedCommentServiceServer) CreateComment(context.Context, *v1.CreateCommentRequest) (*v1.Comment, error) { +func (UnimplementedCommentServiceServer) CreateComment(context.Context, *v11.CreateCommentRequest) (*v11.Comment, error) { return nil, status.Errorf(codes.Unimplemented, "method CreateComment not implemented") } -func (UnimplementedCommentServiceServer) UpdateComment(context.Context, *v1.UpdateCommentRequest) (*v1.Comment, error) { +func (UnimplementedCommentServiceServer) UpdateComment(context.Context, *v11.UpdateCommentRequest) (*v11.Comment, error) { return nil, status.Errorf(codes.Unimplemented, "method UpdateComment not implemented") } -func (UnimplementedCommentServiceServer) DeleteComment(context.Context, *v1.DeleteCommentRequest) (*emptypb.Empty, error) { +func (UnimplementedCommentServiceServer) DeleteComment(context.Context, *v11.DeleteCommentRequest) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method DeleteComment not implemented") } func (UnimplementedCommentServiceServer) mustEmbedUnimplementedCommentServiceServer() {} @@ -148,7 +148,7 @@ func RegisterCommentServiceServer(s grpc.ServiceRegistrar, srv CommentServiceSer } func _CommentService_ListComment_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(pagination.PagingRequest) + in := new(v1.PagingRequest) if err := dec(in); err != nil { return nil, err } @@ -160,13 +160,13 @@ func _CommentService_ListComment_Handler(srv interface{}, ctx context.Context, d FullMethod: CommentService_ListComment_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(CommentServiceServer).ListComment(ctx, req.(*pagination.PagingRequest)) + return srv.(CommentServiceServer).ListComment(ctx, req.(*v1.PagingRequest)) } return interceptor(ctx, in, info, handler) } func _CommentService_GetComment_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.GetCommentRequest) + in := new(v11.GetCommentRequest) if err := dec(in); err != nil { return nil, err } @@ -178,13 +178,13 @@ func _CommentService_GetComment_Handler(srv interface{}, ctx context.Context, de FullMethod: CommentService_GetComment_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(CommentServiceServer).GetComment(ctx, req.(*v1.GetCommentRequest)) + return srv.(CommentServiceServer).GetComment(ctx, req.(*v11.GetCommentRequest)) } return interceptor(ctx, in, info, handler) } func _CommentService_CreateComment_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.CreateCommentRequest) + in := new(v11.CreateCommentRequest) if err := dec(in); err != nil { return nil, err } @@ -196,13 +196,13 @@ func _CommentService_CreateComment_Handler(srv interface{}, ctx context.Context, FullMethod: CommentService_CreateComment_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(CommentServiceServer).CreateComment(ctx, req.(*v1.CreateCommentRequest)) + return srv.(CommentServiceServer).CreateComment(ctx, req.(*v11.CreateCommentRequest)) } return interceptor(ctx, in, info, handler) } func _CommentService_UpdateComment_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.UpdateCommentRequest) + in := new(v11.UpdateCommentRequest) if err := dec(in); err != nil { return nil, err } @@ -214,13 +214,13 @@ func _CommentService_UpdateComment_Handler(srv interface{}, ctx context.Context, FullMethod: CommentService_UpdateComment_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(CommentServiceServer).UpdateComment(ctx, req.(*v1.UpdateCommentRequest)) + return srv.(CommentServiceServer).UpdateComment(ctx, req.(*v11.UpdateCommentRequest)) } return interceptor(ctx, in, info, handler) } func _CommentService_DeleteComment_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.DeleteCommentRequest) + in := new(v11.DeleteCommentRequest) if err := dec(in); err != nil { return nil, err } @@ -232,7 +232,7 @@ func _CommentService_DeleteComment_Handler(srv interface{}, ctx context.Context, FullMethod: CommentService_DeleteComment_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(CommentServiceServer).DeleteComment(ctx, req.(*v1.DeleteCommentRequest)) + return srv.(CommentServiceServer).DeleteComment(ctx, req.(*v11.DeleteCommentRequest)) } return interceptor(ctx, in, info, handler) } diff --git a/blog-backend/gen/api/go/front/service/v1/i_comment_http.pb.go b/blog-backend/gen/api/go/front/service/v1/i_comment_http.pb.go index 47322187..cdcf584b 100644 --- a/blog-backend/gen/api/go/front/service/v1/i_comment_http.pb.go +++ b/blog-backend/gen/api/go/front/service/v1/i_comment_http.pb.go @@ -4,15 +4,15 @@ // - protoc (unknown) // source: front/service/v1/i_comment.proto -package v1 +package servicev1 import ( context "context" http "github.com/go-kratos/kratos/v2/transport/http" binding "github.com/go-kratos/kratos/v2/transport/http/binding" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" emptypb "google.golang.org/protobuf/types/known/emptypb" - v1 "kratos-cms/gen/api/go/comment/service/v1" - pagination "kratos-cms/gen/api/go/common/pagination" + v11 "kratos-cms/gen/api/go/comment/service/v1" ) // This is a compile-time assertion to ensure that this generated file @@ -30,15 +30,15 @@ const OperationCommentServiceUpdateComment = "/front.service.v1.CommentService/U type CommentServiceHTTPServer interface { // CreateComment 创建评论 - CreateComment(context.Context, *v1.CreateCommentRequest) (*v1.Comment, error) + CreateComment(context.Context, *v11.CreateCommentRequest) (*v11.Comment, error) // DeleteComment 删除评论 - DeleteComment(context.Context, *v1.DeleteCommentRequest) (*emptypb.Empty, error) + DeleteComment(context.Context, *v11.DeleteCommentRequest) (*emptypb.Empty, error) // GetComment 获取评论数据 - GetComment(context.Context, *v1.GetCommentRequest) (*v1.Comment, error) + GetComment(context.Context, *v11.GetCommentRequest) (*v11.Comment, error) // ListComment 获取评论列表 - ListComment(context.Context, *pagination.PagingRequest) (*v1.ListCommentResponse, error) + ListComment(context.Context, *v1.PagingRequest) (*v11.ListCommentResponse, error) // UpdateComment 更新评论 - UpdateComment(context.Context, *v1.UpdateCommentRequest) (*v1.Comment, error) + UpdateComment(context.Context, *v11.UpdateCommentRequest) (*v11.Comment, error) } func RegisterCommentServiceHTTPServer(s *http.Server, srv CommentServiceHTTPServer) { @@ -52,26 +52,26 @@ func RegisterCommentServiceHTTPServer(s *http.Server, srv CommentServiceHTTPServ func _CommentService_ListComment0_HTTP_Handler(srv CommentServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in pagination.PagingRequest + var in v1.PagingRequest if err := ctx.BindQuery(&in); err != nil { return err } http.SetOperation(ctx, OperationCommentServiceListComment) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.ListComment(ctx, req.(*pagination.PagingRequest)) + return srv.ListComment(ctx, req.(*v1.PagingRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.ListCommentResponse) + reply := out.(*v11.ListCommentResponse) return ctx.Result(200, reply) } } func _CommentService_GetComment0_HTTP_Handler(srv CommentServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.GetCommentRequest + var in v11.GetCommentRequest if err := ctx.BindQuery(&in); err != nil { return err } @@ -80,20 +80,20 @@ func _CommentService_GetComment0_HTTP_Handler(srv CommentServiceHTTPServer) func } http.SetOperation(ctx, OperationCommentServiceGetComment) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.GetComment(ctx, req.(*v1.GetCommentRequest)) + return srv.GetComment(ctx, req.(*v11.GetCommentRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.Comment) + reply := out.(*v11.Comment) return ctx.Result(200, reply) } } func _CommentService_CreateComment0_HTTP_Handler(srv CommentServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.CreateCommentRequest + var in v11.CreateCommentRequest if err := ctx.Bind(&in); err != nil { return err } @@ -102,20 +102,20 @@ func _CommentService_CreateComment0_HTTP_Handler(srv CommentServiceHTTPServer) f } http.SetOperation(ctx, OperationCommentServiceCreateComment) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.CreateComment(ctx, req.(*v1.CreateCommentRequest)) + return srv.CreateComment(ctx, req.(*v11.CreateCommentRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.Comment) + reply := out.(*v11.Comment) return ctx.Result(200, reply) } } func _CommentService_UpdateComment0_HTTP_Handler(srv CommentServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.UpdateCommentRequest + var in v11.UpdateCommentRequest if err := ctx.Bind(&in.Comment); err != nil { return err } @@ -127,20 +127,20 @@ func _CommentService_UpdateComment0_HTTP_Handler(srv CommentServiceHTTPServer) f } http.SetOperation(ctx, OperationCommentServiceUpdateComment) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.UpdateComment(ctx, req.(*v1.UpdateCommentRequest)) + return srv.UpdateComment(ctx, req.(*v11.UpdateCommentRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.Comment) + reply := out.(*v11.Comment) return ctx.Result(200, reply) } } func _CommentService_DeleteComment0_HTTP_Handler(srv CommentServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.DeleteCommentRequest + var in v11.DeleteCommentRequest if err := ctx.BindQuery(&in); err != nil { return err } @@ -149,7 +149,7 @@ func _CommentService_DeleteComment0_HTTP_Handler(srv CommentServiceHTTPServer) f } http.SetOperation(ctx, OperationCommentServiceDeleteComment) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.DeleteComment(ctx, req.(*v1.DeleteCommentRequest)) + return srv.DeleteComment(ctx, req.(*v11.DeleteCommentRequest)) }) out, err := h(ctx, &in) if err != nil { @@ -161,11 +161,11 @@ func _CommentService_DeleteComment0_HTTP_Handler(srv CommentServiceHTTPServer) f } type CommentServiceHTTPClient interface { - CreateComment(ctx context.Context, req *v1.CreateCommentRequest, opts ...http.CallOption) (rsp *v1.Comment, err error) - DeleteComment(ctx context.Context, req *v1.DeleteCommentRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error) - GetComment(ctx context.Context, req *v1.GetCommentRequest, opts ...http.CallOption) (rsp *v1.Comment, err error) - ListComment(ctx context.Context, req *pagination.PagingRequest, opts ...http.CallOption) (rsp *v1.ListCommentResponse, err error) - UpdateComment(ctx context.Context, req *v1.UpdateCommentRequest, opts ...http.CallOption) (rsp *v1.Comment, err error) + CreateComment(ctx context.Context, req *v11.CreateCommentRequest, opts ...http.CallOption) (rsp *v11.Comment, err error) + DeleteComment(ctx context.Context, req *v11.DeleteCommentRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error) + GetComment(ctx context.Context, req *v11.GetCommentRequest, opts ...http.CallOption) (rsp *v11.Comment, err error) + ListComment(ctx context.Context, req *v1.PagingRequest, opts ...http.CallOption) (rsp *v11.ListCommentResponse, err error) + UpdateComment(ctx context.Context, req *v11.UpdateCommentRequest, opts ...http.CallOption) (rsp *v11.Comment, err error) } type CommentServiceHTTPClientImpl struct { @@ -176,8 +176,8 @@ func NewCommentServiceHTTPClient(client *http.Client) CommentServiceHTTPClient { return &CommentServiceHTTPClientImpl{client} } -func (c *CommentServiceHTTPClientImpl) CreateComment(ctx context.Context, in *v1.CreateCommentRequest, opts ...http.CallOption) (*v1.Comment, error) { - var out v1.Comment +func (c *CommentServiceHTTPClientImpl) CreateComment(ctx context.Context, in *v11.CreateCommentRequest, opts ...http.CallOption) (*v11.Comment, error) { + var out v11.Comment pattern := "/blog/v1/comments" path := binding.EncodeURL(pattern, in, false) opts = append(opts, http.Operation(OperationCommentServiceCreateComment)) @@ -189,7 +189,7 @@ func (c *CommentServiceHTTPClientImpl) CreateComment(ctx context.Context, in *v1 return &out, err } -func (c *CommentServiceHTTPClientImpl) DeleteComment(ctx context.Context, in *v1.DeleteCommentRequest, opts ...http.CallOption) (*emptypb.Empty, error) { +func (c *CommentServiceHTTPClientImpl) DeleteComment(ctx context.Context, in *v11.DeleteCommentRequest, opts ...http.CallOption) (*emptypb.Empty, error) { var out emptypb.Empty pattern := "/blog/v1/comments/{id}" path := binding.EncodeURL(pattern, in, true) @@ -202,8 +202,8 @@ func (c *CommentServiceHTTPClientImpl) DeleteComment(ctx context.Context, in *v1 return &out, err } -func (c *CommentServiceHTTPClientImpl) GetComment(ctx context.Context, in *v1.GetCommentRequest, opts ...http.CallOption) (*v1.Comment, error) { - var out v1.Comment +func (c *CommentServiceHTTPClientImpl) GetComment(ctx context.Context, in *v11.GetCommentRequest, opts ...http.CallOption) (*v11.Comment, error) { + var out v11.Comment pattern := "/blog/v1/comments/{id}" path := binding.EncodeURL(pattern, in, true) opts = append(opts, http.Operation(OperationCommentServiceGetComment)) @@ -215,8 +215,8 @@ func (c *CommentServiceHTTPClientImpl) GetComment(ctx context.Context, in *v1.Ge return &out, err } -func (c *CommentServiceHTTPClientImpl) ListComment(ctx context.Context, in *pagination.PagingRequest, opts ...http.CallOption) (*v1.ListCommentResponse, error) { - var out v1.ListCommentResponse +func (c *CommentServiceHTTPClientImpl) ListComment(ctx context.Context, in *v1.PagingRequest, opts ...http.CallOption) (*v11.ListCommentResponse, error) { + var out v11.ListCommentResponse pattern := "/blog/v1/comments" path := binding.EncodeURL(pattern, in, true) opts = append(opts, http.Operation(OperationCommentServiceListComment)) @@ -228,8 +228,8 @@ func (c *CommentServiceHTTPClientImpl) ListComment(ctx context.Context, in *pagi return &out, err } -func (c *CommentServiceHTTPClientImpl) UpdateComment(ctx context.Context, in *v1.UpdateCommentRequest, opts ...http.CallOption) (*v1.Comment, error) { - var out v1.Comment +func (c *CommentServiceHTTPClientImpl) UpdateComment(ctx context.Context, in *v11.UpdateCommentRequest, opts ...http.CallOption) (*v11.Comment, error) { + var out v11.Comment pattern := "/blog/v1/comments/{id}" path := binding.EncodeURL(pattern, in, false) opts = append(opts, http.Operation(OperationCommentServiceUpdateComment)) diff --git a/blog-backend/gen/api/go/front/service/v1/i_front.pb.go b/blog-backend/gen/api/go/front/service/v1/i_front.pb.go index e9f10d3b..6c83cf6b 100644 --- a/blog-backend/gen/api/go/front/service/v1/i_front.pb.go +++ b/blog-backend/gen/api/go/front/service/v1/i_front.pb.go @@ -4,7 +4,7 @@ // protoc (unknown) // source: front/service/v1/i_front.proto -package v1 +package servicev1 import ( _ "github.com/google/gnostic/openapiv3" @@ -28,7 +28,7 @@ var file_front_service_v1_i_front_proto_rawDesc = []byte{ 0x12, 0x10, 0x66, 0x72, 0x6f, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x1a, 0x24, 0x67, 0x6e, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x2f, 0x6f, 0x70, 0x65, 0x6e, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x33, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x42, 0xee, 0x04, 0xba, 0x47, 0xbf, 0x04, 0x12, + 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x42, 0xfa, 0x05, 0xba, 0x47, 0xbf, 0x04, 0x12, 0xbc, 0x01, 0x0a, 0x14, 0x4b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x43, 0x4d, 0x53, 0x20, 0xe5, 0x89, 0x8d, 0xe5, 0x8f, 0xb0, 0x41, 0x50, 0x49, 0x12, 0x14, 0x4b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x43, 0x4d, 0x53, 0x20, 0xe5, 0x89, 0x8d, 0xe5, 0x8f, 0xb0, 0x41, 0x50, 0x49, 0x22, 0x41, @@ -64,11 +64,19 @@ var file_front_service_v1_i_front_proto_rawDesc = []byte{ 0x73, 0x3a, 0x3b, 0x0a, 0x39, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x21, 0x0a, 0x1f, 0x0a, 0x06, 0x6f, 0x61, 0x75, 0x74, 0x68, 0x32, 0x3a, 0x15, 0x12, 0x13, 0x12, 0x0f, 0x2f, 0x66, 0x72, - 0x6f, 0x6e, 0x74, 0x2f, 0x76, 0x31, 0x2f, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x22, 0x00, 0x5a, 0x29, - 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x63, 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, - 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x66, 0x72, 0x6f, 0x6e, 0x74, 0x2f, 0x73, 0x65, 0x72, 0x76, - 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x6f, 0x6e, 0x74, 0x2f, 0x76, 0x31, 0x2f, 0x6c, 0x6f, 0x67, 0x69, 0x6e, 0x22, 0x00, 0x0a, 0x14, + 0x63, 0x6f, 0x6d, 0x2e, 0x66, 0x72, 0x6f, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x2e, 0x76, 0x31, 0x42, 0x0b, 0x49, 0x46, 0x72, 0x6f, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x74, + 0x6f, 0x50, 0x01, 0x5a, 0x30, 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x63, 0x6d, 0x73, 0x2f, + 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x66, 0x72, 0x6f, 0x6e, 0x74, + 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x73, 0x65, 0x72, 0x76, + 0x69, 0x63, 0x65, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x46, 0x53, 0x58, 0xaa, 0x02, 0x10, 0x46, 0x72, + 0x6f, 0x6e, 0x74, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02, + 0x10, 0x46, 0x72, 0x6f, 0x6e, 0x74, 0x5c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x56, + 0x31, 0xe2, 0x02, 0x1c, 0x46, 0x72, 0x6f, 0x6e, 0x74, 0x5c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, + 0xea, 0x02, 0x12, 0x46, 0x72, 0x6f, 0x6e, 0x74, 0x3a, 0x3a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var file_front_service_v1_i_front_proto_goTypes = []interface{}{} diff --git a/blog-backend/gen/api/go/front/service/v1/i_front.pb.validate.go b/blog-backend/gen/api/go/front/service/v1/i_front.pb.validate.go index c827db9b..616d045d 100644 --- a/blog-backend/gen/api/go/front/service/v1/i_front.pb.validate.go +++ b/blog-backend/gen/api/go/front/service/v1/i_front.pb.validate.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-validate. DO NOT EDIT. // source: front/service/v1/i_front.proto -package v1 +package servicev1 import ( "bytes" diff --git a/blog-backend/gen/api/go/front/service/v1/i_link.pb.go b/blog-backend/gen/api/go/front/service/v1/i_link.pb.go index 89a644be..b93c3a00 100644 --- a/blog-backend/gen/api/go/front/service/v1/i_link.pb.go +++ b/blog-backend/gen/api/go/front/service/v1/i_link.pb.go @@ -4,16 +4,16 @@ // protoc (unknown) // source: front/service/v1/i_link.proto -package v1 +package servicev1 import ( _ "github.com/google/gnostic/openapiv3" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" - v1 "kratos-cms/gen/api/go/content/service/v1" + v11 "kratos-cms/gen/api/go/content/service/v1" reflect "reflect" ) @@ -36,69 +36,78 @@ var file_front_service_v1_i_link_proto_rawDesc = []byte{ 0x61, 0x70, 0x69, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x1a, 0x22, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2f, - 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x6c, 0x69, 0x6e, 0x6b, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0xbe, 0x05, 0x0a, 0x0b, 0x4c, 0x69, 0x6e, 0x6b, 0x53, 0x65, - 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x82, 0x01, 0x0a, 0x08, 0x4c, 0x69, 0x73, 0x74, 0x4c, 0x69, - 0x6e, 0x6b, 0x12, 0x19, 0x2e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, - 0x50, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, - 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, - 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4c, 0x69, 0x6e, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, - 0x6e, 0x73, 0x65, 0x22, 0x35, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, - 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, - 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x10, 0x12, 0x0e, 0x2f, 0x62, 0x6c, 0x6f, - 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x6c, 0x69, 0x6e, 0x6b, 0x73, 0x12, 0x83, 0x01, 0x0a, 0x07, 0x47, - 0x65, 0x74, 0x4c, 0x69, 0x6e, 0x6b, 0x12, 0x22, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, - 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x4c, - 0x69, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x63, 0x6f, 0x6e, - 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, - 0x4c, 0x69, 0x6e, 0x6b, 0x22, 0x3a, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, - 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, - 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x15, 0x12, 0x13, 0x2f, 0x62, 0x6c, - 0x6f, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x6c, 0x69, 0x6e, 0x6b, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, - 0x12, 0x87, 0x01, 0x0a, 0x0a, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6e, 0x6b, 0x12, - 0x25, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, - 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6e, 0x6b, 0x52, + 0x74, 0x6f, 0x1a, 0x1e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x76, + 0x31, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x1a, 0x1d, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2f, 0x73, 0x65, 0x72, 0x76, + 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x6c, 0x69, 0x6e, 0x6b, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x32, 0xbe, 0x05, 0x0a, 0x0b, 0x4c, 0x69, 0x6e, 0x6b, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x12, 0x82, 0x01, 0x0a, 0x08, 0x4c, 0x69, 0x73, 0x74, 0x4c, 0x69, 0x6e, 0x6b, 0x12, 0x19, + 0x2e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x50, 0x61, 0x67, 0x69, + 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x63, 0x6f, 0x6e, 0x74, + 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, + 0x69, 0x73, 0x74, 0x4c, 0x69, 0x6e, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, + 0x35, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, + 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, + 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x10, 0x12, 0x0e, 0x2f, 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, + 0x2f, 0x6c, 0x69, 0x6e, 0x6b, 0x73, 0x12, 0x83, 0x01, 0x0a, 0x07, 0x47, 0x65, 0x74, 0x4c, 0x69, + 0x6e, 0x6b, 0x12, 0x22, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, + 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x6e, 0x6b, - 0x22, 0x38, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, + 0x22, 0x3a, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, - 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x13, 0x3a, 0x01, 0x2a, 0x22, 0x0e, 0x2f, 0x62, 0x6c, 0x6f, - 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x6c, 0x69, 0x6e, 0x6b, 0x73, 0x12, 0x8f, 0x01, 0x0a, 0x0a, 0x55, - 0x70, 0x64, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6e, 0x6b, 0x12, 0x25, 0x2e, 0x63, 0x6f, 0x6e, 0x74, - 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, - 0x70, 0x64, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x1a, 0x18, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, - 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x6e, 0x6b, 0x22, 0x40, 0xba, 0x47, 0x1c, 0x5a, - 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, - 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, - 0x1b, 0x3a, 0x04, 0x6c, 0x69, 0x6e, 0x6b, 0x1a, 0x13, 0x2f, 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, + 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x15, 0x12, 0x13, 0x2f, 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x6c, 0x69, 0x6e, 0x6b, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x87, 0x01, 0x0a, - 0x0a, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4c, 0x69, 0x6e, 0x6b, 0x12, 0x25, 0x2e, 0x63, 0x6f, + 0x0a, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6e, 0x6b, 0x12, 0x25, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, - 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4c, 0x69, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x3a, 0xba, 0x47, 0x1c, 0x5a, - 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, - 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, - 0x15, 0x2a, 0x13, 0x2f, 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x6c, 0x69, 0x6e, 0x6b, - 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x42, 0x2b, 0x5a, 0x29, 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, - 0x2d, 0x63, 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, - 0x66, 0x72, 0x6f, 0x6e, 0x74, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, - 0x3b, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, + 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, + 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x6e, 0x6b, 0x22, 0x38, 0xba, 0x47, + 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, + 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, + 0x93, 0x02, 0x13, 0x3a, 0x01, 0x2a, 0x22, 0x0e, 0x2f, 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, + 0x2f, 0x6c, 0x69, 0x6e, 0x6b, 0x73, 0x12, 0x8f, 0x01, 0x0a, 0x0a, 0x55, 0x70, 0x64, 0x61, 0x74, + 0x65, 0x4c, 0x69, 0x6e, 0x6b, 0x12, 0x25, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, + 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, + 0x65, 0x4c, 0x69, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x63, + 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, + 0x31, 0x2e, 0x4c, 0x69, 0x6e, 0x6b, 0x22, 0x40, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, + 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, + 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1b, 0x3a, 0x04, 0x6c, + 0x69, 0x6e, 0x6b, 0x1a, 0x13, 0x2f, 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x6c, 0x69, + 0x6e, 0x6b, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x87, 0x01, 0x0a, 0x0a, 0x44, 0x65, 0x6c, + 0x65, 0x74, 0x65, 0x4c, 0x69, 0x6e, 0x6b, 0x12, 0x25, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, + 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, + 0x65, 0x74, 0x65, 0x4c, 0x69, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, + 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, + 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x3a, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, + 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, + 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x15, 0x2a, 0x13, 0x2f, + 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x6c, 0x69, 0x6e, 0x6b, 0x73, 0x2f, 0x7b, 0x69, + 0x64, 0x7d, 0x42, 0xb6, 0x01, 0x0a, 0x14, 0x63, 0x6f, 0x6d, 0x2e, 0x66, 0x72, 0x6f, 0x6e, 0x74, + 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x42, 0x0a, 0x49, 0x4c, 0x69, + 0x6e, 0x6b, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x30, 0x6b, 0x72, 0x61, 0x74, 0x6f, + 0x73, 0x2d, 0x63, 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, + 0x2f, 0x66, 0x72, 0x6f, 0x6e, 0x74, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, + 0x31, 0x3b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x46, 0x53, + 0x58, 0xaa, 0x02, 0x10, 0x46, 0x72, 0x6f, 0x6e, 0x74, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x10, 0x46, 0x72, 0x6f, 0x6e, 0x74, 0x5c, 0x53, 0x65, 0x72, + 0x76, 0x69, 0x63, 0x65, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1c, 0x46, 0x72, 0x6f, 0x6e, 0x74, 0x5c, + 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, + 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x12, 0x46, 0x72, 0x6f, 0x6e, 0x74, 0x3a, 0x3a, + 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var file_front_service_v1_i_link_proto_goTypes = []interface{}{ - (*pagination.PagingRequest)(nil), // 0: pagination.PagingRequest - (*v1.GetLinkRequest)(nil), // 1: content.service.v1.GetLinkRequest - (*v1.CreateLinkRequest)(nil), // 2: content.service.v1.CreateLinkRequest - (*v1.UpdateLinkRequest)(nil), // 3: content.service.v1.UpdateLinkRequest - (*v1.DeleteLinkRequest)(nil), // 4: content.service.v1.DeleteLinkRequest - (*v1.ListLinkResponse)(nil), // 5: content.service.v1.ListLinkResponse - (*v1.Link)(nil), // 6: content.service.v1.Link - (*emptypb.Empty)(nil), // 7: google.protobuf.Empty + (*v1.PagingRequest)(nil), // 0: pagination.PagingRequest + (*v11.GetLinkRequest)(nil), // 1: content.service.v1.GetLinkRequest + (*v11.CreateLinkRequest)(nil), // 2: content.service.v1.CreateLinkRequest + (*v11.UpdateLinkRequest)(nil), // 3: content.service.v1.UpdateLinkRequest + (*v11.DeleteLinkRequest)(nil), // 4: content.service.v1.DeleteLinkRequest + (*v11.ListLinkResponse)(nil), // 5: content.service.v1.ListLinkResponse + (*v11.Link)(nil), // 6: content.service.v1.Link + (*emptypb.Empty)(nil), // 7: google.protobuf.Empty } var file_front_service_v1_i_link_proto_depIdxs = []int32{ 0, // 0: front.service.v1.LinkService.ListLink:input_type -> pagination.PagingRequest diff --git a/blog-backend/gen/api/go/front/service/v1/i_link.pb.validate.go b/blog-backend/gen/api/go/front/service/v1/i_link.pb.validate.go index ee8b2c9c..48cc7efa 100644 --- a/blog-backend/gen/api/go/front/service/v1/i_link.pb.validate.go +++ b/blog-backend/gen/api/go/front/service/v1/i_link.pb.validate.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-validate. DO NOT EDIT. // source: front/service/v1/i_link.proto -package v1 +package servicev1 import ( "bytes" diff --git a/blog-backend/gen/api/go/front/service/v1/i_link_grpc.pb.go b/blog-backend/gen/api/go/front/service/v1/i_link_grpc.pb.go index 991ec391..3544751a 100644 --- a/blog-backend/gen/api/go/front/service/v1/i_link_grpc.pb.go +++ b/blog-backend/gen/api/go/front/service/v1/i_link_grpc.pb.go @@ -4,16 +4,16 @@ // - protoc (unknown) // source: front/service/v1/i_link.proto -package v1 +package servicev1 import ( context "context" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" - v1 "kratos-cms/gen/api/go/content/service/v1" + v11 "kratos-cms/gen/api/go/content/service/v1" ) // This is a compile-time assertion to ensure that this generated file @@ -34,15 +34,15 @@ const ( // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type LinkServiceClient interface { // 获取链接列表 - ListLink(ctx context.Context, in *pagination.PagingRequest, opts ...grpc.CallOption) (*v1.ListLinkResponse, error) + ListLink(ctx context.Context, in *v1.PagingRequest, opts ...grpc.CallOption) (*v11.ListLinkResponse, error) // 获取链接数据 - GetLink(ctx context.Context, in *v1.GetLinkRequest, opts ...grpc.CallOption) (*v1.Link, error) + GetLink(ctx context.Context, in *v11.GetLinkRequest, opts ...grpc.CallOption) (*v11.Link, error) // 创建链接 - CreateLink(ctx context.Context, in *v1.CreateLinkRequest, opts ...grpc.CallOption) (*v1.Link, error) + CreateLink(ctx context.Context, in *v11.CreateLinkRequest, opts ...grpc.CallOption) (*v11.Link, error) // 更新链接 - UpdateLink(ctx context.Context, in *v1.UpdateLinkRequest, opts ...grpc.CallOption) (*v1.Link, error) + UpdateLink(ctx context.Context, in *v11.UpdateLinkRequest, opts ...grpc.CallOption) (*v11.Link, error) // 删除链接 - DeleteLink(ctx context.Context, in *v1.DeleteLinkRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) + DeleteLink(ctx context.Context, in *v11.DeleteLinkRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) } type linkServiceClient struct { @@ -53,8 +53,8 @@ func NewLinkServiceClient(cc grpc.ClientConnInterface) LinkServiceClient { return &linkServiceClient{cc} } -func (c *linkServiceClient) ListLink(ctx context.Context, in *pagination.PagingRequest, opts ...grpc.CallOption) (*v1.ListLinkResponse, error) { - out := new(v1.ListLinkResponse) +func (c *linkServiceClient) ListLink(ctx context.Context, in *v1.PagingRequest, opts ...grpc.CallOption) (*v11.ListLinkResponse, error) { + out := new(v11.ListLinkResponse) err := c.cc.Invoke(ctx, LinkService_ListLink_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -62,8 +62,8 @@ func (c *linkServiceClient) ListLink(ctx context.Context, in *pagination.PagingR return out, nil } -func (c *linkServiceClient) GetLink(ctx context.Context, in *v1.GetLinkRequest, opts ...grpc.CallOption) (*v1.Link, error) { - out := new(v1.Link) +func (c *linkServiceClient) GetLink(ctx context.Context, in *v11.GetLinkRequest, opts ...grpc.CallOption) (*v11.Link, error) { + out := new(v11.Link) err := c.cc.Invoke(ctx, LinkService_GetLink_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -71,8 +71,8 @@ func (c *linkServiceClient) GetLink(ctx context.Context, in *v1.GetLinkRequest, return out, nil } -func (c *linkServiceClient) CreateLink(ctx context.Context, in *v1.CreateLinkRequest, opts ...grpc.CallOption) (*v1.Link, error) { - out := new(v1.Link) +func (c *linkServiceClient) CreateLink(ctx context.Context, in *v11.CreateLinkRequest, opts ...grpc.CallOption) (*v11.Link, error) { + out := new(v11.Link) err := c.cc.Invoke(ctx, LinkService_CreateLink_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -80,8 +80,8 @@ func (c *linkServiceClient) CreateLink(ctx context.Context, in *v1.CreateLinkReq return out, nil } -func (c *linkServiceClient) UpdateLink(ctx context.Context, in *v1.UpdateLinkRequest, opts ...grpc.CallOption) (*v1.Link, error) { - out := new(v1.Link) +func (c *linkServiceClient) UpdateLink(ctx context.Context, in *v11.UpdateLinkRequest, opts ...grpc.CallOption) (*v11.Link, error) { + out := new(v11.Link) err := c.cc.Invoke(ctx, LinkService_UpdateLink_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -89,7 +89,7 @@ func (c *linkServiceClient) UpdateLink(ctx context.Context, in *v1.UpdateLinkReq return out, nil } -func (c *linkServiceClient) DeleteLink(ctx context.Context, in *v1.DeleteLinkRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { +func (c *linkServiceClient) DeleteLink(ctx context.Context, in *v11.DeleteLinkRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { out := new(emptypb.Empty) err := c.cc.Invoke(ctx, LinkService_DeleteLink_FullMethodName, in, out, opts...) if err != nil { @@ -103,15 +103,15 @@ func (c *linkServiceClient) DeleteLink(ctx context.Context, in *v1.DeleteLinkReq // for forward compatibility type LinkServiceServer interface { // 获取链接列表 - ListLink(context.Context, *pagination.PagingRequest) (*v1.ListLinkResponse, error) + ListLink(context.Context, *v1.PagingRequest) (*v11.ListLinkResponse, error) // 获取链接数据 - GetLink(context.Context, *v1.GetLinkRequest) (*v1.Link, error) + GetLink(context.Context, *v11.GetLinkRequest) (*v11.Link, error) // 创建链接 - CreateLink(context.Context, *v1.CreateLinkRequest) (*v1.Link, error) + CreateLink(context.Context, *v11.CreateLinkRequest) (*v11.Link, error) // 更新链接 - UpdateLink(context.Context, *v1.UpdateLinkRequest) (*v1.Link, error) + UpdateLink(context.Context, *v11.UpdateLinkRequest) (*v11.Link, error) // 删除链接 - DeleteLink(context.Context, *v1.DeleteLinkRequest) (*emptypb.Empty, error) + DeleteLink(context.Context, *v11.DeleteLinkRequest) (*emptypb.Empty, error) mustEmbedUnimplementedLinkServiceServer() } @@ -119,19 +119,19 @@ type LinkServiceServer interface { type UnimplementedLinkServiceServer struct { } -func (UnimplementedLinkServiceServer) ListLink(context.Context, *pagination.PagingRequest) (*v1.ListLinkResponse, error) { +func (UnimplementedLinkServiceServer) ListLink(context.Context, *v1.PagingRequest) (*v11.ListLinkResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListLink not implemented") } -func (UnimplementedLinkServiceServer) GetLink(context.Context, *v1.GetLinkRequest) (*v1.Link, error) { +func (UnimplementedLinkServiceServer) GetLink(context.Context, *v11.GetLinkRequest) (*v11.Link, error) { return nil, status.Errorf(codes.Unimplemented, "method GetLink not implemented") } -func (UnimplementedLinkServiceServer) CreateLink(context.Context, *v1.CreateLinkRequest) (*v1.Link, error) { +func (UnimplementedLinkServiceServer) CreateLink(context.Context, *v11.CreateLinkRequest) (*v11.Link, error) { return nil, status.Errorf(codes.Unimplemented, "method CreateLink not implemented") } -func (UnimplementedLinkServiceServer) UpdateLink(context.Context, *v1.UpdateLinkRequest) (*v1.Link, error) { +func (UnimplementedLinkServiceServer) UpdateLink(context.Context, *v11.UpdateLinkRequest) (*v11.Link, error) { return nil, status.Errorf(codes.Unimplemented, "method UpdateLink not implemented") } -func (UnimplementedLinkServiceServer) DeleteLink(context.Context, *v1.DeleteLinkRequest) (*emptypb.Empty, error) { +func (UnimplementedLinkServiceServer) DeleteLink(context.Context, *v11.DeleteLinkRequest) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method DeleteLink not implemented") } func (UnimplementedLinkServiceServer) mustEmbedUnimplementedLinkServiceServer() {} @@ -148,7 +148,7 @@ func RegisterLinkServiceServer(s grpc.ServiceRegistrar, srv LinkServiceServer) { } func _LinkService_ListLink_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(pagination.PagingRequest) + in := new(v1.PagingRequest) if err := dec(in); err != nil { return nil, err } @@ -160,13 +160,13 @@ func _LinkService_ListLink_Handler(srv interface{}, ctx context.Context, dec fun FullMethod: LinkService_ListLink_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(LinkServiceServer).ListLink(ctx, req.(*pagination.PagingRequest)) + return srv.(LinkServiceServer).ListLink(ctx, req.(*v1.PagingRequest)) } return interceptor(ctx, in, info, handler) } func _LinkService_GetLink_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.GetLinkRequest) + in := new(v11.GetLinkRequest) if err := dec(in); err != nil { return nil, err } @@ -178,13 +178,13 @@ func _LinkService_GetLink_Handler(srv interface{}, ctx context.Context, dec func FullMethod: LinkService_GetLink_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(LinkServiceServer).GetLink(ctx, req.(*v1.GetLinkRequest)) + return srv.(LinkServiceServer).GetLink(ctx, req.(*v11.GetLinkRequest)) } return interceptor(ctx, in, info, handler) } func _LinkService_CreateLink_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.CreateLinkRequest) + in := new(v11.CreateLinkRequest) if err := dec(in); err != nil { return nil, err } @@ -196,13 +196,13 @@ func _LinkService_CreateLink_Handler(srv interface{}, ctx context.Context, dec f FullMethod: LinkService_CreateLink_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(LinkServiceServer).CreateLink(ctx, req.(*v1.CreateLinkRequest)) + return srv.(LinkServiceServer).CreateLink(ctx, req.(*v11.CreateLinkRequest)) } return interceptor(ctx, in, info, handler) } func _LinkService_UpdateLink_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.UpdateLinkRequest) + in := new(v11.UpdateLinkRequest) if err := dec(in); err != nil { return nil, err } @@ -214,13 +214,13 @@ func _LinkService_UpdateLink_Handler(srv interface{}, ctx context.Context, dec f FullMethod: LinkService_UpdateLink_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(LinkServiceServer).UpdateLink(ctx, req.(*v1.UpdateLinkRequest)) + return srv.(LinkServiceServer).UpdateLink(ctx, req.(*v11.UpdateLinkRequest)) } return interceptor(ctx, in, info, handler) } func _LinkService_DeleteLink_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.DeleteLinkRequest) + in := new(v11.DeleteLinkRequest) if err := dec(in); err != nil { return nil, err } @@ -232,7 +232,7 @@ func _LinkService_DeleteLink_Handler(srv interface{}, ctx context.Context, dec f FullMethod: LinkService_DeleteLink_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(LinkServiceServer).DeleteLink(ctx, req.(*v1.DeleteLinkRequest)) + return srv.(LinkServiceServer).DeleteLink(ctx, req.(*v11.DeleteLinkRequest)) } return interceptor(ctx, in, info, handler) } diff --git a/blog-backend/gen/api/go/front/service/v1/i_link_http.pb.go b/blog-backend/gen/api/go/front/service/v1/i_link_http.pb.go index 4c934af7..fd91c7a3 100644 --- a/blog-backend/gen/api/go/front/service/v1/i_link_http.pb.go +++ b/blog-backend/gen/api/go/front/service/v1/i_link_http.pb.go @@ -4,15 +4,15 @@ // - protoc (unknown) // source: front/service/v1/i_link.proto -package v1 +package servicev1 import ( context "context" http "github.com/go-kratos/kratos/v2/transport/http" binding "github.com/go-kratos/kratos/v2/transport/http/binding" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" - v1 "kratos-cms/gen/api/go/content/service/v1" + v11 "kratos-cms/gen/api/go/content/service/v1" ) // This is a compile-time assertion to ensure that this generated file @@ -30,15 +30,15 @@ const OperationLinkServiceUpdateLink = "/front.service.v1.LinkService/UpdateLink type LinkServiceHTTPServer interface { // CreateLink 创建链接 - CreateLink(context.Context, *v1.CreateLinkRequest) (*v1.Link, error) + CreateLink(context.Context, *v11.CreateLinkRequest) (*v11.Link, error) // DeleteLink 删除链接 - DeleteLink(context.Context, *v1.DeleteLinkRequest) (*emptypb.Empty, error) + DeleteLink(context.Context, *v11.DeleteLinkRequest) (*emptypb.Empty, error) // GetLink 获取链接数据 - GetLink(context.Context, *v1.GetLinkRequest) (*v1.Link, error) + GetLink(context.Context, *v11.GetLinkRequest) (*v11.Link, error) // ListLink 获取链接列表 - ListLink(context.Context, *pagination.PagingRequest) (*v1.ListLinkResponse, error) + ListLink(context.Context, *v1.PagingRequest) (*v11.ListLinkResponse, error) // UpdateLink 更新链接 - UpdateLink(context.Context, *v1.UpdateLinkRequest) (*v1.Link, error) + UpdateLink(context.Context, *v11.UpdateLinkRequest) (*v11.Link, error) } func RegisterLinkServiceHTTPServer(s *http.Server, srv LinkServiceHTTPServer) { @@ -52,26 +52,26 @@ func RegisterLinkServiceHTTPServer(s *http.Server, srv LinkServiceHTTPServer) { func _LinkService_ListLink0_HTTP_Handler(srv LinkServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in pagination.PagingRequest + var in v1.PagingRequest if err := ctx.BindQuery(&in); err != nil { return err } http.SetOperation(ctx, OperationLinkServiceListLink) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.ListLink(ctx, req.(*pagination.PagingRequest)) + return srv.ListLink(ctx, req.(*v1.PagingRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.ListLinkResponse) + reply := out.(*v11.ListLinkResponse) return ctx.Result(200, reply) } } func _LinkService_GetLink0_HTTP_Handler(srv LinkServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.GetLinkRequest + var in v11.GetLinkRequest if err := ctx.BindQuery(&in); err != nil { return err } @@ -80,20 +80,20 @@ func _LinkService_GetLink0_HTTP_Handler(srv LinkServiceHTTPServer) func(ctx http } http.SetOperation(ctx, OperationLinkServiceGetLink) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.GetLink(ctx, req.(*v1.GetLinkRequest)) + return srv.GetLink(ctx, req.(*v11.GetLinkRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.Link) + reply := out.(*v11.Link) return ctx.Result(200, reply) } } func _LinkService_CreateLink0_HTTP_Handler(srv LinkServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.CreateLinkRequest + var in v11.CreateLinkRequest if err := ctx.Bind(&in); err != nil { return err } @@ -102,20 +102,20 @@ func _LinkService_CreateLink0_HTTP_Handler(srv LinkServiceHTTPServer) func(ctx h } http.SetOperation(ctx, OperationLinkServiceCreateLink) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.CreateLink(ctx, req.(*v1.CreateLinkRequest)) + return srv.CreateLink(ctx, req.(*v11.CreateLinkRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.Link) + reply := out.(*v11.Link) return ctx.Result(200, reply) } } func _LinkService_UpdateLink0_HTTP_Handler(srv LinkServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.UpdateLinkRequest + var in v11.UpdateLinkRequest if err := ctx.Bind(&in.Link); err != nil { return err } @@ -127,20 +127,20 @@ func _LinkService_UpdateLink0_HTTP_Handler(srv LinkServiceHTTPServer) func(ctx h } http.SetOperation(ctx, OperationLinkServiceUpdateLink) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.UpdateLink(ctx, req.(*v1.UpdateLinkRequest)) + return srv.UpdateLink(ctx, req.(*v11.UpdateLinkRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.Link) + reply := out.(*v11.Link) return ctx.Result(200, reply) } } func _LinkService_DeleteLink0_HTTP_Handler(srv LinkServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.DeleteLinkRequest + var in v11.DeleteLinkRequest if err := ctx.BindQuery(&in); err != nil { return err } @@ -149,7 +149,7 @@ func _LinkService_DeleteLink0_HTTP_Handler(srv LinkServiceHTTPServer) func(ctx h } http.SetOperation(ctx, OperationLinkServiceDeleteLink) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.DeleteLink(ctx, req.(*v1.DeleteLinkRequest)) + return srv.DeleteLink(ctx, req.(*v11.DeleteLinkRequest)) }) out, err := h(ctx, &in) if err != nil { @@ -161,11 +161,11 @@ func _LinkService_DeleteLink0_HTTP_Handler(srv LinkServiceHTTPServer) func(ctx h } type LinkServiceHTTPClient interface { - CreateLink(ctx context.Context, req *v1.CreateLinkRequest, opts ...http.CallOption) (rsp *v1.Link, err error) - DeleteLink(ctx context.Context, req *v1.DeleteLinkRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error) - GetLink(ctx context.Context, req *v1.GetLinkRequest, opts ...http.CallOption) (rsp *v1.Link, err error) - ListLink(ctx context.Context, req *pagination.PagingRequest, opts ...http.CallOption) (rsp *v1.ListLinkResponse, err error) - UpdateLink(ctx context.Context, req *v1.UpdateLinkRequest, opts ...http.CallOption) (rsp *v1.Link, err error) + CreateLink(ctx context.Context, req *v11.CreateLinkRequest, opts ...http.CallOption) (rsp *v11.Link, err error) + DeleteLink(ctx context.Context, req *v11.DeleteLinkRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error) + GetLink(ctx context.Context, req *v11.GetLinkRequest, opts ...http.CallOption) (rsp *v11.Link, err error) + ListLink(ctx context.Context, req *v1.PagingRequest, opts ...http.CallOption) (rsp *v11.ListLinkResponse, err error) + UpdateLink(ctx context.Context, req *v11.UpdateLinkRequest, opts ...http.CallOption) (rsp *v11.Link, err error) } type LinkServiceHTTPClientImpl struct { @@ -176,8 +176,8 @@ func NewLinkServiceHTTPClient(client *http.Client) LinkServiceHTTPClient { return &LinkServiceHTTPClientImpl{client} } -func (c *LinkServiceHTTPClientImpl) CreateLink(ctx context.Context, in *v1.CreateLinkRequest, opts ...http.CallOption) (*v1.Link, error) { - var out v1.Link +func (c *LinkServiceHTTPClientImpl) CreateLink(ctx context.Context, in *v11.CreateLinkRequest, opts ...http.CallOption) (*v11.Link, error) { + var out v11.Link pattern := "/blog/v1/links" path := binding.EncodeURL(pattern, in, false) opts = append(opts, http.Operation(OperationLinkServiceCreateLink)) @@ -189,7 +189,7 @@ func (c *LinkServiceHTTPClientImpl) CreateLink(ctx context.Context, in *v1.Creat return &out, err } -func (c *LinkServiceHTTPClientImpl) DeleteLink(ctx context.Context, in *v1.DeleteLinkRequest, opts ...http.CallOption) (*emptypb.Empty, error) { +func (c *LinkServiceHTTPClientImpl) DeleteLink(ctx context.Context, in *v11.DeleteLinkRequest, opts ...http.CallOption) (*emptypb.Empty, error) { var out emptypb.Empty pattern := "/blog/v1/links/{id}" path := binding.EncodeURL(pattern, in, true) @@ -202,8 +202,8 @@ func (c *LinkServiceHTTPClientImpl) DeleteLink(ctx context.Context, in *v1.Delet return &out, err } -func (c *LinkServiceHTTPClientImpl) GetLink(ctx context.Context, in *v1.GetLinkRequest, opts ...http.CallOption) (*v1.Link, error) { - var out v1.Link +func (c *LinkServiceHTTPClientImpl) GetLink(ctx context.Context, in *v11.GetLinkRequest, opts ...http.CallOption) (*v11.Link, error) { + var out v11.Link pattern := "/blog/v1/links/{id}" path := binding.EncodeURL(pattern, in, true) opts = append(opts, http.Operation(OperationLinkServiceGetLink)) @@ -215,8 +215,8 @@ func (c *LinkServiceHTTPClientImpl) GetLink(ctx context.Context, in *v1.GetLinkR return &out, err } -func (c *LinkServiceHTTPClientImpl) ListLink(ctx context.Context, in *pagination.PagingRequest, opts ...http.CallOption) (*v1.ListLinkResponse, error) { - var out v1.ListLinkResponse +func (c *LinkServiceHTTPClientImpl) ListLink(ctx context.Context, in *v1.PagingRequest, opts ...http.CallOption) (*v11.ListLinkResponse, error) { + var out v11.ListLinkResponse pattern := "/blog/v1/links" path := binding.EncodeURL(pattern, in, true) opts = append(opts, http.Operation(OperationLinkServiceListLink)) @@ -228,8 +228,8 @@ func (c *LinkServiceHTTPClientImpl) ListLink(ctx context.Context, in *pagination return &out, err } -func (c *LinkServiceHTTPClientImpl) UpdateLink(ctx context.Context, in *v1.UpdateLinkRequest, opts ...http.CallOption) (*v1.Link, error) { - var out v1.Link +func (c *LinkServiceHTTPClientImpl) UpdateLink(ctx context.Context, in *v11.UpdateLinkRequest, opts ...http.CallOption) (*v11.Link, error) { + var out v11.Link pattern := "/blog/v1/links/{id}" path := binding.EncodeURL(pattern, in, false) opts = append(opts, http.Operation(OperationLinkServiceUpdateLink)) diff --git a/blog-backend/gen/api/go/front/service/v1/i_menu.pb.go b/blog-backend/gen/api/go/front/service/v1/i_menu.pb.go index 35c3cd6a..1e334a10 100644 --- a/blog-backend/gen/api/go/front/service/v1/i_menu.pb.go +++ b/blog-backend/gen/api/go/front/service/v1/i_menu.pb.go @@ -4,16 +4,16 @@ // protoc (unknown) // source: front/service/v1/i_menu.proto -package v1 +package servicev1 import ( _ "github.com/google/gnostic/openapiv3" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" - v1 "kratos-cms/gen/api/go/content/service/v1" + v11 "kratos-cms/gen/api/go/content/service/v1" reflect "reflect" ) @@ -36,69 +36,78 @@ var file_front_service_v1_i_menu_proto_rawDesc = []byte{ 0x61, 0x70, 0x69, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x1a, 0x22, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2f, - 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x6d, 0x65, 0x6e, 0x75, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0xbe, 0x05, 0x0a, 0x0b, 0x4d, 0x65, 0x6e, 0x75, 0x53, 0x65, - 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x82, 0x01, 0x0a, 0x08, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, - 0x6e, 0x75, 0x12, 0x19, 0x2e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, - 0x50, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, - 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, - 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6e, 0x75, 0x52, 0x65, 0x73, 0x70, 0x6f, - 0x6e, 0x73, 0x65, 0x22, 0x35, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, - 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, - 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x10, 0x12, 0x0e, 0x2f, 0x62, 0x6c, 0x6f, - 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x6d, 0x65, 0x6e, 0x75, 0x73, 0x12, 0x83, 0x01, 0x0a, 0x07, 0x47, - 0x65, 0x74, 0x4d, 0x65, 0x6e, 0x75, 0x12, 0x22, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, - 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x4d, - 0x65, 0x6e, 0x75, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x63, 0x6f, 0x6e, - 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, - 0x4d, 0x65, 0x6e, 0x75, 0x22, 0x3a, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, - 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, - 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x15, 0x12, 0x13, 0x2f, 0x62, 0x6c, - 0x6f, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x6d, 0x65, 0x6e, 0x75, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, - 0x12, 0x87, 0x01, 0x0a, 0x0a, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x12, - 0x25, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, - 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x52, + 0x74, 0x6f, 0x1a, 0x1e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x76, + 0x31, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x1a, 0x1d, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2f, 0x73, 0x65, 0x72, 0x76, + 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x6d, 0x65, 0x6e, 0x75, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x32, 0xbe, 0x05, 0x0a, 0x0b, 0x4d, 0x65, 0x6e, 0x75, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x12, 0x82, 0x01, 0x0a, 0x08, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6e, 0x75, 0x12, 0x19, + 0x2e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x50, 0x61, 0x67, 0x69, + 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x63, 0x6f, 0x6e, 0x74, + 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, + 0x69, 0x73, 0x74, 0x4d, 0x65, 0x6e, 0x75, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, + 0x35, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, + 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, + 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x10, 0x12, 0x0e, 0x2f, 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, + 0x2f, 0x6d, 0x65, 0x6e, 0x75, 0x73, 0x12, 0x83, 0x01, 0x0a, 0x07, 0x47, 0x65, 0x74, 0x4d, 0x65, + 0x6e, 0x75, 0x12, 0x22, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, + 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x4d, 0x65, 0x6e, 0x75, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x65, 0x6e, 0x75, - 0x22, 0x38, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, + 0x22, 0x3a, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, - 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x13, 0x3a, 0x01, 0x2a, 0x22, 0x0e, 0x2f, 0x62, 0x6c, 0x6f, - 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x6d, 0x65, 0x6e, 0x75, 0x73, 0x12, 0x8f, 0x01, 0x0a, 0x0a, 0x55, - 0x70, 0x64, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x12, 0x25, 0x2e, 0x63, 0x6f, 0x6e, 0x74, - 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, - 0x70, 0x64, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x1a, 0x18, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, - 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x65, 0x6e, 0x75, 0x22, 0x40, 0xba, 0x47, 0x1c, 0x5a, - 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, - 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, - 0x1b, 0x3a, 0x04, 0x6d, 0x65, 0x6e, 0x75, 0x1a, 0x13, 0x2f, 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, + 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x15, 0x12, 0x13, 0x2f, 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x6d, 0x65, 0x6e, 0x75, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x87, 0x01, 0x0a, - 0x0a, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x12, 0x25, 0x2e, 0x63, 0x6f, + 0x0a, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x12, 0x25, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, - 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x3a, 0xba, 0x47, 0x1c, 0x5a, - 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, - 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, - 0x15, 0x2a, 0x13, 0x2f, 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x6d, 0x65, 0x6e, 0x75, - 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x42, 0x2b, 0x5a, 0x29, 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, - 0x2d, 0x63, 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, - 0x66, 0x72, 0x6f, 0x6e, 0x74, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, - 0x3b, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x52, 0x65, 0x71, 0x75, 0x65, + 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, + 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x65, 0x6e, 0x75, 0x22, 0x38, 0xba, 0x47, + 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, + 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, + 0x93, 0x02, 0x13, 0x3a, 0x01, 0x2a, 0x22, 0x0e, 0x2f, 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, + 0x2f, 0x6d, 0x65, 0x6e, 0x75, 0x73, 0x12, 0x8f, 0x01, 0x0a, 0x0a, 0x55, 0x70, 0x64, 0x61, 0x74, + 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x12, 0x25, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, + 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, + 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x63, + 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, + 0x31, 0x2e, 0x4d, 0x65, 0x6e, 0x75, 0x22, 0x40, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, + 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, + 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1b, 0x3a, 0x04, 0x6d, + 0x65, 0x6e, 0x75, 0x1a, 0x13, 0x2f, 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x6d, 0x65, + 0x6e, 0x75, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x87, 0x01, 0x0a, 0x0a, 0x44, 0x65, 0x6c, + 0x65, 0x74, 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x12, 0x25, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, + 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, + 0x65, 0x74, 0x65, 0x4d, 0x65, 0x6e, 0x75, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, + 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, + 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x3a, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, + 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, + 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x15, 0x2a, 0x13, 0x2f, + 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x6d, 0x65, 0x6e, 0x75, 0x73, 0x2f, 0x7b, 0x69, + 0x64, 0x7d, 0x42, 0xb6, 0x01, 0x0a, 0x14, 0x63, 0x6f, 0x6d, 0x2e, 0x66, 0x72, 0x6f, 0x6e, 0x74, + 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x42, 0x0a, 0x49, 0x4d, 0x65, + 0x6e, 0x75, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x30, 0x6b, 0x72, 0x61, 0x74, 0x6f, + 0x73, 0x2d, 0x63, 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, + 0x2f, 0x66, 0x72, 0x6f, 0x6e, 0x74, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, + 0x31, 0x3b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x46, 0x53, + 0x58, 0xaa, 0x02, 0x10, 0x46, 0x72, 0x6f, 0x6e, 0x74, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x10, 0x46, 0x72, 0x6f, 0x6e, 0x74, 0x5c, 0x53, 0x65, 0x72, + 0x76, 0x69, 0x63, 0x65, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1c, 0x46, 0x72, 0x6f, 0x6e, 0x74, 0x5c, + 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, + 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x12, 0x46, 0x72, 0x6f, 0x6e, 0x74, 0x3a, 0x3a, + 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var file_front_service_v1_i_menu_proto_goTypes = []interface{}{ - (*pagination.PagingRequest)(nil), // 0: pagination.PagingRequest - (*v1.GetMenuRequest)(nil), // 1: content.service.v1.GetMenuRequest - (*v1.CreateMenuRequest)(nil), // 2: content.service.v1.CreateMenuRequest - (*v1.UpdateMenuRequest)(nil), // 3: content.service.v1.UpdateMenuRequest - (*v1.DeleteMenuRequest)(nil), // 4: content.service.v1.DeleteMenuRequest - (*v1.ListMenuResponse)(nil), // 5: content.service.v1.ListMenuResponse - (*v1.Menu)(nil), // 6: content.service.v1.Menu - (*emptypb.Empty)(nil), // 7: google.protobuf.Empty + (*v1.PagingRequest)(nil), // 0: pagination.PagingRequest + (*v11.GetMenuRequest)(nil), // 1: content.service.v1.GetMenuRequest + (*v11.CreateMenuRequest)(nil), // 2: content.service.v1.CreateMenuRequest + (*v11.UpdateMenuRequest)(nil), // 3: content.service.v1.UpdateMenuRequest + (*v11.DeleteMenuRequest)(nil), // 4: content.service.v1.DeleteMenuRequest + (*v11.ListMenuResponse)(nil), // 5: content.service.v1.ListMenuResponse + (*v11.Menu)(nil), // 6: content.service.v1.Menu + (*emptypb.Empty)(nil), // 7: google.protobuf.Empty } var file_front_service_v1_i_menu_proto_depIdxs = []int32{ 0, // 0: front.service.v1.MenuService.ListMenu:input_type -> pagination.PagingRequest diff --git a/blog-backend/gen/api/go/front/service/v1/i_menu.pb.validate.go b/blog-backend/gen/api/go/front/service/v1/i_menu.pb.validate.go index bb464063..573a732b 100644 --- a/blog-backend/gen/api/go/front/service/v1/i_menu.pb.validate.go +++ b/blog-backend/gen/api/go/front/service/v1/i_menu.pb.validate.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-validate. DO NOT EDIT. // source: front/service/v1/i_menu.proto -package v1 +package servicev1 import ( "bytes" diff --git a/blog-backend/gen/api/go/front/service/v1/i_menu_grpc.pb.go b/blog-backend/gen/api/go/front/service/v1/i_menu_grpc.pb.go index fad185d0..e706b3c0 100644 --- a/blog-backend/gen/api/go/front/service/v1/i_menu_grpc.pb.go +++ b/blog-backend/gen/api/go/front/service/v1/i_menu_grpc.pb.go @@ -4,16 +4,16 @@ // - protoc (unknown) // source: front/service/v1/i_menu.proto -package v1 +package servicev1 import ( context "context" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" - v1 "kratos-cms/gen/api/go/content/service/v1" + v11 "kratos-cms/gen/api/go/content/service/v1" ) // This is a compile-time assertion to ensure that this generated file @@ -34,15 +34,15 @@ const ( // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type MenuServiceClient interface { // 获取目录列表 - ListMenu(ctx context.Context, in *pagination.PagingRequest, opts ...grpc.CallOption) (*v1.ListMenuResponse, error) + ListMenu(ctx context.Context, in *v1.PagingRequest, opts ...grpc.CallOption) (*v11.ListMenuResponse, error) // 获取目录数据 - GetMenu(ctx context.Context, in *v1.GetMenuRequest, opts ...grpc.CallOption) (*v1.Menu, error) + GetMenu(ctx context.Context, in *v11.GetMenuRequest, opts ...grpc.CallOption) (*v11.Menu, error) // 创建目录 - CreateMenu(ctx context.Context, in *v1.CreateMenuRequest, opts ...grpc.CallOption) (*v1.Menu, error) + CreateMenu(ctx context.Context, in *v11.CreateMenuRequest, opts ...grpc.CallOption) (*v11.Menu, error) // 更新目录 - UpdateMenu(ctx context.Context, in *v1.UpdateMenuRequest, opts ...grpc.CallOption) (*v1.Menu, error) + UpdateMenu(ctx context.Context, in *v11.UpdateMenuRequest, opts ...grpc.CallOption) (*v11.Menu, error) // 删除目录 - DeleteMenu(ctx context.Context, in *v1.DeleteMenuRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) + DeleteMenu(ctx context.Context, in *v11.DeleteMenuRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) } type menuServiceClient struct { @@ -53,8 +53,8 @@ func NewMenuServiceClient(cc grpc.ClientConnInterface) MenuServiceClient { return &menuServiceClient{cc} } -func (c *menuServiceClient) ListMenu(ctx context.Context, in *pagination.PagingRequest, opts ...grpc.CallOption) (*v1.ListMenuResponse, error) { - out := new(v1.ListMenuResponse) +func (c *menuServiceClient) ListMenu(ctx context.Context, in *v1.PagingRequest, opts ...grpc.CallOption) (*v11.ListMenuResponse, error) { + out := new(v11.ListMenuResponse) err := c.cc.Invoke(ctx, MenuService_ListMenu_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -62,8 +62,8 @@ func (c *menuServiceClient) ListMenu(ctx context.Context, in *pagination.PagingR return out, nil } -func (c *menuServiceClient) GetMenu(ctx context.Context, in *v1.GetMenuRequest, opts ...grpc.CallOption) (*v1.Menu, error) { - out := new(v1.Menu) +func (c *menuServiceClient) GetMenu(ctx context.Context, in *v11.GetMenuRequest, opts ...grpc.CallOption) (*v11.Menu, error) { + out := new(v11.Menu) err := c.cc.Invoke(ctx, MenuService_GetMenu_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -71,8 +71,8 @@ func (c *menuServiceClient) GetMenu(ctx context.Context, in *v1.GetMenuRequest, return out, nil } -func (c *menuServiceClient) CreateMenu(ctx context.Context, in *v1.CreateMenuRequest, opts ...grpc.CallOption) (*v1.Menu, error) { - out := new(v1.Menu) +func (c *menuServiceClient) CreateMenu(ctx context.Context, in *v11.CreateMenuRequest, opts ...grpc.CallOption) (*v11.Menu, error) { + out := new(v11.Menu) err := c.cc.Invoke(ctx, MenuService_CreateMenu_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -80,8 +80,8 @@ func (c *menuServiceClient) CreateMenu(ctx context.Context, in *v1.CreateMenuReq return out, nil } -func (c *menuServiceClient) UpdateMenu(ctx context.Context, in *v1.UpdateMenuRequest, opts ...grpc.CallOption) (*v1.Menu, error) { - out := new(v1.Menu) +func (c *menuServiceClient) UpdateMenu(ctx context.Context, in *v11.UpdateMenuRequest, opts ...grpc.CallOption) (*v11.Menu, error) { + out := new(v11.Menu) err := c.cc.Invoke(ctx, MenuService_UpdateMenu_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -89,7 +89,7 @@ func (c *menuServiceClient) UpdateMenu(ctx context.Context, in *v1.UpdateMenuReq return out, nil } -func (c *menuServiceClient) DeleteMenu(ctx context.Context, in *v1.DeleteMenuRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { +func (c *menuServiceClient) DeleteMenu(ctx context.Context, in *v11.DeleteMenuRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { out := new(emptypb.Empty) err := c.cc.Invoke(ctx, MenuService_DeleteMenu_FullMethodName, in, out, opts...) if err != nil { @@ -103,15 +103,15 @@ func (c *menuServiceClient) DeleteMenu(ctx context.Context, in *v1.DeleteMenuReq // for forward compatibility type MenuServiceServer interface { // 获取目录列表 - ListMenu(context.Context, *pagination.PagingRequest) (*v1.ListMenuResponse, error) + ListMenu(context.Context, *v1.PagingRequest) (*v11.ListMenuResponse, error) // 获取目录数据 - GetMenu(context.Context, *v1.GetMenuRequest) (*v1.Menu, error) + GetMenu(context.Context, *v11.GetMenuRequest) (*v11.Menu, error) // 创建目录 - CreateMenu(context.Context, *v1.CreateMenuRequest) (*v1.Menu, error) + CreateMenu(context.Context, *v11.CreateMenuRequest) (*v11.Menu, error) // 更新目录 - UpdateMenu(context.Context, *v1.UpdateMenuRequest) (*v1.Menu, error) + UpdateMenu(context.Context, *v11.UpdateMenuRequest) (*v11.Menu, error) // 删除目录 - DeleteMenu(context.Context, *v1.DeleteMenuRequest) (*emptypb.Empty, error) + DeleteMenu(context.Context, *v11.DeleteMenuRequest) (*emptypb.Empty, error) mustEmbedUnimplementedMenuServiceServer() } @@ -119,19 +119,19 @@ type MenuServiceServer interface { type UnimplementedMenuServiceServer struct { } -func (UnimplementedMenuServiceServer) ListMenu(context.Context, *pagination.PagingRequest) (*v1.ListMenuResponse, error) { +func (UnimplementedMenuServiceServer) ListMenu(context.Context, *v1.PagingRequest) (*v11.ListMenuResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListMenu not implemented") } -func (UnimplementedMenuServiceServer) GetMenu(context.Context, *v1.GetMenuRequest) (*v1.Menu, error) { +func (UnimplementedMenuServiceServer) GetMenu(context.Context, *v11.GetMenuRequest) (*v11.Menu, error) { return nil, status.Errorf(codes.Unimplemented, "method GetMenu not implemented") } -func (UnimplementedMenuServiceServer) CreateMenu(context.Context, *v1.CreateMenuRequest) (*v1.Menu, error) { +func (UnimplementedMenuServiceServer) CreateMenu(context.Context, *v11.CreateMenuRequest) (*v11.Menu, error) { return nil, status.Errorf(codes.Unimplemented, "method CreateMenu not implemented") } -func (UnimplementedMenuServiceServer) UpdateMenu(context.Context, *v1.UpdateMenuRequest) (*v1.Menu, error) { +func (UnimplementedMenuServiceServer) UpdateMenu(context.Context, *v11.UpdateMenuRequest) (*v11.Menu, error) { return nil, status.Errorf(codes.Unimplemented, "method UpdateMenu not implemented") } -func (UnimplementedMenuServiceServer) DeleteMenu(context.Context, *v1.DeleteMenuRequest) (*emptypb.Empty, error) { +func (UnimplementedMenuServiceServer) DeleteMenu(context.Context, *v11.DeleteMenuRequest) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method DeleteMenu not implemented") } func (UnimplementedMenuServiceServer) mustEmbedUnimplementedMenuServiceServer() {} @@ -148,7 +148,7 @@ func RegisterMenuServiceServer(s grpc.ServiceRegistrar, srv MenuServiceServer) { } func _MenuService_ListMenu_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(pagination.PagingRequest) + in := new(v1.PagingRequest) if err := dec(in); err != nil { return nil, err } @@ -160,13 +160,13 @@ func _MenuService_ListMenu_Handler(srv interface{}, ctx context.Context, dec fun FullMethod: MenuService_ListMenu_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MenuServiceServer).ListMenu(ctx, req.(*pagination.PagingRequest)) + return srv.(MenuServiceServer).ListMenu(ctx, req.(*v1.PagingRequest)) } return interceptor(ctx, in, info, handler) } func _MenuService_GetMenu_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.GetMenuRequest) + in := new(v11.GetMenuRequest) if err := dec(in); err != nil { return nil, err } @@ -178,13 +178,13 @@ func _MenuService_GetMenu_Handler(srv interface{}, ctx context.Context, dec func FullMethod: MenuService_GetMenu_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MenuServiceServer).GetMenu(ctx, req.(*v1.GetMenuRequest)) + return srv.(MenuServiceServer).GetMenu(ctx, req.(*v11.GetMenuRequest)) } return interceptor(ctx, in, info, handler) } func _MenuService_CreateMenu_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.CreateMenuRequest) + in := new(v11.CreateMenuRequest) if err := dec(in); err != nil { return nil, err } @@ -196,13 +196,13 @@ func _MenuService_CreateMenu_Handler(srv interface{}, ctx context.Context, dec f FullMethod: MenuService_CreateMenu_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MenuServiceServer).CreateMenu(ctx, req.(*v1.CreateMenuRequest)) + return srv.(MenuServiceServer).CreateMenu(ctx, req.(*v11.CreateMenuRequest)) } return interceptor(ctx, in, info, handler) } func _MenuService_UpdateMenu_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.UpdateMenuRequest) + in := new(v11.UpdateMenuRequest) if err := dec(in); err != nil { return nil, err } @@ -214,13 +214,13 @@ func _MenuService_UpdateMenu_Handler(srv interface{}, ctx context.Context, dec f FullMethod: MenuService_UpdateMenu_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MenuServiceServer).UpdateMenu(ctx, req.(*v1.UpdateMenuRequest)) + return srv.(MenuServiceServer).UpdateMenu(ctx, req.(*v11.UpdateMenuRequest)) } return interceptor(ctx, in, info, handler) } func _MenuService_DeleteMenu_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.DeleteMenuRequest) + in := new(v11.DeleteMenuRequest) if err := dec(in); err != nil { return nil, err } @@ -232,7 +232,7 @@ func _MenuService_DeleteMenu_Handler(srv interface{}, ctx context.Context, dec f FullMethod: MenuService_DeleteMenu_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MenuServiceServer).DeleteMenu(ctx, req.(*v1.DeleteMenuRequest)) + return srv.(MenuServiceServer).DeleteMenu(ctx, req.(*v11.DeleteMenuRequest)) } return interceptor(ctx, in, info, handler) } diff --git a/blog-backend/gen/api/go/front/service/v1/i_menu_http.pb.go b/blog-backend/gen/api/go/front/service/v1/i_menu_http.pb.go index ae756ac7..a37e0144 100644 --- a/blog-backend/gen/api/go/front/service/v1/i_menu_http.pb.go +++ b/blog-backend/gen/api/go/front/service/v1/i_menu_http.pb.go @@ -4,15 +4,15 @@ // - protoc (unknown) // source: front/service/v1/i_menu.proto -package v1 +package servicev1 import ( context "context" http "github.com/go-kratos/kratos/v2/transport/http" binding "github.com/go-kratos/kratos/v2/transport/http/binding" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" - v1 "kratos-cms/gen/api/go/content/service/v1" + v11 "kratos-cms/gen/api/go/content/service/v1" ) // This is a compile-time assertion to ensure that this generated file @@ -30,15 +30,15 @@ const OperationMenuServiceUpdateMenu = "/front.service.v1.MenuService/UpdateMenu type MenuServiceHTTPServer interface { // CreateMenu 创建目录 - CreateMenu(context.Context, *v1.CreateMenuRequest) (*v1.Menu, error) + CreateMenu(context.Context, *v11.CreateMenuRequest) (*v11.Menu, error) // DeleteMenu 删除目录 - DeleteMenu(context.Context, *v1.DeleteMenuRequest) (*emptypb.Empty, error) + DeleteMenu(context.Context, *v11.DeleteMenuRequest) (*emptypb.Empty, error) // GetMenu 获取目录数据 - GetMenu(context.Context, *v1.GetMenuRequest) (*v1.Menu, error) + GetMenu(context.Context, *v11.GetMenuRequest) (*v11.Menu, error) // ListMenu 获取目录列表 - ListMenu(context.Context, *pagination.PagingRequest) (*v1.ListMenuResponse, error) + ListMenu(context.Context, *v1.PagingRequest) (*v11.ListMenuResponse, error) // UpdateMenu 更新目录 - UpdateMenu(context.Context, *v1.UpdateMenuRequest) (*v1.Menu, error) + UpdateMenu(context.Context, *v11.UpdateMenuRequest) (*v11.Menu, error) } func RegisterMenuServiceHTTPServer(s *http.Server, srv MenuServiceHTTPServer) { @@ -52,26 +52,26 @@ func RegisterMenuServiceHTTPServer(s *http.Server, srv MenuServiceHTTPServer) { func _MenuService_ListMenu0_HTTP_Handler(srv MenuServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in pagination.PagingRequest + var in v1.PagingRequest if err := ctx.BindQuery(&in); err != nil { return err } http.SetOperation(ctx, OperationMenuServiceListMenu) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.ListMenu(ctx, req.(*pagination.PagingRequest)) + return srv.ListMenu(ctx, req.(*v1.PagingRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.ListMenuResponse) + reply := out.(*v11.ListMenuResponse) return ctx.Result(200, reply) } } func _MenuService_GetMenu0_HTTP_Handler(srv MenuServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.GetMenuRequest + var in v11.GetMenuRequest if err := ctx.BindQuery(&in); err != nil { return err } @@ -80,20 +80,20 @@ func _MenuService_GetMenu0_HTTP_Handler(srv MenuServiceHTTPServer) func(ctx http } http.SetOperation(ctx, OperationMenuServiceGetMenu) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.GetMenu(ctx, req.(*v1.GetMenuRequest)) + return srv.GetMenu(ctx, req.(*v11.GetMenuRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.Menu) + reply := out.(*v11.Menu) return ctx.Result(200, reply) } } func _MenuService_CreateMenu0_HTTP_Handler(srv MenuServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.CreateMenuRequest + var in v11.CreateMenuRequest if err := ctx.Bind(&in); err != nil { return err } @@ -102,20 +102,20 @@ func _MenuService_CreateMenu0_HTTP_Handler(srv MenuServiceHTTPServer) func(ctx h } http.SetOperation(ctx, OperationMenuServiceCreateMenu) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.CreateMenu(ctx, req.(*v1.CreateMenuRequest)) + return srv.CreateMenu(ctx, req.(*v11.CreateMenuRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.Menu) + reply := out.(*v11.Menu) return ctx.Result(200, reply) } } func _MenuService_UpdateMenu0_HTTP_Handler(srv MenuServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.UpdateMenuRequest + var in v11.UpdateMenuRequest if err := ctx.Bind(&in.Menu); err != nil { return err } @@ -127,20 +127,20 @@ func _MenuService_UpdateMenu0_HTTP_Handler(srv MenuServiceHTTPServer) func(ctx h } http.SetOperation(ctx, OperationMenuServiceUpdateMenu) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.UpdateMenu(ctx, req.(*v1.UpdateMenuRequest)) + return srv.UpdateMenu(ctx, req.(*v11.UpdateMenuRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.Menu) + reply := out.(*v11.Menu) return ctx.Result(200, reply) } } func _MenuService_DeleteMenu0_HTTP_Handler(srv MenuServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.DeleteMenuRequest + var in v11.DeleteMenuRequest if err := ctx.BindQuery(&in); err != nil { return err } @@ -149,7 +149,7 @@ func _MenuService_DeleteMenu0_HTTP_Handler(srv MenuServiceHTTPServer) func(ctx h } http.SetOperation(ctx, OperationMenuServiceDeleteMenu) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.DeleteMenu(ctx, req.(*v1.DeleteMenuRequest)) + return srv.DeleteMenu(ctx, req.(*v11.DeleteMenuRequest)) }) out, err := h(ctx, &in) if err != nil { @@ -161,11 +161,11 @@ func _MenuService_DeleteMenu0_HTTP_Handler(srv MenuServiceHTTPServer) func(ctx h } type MenuServiceHTTPClient interface { - CreateMenu(ctx context.Context, req *v1.CreateMenuRequest, opts ...http.CallOption) (rsp *v1.Menu, err error) - DeleteMenu(ctx context.Context, req *v1.DeleteMenuRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error) - GetMenu(ctx context.Context, req *v1.GetMenuRequest, opts ...http.CallOption) (rsp *v1.Menu, err error) - ListMenu(ctx context.Context, req *pagination.PagingRequest, opts ...http.CallOption) (rsp *v1.ListMenuResponse, err error) - UpdateMenu(ctx context.Context, req *v1.UpdateMenuRequest, opts ...http.CallOption) (rsp *v1.Menu, err error) + CreateMenu(ctx context.Context, req *v11.CreateMenuRequest, opts ...http.CallOption) (rsp *v11.Menu, err error) + DeleteMenu(ctx context.Context, req *v11.DeleteMenuRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error) + GetMenu(ctx context.Context, req *v11.GetMenuRequest, opts ...http.CallOption) (rsp *v11.Menu, err error) + ListMenu(ctx context.Context, req *v1.PagingRequest, opts ...http.CallOption) (rsp *v11.ListMenuResponse, err error) + UpdateMenu(ctx context.Context, req *v11.UpdateMenuRequest, opts ...http.CallOption) (rsp *v11.Menu, err error) } type MenuServiceHTTPClientImpl struct { @@ -176,8 +176,8 @@ func NewMenuServiceHTTPClient(client *http.Client) MenuServiceHTTPClient { return &MenuServiceHTTPClientImpl{client} } -func (c *MenuServiceHTTPClientImpl) CreateMenu(ctx context.Context, in *v1.CreateMenuRequest, opts ...http.CallOption) (*v1.Menu, error) { - var out v1.Menu +func (c *MenuServiceHTTPClientImpl) CreateMenu(ctx context.Context, in *v11.CreateMenuRequest, opts ...http.CallOption) (*v11.Menu, error) { + var out v11.Menu pattern := "/blog/v1/menus" path := binding.EncodeURL(pattern, in, false) opts = append(opts, http.Operation(OperationMenuServiceCreateMenu)) @@ -189,7 +189,7 @@ func (c *MenuServiceHTTPClientImpl) CreateMenu(ctx context.Context, in *v1.Creat return &out, err } -func (c *MenuServiceHTTPClientImpl) DeleteMenu(ctx context.Context, in *v1.DeleteMenuRequest, opts ...http.CallOption) (*emptypb.Empty, error) { +func (c *MenuServiceHTTPClientImpl) DeleteMenu(ctx context.Context, in *v11.DeleteMenuRequest, opts ...http.CallOption) (*emptypb.Empty, error) { var out emptypb.Empty pattern := "/blog/v1/menus/{id}" path := binding.EncodeURL(pattern, in, true) @@ -202,8 +202,8 @@ func (c *MenuServiceHTTPClientImpl) DeleteMenu(ctx context.Context, in *v1.Delet return &out, err } -func (c *MenuServiceHTTPClientImpl) GetMenu(ctx context.Context, in *v1.GetMenuRequest, opts ...http.CallOption) (*v1.Menu, error) { - var out v1.Menu +func (c *MenuServiceHTTPClientImpl) GetMenu(ctx context.Context, in *v11.GetMenuRequest, opts ...http.CallOption) (*v11.Menu, error) { + var out v11.Menu pattern := "/blog/v1/menus/{id}" path := binding.EncodeURL(pattern, in, true) opts = append(opts, http.Operation(OperationMenuServiceGetMenu)) @@ -215,8 +215,8 @@ func (c *MenuServiceHTTPClientImpl) GetMenu(ctx context.Context, in *v1.GetMenuR return &out, err } -func (c *MenuServiceHTTPClientImpl) ListMenu(ctx context.Context, in *pagination.PagingRequest, opts ...http.CallOption) (*v1.ListMenuResponse, error) { - var out v1.ListMenuResponse +func (c *MenuServiceHTTPClientImpl) ListMenu(ctx context.Context, in *v1.PagingRequest, opts ...http.CallOption) (*v11.ListMenuResponse, error) { + var out v11.ListMenuResponse pattern := "/blog/v1/menus" path := binding.EncodeURL(pattern, in, true) opts = append(opts, http.Operation(OperationMenuServiceListMenu)) @@ -228,8 +228,8 @@ func (c *MenuServiceHTTPClientImpl) ListMenu(ctx context.Context, in *pagination return &out, err } -func (c *MenuServiceHTTPClientImpl) UpdateMenu(ctx context.Context, in *v1.UpdateMenuRequest, opts ...http.CallOption) (*v1.Menu, error) { - var out v1.Menu +func (c *MenuServiceHTTPClientImpl) UpdateMenu(ctx context.Context, in *v11.UpdateMenuRequest, opts ...http.CallOption) (*v11.Menu, error) { + var out v11.Menu pattern := "/blog/v1/menus/{id}" path := binding.EncodeURL(pattern, in, false) opts = append(opts, http.Operation(OperationMenuServiceUpdateMenu)) diff --git a/blog-backend/gen/api/go/front/service/v1/i_photo.pb.go b/blog-backend/gen/api/go/front/service/v1/i_photo.pb.go index de479e32..8bf9a80b 100644 --- a/blog-backend/gen/api/go/front/service/v1/i_photo.pb.go +++ b/blog-backend/gen/api/go/front/service/v1/i_photo.pb.go @@ -4,16 +4,16 @@ // protoc (unknown) // source: front/service/v1/i_photo.proto -package v1 +package servicev1 import ( _ "github.com/google/gnostic/openapiv3" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" - v1 "kratos-cms/gen/api/go/content/service/v1" + v11 "kratos-cms/gen/api/go/content/service/v1" reflect "reflect" ) @@ -36,71 +36,79 @@ var file_front_service_v1_i_photo_proto_rawDesc = []byte{ 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x1a, 0x22, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x61, 0x67, 0x69, - 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, - 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x68, 0x6f, 0x74, - 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0xd2, 0x05, 0x0a, 0x0c, 0x50, 0x68, 0x6f, 0x74, - 0x6f, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x85, 0x01, 0x0a, 0x09, 0x4c, 0x69, 0x73, - 0x74, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x12, 0x19, 0x2e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x2e, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x1a, 0x25, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, - 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x68, 0x6f, 0x74, 0x6f, - 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x36, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, - 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, - 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x11, 0x12, - 0x0f, 0x2f, 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x68, 0x6f, 0x74, 0x6f, 0x73, - 0x12, 0x87, 0x01, 0x0a, 0x08, 0x47, 0x65, 0x74, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x12, 0x23, 0x2e, + 0x6f, 0x74, 0x6f, 0x1a, 0x1e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, + 0x76, 0x31, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x1a, 0x1e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2f, 0x73, 0x65, 0x72, + 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x68, 0x6f, 0x74, 0x6f, 0x2e, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x32, 0xd2, 0x05, 0x0a, 0x0c, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x53, 0x65, 0x72, + 0x76, 0x69, 0x63, 0x65, 0x12, 0x85, 0x01, 0x0a, 0x09, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x68, 0x6f, + 0x74, 0x6f, 0x12, 0x19, 0x2e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, + 0x50, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x25, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, - 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x1a, 0x19, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, - 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x22, 0x3b, 0xba, - 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, - 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, - 0xe4, 0x93, 0x02, 0x16, 0x12, 0x14, 0x2f, 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x70, - 0x68, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x8b, 0x01, 0x0a, 0x0b, 0x43, - 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x12, 0x26, 0x2e, 0x63, 0x6f, 0x6e, - 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, - 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x1a, 0x19, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, - 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x22, 0x39, 0xba, - 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, - 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, - 0xe4, 0x93, 0x02, 0x14, 0x3a, 0x01, 0x2a, 0x22, 0x0f, 0x2f, 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, - 0x31, 0x2f, 0x70, 0x68, 0x6f, 0x74, 0x6f, 0x73, 0x12, 0x94, 0x01, 0x0a, 0x0b, 0x55, 0x70, 0x64, - 0x61, 0x74, 0x65, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x12, 0x26, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, - 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, - 0x64, 0x61, 0x74, 0x65, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x1a, 0x19, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, - 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x22, 0x42, 0xba, 0x47, 0x1c, + 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x36, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, + 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, + 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x11, 0x12, 0x0f, 0x2f, 0x62, 0x6c, + 0x6f, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x68, 0x6f, 0x74, 0x6f, 0x73, 0x12, 0x87, 0x01, 0x0a, + 0x08, 0x47, 0x65, 0x74, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x12, 0x23, 0x2e, 0x63, 0x6f, 0x6e, 0x74, + 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, + 0x65, 0x74, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x19, + 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, + 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x22, 0x3b, 0xba, 0x47, 0x1c, 0x5a, 0x1a, + 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, + 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x16, + 0x12, 0x14, 0x2f, 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x68, 0x6f, 0x74, 0x6f, + 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x8b, 0x01, 0x0a, 0x0b, 0x43, 0x72, 0x65, 0x61, 0x74, + 0x65, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x12, 0x26, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, + 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, + 0x74, 0x65, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x19, + 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, + 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x22, 0x39, 0xba, 0x47, 0x1c, 0x5a, 0x1a, + 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, + 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x14, + 0x3a, 0x01, 0x2a, 0x22, 0x0f, 0x2f, 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x68, + 0x6f, 0x74, 0x6f, 0x73, 0x12, 0x94, 0x01, 0x0a, 0x0b, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, + 0x68, 0x6f, 0x74, 0x6f, 0x12, 0x26, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, + 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, + 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x19, 0x2e, 0x63, + 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, + 0x31, 0x2e, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x22, 0x42, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, + 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, + 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1d, 0x3a, 0x05, + 0x70, 0x68, 0x6f, 0x74, 0x6f, 0x1a, 0x14, 0x2f, 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, 0x2f, + 0x70, 0x68, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x8a, 0x01, 0x0a, 0x0b, + 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x12, 0x26, 0x2e, 0x63, 0x6f, + 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, + 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x3b, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, - 0x02, 0x1d, 0x3a, 0x05, 0x70, 0x68, 0x6f, 0x74, 0x6f, 0x1a, 0x14, 0x2f, 0x62, 0x6c, 0x6f, 0x67, - 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x68, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, - 0x8a, 0x01, 0x0a, 0x0b, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x12, - 0x26, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, - 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x50, 0x68, 0x6f, 0x74, 0x6f, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, - 0x3b, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, - 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, - 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x16, 0x2a, 0x14, 0x2f, 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, - 0x2f, 0x70, 0x68, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x42, 0x2b, 0x5a, 0x29, - 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x63, 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, - 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x66, 0x72, 0x6f, 0x6e, 0x74, 0x2f, 0x73, 0x65, 0x72, 0x76, - 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x02, 0x16, 0x2a, 0x14, 0x2f, 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x68, 0x6f, + 0x74, 0x6f, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x42, 0xb7, 0x01, 0x0a, 0x14, 0x63, 0x6f, 0x6d, + 0x2e, 0x66, 0x72, 0x6f, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, + 0x31, 0x42, 0x0b, 0x49, 0x50, 0x68, 0x6f, 0x74, 0x6f, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, + 0x5a, 0x30, 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x63, 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, + 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x66, 0x72, 0x6f, 0x6e, 0x74, 0x2f, 0x73, 0x65, + 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, + 0x76, 0x31, 0xa2, 0x02, 0x03, 0x46, 0x53, 0x58, 0xaa, 0x02, 0x10, 0x46, 0x72, 0x6f, 0x6e, 0x74, + 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x10, 0x46, 0x72, + 0x6f, 0x6e, 0x74, 0x5c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x56, 0x31, 0xe2, 0x02, + 0x1c, 0x46, 0x72, 0x6f, 0x6e, 0x74, 0x5c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x56, + 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x12, + 0x46, 0x72, 0x6f, 0x6e, 0x74, 0x3a, 0x3a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x3a, 0x3a, + 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var file_front_service_v1_i_photo_proto_goTypes = []interface{}{ - (*pagination.PagingRequest)(nil), // 0: pagination.PagingRequest - (*v1.GetPhotoRequest)(nil), // 1: content.service.v1.GetPhotoRequest - (*v1.CreatePhotoRequest)(nil), // 2: content.service.v1.CreatePhotoRequest - (*v1.UpdatePhotoRequest)(nil), // 3: content.service.v1.UpdatePhotoRequest - (*v1.DeletePhotoRequest)(nil), // 4: content.service.v1.DeletePhotoRequest - (*v1.ListPhotoResponse)(nil), // 5: content.service.v1.ListPhotoResponse - (*v1.Photo)(nil), // 6: content.service.v1.Photo - (*emptypb.Empty)(nil), // 7: google.protobuf.Empty + (*v1.PagingRequest)(nil), // 0: pagination.PagingRequest + (*v11.GetPhotoRequest)(nil), // 1: content.service.v1.GetPhotoRequest + (*v11.CreatePhotoRequest)(nil), // 2: content.service.v1.CreatePhotoRequest + (*v11.UpdatePhotoRequest)(nil), // 3: content.service.v1.UpdatePhotoRequest + (*v11.DeletePhotoRequest)(nil), // 4: content.service.v1.DeletePhotoRequest + (*v11.ListPhotoResponse)(nil), // 5: content.service.v1.ListPhotoResponse + (*v11.Photo)(nil), // 6: content.service.v1.Photo + (*emptypb.Empty)(nil), // 7: google.protobuf.Empty } var file_front_service_v1_i_photo_proto_depIdxs = []int32{ 0, // 0: front.service.v1.PhotoService.ListPhoto:input_type -> pagination.PagingRequest diff --git a/blog-backend/gen/api/go/front/service/v1/i_photo.pb.validate.go b/blog-backend/gen/api/go/front/service/v1/i_photo.pb.validate.go index 72c7d383..7740f7f8 100644 --- a/blog-backend/gen/api/go/front/service/v1/i_photo.pb.validate.go +++ b/blog-backend/gen/api/go/front/service/v1/i_photo.pb.validate.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-validate. DO NOT EDIT. // source: front/service/v1/i_photo.proto -package v1 +package servicev1 import ( "bytes" diff --git a/blog-backend/gen/api/go/front/service/v1/i_photo_grpc.pb.go b/blog-backend/gen/api/go/front/service/v1/i_photo_grpc.pb.go index 7556af93..80702201 100644 --- a/blog-backend/gen/api/go/front/service/v1/i_photo_grpc.pb.go +++ b/blog-backend/gen/api/go/front/service/v1/i_photo_grpc.pb.go @@ -4,16 +4,16 @@ // - protoc (unknown) // source: front/service/v1/i_photo.proto -package v1 +package servicev1 import ( context "context" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" - v1 "kratos-cms/gen/api/go/content/service/v1" + v11 "kratos-cms/gen/api/go/content/service/v1" ) // This is a compile-time assertion to ensure that this generated file @@ -34,15 +34,15 @@ const ( // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type PhotoServiceClient interface { // 获取照片列表 - ListPhoto(ctx context.Context, in *pagination.PagingRequest, opts ...grpc.CallOption) (*v1.ListPhotoResponse, error) + ListPhoto(ctx context.Context, in *v1.PagingRequest, opts ...grpc.CallOption) (*v11.ListPhotoResponse, error) // 获取照片数据 - GetPhoto(ctx context.Context, in *v1.GetPhotoRequest, opts ...grpc.CallOption) (*v1.Photo, error) + GetPhoto(ctx context.Context, in *v11.GetPhotoRequest, opts ...grpc.CallOption) (*v11.Photo, error) // 创建照片 - CreatePhoto(ctx context.Context, in *v1.CreatePhotoRequest, opts ...grpc.CallOption) (*v1.Photo, error) + CreatePhoto(ctx context.Context, in *v11.CreatePhotoRequest, opts ...grpc.CallOption) (*v11.Photo, error) // 更新照片 - UpdatePhoto(ctx context.Context, in *v1.UpdatePhotoRequest, opts ...grpc.CallOption) (*v1.Photo, error) + UpdatePhoto(ctx context.Context, in *v11.UpdatePhotoRequest, opts ...grpc.CallOption) (*v11.Photo, error) // 删除照片 - DeletePhoto(ctx context.Context, in *v1.DeletePhotoRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) + DeletePhoto(ctx context.Context, in *v11.DeletePhotoRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) } type photoServiceClient struct { @@ -53,8 +53,8 @@ func NewPhotoServiceClient(cc grpc.ClientConnInterface) PhotoServiceClient { return &photoServiceClient{cc} } -func (c *photoServiceClient) ListPhoto(ctx context.Context, in *pagination.PagingRequest, opts ...grpc.CallOption) (*v1.ListPhotoResponse, error) { - out := new(v1.ListPhotoResponse) +func (c *photoServiceClient) ListPhoto(ctx context.Context, in *v1.PagingRequest, opts ...grpc.CallOption) (*v11.ListPhotoResponse, error) { + out := new(v11.ListPhotoResponse) err := c.cc.Invoke(ctx, PhotoService_ListPhoto_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -62,8 +62,8 @@ func (c *photoServiceClient) ListPhoto(ctx context.Context, in *pagination.Pagin return out, nil } -func (c *photoServiceClient) GetPhoto(ctx context.Context, in *v1.GetPhotoRequest, opts ...grpc.CallOption) (*v1.Photo, error) { - out := new(v1.Photo) +func (c *photoServiceClient) GetPhoto(ctx context.Context, in *v11.GetPhotoRequest, opts ...grpc.CallOption) (*v11.Photo, error) { + out := new(v11.Photo) err := c.cc.Invoke(ctx, PhotoService_GetPhoto_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -71,8 +71,8 @@ func (c *photoServiceClient) GetPhoto(ctx context.Context, in *v1.GetPhotoReques return out, nil } -func (c *photoServiceClient) CreatePhoto(ctx context.Context, in *v1.CreatePhotoRequest, opts ...grpc.CallOption) (*v1.Photo, error) { - out := new(v1.Photo) +func (c *photoServiceClient) CreatePhoto(ctx context.Context, in *v11.CreatePhotoRequest, opts ...grpc.CallOption) (*v11.Photo, error) { + out := new(v11.Photo) err := c.cc.Invoke(ctx, PhotoService_CreatePhoto_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -80,8 +80,8 @@ func (c *photoServiceClient) CreatePhoto(ctx context.Context, in *v1.CreatePhoto return out, nil } -func (c *photoServiceClient) UpdatePhoto(ctx context.Context, in *v1.UpdatePhotoRequest, opts ...grpc.CallOption) (*v1.Photo, error) { - out := new(v1.Photo) +func (c *photoServiceClient) UpdatePhoto(ctx context.Context, in *v11.UpdatePhotoRequest, opts ...grpc.CallOption) (*v11.Photo, error) { + out := new(v11.Photo) err := c.cc.Invoke(ctx, PhotoService_UpdatePhoto_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -89,7 +89,7 @@ func (c *photoServiceClient) UpdatePhoto(ctx context.Context, in *v1.UpdatePhoto return out, nil } -func (c *photoServiceClient) DeletePhoto(ctx context.Context, in *v1.DeletePhotoRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { +func (c *photoServiceClient) DeletePhoto(ctx context.Context, in *v11.DeletePhotoRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { out := new(emptypb.Empty) err := c.cc.Invoke(ctx, PhotoService_DeletePhoto_FullMethodName, in, out, opts...) if err != nil { @@ -103,15 +103,15 @@ func (c *photoServiceClient) DeletePhoto(ctx context.Context, in *v1.DeletePhoto // for forward compatibility type PhotoServiceServer interface { // 获取照片列表 - ListPhoto(context.Context, *pagination.PagingRequest) (*v1.ListPhotoResponse, error) + ListPhoto(context.Context, *v1.PagingRequest) (*v11.ListPhotoResponse, error) // 获取照片数据 - GetPhoto(context.Context, *v1.GetPhotoRequest) (*v1.Photo, error) + GetPhoto(context.Context, *v11.GetPhotoRequest) (*v11.Photo, error) // 创建照片 - CreatePhoto(context.Context, *v1.CreatePhotoRequest) (*v1.Photo, error) + CreatePhoto(context.Context, *v11.CreatePhotoRequest) (*v11.Photo, error) // 更新照片 - UpdatePhoto(context.Context, *v1.UpdatePhotoRequest) (*v1.Photo, error) + UpdatePhoto(context.Context, *v11.UpdatePhotoRequest) (*v11.Photo, error) // 删除照片 - DeletePhoto(context.Context, *v1.DeletePhotoRequest) (*emptypb.Empty, error) + DeletePhoto(context.Context, *v11.DeletePhotoRequest) (*emptypb.Empty, error) mustEmbedUnimplementedPhotoServiceServer() } @@ -119,19 +119,19 @@ type PhotoServiceServer interface { type UnimplementedPhotoServiceServer struct { } -func (UnimplementedPhotoServiceServer) ListPhoto(context.Context, *pagination.PagingRequest) (*v1.ListPhotoResponse, error) { +func (UnimplementedPhotoServiceServer) ListPhoto(context.Context, *v1.PagingRequest) (*v11.ListPhotoResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListPhoto not implemented") } -func (UnimplementedPhotoServiceServer) GetPhoto(context.Context, *v1.GetPhotoRequest) (*v1.Photo, error) { +func (UnimplementedPhotoServiceServer) GetPhoto(context.Context, *v11.GetPhotoRequest) (*v11.Photo, error) { return nil, status.Errorf(codes.Unimplemented, "method GetPhoto not implemented") } -func (UnimplementedPhotoServiceServer) CreatePhoto(context.Context, *v1.CreatePhotoRequest) (*v1.Photo, error) { +func (UnimplementedPhotoServiceServer) CreatePhoto(context.Context, *v11.CreatePhotoRequest) (*v11.Photo, error) { return nil, status.Errorf(codes.Unimplemented, "method CreatePhoto not implemented") } -func (UnimplementedPhotoServiceServer) UpdatePhoto(context.Context, *v1.UpdatePhotoRequest) (*v1.Photo, error) { +func (UnimplementedPhotoServiceServer) UpdatePhoto(context.Context, *v11.UpdatePhotoRequest) (*v11.Photo, error) { return nil, status.Errorf(codes.Unimplemented, "method UpdatePhoto not implemented") } -func (UnimplementedPhotoServiceServer) DeletePhoto(context.Context, *v1.DeletePhotoRequest) (*emptypb.Empty, error) { +func (UnimplementedPhotoServiceServer) DeletePhoto(context.Context, *v11.DeletePhotoRequest) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method DeletePhoto not implemented") } func (UnimplementedPhotoServiceServer) mustEmbedUnimplementedPhotoServiceServer() {} @@ -148,7 +148,7 @@ func RegisterPhotoServiceServer(s grpc.ServiceRegistrar, srv PhotoServiceServer) } func _PhotoService_ListPhoto_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(pagination.PagingRequest) + in := new(v1.PagingRequest) if err := dec(in); err != nil { return nil, err } @@ -160,13 +160,13 @@ func _PhotoService_ListPhoto_Handler(srv interface{}, ctx context.Context, dec f FullMethod: PhotoService_ListPhoto_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(PhotoServiceServer).ListPhoto(ctx, req.(*pagination.PagingRequest)) + return srv.(PhotoServiceServer).ListPhoto(ctx, req.(*v1.PagingRequest)) } return interceptor(ctx, in, info, handler) } func _PhotoService_GetPhoto_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.GetPhotoRequest) + in := new(v11.GetPhotoRequest) if err := dec(in); err != nil { return nil, err } @@ -178,13 +178,13 @@ func _PhotoService_GetPhoto_Handler(srv interface{}, ctx context.Context, dec fu FullMethod: PhotoService_GetPhoto_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(PhotoServiceServer).GetPhoto(ctx, req.(*v1.GetPhotoRequest)) + return srv.(PhotoServiceServer).GetPhoto(ctx, req.(*v11.GetPhotoRequest)) } return interceptor(ctx, in, info, handler) } func _PhotoService_CreatePhoto_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.CreatePhotoRequest) + in := new(v11.CreatePhotoRequest) if err := dec(in); err != nil { return nil, err } @@ -196,13 +196,13 @@ func _PhotoService_CreatePhoto_Handler(srv interface{}, ctx context.Context, dec FullMethod: PhotoService_CreatePhoto_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(PhotoServiceServer).CreatePhoto(ctx, req.(*v1.CreatePhotoRequest)) + return srv.(PhotoServiceServer).CreatePhoto(ctx, req.(*v11.CreatePhotoRequest)) } return interceptor(ctx, in, info, handler) } func _PhotoService_UpdatePhoto_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.UpdatePhotoRequest) + in := new(v11.UpdatePhotoRequest) if err := dec(in); err != nil { return nil, err } @@ -214,13 +214,13 @@ func _PhotoService_UpdatePhoto_Handler(srv interface{}, ctx context.Context, dec FullMethod: PhotoService_UpdatePhoto_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(PhotoServiceServer).UpdatePhoto(ctx, req.(*v1.UpdatePhotoRequest)) + return srv.(PhotoServiceServer).UpdatePhoto(ctx, req.(*v11.UpdatePhotoRequest)) } return interceptor(ctx, in, info, handler) } func _PhotoService_DeletePhoto_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.DeletePhotoRequest) + in := new(v11.DeletePhotoRequest) if err := dec(in); err != nil { return nil, err } @@ -232,7 +232,7 @@ func _PhotoService_DeletePhoto_Handler(srv interface{}, ctx context.Context, dec FullMethod: PhotoService_DeletePhoto_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(PhotoServiceServer).DeletePhoto(ctx, req.(*v1.DeletePhotoRequest)) + return srv.(PhotoServiceServer).DeletePhoto(ctx, req.(*v11.DeletePhotoRequest)) } return interceptor(ctx, in, info, handler) } diff --git a/blog-backend/gen/api/go/front/service/v1/i_photo_http.pb.go b/blog-backend/gen/api/go/front/service/v1/i_photo_http.pb.go index 882a0518..1a95df38 100644 --- a/blog-backend/gen/api/go/front/service/v1/i_photo_http.pb.go +++ b/blog-backend/gen/api/go/front/service/v1/i_photo_http.pb.go @@ -4,15 +4,15 @@ // - protoc (unknown) // source: front/service/v1/i_photo.proto -package v1 +package servicev1 import ( context "context" http "github.com/go-kratos/kratos/v2/transport/http" binding "github.com/go-kratos/kratos/v2/transport/http/binding" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" - v1 "kratos-cms/gen/api/go/content/service/v1" + v11 "kratos-cms/gen/api/go/content/service/v1" ) // This is a compile-time assertion to ensure that this generated file @@ -30,15 +30,15 @@ const OperationPhotoServiceUpdatePhoto = "/front.service.v1.PhotoService/UpdateP type PhotoServiceHTTPServer interface { // CreatePhoto 创建照片 - CreatePhoto(context.Context, *v1.CreatePhotoRequest) (*v1.Photo, error) + CreatePhoto(context.Context, *v11.CreatePhotoRequest) (*v11.Photo, error) // DeletePhoto 删除照片 - DeletePhoto(context.Context, *v1.DeletePhotoRequest) (*emptypb.Empty, error) + DeletePhoto(context.Context, *v11.DeletePhotoRequest) (*emptypb.Empty, error) // GetPhoto 获取照片数据 - GetPhoto(context.Context, *v1.GetPhotoRequest) (*v1.Photo, error) + GetPhoto(context.Context, *v11.GetPhotoRequest) (*v11.Photo, error) // ListPhoto 获取照片列表 - ListPhoto(context.Context, *pagination.PagingRequest) (*v1.ListPhotoResponse, error) + ListPhoto(context.Context, *v1.PagingRequest) (*v11.ListPhotoResponse, error) // UpdatePhoto 更新照片 - UpdatePhoto(context.Context, *v1.UpdatePhotoRequest) (*v1.Photo, error) + UpdatePhoto(context.Context, *v11.UpdatePhotoRequest) (*v11.Photo, error) } func RegisterPhotoServiceHTTPServer(s *http.Server, srv PhotoServiceHTTPServer) { @@ -52,26 +52,26 @@ func RegisterPhotoServiceHTTPServer(s *http.Server, srv PhotoServiceHTTPServer) func _PhotoService_ListPhoto0_HTTP_Handler(srv PhotoServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in pagination.PagingRequest + var in v1.PagingRequest if err := ctx.BindQuery(&in); err != nil { return err } http.SetOperation(ctx, OperationPhotoServiceListPhoto) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.ListPhoto(ctx, req.(*pagination.PagingRequest)) + return srv.ListPhoto(ctx, req.(*v1.PagingRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.ListPhotoResponse) + reply := out.(*v11.ListPhotoResponse) return ctx.Result(200, reply) } } func _PhotoService_GetPhoto0_HTTP_Handler(srv PhotoServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.GetPhotoRequest + var in v11.GetPhotoRequest if err := ctx.BindQuery(&in); err != nil { return err } @@ -80,20 +80,20 @@ func _PhotoService_GetPhoto0_HTTP_Handler(srv PhotoServiceHTTPServer) func(ctx h } http.SetOperation(ctx, OperationPhotoServiceGetPhoto) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.GetPhoto(ctx, req.(*v1.GetPhotoRequest)) + return srv.GetPhoto(ctx, req.(*v11.GetPhotoRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.Photo) + reply := out.(*v11.Photo) return ctx.Result(200, reply) } } func _PhotoService_CreatePhoto0_HTTP_Handler(srv PhotoServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.CreatePhotoRequest + var in v11.CreatePhotoRequest if err := ctx.Bind(&in); err != nil { return err } @@ -102,20 +102,20 @@ func _PhotoService_CreatePhoto0_HTTP_Handler(srv PhotoServiceHTTPServer) func(ct } http.SetOperation(ctx, OperationPhotoServiceCreatePhoto) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.CreatePhoto(ctx, req.(*v1.CreatePhotoRequest)) + return srv.CreatePhoto(ctx, req.(*v11.CreatePhotoRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.Photo) + reply := out.(*v11.Photo) return ctx.Result(200, reply) } } func _PhotoService_UpdatePhoto0_HTTP_Handler(srv PhotoServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.UpdatePhotoRequest + var in v11.UpdatePhotoRequest if err := ctx.Bind(&in.Photo); err != nil { return err } @@ -127,20 +127,20 @@ func _PhotoService_UpdatePhoto0_HTTP_Handler(srv PhotoServiceHTTPServer) func(ct } http.SetOperation(ctx, OperationPhotoServiceUpdatePhoto) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.UpdatePhoto(ctx, req.(*v1.UpdatePhotoRequest)) + return srv.UpdatePhoto(ctx, req.(*v11.UpdatePhotoRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.Photo) + reply := out.(*v11.Photo) return ctx.Result(200, reply) } } func _PhotoService_DeletePhoto0_HTTP_Handler(srv PhotoServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.DeletePhotoRequest + var in v11.DeletePhotoRequest if err := ctx.BindQuery(&in); err != nil { return err } @@ -149,7 +149,7 @@ func _PhotoService_DeletePhoto0_HTTP_Handler(srv PhotoServiceHTTPServer) func(ct } http.SetOperation(ctx, OperationPhotoServiceDeletePhoto) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.DeletePhoto(ctx, req.(*v1.DeletePhotoRequest)) + return srv.DeletePhoto(ctx, req.(*v11.DeletePhotoRequest)) }) out, err := h(ctx, &in) if err != nil { @@ -161,11 +161,11 @@ func _PhotoService_DeletePhoto0_HTTP_Handler(srv PhotoServiceHTTPServer) func(ct } type PhotoServiceHTTPClient interface { - CreatePhoto(ctx context.Context, req *v1.CreatePhotoRequest, opts ...http.CallOption) (rsp *v1.Photo, err error) - DeletePhoto(ctx context.Context, req *v1.DeletePhotoRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error) - GetPhoto(ctx context.Context, req *v1.GetPhotoRequest, opts ...http.CallOption) (rsp *v1.Photo, err error) - ListPhoto(ctx context.Context, req *pagination.PagingRequest, opts ...http.CallOption) (rsp *v1.ListPhotoResponse, err error) - UpdatePhoto(ctx context.Context, req *v1.UpdatePhotoRequest, opts ...http.CallOption) (rsp *v1.Photo, err error) + CreatePhoto(ctx context.Context, req *v11.CreatePhotoRequest, opts ...http.CallOption) (rsp *v11.Photo, err error) + DeletePhoto(ctx context.Context, req *v11.DeletePhotoRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error) + GetPhoto(ctx context.Context, req *v11.GetPhotoRequest, opts ...http.CallOption) (rsp *v11.Photo, err error) + ListPhoto(ctx context.Context, req *v1.PagingRequest, opts ...http.CallOption) (rsp *v11.ListPhotoResponse, err error) + UpdatePhoto(ctx context.Context, req *v11.UpdatePhotoRequest, opts ...http.CallOption) (rsp *v11.Photo, err error) } type PhotoServiceHTTPClientImpl struct { @@ -176,8 +176,8 @@ func NewPhotoServiceHTTPClient(client *http.Client) PhotoServiceHTTPClient { return &PhotoServiceHTTPClientImpl{client} } -func (c *PhotoServiceHTTPClientImpl) CreatePhoto(ctx context.Context, in *v1.CreatePhotoRequest, opts ...http.CallOption) (*v1.Photo, error) { - var out v1.Photo +func (c *PhotoServiceHTTPClientImpl) CreatePhoto(ctx context.Context, in *v11.CreatePhotoRequest, opts ...http.CallOption) (*v11.Photo, error) { + var out v11.Photo pattern := "/blog/v1/photos" path := binding.EncodeURL(pattern, in, false) opts = append(opts, http.Operation(OperationPhotoServiceCreatePhoto)) @@ -189,7 +189,7 @@ func (c *PhotoServiceHTTPClientImpl) CreatePhoto(ctx context.Context, in *v1.Cre return &out, err } -func (c *PhotoServiceHTTPClientImpl) DeletePhoto(ctx context.Context, in *v1.DeletePhotoRequest, opts ...http.CallOption) (*emptypb.Empty, error) { +func (c *PhotoServiceHTTPClientImpl) DeletePhoto(ctx context.Context, in *v11.DeletePhotoRequest, opts ...http.CallOption) (*emptypb.Empty, error) { var out emptypb.Empty pattern := "/blog/v1/photos/{id}" path := binding.EncodeURL(pattern, in, true) @@ -202,8 +202,8 @@ func (c *PhotoServiceHTTPClientImpl) DeletePhoto(ctx context.Context, in *v1.Del return &out, err } -func (c *PhotoServiceHTTPClientImpl) GetPhoto(ctx context.Context, in *v1.GetPhotoRequest, opts ...http.CallOption) (*v1.Photo, error) { - var out v1.Photo +func (c *PhotoServiceHTTPClientImpl) GetPhoto(ctx context.Context, in *v11.GetPhotoRequest, opts ...http.CallOption) (*v11.Photo, error) { + var out v11.Photo pattern := "/blog/v1/photos/{id}" path := binding.EncodeURL(pattern, in, true) opts = append(opts, http.Operation(OperationPhotoServiceGetPhoto)) @@ -215,8 +215,8 @@ func (c *PhotoServiceHTTPClientImpl) GetPhoto(ctx context.Context, in *v1.GetPho return &out, err } -func (c *PhotoServiceHTTPClientImpl) ListPhoto(ctx context.Context, in *pagination.PagingRequest, opts ...http.CallOption) (*v1.ListPhotoResponse, error) { - var out v1.ListPhotoResponse +func (c *PhotoServiceHTTPClientImpl) ListPhoto(ctx context.Context, in *v1.PagingRequest, opts ...http.CallOption) (*v11.ListPhotoResponse, error) { + var out v11.ListPhotoResponse pattern := "/blog/v1/photos" path := binding.EncodeURL(pattern, in, true) opts = append(opts, http.Operation(OperationPhotoServiceListPhoto)) @@ -228,8 +228,8 @@ func (c *PhotoServiceHTTPClientImpl) ListPhoto(ctx context.Context, in *paginati return &out, err } -func (c *PhotoServiceHTTPClientImpl) UpdatePhoto(ctx context.Context, in *v1.UpdatePhotoRequest, opts ...http.CallOption) (*v1.Photo, error) { - var out v1.Photo +func (c *PhotoServiceHTTPClientImpl) UpdatePhoto(ctx context.Context, in *v11.UpdatePhotoRequest, opts ...http.CallOption) (*v11.Photo, error) { + var out v11.Photo pattern := "/blog/v1/photos/{id}" path := binding.EncodeURL(pattern, in, false) opts = append(opts, http.Operation(OperationPhotoServiceUpdatePhoto)) diff --git a/blog-backend/gen/api/go/front/service/v1/i_post.pb.go b/blog-backend/gen/api/go/front/service/v1/i_post.pb.go index ac1075bc..dd67c609 100644 --- a/blog-backend/gen/api/go/front/service/v1/i_post.pb.go +++ b/blog-backend/gen/api/go/front/service/v1/i_post.pb.go @@ -4,16 +4,16 @@ // protoc (unknown) // source: front/service/v1/i_post.proto -package v1 +package servicev1 import ( _ "github.com/google/gnostic/openapiv3" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" - v1 "kratos-cms/gen/api/go/content/service/v1" + v11 "kratos-cms/gen/api/go/content/service/v1" reflect "reflect" ) @@ -36,69 +36,78 @@ var file_front_service_v1_i_post_proto_rawDesc = []byte{ 0x61, 0x70, 0x69, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x1a, 0x22, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2f, - 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x6f, 0x73, 0x74, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, 0xbe, 0x05, 0x0a, 0x0b, 0x50, 0x6f, 0x73, 0x74, 0x53, 0x65, - 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x82, 0x01, 0x0a, 0x08, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x6f, - 0x73, 0x74, 0x12, 0x19, 0x2e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, - 0x50, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, - 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, - 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x6f, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, - 0x6e, 0x73, 0x65, 0x22, 0x35, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, - 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, - 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x10, 0x12, 0x0e, 0x2f, 0x62, 0x6c, 0x6f, - 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x6f, 0x73, 0x74, 0x73, 0x12, 0x83, 0x01, 0x0a, 0x07, 0x47, - 0x65, 0x74, 0x50, 0x6f, 0x73, 0x74, 0x12, 0x22, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, - 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x50, - 0x6f, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x63, 0x6f, 0x6e, - 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, - 0x50, 0x6f, 0x73, 0x74, 0x22, 0x3a, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, - 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, - 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x15, 0x12, 0x13, 0x2f, 0x62, 0x6c, - 0x6f, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x6f, 0x73, 0x74, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, - 0x12, 0x87, 0x01, 0x0a, 0x0a, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x6f, 0x73, 0x74, 0x12, - 0x25, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, - 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x6f, 0x73, 0x74, 0x52, + 0x74, 0x6f, 0x1a, 0x1e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x76, + 0x31, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x1a, 0x1d, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2f, 0x73, 0x65, 0x72, 0x76, + 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x6f, 0x73, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x32, 0xbe, 0x05, 0x0a, 0x0b, 0x50, 0x6f, 0x73, 0x74, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x12, 0x82, 0x01, 0x0a, 0x08, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x6f, 0x73, 0x74, 0x12, 0x19, + 0x2e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x50, 0x61, 0x67, 0x69, + 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x63, 0x6f, 0x6e, 0x74, + 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, + 0x69, 0x73, 0x74, 0x50, 0x6f, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, + 0x35, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, + 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, + 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x10, 0x12, 0x0e, 0x2f, 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, + 0x2f, 0x70, 0x6f, 0x73, 0x74, 0x73, 0x12, 0x83, 0x01, 0x0a, 0x07, 0x47, 0x65, 0x74, 0x50, 0x6f, + 0x73, 0x74, 0x12, 0x22, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, + 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x50, 0x6f, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x6f, 0x73, 0x74, - 0x22, 0x38, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, + 0x22, 0x3a, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, - 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x13, 0x3a, 0x01, 0x2a, 0x22, 0x0e, 0x2f, 0x62, 0x6c, 0x6f, - 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x6f, 0x73, 0x74, 0x73, 0x12, 0x8f, 0x01, 0x0a, 0x0a, 0x55, - 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x6f, 0x73, 0x74, 0x12, 0x25, 0x2e, 0x63, 0x6f, 0x6e, 0x74, - 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, - 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x6f, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x1a, 0x18, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, - 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x6f, 0x73, 0x74, 0x22, 0x40, 0xba, 0x47, 0x1c, 0x5a, - 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, - 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, - 0x1b, 0x3a, 0x04, 0x70, 0x6f, 0x73, 0x74, 0x1a, 0x13, 0x2f, 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, + 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x15, 0x12, 0x13, 0x2f, 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x6f, 0x73, 0x74, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x87, 0x01, 0x0a, - 0x0a, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x50, 0x6f, 0x73, 0x74, 0x12, 0x25, 0x2e, 0x63, 0x6f, + 0x0a, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x6f, 0x73, 0x74, 0x12, 0x25, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, - 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x50, 0x6f, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x3a, 0xba, 0x47, 0x1c, 0x5a, - 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, - 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, - 0x15, 0x2a, 0x13, 0x2f, 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x6f, 0x73, 0x74, - 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x42, 0x2b, 0x5a, 0x29, 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, - 0x2d, 0x63, 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, - 0x66, 0x72, 0x6f, 0x6e, 0x74, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, - 0x3b, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x50, 0x6f, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, + 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, + 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x6f, 0x73, 0x74, 0x22, 0x38, 0xba, 0x47, + 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, + 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, + 0x93, 0x02, 0x13, 0x3a, 0x01, 0x2a, 0x22, 0x0e, 0x2f, 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, + 0x2f, 0x70, 0x6f, 0x73, 0x74, 0x73, 0x12, 0x8f, 0x01, 0x0a, 0x0a, 0x55, 0x70, 0x64, 0x61, 0x74, + 0x65, 0x50, 0x6f, 0x73, 0x74, 0x12, 0x25, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, + 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, + 0x65, 0x50, 0x6f, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x18, 0x2e, 0x63, + 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, + 0x31, 0x2e, 0x50, 0x6f, 0x73, 0x74, 0x22, 0x40, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, + 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, + 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1b, 0x3a, 0x04, 0x70, + 0x6f, 0x73, 0x74, 0x1a, 0x13, 0x2f, 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x6f, + 0x73, 0x74, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x87, 0x01, 0x0a, 0x0a, 0x44, 0x65, 0x6c, + 0x65, 0x74, 0x65, 0x50, 0x6f, 0x73, 0x74, 0x12, 0x25, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, + 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, + 0x65, 0x74, 0x65, 0x50, 0x6f, 0x73, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, + 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, + 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x3a, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, + 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, + 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x15, 0x2a, 0x13, 0x2f, + 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x70, 0x6f, 0x73, 0x74, 0x73, 0x2f, 0x7b, 0x69, + 0x64, 0x7d, 0x42, 0xb6, 0x01, 0x0a, 0x14, 0x63, 0x6f, 0x6d, 0x2e, 0x66, 0x72, 0x6f, 0x6e, 0x74, + 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x42, 0x0a, 0x49, 0x50, 0x6f, + 0x73, 0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x30, 0x6b, 0x72, 0x61, 0x74, 0x6f, + 0x73, 0x2d, 0x63, 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, + 0x2f, 0x66, 0x72, 0x6f, 0x6e, 0x74, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, + 0x31, 0x3b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x46, 0x53, + 0x58, 0xaa, 0x02, 0x10, 0x46, 0x72, 0x6f, 0x6e, 0x74, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x10, 0x46, 0x72, 0x6f, 0x6e, 0x74, 0x5c, 0x53, 0x65, 0x72, + 0x76, 0x69, 0x63, 0x65, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1c, 0x46, 0x72, 0x6f, 0x6e, 0x74, 0x5c, + 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, + 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x12, 0x46, 0x72, 0x6f, 0x6e, 0x74, 0x3a, 0x3a, + 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var file_front_service_v1_i_post_proto_goTypes = []interface{}{ - (*pagination.PagingRequest)(nil), // 0: pagination.PagingRequest - (*v1.GetPostRequest)(nil), // 1: content.service.v1.GetPostRequest - (*v1.CreatePostRequest)(nil), // 2: content.service.v1.CreatePostRequest - (*v1.UpdatePostRequest)(nil), // 3: content.service.v1.UpdatePostRequest - (*v1.DeletePostRequest)(nil), // 4: content.service.v1.DeletePostRequest - (*v1.ListPostResponse)(nil), // 5: content.service.v1.ListPostResponse - (*v1.Post)(nil), // 6: content.service.v1.Post - (*emptypb.Empty)(nil), // 7: google.protobuf.Empty + (*v1.PagingRequest)(nil), // 0: pagination.PagingRequest + (*v11.GetPostRequest)(nil), // 1: content.service.v1.GetPostRequest + (*v11.CreatePostRequest)(nil), // 2: content.service.v1.CreatePostRequest + (*v11.UpdatePostRequest)(nil), // 3: content.service.v1.UpdatePostRequest + (*v11.DeletePostRequest)(nil), // 4: content.service.v1.DeletePostRequest + (*v11.ListPostResponse)(nil), // 5: content.service.v1.ListPostResponse + (*v11.Post)(nil), // 6: content.service.v1.Post + (*emptypb.Empty)(nil), // 7: google.protobuf.Empty } var file_front_service_v1_i_post_proto_depIdxs = []int32{ 0, // 0: front.service.v1.PostService.ListPost:input_type -> pagination.PagingRequest diff --git a/blog-backend/gen/api/go/front/service/v1/i_post.pb.validate.go b/blog-backend/gen/api/go/front/service/v1/i_post.pb.validate.go index b868678d..495b1f3d 100644 --- a/blog-backend/gen/api/go/front/service/v1/i_post.pb.validate.go +++ b/blog-backend/gen/api/go/front/service/v1/i_post.pb.validate.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-validate. DO NOT EDIT. // source: front/service/v1/i_post.proto -package v1 +package servicev1 import ( "bytes" diff --git a/blog-backend/gen/api/go/front/service/v1/i_post_grpc.pb.go b/blog-backend/gen/api/go/front/service/v1/i_post_grpc.pb.go index 3c082de1..2972f531 100644 --- a/blog-backend/gen/api/go/front/service/v1/i_post_grpc.pb.go +++ b/blog-backend/gen/api/go/front/service/v1/i_post_grpc.pb.go @@ -4,16 +4,16 @@ // - protoc (unknown) // source: front/service/v1/i_post.proto -package v1 +package servicev1 import ( context "context" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" - v1 "kratos-cms/gen/api/go/content/service/v1" + v11 "kratos-cms/gen/api/go/content/service/v1" ) // This is a compile-time assertion to ensure that this generated file @@ -34,15 +34,15 @@ const ( // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type PostServiceClient interface { // 获取帖子列表 - ListPost(ctx context.Context, in *pagination.PagingRequest, opts ...grpc.CallOption) (*v1.ListPostResponse, error) + ListPost(ctx context.Context, in *v1.PagingRequest, opts ...grpc.CallOption) (*v11.ListPostResponse, error) // 获取帖子数据 - GetPost(ctx context.Context, in *v1.GetPostRequest, opts ...grpc.CallOption) (*v1.Post, error) + GetPost(ctx context.Context, in *v11.GetPostRequest, opts ...grpc.CallOption) (*v11.Post, error) // 创建帖子 - CreatePost(ctx context.Context, in *v1.CreatePostRequest, opts ...grpc.CallOption) (*v1.Post, error) + CreatePost(ctx context.Context, in *v11.CreatePostRequest, opts ...grpc.CallOption) (*v11.Post, error) // 更新帖子 - UpdatePost(ctx context.Context, in *v1.UpdatePostRequest, opts ...grpc.CallOption) (*v1.Post, error) + UpdatePost(ctx context.Context, in *v11.UpdatePostRequest, opts ...grpc.CallOption) (*v11.Post, error) // 删除帖子 - DeletePost(ctx context.Context, in *v1.DeletePostRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) + DeletePost(ctx context.Context, in *v11.DeletePostRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) } type postServiceClient struct { @@ -53,8 +53,8 @@ func NewPostServiceClient(cc grpc.ClientConnInterface) PostServiceClient { return &postServiceClient{cc} } -func (c *postServiceClient) ListPost(ctx context.Context, in *pagination.PagingRequest, opts ...grpc.CallOption) (*v1.ListPostResponse, error) { - out := new(v1.ListPostResponse) +func (c *postServiceClient) ListPost(ctx context.Context, in *v1.PagingRequest, opts ...grpc.CallOption) (*v11.ListPostResponse, error) { + out := new(v11.ListPostResponse) err := c.cc.Invoke(ctx, PostService_ListPost_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -62,8 +62,8 @@ func (c *postServiceClient) ListPost(ctx context.Context, in *pagination.PagingR return out, nil } -func (c *postServiceClient) GetPost(ctx context.Context, in *v1.GetPostRequest, opts ...grpc.CallOption) (*v1.Post, error) { - out := new(v1.Post) +func (c *postServiceClient) GetPost(ctx context.Context, in *v11.GetPostRequest, opts ...grpc.CallOption) (*v11.Post, error) { + out := new(v11.Post) err := c.cc.Invoke(ctx, PostService_GetPost_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -71,8 +71,8 @@ func (c *postServiceClient) GetPost(ctx context.Context, in *v1.GetPostRequest, return out, nil } -func (c *postServiceClient) CreatePost(ctx context.Context, in *v1.CreatePostRequest, opts ...grpc.CallOption) (*v1.Post, error) { - out := new(v1.Post) +func (c *postServiceClient) CreatePost(ctx context.Context, in *v11.CreatePostRequest, opts ...grpc.CallOption) (*v11.Post, error) { + out := new(v11.Post) err := c.cc.Invoke(ctx, PostService_CreatePost_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -80,8 +80,8 @@ func (c *postServiceClient) CreatePost(ctx context.Context, in *v1.CreatePostReq return out, nil } -func (c *postServiceClient) UpdatePost(ctx context.Context, in *v1.UpdatePostRequest, opts ...grpc.CallOption) (*v1.Post, error) { - out := new(v1.Post) +func (c *postServiceClient) UpdatePost(ctx context.Context, in *v11.UpdatePostRequest, opts ...grpc.CallOption) (*v11.Post, error) { + out := new(v11.Post) err := c.cc.Invoke(ctx, PostService_UpdatePost_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -89,7 +89,7 @@ func (c *postServiceClient) UpdatePost(ctx context.Context, in *v1.UpdatePostReq return out, nil } -func (c *postServiceClient) DeletePost(ctx context.Context, in *v1.DeletePostRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { +func (c *postServiceClient) DeletePost(ctx context.Context, in *v11.DeletePostRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { out := new(emptypb.Empty) err := c.cc.Invoke(ctx, PostService_DeletePost_FullMethodName, in, out, opts...) if err != nil { @@ -103,15 +103,15 @@ func (c *postServiceClient) DeletePost(ctx context.Context, in *v1.DeletePostReq // for forward compatibility type PostServiceServer interface { // 获取帖子列表 - ListPost(context.Context, *pagination.PagingRequest) (*v1.ListPostResponse, error) + ListPost(context.Context, *v1.PagingRequest) (*v11.ListPostResponse, error) // 获取帖子数据 - GetPost(context.Context, *v1.GetPostRequest) (*v1.Post, error) + GetPost(context.Context, *v11.GetPostRequest) (*v11.Post, error) // 创建帖子 - CreatePost(context.Context, *v1.CreatePostRequest) (*v1.Post, error) + CreatePost(context.Context, *v11.CreatePostRequest) (*v11.Post, error) // 更新帖子 - UpdatePost(context.Context, *v1.UpdatePostRequest) (*v1.Post, error) + UpdatePost(context.Context, *v11.UpdatePostRequest) (*v11.Post, error) // 删除帖子 - DeletePost(context.Context, *v1.DeletePostRequest) (*emptypb.Empty, error) + DeletePost(context.Context, *v11.DeletePostRequest) (*emptypb.Empty, error) mustEmbedUnimplementedPostServiceServer() } @@ -119,19 +119,19 @@ type PostServiceServer interface { type UnimplementedPostServiceServer struct { } -func (UnimplementedPostServiceServer) ListPost(context.Context, *pagination.PagingRequest) (*v1.ListPostResponse, error) { +func (UnimplementedPostServiceServer) ListPost(context.Context, *v1.PagingRequest) (*v11.ListPostResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListPost not implemented") } -func (UnimplementedPostServiceServer) GetPost(context.Context, *v1.GetPostRequest) (*v1.Post, error) { +func (UnimplementedPostServiceServer) GetPost(context.Context, *v11.GetPostRequest) (*v11.Post, error) { return nil, status.Errorf(codes.Unimplemented, "method GetPost not implemented") } -func (UnimplementedPostServiceServer) CreatePost(context.Context, *v1.CreatePostRequest) (*v1.Post, error) { +func (UnimplementedPostServiceServer) CreatePost(context.Context, *v11.CreatePostRequest) (*v11.Post, error) { return nil, status.Errorf(codes.Unimplemented, "method CreatePost not implemented") } -func (UnimplementedPostServiceServer) UpdatePost(context.Context, *v1.UpdatePostRequest) (*v1.Post, error) { +func (UnimplementedPostServiceServer) UpdatePost(context.Context, *v11.UpdatePostRequest) (*v11.Post, error) { return nil, status.Errorf(codes.Unimplemented, "method UpdatePost not implemented") } -func (UnimplementedPostServiceServer) DeletePost(context.Context, *v1.DeletePostRequest) (*emptypb.Empty, error) { +func (UnimplementedPostServiceServer) DeletePost(context.Context, *v11.DeletePostRequest) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method DeletePost not implemented") } func (UnimplementedPostServiceServer) mustEmbedUnimplementedPostServiceServer() {} @@ -148,7 +148,7 @@ func RegisterPostServiceServer(s grpc.ServiceRegistrar, srv PostServiceServer) { } func _PostService_ListPost_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(pagination.PagingRequest) + in := new(v1.PagingRequest) if err := dec(in); err != nil { return nil, err } @@ -160,13 +160,13 @@ func _PostService_ListPost_Handler(srv interface{}, ctx context.Context, dec fun FullMethod: PostService_ListPost_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(PostServiceServer).ListPost(ctx, req.(*pagination.PagingRequest)) + return srv.(PostServiceServer).ListPost(ctx, req.(*v1.PagingRequest)) } return interceptor(ctx, in, info, handler) } func _PostService_GetPost_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.GetPostRequest) + in := new(v11.GetPostRequest) if err := dec(in); err != nil { return nil, err } @@ -178,13 +178,13 @@ func _PostService_GetPost_Handler(srv interface{}, ctx context.Context, dec func FullMethod: PostService_GetPost_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(PostServiceServer).GetPost(ctx, req.(*v1.GetPostRequest)) + return srv.(PostServiceServer).GetPost(ctx, req.(*v11.GetPostRequest)) } return interceptor(ctx, in, info, handler) } func _PostService_CreatePost_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.CreatePostRequest) + in := new(v11.CreatePostRequest) if err := dec(in); err != nil { return nil, err } @@ -196,13 +196,13 @@ func _PostService_CreatePost_Handler(srv interface{}, ctx context.Context, dec f FullMethod: PostService_CreatePost_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(PostServiceServer).CreatePost(ctx, req.(*v1.CreatePostRequest)) + return srv.(PostServiceServer).CreatePost(ctx, req.(*v11.CreatePostRequest)) } return interceptor(ctx, in, info, handler) } func _PostService_UpdatePost_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.UpdatePostRequest) + in := new(v11.UpdatePostRequest) if err := dec(in); err != nil { return nil, err } @@ -214,13 +214,13 @@ func _PostService_UpdatePost_Handler(srv interface{}, ctx context.Context, dec f FullMethod: PostService_UpdatePost_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(PostServiceServer).UpdatePost(ctx, req.(*v1.UpdatePostRequest)) + return srv.(PostServiceServer).UpdatePost(ctx, req.(*v11.UpdatePostRequest)) } return interceptor(ctx, in, info, handler) } func _PostService_DeletePost_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.DeletePostRequest) + in := new(v11.DeletePostRequest) if err := dec(in); err != nil { return nil, err } @@ -232,7 +232,7 @@ func _PostService_DeletePost_Handler(srv interface{}, ctx context.Context, dec f FullMethod: PostService_DeletePost_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(PostServiceServer).DeletePost(ctx, req.(*v1.DeletePostRequest)) + return srv.(PostServiceServer).DeletePost(ctx, req.(*v11.DeletePostRequest)) } return interceptor(ctx, in, info, handler) } diff --git a/blog-backend/gen/api/go/front/service/v1/i_post_http.pb.go b/blog-backend/gen/api/go/front/service/v1/i_post_http.pb.go index 7314541a..e3d595e2 100644 --- a/blog-backend/gen/api/go/front/service/v1/i_post_http.pb.go +++ b/blog-backend/gen/api/go/front/service/v1/i_post_http.pb.go @@ -4,15 +4,15 @@ // - protoc (unknown) // source: front/service/v1/i_post.proto -package v1 +package servicev1 import ( context "context" http "github.com/go-kratos/kratos/v2/transport/http" binding "github.com/go-kratos/kratos/v2/transport/http/binding" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" - v1 "kratos-cms/gen/api/go/content/service/v1" + v11 "kratos-cms/gen/api/go/content/service/v1" ) // This is a compile-time assertion to ensure that this generated file @@ -30,15 +30,15 @@ const OperationPostServiceUpdatePost = "/front.service.v1.PostService/UpdatePost type PostServiceHTTPServer interface { // CreatePost 创建帖子 - CreatePost(context.Context, *v1.CreatePostRequest) (*v1.Post, error) + CreatePost(context.Context, *v11.CreatePostRequest) (*v11.Post, error) // DeletePost 删除帖子 - DeletePost(context.Context, *v1.DeletePostRequest) (*emptypb.Empty, error) + DeletePost(context.Context, *v11.DeletePostRequest) (*emptypb.Empty, error) // GetPost 获取帖子数据 - GetPost(context.Context, *v1.GetPostRequest) (*v1.Post, error) + GetPost(context.Context, *v11.GetPostRequest) (*v11.Post, error) // ListPost 获取帖子列表 - ListPost(context.Context, *pagination.PagingRequest) (*v1.ListPostResponse, error) + ListPost(context.Context, *v1.PagingRequest) (*v11.ListPostResponse, error) // UpdatePost 更新帖子 - UpdatePost(context.Context, *v1.UpdatePostRequest) (*v1.Post, error) + UpdatePost(context.Context, *v11.UpdatePostRequest) (*v11.Post, error) } func RegisterPostServiceHTTPServer(s *http.Server, srv PostServiceHTTPServer) { @@ -52,26 +52,26 @@ func RegisterPostServiceHTTPServer(s *http.Server, srv PostServiceHTTPServer) { func _PostService_ListPost0_HTTP_Handler(srv PostServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in pagination.PagingRequest + var in v1.PagingRequest if err := ctx.BindQuery(&in); err != nil { return err } http.SetOperation(ctx, OperationPostServiceListPost) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.ListPost(ctx, req.(*pagination.PagingRequest)) + return srv.ListPost(ctx, req.(*v1.PagingRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.ListPostResponse) + reply := out.(*v11.ListPostResponse) return ctx.Result(200, reply) } } func _PostService_GetPost0_HTTP_Handler(srv PostServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.GetPostRequest + var in v11.GetPostRequest if err := ctx.BindQuery(&in); err != nil { return err } @@ -80,20 +80,20 @@ func _PostService_GetPost0_HTTP_Handler(srv PostServiceHTTPServer) func(ctx http } http.SetOperation(ctx, OperationPostServiceGetPost) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.GetPost(ctx, req.(*v1.GetPostRequest)) + return srv.GetPost(ctx, req.(*v11.GetPostRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.Post) + reply := out.(*v11.Post) return ctx.Result(200, reply) } } func _PostService_CreatePost0_HTTP_Handler(srv PostServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.CreatePostRequest + var in v11.CreatePostRequest if err := ctx.Bind(&in); err != nil { return err } @@ -102,20 +102,20 @@ func _PostService_CreatePost0_HTTP_Handler(srv PostServiceHTTPServer) func(ctx h } http.SetOperation(ctx, OperationPostServiceCreatePost) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.CreatePost(ctx, req.(*v1.CreatePostRequest)) + return srv.CreatePost(ctx, req.(*v11.CreatePostRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.Post) + reply := out.(*v11.Post) return ctx.Result(200, reply) } } func _PostService_UpdatePost0_HTTP_Handler(srv PostServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.UpdatePostRequest + var in v11.UpdatePostRequest if err := ctx.Bind(&in.Post); err != nil { return err } @@ -127,20 +127,20 @@ func _PostService_UpdatePost0_HTTP_Handler(srv PostServiceHTTPServer) func(ctx h } http.SetOperation(ctx, OperationPostServiceUpdatePost) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.UpdatePost(ctx, req.(*v1.UpdatePostRequest)) + return srv.UpdatePost(ctx, req.(*v11.UpdatePostRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.Post) + reply := out.(*v11.Post) return ctx.Result(200, reply) } } func _PostService_DeletePost0_HTTP_Handler(srv PostServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.DeletePostRequest + var in v11.DeletePostRequest if err := ctx.BindQuery(&in); err != nil { return err } @@ -149,7 +149,7 @@ func _PostService_DeletePost0_HTTP_Handler(srv PostServiceHTTPServer) func(ctx h } http.SetOperation(ctx, OperationPostServiceDeletePost) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.DeletePost(ctx, req.(*v1.DeletePostRequest)) + return srv.DeletePost(ctx, req.(*v11.DeletePostRequest)) }) out, err := h(ctx, &in) if err != nil { @@ -161,11 +161,11 @@ func _PostService_DeletePost0_HTTP_Handler(srv PostServiceHTTPServer) func(ctx h } type PostServiceHTTPClient interface { - CreatePost(ctx context.Context, req *v1.CreatePostRequest, opts ...http.CallOption) (rsp *v1.Post, err error) - DeletePost(ctx context.Context, req *v1.DeletePostRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error) - GetPost(ctx context.Context, req *v1.GetPostRequest, opts ...http.CallOption) (rsp *v1.Post, err error) - ListPost(ctx context.Context, req *pagination.PagingRequest, opts ...http.CallOption) (rsp *v1.ListPostResponse, err error) - UpdatePost(ctx context.Context, req *v1.UpdatePostRequest, opts ...http.CallOption) (rsp *v1.Post, err error) + CreatePost(ctx context.Context, req *v11.CreatePostRequest, opts ...http.CallOption) (rsp *v11.Post, err error) + DeletePost(ctx context.Context, req *v11.DeletePostRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error) + GetPost(ctx context.Context, req *v11.GetPostRequest, opts ...http.CallOption) (rsp *v11.Post, err error) + ListPost(ctx context.Context, req *v1.PagingRequest, opts ...http.CallOption) (rsp *v11.ListPostResponse, err error) + UpdatePost(ctx context.Context, req *v11.UpdatePostRequest, opts ...http.CallOption) (rsp *v11.Post, err error) } type PostServiceHTTPClientImpl struct { @@ -176,8 +176,8 @@ func NewPostServiceHTTPClient(client *http.Client) PostServiceHTTPClient { return &PostServiceHTTPClientImpl{client} } -func (c *PostServiceHTTPClientImpl) CreatePost(ctx context.Context, in *v1.CreatePostRequest, opts ...http.CallOption) (*v1.Post, error) { - var out v1.Post +func (c *PostServiceHTTPClientImpl) CreatePost(ctx context.Context, in *v11.CreatePostRequest, opts ...http.CallOption) (*v11.Post, error) { + var out v11.Post pattern := "/blog/v1/posts" path := binding.EncodeURL(pattern, in, false) opts = append(opts, http.Operation(OperationPostServiceCreatePost)) @@ -189,7 +189,7 @@ func (c *PostServiceHTTPClientImpl) CreatePost(ctx context.Context, in *v1.Creat return &out, err } -func (c *PostServiceHTTPClientImpl) DeletePost(ctx context.Context, in *v1.DeletePostRequest, opts ...http.CallOption) (*emptypb.Empty, error) { +func (c *PostServiceHTTPClientImpl) DeletePost(ctx context.Context, in *v11.DeletePostRequest, opts ...http.CallOption) (*emptypb.Empty, error) { var out emptypb.Empty pattern := "/blog/v1/posts/{id}" path := binding.EncodeURL(pattern, in, true) @@ -202,8 +202,8 @@ func (c *PostServiceHTTPClientImpl) DeletePost(ctx context.Context, in *v1.Delet return &out, err } -func (c *PostServiceHTTPClientImpl) GetPost(ctx context.Context, in *v1.GetPostRequest, opts ...http.CallOption) (*v1.Post, error) { - var out v1.Post +func (c *PostServiceHTTPClientImpl) GetPost(ctx context.Context, in *v11.GetPostRequest, opts ...http.CallOption) (*v11.Post, error) { + var out v11.Post pattern := "/blog/v1/posts/{id}" path := binding.EncodeURL(pattern, in, true) opts = append(opts, http.Operation(OperationPostServiceGetPost)) @@ -215,8 +215,8 @@ func (c *PostServiceHTTPClientImpl) GetPost(ctx context.Context, in *v1.GetPostR return &out, err } -func (c *PostServiceHTTPClientImpl) ListPost(ctx context.Context, in *pagination.PagingRequest, opts ...http.CallOption) (*v1.ListPostResponse, error) { - var out v1.ListPostResponse +func (c *PostServiceHTTPClientImpl) ListPost(ctx context.Context, in *v1.PagingRequest, opts ...http.CallOption) (*v11.ListPostResponse, error) { + var out v11.ListPostResponse pattern := "/blog/v1/posts" path := binding.EncodeURL(pattern, in, true) opts = append(opts, http.Operation(OperationPostServiceListPost)) @@ -228,8 +228,8 @@ func (c *PostServiceHTTPClientImpl) ListPost(ctx context.Context, in *pagination return &out, err } -func (c *PostServiceHTTPClientImpl) UpdatePost(ctx context.Context, in *v1.UpdatePostRequest, opts ...http.CallOption) (*v1.Post, error) { - var out v1.Post +func (c *PostServiceHTTPClientImpl) UpdatePost(ctx context.Context, in *v11.UpdatePostRequest, opts ...http.CallOption) (*v11.Post, error) { + var out v11.Post pattern := "/blog/v1/posts/{id}" path := binding.EncodeURL(pattern, in, false) opts = append(opts, http.Operation(OperationPostServiceUpdatePost)) diff --git a/blog-backend/gen/api/go/front/service/v1/i_tag.pb.go b/blog-backend/gen/api/go/front/service/v1/i_tag.pb.go index 25309c9f..a4e8d030 100644 --- a/blog-backend/gen/api/go/front/service/v1/i_tag.pb.go +++ b/blog-backend/gen/api/go/front/service/v1/i_tag.pb.go @@ -4,16 +4,16 @@ // protoc (unknown) // source: front/service/v1/i_tag.proto -package v1 +package servicev1 import ( _ "github.com/google/gnostic/openapiv3" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" - v1 "kratos-cms/gen/api/go/content/service/v1" + v11 "kratos-cms/gen/api/go/content/service/v1" reflect "reflect" ) @@ -36,68 +36,76 @@ var file_front_service_v1_i_tag_proto_rawDesc = []byte{ 0x70, 0x69, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x1a, 0x22, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1c, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2f, 0x73, - 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x61, 0x67, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x32, 0xa8, 0x05, 0x0a, 0x0a, 0x54, 0x61, 0x67, 0x53, 0x65, 0x72, 0x76, 0x69, - 0x63, 0x65, 0x12, 0x7f, 0x0a, 0x07, 0x4c, 0x69, 0x73, 0x74, 0x54, 0x61, 0x67, 0x12, 0x19, 0x2e, - 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x50, 0x61, 0x67, 0x69, 0x6e, - 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, - 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, - 0x73, 0x74, 0x54, 0x61, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x34, 0xba, - 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, - 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, - 0xe4, 0x93, 0x02, 0x0f, 0x12, 0x0d, 0x2f, 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x74, - 0x61, 0x67, 0x73, 0x12, 0x7f, 0x0a, 0x06, 0x47, 0x65, 0x74, 0x54, 0x61, 0x67, 0x12, 0x21, 0x2e, - 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, - 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x54, 0x61, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x1a, 0x17, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, - 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x61, 0x67, 0x22, 0x39, 0xba, 0x47, 0x1c, 0x5a, 0x1a, + 0x6f, 0x1a, 0x1e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x76, 0x31, + 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x1a, 0x1c, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, + 0x63, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x61, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x32, + 0xa8, 0x05, 0x0a, 0x0a, 0x54, 0x61, 0x67, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x7f, + 0x0a, 0x07, 0x4c, 0x69, 0x73, 0x74, 0x54, 0x61, 0x67, 0x12, 0x19, 0x2e, 0x70, 0x61, 0x67, 0x69, + 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, + 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x54, 0x61, + 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x34, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, - 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x14, - 0x12, 0x12, 0x2f, 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x61, 0x67, 0x73, 0x2f, - 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x83, 0x01, 0x0a, 0x09, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, - 0x61, 0x67, 0x12, 0x24, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, - 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x61, - 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x17, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, - 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x61, - 0x67, 0x22, 0x37, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, - 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, - 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x12, 0x3a, 0x01, 0x2a, 0x22, 0x0d, 0x2f, 0x62, 0x6c, - 0x6f, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x61, 0x67, 0x73, 0x12, 0x8a, 0x01, 0x0a, 0x09, 0x55, - 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x61, 0x67, 0x12, 0x24, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, - 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, - 0x64, 0x61, 0x74, 0x65, 0x54, 0x61, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x17, + 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x0f, + 0x12, 0x0d, 0x2f, 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x61, 0x67, 0x73, 0x12, + 0x7f, 0x0a, 0x06, 0x47, 0x65, 0x74, 0x54, 0x61, 0x67, 0x12, 0x21, 0x2e, 0x63, 0x6f, 0x6e, 0x74, + 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, + 0x65, 0x74, 0x54, 0x61, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x17, 0x2e, 0x63, + 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, + 0x31, 0x2e, 0x54, 0x61, 0x67, 0x22, 0x39, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, + 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, + 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x14, 0x12, 0x12, 0x2f, 0x62, + 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x61, 0x67, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, + 0x12, 0x83, 0x01, 0x0a, 0x09, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x61, 0x67, 0x12, 0x24, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, - 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x61, 0x67, 0x22, 0x3e, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, - 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, - 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x19, 0x3a, 0x03, - 0x74, 0x61, 0x67, 0x1a, 0x12, 0x2f, 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x61, - 0x67, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0x84, 0x01, 0x0a, 0x09, 0x44, 0x65, 0x6c, 0x65, - 0x74, 0x65, 0x54, 0x61, 0x67, 0x12, 0x24, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, - 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, - 0x65, 0x54, 0x61, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, - 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, - 0x70, 0x74, 0x79, 0x22, 0x39, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, + 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x61, 0x67, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x1a, 0x17, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, + 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x61, 0x67, 0x22, 0x37, 0xba, + 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, + 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, + 0xe4, 0x93, 0x02, 0x12, 0x3a, 0x01, 0x2a, 0x22, 0x0d, 0x2f, 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, + 0x31, 0x2f, 0x74, 0x61, 0x67, 0x73, 0x12, 0x8a, 0x01, 0x0a, 0x09, 0x55, 0x70, 0x64, 0x61, 0x74, + 0x65, 0x54, 0x61, 0x67, 0x12, 0x24, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, + 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, + 0x54, 0x61, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x17, 0x2e, 0x63, 0x6f, 0x6e, + 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, + 0x54, 0x61, 0x67, 0x22, 0x3e, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, - 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x14, 0x2a, 0x12, 0x2f, 0x62, 0x6c, 0x6f, - 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x61, 0x67, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x42, 0x2b, - 0x5a, 0x29, 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x63, 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, + 0x65, 0x72, 0x12, 0x00, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x19, 0x3a, 0x03, 0x74, 0x61, 0x67, 0x1a, + 0x12, 0x2f, 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x74, 0x61, 0x67, 0x73, 0x2f, 0x7b, + 0x69, 0x64, 0x7d, 0x12, 0x84, 0x01, 0x0a, 0x09, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, + 0x67, 0x12, 0x24, 0x2e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, + 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x67, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, + 0x39, 0xba, 0x47, 0x1c, 0x5a, 0x1a, 0x0a, 0x18, 0x0a, 0x14, 0x4f, 0x41, 0x75, 0x74, 0x68, 0x32, + 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x65, 0x61, 0x72, 0x65, 0x72, 0x12, 0x00, + 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x14, 0x2a, 0x12, 0x2f, 0x62, 0x6c, 0x6f, 0x67, 0x2f, 0x76, 0x31, + 0x2f, 0x74, 0x61, 0x67, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x42, 0xb5, 0x01, 0x0a, 0x14, 0x63, + 0x6f, 0x6d, 0x2e, 0x66, 0x72, 0x6f, 0x6e, 0x74, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, + 0x2e, 0x76, 0x31, 0x42, 0x09, 0x49, 0x54, 0x61, 0x67, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, + 0x5a, 0x30, 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x63, 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x66, 0x72, 0x6f, 0x6e, 0x74, 0x2f, 0x73, 0x65, - 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, + 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, + 0x76, 0x31, 0xa2, 0x02, 0x03, 0x46, 0x53, 0x58, 0xaa, 0x02, 0x10, 0x46, 0x72, 0x6f, 0x6e, 0x74, + 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x10, 0x46, 0x72, + 0x6f, 0x6e, 0x74, 0x5c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x56, 0x31, 0xe2, 0x02, + 0x1c, 0x46, 0x72, 0x6f, 0x6e, 0x74, 0x5c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x56, + 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x12, + 0x46, 0x72, 0x6f, 0x6e, 0x74, 0x3a, 0x3a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x3a, 0x3a, + 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var file_front_service_v1_i_tag_proto_goTypes = []interface{}{ - (*pagination.PagingRequest)(nil), // 0: pagination.PagingRequest - (*v1.GetTagRequest)(nil), // 1: content.service.v1.GetTagRequest - (*v1.CreateTagRequest)(nil), // 2: content.service.v1.CreateTagRequest - (*v1.UpdateTagRequest)(nil), // 3: content.service.v1.UpdateTagRequest - (*v1.DeleteTagRequest)(nil), // 4: content.service.v1.DeleteTagRequest - (*v1.ListTagResponse)(nil), // 5: content.service.v1.ListTagResponse - (*v1.Tag)(nil), // 6: content.service.v1.Tag - (*emptypb.Empty)(nil), // 7: google.protobuf.Empty + (*v1.PagingRequest)(nil), // 0: pagination.PagingRequest + (*v11.GetTagRequest)(nil), // 1: content.service.v1.GetTagRequest + (*v11.CreateTagRequest)(nil), // 2: content.service.v1.CreateTagRequest + (*v11.UpdateTagRequest)(nil), // 3: content.service.v1.UpdateTagRequest + (*v11.DeleteTagRequest)(nil), // 4: content.service.v1.DeleteTagRequest + (*v11.ListTagResponse)(nil), // 5: content.service.v1.ListTagResponse + (*v11.Tag)(nil), // 6: content.service.v1.Tag + (*emptypb.Empty)(nil), // 7: google.protobuf.Empty } var file_front_service_v1_i_tag_proto_depIdxs = []int32{ 0, // 0: front.service.v1.TagService.ListTag:input_type -> pagination.PagingRequest diff --git a/blog-backend/gen/api/go/front/service/v1/i_tag.pb.validate.go b/blog-backend/gen/api/go/front/service/v1/i_tag.pb.validate.go index 0cd5f91e..5e0a3b58 100644 --- a/blog-backend/gen/api/go/front/service/v1/i_tag.pb.validate.go +++ b/blog-backend/gen/api/go/front/service/v1/i_tag.pb.validate.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-validate. DO NOT EDIT. // source: front/service/v1/i_tag.proto -package v1 +package servicev1 import ( "bytes" diff --git a/blog-backend/gen/api/go/front/service/v1/i_tag_grpc.pb.go b/blog-backend/gen/api/go/front/service/v1/i_tag_grpc.pb.go index cb00580e..215d8bb0 100644 --- a/blog-backend/gen/api/go/front/service/v1/i_tag_grpc.pb.go +++ b/blog-backend/gen/api/go/front/service/v1/i_tag_grpc.pb.go @@ -4,16 +4,16 @@ // - protoc (unknown) // source: front/service/v1/i_tag.proto -package v1 +package servicev1 import ( context "context" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" - v1 "kratos-cms/gen/api/go/content/service/v1" + v11 "kratos-cms/gen/api/go/content/service/v1" ) // This is a compile-time assertion to ensure that this generated file @@ -34,15 +34,15 @@ const ( // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type TagServiceClient interface { // 获取标签列表 - ListTag(ctx context.Context, in *pagination.PagingRequest, opts ...grpc.CallOption) (*v1.ListTagResponse, error) + ListTag(ctx context.Context, in *v1.PagingRequest, opts ...grpc.CallOption) (*v11.ListTagResponse, error) // 获取标签数据 - GetTag(ctx context.Context, in *v1.GetTagRequest, opts ...grpc.CallOption) (*v1.Tag, error) + GetTag(ctx context.Context, in *v11.GetTagRequest, opts ...grpc.CallOption) (*v11.Tag, error) // 创建标签 - CreateTag(ctx context.Context, in *v1.CreateTagRequest, opts ...grpc.CallOption) (*v1.Tag, error) + CreateTag(ctx context.Context, in *v11.CreateTagRequest, opts ...grpc.CallOption) (*v11.Tag, error) // 更新标签 - UpdateTag(ctx context.Context, in *v1.UpdateTagRequest, opts ...grpc.CallOption) (*v1.Tag, error) + UpdateTag(ctx context.Context, in *v11.UpdateTagRequest, opts ...grpc.CallOption) (*v11.Tag, error) // 删除标签 - DeleteTag(ctx context.Context, in *v1.DeleteTagRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) + DeleteTag(ctx context.Context, in *v11.DeleteTagRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) } type tagServiceClient struct { @@ -53,8 +53,8 @@ func NewTagServiceClient(cc grpc.ClientConnInterface) TagServiceClient { return &tagServiceClient{cc} } -func (c *tagServiceClient) ListTag(ctx context.Context, in *pagination.PagingRequest, opts ...grpc.CallOption) (*v1.ListTagResponse, error) { - out := new(v1.ListTagResponse) +func (c *tagServiceClient) ListTag(ctx context.Context, in *v1.PagingRequest, opts ...grpc.CallOption) (*v11.ListTagResponse, error) { + out := new(v11.ListTagResponse) err := c.cc.Invoke(ctx, TagService_ListTag_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -62,8 +62,8 @@ func (c *tagServiceClient) ListTag(ctx context.Context, in *pagination.PagingReq return out, nil } -func (c *tagServiceClient) GetTag(ctx context.Context, in *v1.GetTagRequest, opts ...grpc.CallOption) (*v1.Tag, error) { - out := new(v1.Tag) +func (c *tagServiceClient) GetTag(ctx context.Context, in *v11.GetTagRequest, opts ...grpc.CallOption) (*v11.Tag, error) { + out := new(v11.Tag) err := c.cc.Invoke(ctx, TagService_GetTag_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -71,8 +71,8 @@ func (c *tagServiceClient) GetTag(ctx context.Context, in *v1.GetTagRequest, opt return out, nil } -func (c *tagServiceClient) CreateTag(ctx context.Context, in *v1.CreateTagRequest, opts ...grpc.CallOption) (*v1.Tag, error) { - out := new(v1.Tag) +func (c *tagServiceClient) CreateTag(ctx context.Context, in *v11.CreateTagRequest, opts ...grpc.CallOption) (*v11.Tag, error) { + out := new(v11.Tag) err := c.cc.Invoke(ctx, TagService_CreateTag_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -80,8 +80,8 @@ func (c *tagServiceClient) CreateTag(ctx context.Context, in *v1.CreateTagReques return out, nil } -func (c *tagServiceClient) UpdateTag(ctx context.Context, in *v1.UpdateTagRequest, opts ...grpc.CallOption) (*v1.Tag, error) { - out := new(v1.Tag) +func (c *tagServiceClient) UpdateTag(ctx context.Context, in *v11.UpdateTagRequest, opts ...grpc.CallOption) (*v11.Tag, error) { + out := new(v11.Tag) err := c.cc.Invoke(ctx, TagService_UpdateTag_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -89,7 +89,7 @@ func (c *tagServiceClient) UpdateTag(ctx context.Context, in *v1.UpdateTagReques return out, nil } -func (c *tagServiceClient) DeleteTag(ctx context.Context, in *v1.DeleteTagRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { +func (c *tagServiceClient) DeleteTag(ctx context.Context, in *v11.DeleteTagRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { out := new(emptypb.Empty) err := c.cc.Invoke(ctx, TagService_DeleteTag_FullMethodName, in, out, opts...) if err != nil { @@ -103,15 +103,15 @@ func (c *tagServiceClient) DeleteTag(ctx context.Context, in *v1.DeleteTagReques // for forward compatibility type TagServiceServer interface { // 获取标签列表 - ListTag(context.Context, *pagination.PagingRequest) (*v1.ListTagResponse, error) + ListTag(context.Context, *v1.PagingRequest) (*v11.ListTagResponse, error) // 获取标签数据 - GetTag(context.Context, *v1.GetTagRequest) (*v1.Tag, error) + GetTag(context.Context, *v11.GetTagRequest) (*v11.Tag, error) // 创建标签 - CreateTag(context.Context, *v1.CreateTagRequest) (*v1.Tag, error) + CreateTag(context.Context, *v11.CreateTagRequest) (*v11.Tag, error) // 更新标签 - UpdateTag(context.Context, *v1.UpdateTagRequest) (*v1.Tag, error) + UpdateTag(context.Context, *v11.UpdateTagRequest) (*v11.Tag, error) // 删除标签 - DeleteTag(context.Context, *v1.DeleteTagRequest) (*emptypb.Empty, error) + DeleteTag(context.Context, *v11.DeleteTagRequest) (*emptypb.Empty, error) mustEmbedUnimplementedTagServiceServer() } @@ -119,19 +119,19 @@ type TagServiceServer interface { type UnimplementedTagServiceServer struct { } -func (UnimplementedTagServiceServer) ListTag(context.Context, *pagination.PagingRequest) (*v1.ListTagResponse, error) { +func (UnimplementedTagServiceServer) ListTag(context.Context, *v1.PagingRequest) (*v11.ListTagResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListTag not implemented") } -func (UnimplementedTagServiceServer) GetTag(context.Context, *v1.GetTagRequest) (*v1.Tag, error) { +func (UnimplementedTagServiceServer) GetTag(context.Context, *v11.GetTagRequest) (*v11.Tag, error) { return nil, status.Errorf(codes.Unimplemented, "method GetTag not implemented") } -func (UnimplementedTagServiceServer) CreateTag(context.Context, *v1.CreateTagRequest) (*v1.Tag, error) { +func (UnimplementedTagServiceServer) CreateTag(context.Context, *v11.CreateTagRequest) (*v11.Tag, error) { return nil, status.Errorf(codes.Unimplemented, "method CreateTag not implemented") } -func (UnimplementedTagServiceServer) UpdateTag(context.Context, *v1.UpdateTagRequest) (*v1.Tag, error) { +func (UnimplementedTagServiceServer) UpdateTag(context.Context, *v11.UpdateTagRequest) (*v11.Tag, error) { return nil, status.Errorf(codes.Unimplemented, "method UpdateTag not implemented") } -func (UnimplementedTagServiceServer) DeleteTag(context.Context, *v1.DeleteTagRequest) (*emptypb.Empty, error) { +func (UnimplementedTagServiceServer) DeleteTag(context.Context, *v11.DeleteTagRequest) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method DeleteTag not implemented") } func (UnimplementedTagServiceServer) mustEmbedUnimplementedTagServiceServer() {} @@ -148,7 +148,7 @@ func RegisterTagServiceServer(s grpc.ServiceRegistrar, srv TagServiceServer) { } func _TagService_ListTag_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(pagination.PagingRequest) + in := new(v1.PagingRequest) if err := dec(in); err != nil { return nil, err } @@ -160,13 +160,13 @@ func _TagService_ListTag_Handler(srv interface{}, ctx context.Context, dec func( FullMethod: TagService_ListTag_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TagServiceServer).ListTag(ctx, req.(*pagination.PagingRequest)) + return srv.(TagServiceServer).ListTag(ctx, req.(*v1.PagingRequest)) } return interceptor(ctx, in, info, handler) } func _TagService_GetTag_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.GetTagRequest) + in := new(v11.GetTagRequest) if err := dec(in); err != nil { return nil, err } @@ -178,13 +178,13 @@ func _TagService_GetTag_Handler(srv interface{}, ctx context.Context, dec func(i FullMethod: TagService_GetTag_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TagServiceServer).GetTag(ctx, req.(*v1.GetTagRequest)) + return srv.(TagServiceServer).GetTag(ctx, req.(*v11.GetTagRequest)) } return interceptor(ctx, in, info, handler) } func _TagService_CreateTag_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.CreateTagRequest) + in := new(v11.CreateTagRequest) if err := dec(in); err != nil { return nil, err } @@ -196,13 +196,13 @@ func _TagService_CreateTag_Handler(srv interface{}, ctx context.Context, dec fun FullMethod: TagService_CreateTag_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TagServiceServer).CreateTag(ctx, req.(*v1.CreateTagRequest)) + return srv.(TagServiceServer).CreateTag(ctx, req.(*v11.CreateTagRequest)) } return interceptor(ctx, in, info, handler) } func _TagService_UpdateTag_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.UpdateTagRequest) + in := new(v11.UpdateTagRequest) if err := dec(in); err != nil { return nil, err } @@ -214,13 +214,13 @@ func _TagService_UpdateTag_Handler(srv interface{}, ctx context.Context, dec fun FullMethod: TagService_UpdateTag_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TagServiceServer).UpdateTag(ctx, req.(*v1.UpdateTagRequest)) + return srv.(TagServiceServer).UpdateTag(ctx, req.(*v11.UpdateTagRequest)) } return interceptor(ctx, in, info, handler) } func _TagService_DeleteTag_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(v1.DeleteTagRequest) + in := new(v11.DeleteTagRequest) if err := dec(in); err != nil { return nil, err } @@ -232,7 +232,7 @@ func _TagService_DeleteTag_Handler(srv interface{}, ctx context.Context, dec fun FullMethod: TagService_DeleteTag_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TagServiceServer).DeleteTag(ctx, req.(*v1.DeleteTagRequest)) + return srv.(TagServiceServer).DeleteTag(ctx, req.(*v11.DeleteTagRequest)) } return interceptor(ctx, in, info, handler) } diff --git a/blog-backend/gen/api/go/front/service/v1/i_tag_http.pb.go b/blog-backend/gen/api/go/front/service/v1/i_tag_http.pb.go index 49a20085..69dedd20 100644 --- a/blog-backend/gen/api/go/front/service/v1/i_tag_http.pb.go +++ b/blog-backend/gen/api/go/front/service/v1/i_tag_http.pb.go @@ -4,15 +4,15 @@ // - protoc (unknown) // source: front/service/v1/i_tag.proto -package v1 +package servicev1 import ( context "context" http "github.com/go-kratos/kratos/v2/transport/http" binding "github.com/go-kratos/kratos/v2/transport/http/binding" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" - v1 "kratos-cms/gen/api/go/content/service/v1" + v11 "kratos-cms/gen/api/go/content/service/v1" ) // This is a compile-time assertion to ensure that this generated file @@ -30,15 +30,15 @@ const OperationTagServiceUpdateTag = "/front.service.v1.TagService/UpdateTag" type TagServiceHTTPServer interface { // CreateTag 创建标签 - CreateTag(context.Context, *v1.CreateTagRequest) (*v1.Tag, error) + CreateTag(context.Context, *v11.CreateTagRequest) (*v11.Tag, error) // DeleteTag 删除标签 - DeleteTag(context.Context, *v1.DeleteTagRequest) (*emptypb.Empty, error) + DeleteTag(context.Context, *v11.DeleteTagRequest) (*emptypb.Empty, error) // GetTag 获取标签数据 - GetTag(context.Context, *v1.GetTagRequest) (*v1.Tag, error) + GetTag(context.Context, *v11.GetTagRequest) (*v11.Tag, error) // ListTag 获取标签列表 - ListTag(context.Context, *pagination.PagingRequest) (*v1.ListTagResponse, error) + ListTag(context.Context, *v1.PagingRequest) (*v11.ListTagResponse, error) // UpdateTag 更新标签 - UpdateTag(context.Context, *v1.UpdateTagRequest) (*v1.Tag, error) + UpdateTag(context.Context, *v11.UpdateTagRequest) (*v11.Tag, error) } func RegisterTagServiceHTTPServer(s *http.Server, srv TagServiceHTTPServer) { @@ -52,26 +52,26 @@ func RegisterTagServiceHTTPServer(s *http.Server, srv TagServiceHTTPServer) { func _TagService_ListTag0_HTTP_Handler(srv TagServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in pagination.PagingRequest + var in v1.PagingRequest if err := ctx.BindQuery(&in); err != nil { return err } http.SetOperation(ctx, OperationTagServiceListTag) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.ListTag(ctx, req.(*pagination.PagingRequest)) + return srv.ListTag(ctx, req.(*v1.PagingRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.ListTagResponse) + reply := out.(*v11.ListTagResponse) return ctx.Result(200, reply) } } func _TagService_GetTag0_HTTP_Handler(srv TagServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.GetTagRequest + var in v11.GetTagRequest if err := ctx.BindQuery(&in); err != nil { return err } @@ -80,20 +80,20 @@ func _TagService_GetTag0_HTTP_Handler(srv TagServiceHTTPServer) func(ctx http.Co } http.SetOperation(ctx, OperationTagServiceGetTag) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.GetTag(ctx, req.(*v1.GetTagRequest)) + return srv.GetTag(ctx, req.(*v11.GetTagRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.Tag) + reply := out.(*v11.Tag) return ctx.Result(200, reply) } } func _TagService_CreateTag0_HTTP_Handler(srv TagServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.CreateTagRequest + var in v11.CreateTagRequest if err := ctx.Bind(&in); err != nil { return err } @@ -102,20 +102,20 @@ func _TagService_CreateTag0_HTTP_Handler(srv TagServiceHTTPServer) func(ctx http } http.SetOperation(ctx, OperationTagServiceCreateTag) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.CreateTag(ctx, req.(*v1.CreateTagRequest)) + return srv.CreateTag(ctx, req.(*v11.CreateTagRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.Tag) + reply := out.(*v11.Tag) return ctx.Result(200, reply) } } func _TagService_UpdateTag0_HTTP_Handler(srv TagServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.UpdateTagRequest + var in v11.UpdateTagRequest if err := ctx.Bind(&in.Tag); err != nil { return err } @@ -127,20 +127,20 @@ func _TagService_UpdateTag0_HTTP_Handler(srv TagServiceHTTPServer) func(ctx http } http.SetOperation(ctx, OperationTagServiceUpdateTag) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.UpdateTag(ctx, req.(*v1.UpdateTagRequest)) + return srv.UpdateTag(ctx, req.(*v11.UpdateTagRequest)) }) out, err := h(ctx, &in) if err != nil { return err } - reply := out.(*v1.Tag) + reply := out.(*v11.Tag) return ctx.Result(200, reply) } } func _TagService_DeleteTag0_HTTP_Handler(srv TagServiceHTTPServer) func(ctx http.Context) error { return func(ctx http.Context) error { - var in v1.DeleteTagRequest + var in v11.DeleteTagRequest if err := ctx.BindQuery(&in); err != nil { return err } @@ -149,7 +149,7 @@ func _TagService_DeleteTag0_HTTP_Handler(srv TagServiceHTTPServer) func(ctx http } http.SetOperation(ctx, OperationTagServiceDeleteTag) h := ctx.Middleware(func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.DeleteTag(ctx, req.(*v1.DeleteTagRequest)) + return srv.DeleteTag(ctx, req.(*v11.DeleteTagRequest)) }) out, err := h(ctx, &in) if err != nil { @@ -161,11 +161,11 @@ func _TagService_DeleteTag0_HTTP_Handler(srv TagServiceHTTPServer) func(ctx http } type TagServiceHTTPClient interface { - CreateTag(ctx context.Context, req *v1.CreateTagRequest, opts ...http.CallOption) (rsp *v1.Tag, err error) - DeleteTag(ctx context.Context, req *v1.DeleteTagRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error) - GetTag(ctx context.Context, req *v1.GetTagRequest, opts ...http.CallOption) (rsp *v1.Tag, err error) - ListTag(ctx context.Context, req *pagination.PagingRequest, opts ...http.CallOption) (rsp *v1.ListTagResponse, err error) - UpdateTag(ctx context.Context, req *v1.UpdateTagRequest, opts ...http.CallOption) (rsp *v1.Tag, err error) + CreateTag(ctx context.Context, req *v11.CreateTagRequest, opts ...http.CallOption) (rsp *v11.Tag, err error) + DeleteTag(ctx context.Context, req *v11.DeleteTagRequest, opts ...http.CallOption) (rsp *emptypb.Empty, err error) + GetTag(ctx context.Context, req *v11.GetTagRequest, opts ...http.CallOption) (rsp *v11.Tag, err error) + ListTag(ctx context.Context, req *v1.PagingRequest, opts ...http.CallOption) (rsp *v11.ListTagResponse, err error) + UpdateTag(ctx context.Context, req *v11.UpdateTagRequest, opts ...http.CallOption) (rsp *v11.Tag, err error) } type TagServiceHTTPClientImpl struct { @@ -176,8 +176,8 @@ func NewTagServiceHTTPClient(client *http.Client) TagServiceHTTPClient { return &TagServiceHTTPClientImpl{client} } -func (c *TagServiceHTTPClientImpl) CreateTag(ctx context.Context, in *v1.CreateTagRequest, opts ...http.CallOption) (*v1.Tag, error) { - var out v1.Tag +func (c *TagServiceHTTPClientImpl) CreateTag(ctx context.Context, in *v11.CreateTagRequest, opts ...http.CallOption) (*v11.Tag, error) { + var out v11.Tag pattern := "/blog/v1/tags" path := binding.EncodeURL(pattern, in, false) opts = append(opts, http.Operation(OperationTagServiceCreateTag)) @@ -189,7 +189,7 @@ func (c *TagServiceHTTPClientImpl) CreateTag(ctx context.Context, in *v1.CreateT return &out, err } -func (c *TagServiceHTTPClientImpl) DeleteTag(ctx context.Context, in *v1.DeleteTagRequest, opts ...http.CallOption) (*emptypb.Empty, error) { +func (c *TagServiceHTTPClientImpl) DeleteTag(ctx context.Context, in *v11.DeleteTagRequest, opts ...http.CallOption) (*emptypb.Empty, error) { var out emptypb.Empty pattern := "/blog/v1/tags/{id}" path := binding.EncodeURL(pattern, in, true) @@ -202,8 +202,8 @@ func (c *TagServiceHTTPClientImpl) DeleteTag(ctx context.Context, in *v1.DeleteT return &out, err } -func (c *TagServiceHTTPClientImpl) GetTag(ctx context.Context, in *v1.GetTagRequest, opts ...http.CallOption) (*v1.Tag, error) { - var out v1.Tag +func (c *TagServiceHTTPClientImpl) GetTag(ctx context.Context, in *v11.GetTagRequest, opts ...http.CallOption) (*v11.Tag, error) { + var out v11.Tag pattern := "/blog/v1/tags/{id}" path := binding.EncodeURL(pattern, in, true) opts = append(opts, http.Operation(OperationTagServiceGetTag)) @@ -215,8 +215,8 @@ func (c *TagServiceHTTPClientImpl) GetTag(ctx context.Context, in *v1.GetTagRequ return &out, err } -func (c *TagServiceHTTPClientImpl) ListTag(ctx context.Context, in *pagination.PagingRequest, opts ...http.CallOption) (*v1.ListTagResponse, error) { - var out v1.ListTagResponse +func (c *TagServiceHTTPClientImpl) ListTag(ctx context.Context, in *v1.PagingRequest, opts ...http.CallOption) (*v11.ListTagResponse, error) { + var out v11.ListTagResponse pattern := "/blog/v1/tags" path := binding.EncodeURL(pattern, in, true) opts = append(opts, http.Operation(OperationTagServiceListTag)) @@ -228,8 +228,8 @@ func (c *TagServiceHTTPClientImpl) ListTag(ctx context.Context, in *pagination.P return &out, err } -func (c *TagServiceHTTPClientImpl) UpdateTag(ctx context.Context, in *v1.UpdateTagRequest, opts ...http.CallOption) (*v1.Tag, error) { - var out v1.Tag +func (c *TagServiceHTTPClientImpl) UpdateTag(ctx context.Context, in *v11.UpdateTagRequest, opts ...http.CallOption) (*v11.Tag, error) { + var out v11.Tag pattern := "/blog/v1/tags/{id}" path := binding.EncodeURL(pattern, in, false) opts = append(opts, http.Operation(OperationTagServiceUpdateTag)) diff --git a/blog-backend/gen/api/go/user/service/v1/user.pb.go b/blog-backend/gen/api/go/user/service/v1/user.pb.go index d365a91e..8e960271 100644 --- a/blog-backend/gen/api/go/user/service/v1/user.pb.go +++ b/blog-backend/gen/api/go/user/service/v1/user.pb.go @@ -4,14 +4,14 @@ // protoc (unknown) // source: user/service/v1/user.proto -package v1 +package servicev1 import ( _ "github.com/google/gnostic/openapiv3" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" reflect "reflect" sync "sync" ) @@ -810,154 +810,162 @@ var file_user_service_v1_user_proto_rawDesc = []byte{ 0x33, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x1a, 0x22, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x2f, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xcb, 0x05, 0x0a, 0x04, 0x55, 0x73, 0x65, 0x72, 0x12, 0x0e, 0x0a, - 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1f, 0x0a, - 0x08, 0x75, 0x73, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, - 0x00, 0x52, 0x08, 0x75, 0x73, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x12, 0x1f, - 0x0a, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, - 0x48, 0x01, 0x52, 0x08, 0x6e, 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x12, - 0x19, 0x0a, 0x05, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x48, 0x02, - 0x52, 0x05, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x88, 0x01, 0x01, 0x12, 0x1b, 0x0a, 0x06, 0x61, 0x76, - 0x61, 0x74, 0x61, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x48, 0x03, 0x52, 0x06, 0x61, 0x76, - 0x61, 0x74, 0x61, 0x72, 0x88, 0x01, 0x01, 0x12, 0x25, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, - 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x48, 0x04, 0x52, 0x0b, - 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x1f, - 0x0a, 0x08, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, - 0x48, 0x05, 0x52, 0x08, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x88, 0x01, 0x01, 0x12, - 0x23, 0x0a, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x08, 0x20, - 0x01, 0x28, 0x09, 0x48, 0x06, 0x52, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, - 0x65, 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, - 0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x48, 0x07, 0x52, 0x0a, 0x75, 0x70, 0x64, 0x61, - 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x12, 0x45, 0x0a, 0x06, 0x73, 0x74, 0x61, - 0x74, 0x75, 0x73, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x42, 0x28, 0xba, 0x47, 0x25, 0xc2, 0x01, - 0x04, 0x12, 0x02, 0x4f, 0x4e, 0xc2, 0x01, 0x05, 0x12, 0x03, 0x4f, 0x46, 0x46, 0x8a, 0x02, 0x04, - 0x1a, 0x02, 0x4f, 0x4e, 0x92, 0x02, 0x0c, 0xe7, 0x94, 0xa8, 0xe6, 0x88, 0xb7, 0xe7, 0x8a, 0xb6, - 0xe6, 0x80, 0x81, 0x48, 0x08, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x88, 0x01, 0x01, - 0x12, 0x2b, 0x0a, 0x06, 0x72, 0x6f, 0x6c, 0x65, 0x49, 0x64, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0d, - 0x42, 0x0e, 0xba, 0x47, 0x0b, 0x92, 0x02, 0x08, 0xe8, 0xa7, 0x92, 0xe8, 0x89, 0xb2, 0x49, 0x44, - 0x48, 0x09, 0x52, 0x06, 0x72, 0x6f, 0x6c, 0x65, 0x49, 0x64, 0x88, 0x01, 0x01, 0x12, 0x34, 0x0a, - 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0d, - 0x42, 0x11, 0xba, 0x47, 0x0e, 0x92, 0x02, 0x0b, 0xe5, 0x88, 0x9b, 0xe5, 0xbb, 0xba, 0xe8, 0x80, - 0x85, 0x49, 0x44, 0x48, 0x0a, 0x52, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, - 0x88, 0x01, 0x01, 0x12, 0x61, 0x0a, 0x09, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x74, 0x79, - 0x18, 0x0d, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1e, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x73, 0x65, - 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x75, 0x74, - 0x68, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x42, 0x1e, 0xba, 0x47, 0x1b, 0x8a, 0x02, 0x0f, 0x1a, 0x0d, - 0x43, 0x55, 0x53, 0x54, 0x4f, 0x4d, 0x45, 0x52, 0x5f, 0x55, 0x53, 0x45, 0x52, 0x92, 0x02, 0x06, - 0xe6, 0x9d, 0x83, 0xe9, 0x99, 0x90, 0x48, 0x0b, 0x52, 0x09, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, - 0x69, 0x74, 0x79, 0x88, 0x01, 0x01, 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x4e, - 0x61, 0x6d, 0x65, 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x6e, 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, - 0x42, 0x08, 0x0a, 0x06, 0x5f, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x61, - 0x76, 0x61, 0x74, 0x61, 0x72, 0x42, 0x0e, 0x0a, 0x0c, 0x5f, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, - 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, - 0x72, 0x64, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, - 0x65, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, - 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x42, 0x09, 0x0a, 0x07, 0x5f, - 0x72, 0x6f, 0x6c, 0x65, 0x49, 0x64, 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x63, 0x72, 0x65, 0x61, 0x74, - 0x6f, 0x72, 0x49, 0x64, 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, - 0x74, 0x79, 0x22, 0x55, 0x0a, 0x10, 0x4c, 0x69, 0x73, 0x74, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2b, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, - 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x73, 0x65, 0x72, - 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x52, 0x05, 0x69, 0x74, - 0x65, 0x6d, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x22, 0x20, 0x0a, 0x0e, 0x47, 0x65, 0x74, - 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x22, 0x36, 0x0a, 0x18, 0x47, + 0x1a, 0x1e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x76, 0x31, 0x2f, + 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x22, 0xcb, 0x05, 0x0a, 0x04, 0x55, 0x73, 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1f, 0x0a, 0x08, 0x75, 0x73, 0x65, + 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x08, 0x75, + 0x73, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x12, 0x1f, 0x0a, 0x08, 0x6e, 0x69, + 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, 0x01, 0x52, 0x08, + 0x6e, 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x12, 0x19, 0x0a, 0x05, 0x65, + 0x6d, 0x61, 0x69, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x48, 0x02, 0x52, 0x05, 0x65, 0x6d, + 0x61, 0x69, 0x6c, 0x88, 0x01, 0x01, 0x12, 0x1b, 0x0a, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, + 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x48, 0x03, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, + 0x88, 0x01, 0x01, 0x12, 0x25, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, + 0x6f, 0x6e, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x48, 0x04, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, + 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x1f, 0x0a, 0x08, 0x70, 0x61, + 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x48, 0x05, 0x52, 0x08, + 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, 0x0a, 0x63, + 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x48, + 0x06, 0x52, 0x0a, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x88, 0x01, 0x01, + 0x12, 0x23, 0x0a, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x09, + 0x20, 0x01, 0x28, 0x09, 0x48, 0x07, 0x52, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, + 0x6d, 0x65, 0x88, 0x01, 0x01, 0x12, 0x45, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, + 0x0a, 0x20, 0x01, 0x28, 0x09, 0x42, 0x28, 0xba, 0x47, 0x25, 0xc2, 0x01, 0x04, 0x12, 0x02, 0x4f, + 0x4e, 0xc2, 0x01, 0x05, 0x12, 0x03, 0x4f, 0x46, 0x46, 0x8a, 0x02, 0x04, 0x1a, 0x02, 0x4f, 0x4e, + 0x92, 0x02, 0x0c, 0xe7, 0x94, 0xa8, 0xe6, 0x88, 0xb7, 0xe7, 0x8a, 0xb6, 0xe6, 0x80, 0x81, 0x48, + 0x08, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x88, 0x01, 0x01, 0x12, 0x2b, 0x0a, 0x06, + 0x72, 0x6f, 0x6c, 0x65, 0x49, 0x64, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0d, 0x42, 0x0e, 0xba, 0x47, + 0x0b, 0x92, 0x02, 0x08, 0xe8, 0xa7, 0x92, 0xe8, 0x89, 0xb2, 0x49, 0x44, 0x48, 0x09, 0x52, 0x06, + 0x72, 0x6f, 0x6c, 0x65, 0x49, 0x64, 0x88, 0x01, 0x01, 0x12, 0x34, 0x0a, 0x09, 0x63, 0x72, 0x65, + 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0d, 0x42, 0x11, 0xba, 0x47, + 0x0e, 0x92, 0x02, 0x0b, 0xe5, 0x88, 0x9b, 0xe5, 0xbb, 0xba, 0xe8, 0x80, 0x85, 0x49, 0x44, 0x48, + 0x0a, 0x52, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x88, 0x01, 0x01, 0x12, + 0x61, 0x0a, 0x09, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x18, 0x0d, 0x20, 0x01, + 0x28, 0x0e, 0x32, 0x1e, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, + 0x74, 0x79, 0x42, 0x1e, 0xba, 0x47, 0x1b, 0x8a, 0x02, 0x0f, 0x1a, 0x0d, 0x43, 0x55, 0x53, 0x54, + 0x4f, 0x4d, 0x45, 0x52, 0x5f, 0x55, 0x53, 0x45, 0x52, 0x92, 0x02, 0x06, 0xe6, 0x9d, 0x83, 0xe9, + 0x99, 0x90, 0x48, 0x0b, 0x52, 0x09, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x88, + 0x01, 0x01, 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x75, 0x73, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x42, + 0x0b, 0x0a, 0x09, 0x5f, 0x6e, 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x42, 0x08, 0x0a, 0x06, + 0x5f, 0x65, 0x6d, 0x61, 0x69, 0x6c, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x61, 0x76, 0x61, 0x74, 0x61, + 0x72, 0x42, 0x0e, 0x0a, 0x0c, 0x5f, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, + 0x6e, 0x42, 0x0b, 0x0a, 0x09, 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0x0d, + 0x0a, 0x0b, 0x5f, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x42, 0x0d, 0x0a, + 0x0b, 0x5f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x42, 0x09, 0x0a, 0x07, + 0x5f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x72, 0x6f, 0x6c, 0x65, + 0x49, 0x64, 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x63, 0x72, 0x65, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, + 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x22, 0x55, + 0x0a, 0x10, 0x4c, 0x69, 0x73, 0x74, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x73, 0x65, 0x12, 0x2b, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x15, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, + 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x12, + 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, + 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x22, 0x20, 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x22, 0x36, 0x0a, 0x18, 0x47, 0x65, 0x74, 0x55, 0x73, + 0x65, 0x72, 0x42, 0x79, 0x55, 0x73, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x75, 0x73, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x75, 0x73, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x22, + 0x5e, 0x0a, 0x11, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x12, 0x29, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, 0x12, + 0x1e, 0x0a, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x22, + 0x6e, 0x0a, 0x11, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, + 0x52, 0x02, 0x69, 0x64, 0x12, 0x29, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, 0x12, + 0x1e, 0x0a, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x22, + 0x43, 0x0a, 0x11, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, + 0x52, 0x02, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, + 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, + 0x6f, 0x72, 0x49, 0x64, 0x22, 0x4f, 0x0a, 0x15, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x50, 0x61, + 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, + 0x08, 0x75, 0x73, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x08, 0x75, 0x73, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x70, 0x61, 0x73, + 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x70, 0x61, 0x73, + 0x73, 0x77, 0x6f, 0x72, 0x64, 0x22, 0x57, 0x0a, 0x16, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x50, + 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, + 0x3d, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, + 0x25, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, + 0x31, 0x2e, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, + 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x22, 0x2f, + 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x69, 0x73, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x75, 0x73, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x75, 0x73, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x22, + 0x2a, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x69, 0x73, 0x74, 0x73, 0x52, 0x65, 0x73, + 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x78, 0x69, 0x73, 0x74, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x65, 0x78, 0x69, 0x73, 0x74, 0x2a, 0x68, 0x0a, 0x14, 0x56, + 0x65, 0x72, 0x69, 0x66, 0x79, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x73, + 0x75, 0x6c, 0x74, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x55, 0x43, 0x43, 0x45, 0x53, 0x53, 0x10, 0x00, + 0x12, 0x16, 0x0a, 0x12, 0x41, 0x43, 0x43, 0x4f, 0x55, 0x4e, 0x54, 0x5f, 0x4e, 0x4f, 0x54, 0x5f, + 0x45, 0x58, 0x49, 0x53, 0x54, 0x53, 0x10, 0x01, 0x12, 0x12, 0x0a, 0x0e, 0x57, 0x52, 0x4f, 0x4e, + 0x47, 0x5f, 0x50, 0x41, 0x53, 0x53, 0x57, 0x4f, 0x52, 0x44, 0x10, 0x02, 0x12, 0x0a, 0x0a, 0x06, + 0x46, 0x52, 0x45, 0x45, 0x5a, 0x45, 0x10, 0x03, 0x12, 0x0b, 0x0a, 0x07, 0x44, 0x45, 0x4c, 0x45, + 0x54, 0x45, 0x44, 0x10, 0x04, 0x2a, 0x41, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x41, 0x75, 0x74, + 0x68, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x12, 0x0d, 0x0a, 0x09, 0x53, 0x59, 0x53, 0x5f, 0x41, 0x44, + 0x4d, 0x49, 0x4e, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d, 0x43, 0x55, 0x53, 0x54, 0x4f, 0x4d, 0x45, + 0x52, 0x5f, 0x55, 0x53, 0x45, 0x52, 0x10, 0x01, 0x12, 0x0e, 0x0a, 0x0a, 0x47, 0x55, 0x45, 0x53, + 0x54, 0x5f, 0x55, 0x53, 0x45, 0x52, 0x10, 0x02, 0x32, 0x97, 0x05, 0x0a, 0x0b, 0x55, 0x73, 0x65, + 0x72, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x4a, 0x0a, 0x08, 0x4c, 0x69, 0x73, 0x74, + 0x55, 0x73, 0x65, 0x72, 0x12, 0x19, 0x2e, 0x70, 0x61, 0x67, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x2e, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, + 0x21, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, + 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x73, 0x65, 0x22, 0x00, 0x12, 0x43, 0x0a, 0x07, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x12, + 0x1f, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, + 0x31, 0x2e, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x1a, 0x15, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, + 0x76, 0x31, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x22, 0x00, 0x12, 0x49, 0x0a, 0x0a, 0x43, 0x72, 0x65, + 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x12, 0x22, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x73, + 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, + 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x15, 0x2e, 0x75, 0x73, + 0x65, 0x72, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x73, + 0x65, 0x72, 0x22, 0x00, 0x12, 0x49, 0x0a, 0x0a, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, 0x73, + 0x65, 0x72, 0x12, 0x22, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x15, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x73, 0x65, + 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x22, 0x00, 0x12, + 0x4a, 0x0a, 0x0a, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x12, 0x22, 0x2e, + 0x75, 0x73, 0x65, 0x72, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, + 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x12, 0x57, 0x0a, 0x11, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x42, 0x79, 0x55, 0x73, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x75, 0x73, 0x65, 0x72, 0x4e, - 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x75, 0x73, 0x65, 0x72, 0x4e, - 0x61, 0x6d, 0x65, 0x22, 0x5e, 0x0a, 0x11, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, - 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x29, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x73, 0x65, - 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x52, 0x04, 0x75, - 0x73, 0x65, 0x72, 0x12, 0x1e, 0x0a, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, - 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, - 0x72, 0x49, 0x64, 0x22, 0x6e, 0x0a, 0x11, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, - 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x29, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x73, 0x65, - 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x52, 0x04, 0x75, - 0x73, 0x65, 0x72, 0x12, 0x1e, 0x0a, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, - 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x6f, - 0x72, 0x49, 0x64, 0x22, 0x43, 0x0a, 0x11, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x55, 0x73, 0x65, - 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x6f, 0x70, 0x65, 0x72, - 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x6f, 0x70, - 0x65, 0x72, 0x61, 0x74, 0x6f, 0x72, 0x49, 0x64, 0x22, 0x4f, 0x0a, 0x15, 0x56, 0x65, 0x72, 0x69, - 0x66, 0x79, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x75, 0x73, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x08, 0x75, 0x73, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, - 0x08, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x08, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x22, 0x57, 0x0a, 0x16, 0x56, 0x65, 0x72, - 0x69, 0x66, 0x79, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, - 0x6e, 0x73, 0x65, 0x12, 0x3d, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x0e, 0x32, 0x25, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, - 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x50, 0x61, 0x73, 0x73, - 0x77, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, - 0x6c, 0x74, 0x22, 0x2f, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x69, 0x73, 0x74, 0x73, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x75, 0x73, 0x65, 0x72, 0x4e, - 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x75, 0x73, 0x65, 0x72, 0x4e, - 0x61, 0x6d, 0x65, 0x22, 0x2a, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x69, 0x73, 0x74, - 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x78, 0x69, - 0x73, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x65, 0x78, 0x69, 0x73, 0x74, 0x2a, - 0x68, 0x0a, 0x14, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, - 0x64, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x55, 0x43, 0x43, 0x45, - 0x53, 0x53, 0x10, 0x00, 0x12, 0x16, 0x0a, 0x12, 0x41, 0x43, 0x43, 0x4f, 0x55, 0x4e, 0x54, 0x5f, - 0x4e, 0x4f, 0x54, 0x5f, 0x45, 0x58, 0x49, 0x53, 0x54, 0x53, 0x10, 0x01, 0x12, 0x12, 0x0a, 0x0e, - 0x57, 0x52, 0x4f, 0x4e, 0x47, 0x5f, 0x50, 0x41, 0x53, 0x53, 0x57, 0x4f, 0x52, 0x44, 0x10, 0x02, - 0x12, 0x0a, 0x0a, 0x06, 0x46, 0x52, 0x45, 0x45, 0x5a, 0x45, 0x10, 0x03, 0x12, 0x0b, 0x0a, 0x07, - 0x44, 0x45, 0x4c, 0x45, 0x54, 0x45, 0x44, 0x10, 0x04, 0x2a, 0x41, 0x0a, 0x0d, 0x55, 0x73, 0x65, - 0x72, 0x41, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x12, 0x0d, 0x0a, 0x09, 0x53, 0x59, - 0x53, 0x5f, 0x41, 0x44, 0x4d, 0x49, 0x4e, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d, 0x43, 0x55, 0x53, - 0x54, 0x4f, 0x4d, 0x45, 0x52, 0x5f, 0x55, 0x53, 0x45, 0x52, 0x10, 0x01, 0x12, 0x0e, 0x0a, 0x0a, - 0x47, 0x55, 0x45, 0x53, 0x54, 0x5f, 0x55, 0x53, 0x45, 0x52, 0x10, 0x02, 0x32, 0x97, 0x05, 0x0a, - 0x0b, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x4a, 0x0a, 0x08, - 0x4c, 0x69, 0x73, 0x74, 0x55, 0x73, 0x65, 0x72, 0x12, 0x19, 0x2e, 0x70, 0x61, 0x67, 0x69, 0x6e, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x50, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x1a, 0x21, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, - 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x43, 0x0a, 0x07, 0x47, 0x65, 0x74, 0x55, - 0x73, 0x65, 0x72, 0x12, 0x1f, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, - 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x1a, 0x15, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x73, 0x65, 0x72, 0x76, - 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x22, 0x00, 0x12, 0x49, 0x0a, - 0x0a, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x12, 0x22, 0x2e, 0x75, 0x73, - 0x65, 0x72, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x43, 0x72, - 0x65, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, - 0x15, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, - 0x31, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x22, 0x00, 0x12, 0x49, 0x0a, 0x0a, 0x55, 0x70, 0x64, 0x61, - 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x12, 0x22, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x73, 0x65, - 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, - 0x73, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x15, 0x2e, 0x75, 0x73, 0x65, - 0x72, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x73, 0x65, - 0x72, 0x22, 0x00, 0x12, 0x4a, 0x0a, 0x0a, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x55, 0x73, 0x65, - 0x72, 0x12, 0x22, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, - 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x12, - 0x57, 0x0a, 0x11, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x42, 0x79, 0x55, 0x73, 0x65, 0x72, - 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x29, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x73, 0x65, 0x72, 0x76, - 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x42, 0x79, - 0x55, 0x73, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, - 0x15, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, - 0x31, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x22, 0x00, 0x12, 0x63, 0x0a, 0x0e, 0x56, 0x65, 0x72, 0x69, - 0x66, 0x79, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x12, 0x26, 0x2e, 0x75, 0x73, 0x65, - 0x72, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x65, 0x72, - 0x69, 0x66, 0x79, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, - 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x50, 0x61, 0x73, 0x73, 0x77, - 0x6f, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x57, 0x0a, - 0x0a, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x69, 0x73, 0x74, 0x73, 0x12, 0x22, 0x2e, 0x75, 0x73, + 0x12, 0x29, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, + 0x76, 0x31, 0x2e, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x42, 0x79, 0x55, 0x73, 0x65, 0x72, + 0x4e, 0x61, 0x6d, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x15, 0x2e, 0x75, 0x73, + 0x65, 0x72, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x73, + 0x65, 0x72, 0x22, 0x00, 0x12, 0x63, 0x0a, 0x0e, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x50, 0x61, + 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x12, 0x26, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x73, 0x65, + 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x50, + 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, + 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, + 0x2e, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x52, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x57, 0x0a, 0x0a, 0x55, 0x73, 0x65, + 0x72, 0x45, 0x78, 0x69, 0x73, 0x74, 0x73, 0x12, 0x22, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x73, + 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, + 0x69, 0x73, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x23, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x55, 0x73, - 0x65, 0x72, 0x45, 0x78, 0x69, 0x73, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, - 0x23, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, - 0x31, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x45, 0x78, 0x69, 0x73, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x2a, 0x5a, 0x28, 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, - 0x2d, 0x63, 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, - 0x75, 0x73, 0x65, 0x72, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, - 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x65, 0x72, 0x45, 0x78, 0x69, 0x73, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, + 0x22, 0x00, 0x42, 0xaf, 0x01, 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, + 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x42, 0x09, 0x55, 0x73, 0x65, 0x72, + 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2f, 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, + 0x63, 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x75, + 0x73, 0x65, 0x72, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x73, + 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x55, 0x53, 0x58, 0xaa, 0x02, + 0x0f, 0x55, 0x73, 0x65, 0x72, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x56, 0x31, + 0xca, 0x02, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x5c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, + 0x56, 0x31, 0xe2, 0x02, 0x1b, 0x55, 0x73, 0x65, 0x72, 0x5c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, + 0xea, 0x02, 0x11, 0x55, 0x73, 0x65, 0x72, 0x3a, 0x3a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, + 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -988,7 +996,7 @@ var file_user_service_v1_user_proto_goTypes = []interface{}{ (*VerifyPasswordResponse)(nil), // 10: user.service.v1.VerifyPasswordResponse (*UserExistsRequest)(nil), // 11: user.service.v1.UserExistsRequest (*UserExistsResponse)(nil), // 12: user.service.v1.UserExistsResponse - (*pagination.PagingRequest)(nil), // 13: pagination.PagingRequest + (*v1.PagingRequest)(nil), // 13: pagination.PagingRequest (*emptypb.Empty)(nil), // 14: google.protobuf.Empty } var file_user_service_v1_user_proto_depIdxs = []int32{ diff --git a/blog-backend/gen/api/go/user/service/v1/user.pb.validate.go b/blog-backend/gen/api/go/user/service/v1/user.pb.validate.go index 2127a315..63df6186 100644 --- a/blog-backend/gen/api/go/user/service/v1/user.pb.validate.go +++ b/blog-backend/gen/api/go/user/service/v1/user.pb.validate.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-validate. DO NOT EDIT. // source: user/service/v1/user.proto -package v1 +package servicev1 import ( "bytes" diff --git a/blog-backend/gen/api/go/user/service/v1/user_error.pb.go b/blog-backend/gen/api/go/user/service/v1/user_error.pb.go index 833483ca..8ef07828 100644 --- a/blog-backend/gen/api/go/user/service/v1/user_error.pb.go +++ b/blog-backend/gen/api/go/user/service/v1/user_error.pb.go @@ -4,7 +4,7 @@ // protoc (unknown) // source: user/service/v1/user_error.proto -package v1 +package servicev1 import ( _ "github.com/go-kratos/kratos/v2/errors" @@ -164,10 +164,19 @@ var file_user_service_v1_user_error_proto_rawDesc = []byte{ 0x45, 0x4e, 0x5f, 0x4e, 0x4f, 0x54, 0x5f, 0x45, 0x58, 0x49, 0x53, 0x54, 0x10, 0x12, 0x1a, 0x03, 0xa8, 0x45, 0x69, 0x12, 0x17, 0x0a, 0x0e, 0x55, 0x53, 0x45, 0x52, 0x5f, 0x4e, 0x4f, 0x54, 0x5f, 0x45, 0x58, 0x49, 0x53, 0x54, 0x10, 0x13, 0x1a, 0x03, 0xa8, 0x45, 0x6a, 0x1a, 0x04, 0xa0, 0x45, - 0xf4, 0x03, 0x42, 0x2a, 0x5a, 0x28, 0x6b, 0x72, 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x63, 0x6d, 0x73, - 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x67, 0x6f, 0x2f, 0x75, 0x73, 0x65, 0x72, - 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x76, 0x31, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0xf4, 0x03, 0x42, 0xb4, 0x01, 0x0a, 0x13, 0x63, 0x6f, 0x6d, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, + 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x76, 0x31, 0x42, 0x0e, 0x55, 0x73, 0x65, 0x72, + 0x45, 0x72, 0x72, 0x6f, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2f, 0x6b, 0x72, + 0x61, 0x74, 0x6f, 0x73, 0x2d, 0x63, 0x6d, 0x73, 0x2f, 0x67, 0x65, 0x6e, 0x2f, 0x61, 0x70, 0x69, + 0x2f, 0x67, 0x6f, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, + 0x2f, 0x76, 0x31, 0x3b, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x76, 0x31, 0xa2, 0x02, 0x03, + 0x55, 0x53, 0x58, 0xaa, 0x02, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, + 0x63, 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x5c, 0x53, 0x65, 0x72, + 0x76, 0x69, 0x63, 0x65, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1b, 0x55, 0x73, 0x65, 0x72, 0x5c, 0x53, + 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, + 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x11, 0x55, 0x73, 0x65, 0x72, 0x3a, 0x3a, 0x53, 0x65, + 0x72, 0x76, 0x69, 0x63, 0x65, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, } var ( diff --git a/blog-backend/gen/api/go/user/service/v1/user_error.pb.validate.go b/blog-backend/gen/api/go/user/service/v1/user_error.pb.validate.go index 644a37c5..11d8acdc 100644 --- a/blog-backend/gen/api/go/user/service/v1/user_error.pb.validate.go +++ b/blog-backend/gen/api/go/user/service/v1/user_error.pb.validate.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-validate. DO NOT EDIT. // source: user/service/v1/user_error.proto -package v1 +package servicev1 import ( "bytes" diff --git a/blog-backend/gen/api/go/user/service/v1/user_error_errors.pb.go b/blog-backend/gen/api/go/user/service/v1/user_error_errors.pb.go index b8245a65..21b485d8 100644 --- a/blog-backend/gen/api/go/user/service/v1/user_error_errors.pb.go +++ b/blog-backend/gen/api/go/user/service/v1/user_error_errors.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go-errors. DO NOT EDIT. -package v1 +package servicev1 import ( fmt "fmt" diff --git a/blog-backend/gen/api/go/user/service/v1/user_grpc.pb.go b/blog-backend/gen/api/go/user/service/v1/user_grpc.pb.go index 8d749732..d7a31cba 100644 --- a/blog-backend/gen/api/go/user/service/v1/user_grpc.pb.go +++ b/blog-backend/gen/api/go/user/service/v1/user_grpc.pb.go @@ -4,15 +4,15 @@ // - protoc (unknown) // source: user/service/v1/user.proto -package v1 +package servicev1 import ( context "context" + v1 "github.com/tx7do/kratos-bootstrap/gen/api/go/pagination/v1" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" emptypb "google.golang.org/protobuf/types/known/emptypb" - pagination "kratos-cms/gen/api/go/common/pagination" ) // This is a compile-time assertion to ensure that this generated file @@ -36,7 +36,7 @@ const ( // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type UserServiceClient interface { // 查询用户列表 - ListUser(ctx context.Context, in *pagination.PagingRequest, opts ...grpc.CallOption) (*ListUserResponse, error) + ListUser(ctx context.Context, in *v1.PagingRequest, opts ...grpc.CallOption) (*ListUserResponse, error) // 查询用户详情 GetUser(ctx context.Context, in *GetUserRequest, opts ...grpc.CallOption) (*User, error) // 创建用户 @@ -61,7 +61,7 @@ func NewUserServiceClient(cc grpc.ClientConnInterface) UserServiceClient { return &userServiceClient{cc} } -func (c *userServiceClient) ListUser(ctx context.Context, in *pagination.PagingRequest, opts ...grpc.CallOption) (*ListUserResponse, error) { +func (c *userServiceClient) ListUser(ctx context.Context, in *v1.PagingRequest, opts ...grpc.CallOption) (*ListUserResponse, error) { out := new(ListUserResponse) err := c.cc.Invoke(ctx, UserService_ListUser_FullMethodName, in, out, opts...) if err != nil { @@ -138,7 +138,7 @@ func (c *userServiceClient) UserExists(ctx context.Context, in *UserExistsReques // for forward compatibility type UserServiceServer interface { // 查询用户列表 - ListUser(context.Context, *pagination.PagingRequest) (*ListUserResponse, error) + ListUser(context.Context, *v1.PagingRequest) (*ListUserResponse, error) // 查询用户详情 GetUser(context.Context, *GetUserRequest) (*User, error) // 创建用户 @@ -160,7 +160,7 @@ type UserServiceServer interface { type UnimplementedUserServiceServer struct { } -func (UnimplementedUserServiceServer) ListUser(context.Context, *pagination.PagingRequest) (*ListUserResponse, error) { +func (UnimplementedUserServiceServer) ListUser(context.Context, *v1.PagingRequest) (*ListUserResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListUser not implemented") } func (UnimplementedUserServiceServer) GetUser(context.Context, *GetUserRequest) (*User, error) { @@ -198,7 +198,7 @@ func RegisterUserServiceServer(s grpc.ServiceRegistrar, srv UserServiceServer) { } func _UserService_ListUser_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(pagination.PagingRequest) + in := new(v1.PagingRequest) if err := dec(in); err != nil { return nil, err } @@ -210,7 +210,7 @@ func _UserService_ListUser_Handler(srv interface{}, ctx context.Context, dec fun FullMethod: UserService_ListUser_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(UserServiceServer).ListUser(ctx, req.(*pagination.PagingRequest)) + return srv.(UserServiceServer).ListUser(ctx, req.(*v1.PagingRequest)) } return interceptor(ctx, in, info, handler) } diff --git a/blog-backend/go.mod b/blog-backend/go.mod index 3bf2483f..b95a2623 100644 --- a/blog-backend/go.mod +++ b/blog-backend/go.mod @@ -9,18 +9,16 @@ require ( github.com/go-sql-driver/mysql v1.7.1 github.com/google/gnostic v0.7.0 github.com/google/wire v0.5.0 - github.com/gosimple/slug v1.13.1 github.com/jackc/pgx/v4 v4.18.1 github.com/lib/pq v1.10.9 - github.com/stretchr/testify v1.8.4 - github.com/tx7do/go-utils v1.1.3 - github.com/tx7do/go-utils/entgo v1.1.4 + github.com/tx7do/go-utils v1.1.4 + github.com/tx7do/go-utils/entgo v1.1.6 github.com/tx7do/kratos-authn v1.0.0 github.com/tx7do/kratos-authn/engine/jwt v1.0.0 github.com/tx7do/kratos-authn/middleware v1.0.0 github.com/tx7do/kratos-authz v1.0.0 github.com/tx7do/kratos-authz/middleware v1.0.0 - github.com/tx7do/kratos-bootstrap v0.2.12 + github.com/tx7do/kratos-bootstrap v0.2.16 github.com/tx7do/kratos-swagger-ui v0.0.0-20231027101037-78256951ad49 google.golang.org/genproto/googleapis/api v0.0.0-20231030173426-d783a09b4405 google.golang.org/grpc v1.59.0 @@ -101,7 +99,6 @@ require ( github.com/gorilla/handlers v1.5.1 // indirect github.com/gorilla/mux v1.8.0 // indirect github.com/gorilla/websocket v1.5.0 // indirect - github.com/gosimple/unidecode v1.0.1 // indirect github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0 // indirect github.com/hashicorp/consul/api v1.25.1 // indirect @@ -153,7 +150,6 @@ require ( github.com/philhofer/fwd v1.1.2 // indirect github.com/pierrec/lz4 v2.6.1+incompatible // indirect github.com/pkg/errors v0.9.1 // indirect - github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b // indirect github.com/rivo/uniseg v0.4.4 // indirect github.com/rs/xid v1.5.0 // indirect @@ -162,6 +158,7 @@ require ( github.com/shirou/gopsutil/v3 v3.23.9 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/sirupsen/logrus v1.9.3 // indirect + github.com/sony/sonyflake v1.2.0 // indirect github.com/sourcegraph/conc v0.3.0 // indirect github.com/spf13/afero v1.10.0 // indirect github.com/spf13/cast v1.5.1 // indirect diff --git a/blog-backend/go.sum b/blog-backend/go.sum index 6113f759..95c94fbe 100644 --- a/blog-backend/go.sum +++ b/blog-backend/go.sum @@ -611,13 +611,10 @@ github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible h1 github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= github.com/Masterminds/semver/v3 v3.1.1 h1:hLg3sBzpNErnxhQtUy/mmLR2I9foDujNK030IGemrRc= github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs= -github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= github.com/Netflix/go-env v0.0.0-20220526054621-78278af1949d h1:wvStE9wLpws31NiWUx+38wny1msZ/tm+eL5xmm4Y7So= github.com/Netflix/go-env v0.0.0-20220526054621-78278af1949d/go.mod h1:9XMFaCeRyW7fC9XJOWQ+NdAv8VLG7ys7l3x4ozEGLUQ= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/OneOfOne/xxhash v1.2.8 h1:31czK/TI9sNkxIKfaUfGlU47BAxQ0ztGgd9vPyqimf8= -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/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= @@ -661,8 +658,6 @@ github.com/alibabacloud-go/tea-utils/v2 v2.0.1/go.mod h1:U5MTY10WwlquGPS34DOeomU github.com/alibabacloud-go/tea-xml v1.1.2 h1:oLxa7JUXm2EDFzMg+7oRsYc+kutgCVwm+bZlhhmvW5M= github.com/alibabacloud-go/tea-xml v1.1.2/go.mod h1:Rq08vgCcCAjHyRi/M7xlHKUykZCEtyBy9+DPF6GgEu8= github.com/aliyun/alibaba-cloud-sdk-go v1.61.18/go.mod h1:v8ESoHo4SyHmuB4b1tJqDHxfTGEciD+yhvOU/5s1Rfk= -github.com/aliyun/alibaba-cloud-sdk-go v1.62.591 h1:r30izVxfKxlAct6sq3m+Ehr+SwScQv7qnAoHGCpCJjo= -github.com/aliyun/alibaba-cloud-sdk-go v1.62.591/go.mod h1:CJJYa1ZMxjlN/NbXEwmejEnBkhi0DV+Yb3B2lxf+74o= github.com/aliyun/alibaba-cloud-sdk-go v1.62.593 h1:Rf/PXVOPUW+iQ4nzWuhMi/pqflK5tzHGQEWrExxbtyw= github.com/aliyun/alibaba-cloud-sdk-go v1.62.593/go.mod h1:CJJYa1ZMxjlN/NbXEwmejEnBkhi0DV+Yb3B2lxf+74o= github.com/aliyun/aliyun-log-go-sdk v0.1.64 h1:fcqUfY2IqFZTKgdIw8O0rvv1pamJERIWB741o+NJcNc= @@ -679,8 +674,6 @@ github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU= github.com/apolloconfig/agollo/v4 v4.3.1 h1:NHjd7KqOPmTvYwJidISc9MPBRO8m9UNrH3tijcEVNAY= github.com/apolloconfig/agollo/v4 v4.3.1/go.mod h1:n/7qxpKOTbegygLmO5OKmFWCdy3T+S/zioBGlo457Dk= -github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3/go.mod h1:oL81AME2rN47vu18xqj1S1jPIPuN7afo62yKTNn3XMM= -github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo= github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew1u1fNQOlOtuGxQY= github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= @@ -689,9 +682,7 @@ github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJ github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= -github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= @@ -721,7 +712,6 @@ github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.4.1 h1:iKLQ0xPNFxR/2hzXZMrBo8f1j86j5WHzznCCQxV/b8g= github.com/census-instrumentation/opencensus-proto v0.4.1/go.mod h1:4T9NM4+4Vw91VeyqjLS6ao50K5bOcLKN6Q42XnYaRYw= -github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= @@ -790,7 +780,6 @@ github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5m github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= -github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g= github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/envoyproxy/go-control-plane v0.6.9/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g= @@ -809,7 +798,6 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7 github.com/envoyproxy/protoc-gen-validate v0.6.7/go.mod h1:dyJXwwfPK2VSqiB9Klm1J6romD608Ba7Hij42vrOBCo= github.com/envoyproxy/protoc-gen-validate v0.9.1/go.mod h1:OKNgG7TCp5pF4d6XftA0++PMirau2/yoOwVac3AbF2w= github.com/envoyproxy/protoc-gen-validate v1.0.2 h1:QkIBuU5k+x7/QXPvPPnWXWlCdaBFApVqftFV6k087DA= -github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= @@ -823,7 +811,6 @@ github.com/fluent/fluent-logger-golang v1.9.0 h1:zUdY44CHX2oIUc7VTNZc+4m+ORuO/ml github.com/fluent/fluent-logger-golang v1.9.0/go.mod h1:2/HCT/jTy78yGyeNGQLGQsjF3zzzAuy6Xlk6FCMV5eU= github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= -github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= github.com/frankban/quicktest v1.10.2/go.mod h1:K+q6oSqb0W0Ininfk863uOk1lMy69l/P6txr3mVT54s= @@ -951,7 +938,6 @@ github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/me github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68= -github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA= github.com/go-zookeeper/zk v1.0.3 h1:7M2kwOsc//9VeeFiPtf+uSJlVpU66x9Ba5+8XK7/TDg= github.com/go-zookeeper/zk v1.0.3/go.mod h1:nOB03cncLtlp4t+UAkGSV+9beXP/akpekBwL+UX1Qcw= github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= @@ -978,7 +964,6 @@ github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4er github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= @@ -1014,7 +999,6 @@ github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4= -github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= github.com/google/flatbuffers v2.0.8+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/gnostic v0.7.0 h1:d7EpuFp8vVdML+y0JJJYiKeOLjKTdH/GvVkLOBWqJpw= github.com/google/gnostic v0.7.0/go.mod h1:IAcUyMl6vtC95f60EZ8oXyqTsOersP6HbwjeG7EyDPM= @@ -1104,17 +1088,11 @@ github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/gosimple/slug v1.13.1 h1:bQ+kpX9Qa6tHRaK+fZR0A0M2Kd7Pa5eHPPsb1JpHD+Q= -github.com/gosimple/slug v1.13.1/go.mod h1:UiRaFH+GEilHstLUmcBgWcI42viBN7mAb818JrYOeFQ= -github.com/gosimple/unidecode v1.0.1 h1:hZzFTMMqSswvf0LBJZCZgThIZrpDHFXux9KeGmn6T/o= -github.com/gosimple/unidecode v1.0.1/go.mod h1:CP0Cr1Y1kogOtx0bJblKzsVWrqYaqfNOnHzpgWw4Awc= -github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDaL56wXCB/5+wF6uHfaI= github.com/grpc-ecosystem/go-grpc-middleware v1.4.0/go.mod h1:g5qyo/la0ALbONm6Vbp88Yd8NsDy6rZz+RcrMPxvld8= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= -github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4ZsPv9hVvWI6+ch50m39Pf2Ks= github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3/go.mod h1:o//XUCC/F+yRGJoPO/VU0GSB0f8Nhgmxx0VIRUvaC0w= @@ -1140,18 +1118,15 @@ github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJ github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= github.com/hashicorp/go-msgpack v0.5.5 h1:i9R9JSrqIz0QVLz3sz+i3YJdT7TTSLcfLLzJi9aZTuI= -github.com/hashicorp/go-msgpack v0.5.5/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= -github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc= github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= github.com/hashicorp/go-sockaddr v1.0.2 h1:ztczhD1jLxIRjVejw8gFomI1BQZOe2WoVOu0SyteCQc= -github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A= github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= @@ -1293,10 +1268,7 @@ 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/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348 h1:MtvEpTB6LX3vkb4ax0b5D2DHbNAUsen0Gx5wZoq3lV4= -github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k= github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY= -github.com/lestrrat/go-file-rotatelogs v0.0.0-20180223000712-d3151e2a480f/go.mod h1:UGmTpUd3rjbtfIpwAPrcfmGf/Z1HS95TATB+m57TPB8= -github.com/lestrrat/go-strftime v0.0.0-20180220042222-ba3bf9c1d042/go.mod h1:TPpsiPUEh0zFL1Snz4crhMlBe60PYxRHr5oFF3rRYg0= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= @@ -1371,7 +1343,6 @@ github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= 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/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= 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= @@ -1382,7 +1353,6 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= github.com/nacos-group/nacos-sdk-go v1.1.4 h1:qyrZ7HTWM4aeymFfqnbgNRERh7TWuER10pCB7ddRcTY= github.com/nacos-group/nacos-sdk-go v1.1.4/go.mod h1:cBv9wy5iObs7khOqov1ERFQrCuTR4ILpgaiaVMxEmGI= github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg= @@ -1440,7 +1410,6 @@ github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCko github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4= github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc= github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= -github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= github.com/philhofer/fwd v1.1.2 h1:bnDivRJ1EWPjUIRXV5KfORO897HTbpFAQddBdE8t7Gw= github.com/philhofer/fwd v1.1.2/go.mod h1:qkPdfjR2SIEbspLqpe1tO4n5yICnr2DY7mqEx2tUTP0= github.com/phpdave11/gofpdf v1.4.2/go.mod h1:zpO6xFn9yxo3YLyMvW8HcKWVdbNqgIfOOp2dXMnm1mY= @@ -1462,7 +1431,6 @@ github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZ github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= 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/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= @@ -1522,7 +1490,6 @@ github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdh github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ= -github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/shirou/gopsutil/v3 v3.23.9 h1:ZI5bWVeu2ep4/DIxB4U9okeYJ7zp/QLTO4auRb/ty/E= github.com/shirou/gopsutil/v3 v3.23.9/go.mod h1:x/NWSb71eMcjFIO0vhyGW5nZ7oSIgVjrCnADckb85GA= github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM= @@ -1544,6 +1511,8 @@ github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:s github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= +github.com/sony/sonyflake v1.2.0 h1:Pfr3A+ejSg+0SPqpoAmQgEtNDAhc2G1SUYk205qVMLQ= +github.com/sony/sonyflake v1.2.0/go.mod h1:LORtCywH/cq10ZbyfhKrHYgAUGH7mOBa76enV9txy/Y= github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo= github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= @@ -1600,8 +1569,6 @@ github.com/tevid/gohamcrest v1.1.1/go.mod h1:3UvtWlqm8j5JbwYZh80D/PVBt0mJ1eJiYgZ github.com/tidwall/gjson v1.17.0 h1:/Jocvlh98kcTfpN2+JzGQWQcqrPQwDrVEMApx/M5ZwM= github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4= -github.com/tinylib/msgp v1.1.8 h1:FCXC1xanKO4I8plpHGH2P7koL/RzZs12l/+r7vakfm0= -github.com/tinylib/msgp v1.1.8/go.mod h1:qkpG+2ldGg4xRFmx+jfTvZPxfGFhi64BcnL9vkCm/Tw= github.com/tinylib/msgp v1.1.9 h1:SHf3yoO2sGA0veCJeCBYLHuttAVFHGm2RHgNodW7wQU= github.com/tinylib/msgp v1.1.9/go.mod h1:BCXGB54lDD8qUEPmiG0cQQUANC4IUQyB2ItS2UDlO/k= github.com/tjfoc/gmsm v1.3.2 h1:7JVkAn5bvUJ7HtU08iW6UiD+UTmJTIToHCfeFzkcCxM= @@ -1611,18 +1578,11 @@ github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0h github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk= github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/toolkits/concurrent v0.0.0-20150624120057-a4371d70e3e3/go.mod h1:QDlpd3qS71vYtakd2hmdpqhJ9nwv6mD6A30bQ1BPBFE= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= -github.com/tx7do/go-utils v1.1.2 h1:Si5dqt25sRjSyK2yqF8wgKcS0JFs94vuZNBVJH+/oXM= -github.com/tx7do/go-utils v1.1.2/go.mod h1:rTuiF/OUFvJNKFT6brB7YPEXv0fTdF8cTmelmYok3Hc= -github.com/tx7do/go-utils v1.1.3 h1:v3aFjEvqV0GWxLUpJ7OawmJhO5h6szJBAvY3w+eciZI= -github.com/tx7do/go-utils v1.1.3/go.mod h1:/EWpkgsSw3y4xzypeClWsBbVySVL/FyzHaRHiHEHKwE= -github.com/tx7do/go-utils/entgo v1.1.2 h1:PwVOXUHvZxD5rPTjA+iRaYZdQzWUhELG/Uc7eSgkANI= -github.com/tx7do/go-utils/entgo v1.1.2/go.mod h1:J9KU3Yr3UF6eEcWCJCKmB9CkJJMWXHHJE+MC0XbtWxQ= -github.com/tx7do/go-utils/entgo v1.1.3 h1:/09wPKCKb3HELd4yErXaDTrJNria225E73CLmzloVGs= -github.com/tx7do/go-utils/entgo v1.1.3/go.mod h1:qx8pAX6CCB5PHzxPpWuaIODD/lfmNO+nYlVo81kxX+w= -github.com/tx7do/go-utils/entgo v1.1.4 h1:gSuYVuQ2RAbMLv6eFB8wpMyRW8zXi4o5zH6wkhyZqLw= -github.com/tx7do/go-utils/entgo v1.1.4/go.mod h1:qx8pAX6CCB5PHzxPpWuaIODD/lfmNO+nYlVo81kxX+w= +github.com/tx7do/go-utils v1.1.4 h1:gEQnUBFWWNdmwIIT/YQuFqx3rwhPWOX2PXdwTPahRUw= +github.com/tx7do/go-utils v1.1.4/go.mod h1:6AIxTCgdBxAkaiWEs/eO9YnvPsC5xjFLVC7F/swZrYs= +github.com/tx7do/go-utils/entgo v1.1.6 h1:q9DJX1v6gg+CzAAriX6xgF0X3smcGUUhD9ykjlcQiyY= +github.com/tx7do/go-utils/entgo v1.1.6/go.mod h1:BiAq4JuJ8RClEEzbuXxMCcqqQVp+9kPxT08MCQGpoDQ= github.com/tx7do/kratos-authn v1.0.0 h1:+dLtYDPfk7yT9nLO4qTjsrLO9cHqYVlCXfHf8fVQmBY= github.com/tx7do/kratos-authn v1.0.0/go.mod h1:iDys5Pfomo9onMENYJRyhGx+TLf3C8EhFViQhXWbowA= github.com/tx7do/kratos-authn/engine/jwt v1.0.0 h1:GcAkb5/vteUcetcYd/6+BR8iAHOcyMgt1HttCXrqvg8= @@ -1635,12 +1595,8 @@ github.com/tx7do/kratos-authz/engine/casbin v1.0.0 h1:40nXTq8DB4HtKy86JHoyZxrCf3 github.com/tx7do/kratos-authz/engine/opa v1.0.0 h1:CWG6zU1FuVZOs8ywEAeADwrJXvg6aV20HFx4fYXGXSE= github.com/tx7do/kratos-authz/middleware v1.0.0 h1:anMwRQkMFalgSaav09bLBaydr+U42vW8HuG+ragYEZ4= github.com/tx7do/kratos-authz/middleware v1.0.0/go.mod h1:TuQUExwkTXuVOfPTlR5FPKrzGMyvPf5vQjPjt9k6qzo= -github.com/tx7do/kratos-bootstrap v0.2.8 h1:UiB3CzphAu2zWMn2U7bw9XTir3/0DftcARQGbaTkYyo= -github.com/tx7do/kratos-bootstrap v0.2.8/go.mod h1:B0AktOMj19eFZKJ8DBUsNdz02n+I0y0hNAFgMNoMiKE= -github.com/tx7do/kratos-bootstrap v0.2.10 h1:Dar8U+SIB666+AAWM9CObSpTggHtOSDgxPexfvoahDo= -github.com/tx7do/kratos-bootstrap v0.2.10/go.mod h1:JkVAoIKz+Jt0ROQhcd9apY+vt19V+Ww2W3BjTBFkmoM= -github.com/tx7do/kratos-bootstrap v0.2.12 h1:igjzb+vWtxzgDe2+S9F6+HUQNav6Uv3IBJrRFq+IbOY= -github.com/tx7do/kratos-bootstrap v0.2.12/go.mod h1:JkVAoIKz+Jt0ROQhcd9apY+vt19V+Ww2W3BjTBFkmoM= +github.com/tx7do/kratos-bootstrap v0.2.16 h1:ZI3AyUcnM4wnZoTNfTFh1JRcBjKe1KaySLUP93kP5r8= +github.com/tx7do/kratos-bootstrap v0.2.16/go.mod h1:JkVAoIKz+Jt0ROQhcd9apY+vt19V+Ww2W3BjTBFkmoM= github.com/tx7do/kratos-swagger-ui v0.0.0-20231027101037-78256951ad49 h1:nLkwxRN9+NgWrdPK3U/c+JEVd/BwZN9khy5s/OQlS1c= github.com/tx7do/kratos-swagger-ui v0.0.0-20231027101037-78256951ad49/go.mod h1:tj6nv6I/pLGNcqUyZhIG6X/Lxjhiv3K9xyHXXO1rTvc= github.com/uber/jaeger-client-go v2.30.0+incompatible h1:D6wyKGCecFaSRUpo8lCVbaOOb6ThwMmTEbhRwtKR97o= @@ -1672,12 +1628,10 @@ github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFi github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= github.com/zclconf/go-cty v1.14.1 h1:t9fyA35fwjjUMcmL5hLER+e/rEPqrbCK1/OSE4SI9KA= github.com/zclconf/go-cty v1.14.1/go.mod h1:VvMs5i0vgZdhYawQNq5kePSpLAoz8u1xvZgrPIxfnZE= -github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b/go.mod h1:ZRKQfBXbGkpdV6QMzT3rU1kSTAnfu1dO8dPKjYprgj8= github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0= github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA= github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738 h1:VcrIfasaLFkyjk6KNlXQSzO+B0fZcnECiDrKJsfxka0= go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= go.etcd.io/etcd/api/v3 v3.5.10 h1:szRajuUUbLyppkhs9K6BRtjY37l66XQQmw7oZRANE4k= @@ -1898,7 +1852,6 @@ golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfS golang.org/x/net v0.0.0-20221012135044-0b7e1fb9d458/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= -golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= @@ -2055,7 +2008,6 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220829200755-d48e67d00261/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -2068,7 +2020,6 @@ golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXR 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.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= -golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA= golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= @@ -2175,7 +2126,6 @@ golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.3.0/go.mod h1:/rWhSS2+zyEVwoJf8YAX6L2f0ntZ7Kn/mGgAWcipA5k= -golang.org/x/tools v0.4.0/go.mod h1:UE5sM2OK9E/d67R0ANs2xJizIymRP5gJU295PvKXxjQ= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/tools v0.14.0 h1:jvNa2pY0M4r62jkRQ6RwEZZyPcymeL9XZMLBbV7U2nc= golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg= @@ -2401,20 +2351,14 @@ google.golang.org/genproto v0.0.0-20230330154414-c0448cd141ea/go.mod h1:UUQDJDOl google.golang.org/genproto v0.0.0-20230331144136-dcfb400f0633/go.mod h1:UUQDJDOlWu4KYeJZffbWgBkS1YFobzKbLVfK69pe0Ak= google.golang.org/genproto v0.0.0-20230525234025-438c736192d0/go.mod h1:9ExIQyXL5hZrHzQceCwuSYwZZ5QZBazOcprJ5rgs3lY= google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54/go.mod h1:zqTuNwFlFRsw5zIts5VnzLQxSRqh+CGOTVMlYbY0Eyk= -google.golang.org/genproto v0.0.0-20231016165738-49dd2c1f3d0b h1:+YaDE2r2OG8t/z5qmsh7Y+XXwCbvadxxZ0YY6mTdrVA= -google.golang.org/genproto v0.0.0-20231016165738-49dd2c1f3d0b/go.mod h1:CgAqfJo+Xmu0GwA0411Ht3OU3OntXwsGmrmjI8ioGXI= google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405 h1:I6WNifs6pF9tNdSob2W24JtyxIYjzFB9qDlpUC76q+U= google.golang.org/genproto v0.0.0-20231030173426-d783a09b4405/go.mod h1:3WDQMjmJk36UQhjQ89emUzb1mdaHcPeeAh4SCBKznB4= google.golang.org/genproto/googleapis/api v0.0.0-20230525234020-1aefcd67740a/go.mod h1:ts19tUU+Z0ZShN1y3aPyq2+O3d5FUNNgT6FtOzmrNn8= google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig= -google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b h1:CIC2YMXmIhYw6evmhPxBKJ4fmLbOFtXQN/GV3XOZR8k= -google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b/go.mod h1:IBQ646DjkDkvUIsVq/cc03FUFQ9wbZu7yE396YcL870= google.golang.org/genproto/googleapis/api v0.0.0-20231030173426-d783a09b4405 h1:HJMDndgxest5n2y77fnErkM62iUsptE/H8p0dC2Huo4= google.golang.org/genproto/googleapis/api v0.0.0-20231030173426-d783a09b4405/go.mod h1:oT32Z4o8Zv2xPQTg0pbVaPr0MPOH6f14RgXt7zfIpwg= google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234015-3fc162c6f38a/go.mod h1:xURIpW9ES5+/GZhnV6beoEtxQrnkRGIfP5VQG2tCBLc= google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b h1:ZlWIi1wSK56/8hn4QcBp/j9M7Gt3U/3hZw3mC7vDICo= -google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b/go.mod h1:swOH3j0KzcDDgGUWr+SNpyTen5YrXjS3eyPzFYKc6lc= google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405 h1:AB/lmRny7e2pLhFEYIbl5qkDAUt2h0ZRO4wGPhZf+ik= google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405/go.mod h1:67X1fPuzjcrkymZzZV1vvkFeTn2Rvc6lYF9MYFGCcwE= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= @@ -2586,10 +2530,6 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= -sigs.k8s.io/structured-merge-diff/v4 v4.3.0 h1:UZbZAZfX0wV2zr7YZorDz6GXROfDFj6LvqCRm4VUVKk= -sigs.k8s.io/structured-merge-diff/v4 v4.3.0/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08= -sigs.k8s.io/structured-merge-diff/v4 v4.4.0 h1:ZNWce/g8uFW41cK9XYCj7RRt6919IWznPZ2VOCuHLjg= -sigs.k8s.io/structured-merge-diff/v4 v4.4.0/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08= 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.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= diff --git a/blog-backend/pkg/util/slug/BUILD.bazel b/blog-backend/pkg/util/slug/BUILD.bazel deleted file mode 100644 index e80db017..00000000 --- a/blog-backend/pkg/util/slug/BUILD.bazel +++ /dev/null @@ -1,19 +0,0 @@ -load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") - -go_library( - name = "slug", - srcs = ["slug.go"], - importpath = "github.com/tx7do/go-utils/slug", - visibility = ["//visibility:public"], - deps = ["@com_github_gosimple_slug//:slug"], -) - -go_test( - name = "slug_test", - srcs = ["slug_test.go"], - embed = [":slug"], - deps = [ - "@com_github_gosimple_slug//:slug", - "@com_github_stretchr_testify//assert", - ], -) diff --git a/blog-backend/pkg/util/slug/slug.go b/blog-backend/pkg/util/slug/slug.go deleted file mode 100644 index 1bf540f7..00000000 --- a/blog-backend/pkg/util/slug/slug.go +++ /dev/null @@ -1,20 +0,0 @@ -package slug - -import ( - "github.com/gosimple/slug" -) - -// Generate 生成短链接 -func Generate(input string) string { - return slug.MakeLang(input, "en") -} - -// GenerateEnglish 生成英文短链接 -func GenerateEnglish(input string) string { - return slug.MakeLang(input, "en") -} - -// GenerateGerman 生成德文短链接 -func GenerateGerman(input string) string { - return slug.MakeLang(input, "de") -} diff --git a/blog-backend/pkg/util/slug/slug_test.go b/blog-backend/pkg/util/slug/slug_test.go deleted file mode 100644 index f15c5e71..00000000 --- a/blog-backend/pkg/util/slug/slug_test.go +++ /dev/null @@ -1,83 +0,0 @@ -package slug - -import ( - "fmt" - "github.com/gosimple/slug" - "github.com/stretchr/testify/assert" - "testing" -) - -func TestGoSimple(t *testing.T) { - // 俄文 - text := slug.Make("Hellö Wörld хелло ворлд") - assert.Equal(t, text, "hello-world-khello-vorld") - fmt.Println(text) - - // 繁体中文 - someText := slug.Make("影師") - assert.Equal(t, someText, "ying-shi") - fmt.Println(someText) - - // 简体中文 - cnText := slug.Make("天下太平") - assert.Equal(t, cnText, "tian-xia-tai-ping") - fmt.Println(cnText) - - // 英文 - enText := slug.MakeLang("This & that", "en") - assert.Equal(t, enText, "this-and-that") - fmt.Println(enText) - - // 德文 - deText := slug.MakeLang("Diese & Dass", "de") - assert.Equal(t, deText, "diese-und-dass") - fmt.Println(deText) - - // 保持大小写 - slug.Lowercase = false - deUppercaseText := slug.MakeLang("Diese & Dass", "de") - assert.Equal(t, deUppercaseText, "Diese-und-Dass") - fmt.Println(deUppercaseText) - - // 字符替换 - slug.CustomSub = map[string]string{ - "water": "sand", - } - textSub := slug.Make("water is hot") - assert.Equal(t, textSub, "sand-is-hot") - fmt.Println(textSub) -} - -func TestGenerate(t *testing.T) { - // 俄文 - text := Generate("Hellö Wörld хелло ворлд") - assert.Equal(t, text, "hello-world-khello-vorld") - fmt.Println(text) - - // 繁体中文 - someText := Generate("影師") - assert.Equal(t, someText, "ying-shi") - fmt.Println(someText) - - // 简体中文 - cnText := Generate("天下太平") - assert.Equal(t, cnText, "tian-xia-tai-ping") - fmt.Println(cnText) - - // 英文 - enText := GenerateEnglish("This & that") - assert.Equal(t, enText, "this-and-that") - fmt.Println(enText) - - // 德文 - deText := GenerateGerman("Diese & Dass") - assert.Equal(t, deText, "diese-und-dass") - fmt.Println(deText) - - slug.CustomSub = map[string]string{ - "water": "sand", - } - textSub := Generate("water is hot") - assert.Equal(t, textSub, "sand-is-hot") - fmt.Println(textSub) -}