feat: refactor.

tx7do · Nov 5, 2023 · 8ad811c · 8ad811c
1 parent f1a7916
commit 8ad811c
Show file tree

Hide file tree

Showing 256 changed files with 4,965 additions and 11,230 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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等。