From fe17144107194a911d5f546e183789f32c24b13e Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 19 Oct 2022 14:52:18 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=B8=80=E4=B8=AA=E5=9C=A8=E7=BA=BF?= =?UTF-8?q?=E4=B9=9F=E6=B2=A1=E6=9C=89=20=E9=82=A3=E4=B9=88=20=E5=B0=B1?= =?UTF-8?q?=E5=8E=BB=E9=9A=8F=E6=9C=BA=E5=8F=96=E6=8C=87=E5=AE=9A=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E7=9A=84=E7=8E=A9=E5=AE=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/gourmet/api_getranduser.go | 23 ++++++++++++++++++++++- modules/library/comp_configure.go | 2 +- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/modules/gourmet/api_getranduser.go b/modules/gourmet/api_getranduser.go index ad48dba38..eccbf1abb 100644 --- a/modules/gourmet/api_getranduser.go +++ b/modules/gourmet/api_getranduser.go @@ -1,10 +1,16 @@ package gourmet import ( + "context" "go_dreamfactory/comm" + "go_dreamfactory/lego/core" "go_dreamfactory/pb" + "go_dreamfactory/sys/db" "go_dreamfactory/utils" + "time" + "go.mongodb.org/mongo-driver/bson" + "go.mongodb.org/mongo-driver/mongo/options" "google.golang.org/protobuf/proto" ) @@ -28,7 +34,7 @@ func (this *apiComp) GetRandUser(session comm.IUserSession, req *pb.GourmetGetRa return // 参数校验失败直接返回 } // 获取在线玩家信息 - onlineList, err := this.module.ModuleUser.UserOnlineList() + onlineList, err := this.module.ModuleUser.CrossUserOnlineList() if err != nil { code = pb.ErrorCode_DBError return @@ -54,6 +60,21 @@ func (this *apiComp) GetRandUser(session comm.IUserSession, req *pb.GourmetGetRa for _, v := range szUid { randOnlineUsers = append(randOnlineUsers, v) } + if len(randOnlineUsers) == 0 { // 一个人也没有 那就从db 中随机取 + tag := session.GetServiecTag() + if conn, err := db.ServerDBConn(tag); err == nil { + dbModel := db.NewDBModel(comm.TableUser, time.Hour, conn) + if _data, err1 := dbModel.DB.Find(core.SqlTable(comm.TableUser), bson.M{}, options.Find().SetSort(bson.M{"lv": -1}).SetLimit(int64(req.People))); err1 == nil { + for _data.Next(context.TODO()) { + temp := &pb.DBUser{} + if err = _data.Decode(temp); err == nil { + randOnlineUsers = append(randOnlineUsers, temp.Uid) + + } + } + } + } + } } for _, v := range randOnlineUsers { szDbUser = append(szDbUser, this.module.ModuleUser.GetUser(v)) // 转成user对象 diff --git a/modules/library/comp_configure.go b/modules/library/comp_configure.go index 8ffd527e5..30daffc8f 100644 --- a/modules/library/comp_configure.go +++ b/modules/library/comp_configure.go @@ -44,7 +44,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp } func (this *configureComp) SetLibraryFavor() { - if v, err := this.GetConfigure(game_favornum); err == nil { + if v, err := this.GetConfigure(game_libraryfavor); err == nil { if _configure, ok := v.(*cfg.GameLibraryFavor); ok { for _, v1 := range _configure.GetDataList() { this.favor[int64(v1.Star<<8)+int64(v1.Favorlv)] = v1 From 26703b7b56fbfd1c22eb1e9ebe3046038f6408a6 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Wed, 19 Oct 2022 15:02:51 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=B8=8A=E4=BC=A0gm=E5=92=8Crtask=20?= =?UTF-8?q?=E8=B7=A8=E6=9C=8D=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- comm/const.go | 6 +- modules/chat/api.go | 5 +- modules/chat/api_getlist.go | 6 +- modules/chat/api_send.go | 25 +- modules/gm/module.go | 30 ++- modules/rtask/module.go | 28 +++ pb/battle_db.pb.go | 36 +-- pb/battle_msg.pb.go | 4 +- pb/chat_msg.pb.go | 467 ++++-------------------------------- pb/comm.pb.go | 152 ++++++++++-- 10 files changed, 295 insertions(+), 464 deletions(-) diff --git a/comm/const.go b/comm/const.go index 82f6acd9f..faf2c4b00 100644 --- a/comm/const.go +++ b/comm/const.go @@ -161,10 +161,12 @@ const ( //Rpc Rpc_GatewayAgentClose core.Rpc_Key = "Rpc_GatewayAgentClose" //代理关闭 关闭用户连接 Rpc_GatewayNoticeUserLogin core.Rpc_Key = "Rpc_NoticeUserLogin" //通知用户登录 Rpc_GatewayNoticeUserClose core.Rpc_Key = "Rpc_NoticeUserClose" //通知用户离线 - //GM 后台消息 - Rpc_GMReleaseChatSystemMessage core.Rpc_Key = "Rpc_GMChatReleaseSystemMessage" //发布聊天系统消息 + //GM 命令 + Rpc_ModuleGMCreateCmd core.Rpc_Key = "Rpc_ModuleGMCreateCmd" //执行GM命令 //Moonfantasy 月之秘境 Rpc_ModuleMoonfantasyTrigger core.Rpc_Key = "Rpc_ModuleMoonfantasyTrigger" //月之秘境触发消息 + //rtask 上传随机任务代码 + Rpc_ModuleRtaskSendTask core.Rpc_Key = "Rpc_ModuleRtaskSendTask" //随机任务触发 ) //事件类型定义处 diff --git a/modules/chat/api.go b/modules/chat/api.go index 28e7da445..925052782 100644 --- a/modules/chat/api.go +++ b/modules/chat/api.go @@ -3,6 +3,7 @@ package chat import ( "go_dreamfactory/modules" + "go_dreamfactory/lego/base" "go_dreamfactory/lego/core" ) @@ -11,7 +12,7 @@ API */ type apiComp struct { modules.MCompGate - service core.IService + service base.IRPCXService module *Chat } @@ -19,7 +20,7 @@ type apiComp struct { func (this *apiComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { this.MCompGate.Init(service, module, comp, options) this.module = module.(*Chat) - this.service = service + this.service = service.(base.IRPCXService) return } diff --git a/modules/chat/api_getlist.go b/modules/chat/api_getlist.go index e6c383392..0237e3bf0 100644 --- a/modules/chat/api_getlist.go +++ b/modules/chat/api_getlist.go @@ -8,7 +8,7 @@ import ( ) //参数校验 -func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.ChatGetCrossListReq) (code pb.ErrorCode) { +func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.ChatGetListReq) (code pb.ErrorCode) { if req.Channel == pb.ChatChannel_World && req.ChannelId == 0 { code = pb.ErrorCode_ReqParameterError } @@ -16,7 +16,7 @@ func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.ChatGetCros } ///获取本服聊天消息记录 -func (this *apiComp) GetList(session comm.IUserSession, req *pb.ChatGetCrossListReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) GetList(session comm.IUserSession, req *pb.ChatGetListReq) (code pb.ErrorCode, data proto.Message) { var ( err error result *pb.DBUserExpand @@ -72,6 +72,6 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.ChatGetCrossList this.module.Errorf("getlist no support channel:%d ", req.Channel) return } - session.SendMsg(string(this.module.GetType()), "getcrosslist", &pb.ChatGetCrossListResp{Chats: list}) + session.SendMsg(string(this.module.GetType()), "getcrosslist", &pb.ChatGetListResp{Chats: list}) return } diff --git a/modules/chat/api_send.go b/modules/chat/api_send.go index a9eb1ae05..be0e21082 100644 --- a/modules/chat/api_send.go +++ b/modules/chat/api_send.go @@ -1,6 +1,7 @@ package chat import ( + "context" "fmt" "go_dreamfactory/comm" "go_dreamfactory/pb" @@ -11,7 +12,7 @@ import ( ) //参数校验 -func (this *apiComp) SendCheck(session comm.IUserSession, req *pb.ChatSendCrossReq) (code pb.ErrorCode) { +func (this *apiComp) SendCheck(session comm.IUserSession, req *pb.ChatSendReq) (code pb.ErrorCode) { if (req.Channel == pb.ChatChannel_Union && req.TargetId == "") || (req.Channel == pb.ChatChannel_Private && req.TargetId == "") { code = pb.ErrorCode_ReqParameterError } @@ -19,7 +20,7 @@ func (this *apiComp) SendCheck(session comm.IUserSession, req *pb.ChatSendCrossR } ///消息发送请求 -func (this *apiComp) Send(session comm.IUserSession, req *pb.ChatSendCrossReq) (code pb.ErrorCode, data proto.Message) { +func (this *apiComp) Send(session comm.IUserSession, req *pb.ChatSendReq) (code pb.ErrorCode, data proto.Message) { var ( err error max int32 @@ -59,6 +60,15 @@ func (this *apiComp) Send(session comm.IUserSession, req *pb.ChatSendCrossReq) ( case pb.ChatChannel_World: if this.module.options.GM { //判断gm命令 if IsCmd(req.Content) { //是否是GM命令 + if _, err = this.service.AcrossClusterRpcGo( + context.Background(), + session.GetServiecTag(), + comm.Service_Worker, + string(comm.Rpc_ModuleGMCreateCmd), + pb.RPCGeneralReqA2{Param1: session.GetUserId(), Param2: req.Content}, + nil); err != nil { + this.module.Errorln(err) + } session.SendMsg(string(this.module.GetType()), "send", &pb.ChatSendResp{Issucc: true}) return } @@ -75,6 +85,15 @@ func (this *apiComp) Send(session comm.IUserSession, req *pb.ChatSendCrossReq) ( } //随机任务 // this.module.ModuleRtask.SendToRtask(session, comm.Rtype62, 1) + if _, err = this.service.AcrossClusterRpcGo( + context.Background(), + session.GetServiecTag(), + comm.Service_Worker, + string(comm.Rpc_ModuleRtaskSendTask), + pb.RPCRTaskReq{Uid: session.GetUserId(), TaskType: int32(comm.Rtype62), Param1: 1}, + nil); err != nil { + this.module.Errorln(err) + } break case pb.ChatChannel_Union: msg.UnionId = req.TargetId @@ -112,6 +131,6 @@ func (this *apiComp) Send(session comm.IUserSession, req *pb.ChatSendCrossReq) ( this.module.Errorf("getlist no support channel:%d ", req.Channel) return } - session.SendMsg(string(this.module.GetType()), "sendcross", &pb.ChatSendCrossResp{Issucc: true}) + session.SendMsg(string(this.module.GetType()), "sendcross", &pb.ChatSendResp{Issucc: true}) return } diff --git a/modules/gm/module.go b/modules/gm/module.go index 774b86d44..f4b6d5ccf 100644 --- a/modules/gm/module.go +++ b/modules/gm/module.go @@ -1,7 +1,11 @@ package gm import ( + "context" + "errors" + "fmt" "go_dreamfactory/comm" + "go_dreamfactory/lego/base" "go_dreamfactory/lego/core" "go_dreamfactory/lego/sys/log" "go_dreamfactory/modules" @@ -25,7 +29,7 @@ func NewModule() core.IModule { type GM struct { modules.ModuleBase api_comp *apiComp - service core.IService + service base.IRPCXService configure *configureComp } @@ -37,7 +41,14 @@ func (this *GM) GetType() core.M_Modules { //模块初始化接口 注册用户创建角色事件 func (this *GM) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { err = this.ModuleBase.Init(service, module, options) - this.service = service + this.service = service.(base.IRPCXService) + return +} + +//模块初始化接口 注册用户创建角色事件 +func (this *GM) Start() (err error) { + err = this.ModuleBase.Start() + this.service.RegisterFunctionName(string(comm.Rpc_ModuleGMCreateCmd), this.Rpc_ModuleGMCreateCmd) return } @@ -125,3 +136,18 @@ func (this *GM) CreateCmd(session comm.IUserSession, cmd string) (code pb.ErrorC return } + +func (this *GM) Rpc_ModuleGMCreateCmd(ctx context.Context, args *pb.RPCGeneralReqA2, reply *pb.EmptyResp) (err error) { + this.Debug("Rpc_ModuleGMCreateCmd", log.Field{Key: "args", Value: args.String()}) + if args.Param1 == "" || args.Param2 == "" { + err = errors.New("请求参数错误") + } + if session, ok := this.GetUserSession(args.Param1); !ok { + err = fmt.Errorf("目标用户:%s 不在线", args.Param1) + return + } else { + this.CreateCmd(session, args.Param2) + session.Push() + } + return +} diff --git a/modules/rtask/module.go b/modules/rtask/module.go index 7dbee44b8..ddcef92e4 100644 --- a/modules/rtask/module.go +++ b/modules/rtask/module.go @@ -2,7 +2,10 @@ package rtask import ( + "context" + "fmt" "go_dreamfactory/comm" + "go_dreamfactory/lego/base" "go_dreamfactory/lego/core" "go_dreamfactory/lego/sys/log" "go_dreamfactory/modules" @@ -30,6 +33,7 @@ type updateDataHandle func(uid string, cfg *cfg.GameRdtaskCondiData, vals ...int type ModuleRtask struct { modules.ModuleBase + service base.IRPCXService modelRtask *ModelRtask modelRtaskRecord *ModelRtaskRecord api *apiComp @@ -50,9 +54,15 @@ func (this *ModuleRtask) GetType() core.M_Modules { func (this *ModuleRtask) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { err = this.ModuleBase.Init(service, module, options) + this.service = service.(base.IRPCXService) this.initRtaskVerifyHandle() return } +func (this *ModuleRtask) Start() (err error) { + err = this.ModuleBase.Start() + this.service.RegisterFunctionName(string(comm.Rpc_ModuleRtaskSendTask), this.Rpc_ModuleRtaskSendTask) + return +} func (this *ModuleRtask) OnInstallComp() { this.ModuleBase.OnInstallComp() @@ -316,3 +326,21 @@ func (this *ModuleRtask) BingoRtask(session comm.IUserSession, groupId, rtaskId } return nil } + +//接收区服worker发起的秘境事件 +func (this *ModuleRtask) Rpc_ModuleRtaskSendTask(ctx context.Context, args *pb.RPCRTaskReq, reply *pb.EmptyResp) (err error) { + this.Debug("Rpc_ModuleRtaskSendTask", log.Field{Key: "args", Value: args.String()}) + if args.Uid == "" { + err = errors.New("参数异常!") + return + } + + if session, ok := this.GetUserSession(args.Uid); !ok { + err = fmt.Errorf("未查询到用户:%s在线信息!", args.Uid) + return + } else { + this.SendToRtask(session, comm.TaskType(args.TaskType), args.Param1, args.Param2, args.Param3, args.Param4, args.Param5) + session.Push() + } + return +} diff --git a/pb/battle_db.pb.go b/pb/battle_db.pb.go index e2fa769f6..94860b92d 100644 --- a/pb/battle_db.pb.go +++ b/pb/battle_db.pb.go @@ -76,31 +76,34 @@ func (BattleType) EnumDescriptor() ([]byte, []int) { type PlayType int32 const ( - PlayType_moonfantasy PlayType = 0 //月之秘境 + PlayType_null PlayType = 0 //无效类型 PlayType_mainline PlayType = 1 //主线玩法 PlayType_pagoda PlayType = 2 //爬塔 PlayType_rtask PlayType = 3 //随机任务战斗 PlayType_hunting PlayType = 4 //狩猎 PlayType_viking PlayType = 5 //维京远征 + PlayType_moonfantasy PlayType = 6 //月之秘境 ) // Enum value maps for PlayType. var ( PlayType_name = map[int32]string{ - 0: "moonfantasy", + 0: "null", 1: "mainline", 2: "pagoda", 3: "rtask", 4: "hunting", 5: "viking", + 6: "moonfantasy", } PlayType_value = map[string]int32{ - "moonfantasy": 0, + "null": 0, "mainline": 1, "pagoda": 2, "rtask": 3, "hunting": 4, "viking": 5, + "moonfantasy": 6, } ) @@ -488,7 +491,7 @@ func (x *DBBattleRecord) GetPtype() PlayType { if x != nil { return x.Ptype } - return PlayType_moonfantasy + return PlayType_null } func (x *DBBattleRecord) GetPlevel() string { @@ -612,18 +615,19 @@ var file_battle_battle_db_proto_rawDesc = []byte{ 0x75, 0x6c, 0x74, 0x2a, 0x30, 0x0a, 0x0a, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x07, 0x0a, 0x03, 0x6e, 0x69, 0x6c, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x70, 0x76, 0x65, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x70, 0x76, 0x70, 0x10, 0x02, 0x12, 0x07, 0x0a, 0x03, - 0x70, 0x76, 0x62, 0x10, 0x03, 0x2a, 0x59, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, - 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x6d, 0x6f, 0x6f, 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, - 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x6d, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x10, 0x01, - 0x12, 0x0a, 0x0a, 0x06, 0x70, 0x61, 0x67, 0x6f, 0x64, 0x61, 0x10, 0x02, 0x12, 0x09, 0x0a, 0x05, - 0x72, 0x74, 0x61, 0x73, 0x6b, 0x10, 0x03, 0x12, 0x0b, 0x0a, 0x07, 0x68, 0x75, 0x6e, 0x74, 0x69, - 0x6e, 0x67, 0x10, 0x04, 0x12, 0x0a, 0x0a, 0x06, 0x76, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x10, 0x05, - 0x2a, 0x1f, 0x0a, 0x0c, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, - 0x12, 0x06, 0x0a, 0x02, 0x69, 0x6e, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x65, 0x6e, 0x64, 0x10, - 0x02, 0x2a, 0x2b, 0x0a, 0x0c, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6d, - 0x70, 0x12, 0x08, 0x0a, 0x04, 0x64, 0x72, 0x61, 0x77, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x72, - 0x65, 0x64, 0x10, 0x01, 0x12, 0x08, 0x0a, 0x04, 0x62, 0x75, 0x6c, 0x65, 0x10, 0x02, 0x42, 0x06, - 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x70, 0x76, 0x62, 0x10, 0x03, 0x2a, 0x63, 0x0a, 0x08, 0x50, 0x6c, 0x61, 0x79, 0x54, 0x79, 0x70, + 0x65, 0x12, 0x08, 0x0a, 0x04, 0x6e, 0x75, 0x6c, 0x6c, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x6d, + 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x65, 0x10, 0x01, 0x12, 0x0a, 0x0a, 0x06, 0x70, 0x61, 0x67, + 0x6f, 0x64, 0x61, 0x10, 0x02, 0x12, 0x09, 0x0a, 0x05, 0x72, 0x74, 0x61, 0x73, 0x6b, 0x10, 0x03, + 0x12, 0x0b, 0x0a, 0x07, 0x68, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x67, 0x10, 0x04, 0x12, 0x0a, 0x0a, + 0x06, 0x76, 0x69, 0x6b, 0x69, 0x6e, 0x67, 0x10, 0x05, 0x12, 0x0f, 0x0a, 0x0b, 0x6d, 0x6f, 0x6f, + 0x6e, 0x66, 0x61, 0x6e, 0x74, 0x61, 0x73, 0x79, 0x10, 0x06, 0x2a, 0x1f, 0x0a, 0x0c, 0x42, 0x42, + 0x61, 0x74, 0x74, 0x6c, 0x65, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x06, 0x0a, 0x02, 0x69, 0x6e, + 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x65, 0x6e, 0x64, 0x10, 0x02, 0x2a, 0x2b, 0x0a, 0x0c, 0x44, + 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6d, 0x70, 0x12, 0x08, 0x0a, 0x04, 0x64, + 0x72, 0x61, 0x77, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x72, 0x65, 0x64, 0x10, 0x01, 0x12, 0x08, + 0x0a, 0x04, 0x62, 0x75, 0x6c, 0x65, 0x10, 0x02, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pb/battle_msg.pb.go b/pb/battle_msg.pb.go index 8e05c4142..bdb96d7f4 100644 --- a/pb/battle_msg.pb.go +++ b/pb/battle_msg.pb.go @@ -132,7 +132,7 @@ func (x *BattlePVEReq) GetPtype() PlayType { if x != nil { return x.Ptype } - return PlayType_moonfantasy + return PlayType_null } func (x *BattlePVEReq) GetTitle() string { @@ -236,7 +236,7 @@ func (x *BattleInfo) GetPtype() PlayType { if x != nil { return x.Ptype } - return PlayType_moonfantasy + return PlayType_null } func (x *BattleInfo) GetRedCompId() string { diff --git a/pb/chat_msg.pb.go b/pb/chat_msg.pb.go index 8f58fa66a..1cf733b72 100644 --- a/pb/chat_msg.pb.go +++ b/pb/chat_msg.pb.go @@ -363,110 +363,6 @@ func (x *ChatGetListResp) GetChats() []*DBChat { return nil } -//跨服请求聊天消息 -type ChatGetCrossListReq struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Channel ChatChannel `protobuf:"varint,1,opt,name=channel,proto3,enum=ChatChannel" json:"channel"` //频道 - ChannelId int32 `protobuf:"varint,2,opt,name=channelId,proto3" json:"channelId"` //跨服频道id -} - -func (x *ChatGetCrossListReq) Reset() { - *x = ChatGetCrossListReq{} - if protoimpl.UnsafeEnabled { - mi := &file_chat_chat_msg_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *ChatGetCrossListReq) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ChatGetCrossListReq) ProtoMessage() {} - -func (x *ChatGetCrossListReq) ProtoReflect() protoreflect.Message { - mi := &file_chat_chat_msg_proto_msgTypes[7] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use ChatGetCrossListReq.ProtoReflect.Descriptor instead. -func (*ChatGetCrossListReq) Descriptor() ([]byte, []int) { - return file_chat_chat_msg_proto_rawDescGZIP(), []int{7} -} - -func (x *ChatGetCrossListReq) GetChannel() ChatChannel { - if x != nil { - return x.Channel - } - return ChatChannel_World -} - -func (x *ChatGetCrossListReq) GetChannelId() int32 { - if x != nil { - return x.ChannelId - } - return 0 -} - -//跨服请求聊天消息 回应 -type ChatGetCrossListResp struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Chats []*DBChat `protobuf:"bytes,1,rep,name=chats,proto3" json:"chats"` -} - -func (x *ChatGetCrossListResp) Reset() { - *x = ChatGetCrossListResp{} - if protoimpl.UnsafeEnabled { - mi := &file_chat_chat_msg_proto_msgTypes[8] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *ChatGetCrossListResp) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ChatGetCrossListResp) ProtoMessage() {} - -func (x *ChatGetCrossListResp) ProtoReflect() protoreflect.Message { - mi := &file_chat_chat_msg_proto_msgTypes[8] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use ChatGetCrossListResp.ProtoReflect.Descriptor instead. -func (*ChatGetCrossListResp) Descriptor() ([]byte, []int) { - return file_chat_chat_msg_proto_rawDescGZIP(), []int{8} -} - -func (x *ChatGetCrossListResp) GetChats() []*DBChat { - if x != nil { - return x.Chats - } - return nil -} - //消息发送请求 type ChatSendReq struct { state protoimpl.MessageState @@ -489,7 +385,7 @@ type ChatSendReq struct { func (x *ChatSendReq) Reset() { *x = ChatSendReq{} if protoimpl.UnsafeEnabled { - mi := &file_chat_chat_msg_proto_msgTypes[9] + mi := &file_chat_chat_msg_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -502,7 +398,7 @@ func (x *ChatSendReq) String() string { func (*ChatSendReq) ProtoMessage() {} func (x *ChatSendReq) ProtoReflect() protoreflect.Message { - mi := &file_chat_chat_msg_proto_msgTypes[9] + mi := &file_chat_chat_msg_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -515,7 +411,7 @@ func (x *ChatSendReq) ProtoReflect() protoreflect.Message { // Deprecated: Use ChatSendReq.ProtoReflect.Descriptor instead. func (*ChatSendReq) Descriptor() ([]byte, []int) { - return file_chat_chat_msg_proto_rawDescGZIP(), []int{9} + return file_chat_chat_msg_proto_rawDescGZIP(), []int{7} } func (x *ChatSendReq) GetAvatar() string { @@ -607,7 +503,7 @@ type ChatSendResp struct { func (x *ChatSendResp) Reset() { *x = ChatSendResp{} if protoimpl.UnsafeEnabled { - mi := &file_chat_chat_msg_proto_msgTypes[10] + mi := &file_chat_chat_msg_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -620,7 +516,7 @@ func (x *ChatSendResp) String() string { func (*ChatSendResp) ProtoMessage() {} func (x *ChatSendResp) ProtoReflect() protoreflect.Message { - mi := &file_chat_chat_msg_proto_msgTypes[10] + mi := &file_chat_chat_msg_proto_msgTypes[8] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -633,7 +529,7 @@ func (x *ChatSendResp) ProtoReflect() protoreflect.Message { // Deprecated: Use ChatSendResp.ProtoReflect.Descriptor instead. func (*ChatSendResp) Descriptor() ([]byte, []int) { - return file_chat_chat_msg_proto_rawDescGZIP(), []int{10} + return file_chat_chat_msg_proto_rawDescGZIP(), []int{8} } func (x *ChatSendResp) GetIssucc() bool { @@ -643,182 +539,6 @@ func (x *ChatSendResp) GetIssucc() bool { return false } -//跨服消息发送请求 -type ChatSendCrossReq struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Avatar string `protobuf:"bytes,1,opt,name=avatar,proto3" json:"avatar"` //用户头像 - Uname string `protobuf:"bytes,2,opt,name=uname,proto3" json:"uname"` //用户名 - Ulv int32 `protobuf:"varint,3,opt,name=ulv,proto3" json:"ulv"` //用户等级 - Channel ChatChannel `protobuf:"varint,4,opt,name=channel,proto3,enum=ChatChannel" json:"channel"` //频道 - TargetId string `protobuf:"bytes,5,opt,name=targetId,proto3" json:"targetId"` //目标用户id - Ctype ChatType `protobuf:"varint,6,opt,name=ctype,proto3,enum=ChatType" json:"ctype"` //消息类型 - Content string `protobuf:"bytes,7,opt,name=content,proto3" json:"content"` //内容 - AppendInt int64 `protobuf:"varint,8,opt,name=appendInt,proto3" json:"appendInt" bson:"appendInt"` //聊天附加数据 - AppendStr string `protobuf:"bytes,9,opt,name=appendStr,proto3" json:"appendStr" bson:"appendStr"` //聊天附加数据 - AppendBool string `protobuf:"bytes,10,opt,name=appendBool,proto3" json:"appendBool" bson:"appendBool"` //聊天附加数据 - AppendBytes []byte `protobuf:"bytes,11,opt,name=appendBytes,proto3" json:"appendBytes" bson:"appendInt"` //聊天附加数据 -} - -func (x *ChatSendCrossReq) Reset() { - *x = ChatSendCrossReq{} - if protoimpl.UnsafeEnabled { - mi := &file_chat_chat_msg_proto_msgTypes[11] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *ChatSendCrossReq) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ChatSendCrossReq) ProtoMessage() {} - -func (x *ChatSendCrossReq) ProtoReflect() protoreflect.Message { - mi := &file_chat_chat_msg_proto_msgTypes[11] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use ChatSendCrossReq.ProtoReflect.Descriptor instead. -func (*ChatSendCrossReq) Descriptor() ([]byte, []int) { - return file_chat_chat_msg_proto_rawDescGZIP(), []int{11} -} - -func (x *ChatSendCrossReq) GetAvatar() string { - if x != nil { - return x.Avatar - } - return "" -} - -func (x *ChatSendCrossReq) GetUname() string { - if x != nil { - return x.Uname - } - return "" -} - -func (x *ChatSendCrossReq) GetUlv() int32 { - if x != nil { - return x.Ulv - } - return 0 -} - -func (x *ChatSendCrossReq) GetChannel() ChatChannel { - if x != nil { - return x.Channel - } - return ChatChannel_World -} - -func (x *ChatSendCrossReq) GetTargetId() string { - if x != nil { - return x.TargetId - } - return "" -} - -func (x *ChatSendCrossReq) GetCtype() ChatType { - if x != nil { - return x.Ctype - } - return ChatType_Text -} - -func (x *ChatSendCrossReq) GetContent() string { - if x != nil { - return x.Content - } - return "" -} - -func (x *ChatSendCrossReq) GetAppendInt() int64 { - if x != nil { - return x.AppendInt - } - return 0 -} - -func (x *ChatSendCrossReq) GetAppendStr() string { - if x != nil { - return x.AppendStr - } - return "" -} - -func (x *ChatSendCrossReq) GetAppendBool() string { - if x != nil { - return x.AppendBool - } - return "" -} - -func (x *ChatSendCrossReq) GetAppendBytes() []byte { - if x != nil { - return x.AppendBytes - } - return nil -} - -//跨服消息发送请求 回应 -type ChatSendCrossResp struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields - - Issucc bool `protobuf:"varint,1,opt,name=issucc,proto3" json:"issucc"` //是否成功 -} - -func (x *ChatSendCrossResp) Reset() { - *x = ChatSendCrossResp{} - if protoimpl.UnsafeEnabled { - mi := &file_chat_chat_msg_proto_msgTypes[12] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *ChatSendCrossResp) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ChatSendCrossResp) ProtoMessage() {} - -func (x *ChatSendCrossResp) ProtoReflect() protoreflect.Message { - mi := &file_chat_chat_msg_proto_msgTypes[12] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use ChatSendCrossResp.ProtoReflect.Descriptor instead. -func (*ChatSendCrossResp) Descriptor() ([]byte, []int) { - return file_chat_chat_msg_proto_rawDescGZIP(), []int{12} -} - -func (x *ChatSendCrossResp) GetIssucc() bool { - if x != nil { - return x.Issucc - } - return false -} - var File_chat_chat_msg_proto protoreflect.FileDescriptor var file_chat_chat_msg_proto_rawDesc = []byte{ @@ -849,64 +569,31 @@ var file_chat_chat_msg_proto_rawDesc = []byte{ 0x6e, 0x65, 0x6c, 0x49, 0x64, 0x22, 0x30, 0x0a, 0x0f, 0x43, 0x68, 0x61, 0x74, 0x47, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x05, 0x63, 0x68, 0x61, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x43, 0x68, 0x61, 0x74, - 0x52, 0x05, 0x63, 0x68, 0x61, 0x74, 0x73, 0x22, 0x5b, 0x0a, 0x13, 0x43, 0x68, 0x61, 0x74, 0x47, - 0x65, 0x74, 0x43, 0x72, 0x6f, 0x73, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x71, 0x12, 0x26, - 0x0a, 0x07, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, - 0x0c, 0x2e, 0x43, 0x68, 0x61, 0x74, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x52, 0x07, 0x63, - 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, - 0x6c, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x63, 0x68, 0x61, 0x6e, 0x6e, - 0x65, 0x6c, 0x49, 0x64, 0x22, 0x35, 0x0a, 0x14, 0x43, 0x68, 0x61, 0x74, 0x47, 0x65, 0x74, 0x43, - 0x72, 0x6f, 0x73, 0x73, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x05, - 0x63, 0x68, 0x61, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, - 0x43, 0x68, 0x61, 0x74, 0x52, 0x05, 0x63, 0x68, 0x61, 0x74, 0x73, 0x22, 0xca, 0x02, 0x0a, 0x0b, - 0x43, 0x68, 0x61, 0x74, 0x53, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x61, - 0x76, 0x61, 0x74, 0x61, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x76, 0x61, - 0x74, 0x61, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x75, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x05, 0x75, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x6c, 0x76, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x75, 0x6c, 0x76, 0x12, 0x26, 0x0a, 0x07, 0x63, - 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0c, 0x2e, 0x43, - 0x68, 0x61, 0x74, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x52, 0x07, 0x63, 0x68, 0x61, 0x6e, - 0x6e, 0x65, 0x6c, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x49, 0x64, 0x18, - 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x49, 0x64, 0x12, - 0x1f, 0x0a, 0x05, 0x63, 0x74, 0x79, 0x70, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, - 0x2e, 0x43, 0x68, 0x61, 0x74, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x63, 0x74, 0x79, 0x70, 0x65, - 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x70, - 0x70, 0x65, 0x6e, 0x64, 0x49, 0x6e, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x61, - 0x70, 0x70, 0x65, 0x6e, 0x64, 0x49, 0x6e, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x70, 0x70, 0x65, - 0x6e, 0x64, 0x53, 0x74, 0x72, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x70, 0x70, - 0x65, 0x6e, 0x64, 0x53, 0x74, 0x72, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, - 0x42, 0x6f, 0x6f, 0x6c, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x61, 0x70, 0x70, 0x65, - 0x6e, 0x64, 0x42, 0x6f, 0x6f, 0x6c, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, - 0x42, 0x79, 0x74, 0x65, 0x73, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0b, 0x61, 0x70, 0x70, - 0x65, 0x6e, 0x64, 0x42, 0x79, 0x74, 0x65, 0x73, 0x22, 0x26, 0x0a, 0x0c, 0x43, 0x68, 0x61, 0x74, - 0x53, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, - 0x63, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, - 0x22, 0xcf, 0x02, 0x0a, 0x10, 0x43, 0x68, 0x61, 0x74, 0x53, 0x65, 0x6e, 0x64, 0x43, 0x72, 0x6f, - 0x73, 0x73, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x12, 0x14, 0x0a, - 0x05, 0x75, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x75, 0x6e, - 0x61, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x03, 0x75, 0x6c, 0x76, 0x12, 0x26, 0x0a, 0x07, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, - 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0c, 0x2e, 0x43, 0x68, 0x61, 0x74, 0x43, 0x68, 0x61, - 0x6e, 0x6e, 0x65, 0x6c, 0x52, 0x07, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x12, 0x1a, 0x0a, - 0x08, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x08, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x49, 0x64, 0x12, 0x1f, 0x0a, 0x05, 0x63, 0x74, 0x79, - 0x70, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x43, 0x68, 0x61, 0x74, 0x54, - 0x79, 0x70, 0x65, 0x52, 0x05, 0x63, 0x74, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, - 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6f, 0x6e, - 0x74, 0x65, 0x6e, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x49, 0x6e, - 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x49, - 0x6e, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x53, 0x74, 0x72, 0x18, - 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x53, 0x74, 0x72, - 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x42, 0x6f, 0x6f, 0x6c, 0x18, 0x0a, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x42, 0x6f, 0x6f, 0x6c, - 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x42, 0x79, 0x74, 0x65, 0x73, 0x18, - 0x0b, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0b, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x42, 0x79, 0x74, - 0x65, 0x73, 0x22, 0x2b, 0x0a, 0x11, 0x43, 0x68, 0x61, 0x74, 0x53, 0x65, 0x6e, 0x64, 0x43, 0x72, - 0x6f, 0x73, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, - 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x42, - 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x52, 0x05, 0x63, 0x68, 0x61, 0x74, 0x73, 0x22, 0xca, 0x02, 0x0a, 0x0b, 0x43, 0x68, 0x61, 0x74, + 0x53, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, + 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x76, 0x61, 0x74, 0x61, 0x72, 0x12, + 0x14, 0x0a, 0x05, 0x75, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, + 0x75, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x6c, 0x76, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x03, 0x75, 0x6c, 0x76, 0x12, 0x26, 0x0a, 0x07, 0x63, 0x68, 0x61, 0x6e, 0x6e, + 0x65, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0c, 0x2e, 0x43, 0x68, 0x61, 0x74, 0x43, + 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x52, 0x07, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x12, + 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x49, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x08, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x49, 0x64, 0x12, 0x1f, 0x0a, 0x05, 0x63, + 0x74, 0x79, 0x70, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x43, 0x68, 0x61, + 0x74, 0x54, 0x79, 0x70, 0x65, 0x52, 0x05, 0x63, 0x74, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, + 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, + 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, + 0x49, 0x6e, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x61, 0x70, 0x70, 0x65, 0x6e, + 0x64, 0x49, 0x6e, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x53, 0x74, + 0x72, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x53, + 0x74, 0x72, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x42, 0x6f, 0x6f, 0x6c, + 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x42, 0x6f, + 0x6f, 0x6c, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x42, 0x79, 0x74, 0x65, + 0x73, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0b, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x42, + 0x79, 0x74, 0x65, 0x73, 0x22, 0x26, 0x0a, 0x0c, 0x43, 0x68, 0x61, 0x74, 0x53, 0x65, 0x6e, 0x64, + 0x52, 0x65, 0x73, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x69, 0x73, 0x73, 0x75, 0x63, 0x63, 0x42, 0x06, 0x5a, 0x04, + 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -921,7 +608,7 @@ func file_chat_chat_msg_proto_rawDescGZIP() []byte { return file_chat_chat_msg_proto_rawDescData } -var file_chat_chat_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 13) +var file_chat_chat_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 9) var file_chat_chat_msg_proto_goTypes = []interface{}{ (*ChatMessagePush)(nil), // 0: ChatMessagePush (*ChatCrossChannelReq)(nil), // 1: ChatCrossChannelReq @@ -930,31 +617,23 @@ var file_chat_chat_msg_proto_goTypes = []interface{}{ (*ChatChanageChannelResp)(nil), // 4: ChatChanageChannelResp (*ChatGetListReq)(nil), // 5: ChatGetListReq (*ChatGetListResp)(nil), // 6: ChatGetListResp - (*ChatGetCrossListReq)(nil), // 7: ChatGetCrossListReq - (*ChatGetCrossListResp)(nil), // 8: ChatGetCrossListResp - (*ChatSendReq)(nil), // 9: ChatSendReq - (*ChatSendResp)(nil), // 10: ChatSendResp - (*ChatSendCrossReq)(nil), // 11: ChatSendCrossReq - (*ChatSendCrossResp)(nil), // 12: ChatSendCrossResp - (*DBChat)(nil), // 13: DBChat - (ChatChannel)(0), // 14: ChatChannel - (ChatType)(0), // 15: ChatType + (*ChatSendReq)(nil), // 7: ChatSendReq + (*ChatSendResp)(nil), // 8: ChatSendResp + (*DBChat)(nil), // 9: DBChat + (ChatChannel)(0), // 10: ChatChannel + (ChatType)(0), // 11: ChatType } var file_chat_chat_msg_proto_depIdxs = []int32{ - 13, // 0: ChatMessagePush.chat:type_name -> DBChat - 14, // 1: ChatGetListReq.channel:type_name -> ChatChannel - 13, // 2: ChatGetListResp.chats:type_name -> DBChat - 14, // 3: ChatGetCrossListReq.channel:type_name -> ChatChannel - 13, // 4: ChatGetCrossListResp.chats:type_name -> DBChat - 14, // 5: ChatSendReq.channel:type_name -> ChatChannel - 15, // 6: ChatSendReq.ctype:type_name -> ChatType - 14, // 7: ChatSendCrossReq.channel:type_name -> ChatChannel - 15, // 8: ChatSendCrossReq.ctype:type_name -> ChatType - 9, // [9:9] is the sub-list for method output_type - 9, // [9:9] is the sub-list for method input_type - 9, // [9:9] is the sub-list for extension type_name - 9, // [9:9] is the sub-list for extension extendee - 0, // [0:9] is the sub-list for field type_name + 9, // 0: ChatMessagePush.chat:type_name -> DBChat + 10, // 1: ChatGetListReq.channel:type_name -> ChatChannel + 9, // 2: ChatGetListResp.chats:type_name -> DBChat + 10, // 3: ChatSendReq.channel:type_name -> ChatChannel + 11, // 4: ChatSendReq.ctype:type_name -> ChatType + 5, // [5:5] is the sub-list for method output_type + 5, // [5:5] is the sub-list for method input_type + 5, // [5:5] is the sub-list for extension type_name + 5, // [5:5] is the sub-list for extension extendee + 0, // [0:5] is the sub-list for field type_name } func init() { file_chat_chat_msg_proto_init() } @@ -1049,30 +728,6 @@ func file_chat_chat_msg_proto_init() { } } file_chat_chat_msg_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ChatGetCrossListReq); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_chat_chat_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ChatGetCrossListResp); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_chat_chat_msg_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ChatSendReq); i { case 0: return &v.state @@ -1084,7 +739,7 @@ func file_chat_chat_msg_proto_init() { return nil } } - file_chat_chat_msg_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { + file_chat_chat_msg_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ChatSendResp); i { case 0: return &v.state @@ -1096,30 +751,6 @@ func file_chat_chat_msg_proto_init() { return nil } } - file_chat_chat_msg_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ChatSendCrossReq); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_chat_chat_msg_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ChatSendCrossResp); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } } type x struct{} out := protoimpl.TypeBuilder{ @@ -1127,7 +758,7 @@ func file_chat_chat_msg_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_chat_chat_msg_proto_rawDesc, NumEnums: 0, - NumMessages: 13, + NumMessages: 9, NumExtensions: 0, NumServices: 0, }, diff --git a/pb/comm.pb.go b/pb/comm.pb.go index b8be12389..e353957a2 100644 --- a/pb/comm.pb.go +++ b/pb/comm.pb.go @@ -1430,6 +1430,102 @@ func (x *RPCGeneralReqA4) GetParam4() string { return "" } +// rpc 通用请求消息 1 +type RPCRTaskReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"` + TaskType int32 `protobuf:"varint,2,opt,name=taskType,proto3" json:"taskType"` + Param1 int32 `protobuf:"varint,3,opt,name=param1,proto3" json:"param1"` + Param2 int32 `protobuf:"varint,4,opt,name=param2,proto3" json:"param2"` + Param3 int32 `protobuf:"varint,5,opt,name=param3,proto3" json:"param3"` + Param4 int32 `protobuf:"varint,6,opt,name=param4,proto3" json:"param4"` + Param5 int32 `protobuf:"varint,7,opt,name=param5,proto3" json:"param5"` +} + +func (x *RPCRTaskReq) Reset() { + *x = RPCRTaskReq{} + if protoimpl.UnsafeEnabled { + mi := &file_comm_proto_msgTypes[22] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *RPCRTaskReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*RPCRTaskReq) ProtoMessage() {} + +func (x *RPCRTaskReq) ProtoReflect() protoreflect.Message { + mi := &file_comm_proto_msgTypes[22] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use RPCRTaskReq.ProtoReflect.Descriptor instead. +func (*RPCRTaskReq) Descriptor() ([]byte, []int) { + return file_comm_proto_rawDescGZIP(), []int{22} +} + +func (x *RPCRTaskReq) GetUid() string { + if x != nil { + return x.Uid + } + return "" +} + +func (x *RPCRTaskReq) GetTaskType() int32 { + if x != nil { + return x.TaskType + } + return 0 +} + +func (x *RPCRTaskReq) GetParam1() int32 { + if x != nil { + return x.Param1 + } + return 0 +} + +func (x *RPCRTaskReq) GetParam2() int32 { + if x != nil { + return x.Param2 + } + return 0 +} + +func (x *RPCRTaskReq) GetParam3() int32 { + if x != nil { + return x.Param3 + } + return 0 +} + +func (x *RPCRTaskReq) GetParam4() int32 { + if x != nil { + return x.Param4 + } + return 0 +} + +func (x *RPCRTaskReq) GetParam5() int32 { + if x != nil { + return x.Param5 + } + return 0 +} + var File_comm_proto protoreflect.FileDescriptor var file_comm_proto_rawDesc = []byte{ @@ -1569,12 +1665,23 @@ var file_comm_proto_rawDesc = []byte{ 0x61, 0x72, 0x61, 0x6d, 0x32, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x34, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x70, - 0x61, 0x72, 0x61, 0x6d, 0x34, 0x2a, 0x43, 0x0a, 0x12, 0x48, 0x65, 0x72, 0x6f, 0x41, 0x74, 0x74, - 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x06, 0x0a, 0x02, 0x48, - 0x70, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x41, 0x74, 0x6b, 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, - 0x44, 0x65, 0x66, 0x10, 0x02, 0x12, 0x09, 0x0a, 0x05, 0x53, 0x70, 0x65, 0x65, 0x64, 0x10, 0x03, - 0x12, 0x08, 0x0a, 0x04, 0x43, 0x72, 0x69, 0x74, 0x10, 0x04, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, - 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x61, 0x72, 0x61, 0x6d, 0x34, 0x22, 0xb3, 0x01, 0x0a, 0x0b, 0x52, 0x50, 0x43, 0x52, 0x54, 0x61, + 0x73, 0x6b, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x54, + 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x74, 0x61, 0x73, 0x6b, 0x54, + 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x31, 0x12, 0x16, 0x0a, 0x06, 0x70, + 0x61, 0x72, 0x61, 0x6d, 0x32, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x61, 0x72, + 0x61, 0x6d, 0x32, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x18, 0x05, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x33, 0x12, 0x16, 0x0a, 0x06, 0x70, + 0x61, 0x72, 0x61, 0x6d, 0x34, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x61, 0x72, + 0x61, 0x6d, 0x34, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x35, 0x18, 0x07, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x35, 0x2a, 0x43, 0x0a, 0x12, 0x48, + 0x65, 0x72, 0x6f, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x73, 0x54, 0x79, 0x70, + 0x65, 0x12, 0x06, 0x0a, 0x02, 0x48, 0x70, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x41, 0x74, 0x6b, + 0x10, 0x01, 0x12, 0x07, 0x0a, 0x03, 0x44, 0x65, 0x66, 0x10, 0x02, 0x12, 0x09, 0x0a, 0x05, 0x53, + 0x70, 0x65, 0x65, 0x64, 0x10, 0x03, 0x12, 0x08, 0x0a, 0x04, 0x43, 0x72, 0x69, 0x74, 0x10, 0x04, + 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1590,7 +1697,7 @@ func file_comm_proto_rawDescGZIP() []byte { } var file_comm_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_comm_proto_msgTypes = make([]protoimpl.MessageInfo, 22) +var file_comm_proto_msgTypes = make([]protoimpl.MessageInfo, 23) var file_comm_proto_goTypes = []interface{}{ (HeroAttributesType)(0), // 0: HeroAttributesType (*UserMessage)(nil), // 1: UserMessage @@ -1615,18 +1722,19 @@ var file_comm_proto_goTypes = []interface{}{ (*RPCGeneralReqA2)(nil), // 20: RPCGeneralReqA2 (*RPCGeneralReqA3)(nil), // 21: RPCGeneralReqA3 (*RPCGeneralReqA4)(nil), // 22: RPCGeneralReqA4 - (*anypb.Any)(nil), // 23: google.protobuf.Any - (ErrorCode)(0), // 24: ErrorCode + (*RPCRTaskReq)(nil), // 23: RPCRTaskReq + (*anypb.Any)(nil), // 24: google.protobuf.Any + (ErrorCode)(0), // 25: ErrorCode } var file_comm_proto_depIdxs = []int32{ - 23, // 0: UserMessage.data:type_name -> google.protobuf.Any - 23, // 1: AgentMessage.Message:type_name -> google.protobuf.Any - 24, // 2: RPCMessageReply.Code:type_name -> ErrorCode - 23, // 3: RPCMessageReply.ErrorData:type_name -> google.protobuf.Any + 24, // 0: UserMessage.data:type_name -> google.protobuf.Any + 24, // 1: AgentMessage.Message:type_name -> google.protobuf.Any + 25, // 2: RPCMessageReply.Code:type_name -> ErrorCode + 24, // 3: RPCMessageReply.ErrorData:type_name -> google.protobuf.Any 1, // 4: RPCMessageReply.Reply:type_name -> UserMessage 1, // 5: AgentSendMessageReq.Reply:type_name -> UserMessage - 23, // 6: BatchMessageReq.Data:type_name -> google.protobuf.Any - 23, // 7: BroadCastMessageReq.Data:type_name -> google.protobuf.Any + 24, // 6: BatchMessageReq.Data:type_name -> google.protobuf.Any + 24, // 7: BroadCastMessageReq.Data:type_name -> google.protobuf.Any 8, // [8:8] is the sub-list for method output_type 8, // [8:8] is the sub-list for method input_type 8, // [8:8] is the sub-list for extension type_name @@ -1905,6 +2013,18 @@ func file_comm_proto_init() { return nil } } + file_comm_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*RPCRTaskReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } } type x struct{} out := protoimpl.TypeBuilder{ @@ -1912,7 +2032,7 @@ func file_comm_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_comm_proto_rawDesc, NumEnums: 1, - NumMessages: 22, + NumMessages: 23, NumExtensions: 0, NumServices: 0, }, From a48c616907f3c99885ae4e03b1f782bd211f5969 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Wed, 19 Oct 2022 15:18:26 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=81=8A=E5=A4=A9?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=B6=88=E6=81=AF=E6=A0=A1=E9=AA=8C=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/chat/api_getlist.go | 2 +- modules/chat/api_send.go | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/chat/api_getlist.go b/modules/chat/api_getlist.go index 0237e3bf0..91792038d 100644 --- a/modules/chat/api_getlist.go +++ b/modules/chat/api_getlist.go @@ -9,7 +9,7 @@ import ( //参数校验 func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.ChatGetListReq) (code pb.ErrorCode) { - if req.Channel == pb.ChatChannel_World && req.ChannelId == 0 { + if req.Channel == pb.ChatChannel_CrossServer && req.ChannelId == 0 { code = pb.ErrorCode_ReqParameterError } return diff --git a/modules/chat/api_send.go b/modules/chat/api_send.go index be0e21082..522d7a5b2 100644 --- a/modules/chat/api_send.go +++ b/modules/chat/api_send.go @@ -84,7 +84,6 @@ func (this *apiComp) Send(session comm.IUserSession, req *pb.ChatSendReq) (code return } //随机任务 - // this.module.ModuleRtask.SendToRtask(session, comm.Rtype62, 1) if _, err = this.service.AcrossClusterRpcGo( context.Background(), session.GetServiecTag(), From a48e4cca9fa173c96c2375d79727621ae7f43e73 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Wed, 19 Oct 2022 15:39:18 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=81=8A=E5=A4=A9?= =?UTF-8?q?=E9=A2=91=E9=81=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/chat/api_getlist.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/chat/api_getlist.go b/modules/chat/api_getlist.go index 91792038d..2016442c5 100644 --- a/modules/chat/api_getlist.go +++ b/modules/chat/api_getlist.go @@ -61,12 +61,12 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.ChatGetListReq) return } break - // case pb.ChatChannel_System: - // if list, err = this.module.modelChat.getChatQueue(req.Channel, session.GetServiecTag(), "", 0); err != nil { - // code = pb.ErrorCode_DBError - // return - // } - // break + case pb.ChatChannel_System: + if list, err = this.module.modelChat.getChatQueue(req.Channel, session.GetServiecTag(), "", 0); err != nil { + code = pb.ErrorCode_DBError + return + } + break default: code = pb.ErrorCode_ReqParameterError this.module.Errorf("getlist no support channel:%d ", req.Channel)