diff --git a/modules/chat/api_send.go b/modules/chat/api_send.go index 0e7753b72..15c2a0aea 100644 --- a/modules/chat/api_send.go +++ b/modules/chat/api_send.go @@ -73,16 +73,17 @@ func (this *apiComp) Send(session comm.IUserSession, req *pb.ChatSendReq) (code code = pb.ErrorCode_DBError return } + 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) - } + // 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 diff --git a/modules/rtask/module.go b/modules/rtask/module.go index ddcef92e4..b75fb2970 100644 --- a/modules/rtask/module.go +++ b/modules/rtask/module.go @@ -209,6 +209,20 @@ func (this *ModuleRtask) initRtaskVerifyHandle() { } func (this *ModuleRtask) SendToRtask(session comm.IUserSession, rtaskType comm.TaskType, params ...int32) (code pb.ErrorCode) { + if this.IsCross() { + //随机任务 + if _, err := this.service.AcrossClusterRpcGo( + context.Background(), + session.GetServiecTag(), + comm.Service_Worker, + string(comm.Rpc_ModuleRtaskSendTask), + pb.RPCRTaskReq{Uid: session.GetUserId(), TaskType: int32(rtaskType), Param: params}, + nil); err != nil { + this.Errorln(err) + } + return + } + this.Debug("任务事件触发", log.Field{"uid", session.GetUserId()}, log.Field{"taskType", rtaskType}, log.Field{"params", params}) var ( err error @@ -335,11 +349,16 @@ func (this *ModuleRtask) Rpc_ModuleRtaskSendTask(ctx context.Context, args *pb.R return } + if this.IsCross() { + 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) + this.SendToRtask(session, comm.TaskType(args.TaskType), args.Param...) session.Push() } return diff --git a/pb/comm.pb.go b/pb/comm.pb.go index e353957a2..7409dc5c4 100644 --- a/pb/comm.pb.go +++ b/pb/comm.pb.go @@ -1436,13 +1436,9 @@ type RPCRTaskReq struct { 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"` + Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"` + TaskType int32 `protobuf:"varint,2,opt,name=taskType,proto3" json:"taskType"` + Param []int32 `protobuf:"varint,3,rep,packed,name=param,proto3" json:"param"` } func (x *RPCRTaskReq) Reset() { @@ -1491,39 +1487,11 @@ func (x *RPCRTaskReq) GetTaskType() int32 { return 0 } -func (x *RPCRTaskReq) GetParam1() int32 { +func (x *RPCRTaskReq) GetParam() []int32 { if x != nil { - return x.Param1 + return x.Param } - 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 + return nil } var File_comm_proto protoreflect.FileDescriptor @@ -1665,23 +1633,17 @@ 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, 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, + 0x61, 0x72, 0x61, 0x6d, 0x34, 0x22, 0x51, 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, 0x14, 0x0a, 0x05, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x18, 0x03, 0x20, 0x03, 0x28, + 0x05, 0x52, 0x05, 0x70, 0x61, 0x72, 0x61, 0x6d, 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 (