workmoment

config/config.yaml

@@ -758,6 +758,10 @@ demo:
   joinDepartmentGroups: false # 注册是否加部门群
   oaNotification: false # 注册是否发送OA通知
 
+workMoment:
+  onlyFriendCanSee: false
+
+
 rtc:
   signalTimeout: 35
 

internal/rpc/office/office.go

@@ -7,6 +7,7 @@ import (
 	"Open_IM/pkg/common/db"
 	"Open_IM/pkg/common/db/mysql_model/im_mysql_model"
 	imdb "Open_IM/pkg/common/db/mysql_model/im_mysql_model"
+	rocksCache "Open_IM/pkg/common/db/rocks_cache"
 	"Open_IM/pkg/common/log"
 	promePkg "Open_IM/pkg/common/prometheus"
 	"Open_IM/pkg/grpc-etcdv3/getcdv3"
@@ -674,7 +675,16 @@ func (s *officeServer) GetUserFriendWorkMoments(_ context.Context, req *pbOffice
 	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String())
 	resp = &pbOffice.GetUserFriendWorkMomentsResp{CommonResp: &pbOffice.CommonResp{}, WorkMoments: []*pbOffice.WorkMoment{}}
 	resp.Pagination = &pbCommon.ResponsePagination{CurrentPage: req.Pagination.PageNumber, ShowNumber: req.Pagination.ShowNumber}
-	workMoments, err := db.DB.GetUserFriendWorkMoments(req.Pagination.ShowNumber, req.Pagination.PageNumber, req.UserID)
+	var friendIDList []string
+	if config.Config.WorkMoment.OnlyFriendCanSee {
+		friendIDList, err = rocksCache.GetFriendIDListFromCache(req.UserID)
+		if err != nil {
+			log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetUserFriendWorkMoments", err.Error())
+			resp.CommonResp = &pbOffice.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: err.Error()}
+			return resp, nil
+		}
+	}
+	workMoments, err := db.DB.GetUserFriendWorkMoments(req.Pagination.ShowNumber, req.Pagination.PageNumber, req.UserID, friendIDList)
 	if err != nil {
 		log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetUserFriendWorkMoments", err.Error())
 		resp.CommonResp = &pbOffice.CommonResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}
@@ -684,7 +694,7 @@ func (s *officeServer) GetUserFriendWorkMoments(_ context.Context, req *pbOffice
 		log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "CopyStructFields failed", err.Error())
 	}
 	for _, v := range resp.WorkMoments {
-		user, err := imdb.GetUserByUserID(v.UserID)
+		user, err := rocksCache.GetUserInfoFromCache(v.UserID)
 		if err != nil {
 			log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error())
 		}

pkg/common/config/config.go

@@ -513,6 +513,9 @@ type config struct {
 		OaNotification                          bool     `yaml:"oaNotification"`
 		CreateOrganizationUserAndJoinDepartment bool     `json:"createOrganizationUserAndJoinDepartment"`
 	}
+	WorkMoment struct {
+		OnlyFriendCanSee bool `yaml:"onlyFriendCanSee"`
+	}
 	Rtc struct {
 		SignalTimeout string `yaml:"signalTimeout"`
 	} `yaml:"rtc"`

pkg/common/db/mongoModel.go

@@ -990,23 +990,36 @@ func (d *DataBases) GetUserWorkMoments(opUserID, userID string, showNumber, page
 	return workMomentList, err
 }
 
-func (d *DataBases) GetUserFriendWorkMoments(showNumber, pageNumber int32, userID string) ([]WorkMoment, error) {
+func (d *DataBases) GetUserFriendWorkMoments(showNumber, pageNumber int32, userID string, friendIDList []string) ([]WorkMoment, error) {
 	ctx, _ := context.WithTimeout(context.Background(), time.Duration(config.Config.Mongo.DBTimeout)*time.Second)
 	c := d.mongoClient.Database(config.Config.Mongo.DBDatabase).Collection(cWorkMoment)
 	var workMomentList []WorkMoment
 	findOpts := options.Find().SetLimit(int64(showNumber)).SetSkip(int64(showNumber) * (int64(pageNumber) - 1)).SetSort(bson.M{"create_time": -1})
-	result, err := c.Find(ctx, bson.D{
+	var filter bson.D
+	permissionFilter := bson.D{
 		{"$or", bson.A{
-			bson.D{{"user_id", userID}}, //self
+			bson.D{{"permission", constant.WorkMomentPermissionCantSee}, {"permission_user_id_list", bson.D{{"$nin", bson.A{userID}}}}},
-			bson.D{
+			bson.D{{"permission", constant.WorkMomentPermissionCanSee}, {"permission_user_id_list", bson.D{{"$in", bson.A{userID}}}}},
-				{"$or", bson.A{
+			bson.D{{"permission", constant.WorkMomentPublic}},
-					bson.D{{"permission", constant.WorkMomentPermissionCantSee}, {"permission_user_id_list", bson.D{{"$nin", bson.A{userID}}}}},
+		}}}
-					bson.D{{"permission", constant.WorkMomentPermissionCanSee}, {"permission_user_id_list", bson.D{{"$in", bson.A{userID}}}}},
+	if config.Config.WorkMoment.OnlyFriendCanSee {
-					bson.D{{"permission", constant.WorkMomentPublic}},
+		filter = bson.D{
-				}}},
+			{"$or", bson.A{
-		},
+				bson.D{{"user_id", userID}}, //self
-		},
+				bson.D{{"$and", bson.A{permissionFilter, bson.D{{"user_id", bson.D{{"$in", friendIDList}}}}}}},
-	}, findOpts)
+			},
+			},
+		}
+	} else {
+		filter = bson.D{
+			{"$or", bson.A{
+				bson.D{{"user_id", userID}}, //self
+				permissionFilter,
+			},
+			},
+		}
+	}
+	result, err := c.Find(ctx, filter, findOpts)
 	if err != nil {
 		return workMomentList, err
 	}

pkg/proto/rtc/rtc.pb.go

@@ -35,7 +35,7 @@ func (m *CommonResp) Reset()         { *m = CommonResp{} }
 func (m *CommonResp) String() string { return proto.CompactTextString(m) }
 func (*CommonResp) ProtoMessage()    {}
 func (*CommonResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_rtc_2059f33abbeeea7e, []int{0}
+	return fileDescriptor_rtc_91d7dfac542e285c, []int{0}
 }
 func (m *CommonResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_CommonResp.Unmarshal(m, b)
@@ -97,7 +97,7 @@ func (m *MsgData) Reset()         { *m = MsgData{} }
 func (m *MsgData) String() string { return proto.CompactTextString(m) }
 func (*MsgData) ProtoMessage()    {}
 func (*MsgData) Descriptor() ([]byte, []int) {
-	return fileDescriptor_rtc_2059f33abbeeea7e, []int{1}
+	return fileDescriptor_rtc_91d7dfac542e285c, []int{1}
 }
 func (m *MsgData) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_MsgData.Unmarshal(m, b)
@@ -265,7 +265,7 @@ func (m *GroupInfo) Reset()         { *m = GroupInfo{} }
 func (m *GroupInfo) String() string { return proto.CompactTextString(m) }
 func (*GroupInfo) ProtoMessage()    {}
 func (*GroupInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_rtc_2059f33abbeeea7e, []int{2}
+	return fileDescriptor_rtc_91d7dfac542e285c, []int{2}
 }
 func (m *GroupInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GroupInfo.Unmarshal(m, b)
@@ -389,7 +389,7 @@ func (m *GroupMemberFullInfo) Reset()         { *m = GroupMemberFullInfo{} }
 func (m *GroupMemberFullInfo) String() string { return proto.CompactTextString(m) }
 func (*GroupMemberFullInfo) ProtoMessage()    {}
 func (*GroupMemberFullInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_rtc_2059f33abbeeea7e, []int{3}
+	return fileDescriptor_rtc_91d7dfac542e285c, []int{3}
 }
 func (m *GroupMemberFullInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GroupMemberFullInfo.Unmarshal(m, b)
@@ -492,7 +492,7 @@ func (m *ParticipantMetaData) Reset()         { *m = ParticipantMetaData{} }
 func (m *ParticipantMetaData) String() string { return proto.CompactTextString(m) }
 func (*ParticipantMetaData) ProtoMessage()    {}
 func (*ParticipantMetaData) Descriptor() ([]byte, []int) {
-	return fileDescriptor_rtc_2059f33abbeeea7e, []int{4}
+	return fileDescriptor_rtc_91d7dfac542e285c, []int{4}
 }
 func (m *ParticipantMetaData) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_ParticipantMetaData.Unmarshal(m, b)
@@ -548,7 +548,7 @@ func (m *PublicUserInfo) Reset()         { *m = PublicUserInfo{} }
 func (m *PublicUserInfo) String() string { return proto.CompactTextString(m) }
 func (*PublicUserInfo) ProtoMessage()    {}
 func (*PublicUserInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_rtc_2059f33abbeeea7e, []int{5}
+	return fileDescriptor_rtc_91d7dfac542e285c, []int{5}
 }
 func (m *PublicUserInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_PublicUserInfo.Unmarshal(m, b)
@@ -617,7 +617,7 @@ func (m *GetJoinTokenReq) Reset()         { *m = GetJoinTokenReq{} }
 func (m *GetJoinTokenReq) String() string { return proto.CompactTextString(m) }
 func (*GetJoinTokenReq) ProtoMessage()    {}
 func (*GetJoinTokenReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_rtc_2059f33abbeeea7e, []int{6}
+	return fileDescriptor_rtc_91d7dfac542e285c, []int{6}
 }
 func (m *GetJoinTokenReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetJoinTokenReq.Unmarshal(m, b)
@@ -678,7 +678,7 @@ func (m *GetJoinTokenResp) Reset()         { *m = GetJoinTokenResp{} }
 func (m *GetJoinTokenResp) String() string { return proto.CompactTextString(m) }
 func (*GetJoinTokenResp) ProtoMessage()    {}
 func (*GetJoinTokenResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_rtc_2059f33abbeeea7e, []int{7}
+	return fileDescriptor_rtc_91d7dfac542e285c, []int{7}
 }
 func (m *GetJoinTokenResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_GetJoinTokenResp.Unmarshal(m, b)
@@ -734,7 +734,7 @@ func (m *OfflinePushInfo) Reset()         { *m = OfflinePushInfo{} }
 func (m *OfflinePushInfo) String() string { return proto.CompactTextString(m) }
 func (*OfflinePushInfo) ProtoMessage()    {}
 func (*OfflinePushInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_rtc_2059f33abbeeea7e, []int{8}
+	return fileDescriptor_rtc_91d7dfac542e285c, []int{8}
 }
 func (m *OfflinePushInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_OfflinePushInfo.Unmarshal(m, b)
@@ -797,6 +797,7 @@ type SignalReq struct {
 	//	*SignalReq_Accept
 	//	*SignalReq_HungUp
 	//	*SignalReq_Reject
+	//	*SignalReq_GetRoomByGroupID
 	Payload              isSignalReq_Payload `protobuf_oneof:"payload"`
 	XXX_NoUnkeyedLiteral struct{}            `json:"-"`
 	XXX_unrecognized     []byte              `json:"-"`
@@ -807,7 +808,7 @@ func (m *SignalReq) Reset()         { *m = SignalReq{} }
 func (m *SignalReq) String() string { return proto.CompactTextString(m) }
 func (*SignalReq) ProtoMessage()    {}
 func (*SignalReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_rtc_2059f33abbeeea7e, []int{9}
+	return fileDescriptor_rtc_91d7dfac542e285c, []int{9}
 }
 func (m *SignalReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SignalReq.Unmarshal(m, b)
@@ -849,13 +850,17 @@ type SignalReq_HungUp struct {
 type SignalReq_Reject struct {
 	Reject *SignalRejectReq `protobuf:"bytes,6,opt,name=reject,oneof"`
 }
+type SignalReq_GetRoomByGroupID struct {
+	GetRoomByGroupID *SignalGetRoomByGroupIDReq `protobuf:"bytes,7,opt,name=GetRoomByGroupID,oneof"`
+}
 
-func (*SignalReq_Invite) isSignalReq_Payload()        {}
+func (*SignalReq_Invite) isSignalReq_Payload()           {}
-func (*SignalReq_InviteInGroup) isSignalReq_Payload() {}
+func (*SignalReq_InviteInGroup) isSignalReq_Payload()    {}
-func (*SignalReq_Cancel) isSignalReq_Payload()        {}
+func (*SignalReq_Cancel) isSignalReq_Payload()           {}
-func (*SignalReq_Accept) isSignalReq_Payload()        {}
+func (*SignalReq_Accept) isSignalReq_Payload()           {}
-func (*SignalReq_HungUp) isSignalReq_Payload()        {}
+func (*SignalReq_HungUp) isSignalReq_Payload()           {}
-func (*SignalReq_Reject) isSignalReq_Payload()        {}
+func (*SignalReq_Reject) isSignalReq_Payload()           {}
+func (*SignalReq_GetRoomByGroupID) isSignalReq_Payload() {}
 
 func (m *SignalReq) GetPayload() isSignalReq_Payload {
 	if m != nil {
@@ -906,6 +911,13 @@ func (m *SignalReq) GetReject() *SignalRejectReq {
 	return nil
 }
 
+func (m *SignalReq) GetGetRoomByGroupID() *SignalGetRoomByGroupIDReq {
+	if x, ok := m.GetPayload().(*SignalReq_GetRoomByGroupID); ok {
+		return x.GetRoomByGroupID
+	}
+	return nil
+}
+
 // XXX_OneofFuncs is for the internal use of the proto package.
 func (*SignalReq) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
 	return _SignalReq_OneofMarshaler, _SignalReq_OneofUnmarshaler, _SignalReq_OneofSizer, []interface{}{
@@ -915,6 +927,7 @@ func (*SignalReq) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) err
 		(*SignalReq_Accept)(nil),
 		(*SignalReq_HungUp)(nil),
 		(*SignalReq_Reject)(nil),
+		(*SignalReq_GetRoomByGroupID)(nil),
 	}
 }
 
@@ -952,6 +965,11 @@ func _SignalReq_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
 		if err := b.EncodeMessage(x.Reject); err != nil {
 			return err
 		}
+	case *SignalReq_GetRoomByGroupID:
+		b.EncodeVarint(7<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.GetRoomByGroupID); err != nil {
+			return err
+		}
 	case nil:
 	default:
 		return fmt.Errorf("SignalReq.Payload has unexpected type %T", x)
@@ -1010,6 +1028,14 @@ func _SignalReq_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buff
 		err := b.DecodeMessage(msg)
 		m.Payload = &SignalReq_Reject{msg}
 		return true, err
+	case 7: // payload.GetRoomByGroupID
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(SignalGetRoomByGroupIDReq)
+		err := b.DecodeMessage(msg)
+		m.Payload = &SignalReq_GetRoomByGroupID{msg}
+		return true, err
 	default:
 		return false, nil
 	}
@@ -1049,6 +1075,11 @@ func _SignalReq_OneofSizer(msg proto.Message) (n int) {
 		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
+	case *SignalReq_GetRoomByGroupID:
+		s := proto.Size(x.GetRoomByGroupID)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
 	case nil:
 	default:
 		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
@@ -1064,6 +1095,7 @@ type SignalResp struct {
 	//	*SignalResp_Accept
 	//	*SignalResp_HungUp
 	//	*SignalResp_Reject
+	//	*SignalResp_GetRoomByGroupID
 	Payload              isSignalResp_Payload `protobuf_oneof:"payload"`
 	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
 	XXX_unrecognized     []byte               `json:"-"`
@@ -1074,7 +1106,7 @@ func (m *SignalResp) Reset()         { *m = SignalResp{} }
 func (m *SignalResp) String() string { return proto.CompactTextString(m) }
 func (*SignalResp) ProtoMessage()    {}
 func (*SignalResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_rtc_2059f33abbeeea7e, []int{10}
+	return fileDescriptor_rtc_91d7dfac542e285c, []int{10}
 }
 func (m *SignalResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SignalResp.Unmarshal(m, b)
@@ -1116,13 +1148,17 @@ type SignalResp_HungUp struct {
 type SignalResp_Reject struct {
 	Reject *SignalRejectReply `protobuf:"bytes,6,opt,name=reject,oneof"`
 }
+type SignalResp_GetRoomByGroupID struct {
+	GetRoomByGroupID *SignalGetRoomByGroupIDReply `protobuf:"bytes,7,opt,name=GetRoomByGroupID,oneof"`
+}
 
-func (*SignalResp_Invite) isSignalResp_Payload()        {}
+func (*SignalResp_Invite) isSignalResp_Payload()           {}
-func (*SignalResp_InviteInGroup) isSignalResp_Payload() {}
+func (*SignalResp_InviteInGroup) isSignalResp_Payload()    {}
-func (*SignalResp_Cancel) isSignalResp_Payload()        {}
+func (*SignalResp_Cancel) isSignalResp_Payload()           {}
-func (*SignalResp_Accept) isSignalResp_Payload()        {}
+func (*SignalResp_Accept) isSignalResp_Payload()           {}
-func (*SignalResp_HungUp) isSignalResp_Payload()        {}
+func (*SignalResp_HungUp) isSignalResp_Payload()           {}
-func (*SignalResp_Reject) isSignalResp_Payload()        {}
+func (*SignalResp_Reject) isSignalResp_Payload()           {}
+func (*SignalResp_GetRoomByGroupID) isSignalResp_Payload() {}
 
 func (m *SignalResp) GetPayload() isSignalResp_Payload {
 	if m != nil {
@@ -1173,6 +1209,13 @@ func (m *SignalResp) GetReject() *SignalRejectReply {
 	return nil
 }
 
+func (m *SignalResp) GetGetRoomByGroupID() *SignalGetRoomByGroupIDReply {
+	if x, ok := m.GetPayload().(*SignalResp_GetRoomByGroupID); ok {
+		return x.GetRoomByGroupID
+	}
+	return nil
+}
+
 // XXX_OneofFuncs is for the internal use of the proto package.
 func (*SignalResp) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
 	return _SignalResp_OneofMarshaler, _SignalResp_OneofUnmarshaler, _SignalResp_OneofSizer, []interface{}{
@@ -1182,6 +1225,7 @@ func (*SignalResp) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) er
 		(*SignalResp_Accept)(nil),
 		(*SignalResp_HungUp)(nil),
 		(*SignalResp_Reject)(nil),
+		(*SignalResp_GetRoomByGroupID)(nil),
 	}
 }
 
@@ -1219,6 +1263,11 @@ func _SignalResp_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
 		if err := b.EncodeMessage(x.Reject); err != nil {
 			return err
 		}
+	case *SignalResp_GetRoomByGroupID:
+		b.EncodeVarint(7<<3 | proto.WireBytes)
+		if err := b.EncodeMessage(x.GetRoomByGroupID); err != nil {
+			return err
+		}
 	case nil:
 	default:
 		return fmt.Errorf("SignalResp.Payload has unexpected type %T", x)
@@ -1277,6 +1326,14 @@ func _SignalResp_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buf
 		err := b.DecodeMessage(msg)
 		m.Payload = &SignalResp_Reject{msg}
 		return true, err
+	case 7: // payload.GetRoomByGroupID
+		if wire != proto.WireBytes {
+			return true, proto.ErrInternalBadWireType
+		}
+		msg := new(SignalGetRoomByGroupIDReply)
+		err := b.DecodeMessage(msg)
+		m.Payload = &SignalResp_GetRoomByGroupID{msg}
+		return true, err
 	default:
 		return false, nil
 	}
@@ -1316,6 +1373,11 @@ func _SignalResp_OneofSizer(msg proto.Message) (n int) {
 		n += 1 // tag and wire
 		n += proto.SizeVarint(uint64(s))
 		n += s
+	case *SignalResp_GetRoomByGroupID:
+		s := proto.Size(x.GetRoomByGroupID)
+		n += 1 // tag and wire
+		n += proto.SizeVarint(uint64(s))
+		n += s
 	case nil:
 	default:
 		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
@@ -1343,7 +1405,7 @@ func (m *InvitationInfo) Reset()         { *m = InvitationInfo{} }
 func (m *InvitationInfo) String() string { return proto.CompactTextString(m) }
 func (*InvitationInfo) ProtoMessage()    {}
 func (*InvitationInfo) Descriptor() ([]byte, []int) {
-	return fileDescriptor_rtc_2059f33abbeeea7e, []int{11}
+	return fileDescriptor_rtc_91d7dfac542e285c, []int{11}
 }
 func (m *InvitationInfo) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_InvitationInfo.Unmarshal(m, b)
@@ -1447,7 +1509,7 @@ func (m *SignalInviteReq) Reset()         { *m = SignalInviteReq{} }
 func (m *SignalInviteReq) String() string { return proto.CompactTextString(m) }
 func (*SignalInviteReq) ProtoMessage()    {}
 func (*SignalInviteReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_rtc_2059f33abbeeea7e, []int{12}
+	return fileDescriptor_rtc_91d7dfac542e285c, []int{12}
 }
 func (m *SignalInviteReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SignalInviteReq.Unmarshal(m, b)
@@ -1499,6 +1561,7 @@ type SignalInviteReply struct {
 	Token                string   `protobuf:"bytes,1,opt,name=token" json:"token,omitempty"`
 	RoomID               string   `protobuf:"bytes,2,opt,name=roomID" json:"roomID,omitempty"`
 	LiveURL              string   `protobuf:"bytes,3,opt,name=liveURL" json:"liveURL,omitempty"`
+	BusyLineUserIDList   []string `protobuf:"bytes,4,rep,name=busyLineUserIDList" json:"busyLineUserIDList,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -1508,7 +1571,7 @@ func (m *SignalInviteReply) Reset()         { *m = SignalInviteReply{} }
 func (m *SignalInviteReply) String() string { return proto.CompactTextString(m) }
 func (*SignalInviteReply) ProtoMessage()    {}
 func (*SignalInviteReply) Descriptor() ([]byte, []int) {
-	return fileDescriptor_rtc_2059f33abbeeea7e, []int{13}
+	return fileDescriptor_rtc_91d7dfac542e285c, []int{13}
 }
 func (m *SignalInviteReply) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SignalInviteReply.Unmarshal(m, b)
@@ -1549,6 +1612,13 @@ func (m *SignalInviteReply) GetLiveURL() string {
 	return ""
 }
 
+func (m *SignalInviteReply) GetBusyLineUserIDList() []string {
+	if m != nil {
+		return m.BusyLineUserIDList
+	}
+	return nil
+}
+
 type SignalInviteInGroupReq struct {
 	OpUserID             string               `protobuf:"bytes,1,opt,name=opUserID" json:"opUserID,omitempty"`
 	Invitation           *InvitationInfo      `protobuf:"bytes,2,opt,name=invitation" json:"invitation,omitempty"`
@@ -1563,7 +1633,7 @@ func (m *SignalInviteInGroupReq) Reset()         { *m = SignalInviteInGroupReq{}
 func (m *SignalInviteInGroupReq) String() string { return proto.CompactTextString(m) }
 func (*SignalInviteInGroupReq) ProtoMessage()    {}
 func (*SignalInviteInGroupReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_rtc_2059f33abbeeea7e, []int{14}
+	return fileDescriptor_rtc_91d7dfac542e285c, []int{14}
 }
 func (m *SignalInviteInGroupReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SignalInviteInGroupReq.Unmarshal(m, b)
@@ -1615,6 +1685,7 @@ type SignalInviteInGroupReply struct {
 	Token                string   `protobuf:"bytes,1,opt,name=token" json:"token,omitempty"`
 	RoomID               string   `protobuf:"bytes,2,opt,name=roomID" json:"roomID,omitempty"`
 	LiveURL              string   `protobuf:"bytes,3,opt,name=liveURL" json:"liveURL,omitempty"`
+	BusyLineUserIDList   []string `protobuf:"bytes,4,rep,name=busyLineUserIDList" json:"busyLineUserIDList,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -1624,7 +1695,7 @@ func (m *SignalInviteInGroupReply) Reset()         { *m = SignalInviteInGroupRep
 func (m *SignalInviteInGroupReply) String() string { return proto.CompactTextString(m) }
 func (*SignalInviteInGroupReply) ProtoMessage()    {}
 func (*SignalInviteInGroupReply) Descriptor() ([]byte, []int) {
-	return fileDescriptor_rtc_2059f33abbeeea7e, []int{15}
+	return fileDescriptor_rtc_91d7dfac542e285c, []int{15}
 }
 func (m *SignalInviteInGroupReply) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SignalInviteInGroupReply.Unmarshal(m, b)
@@ -1665,6 +1736,13 @@ func (m *SignalInviteInGroupReply) GetLiveURL() string {
 	return ""
 }
 
+func (m *SignalInviteInGroupReply) GetBusyLineUserIDList() []string {
+	if m != nil {
+		return m.BusyLineUserIDList
+	}
+	return nil
+}
+
 type SignalCancelReq struct {
 	OpUserID             string               `protobuf:"bytes,1,opt,name=opUserID" json:"opUserID,omitempty"`
 	Invitation           *InvitationInfo      `protobuf:"bytes,2,opt,name=invitation" json:"invitation,omitempty"`
@@ -1679,7 +1757,7 @@ func (m *SignalCancelReq) Reset()         { *m = SignalCancelReq{} }
 func (m *SignalCancelReq) String() string { return proto.CompactTextString(m) }
 func (*SignalCancelReq) ProtoMessage()    {}
 func (*SignalCancelReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_rtc_2059f33abbeeea7e, []int{16}
+	return fileDescriptor_rtc_91d7dfac542e285c, []int{16}
 }
 func (m *SignalCancelReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SignalCancelReq.Unmarshal(m, b)
@@ -1737,7 +1815,7 @@ func (m *SignalCancelReply) Reset()         { *m = SignalCancelReply{} }
 func (m *SignalCancelReply) String() string { return proto.CompactTextString(m) }
 func (*SignalCancelReply) ProtoMessage()    {}
 func (*SignalCancelReply) Descriptor() ([]byte, []int) {
-	return fileDescriptor_rtc_2059f33abbeeea7e, []int{17}
+	return fileDescriptor_rtc_91d7dfac542e285c, []int{17}
 }
 func (m *SignalCancelReply) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SignalCancelReply.Unmarshal(m, b)
@@ -1772,7 +1850,7 @@ func (m *SignalAcceptReq) Reset()         { *m = SignalAcceptReq{} }
 func (m *SignalAcceptReq) String() string { return proto.CompactTextString(m) }
 func (*SignalAcceptReq) ProtoMessage()    {}
 func (*SignalAcceptReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_rtc_2059f33abbeeea7e, []int{18}
+	return fileDescriptor_rtc_91d7dfac542e285c, []int{18}
 }
 func (m *SignalAcceptReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SignalAcceptReq.Unmarshal(m, b)
@@ -1840,7 +1918,7 @@ func (m *SignalAcceptReply) Reset()         { *m = SignalAcceptReply{} }
 func (m *SignalAcceptReply) String() string { return proto.CompactTextString(m) }
 func (*SignalAcceptReply) ProtoMessage()    {}
 func (*SignalAcceptReply) Descriptor() ([]byte, []int) {
-	return fileDescriptor_rtc_2059f33abbeeea7e, []int{19}
+	return fileDescriptor_rtc_91d7dfac542e285c, []int{19}
 }
 func (m *SignalAcceptReply) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SignalAcceptReply.Unmarshal(m, b)
@@ -1894,7 +1972,7 @@ func (m *SignalHungUpReq) Reset()         { *m = SignalHungUpReq{} }
 func (m *SignalHungUpReq) String() string { return proto.CompactTextString(m) }
 func (*SignalHungUpReq) ProtoMessage()    {}
 func (*SignalHungUpReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_rtc_2059f33abbeeea7e, []int{20}
+	return fileDescriptor_rtc_91d7dfac542e285c, []int{20}
 }
 func (m *SignalHungUpReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SignalHungUpReq.Unmarshal(m, b)
@@ -1945,7 +2023,7 @@ func (m *SignalHungUpReply) Reset()         { *m = SignalHungUpReply{} }
 func (m *SignalHungUpReply) String() string { return proto.CompactTextString(m) }
 func (*SignalHungUpReply) ProtoMessage()    {}
 func (*SignalHungUpReply) Descriptor() ([]byte, []int) {
-	return fileDescriptor_rtc_2059f33abbeeea7e, []int{21}
+	return fileDescriptor_rtc_91d7dfac542e285c, []int{21}
 }
 func (m *SignalHungUpReply) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SignalHungUpReply.Unmarshal(m, b)
@@ -1980,7 +2058,7 @@ func (m *SignalRejectReq) Reset()         { *m = SignalRejectReq{} }
 func (m *SignalRejectReq) String() string { return proto.CompactTextString(m) }
 func (*SignalRejectReq) ProtoMessage()    {}
 func (*SignalRejectReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_rtc_2059f33abbeeea7e, []int{22}
+	return fileDescriptor_rtc_91d7dfac542e285c, []int{22}
 }
 func (m *SignalRejectReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SignalRejectReq.Unmarshal(m, b)
@@ -2045,7 +2123,7 @@ func (m *SignalRejectReply) Reset()         { *m = SignalRejectReply{} }
 func (m *SignalRejectReply) String() string { return proto.CompactTextString(m) }
 func (*SignalRejectReply) ProtoMessage()    {}
 func (*SignalRejectReply) Descriptor() ([]byte, []int) {
-	return fileDescriptor_rtc_2059f33abbeeea7e, []int{23}
+	return fileDescriptor_rtc_91d7dfac542e285c, []int{23}
 }
 func (m *SignalRejectReply) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SignalRejectReply.Unmarshal(m, b)
@@ -2065,6 +2143,130 @@ func (m *SignalRejectReply) XXX_DiscardUnknown() {
 
 var xxx_messageInfo_SignalRejectReply proto.InternalMessageInfo
 
+type SignalGetRoomByGroupIDReq struct {
+	OpUserID             string               `protobuf:"bytes,1,opt,name=opUserID" json:"opUserID,omitempty"`
+	GroupID              string               `protobuf:"bytes,2,opt,name=groupID" json:"groupID,omitempty"`
+	Participant          *ParticipantMetaData `protobuf:"bytes,3,opt,name=participant" json:"participant,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *SignalGetRoomByGroupIDReq) Reset()         { *m = SignalGetRoomByGroupIDReq{} }
+func (m *SignalGetRoomByGroupIDReq) String() string { return proto.CompactTextString(m) }
+func (*SignalGetRoomByGroupIDReq) ProtoMessage()    {}
+func (*SignalGetRoomByGroupIDReq) Descriptor() ([]byte, []int) {
+	return fileDescriptor_rtc_91d7dfac542e285c, []int{24}
+}
+func (m *SignalGetRoomByGroupIDReq) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SignalGetRoomByGroupIDReq.Unmarshal(m, b)
+}
+func (m *SignalGetRoomByGroupIDReq) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SignalGetRoomByGroupIDReq.Marshal(b, m, deterministic)
+}
+func (dst *SignalGetRoomByGroupIDReq) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SignalGetRoomByGroupIDReq.Merge(dst, src)
+}
+func (m *SignalGetRoomByGroupIDReq) XXX_Size() int {
+	return xxx_messageInfo_SignalGetRoomByGroupIDReq.Size(m)
+}
+func (m *SignalGetRoomByGroupIDReq) XXX_DiscardUnknown() {
+	xxx_messageInfo_SignalGetRoomByGroupIDReq.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SignalGetRoomByGroupIDReq proto.InternalMessageInfo
+
+func (m *SignalGetRoomByGroupIDReq) GetOpUserID() string {
+	if m != nil {
+		return m.OpUserID
+	}
+	return ""
+}
+
+func (m *SignalGetRoomByGroupIDReq) GetGroupID() string {
+	if m != nil {
+		return m.GroupID
+	}
+	return ""
+}
+
+func (m *SignalGetRoomByGroupIDReq) GetParticipant() *ParticipantMetaData {
+	if m != nil {
+		return m.Participant
+	}
+	return nil
+}
+
+type SignalGetRoomByGroupIDReply struct {
+	Invitation           *InvitationInfo        `protobuf:"bytes,1,opt,name=invitation" json:"invitation,omitempty"`
+	MetaData             []*ParticipantMetaData `protobuf:"bytes,2,rep,name=metaData" json:"metaData,omitempty"`
+	Token                string                 `protobuf:"bytes,3,opt,name=token" json:"token,omitempty"`
+	RoomID               string                 `protobuf:"bytes,4,opt,name=roomID" json:"roomID,omitempty"`
+	LiveURL              string                 `protobuf:"bytes,5,opt,name=liveURL" json:"liveURL,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}               `json:"-"`
+	XXX_unrecognized     []byte                 `json:"-"`
+	XXX_sizecache        int32                  `json:"-"`
+}
+
+func (m *SignalGetRoomByGroupIDReply) Reset()         { *m = SignalGetRoomByGroupIDReply{} }
+func (m *SignalGetRoomByGroupIDReply) String() string { return proto.CompactTextString(m) }
+func (*SignalGetRoomByGroupIDReply) ProtoMessage()    {}
+func (*SignalGetRoomByGroupIDReply) Descriptor() ([]byte, []int) {
+	return fileDescriptor_rtc_91d7dfac542e285c, []int{25}
+}
+func (m *SignalGetRoomByGroupIDReply) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_SignalGetRoomByGroupIDReply.Unmarshal(m, b)
+}
+func (m *SignalGetRoomByGroupIDReply) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_SignalGetRoomByGroupIDReply.Marshal(b, m, deterministic)
+}
+func (dst *SignalGetRoomByGroupIDReply) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_SignalGetRoomByGroupIDReply.Merge(dst, src)
+}
+func (m *SignalGetRoomByGroupIDReply) XXX_Size() int {
+	return xxx_messageInfo_SignalGetRoomByGroupIDReply.Size(m)
+}
+func (m *SignalGetRoomByGroupIDReply) XXX_DiscardUnknown() {
+	xxx_messageInfo_SignalGetRoomByGroupIDReply.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_SignalGetRoomByGroupIDReply proto.InternalMessageInfo
+
+func (m *SignalGetRoomByGroupIDReply) GetInvitation() *InvitationInfo {
+	if m != nil {
+		return m.Invitation
+	}
+	return nil
+}
+
+func (m *SignalGetRoomByGroupIDReply) GetMetaData() []*ParticipantMetaData {
+	if m != nil {
+		return m.MetaData
+	}
+	return nil
+}
+
+func (m *SignalGetRoomByGroupIDReply) GetToken() string {
+	if m != nil {
+		return m.Token
+	}
+	return ""
+}
+
+func (m *SignalGetRoomByGroupIDReply) GetRoomID() string {
+	if m != nil {
+		return m.RoomID
+	}
+	return ""
+}
+
+func (m *SignalGetRoomByGroupIDReply) GetLiveURL() string {
+	if m != nil {
+		return m.LiveURL
+	}
+	return ""
+}
+
 type SignalMessageAssembleReq struct {
 	SignalReq            *SignalReq `protobuf:"bytes,1,opt,name=signalReq" json:"signalReq,omitempty"`
 	OperationID          string     `protobuf:"bytes,2,opt,name=operationID" json:"operationID,omitempty"`
@@ -2077,7 +2279,7 @@ func (m *SignalMessageAssembleReq) Reset()         { *m = SignalMessageAssembleR
 func (m *SignalMessageAssembleReq) String() string { return proto.CompactTextString(m) }
 func (*SignalMessageAssembleReq) ProtoMessage()    {}
 func (*SignalMessageAssembleReq) Descriptor() ([]byte, []int) {
-	return fileDescriptor_rtc_2059f33abbeeea7e, []int{24}
+	return fileDescriptor_rtc_91d7dfac542e285c, []int{26}
 }
 func (m *SignalMessageAssembleReq) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SignalMessageAssembleReq.Unmarshal(m, b)
@@ -2125,7 +2327,7 @@ func (m *SignalMessageAssembleResp) Reset()         { *m = SignalMessageAssemble
 func (m *SignalMessageAssembleResp) String() string { return proto.CompactTextString(m) }
 func (*SignalMessageAssembleResp) ProtoMessage()    {}
 func (*SignalMessageAssembleResp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_rtc_2059f33abbeeea7e, []int{25}
+	return fileDescriptor_rtc_91d7dfac542e285c, []int{27}
 }
 func (m *SignalMessageAssembleResp) XXX_Unmarshal(b []byte) error {
 	return xxx_messageInfo_SignalMessageAssembleResp.Unmarshal(m, b)
@@ -2199,6 +2401,8 @@ func init() {
 	proto.RegisterType((*SignalHungUpReply)(nil), "proto.SignalHungUpReply")
 	proto.RegisterType((*SignalRejectReq)(nil), "proto.SignalRejectReq")
 	proto.RegisterType((*SignalRejectReply)(nil), "proto.SignalRejectReply")
+	proto.RegisterType((*SignalGetRoomByGroupIDReq)(nil), "proto.SignalGetRoomByGroupIDReq")
+	proto.RegisterType((*SignalGetRoomByGroupIDReply)(nil), "proto.SignalGetRoomByGroupIDReply")
 	proto.RegisterType((*SignalMessageAssembleReq)(nil), "proto.SignalMessageAssembleReq")
 	proto.RegisterType((*SignalMessageAssembleResp)(nil), "proto.SignalMessageAssembleResp")
 }
@@ -2275,107 +2479,115 @@ var _RtcService_serviceDesc = grpc.ServiceDesc{
 	Metadata: "rtc/rtc.proto",
 }
 
-func init() { proto.RegisterFile("rtc/rtc.proto", fileDescriptor_rtc_2059f33abbeeea7e) }
+func init() { proto.RegisterFile("rtc/rtc.proto", fileDescriptor_rtc_91d7dfac542e285c) }
 
-var fileDescriptor_rtc_2059f33abbeeea7e = []byte{
+var fileDescriptor_rtc_91d7dfac542e285c = []byte{
-	// 1579 bytes of a gzipped FileDescriptorProto
+	// 1697 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x58, 0xcd, 0x6e, 0xdb, 0xc6,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x58, 0xcd, 0x6e, 0xdc, 0x46,
-	0x16, 0xbe, 0x94, 0x2c, 0xdb, 0x3a, 0xf2, 0xef, 0xf8, 0xc6, 0xe0, 0xf5, 0xfd, 0x13, 0x84, 0x20,
+	0x12, 0x5e, 0xce, 0x68, 0x34, 0x9a, 0x1a, 0xfd, 0xb6, 0xd6, 0x02, 0x57, 0xde, 0x9f, 0x01, 0x61,
-	0x10, 0x82, 0x0b, 0xe7, 0x46, 0x45, 0x8a, 0x22, 0x2d, 0x8a, 0x26, 0x76, 0x7e, 0x54, 0xc4, 0xb1,
+	0x18, 0x03, 0x63, 0x21, 0xaf, 0x67, 0xe1, 0xc5, 0xc2, 0xbb, 0x58, 0xac, 0x25, 0xd9, 0xf2, 0x2c,
-	0x31, 0x8e, 0x37, 0xe9, 0x8a, 0xa6, 0xc6, 0xca, 0x24, 0x24, 0x87, 0x1e, 0x0e, 0x9d, 0xf8, 0x05,
+	0x24, 0x4b, 0x68, 0x59, 0x17, 0xef, 0x89, 0xe2, 0xb4, 0xc6, 0xb4, 0x49, 0x36, 0x45, 0x36, 0x65,
-	0xba, 0xee, 0xa6, 0xab, 0x6e, 0x8b, 0xbe, 0x42, 0x77, 0xdd, 0xf4, 0x15, 0x0a, 0xf4, 0x05, 0xb2,
+	0xcf, 0x0b, 0xec, 0x65, 0x0f, 0x09, 0x02, 0xe4, 0x94, 0x6b, 0x90, 0xbc, 0x41, 0x72, 0xcb, 0x25,
-	0xeb, 0xba, 0xfb, 0x62, 0xce, 0x0c, 0xc9, 0x21, 0x2d, 0xa7, 0x29, 0x90, 0x45, 0x91, 0xae, 0xc4,
+	0xaf, 0xe0, 0x47, 0xc8, 0x2d, 0xe7, 0xdc, 0x83, 0xae, 0x6e, 0x92, 0x4d, 0xce, 0x48, 0x96, 0x81,
-	0xf3, 0x37, 0x33, 0xfc, 0xce, 0x37, 0xe7, 0x1c, 0x11, 0x96, 0xa5, 0x0a, 0x6f, 0x48, 0x15, 0x6e,
+	0x00, 0x09, 0x9c, 0xd3, 0x4c, 0x55, 0x57, 0xf5, 0x4f, 0x7d, 0x5f, 0x57, 0x55, 0x13, 0x96, 0x12,
-	0xa7, 0x52, 0x28, 0x41, 0x3a, 0xf8, 0x33, 0xf8, 0x14, 0x60, 0x47, 0xc4, 0xb1, 0x48, 0x28, 0xcb,
+	0xe1, 0xdd, 0x4d, 0x84, 0xb7, 0x15, 0x27, 0x5c, 0x70, 0xd2, 0xc2, 0x1f, 0xe7, 0x5f, 0x00, 0x3b,
-	0x52, 0xe2, 0xc3, 0x02, 0x93, 0x72, 0x47, 0x4c, 0x98, 0xef, 0xf5, 0xbd, 0x61, 0x87, 0x16, 0x22,
+	0x3c, 0x0c, 0x79, 0x44, 0x59, 0x1a, 0x13, 0x1b, 0xda, 0x2c, 0x49, 0x76, 0xf8, 0x88, 0xd9, 0x56,
-	0xd9, 0x84, 0x79, 0x26, 0xe5, 0x5e, 0x36, 0xf5, 0x5b, 0x7d, 0x6f, 0xd8, 0xa5, 0x56, 0x1a, 0x7c,
+	0xcf, 0xea, 0xb7, 0x68, 0x2e, 0x92, 0x0d, 0x98, 0x67, 0x49, 0x72, 0x90, 0x8e, 0xed, 0x46, 0xcf,
-	0xdb, 0x81, 0x85, 0xbd, 0x6c, 0xba, 0x1b, 0xa8, 0x40, 0xfb, 0x64, 0x2c, 0x99, 0x8c, 0x77, 0x31,
+	0xea, 0x77, 0xa8, 0x96, 0x9c, 0xcf, 0x5b, 0xd0, 0x3e, 0x48, 0xc7, 0xbb, 0xae, 0x70, 0xa5, 0x4d,
-	0xb8, 0x4b, 0xad, 0xa4, 0xf5, 0x92, 0x85, 0x67, 0xe3, 0xdd, 0x22, 0xd6, 0x48, 0x7a, 0xb7, 0xa9,
+	0xca, 0xa2, 0xd1, 0x70, 0x17, 0x9d, 0x3b, 0x54, 0x4b, 0x52, 0x9f, 0x30, 0xef, 0x62, 0xb8, 0x9b,
-	0x14, 0x79, 0x3a, 0xde, 0xf5, 0xdb, 0x68, 0x28, 0x44, 0xd2, 0x87, 0x5e, 0x18, 0x71, 0x96, 0xa8,
+	0xfb, 0x2a, 0x49, 0xae, 0x36, 0x4e, 0x78, 0x16, 0x0f, 0x77, 0xed, 0x26, 0x0e, 0xe4, 0x22, 0xe9,
-	0xbd, 0x6c, 0x3a, 0xde, 0xf5, 0xe7, 0xd0, 0xea, 0xaa, 0xb4, 0x47, 0xc6, 0xe4, 0x19, 0x93, 0xc6,
+	0x41, 0xd7, 0x0b, 0x7c, 0x16, 0x89, 0x83, 0x74, 0x3c, 0xdc, 0xb5, 0xe7, 0x70, 0xd4, 0x54, 0x49,
-	0xa3, 0x63, 0x3c, 0x1c, 0x15, 0xb9, 0x0e, 0x6b, 0x7a, 0x7f, 0x26, 0x0f, 0xa2, 0x40, 0x9d, 0x08,
+	0x8b, 0x94, 0x25, 0x17, 0x2c, 0x51, 0x16, 0x2d, 0x65, 0x61, 0xa8, 0xc8, 0x1d, 0x58, 0x95, 0xeb,
-	0x19, 0x8f, 0x77, 0xfd, 0x79, 0x7c, 0xa9, 0x0b, 0x7a, 0x72, 0x0d, 0x56, 0x8c, 0xee, 0x31, 0x0f,
+	0xb3, 0xe4, 0x28, 0x70, 0xc5, 0x19, 0x4f, 0xc2, 0xe1, 0xae, 0x3d, 0x8f, 0x87, 0x9a, 0xd2, 0x93,
-	0x5f, 0x24, 0x41, 0xcc, 0xfc, 0x05, 0x5c, 0xb0, 0xa1, 0x25, 0x57, 0x61, 0xd9, 0x68, 0xee, 0x07,
+	0xdb, 0xb0, 0xac, 0x74, 0x4f, 0x7d, 0xef, 0x55, 0xe4, 0x86, 0xcc, 0x6e, 0xe3, 0x84, 0x35, 0x2d,
-	0x21, 0x3b, 0xa2, 0x8f, 0xfc, 0x45, 0x74, 0xab, 0x2b, 0xcd, 0xd9, 0xb2, 0x8c, 0x8b, 0xe4, 0xc9,
+	0xb9, 0x05, 0x4b, 0x4a, 0xf3, 0xd8, 0xf5, 0xd8, 0x09, 0xdd, 0xb7, 0x17, 0xd0, 0xac, 0xaa, 0x54,
-	0x79, 0xca, 0xfc, 0x2e, 0x6e, 0xea, 0xaa, 0xf4, 0x9b, 0xc7, 0xd9, 0xf4, 0xbe, 0x14, 0xb1, 0x0f,
+	0x7b, 0x4b, 0x53, 0x9f, 0x47, 0xcf, 0x26, 0x31, 0xb3, 0x3b, 0xb8, 0xa8, 0xa9, 0x92, 0x27, 0x0f,
-	0x06, 0x67, 0x2b, 0xe2, 0x9b, 0x8b, 0x44, 0xb1, 0x44, 0x61, 0x6c, 0xcf, 0xc4, 0x3a, 0x2a, 0x1d,
+	0xd3, 0xf1, 0xe3, 0x84, 0x87, 0x36, 0xa8, 0x38, 0x6b, 0x11, 0x4f, 0xce, 0x23, 0xc1, 0x22, 0x81,
-	0x6b, 0x45, 0x7f, 0xa9, 0xef, 0x0d, 0x97, 0x68, 0x21, 0x92, 0x35, 0x68, 0x67, 0xec, 0xd4, 0x5f,
+	0xbe, 0x5d, 0xe5, 0x6b, 0xa8, 0xa4, 0xaf, 0x16, 0xed, 0xc5, 0x9e, 0xd5, 0x5f, 0xa4, 0xb9, 0x48,
-	0xe9, 0x7b, 0xc3, 0x65, 0xaa, 0x1f, 0xc9, 0x16, 0x2c, 0xea, 0xa3, 0x3d, 0xe1, 0x31, 0xf3, 0x57,
+	0x56, 0xa1, 0x99, 0xb2, 0x73, 0x7b, 0xb9, 0x67, 0xf5, 0x97, 0xa8, 0xfc, 0x4b, 0x36, 0x61, 0x41,
-	0xfb, 0xde, 0xb0, 0x4d, 0x4b, 0x99, 0xfc, 0x07, 0x20, 0x94, 0x2c, 0x50, 0x0c, 0xad, 0x6b, 0x68,
+	0x6e, 0xed, 0x99, 0x1f, 0x32, 0x7b, 0xa5, 0x67, 0xf5, 0x9b, 0xb4, 0x90, 0xc9, 0x1f, 0x01, 0xbc,
-	0x75, 0x34, 0x98, 0x4d, 0x15, 0xa8, 0x3c, 0xf3, 0xd7, 0xf1, 0x10, 0x56, 0x22, 0xb7, 0x60, 0x41,
+	0x84, 0xb9, 0x82, 0xe1, 0xe8, 0x2a, 0x8e, 0x1a, 0x1a, 0x44, 0x53, 0xb8, 0x22, 0x4b, 0xed, 0x35,
-	0xa4, 0x8a, 0x8b, 0x24, 0xf3, 0x49, 0xbf, 0x3d, 0xec, 0x8d, 0xfe, 0x69, 0x18, 0xb5, 0x6d, 0x69,
+	0xdc, 0x84, 0x96, 0xc8, 0x7d, 0x68, 0xf3, 0x58, 0xf8, 0x3c, 0x4a, 0x6d, 0xd2, 0x6b, 0xf6, 0xbb,
-	0xb0, 0xbd, 0x6f, 0xac, 0xf7, 0x12, 0x25, 0xcf, 0x69, 0xe1, 0x4b, 0x3e, 0x83, 0x55, 0x71, 0x72,
+	0x83, 0x9b, 0x8a, 0x51, 0x5b, 0x9a, 0x06, 0x5b, 0x87, 0x6a, 0xf4, 0x51, 0x24, 0x92, 0x09, 0xcd,
-	0x12, 0xf1, 0x84, 0x1d, 0xe4, 0xd9, 0xb3, 0x71, 0x72, 0x22, 0xfc, 0x8d, 0xbe, 0x37, 0xec, 0x8d,
+	0x6d, 0xc9, 0xbf, 0x61, 0x85, 0x9f, 0x9d, 0x05, 0x7e, 0xc4, 0x8e, 0xb2, 0xf4, 0xc5, 0x30, 0x3a,
-	0x36, 0x6d, 0xf8, 0x7e, 0xdd, 0x4a, 0x9b, 0xee, 0x5b, 0xb7, 0x61, 0xc9, 0x5d, 0x5a, 0xbf, 0xee,
+	0xe3, 0xf6, 0x7a, 0xcf, 0xea, 0x77, 0x07, 0x1b, 0xda, 0xfd, 0xb0, 0x3a, 0x4a, 0xeb, 0xe6, 0x9b,
-	0x0b, 0x76, 0x6e, 0xb9, 0xa6, 0x1f, 0xc9, 0xdf, 0xa1, 0x73, 0x16, 0x44, 0x39, 0x43, 0x9e, 0x2d,
+	0x0f, 0x60, 0xd1, 0x9c, 0x5a, 0x1e, 0xf7, 0x15, 0x9b, 0x68, 0xae, 0xc9, 0xbf, 0xe4, 0xb7, 0xd0,
-	0x52, 0x23, 0xdc, 0x6e, 0x7d, 0xe4, 0x0d, 0x7e, 0x6d, 0x41, 0xf7, 0x01, 0x92, 0x2b, 0x39, 0x11,
+	0xba, 0x70, 0x83, 0x8c, 0x21, 0xcf, 0x16, 0xa8, 0x12, 0x1e, 0x34, 0xfe, 0x6e, 0x39, 0x3f, 0x34,
-	0x2e, 0xf1, 0xbc, 0x3a, 0xf1, 0xfe, 0x05, 0x5d, 0x7c, 0x7c, 0xac, 0x39, 0x60, 0xd8, 0x5a, 0x29,
+	0xa0, 0xb3, 0x87, 0xe4, 0x8a, 0xce, 0xb8, 0x49, 0x3c, 0xab, 0x4a, 0xbc, 0xdf, 0x43, 0x07, 0xff,
-	0xc8, 0x00, 0x96, 0x12, 0xa1, 0xf8, 0x09, 0x0f, 0x03, 0x7d, 0x0e, 0xcb, 0xda, 0x9a, 0x4e, 0xfb,
+	0x3e, 0x95, 0x1c, 0x50, 0x6c, 0x2d, 0x15, 0xc4, 0x81, 0xc5, 0x88, 0x0b, 0xff, 0xcc, 0xf7, 0x5c,
-	0xf0, 0x44, 0x49, 0x31, 0xc9, 0x43, 0xf4, 0x31, 0xdc, 0xad, 0xe9, 0xf4, 0xfe, 0x27, 0x96, 0x40,
+	0xb9, 0x0f, 0xcd, 0xda, 0x8a, 0x4e, 0xda, 0xf8, 0x91, 0x48, 0xf8, 0x28, 0xf3, 0xd0, 0x46, 0x71,
-	0x86, 0xb8, 0x85, 0xa8, 0xd3, 0x2f, 0x5e, 0x26, 0x4c, 0x1e, 0x65, 0x4c, 0x5a, 0xbe, 0x76, 0xa9,
+	0xb7, 0xa2, 0x93, 0xeb, 0x9f, 0x69, 0x02, 0x29, 0xe2, 0xe6, 0xa2, 0x84, 0x9f, 0xbf, 0x8e, 0x58,
-	0xab, 0x6a, 0xa4, 0x6d, 0x01, 0x73, 0xed, 0xa6, 0xad, 0x0f, 0xbd, 0x98, 0xc5, 0xc7, 0x4c, 0xee,
+	0x72, 0x92, 0xb2, 0x44, 0xf3, 0xb5, 0x43, 0x4d, 0x55, 0x0d, 0xb6, 0x36, 0x62, 0x6d, 0xc2, 0xd6,
-	0x88, 0x3c, 0x51, 0x48, 0xd0, 0x65, 0xea, 0xaa, 0xc8, 0x0a, 0xb4, 0xd8, 0x2b, 0x64, 0x65, 0x97,
+	0x83, 0x6e, 0xc8, 0xc2, 0x53, 0x96, 0xec, 0xf0, 0x2c, 0x12, 0x48, 0xd0, 0x25, 0x6a, 0xaa, 0xc8,
-	0xb6, 0xd8, 0x2b, 0x27, 0xd1, 0x50, 0x4b, 0xf4, 0x55, 0x58, 0xc6, 0x75, 0x45, 0x71, 0x9a, 0x9e,
+	0x32, 0x34, 0xd8, 0x1b, 0x64, 0x65, 0x87, 0x36, 0xd8, 0x1b, 0x03, 0x68, 0xa8, 0x00, 0x7d, 0x0b,
-	0x21, 0x7b, 0x4d, 0x59, 0x22, 0x86, 0x74, 0x5d, 0xc2, 0x05, 0x2a, 0xc5, 0xe0, 0xfb, 0x16, 0x6c,
+	0x96, 0x70, 0x5e, 0x9e, 0xef, 0xa6, 0xab, 0xc8, 0x5e, 0x51, 0x16, 0x11, 0x43, 0xba, 0x2e, 0xe2,
-	0x20, 0xee, 0x7b, 0x78, 0x80, 0xfb, 0x79, 0x14, 0xfd, 0x4e, 0x06, 0x36, 0x61, 0x3e, 0x37, 0xdb,
+	0x04, 0xa5, 0xc2, 0xf9, 0xba, 0x01, 0xeb, 0x18, 0xf7, 0x03, 0xdc, 0xc0, 0xe3, 0x2c, 0x08, 0xde,
-	0xd9, 0x62, 0x91, 0x97, 0xfb, 0x48, 0x11, 0xb1, 0x47, 0xec, 0x8c, 0x45, 0x08, 0x7c, 0x87, 0x56,
+	0x81, 0xc0, 0x06, 0xcc, 0x67, 0x6a, 0x39, 0x9d, 0x2c, 0xb2, 0x62, 0x9d, 0x84, 0x07, 0x6c, 0x9f,
-	0x0a, 0x4d, 0xf4, 0xe7, 0x82, 0x27, 0x88, 0xc9, 0x1c, 0x1a, 0x4b, 0x59, 0xdb, 0x92, 0xe2, 0x5a,
+	0x5d, 0xb0, 0x00, 0x03, 0xdf, 0xa2, 0xa5, 0x42, 0x12, 0xfd, 0x25, 0xf7, 0x23, 0x8c, 0xc9, 0x1c,
-	0x1b, 0xb8, 0x4b, 0xd9, 0xcd, 0xc4, 0x7c, 0x3d, 0x13, 0xd7, 0x60, 0x25, 0x48, 0xd3, 0xbd, 0x20,
+	0x0e, 0x16, 0xb2, 0x1c, 0x8b, 0xf2, 0x6b, 0xad, 0xc2, 0x5d, 0xc8, 0x26, 0x12, 0xf3, 0x55, 0x24,
-	0x99, 0x32, 0x69, 0x36, 0x5d, 0xc0, 0x75, 0x1b, 0x5a, 0x9d, 0x0f, 0xbd, 0xd3, 0xa1, 0xc8, 0x65,
+	0x6e, 0xc3, 0xb2, 0x1b, 0xc7, 0x07, 0x6e, 0x34, 0x66, 0x89, 0x5a, 0xb4, 0x8d, 0xf3, 0xd6, 0xb4,
-	0xc8, 0x10, 0xee, 0x0e, 0x75, 0x34, 0x7a, 0x1d, 0x91, 0x32, 0xe9, 0xc0, 0x68, 0x90, 0x6f, 0x68,
+	0x12, 0x0f, 0xb9, 0xd2, 0x31, 0xcf, 0x12, 0x8f, 0x61, 0xb8, 0x5b, 0xd4, 0xd0, 0xc8, 0x79, 0x78,
-	0x6d, 0x56, 0xa0, 0xc8, 0xca, 0xe0, 0x07, 0x0f, 0x36, 0x0e, 0x02, 0xa9, 0x78, 0xc8, 0xd3, 0x20,
+	0xcc, 0x12, 0x23, 0x8c, 0x2a, 0xf2, 0x35, 0xad, 0x46, 0x05, 0x72, 0x54, 0x9c, 0x6f, 0x2c, 0x58,
-	0x51, 0x7b, 0x4c, 0x05, 0x58, 0x64, 0xb7, 0x2d, 0xde, 0x78, 0x83, 0x3c, 0xbc, 0x41, 0x6b, 0xf6,
+	0x3f, 0x72, 0x13, 0xe1, 0x7b, 0x7e, 0xec, 0x46, 0xe2, 0x80, 0x09, 0x17, 0x93, 0xec, 0x96, 0x8e,
-	0x06, 0x95, 0x04, 0xa7, 0x95, 0x0b, 0xd9, 0x85, 0xd5, 0x69, 0x95, 0x00, 0x8c, 0x6a, 0x61, 0xd4,
+	0x37, 0xde, 0x20, 0x0b, 0x6f, 0xd0, 0xaa, 0xbe, 0x41, 0x05, 0xc1, 0x69, 0x69, 0x42, 0x76, 0x61,
-	0x96, 0x1b, 0x55, 0x4f, 0x0f, 0x6d, 0x86, 0x90, 0x9b, 0xb0, 0x88, 0x79, 0xd0, 0xe1, 0x6d, 0x0c,
+	0x65, 0x5c, 0x02, 0x80, 0x5e, 0x0d, 0xf4, 0xda, 0x34, 0xbd, 0xaa, 0xf0, 0xd0, 0xba, 0x0b, 0xb9,
-	0xbf, 0x62, 0xc3, 0x0f, 0xf2, 0xe3, 0x88, 0x87, 0x47, 0xd6, 0x48, 0x4b, 0xb7, 0xc1, 0x97, 0x1e,
+	0x07, 0x0b, 0x88, 0x83, 0x74, 0x6f, 0xa2, 0xfb, 0x0d, 0xed, 0x7e, 0x94, 0x9d, 0x06, 0xbe, 0x77,
-	0xac, 0xd4, 0x8d, 0x4e, 0x6e, 0xbd, 0x5a, 0x6e, 0xdd, 0x0c, 0xb5, 0x2e, 0xcf, 0x50, 0xbb, 0x9e,
+	0xa2, 0x07, 0x69, 0x61, 0xe6, 0xfc, 0xcf, 0x82, 0xe5, 0xea, 0xa0, 0x81, 0xad, 0x55, 0xc1, 0xd6,
-	0xa1, 0x4d, 0x98, 0x9f, 0x62, 0xdd, 0xb5, 0x19, 0xb7, 0x92, 0x45, 0xb2, 0x53, 0x22, 0xf9, 0x8d,
+	0x44, 0xa8, 0x71, 0x39, 0x42, 0xcd, 0x2a, 0x42, 0x1b, 0x30, 0x3f, 0xc6, 0xbc, 0xab, 0x11, 0xd7,
-	0x07, 0xab, 0x0f, 0x98, 0xfa, 0x5c, 0xf3, 0x41, 0xbc, 0x60, 0x09, 0x65, 0xa7, 0x84, 0xc0, 0x9c,
+	0x92, 0x8e, 0x64, 0xab, 0x88, 0xe4, 0x67, 0x16, 0xac, 0xec, 0x31, 0xf1, 0x1f, 0xc9, 0x07, 0xfe,
-	0x14, 0x22, 0xb6, 0xe7, 0xc0, 0x67, 0x7d, 0x0a, 0x3e, 0x61, 0x89, 0xe2, 0xea, 0xbc, 0x38, 0x45,
+	0x8a, 0x45, 0x94, 0x9d, 0x13, 0x02, 0x73, 0x09, 0xe7, 0xa1, 0xde, 0x07, 0xfe, 0x97, 0xbb, 0xf0,
-	0x21, 0x93, 0x0f, 0x61, 0x31, 0xb6, 0x19, 0xb0, 0xef, 0x5f, 0xc0, 0x37, 0x23, 0x47, 0xb4, 0xf4,
+	0x47, 0x2c, 0x12, 0xbe, 0x98, 0xe4, 0xbb, 0xc8, 0x65, 0xf2, 0x37, 0x58, 0x08, 0x35, 0x02, 0xfa,
-	0xc5, 0xfb, 0x8c, 0x79, 0xe6, 0x22, 0xa9, 0x1a, 0x99, 0xa3, 0x1a, 0x9c, 0xc2, 0x5a, 0xfd, 0x70,
+	0xfc, 0x79, 0xf8, 0x66, 0x60, 0x44, 0x0b, 0x5b, 0xbc, 0xcf, 0x88, 0xb3, 0xcf, 0xa3, 0xb2, 0x90,
-	0x59, 0x4a, 0x6e, 0xba, 0x4d, 0xd9, 0x26, 0x79, 0xdd, 0xee, 0x57, 0x19, 0xa8, 0xdb, 0xb9, 0xd7,
+	0x19, 0x2a, 0xe7, 0x1c, 0x56, 0xab, 0x9b, 0x4b, 0x63, 0x72, 0xcf, 0x2c, 0xca, 0x1a, 0xe4, 0x35,
-	0xa0, 0xfd, 0xfc, 0xa5, 0xb2, 0xe7, 0xd6, 0x8f, 0x1a, 0xb8, 0x88, 0x9f, 0xb9, 0xc0, 0x59, 0x71,
+	0xbd, 0x5e, 0x39, 0x40, 0xcd, 0xca, 0xbd, 0x0a, 0xcd, 0x97, 0xaf, 0x85, 0xde, 0xb7, 0xfc, 0x2b,
-	0xf0, 0xb5, 0x07, 0xab, 0x8d, 0x6a, 0xab, 0x4b, 0xa7, 0xe2, 0x2a, 0x62, 0x16, 0x11, 0x23, 0x68,
+	0x03, 0x17, 0xf8, 0x17, 0x66, 0xe0, 0xb4, 0xe8, 0x7c, 0x6a, 0xc1, 0x4a, 0x2d, 0xdb, 0xca, 0xd4,
-	0x98, 0x26, 0x2c, 0x0b, 0xed, 0xb2, 0xf8, 0x6c, 0xe1, 0x6d, 0x97, 0xe5, 0x43, 0x17, 0xbc, 0xfd,
+	0x29, 0x7c, 0x11, 0x30, 0x1d, 0x11, 0x25, 0xc8, 0x30, 0x8d, 0x58, 0xea, 0xe9, 0x69, 0xf1, 0xbf,
-	0x43, 0xbd, 0xd0, 0xa1, 0xc8, 0x93, 0x49, 0x59, 0xf0, 0x1c, 0x9d, 0x2e, 0x25, 0x7c, 0xff, 0xf0,
+	0x0e, 0x6f, 0xb3, 0x48, 0x1f, 0x32, 0xe1, 0x1d, 0x1e, 0xcb, 0x89, 0x8e, 0x79, 0x16, 0x8d, 0x8a,
-	0x6e, 0x30, 0x99, 0x32, 0x53, 0x96, 0x3a, 0x58, 0xa0, 0xeb, 0xca, 0xc1, 0xcf, 0x2d, 0xe8, 0x1e,
+	0x84, 0x67, 0xe8, 0x64, 0x2a, 0xf1, 0x0f, 0x8f, 0xb7, 0xdd, 0xd1, 0x98, 0xa9, 0xb4, 0xd4, 0xc2,
-	0xf2, 0x69, 0x12, 0x44, 0x3a, 0x45, 0xff, 0x87, 0x79, 0x9e, 0x9c, 0x71, 0xc5, 0x2c, 0x00, 0x45,
+	0x04, 0x5d, 0x55, 0x3a, 0x5f, 0x36, 0xa1, 0x73, 0xec, 0x8f, 0x23, 0x37, 0x90, 0x10, 0xfd, 0x05,
-	0x9f, 0x30, 0x1e, 0x63, 0x34, 0x51, 0x76, 0xfa, 0xf0, 0x6f, 0xd4, 0xfa, 0x91, 0x7b, 0xb0, 0x6c,
+	0xe6, 0xfd, 0xe8, 0xc2, 0x17, 0x4c, 0x07, 0x20, 0xaf, 0x13, 0xca, 0x62, 0x88, 0x43, 0x94, 0x9d,
-	0x9e, 0xc6, 0x09, 0x92, 0xda, 0x12, 0xfd, 0xdf, 0x33, 0x02, 0xad, 0x87, 0x89, 0xaf, 0x47, 0xe9,
+	0x3f, 0xf9, 0x0d, 0xd5, 0x76, 0xe4, 0x11, 0x2c, 0xa9, 0x7f, 0xc3, 0x08, 0x49, 0xad, 0x89, 0xfe,
-	0x8d, 0xc3, 0x20, 0x09, 0x6d, 0x99, 0x69, 0x6e, 0xbc, 0x83, 0x26, 0xbb, 0xb1, 0xf1, 0xd3, 0x11,
+	0x87, 0x19, 0x8e, 0xda, 0x42, 0xf9, 0x57, 0xbd, 0xe4, 0xc2, 0x9e, 0x1b, 0x79, 0x3a, 0xcd, 0xd4,
-	0x41, 0x18, 0xb2, 0x54, 0xe1, 0xcb, 0x37, 0x23, 0xee, 0xa0, 0xc9, 0x46, 0x18, 0x3f, 0x1d, 0xf1,
+	0x17, 0xde, 0xc1, 0x21, 0xbd, 0xb0, 0xb2, 0x93, 0x1e, 0xae, 0xe7, 0xb1, 0x58, 0xe0, 0xe1, 0xeb,
-	0x2c, 0x4f, 0xa6, 0x47, 0x29, 0x22, 0xd1, 0x8c, 0x78, 0x88, 0x26, 0x1b, 0x61, 0xfc, 0x74, 0x84,
+	0x1e, 0x0f, 0x71, 0x48, 0x7b, 0x28, 0x3b, 0xe9, 0xf1, 0x22, 0x8b, 0xc6, 0x27, 0x31, 0x46, 0xa2,
-	0x64, 0xcf, 0x59, 0xa8, 0xb0, 0x50, 0x35, 0x23, 0x28, 0x9a, 0x6c, 0x84, 0xf1, 0xbb, 0xdb, 0x85,
+	0xee, 0xf1, 0x04, 0x87, 0xb4, 0x87, 0xb2, 0x93, 0x1e, 0x09, 0x7b, 0xc9, 0x3c, 0x81, 0x89, 0xaa,
-	0x85, 0x34, 0x38, 0x8f, 0x44, 0x30, 0x19, 0xbc, 0x6e, 0x01, 0x14, 0x8e, 0x59, 0x4a, 0x46, 0x0d,
+	0xee, 0x41, 0x71, 0x48, 0x7b, 0x28, 0x3b, 0xf2, 0x14, 0x99, 0x45, 0x39, 0x0f, 0xb7, 0x27, 0x7b,
-	0x68, 0xfd, 0x99, 0xd0, 0xa6, 0xd1, 0xb9, 0x03, 0xee, 0x83, 0xd9, 0xe0, 0xfe, 0xf7, 0x4d, 0xe0,
+	0x3a, 0xd9, 0xb6, 0xd1, 0xb7, 0x57, 0xf1, 0xad, 0x1b, 0xa9, 0x59, 0xa6, 0x7c, 0xb7, 0x3b, 0xd0,
-	0x9a, 0x15, 0x1a, 0xf0, 0x8e, 0x1a, 0xf0, 0xfa, 0x33, 0xe1, 0xb5, 0x9b, 0x5b, 0x80, 0x47, 0x0d,
+	0x8e, 0xdd, 0x49, 0xc0, 0xdd, 0x91, 0xf3, 0x55, 0x13, 0x20, 0x5f, 0x38, 0x8d, 0xc9, 0xa0, 0x06,
-	0x80, 0xfd, 0x99, 0x00, 0xdb, 0x18, 0x0b, 0xf1, 0xa8, 0x01, 0xb1, 0x3f, 0x13, 0x62, 0x1b, 0x63,
+	0x95, 0x3d, 0x13, 0xaa, 0x38, 0x98, 0x18, 0x60, 0xed, 0xcd, 0x06, 0xeb, 0x4f, 0x57, 0x81, 0xa5,
-	0x41, 0x1e, 0x35, 0x40, 0xf6, 0x67, 0x82, 0x6c, 0x63, 0x2e, 0xc2, 0xfc, 0x53, 0x0b, 0x56, 0x10,
+	0x66, 0xa8, 0xc1, 0x35, 0xa8, 0xc1, 0x65, 0xcf, 0x84, 0x4b, 0x2f, 0xae, 0x01, 0x1b, 0xd4, 0x00,
-	0x02, 0x73, 0xb9, 0xf5, 0xbd, 0xba, 0x5a, 0xc0, 0x56, 0x54, 0x7f, 0x73, 0xbf, 0xea, 0x4a, 0xf2,
+	0xb3, 0x67, 0x02, 0xa6, 0x7d, 0x34, 0x64, 0x83, 0x1a, 0x64, 0xf6, 0x4c, 0xc8, 0xb4, 0x8f, 0x06,
-	0x3f, 0x58, 0x37, 0x0a, 0x66, 0x14, 0x8f, 0x78, 0xa6, 0xef, 0x72, 0x7b, 0xd8, 0xa5, 0x17, 0x0d,
+	0x6d, 0x50, 0x03, 0xcd, 0x9e, 0x09, 0x9a, 0xf6, 0xd1, 0xb0, 0x1d, 0x5d, 0x0a, 0x9b, 0xf3, 0x0e,
-	0x38, 0x02, 0xe4, 0x99, 0x12, 0x71, 0x59, 0x8e, 0xba, 0xd4, 0xd1, 0xb8, 0xcd, 0x75, 0xee, 0x42,
+	0xd8, 0xd4, 0x3c, 0x57, 0x02, 0xf7, 0xb6, 0x01, 0xcb, 0x18, 0x54, 0x95, 0x7e, 0xe4, 0xcd, 0xbf,
-	0x73, 0xd5, 0xa5, 0xae, 0x1c, 0x98, 0xad, 0xa4, 0x23, 0x14, 0x8f, 0x99, 0xc8, 0x95, 0x1d, 0x91,
+	0x95, 0x03, 0x91, 0xd7, 0x27, 0x95, 0x01, 0xaa, 0x4a, 0xf2, 0x67, 0x58, 0x53, 0x0a, 0xa6, 0x14,
-	0x0b, 0x51, 0xb7, 0xdd, 0x98, 0x4d, 0x78, 0x80, 0xed, 0xdd, 0x0c, 0xc5, 0x95, 0x42, 0x9f, 0x24,
+	0xfb, 0x7e, 0x2a, 0xb3, 0x4d, 0xb3, 0xdf, 0xa1, 0xd3, 0x03, 0xd8, 0xa4, 0x64, 0xa9, 0xe0, 0x61,
-	0xad, 0xa6, 0x6b, 0xdb, 0xfc, 0x2a, 0xcd, 0x5b, 0x4c, 0xc2, 0x38, 0x2e, 0x71, 0xc5, 0x8b, 0x81,
+	0x91, 0x30, 0x3b, 0xd4, 0xd0, 0x98, 0xe5, 0x7f, 0x6e, 0xaa, 0xfc, 0xcb, 0x64, 0x5c, 0xb4, 0xf4,
-	0xc6, 0x8c, 0x20, 0x35, 0xdd, 0xe0, 0xb5, 0x07, 0xab, 0x8d, 0x5b, 0xaf, 0x8b, 0xb5, 0x48, 0x6b,
+	0x5a, 0x92, 0x1e, 0xc2, 0x0f, 0x19, 0xcf, 0x84, 0x6e, 0xe2, 0x73, 0x51, 0x36, 0x06, 0x21, 0x1b,
-	0x90, 0x96, 0x32, 0xb9, 0x05, 0xc0, 0xcb, 0x2c, 0x58, 0x9e, 0x16, 0xed, 0xaa, 0x9e, 0x1e, 0xea,
+	0xf9, 0x2e, 0x36, 0x20, 0xaa, 0x6d, 0x2f, 0x15, 0x72, 0x27, 0x71, 0xd9, 0xff, 0xeb, 0xf2, 0x5c,
-	0x38, 0xce, 0x9a, 0x50, 0xdb, 0x7f, 0x68, 0x42, 0x25, 0x9f, 0x40, 0x2f, 0xad, 0xda, 0x81, 0xe5,
+	0x6a, 0xae, 0xd1, 0xab, 0x63, 0x43, 0xe7, 0x0b, 0x3f, 0x6f, 0xb9, 0x54, 0x93, 0x54, 0xd1, 0x39,
-	0xea, 0x9b, 0x1a, 0x85, 0xeb, 0x3e, 0xf8, 0x02, 0xd6, 0x2f, 0x5c, 0x40, 0xac, 0xcb, 0xba, 0x2f,
+	0xdf, 0x59, 0xb0, 0x52, 0xcb, 0x4b, 0xb2, 0x9c, 0xf0, 0xb8, 0x12, 0xd2, 0x42, 0x26, 0xf7, 0x01,
-	0x94, 0x75, 0x59, 0x0b, 0x4e, 0x1e, 0x5b, 0xcd, 0x3c, 0x5e, 0x52, 0xf3, 0x7f, 0xf1, 0x60, 0x73,
+	0xfc, 0x02, 0x05, 0xcd, 0xfc, 0xbc, 0xa0, 0x56, 0xe1, 0xa1, 0x86, 0xe1, 0xac, 0x1e, 0xba, 0xf9,
-	0x76, 0x01, 0x7c, 0x1f, 0xa1, 0x3c, 0x06, 0xff, 0xb2, 0x82, 0xf4, 0xce, 0x10, 0xad, 0x58, 0x59,
+	0x5e, 0x3d, 0x34, 0xf9, 0x27, 0x74, 0xe3, 0xb2, 0x60, 0x69, 0xf6, 0x5f, 0x55, 0xca, 0x4c, 0x73,
-	0xb6, 0x84, 0xf7, 0x11, 0xca, 0x8d, 0x82, 0x95, 0x4e, 0x65, 0x1e, 0x7c, 0xd5, 0x2a, 0xde, 0xbd,
+	0xe7, 0xff, 0x16, 0xac, 0x4d, 0xdd, 0x69, 0x2c, 0x1d, 0xb2, 0x74, 0x15, 0xa5, 0x43, 0x0a, 0x06,
-	0x6c, 0x6e, 0xef, 0xe1, 0xbb, 0x93, 0xeb, 0xb0, 0x66, 0x5e, 0xc1, 0xf9, 0x84, 0xd0, 0x31, 0x9f,
+	0x90, 0x8d, 0x3a, 0x90, 0xb3, 0xcb, 0x12, 0xd9, 0x02, 0x72, 0x9a, 0xa5, 0x93, 0x7d, 0x3f, 0x32,
-	0x10, 0x9a, 0xfa, 0xea, 0xf6, 0x3a, 0xdd, 0xe8, 0x9d, 0x71, 0xed, 0xbb, 0x92, 0x6b, 0xe5, 0x68,
+	0x39, 0x36, 0x87, 0x1c, 0x9b, 0x31, 0xe2, 0x7c, 0x6f, 0xc1, 0xc6, 0xec, 0x9c, 0xfe, 0x21, 0xc6,
-	0xf0, 0xa7, 0xc4, 0xbb, 0x62, 0x8b, 0xd3, 0x5f, 0x1d, 0xb6, 0x94, 0x63, 0xca, 0x5f, 0x9d, 0x2d,
+	0xfe, 0x13, 0x0b, 0xec, 0xcb, 0x92, 0xe2, 0xcf, 0x06, 0x41, 0xc9, 0xfb, 0xa2, 0x2c, 0x7e, 0x88,
-	0x25, 0x4e, 0xce, 0x4c, 0x31, 0x88, 0x8a, 0xaa, 0xb5, 0xc7, 0xb2, 0x2c, 0x98, 0xb2, 0x3b, 0x59,
+	0xb1, 0x5f, 0xcf, 0x69, 0x6f, 0x54, 0x13, 0xe7, 0xe3, 0x46, 0x7e, 0xf6, 0xa2, 0xc0, 0x7f, 0x80,
-	0xc6, 0xe2, 0xe3, 0x08, 0xfb, 0xdd, 0x36, 0x74, 0xb3, 0x62, 0x34, 0x6e, 0xfc, 0xed, 0x2b, 0x47,
+	0x67, 0x27, 0x77, 0x60, 0x55, 0x1d, 0xc1, 0xf8, 0x8c, 0xd2, 0x52, 0x9f, 0x51, 0xea, 0x7a, 0xe7,
-	0x66, 0x5a, 0xb9, 0x34, 0xff, 0x78, 0xb4, 0x2e, 0xfe, 0xf1, 0xf8, 0xd1, 0x83, 0x7f, 0x5c, 0xb2,
+	0xbf, 0x79, 0x9c, 0x8c, 0x0a, 0xfa, 0x53, 0x71, 0xd3, 0xf9, 0xa2, 0xe0, 0x5a, 0xd1, 0x1e, 0xfd,
-	0x9d, 0xf9, 0x0b, 0x12, 0xbe, 0xcd, 0x5f, 0x90, 0xca, 0x49, 0xd3, 0x9a, 0x67, 0x07, 0x41, 0x96,
+	0x22, 0xe3, 0x5d, 0xb2, 0xc5, 0xe8, 0x09, 0x0c, 0xb6, 0x14, 0xad, 0xda, 0xaf, 0x9d, 0x2d, 0x45,
-	0xd9, 0xcf, 0x2f, 0x56, 0xd2, 0x4b, 0x65, 0xe5, 0xec, 0x69, 0x53, 0xb2, 0xde, 0x38, 0xbb, 0x5e,
+	0x9c, 0x8c, 0x3e, 0xc8, 0xf9, 0xc8, 0x82, 0xdf, 0x5d, 0xda, 0x96, 0x5e, 0x19, 0x31, 0xa3, 0xa7,
-	0xaa, 0x72, 0x22, 0x43, 0xfc, 0x3e, 0x86, 0xe3, 0x8d, 0x49, 0xc2, 0x4a, 0xfd, 0x1b, 0x13, 0x2d,
+	0x68, 0x54, 0x7b, 0x8a, 0xda, 0x91, 0x9a, 0xef, 0x77, 0xf9, 0xdf, 0x5a, 0x70, 0xf3, 0x8a, 0x8e,
-	0xcc, 0xa3, 0x67, 0x00, 0x54, 0x85, 0x87, 0x4c, 0x9e, 0xf1, 0x90, 0x91, 0xa7, 0x70, 0x65, 0xe6,
+	0xab, 0x86, 0x94, 0x75, 0x5d, 0xa4, 0xcc, 0x17, 0x65, 0x03, 0xbf, 0xa3, 0x5d, 0xef, 0x45, 0x59,
-	0x2b, 0x91, 0xfa, 0x98, 0x7a, 0x11, 0xdf, 0xad, 0xfe, 0x9b, 0x1d, 0xb2, 0xf4, 0x6e, 0xef, 0x69,
+	0x5c, 0xa7, 0xe6, 0xec, 0xeb, 0x34, 0x77, 0xd9, 0x75, 0x6a, 0x55, 0xaf, 0x53, 0x90, 0x97, 0x93,
-	0x77, 0xfb, 0x86, 0x54, 0xe1, 0xc7, 0x52, 0x85, 0xc7, 0xf3, 0xe8, 0xfd, 0xc1, 0x6f, 0x01, 0x00,
+	0x03, 0x96, 0xa6, 0xee, 0x98, 0x3d, 0x4c, 0x53, 0x16, 0x9e, 0x06, 0xd8, 0xba, 0x6c, 0x41, 0x27,
-	0x00, 0xff, 0xff, 0xcb, 0x87, 0xc7, 0x8b, 0x55, 0x15, 0x00, 0x00,
+	0xcd, 0xdf, 0x61, 0xb5, 0x6f, 0x0c, 0xc5, 0xfb, 0x8c, 0x96, 0x26, 0xf5, 0x57, 0x6e, 0x63, 0xfa,
+	0x95, 0xfb, 0x6d, 0x01, 0xeb, 0xd4, 0x72, 0xea, 0xbd, 0xeb, 0x5d, 0xe7, 0xbd, 0x5b, 0x1a, 0xc9,
+	0x03, 0xfb, 0xe9, 0x91, 0x9b, 0xa6, 0xfa, 0x5b, 0x9f, 0x96, 0xe4, 0x54, 0x69, 0xf1, 0x30, 0xd1,
+	0x50, 0xaf, 0xd5, 0xf6, 0x2e, 0xa7, 0x2a, 0x8d, 0x48, 0x1f, 0x3f, 0xc6, 0x22, 0x10, 0x8a, 0xed,
+	0xcb, 0xd5, 0x0f, 0x9a, 0x34, 0x1f, 0x1e, 0xbc, 0x00, 0xa0, 0xc2, 0x3b, 0x66, 0xc9, 0x85, 0xef,
+	0x31, 0xf2, 0x1c, 0x6e, 0xcc, 0x3c, 0x12, 0xa9, 0xbe, 0x61, 0xa6, 0xe3, 0xbb, 0xd9, 0xbb, 0xda,
+	0x20, 0x8d, 0xb7, 0xbb, 0xcf, 0x3b, 0x5b, 0x77, 0x13, 0xe1, 0xfd, 0x23, 0x11, 0xde, 0xe9, 0x3c,
+	0x5a, 0xff, 0xf5, 0xc7, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf5, 0x61, 0xbf, 0x24, 0xc2, 0x17, 0x00,
+	0x00,
 }

pkg/proto/rtc/rtc.proto

@@ -142,6 +142,7 @@ message SignalInviteReply {
   string token = 1;
   string roomID = 2;
   string liveURL = 3;
+  repeated string busyLineUserIDList = 4;
 }
 
 message SignalInviteInGroupReq {
@@ -155,6 +156,7 @@ message SignalInviteInGroupReply {
   string token = 1;
   string roomID = 2;
   string liveURL = 3;
+  repeated string busyLineUserIDList = 4;
 }
 
 message SignalCancelReq {
@@ -208,11 +210,12 @@ message SignalRejectReply {
 message SignalGetRoomByGroupIDReq {
   string opUserID = 1;
   string groupID = 2;
+  ParticipantMetaData participant = 3;
 }
 
 message SignalGetRoomByGroupIDReply {
   InvitationInfo invitation = 1;
-  repeated string onConnectingUserIDList = 2;
+  repeated ParticipantMetaData metaData = 2;
   string token = 3;
   string roomID = 4;
   string liveURL = 5;
@@ -230,6 +233,8 @@ message SignalMessageAssembleResp {
  MsgData msgData = 4;
 }
 
+
+
 service RtcService {
  rpc SignalMessageAssemble(SignalMessageAssembleReq) returns(SignalMessageAssembleResp);
 }

pkg/proto/sdk_ws/ws.proto

@@ -534,7 +534,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;
@@ -573,6 +573,7 @@ message SignalInviteReply {
   string token = 1;
   string roomID = 2;
   string liveURL = 3;
+  repeated string busyLineUserIDList = 4;
 }
 
 message SignalInviteInGroupReq {
@@ -586,6 +587,7 @@ message SignalInviteInGroupReply {
   string token = 1;
   string roomID = 2;
   string liveURL = 3;
+  repeated string busyLineUserIDList = 4;
 }
 
 message SignalCancelReq {
@@ -639,11 +641,12 @@ message SignalRejectReply {
 message SignalGetRoomByGroupIDReq {
   string opUserID = 1;
   string groupID = 2;
+  ParticipantMetaData participant = 3;
 }
 
 message SignalGetRoomByGroupIDReply {
   InvitationInfo invitation = 1;
-  repeated string onConnectingUserIDList = 2;
+  repeated ParticipantMetaData participant = 2;
   string token = 3;
   string roomID = 4;
   string liveURL = 5;