diff --git a/pkg/proto/auto_proto.sh b/pkg/proto/auto_proto.sh index 179cca6bb..60412855c 100644 --- a/pkg/proto/auto_proto.sh +++ b/pkg/proto/auto_proto.sh @@ -4,7 +4,6 @@ source ./proto_dir.cfg for ((i = 0; i < ${#all_proto[*]}; i++)); do proto=${all_proto[$i]} - protoc -I ../../../ -I ./ --go_out=plugins=grpc:. $proto echo "protoc --go_out=plugins=grpc:." $proto done diff --git a/pkg/proto/proto_dir.cfg b/pkg/proto/proto_dir.cfg index 24654c38f..8d4b3d80e 100644 --- a/pkg/proto/proto_dir.cfg +++ b/pkg/proto/proto_dir.cfg @@ -1,8 +1,6 @@ all_proto=( - message_cms/message_cms.proto admin_cms/admin_cms.proto - statistics/statistics.proto auth/auth.proto friend/friend.proto group/group.proto diff --git a/pkg/proto/rtc/rtc.proto b/pkg/proto/rtc/rtc.proto index 7081865fa..2c93c4963 100644 --- a/pkg/proto/rtc/rtc.proto +++ b/pkg/proto/rtc/rtc.proto @@ -100,7 +100,9 @@ message SignalReq { SignalAcceptReq accept = 4; SignalHungUpReq hungUp = 5; SignalRejectReq reject = 6; - SignalGetRoomByGroupIDReq GetRoomByGroupID = 7; + SignalGetRoomByGroupIDReq getRoomByGroupID = 7; + + SignalOnRoomChangeReq signalOnRoomChangeReq = 8; } } @@ -108,7 +110,7 @@ message SignalResp { oneof payload { SignalInviteReply invite = 1; SignalInviteInGroupReply inviteInGroup= 2; - SignalCancelReply cancel = 3; + SignalCancelReply cancel = 3; SignalAcceptReply accept = 4; SignalHungUpReply hungUp = 5; SignalRejectReply reject = 6; @@ -222,6 +224,12 @@ message SignalGetRoomByGroupIDReply { string liveURL = 5; } +message SignalOnRoomChangeReq { + InvitationInfo invitation = 1; + repeated ParticipantMetaData metaData = 2; + string groupID = 3; +} + message SignalMessageAssembleReq { SignalReq signalReq = 1; string operationID = 2; @@ -234,8 +242,17 @@ message SignalMessageAssembleResp { MsgData msgData = 4; } +message SignalGetRoomsReq { + string operationID = 1; + string roomID = 2; +} +message SignalGetRoomsResp { + CommonResp commonResp = 1; + repeated SignalGetRoomByGroupIDReply roomList = 2; +} service RtcService { rpc SignalMessageAssemble(SignalMessageAssembleReq) returns(SignalMessageAssembleResp); + rpc SignalGetRooms(SignalGetRoomsReq) returns(SignalGetRoomsResp); } diff --git a/pkg/proto/sdk_ws/ws.proto b/pkg/proto/sdk_ws/ws.proto index 1f41192e1..0d51cb4e2 100644 --- a/pkg/proto/sdk_ws/ws.proto +++ b/pkg/proto/sdk_ws/ws.proto @@ -527,6 +527,8 @@ message SignalReq { SignalHungUpReq hungUp = 5; SignalRejectReq reject = 6; SignalGetRoomByGroupIDReq GetRoomByGroupID = 7; + + SignalOnRoomChangeReq signalOnRoomChangeReq = 8; } } @@ -653,6 +655,11 @@ message SignalGetRoomByGroupIDReply { string liveURL = 5; } +message SignalOnRoomChangeReq { + InvitationInfo invitation = 1; + repeated ParticipantMetaData metaData = 2; + string groupID = 3; +} message DelMsgListReq{ string opUserID = 1;