cms

pkg/proto/auto_proto.sh

@@ -7,7 +7,7 @@ for ((i = 0; i < ${#all_proto[*]}; i++)); do
   protoc -I ../../../ -I ./ --go_out=plugins=grpc:. $proto
   s=`echo $proto | sed 's/ //g'`
   v=${s//proto/pb.go}
-  protoc-go-inject-tag -input=./$v
+  # protoc-go-inject-tag -input=./$v
   echo "protoc --go_out=plugins=grpc:." $proto
 done
 echo "proto file generate success..."

pkg/proto/proto_dir.cfg

@@ -1,11 +1,11 @@
 
 all_proto=(
-            auth/auth.proto
-            friend/friend.proto
-            group/group.proto
+            # auth/auth.proto
+            # friend/friend.proto
+            # group/group.proto
             user/user.proto
-            chat/chat.proto
-            push/push.proto
-            relay/relay.proto
+            # chat/chat.proto
+            # push/push.proto
+            # relay/relay.proto
             sdk_ws/ws.proto
 )

pkg/proto/sdk_ws/ws.proto

@@ -1,4 +1,5 @@
 syntax = "proto3";
+option go_package = "./sdk_ws;server_api_params";
 package server_api_params;//The package name to which the proto file belongs
 //option go_package = "./sdk_ws;open_im_sdk";//The generated go pb file is in the current directory, and the package name is open_im_sdk
 
@@ -330,3 +331,9 @@ message FriendInfoChangedTips{
 message UserInfoUpdatedTips{
   string userID = 1;
 }
+
+///cms
+message RequestPagination {
+  int32 pageNumber = 1;
+  int32 showNumber = 2;
+}

pkg/proto/user/user.proto

@@ -13,6 +13,7 @@ message DeleteUsersReq{
   string OpUserID = 3;
   string OperationID = 4;
 }
+
 message DeleteUsersResp{
   CommonResp  CommonResp = 1;
   repeated string FailedUserIDList = 2;
@@ -107,53 +108,84 @@ message GetAllConversationMsgOptResp{
 }
 
 message ResignUserReq{
-    string UserId = 1;
-    string OperationID = 2;
+  string UserId = 1;
+  string OperationID = 2;
 }
 
 message ResignUserResp{
-    CommonResp  commonResp = 1;
+  CommonResp  commonResp = 1;
 }
 
 message GetUserReq{
-    string UserId = 1;
-    string OperationID = 2;
+  string UserId = 1;
+  string OperationID = 2;
 }
 
 message User{
-
+  string ProfilePhoto = 1;
+  string Nickname = 2;
+  string UserID = 3;
+  string CreateTime = 4; 
 }
 
 message GetUserResp{
-    User user = 1
+  User user = 1;
 }
 
 message AlterUserReq{
-    string UserId = 1;
-    string OperationID = 2;
+  string UserId = 1;
+  string OperationID = 2;
 }
 
 message AlterUserResp{
-    CommonResp  commonResp = 1;
+  CommonResp  CommonResp = 1;
 }
 
-message GetUserReq{
-    string OperationID = 1;
+message GetUsersReq {
+  string OperationID = 1;
+  server_api_params.RequestPagination Pagination = 2;
 }
 
 message GetUsersResp{
-    string OperationID = 1;
-    repeated Users User = 2;
+  string OperationID = 1;
+  repeated User user = 2;
 }
 
 message AddUserReq{
-    string OperationID = 1;
+  string OperationID = 1;
 }
 
 message AddUserResp{
-    CommonResp  commonResp = 1;
 }
 
+
+message BlockUserReq{
+  string UserID = 1;
+  string OperationID = 2;
+}
+
+message BlockUserResp{
+}
+
+message UnBlockUserReq{
+  string UserID = 1;
+  string OperationID = 2;
+}
+
+message UnBlockUserResp{
+
+}
+
+message GetBlockUsersReq{
+  server_api_params.RequestPagination Pagination =1;
+  string OperationID = 2;
+}
+
+message GetBlockUsersResp{
+  repeated User user = 2;
+}
+
+
 service user {
   rpc GetUserInfo(GetUserInfoReq) returns(GetUserInfoResp);
   rpc UpdateUserInfo(UpdateUserInfoReq) returns(UpdateUserInfoResp);
@@ -164,8 +196,8 @@ service user {
   rpc GetAllConversationMsgOpt(GetAllConversationMsgOptReq)returns(GetAllConversationMsgOptResp);
   rpc AccountCheck(AccountCheckReq)returns(AccountCheckResp);
 
-  rpc ResignUser(ResignUserReq) returns (ResignUserResp);
   rpc GetUser(GetUserReq) returns (GetUserResp);
+  rpc ResignUser(ResignUserReq) returns (ResignUserResp);
   rpc AlterUser(AlterUserReq) returns (AlterUserResp);
   rpc GetUsers(GetUsersReq) returns (GetUsersResp);
   rpc AddUser(AddUserReq) returns (AddUserResp);