fix: 将like、share和follow结构的定义调整至message action内，避免生成go代码后命名冲突的错误

xh-polaris · Aug 7, 2024 · e4bfe6a · e4bfe6a
1 parent b482800
commit e4bfe6a
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 31 deletions.
diff --git a/meowcloud/action/common.proto b/meowcloud/action/common.proto
@@ -15,31 +15,34 @@ enum TargetType {
   USER = 3;
 }
 
-// 点赞
-message Like {
-  string id = 1;
-  string targetId = 2;
-  TargetType targetType = 3;
-  string userId = 4;
-  int64 createAt = 5;
-  bool isCancel = 6;
-}
+message action {
 
-// 分享
-message Share {
-  string id = 1;
-  string targetId = 2;
-  TargetType targetType = 3;
-  string userId = 4;
-  int64 createAt = 5;
-}
+  // 点赞
+  message Like {
+    string id = 1;
+    string targetId = 2;
+    TargetType targetType = 3;
+    string userId = 4;
+    int64 createAt = 5;
+    bool isCancel = 6;
+  }
+
+  // 分享
+  message Share {
+    string id = 1;
+    string targetId = 2;
+    TargetType targetType = 3;
+    string userId = 4;
+    int64 createAt = 5;
+  }
 
-// 关注
-message Follow {
-  string id = 1;
-  string targetId = 2;
-  TargetType targetType = 3;
-  string userId = 4;
-  int64 createAt = 5;
-  bool isCancel = 6;
+  // 关注
+  message Follow {
+    string id = 1;
+    string targetId = 2;
+    TargetType targetType = 3;
+    string userId = 4;
+    int64 createAt = 5;
+    bool isCancel = 6;
+  }
 }
diff --git a/meowcloud/action/follow.proto b/meowcloud/action/follow.proto
@@ -56,7 +56,7 @@ message GetFollowedUsersReq {
 
 // 获取关注对象列表响应
 message GetFollowedUsersResp {
-  repeated Follow follows = 1;
+  repeated action.Follow follows = 1;
   int64 total = 2;
 }
 
@@ -69,7 +69,7 @@ message GetUserFollowedReq {
 
 // 获取用户关注过对象响应
 message GetUserFollowedResp {
-  repeated Follow follows = 1;
+  repeated action.Follow follows = 1;
   int64 total = 2;
 }
 

diff --git a/meowcloud/action/like.proto b/meowcloud/action/like.proto
@@ -56,7 +56,7 @@ message GetLikedUsersReq {
 
 // 获取点赞对象列表响应
 message GetLikedUsersResp {
-  repeated Like likes = 1;
+  repeated action.Like likes = 1;
   int64 total = 2;
 }
 
@@ -69,7 +69,7 @@ message GetUserLikedReq {
 
 // 获取用户点赞过对象响应
 message GetUserLikedResp {
-  repeated Like likes = 1;
+  repeated action.Like likes = 1;
   int64 total = 2;
 }
 

diff --git a/meowcloud/action/share.proto b/meowcloud/action/share.proto
@@ -45,7 +45,7 @@ message GetSharedUsersReq {
 
 // 获取分享对象列表响应
 message GetSharedUsersResp {
-  repeated Share shares = 1;
+  repeated action.Share shares = 1;
   int64 total = 2;
 }
 
@@ -58,7 +58,7 @@ message GetUserSharedReq {
 
 // 获取用户分享过对象响应
 message GetUserSharedResp {
-  repeated Share shares = 1;
+  repeated action.Share shares = 1;
   int64 total = 2;
 }