blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-24 02:16:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode

Browse Source 
# Conflicts:
#	pkg/common/config/config.go
#	pkg/discoveryregistry/discovery_register.go
This commit is contained in:
wangchuxiao 2023-02-28 15:47:42 +08:00
parent 2edb3cfd8c
commit ab6fa41438
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/proto/msggateway/relay.proto → pkg/proto/msggateway/msg_gateway.proto
View File

@ -1,17 +1,19 @@
syntax = "proto3"; syntax = "proto3";
import "Open-IM-Server/pkg/proto/sdkws/ws.proto"; import "Open-IM-Server/pkg/proto/sdkws/ws.proto";
option go_package = "OpenIM/pkg/proto/relay;pbRelay"; option go_package = "OpenIM/pkg/proto/msggateway;pbMsggateway";
package relay; package msggateway;
message OnlinePushMsgReq { message OnlinePushMsgReq {
string OperationID = 1; string OperationID = 1;
sdkws.MsgData msgData = 2; sdkws.MsgData msgData = 2;
string pushToUserID = 3; string pushToUserID = 3;
} }
message OnlinePushMsgResp{ message OnlinePushMsgResp{
repeated SingleMsgToUserPlatform resp = 1; repeated SingleMsgToUserPlatform resp = 1;
} }
message SingelMsgToUserResultList{
message SingleMsgToUserResultList{
string userID =1; string userID =1;
repeated SingleMsgToUserPlatform resp = 2; repeated SingleMsgToUserPlatform resp = 2;
bool onlinePush = 3; bool onlinePush = 3;
@ -22,8 +24,9 @@ message OnlineBatchPushOneMsgReq{
sdkws.MsgData msgData = 2; sdkws.MsgData msgData = 2;
repeated string pushToUserIDList = 3; repeated string pushToUserIDList = 3;
} }
message OnlineBatchPushOneMsgResp{ message OnlineBatchPushOneMsgResp{
repeated SingelMsgToUserResultList singlePushResult= 1; repeated SingleMsgToUserResultList singlePushResult= 1;
} }
//message SendMsgByWSReq{ //message SendMsgByWSReq{
// string SendID = 1; // string SendID = 1;
@ -47,6 +50,7 @@ message GetUsersOnlineStatusReq{
string operationID = 2; string operationID = 2;
string opUserID = 3; string opUserID = 3;
} }
message GetUsersOnlineStatusResp{ message GetUsersOnlineStatusResp{
int32 errCode = 1; int32 errCode = 1;
string errMsg = 2; string errMsg = 2;
@ -67,16 +71,16 @@ message GetUsersOnlineStatusResp{
string userID = 1; string userID = 1;
string status = 2; string status = 2;
repeated SuccessDetail detailPlatformStatus = 3; repeated SuccessDetail detailPlatformStatus = 3;
} }
} }
message KickUserOfflineReq{ message KickUserOfflineReq{
string operationID = 1; string operationID = 1;
int32 platformID = 2; int32 platformID = 2;
repeated string kickUserIDList = 3; repeated string kickUserIDList = 3;
} }
message KickUserOfflineResp{
message KickUserOfflineResp{
} }

2
pkg/proto/proto_dir.cfg
View File

@ -7,7 +7,7 @@ all_proto=(
rtc/rtc.proto rtc/rtc.proto
msg/msg.proto msg/msg.proto
push/push.proto push/push.proto
relay/relay.proto msggateway/msg_gateway.proto
sdkws/ws.proto sdkws/ws.proto
conversation/conversation.proto conversation/conversation.proto
file/file.proto file/file.proto

6
pkg/proto/file/file.proto → pkg/proto/third/third.proto
View File

@ -1,6 +1,6 @@
syntax = "proto3"; syntax = "proto3";
option go_package = "OpenIM/pkg/proto/file;file"; option go_package = "OpenIM/pkg/proto/third;third";
package file; package third;
message ApplySpaceReq { message ApplySpaceReq {
@ -26,7 +26,7 @@ message ConfirmSpaceResp {
string confirmID = 1; string confirmID = 1;
} }
service file { service third {
rpc ApplySpaceReq(ApplySpaceReq) returns(ApplySpaceResp); rpc ApplySpaceReq(ApplySpaceReq) returns(ApplySpaceResp);
} }