u

code/allapp/allapp-go/idl/space/space.proto

@@ -7,37 +7,22 @@ option go_package = "space";
 import "api.proto";
 
 import "space/space_types.proto";
-import "space/space_user_types.proto";
 
 service SpaceService {
-  rpc DissolveSpace(DissolveSpaceParams) returns (DissolveSpaceResult){
-    option (api.post) = '/space/dissolve';
-  };
-  // 进入空间
-  rpc EnterSpace(EnterSpaceParams) returns (EnterSpaceResult){
-    option (api.post) = '/space/enter';
+  // 踢出用户
+  rpc KickOutUser(KickOutUserParams) returns (KickOutUserResult) {
+    option (api.post) = "/space/kick";
   }
-}
-
-service SpaceUserService{
-  // 获取用户空间
-  rpc getUserSpace(GetUserSpaceParams) returns (GetUserSpaceResult){
-    option (api.get) = '/space/user/get';
-  };
-  // 退出空间
-  rpc ExitSpace(ExitSpaceParams) returns (ExitSpaceResult){
-    option (api.post) = '/space/user/exit';
-  };
-  // 获取空间用户列表
-  rpc ListSpaceUsers(ListSpaceUsersParams) returns (ListSpaceUsersResult){
-    option (api.post) = '/space/user/list';
-  };
-  // 踢出某人
-  rpc RemoveSpaceUser(RemoveSpaceUserParams) returns (RemoveSpaceUserResult){
-    option (api.post) = '/space/user/remove';
-  };
-  // 加入空间
+  // 用户退出当前空间
+  rpc QuitSpace(QuitSpaceParams) returns (QuitSpaceResult) {
+    option (api.post) = "/space/quit";
+  }
+  // 用户加入其他空间
   rpc JoinSpace(JoinSpaceParams) returns (JoinSpaceResult) {
-    option (api.post) = "/space/user/join";
+    option (api.post) = "/space/join";
+  }
+  // 获取某个空间下的用户列表
+  rpc ListSpaceUsers(ListSpaceUsersParams) returns (ListSpaceUsersResult) {
+    option (api.post) = "/space/users";
   };
-}
+}

code/allapp/allapp-go/idl/space/space_types.proto

@@ -6,27 +6,39 @@ option go_package = "space";
 
 import "api.proto";
 
-// 创建空间
-message CreateSpaceParams {
-
+// --- 空间用户列表 ---
+message ListSpaceUsersParams {
+  int64 SpaceId = 1 [(api.query) = "space_id"];
 }
 
-message CreateSpaceResult {
-  int64 Id = 1 [(api.body)="id"];
-  string InviteCode = 2 [(api.body)="invite_code"];
+message SpaceUser {
+  int64 UserId     = 1 [(api.query) = "user_id"];
+  string UserName  = 2 [(api.query) = "user_name"];
+  string UserAvatar= 3 [(api.query) = "user_avatar"];
+  int32 Role       = 4 [(api.query) = "role"];
 }
 
-// 解散空间
-message DissolveSpaceParams {
-
+message ListSpaceUsersResult {
+  repeated SpaceUser users = 1;
 }
 
-message DissolveSpaceResult {
+// 踢出用户
+message KickOutUserParams {
+  int64 SpaceId = 1 [(api.body) = "space_id"];
+  int64 UserId = 2 [(api.body) = "user_id"];
+}
+message KickOutUserResult {}
 
+// 退出空间
+message QuitSpaceParams {
+  int64 SpaceId = 1 [(api.body) = "space_id"];
+}
+message QuitSpaceResult {}
+
+// 加入空间
+message JoinSpaceParams {
+  string InviteCode = 1 [(api.body) = "invite_code"];
 }
 
-message EnterSpaceParams {
-  int64 SpaceId = 1 [(api.body)="space_id"];
-}
-message EnterSpaceResult {
-}
+message JoinSpaceResult {}
+

code/allapp/allapp-go/idl/space/space_user_types.proto

@@ -1,59 +0,0 @@
-syntax = "proto3";
-
-package space;
-
-option go_package = "space";
-
-import "api.proto";
-// 获取空间下的成员
-message ListSpaceUsersParams {
-}
-
-message SpaceUser {
-  int64 UserId = 1 [(api.body)="user_id"];
-  string Username = 2 [(api.body)="username"];
-  int32 SpaceRole = 3 [(api.body)="space_role"];
-  string ActiveTime = 4 [(api.body)="active_time"];
-}
-
-message ListSpaceUsersResult {
-  repeated SpaceUser users = 1;
-}
-
-// 加入空间
-message JoinSpaceParams {
-  string InviteCode = 1 [(api.body)="invite_code",(api.vd)="$ != ''"]; // 邀请码
-}
-
-message JoinSpaceResult {
-
-}
-
-// 退出空间
-message ExitSpaceParams {
-
-}
-
-message ExitSpaceResult {
-
-}
-
-// 踢出成员
-message RemoveSpaceUserParams {
-  int64 UserId  = 1 [(api.body) = "user_id",(api.vd)="$ != 0"];
-}
-
-message RemoveSpaceUserResult {
-
-}
-
-// 获取当前用户的空间信息
-message GetUserSpaceParams{
-
-}
-message GetUserSpaceResult{
-  int64 SpaceId = 1[(api.body)="space_id"];
-  string SpaceName = 2[(api.body)="space_name"];
-  string InviteCode = 3[(api.body)="invite_code"];
-  int32 Role = 4[(api.body)="role"];
-}

code/allapp/allapp-go/idl/user/user.proto

@@ -0,0 +1,16 @@
+syntax = "proto3";
+
+package user;
+
+option go_package = "user";
+
+import "api.proto";
+
+import "user/user_types.proto";
+
+service UserService {
+   // 获取当前用户所属的所有空间
+  rpc ListUserSpaces(ListUserSpacesParams) returns (ListUserSpacesResult) {
+    option (api.get) = "/user/spaces";
+  };
+}

code/allapp/allapp-go/idl/user/user_types.proto

@@ -0,0 +1,21 @@
+syntax = "proto3";
+
+package user;
+
+option go_package = "user";
+
+import "api.proto";
+
+// --- 用户下的空间列表 ---
+message ListUserSpacesParams {}
+
+message UserSpace {
+  int64 Id = 1 [(api.body)="id"];
+  string Name = 2 [(api.body)="name"];
+  string InviteCode = 3 [(api.body)="invite_code"];
+  int32 Role = 4 [(api.body)="role"];
+}
+
+message ListUserSpacesResult {
+  repeated UserSpace Spaces = 1 [(api.body)="spaces"];
+}