refactor: centralize protobuf and remove go-zero

module/base/cms/proto/blocks.proto

@@ -1,73 +0,0 @@
-syntax = "proto3";
-package cms;
-option go_package = ".;cms";
-
-// 列表请求参数
-message FetchRequest {
-  int64              page_no   = 1 [json_name = "page_no"];    // 页数
-  int64              page_size = 2 [json_name = "page_size"];  // 每页记录数
-  map<string,string> params    = 3; // 条件参数,key=val,eg key:category_id=?,vlaue=11
-}
-
-// 唯一标识请求参数
-message IdentRequest{
-  int64  id       = 1; // 唯一ID
-  string identity = 2; // 唯一标识
-}
-
-// 时序版本号请求参数
-message VersionRequest {
-  int64 version = 1; // 时序版本号
-}
-
-// 搜索请求参数
-message SearchRequest {
-  string keyword   = 1;   //<必传>, 关键词
-  int64  page_no   = 2 [json_name = "page_no"];    // 页数
-  int64  page_size = 3 [json_name = "page_size"];  // 每页记录数
-}
-
-message StatusReply{
-  int32  code    = 1; // 状态码
-  string message = 2; // 状态说明
-  string details = 3; // 数据
-  int64  timeseq = 4;  // 响应时间序列
-}
-
-// 空结构请求
-message Empty{
-}
-
-// 分类
-message CategoryItem{
-  string                site_identity = 1 [json_name = "site_identity"];
-  int64                 id            = 2;
-  string                identity      = 3; // 唯一标识
-  int64                 parent_id     = 4 [json_name = "parent_id"];  // 为空表示顶级分类
-  string                title         = 5; // 标题
-  string                cover_path    = 6 [json_name = "cover_path"]; // 封面图片
-  string                intro         = 7; // 简介
-  string                created_at    = 8 [json_name = "created_at"]; // 创建时间
-  string                updated_at    = 9 [json_name = "updated_at"]; // 更新时间
-  repeated CategoryItem child         = 10; // 子集
-  string                category_key  = 11 [json_name = "category_key"];// 分类标识
-
-}
-
-// 标签
-message TagsItem{
-  int64  id         = 1;
-  string identity   = 2;            // 唯一标识
-  string title      = 3;               // 标题
-  string cover_path = 4 [json_name = "cover_path"];          // 封面图片
-  string intro      = 5;                 // 简介
-  string created_at = 6 [json_name = "created_at"]; //创建时间
-}
-
-// 附件
-message AccessoryItem{
-  string identity   = 1;            // 唯一标识
-  string title      = 2;               // 附件标题
-  string file_path  = 3 [json_name = "file_path"];          // 附件文件路径
-  string created_at = 4 [json_name = "created_at"]; //创建时间
-}

module/base/cms/proto/category.proto

@@ -1,27 +1,27 @@
 syntax = "proto3";
 package cms;
-option go_package = ".;cms";
-import "blocks.proto";
+option go_package = "bsm/full/module/base/cms/pb;cms";
+import "protobuf/blocks.proto";
 
 // CMS - 分类
 service Category {
   // 分类列表
-  rpc Fetch (IdentRequest) returns (CategoryListReply) {};
+  rpc Fetch (blocks.IdentRequest) returns (CategoryListReply) {};
 
   // 添加分类
-  rpc Create (CategoryItem) returns (StatusReply) {};
+  rpc Create (blocks.CmsCategoryItem) returns (blocks.StatusReply) {};
 
   // 修改分类
-  rpc Modify (ModifyCategoryRequest) returns (StatusReply) {};
+  rpc Modify (ModifyCategoryRequest) returns (blocks.StatusReply) {};
 
   // 删除分类
-  rpc Delete (DeleteCategoryRequest) returns (StatusReply) {};
+  rpc Delete (DeleteCategoryRequest) returns (blocks.StatusReply) {};
 }
 
   // 分类列表
 message CategoryListReply {
   // 数据
-  repeated CategoryItem data = 1;
+  repeated blocks.CmsCategoryItem data = 1;
   // 总数
   int64 count = 2;
 }
@@ -41,7 +41,7 @@ message AddCategoryRequest{
   string                intro         = 6; // 简介
   string                created_at    = 7 [json_name = "created_at"]; // 创建时间
   string                updated_at    = 8 [json_name = "updated_at"]; // 更新时间
-  repeated CategoryItem data          = 9; // 子集
+  repeated blocks.CmsCategoryItem data          = 9; // 子集
 }
 
 // 修改分类请求
@@ -54,7 +54,7 @@ message ModifyCategoryRequest{
   string                intro        = 6; // 简介
   string                created_at   = 7 [json_name = "created_at"]; // 创建时间
   string                updated_at   = 8 [json_name = "updated_at"]; // 更新时间
-  repeated CategoryItem data         = 9; // 子集
+  repeated blocks.CmsCategoryItem data         = 9; // 子集
   string                category_key = 10[json_name = "category_key"]; // 分类标识
 
 }

module/base/cms/proto/pages.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 package cms;
-option go_package = ".;cms";
-import "blocks.proto";
+option go_package = "bsm/full/module/base/cms/pb;cms";
+import "protobuf/blocks.proto";
 
 // 单页管理
 service Pages{
@@ -15,13 +15,13 @@ service Pages{
   rpc GetByKey (GetPagesByKeyRequest) returns (PagesItem) {};
 
 	//发布单页
-  rpc Create(PagesItem) returns (StatusReply) {};
+  rpc Create(PagesItem) returns (blocks.StatusReply) {};
 
 	//修改单页
-  rpc Modify(PagesItem) returns (StatusReply) {};
+  rpc Modify(PagesItem) returns (blocks.StatusReply) {};
 
 	//删除单页
-  rpc Delete(IdentRequest) returns (StatusReply) {};
+  rpc Delete(blocks.IdentRequest) returns (blocks.StatusReply) {};
 }
 
 // 根据KEY获取内容请求
@@ -45,8 +45,8 @@ message PagesItem{
   bool   has_accessory = 12 [json_name = "has_accessory"]; //是否有附件,默认没有
 
   repeated string        accessory_identity_array = 13 [json_name = "accessory_identity_array"]; //附件Identity 列表
-  repeated AccessoryItem accessory_data           = 14 [json_name = "accessory_data"]; //附件数据
-  repeated TagsItem      tags_data                = 15 [json_name = "tags_data"]; // 标签数据
+  repeated blocks.CmsAccessoryItem accessory_data           = 14 [json_name = "accessory_data"]; //附件数据
+  repeated blocks.CmsTagsItem      tags_data                = 15 [json_name = "tags_data"]; // 标签数据
   repeated string        tags_identity_array      = 16 [json_name = "tags_identity_array"]; // 标签集Identity 列表
   int64                  hits                     = 17; //点击量
 }

module/base/cms/proto/post.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 package cms;
-option go_package = ".;cms";
-import "blocks.proto";
+option go_package = "bsm/full/module/base/cms/pb;cms";
+import "protobuf/blocks.proto";
 
 // 正文
 service Post{
@@ -15,52 +15,52 @@ service Post{
   rpc GetByKey (GetPostByKeyRequest) returns (PostItem) {};
 
     //搜索文章
-  rpc Search (SearchRequest) returns (PostListReply) {};
+  rpc Search (blocks.CmsSearchRequest) returns (PostListReply) {};
 
 	//发布文章
-  rpc Create(PostItem) returns (StatusReply) {};
+  rpc Create(PostItem) returns (blocks.StatusReply) {};
 
 	//修改文章
-  rpc Modify(PostItem) returns (StatusReply) {};
+  rpc Modify(PostItem) returns (blocks.StatusReply) {};
 
 	//删除文章
-  rpc Delete(IdentRequest) returns (StatusReply) {};
+  rpc Delete(blocks.IdentRequest) returns (blocks.StatusReply) {};
 
 	// 文章点赞处理
-  rpc IncrPostLike(PostOpIdentityRequest) returns (StatusReply) {};
+  rpc IncrPostLike(PostOpIdentityRequest) returns (blocks.StatusReply) {};
 
     // 文章点赞取消处理
-  rpc DescPostLike(PostOpIdentityRequest) returns (StatusReply) {};
+  rpc DescPostLike(PostOpIdentityRequest) returns (blocks.StatusReply) {};
 
 	// 文章点踩处理
-  rpc IncrPostUnlike(PostOpIdentityRequest) returns (StatusReply) {};
+  rpc IncrPostUnlike(PostOpIdentityRequest) returns (blocks.StatusReply) {};
 
     // 文章点踩取消处理
-  rpc DescPostUnlike(PostOpIdentityRequest) returns (StatusReply) {};
+  rpc DescPostUnlike(PostOpIdentityRequest) returns (blocks.StatusReply) {};
 
 	//评论列表
   rpc CommentList(CommentListRequest) returns (CommentListResponse) {};
 
 	//发布评论
-  rpc AddComment(CommentItem) returns (StatusReply) {};
+  rpc AddComment(CommentItem) returns (blocks.StatusReply) {};
 
 	//修改评论
-  rpc ModifyComment(CommentItem) returns (StatusReply) {};
+  rpc ModifyComment(CommentItem) returns (blocks.StatusReply) {};
 
 	//删除评论
-  rpc DeleteComment(DeleteCommentRequest) returns (StatusReply) {};
+  rpc DeleteComment(DeleteCommentRequest) returns (blocks.StatusReply) {};
 
 	// 评论点赞处理
-  rpc IncrCommentLike(CommentOpIdentityRequest) returns (StatusReply) {};
+  rpc IncrCommentLike(CommentOpIdentityRequest) returns (blocks.StatusReply) {};
 
     // 评论点赞取消处理
-  rpc DescCommentLike(CommentOpIdentityRequest) returns (StatusReply) {};
+  rpc DescCommentLike(CommentOpIdentityRequest) returns (blocks.StatusReply) {};
 
 	// 评论点踩处理
-  rpc IncrCommentUnlike(CommentOpIdentityRequest) returns (StatusReply) {};
+  rpc IncrCommentUnlike(CommentOpIdentityRequest) returns (blocks.StatusReply) {};
 
     // 评论点踩取消处理
-  rpc DescCommentUnlike(CommentOpIdentityRequest) returns (StatusReply) {};
+  rpc DescCommentUnlike(CommentOpIdentityRequest) returns (blocks.StatusReply) {};
 }
 
 // 删除评论
@@ -101,9 +101,9 @@ message PostItem{
   int32           post_type                = 23 [json_name = "post_type"]; // 用户自定义文章类型
   string          rights                   = 24; //权限
 
-  repeated CategoryItem  category_data  = 26 [json_name = "category_data"]; // 分类数据
-  repeated TagsItem      tags_data      = 27 [json_name = "tags_data"]; // 标签数据
-  repeated AccessoryItem accessory_data = 28 [json_name = "accessory_data"]; //附件数据
+  repeated blocks.CmsCategoryItem  category_data  = 26 [json_name = "category_data"]; // 分类数据
+  repeated blocks.CmsTagsItem      tags_data      = 27 [json_name = "tags_data"]; // 标签数据
+  repeated blocks.CmsAccessoryItem accessory_data = 28 [json_name = "accessory_data"]; //附件数据
 
   string lang          = 29 [json_name = "lang"]; // 语言
   string source_origin = 30 [json_name = "source_origin"]; // 来源方简称

module/base/cms/proto/site.proto

@@ -1,24 +1,24 @@
 syntax = "proto3";
 package cms;
-option go_package = ".;cms";
-import "blocks.proto";
+option go_package = "bsm/full/module/base/cms/pb;cms";
+import "protobuf/blocks.proto";
 
 // CMS - 站点
 service Site {
   // 站点列表
-  rpc Fetch (Empty) returns (SiteListReply) {};
+  rpc Fetch (blocks.Empty) returns (SiteListReply) {};
 
   // 站点详情
-  rpc Get (IdentRequest) returns (SiteItem) {};
+  rpc Get (blocks.IdentRequest) returns (SiteItem) {};
 
   // 添加站点
-  rpc Create (SiteItem) returns (StatusReply) {};
+  rpc Create (SiteItem) returns (blocks.StatusReply) {};
 
   // 修改站点
-  rpc Modify (SiteItem) returns (StatusReply) {};
+  rpc Modify (SiteItem) returns (blocks.StatusReply) {};
 
   // 删除站点
-  rpc Delete (IdentRequest) returns (StatusReply) {};
+  rpc Delete (blocks.IdentRequest) returns (blocks.StatusReply) {};
 }
 
   // 站点列表

module/base/cms/proto/tags.proto

@@ -1,25 +1,25 @@
 syntax = "proto3";
 package cms;
-option go_package = ".;cms";
-import "blocks.proto";
+option go_package = "bsm/full/module/base/cms/pb;cms";
+import "protobuf/blocks.proto";
 
 // 标签
 service Tags {
     //标签列表
-  rpc Fetch (IdentRequest) returns (TagsListReply) {};
+  rpc Fetch (blocks.IdentRequest) returns (TagsListReply) {};
 
     //创建标签
-  rpc Create(TagsItem) returns (StatusReply) {};
+  rpc Create(blocks.CmsTagsItem) returns (blocks.StatusReply) {};
 
     //修改标签
-  rpc Modify(TagsItem) returns (StatusReply) {};
+  rpc Modify(blocks.CmsTagsItem) returns (blocks.StatusReply) {};
 
     //删除标签
-  rpc Delete(IdentRequest) returns (StatusReply) {};
+  rpc Delete(blocks.IdentRequest) returns (blocks.StatusReply) {};
 }
 
   // 标签列表
 message TagsListReply {
-  repeated TagsItem data  = 1; // 数据
+  repeated blocks.CmsTagsItem data  = 1; // 数据
   int64             count = 2; // 总数
 }