From ab6fa41438a2ff97169eb1475ab0d2055a4d2f96 Mon Sep 17 00:00:00 2001
From: wangchuxiao <wangchuxiao97@outlook.com>
Date: Tue, 28 Feb 2023 15:47:42 +0800
Subject: [PATCH] Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server
 into errcode

# Conflicts:
#	pkg/common/config/config.go
#	pkg/discoveryregistry/discovery_register.go
---
 .../{relay.proto => msg_gateway.proto}         | 18 +++++++++++-------
 pkg/proto/proto_dir.cfg                        |  2 +-
 .../{file/file.proto => third/third.proto}     |  6 +++---
 3 files changed, 15 insertions(+), 11 deletions(-)
 rename pkg/proto/msggateway/{relay.proto => msg_gateway.proto} (91%)
 rename pkg/proto/{file/file.proto => third/third.proto} (87%)

diff --git a/pkg/proto/msggateway/relay.proto b/pkg/proto/msggateway/msg_gateway.proto
similarity index 91%
rename from pkg/proto/msggateway/relay.proto
rename to pkg/proto/msggateway/msg_gateway.proto
index 47f981137..20487c7a9 100644
--- a/pkg/proto/msggateway/relay.proto
+++ b/pkg/proto/msggateway/msg_gateway.proto
@@ -1,17 +1,19 @@
 syntax = "proto3";
 import "Open-IM-Server/pkg/proto/sdkws/ws.proto";
-option go_package = "OpenIM/pkg/proto/relay;pbRelay";
-package relay;
+option go_package = "OpenIM/pkg/proto/msggateway;pbMsggateway";
+package msggateway;
 
 message OnlinePushMsgReq {
   string OperationID = 1;
   sdkws.MsgData msgData = 2;
   string pushToUserID = 3;
 }
+
 message OnlinePushMsgResp{
-repeated SingleMsgToUserPlatform resp = 1;
+    repeated SingleMsgToUserPlatform resp = 1;
 }
-message SingelMsgToUserResultList{
+
+message SingleMsgToUserResultList{
   string userID =1;
   repeated SingleMsgToUserPlatform resp = 2;
   bool onlinePush = 3;
@@ -22,8 +24,9 @@ message OnlineBatchPushOneMsgReq{
   sdkws.MsgData msgData = 2;
   repeated string pushToUserIDList = 3;
 }
+
 message OnlineBatchPushOneMsgResp{
-  repeated SingelMsgToUserResultList singlePushResult= 1;
+  repeated SingleMsgToUserResultList singlePushResult= 1;
 }
 //message SendMsgByWSReq{
 //  string SendID = 1;
@@ -47,6 +50,7 @@ message GetUsersOnlineStatusReq{
   string  operationID = 2;
   string opUserID = 3;
 }
+
 message GetUsersOnlineStatusResp{
   int32  errCode = 1;
   string errMsg = 2;
@@ -67,16 +71,16 @@ message GetUsersOnlineStatusResp{
     string userID = 1;
     string status = 2;
     repeated SuccessDetail detailPlatformStatus = 3;
-
   }
 }
+
 message KickUserOfflineReq{
   string operationID = 1;
     int32  platformID = 2;
   repeated string kickUserIDList = 3;
 }
-message KickUserOfflineResp{
 
+message KickUserOfflineResp{
 }
 
 
diff --git a/pkg/proto/proto_dir.cfg b/pkg/proto/proto_dir.cfg
index 7509903fe..2ae80f045 100644
--- a/pkg/proto/proto_dir.cfg
+++ b/pkg/proto/proto_dir.cfg
@@ -7,7 +7,7 @@ all_proto=(
             rtc/rtc.proto
             msg/msg.proto
             push/push.proto
-            relay/relay.proto
+            msggateway/msg_gateway.proto
             sdkws/ws.proto
             conversation/conversation.proto
             file/file.proto
diff --git a/pkg/proto/file/file.proto b/pkg/proto/third/third.proto
similarity index 87%
rename from pkg/proto/file/file.proto
rename to pkg/proto/third/third.proto
index 8952c8501..76c59dfc2 100644
--- a/pkg/proto/file/file.proto
+++ b/pkg/proto/third/third.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
-option go_package = "OpenIM/pkg/proto/file;file";
-package file;
+option go_package = "OpenIM/pkg/proto/third;third";
+package third;
 
 
 message ApplySpaceReq {
@@ -26,7 +26,7 @@ message ConfirmSpaceResp {
   string confirmID = 1;
 }
 
-service file {
+service third {
   rpc ApplySpaceReq(ApplySpaceReq) returns(ApplySpaceResp);
 }