diff --git a/cmd/robot/robot.go b/cmd/robot/robot.go index e4cbe83d3..8217f2031 100644 --- a/cmd/robot/robot.go +++ b/cmd/robot/robot.go @@ -83,9 +83,9 @@ func (r *Robot) onUserLoaded() { // r.CreateUser("乐谷616") //friend - // r.FriendApply("0_62aa9427e2979698b080ec78") - r.FriendAgree([]string{"0_62a9afd994fe03b7aaee6773"}) - // r.FriendRefuse([]string{}) + // r.FriendApply("1_62aa8f30d25fb8c1a7d90b50") + // r.FriendAgree([]string{"0_62a9afd994fe03b7aaee6773"}) + r.FriendRefuse([]string{"0_62aa9427e2979698b080ec78"}) // r.FriendApplyList() // r.FriendList() // r.FriendBlacklist() diff --git a/modules/model_comp.go b/modules/model_comp.go index a1ffa3537..c4f5e31d5 100644 --- a/modules/model_comp.go +++ b/modules/model_comp.go @@ -111,7 +111,7 @@ func (this *Model_Comp) SetObj(uid string, data proto.Message, isnew, islog bool if isnew { return this.InsertModelLogs(this.TableName, uid, data) } else { - return this.UpdateModelLogs(this.TableName, uid, bson.M{"_id": uid}, data) + return this.UpdateModelLogs(this.TableName, uid, bson.M{"uid": uid}, data) } } return nil diff --git a/modules/user/api_create.go b/modules/user/api_create.go index 70f98e333..6f3b66bce 100644 --- a/modules/user/api_create.go +++ b/modules/user/api_create.go @@ -14,17 +14,24 @@ func (this *Api_Comp) Create_Check(session comm.IUserSession, req *pb.UserCreate //创角 func (this *Api_Comp) Create(session comm.IUserSession, result map[string]interface{}, req *pb.UserCreateReq) (err error) { defer utils.TraceFunc(session.GetUserId(), string(this.module.GetType()), User_SubType_Create, req, nil) - var code pb.ErrorCode + self := &pb.DB_UserData{} + defer func() { session.SendMsg(string(this.module.GetType()), User_SubType_Create, code, &pb.UserCreateRsp{}) }() //更新昵称 - update := map[string]interface{}{ - "name": req.NickName, + // update := map[string]interface{}{ + // "name": req.NickName, + // } + err = this.module.modelUser.GetObj(session.GetUserId(), self) + if err != nil { + code = pb.ErrorCode_DBError + return } - err = this.module.modelUser.Set(session.GetUserId(), update, false, true) + self.Name = req.NickName + err = this.module.modelUser.SetObj(session.GetUserId(), self, false, true) if err != nil { code = pb.ErrorCode_DBError return diff --git a/modules/user/api_login.go b/modules/user/api_login.go index 22d63cb2d..aa8879be8 100644 --- a/modules/user/api_login.go +++ b/modules/user/api_login.go @@ -50,9 +50,7 @@ func (this *Api_Comp) Login(session comm.IUserSession, result map[string]interfa defer func() { if db_user != nil { session.SendMsg(string(this.module.GetType()), User_SubType_Login, code, &pb.UserLoginResp{ - Data: &pb.Cache_UserData{ - Uid: db_user.Id, - }, + Data: db_user, }) event.TriggerEvent(comm.Event_UserLogin, db_user.Uid) } diff --git a/modules/user/model_session.go b/modules/user/model_session.go index 2c2b0614e..4c2bf90f5 100644 --- a/modules/user/model_session.go +++ b/modules/user/model_session.go @@ -11,6 +11,6 @@ type ModelSession struct { func (this *ModelSession) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { err = this.Model_Comp.Init(service, module, comp, options) - this.Prefix = "session" + this.TableName = "session" return } diff --git a/modules/user/model_user.go b/modules/user/model_user.go index f56805c6f..afbd963cc 100644 --- a/modules/user/model_user.go +++ b/modules/user/model_user.go @@ -23,7 +23,7 @@ type ModelUser struct { func (this *ModelUser) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { err = this.Model_Comp.Init(service, module, comp, options) - this.Prefix = "user" + this.TableName = "user" return } diff --git a/pb/comm.pb.go b/pb/comm.pb.go index 7cd18c8e1..df790ef4e 100644 --- a/pb/comm.pb.go +++ b/pb/comm.pb.go @@ -27,9 +27,9 @@ type UserMessage struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - MainType string `protobuf:"bytes,1,opt,name=MainType,proto3" json:"MainType,omitempty"` //用户消息处理 模块名 例如:user 对应项目中 user的模块 - SubType string `protobuf:"bytes,2,opt,name=SubType,proto3" json:"SubType,omitempty"` //用户消息处理函数名 例如:login 对应项目中 user的模块中 api_login 的处理函数 - Data *anypb.Any `protobuf:"bytes,3,opt,name=data,proto3" json:"data,omitempty"` + MainType string `protobuf:"bytes,1,opt,name=MainType,proto3" json:"MainType"` //用户消息处理 模块名 例如:user 对应项目中 user的模块 + SubType string `protobuf:"bytes,2,opt,name=SubType,proto3" json:"SubType"` //用户消息处理函数名 例如:login 对应项目中 user的模块中 api_login 的处理函数 + Data *anypb.Any `protobuf:"bytes,3,opt,name=data,proto3" json:"data"` } func (x *UserMessage) Reset() { @@ -91,12 +91,12 @@ type AgentMessage struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Ip string `protobuf:"bytes,1,opt,name=Ip,proto3" json:"Ip,omitempty"` - UserSessionId string `protobuf:"bytes,2,opt,name=UserSessionId,proto3" json:"UserSessionId,omitempty"` - UserId string `protobuf:"bytes,3,opt,name=UserId,proto3" json:"UserId,omitempty"` - GatewayServiceId string `protobuf:"bytes,4,opt,name=GatewayServiceId,proto3" json:"GatewayServiceId,omitempty"` - Method string `protobuf:"bytes,5,opt,name=Method,proto3" json:"Method,omitempty"` - Message *anypb.Any `protobuf:"bytes,6,opt,name=Message,proto3" json:"Message,omitempty"` + Ip string `protobuf:"bytes,1,opt,name=Ip,proto3" json:"Ip"` + UserSessionId string `protobuf:"bytes,2,opt,name=UserSessionId,proto3" json:"UserSessionId"` + UserId string `protobuf:"bytes,3,opt,name=UserId,proto3" json:"UserId"` + GatewayServiceId string `protobuf:"bytes,4,opt,name=GatewayServiceId,proto3" json:"GatewayServiceId"` + Method string `protobuf:"bytes,5,opt,name=Method,proto3" json:"Method"` + Message *anypb.Any `protobuf:"bytes,6,opt,name=Message,proto3" json:"Message"` } func (x *AgentMessage) Reset() { @@ -179,9 +179,9 @@ type RPCMessageReply struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Code ErrorCode `protobuf:"varint,1,opt,name=Code,proto3,enum=ErrorCode" json:"Code,omitempty"` - Message string `protobuf:"bytes,2,opt,name=Message,proto3" json:"Message,omitempty"` - Data string `protobuf:"bytes,3,opt,name=Data,proto3" json:"Data,omitempty"` + Code ErrorCode `protobuf:"varint,1,opt,name=Code,proto3,enum=ErrorCode" json:"Code"` + Message string `protobuf:"bytes,2,opt,name=Message,proto3" json:"Message"` + Data string `protobuf:"bytes,3,opt,name=Data,proto3" json:"Data"` } func (x *RPCMessageReply) Reset() { @@ -243,9 +243,9 @@ type AgentBuildReq struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - UserSessionId string `protobuf:"bytes,1,opt,name=UserSessionId,proto3" json:"UserSessionId,omitempty"` - UserId string `protobuf:"bytes,2,opt,name=UserId,proto3" json:"UserId,omitempty"` - WorkerId string `protobuf:"bytes,3,opt,name=WorkerId,proto3" json:"WorkerId,omitempty"` + UserSessionId string `protobuf:"bytes,1,opt,name=UserSessionId,proto3" json:"UserSessionId"` + UserId string `protobuf:"bytes,2,opt,name=UserId,proto3" json:"UserId"` + WorkerId string `protobuf:"bytes,3,opt,name=WorkerId,proto3" json:"WorkerId"` } func (x *AgentBuildReq) Reset() { @@ -307,7 +307,7 @@ type AgentUnBuildReq struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - UserSessionId string `protobuf:"bytes,1,opt,name=UserSessionId,proto3" json:"UserSessionId,omitempty"` + UserSessionId string `protobuf:"bytes,1,opt,name=UserSessionId,proto3" json:"UserSessionId"` } func (x *AgentUnBuildReq) Reset() { @@ -355,10 +355,10 @@ type AgentSendMessageReq struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - UserSessionId string `protobuf:"bytes,1,opt,name=UserSessionId,proto3" json:"UserSessionId,omitempty"` - MainType string `protobuf:"bytes,2,opt,name=MainType,proto3" json:"MainType,omitempty"` - SubType string `protobuf:"bytes,3,opt,name=SubType,proto3" json:"SubType,omitempty"` - Data *anypb.Any `protobuf:"bytes,4,opt,name=Data,proto3" json:"Data,omitempty"` + UserSessionId string `protobuf:"bytes,1,opt,name=UserSessionId,proto3" json:"UserSessionId"` + MainType string `protobuf:"bytes,2,opt,name=MainType,proto3" json:"MainType"` + SubType string `protobuf:"bytes,3,opt,name=SubType,proto3" json:"SubType"` + Data *anypb.Any `protobuf:"bytes,4,opt,name=Data,proto3" json:"Data"` } func (x *AgentSendMessageReq) Reset() { @@ -427,10 +427,10 @@ type BatchMessageReq struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - UserSessionIds []string `protobuf:"bytes,1,rep,name=UserSessionIds,proto3" json:"UserSessionIds,omitempty"` - MainType string `protobuf:"bytes,2,opt,name=MainType,proto3" json:"MainType,omitempty"` - SubType string `protobuf:"bytes,3,opt,name=SubType,proto3" json:"SubType,omitempty"` - Data *anypb.Any `protobuf:"bytes,4,opt,name=Data,proto3" json:"Data,omitempty"` + UserSessionIds []string `protobuf:"bytes,1,rep,name=UserSessionIds,proto3" json:"UserSessionIds"` + MainType string `protobuf:"bytes,2,opt,name=MainType,proto3" json:"MainType"` + SubType string `protobuf:"bytes,3,opt,name=SubType,proto3" json:"SubType"` + Data *anypb.Any `protobuf:"bytes,4,opt,name=Data,proto3" json:"Data"` } func (x *BatchMessageReq) Reset() { @@ -499,9 +499,9 @@ type BroadCastMessageReq struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - MainType string `protobuf:"bytes,1,opt,name=MainType,proto3" json:"MainType,omitempty"` //服务名 - SubType string `protobuf:"bytes,2,opt,name=SubType,proto3" json:"SubType,omitempty"` - Data *anypb.Any `protobuf:"bytes,3,opt,name=Data,proto3" json:"Data,omitempty"` + MainType string `protobuf:"bytes,1,opt,name=MainType,proto3" json:"MainType"` //服务名 + SubType string `protobuf:"bytes,2,opt,name=SubType,proto3" json:"SubType"` + Data *anypb.Any `protobuf:"bytes,3,opt,name=Data,proto3" json:"Data"` } func (x *BroadCastMessageReq) Reset() { @@ -563,7 +563,7 @@ type AgentCloseeReq struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - UserSessionId string `protobuf:"bytes,1,opt,name=UserSessionId,proto3" json:"UserSessionId,omitempty"` + UserSessionId string `protobuf:"bytes,1,opt,name=UserSessionId,proto3" json:"UserSessionId"` } func (x *AgentCloseeReq) Reset() { diff --git a/pb/friend_db.pb.go b/pb/friend_db.pb.go index c5a69f3cd..b2fc9e3b8 100644 --- a/pb/friend_db.pb.go +++ b/pb/friend_db.pb.go @@ -25,10 +25,10 @@ type DB_FriendData struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - UserId string `protobuf:"bytes,1,opt,name=userId,proto3" json:"userId,omitempty" bson:"_id"` // ID - FriendIds []string `protobuf:"bytes,2,rep,name=friendIds,proto3" json:"friendIds,omitempty"` //好友ID - ApplyIds []string `protobuf:"bytes,3,rep,name=applyIds,proto3" json:"applyIds,omitempty"` //申请用户ID - BlackIds []string `protobuf:"bytes,4,rep,name=blackIds,proto3" json:"blackIds,omitempty"` //黑名单ID + UserId string `protobuf:"bytes,1,opt,name=userId,proto3" json:"userId" bson:"_id"` // ID + FriendIds []string `protobuf:"bytes,2,rep,name=friendIds,proto3" json:"friendIds"` //好友ID + ApplyIds []string `protobuf:"bytes,3,rep,name=applyIds,proto3" json:"applyIds"` //申请用户ID + BlackIds []string `protobuf:"bytes,4,rep,name=blackIds,proto3" json:"blackIds"` //黑名单ID } func (x *DB_FriendData) Reset() { diff --git a/pb/friend_msg.pb.go b/pb/friend_msg.pb.go index 725a918e5..4885e5909 100644 --- a/pb/friend_msg.pb.go +++ b/pb/friend_msg.pb.go @@ -25,13 +25,13 @@ type FriendBase struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - UserId string `protobuf:"bytes,1,opt,name=userId,proto3" json:"userId,omitempty"` //ID - NickName string `protobuf:"bytes,2,opt,name=NickName,proto3" json:"NickName,omitempty"` //昵称 - Level int32 `protobuf:"varint,3,opt,name=level,proto3" json:"level,omitempty"` //等级 - Avatar int32 `protobuf:"varint,4,opt,name=avatar,proto3" json:"avatar,omitempty"` //头像 - Strength int64 `protobuf:"varint,5,opt,name=strength,proto3" json:"strength,omitempty"` //战力 - ServerId int32 `protobuf:"varint,6,opt,name=serverId,proto3" json:"serverId,omitempty"` //服务编号 - OfflineTime int64 `protobuf:"varint,7,opt,name=offlineTime,proto3" json:"offlineTime,omitempty"` //最近一次下线时间 0在线 + UserId string `protobuf:"bytes,1,opt,name=userId,proto3" json:"userId"` //ID + NickName string `protobuf:"bytes,2,opt,name=NickName,proto3" json:"NickName"` //昵称 + Level int32 `protobuf:"varint,3,opt,name=level,proto3" json:"level"` //等级 + Avatar int32 `protobuf:"varint,4,opt,name=avatar,proto3" json:"avatar"` //头像 + Strength int64 `protobuf:"varint,5,opt,name=strength,proto3" json:"strength"` //战力 + ServerId int32 `protobuf:"varint,6,opt,name=serverId,proto3" json:"serverId"` //服务编号 + OfflineTime int64 `protobuf:"varint,7,opt,name=offlineTime,proto3" json:"offlineTime"` //最近一次下线时间 0在线 } func (x *FriendBase) Reset() { @@ -159,7 +159,7 @@ type FriendListRsp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - List []*FriendBase `protobuf:"bytes,1,rep,name=list,proto3" json:"list,omitempty"` + List []*FriendBase `protobuf:"bytes,1,rep,name=list,proto3" json:"list"` } func (x *FriendListRsp) Reset() { @@ -207,7 +207,7 @@ type FriendApplyReq struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - FriendId string `protobuf:"bytes,1,opt,name=friendId,proto3" json:"friendId,omitempty"` //好友ID + FriendId string `protobuf:"bytes,1,opt,name=friendId,proto3" json:"friendId"` //好友ID } func (x *FriendApplyReq) Reset() { @@ -254,8 +254,8 @@ type FriendApplyRsp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - UserId string `protobuf:"bytes,1,opt,name=userId,proto3" json:"userId,omitempty"` //用户ID - FriendId string `protobuf:"bytes,2,opt,name=friendId,proto3" json:"friendId,omitempty"` //好友ID + UserId string `protobuf:"bytes,1,opt,name=userId,proto3" json:"userId"` //用户ID + FriendId string `protobuf:"bytes,2,opt,name=friendId,proto3" json:"friendId"` //好友ID } func (x *FriendApplyRsp) Reset() { @@ -310,7 +310,7 @@ type FriendDelReq struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - FriendId string `protobuf:"bytes,1,opt,name=friendId,proto3" json:"friendId,omitempty"` //好友ID + FriendId string `protobuf:"bytes,1,opt,name=friendId,proto3" json:"friendId"` //好友ID } func (x *FriendDelReq) Reset() { @@ -357,8 +357,8 @@ type FriendDelRsp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - FriendId string `protobuf:"bytes,1,opt,name=friendId,proto3" json:"friendId,omitempty"` //好友ID - UserId string `protobuf:"bytes,2,opt,name=userId,proto3" json:"userId,omitempty"` //用户ID + FriendId string `protobuf:"bytes,1,opt,name=friendId,proto3" json:"friendId"` //好友ID + UserId string `protobuf:"bytes,2,opt,name=userId,proto3" json:"userId"` //用户ID } func (x *FriendDelRsp) Reset() { @@ -413,7 +413,7 @@ type FriendAgreeReq struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - FriendIds []string `protobuf:"bytes,1,rep,name=friendIds,proto3" json:"friendIds,omitempty"` //被同意的用户 + FriendIds []string `protobuf:"bytes,1,rep,name=friendIds,proto3" json:"friendIds"` //被同意的用户 } func (x *FriendAgreeReq) Reset() { @@ -460,7 +460,7 @@ type FriendAgreeRsp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Num int32 `protobuf:"varint,1,opt,name=Num,proto3" json:"Num,omitempty"` //操作的数量 + Num int32 `protobuf:"varint,1,opt,name=Num,proto3" json:"Num"` //操作的数量 } func (x *FriendAgreeRsp) Reset() { @@ -508,7 +508,7 @@ type FriendRefuseReq struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - FriendIds []string `protobuf:"bytes,1,rep,name=friendIds,proto3" json:"friendIds,omitempty"` //被拒绝的用户 + FriendIds []string `protobuf:"bytes,1,rep,name=friendIds,proto3" json:"friendIds"` //被拒绝的用户 } func (x *FriendRefuseReq) Reset() { @@ -555,7 +555,7 @@ type FriendRefuseRsp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Num int32 `protobuf:"varint,1,opt,name=Num,proto3" json:"Num,omitempty"` //操作的数量 + Num int32 `protobuf:"varint,1,opt,name=Num,proto3" json:"Num"` //操作的数量 } func (x *FriendRefuseRsp) Reset() { @@ -641,7 +641,7 @@ type FriendApplyListRsp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - List []*FriendBase `protobuf:"bytes,1,rep,name=list,proto3" json:"list,omitempty"` + List []*FriendBase `protobuf:"bytes,1,rep,name=list,proto3" json:"list"` } func (x *FriendApplyListRsp) Reset() { @@ -689,7 +689,7 @@ type FriendSearchReq struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - NickName string `protobuf:"bytes,1,opt,name=nickName,proto3" json:"nickName,omitempty"` //好友昵称 + NickName string `protobuf:"bytes,1,opt,name=nickName,proto3" json:"nickName"` //好友昵称 } func (x *FriendSearchReq) Reset() { @@ -736,7 +736,7 @@ type FriendSearchRsp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Friend *FriendBase `protobuf:"bytes,1,opt,name=friend,proto3" json:"friend,omitempty"` + Friend *FriendBase `protobuf:"bytes,1,opt,name=friend,proto3" json:"friend"` } func (x *FriendSearchRsp) Reset() { @@ -822,7 +822,7 @@ type FriendBlackListRsp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Friends []*FriendBase `protobuf:"bytes,1,rep,name=friends,proto3" json:"friends,omitempty"` + Friends []*FriendBase `protobuf:"bytes,1,rep,name=friends,proto3" json:"friends"` } func (x *FriendBlackListRsp) Reset() { @@ -870,7 +870,7 @@ type FriendBlackAddReq struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - FriendId string `protobuf:"bytes,1,opt,name=friendId,proto3" json:"friendId,omitempty"` + FriendId string `protobuf:"bytes,1,opt,name=friendId,proto3" json:"friendId"` } func (x *FriendBlackAddReq) Reset() { @@ -917,8 +917,8 @@ type FriendBlackAddRsp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - FriendId string `protobuf:"bytes,1,opt,name=friendId,proto3" json:"friendId,omitempty"` - UserId string `protobuf:"bytes,2,opt,name=userId,proto3" json:"userId,omitempty"` + FriendId string `protobuf:"bytes,1,opt,name=friendId,proto3" json:"friendId"` + UserId string `protobuf:"bytes,2,opt,name=userId,proto3" json:"userId"` } func (x *FriendBlackAddRsp) Reset() { @@ -973,7 +973,7 @@ type FriendDelBlackReq struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - FriendId string `protobuf:"bytes,1,opt,name=friendId,proto3" json:"friendId,omitempty"` + FriendId string `protobuf:"bytes,1,opt,name=friendId,proto3" json:"friendId"` } func (x *FriendDelBlackReq) Reset() { @@ -1020,8 +1020,8 @@ type FriendDelBlackRsp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - FriendId string `protobuf:"bytes,1,opt,name=friendId,proto3" json:"friendId,omitempty"` - UserId string `protobuf:"bytes,2,opt,name=userId,proto3" json:"userId,omitempty"` + FriendId string `protobuf:"bytes,1,opt,name=friendId,proto3" json:"friendId"` + UserId string `protobuf:"bytes,2,opt,name=userId,proto3" json:"userId"` } func (x *FriendDelBlackRsp) Reset() { @@ -1076,7 +1076,7 @@ type FriendReceiveReq struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - FriendId string `protobuf:"bytes,1,opt,name=friendId,proto3" json:"friendId,omitempty"` + FriendId string `protobuf:"bytes,1,opt,name=friendId,proto3" json:"friendId"` } func (x *FriendReceiveReq) Reset() { @@ -1123,8 +1123,8 @@ type FriendReceiveRsp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - FriendId string `protobuf:"bytes,1,opt,name=friendId,proto3" json:"friendId,omitempty"` - UserId string `protobuf:"bytes,2,opt,name=userId,proto3" json:"userId,omitempty"` + FriendId string `protobuf:"bytes,1,opt,name=friendId,proto3" json:"friendId"` + UserId string `protobuf:"bytes,2,opt,name=userId,proto3" json:"userId"` } func (x *FriendReceiveRsp) Reset() { @@ -1179,7 +1179,7 @@ type FriendGiveReq struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - FriendId string `protobuf:"bytes,1,opt,name=friendId,proto3" json:"friendId,omitempty"` + FriendId string `protobuf:"bytes,1,opt,name=friendId,proto3" json:"friendId"` } func (x *FriendGiveReq) Reset() { @@ -1226,8 +1226,8 @@ type FriendGiveRsp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - FriendId string `protobuf:"bytes,1,opt,name=friendId,proto3" json:"friendId,omitempty"` - UserId string `protobuf:"bytes,2,opt,name=userId,proto3" json:"userId,omitempty"` + FriendId string `protobuf:"bytes,1,opt,name=friendId,proto3" json:"friendId"` + UserId string `protobuf:"bytes,2,opt,name=userId,proto3" json:"userId"` } func (x *FriendGiveRsp) Reset() { @@ -1282,7 +1282,7 @@ type FriendTotalReq struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - FriendId string `protobuf:"bytes,1,opt,name=friendId,proto3" json:"friendId,omitempty"` + FriendId string `protobuf:"bytes,1,opt,name=friendId,proto3" json:"friendId"` } func (x *FriendTotalReq) Reset() { @@ -1329,8 +1329,8 @@ type FriendTotalRsp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - FriendId string `protobuf:"bytes,1,opt,name=friendId,proto3" json:"friendId,omitempty"` - Total int32 `protobuf:"varint,2,opt,name=total,proto3" json:"total,omitempty"` //好友数量 + FriendId string `protobuf:"bytes,1,opt,name=friendId,proto3" json:"friendId"` + Total int32 `protobuf:"varint,2,opt,name=total,proto3" json:"total"` //好友数量 } func (x *FriendTotalRsp) Reset() { diff --git a/pb/mail_db.pb.go b/pb/mail_db.pb.go index c4a422a41..29cd81e91 100644 --- a/pb/mail_db.pb.go +++ b/pb/mail_db.pb.go @@ -25,8 +25,8 @@ type MailAttachment struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ItemId uint32 `protobuf:"varint,1,opt,name=ItemId,proto3" json:"ItemId,omitempty"` // 道具iD - ItemCount uint32 `protobuf:"varint,2,opt,name=ItemCount,proto3" json:"ItemCount,omitempty"` // 数量 + ItemId uint32 `protobuf:"varint,1,opt,name=ItemId,proto3" json:"ItemId"` // 道具iD + ItemCount uint32 `protobuf:"varint,2,opt,name=ItemCount,proto3" json:"ItemCount"` // 数量 } func (x *MailAttachment) Reset() { @@ -80,15 +80,15 @@ type DB_MailData struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ObjId string `protobuf:"bytes,1,opt,name=ObjId,proto3" json:"ObjId,omitempty" bson:"_id"` // ID - UserId string `protobuf:"bytes,2,opt,name=UserId,proto3" json:"UserId,omitempty"` - Title string `protobuf:"bytes,3,opt,name=Title,proto3" json:"Title,omitempty"` // 邮件标题 - Contex string `protobuf:"bytes,4,opt,name=Contex,proto3" json:"Contex,omitempty"` // 邮件内容 - CreateTime uint64 `protobuf:"varint,5,opt,name=CreateTime,proto3" json:"CreateTime,omitempty"` // 发送时间 - DueTime uint64 `protobuf:"varint,6,opt,name=DueTime,proto3" json:"DueTime,omitempty"` // 过期时间 - Check bool `protobuf:"varint,7,opt,name=Check,proto3" json:"Check,omitempty"` // 是否查看 - Reward bool `protobuf:"varint,8,opt,name=Reward,proto3" json:"Reward,omitempty"` // 附件领取状态 - Items []*MailAttachment `protobuf:"bytes,9,rep,name=Items,proto3" json:"Items,omitempty"` // 附件 + ObjId string `protobuf:"bytes,1,opt,name=ObjId,proto3" json:"ObjId" bson:"_id"` // ID + UserId string `protobuf:"bytes,2,opt,name=UserId,proto3" json:"UserId"` + Title string `protobuf:"bytes,3,opt,name=Title,proto3" json:"Title"` // 邮件标题 + Contex string `protobuf:"bytes,4,opt,name=Contex,proto3" json:"Contex"` // 邮件内容 + CreateTime uint64 `protobuf:"varint,5,opt,name=CreateTime,proto3" json:"CreateTime"` // 发送时间 + DueTime uint64 `protobuf:"varint,6,opt,name=DueTime,proto3" json:"DueTime"` // 过期时间 + Check bool `protobuf:"varint,7,opt,name=Check,proto3" json:"Check"` // 是否查看 + Reward bool `protobuf:"varint,8,opt,name=Reward,proto3" json:"Reward"` // 附件领取状态 + Items []*MailAttachment `protobuf:"bytes,9,rep,name=Items,proto3" json:"Items"` // 附件 } func (x *DB_MailData) Reset() { diff --git a/pb/mail_msg.pb.go b/pb/mail_msg.pb.go index 388595803..ba6149350 100644 --- a/pb/mail_msg.pb.go +++ b/pb/mail_msg.pb.go @@ -64,7 +64,7 @@ type QueryUserMailResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Mails []*DB_MailData `protobuf:"bytes,1,rep,name=Mails,proto3" json:"Mails,omitempty"` + Mails []*DB_MailData `protobuf:"bytes,1,rep,name=Mails,proto3" json:"Mails"` } func (x *QueryUserMailResp) Reset() { @@ -112,7 +112,7 @@ type ReadUserMailReq struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ObjID string `protobuf:"bytes,1,opt,name=ObjID,proto3" json:"ObjID,omitempty"` + ObjID string `protobuf:"bytes,1,opt,name=ObjID,proto3" json:"ObjID"` } func (x *ReadUserMailReq) Reset() { @@ -159,7 +159,7 @@ type ReadUserMailResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Mail *DB_MailData `protobuf:"bytes,1,opt,name=Mail,proto3" json:"Mail,omitempty"` + Mail *DB_MailData `protobuf:"bytes,1,opt,name=Mail,proto3" json:"Mail"` } func (x *ReadUserMailResp) Reset() { @@ -207,7 +207,7 @@ type GetUserMailAttachmentReq struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ObjID string `protobuf:"bytes,1,opt,name=ObjID,proto3" json:"ObjID,omitempty"` + ObjID string `protobuf:"bytes,1,opt,name=ObjID,proto3" json:"ObjID"` } func (x *GetUserMailAttachmentReq) Reset() { @@ -254,7 +254,7 @@ type GetUserMailAttachmentResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Mail *DB_MailData `protobuf:"bytes,1,opt,name=Mail,proto3" json:"Mail,omitempty"` + Mail *DB_MailData `protobuf:"bytes,1,opt,name=Mail,proto3" json:"Mail"` } func (x *GetUserMailAttachmentResp) Reset() { @@ -302,7 +302,7 @@ type DelUserMailReq struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ObjID string `protobuf:"bytes,1,opt,name=ObjID,proto3" json:"ObjID,omitempty"` + ObjID string `protobuf:"bytes,1,opt,name=ObjID,proto3" json:"ObjID"` } func (x *DelUserMailReq) Reset() { @@ -349,7 +349,7 @@ type DelUserMailResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Mail []*DB_MailData `protobuf:"bytes,1,rep,name=Mail,proto3" json:"Mail,omitempty"` + Mail []*DB_MailData `protobuf:"bytes,1,rep,name=Mail,proto3" json:"Mail"` } func (x *DelUserMailResp) Reset() { diff --git a/pb/notify_msg.pb.go b/pb/notify_msg.pb.go index a1a995cf5..b5a7e3566 100644 --- a/pb/notify_msg.pb.go +++ b/pb/notify_msg.pb.go @@ -26,11 +26,11 @@ type ErrorNotify struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ReqMainType string `protobuf:"bytes,1,opt,name=ReqMainType,proto3" json:"ReqMainType,omitempty"` // 请求协议模块 模块名 例如:user 对应项目中 user的模块 - ReqSubType string `protobuf:"bytes,2,opt,name=ReqSubType,proto3" json:"ReqSubType,omitempty"` // 请求协议函数 例如:login 对应项目中 user的模块中 api_login 的处理函数 - Code ErrorCode `protobuf:"varint,3,opt,name=Code,proto3,enum=ErrorCode" json:"Code,omitempty"` // 执行返回错误码 对应 errorcode.proto 枚举 - Message string `protobuf:"bytes,4,opt,name=Message,proto3" json:"Message,omitempty"` // 错误消息 - Data string `protobuf:"bytes,6,opt,name=Data,proto3" json:"Data,omitempty"` // 错误数据 + ReqMainType string `protobuf:"bytes,1,opt,name=ReqMainType,proto3" json:"ReqMainType"` // 请求协议模块 模块名 例如:user 对应项目中 user的模块 + ReqSubType string `protobuf:"bytes,2,opt,name=ReqSubType,proto3" json:"ReqSubType"` // 请求协议函数 例如:login 对应项目中 user的模块中 api_login 的处理函数 + Code ErrorCode `protobuf:"varint,3,opt,name=Code,proto3,enum=ErrorCode" json:"Code"` // 执行返回错误码 对应 errorcode.proto 枚举 + Message string `protobuf:"bytes,4,opt,name=Message,proto3" json:"Message"` // 错误消息 + Data string `protobuf:"bytes,6,opt,name=Data,proto3" json:"Data"` // 错误数据 } func (x *ErrorNotify) Reset() { diff --git a/pb/pack_db.pb.go b/pb/pack_db.pb.go index 235c28ad7..b353fea0f 100644 --- a/pb/pack_db.pb.go +++ b/pb/pack_db.pb.go @@ -26,14 +26,14 @@ type DB_UserItemData struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - GridId string `protobuf:"bytes,1,opt,name=GridId,proto3" json:"GridId,omitempty"` //背包格子Id - UId string `protobuf:"bytes,2,opt,name=UId,proto3" json:"UId,omitempty"` //用户id - IsEmpty bool `protobuf:"varint,3,opt,name=IsEmpty,proto3" json:"IsEmpty,omitempty"` //是否是空格子 - ItemId int32 `protobuf:"varint,4,opt,name=ItemId,proto3" json:"ItemId,omitempty"` //存放物品的Id - Amount uint32 `protobuf:"varint,5,opt,name=Amount,proto3" json:"Amount,omitempty"` //存放物品的数量 - CTime int64 `protobuf:"varint,6,opt,name=CTime,proto3" json:"CTime,omitempty"` //物品获取时间 - ETime int64 `protobuf:"varint,7,opt,name=ETime,proto3" json:"ETime,omitempty"` //物品过期时间 - IsNewItem bool `protobuf:"varint,8,opt,name=IsNewItem,proto3" json:"IsNewItem,omitempty"` //是否是新的 + GridId string `protobuf:"bytes,1,opt,name=GridId,proto3" json:"GridId"` //背包格子Id + UId string `protobuf:"bytes,2,opt,name=UId,proto3" json:"UId"` //用户id + IsEmpty bool `protobuf:"varint,3,opt,name=IsEmpty,proto3" json:"IsEmpty"` //是否是空格子 + ItemId int32 `protobuf:"varint,4,opt,name=ItemId,proto3" json:"ItemId"` //存放物品的Id + Amount uint32 `protobuf:"varint,5,opt,name=Amount,proto3" json:"Amount"` //存放物品的数量 + CTime int64 `protobuf:"varint,6,opt,name=CTime,proto3" json:"CTime"` //物品获取时间 + ETime int64 `protobuf:"varint,7,opt,name=ETime,proto3" json:"ETime"` //物品过期时间 + IsNewItem bool `protobuf:"varint,8,opt,name=IsNewItem,proto3" json:"IsNewItem"` //是否是新的 } func (x *DB_UserItemData) Reset() { diff --git a/pb/pack_msg.pb.go b/pb/pack_msg.pb.go index ca8145d3d..140b19eeb 100644 --- a/pb/pack_msg.pb.go +++ b/pb/pack_msg.pb.go @@ -26,7 +26,7 @@ type GetlistReq struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - IType int32 `protobuf:"varint,1,opt,name=IType,proto3" json:"IType,omitempty"` //道具类型 + IType int32 `protobuf:"varint,1,opt,name=IType,proto3" json:"IType"` //道具类型 } func (x *GetlistReq) Reset() { @@ -74,7 +74,7 @@ type GetlistResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Grids []*DB_UserItemData `protobuf:"bytes,1,rep,name=Grids,proto3" json:"Grids,omitempty"` //用户背包列表 + Grids []*DB_UserItemData `protobuf:"bytes,1,rep,name=Grids,proto3" json:"Grids"` //用户背包列表 } func (x *GetlistResp) Reset() { @@ -122,9 +122,9 @@ type UseItemReq struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - GridId int32 `protobuf:"varint,1,opt,name=GridId,proto3" json:"GridId,omitempty"` //格子Id - ItemId int32 `protobuf:"varint,2,opt,name=ItemId,proto3" json:"ItemId,omitempty"` //物品Id - Amount uint32 `protobuf:"varint,3,opt,name=Amount,proto3" json:"Amount,omitempty"` //使用数量 + GridId int32 `protobuf:"varint,1,opt,name=GridId,proto3" json:"GridId"` //格子Id + ItemId int32 `protobuf:"varint,2,opt,name=ItemId,proto3" json:"ItemId"` //物品Id + Amount uint32 `protobuf:"varint,3,opt,name=Amount,proto3" json:"Amount"` //使用数量 } func (x *UseItemReq) Reset() { @@ -225,9 +225,9 @@ type SellItemReq struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - GridId int32 `protobuf:"varint,1,opt,name=GridId,proto3" json:"GridId,omitempty"` //格子Id - ItemId int32 `protobuf:"varint,2,opt,name=ItemId,proto3" json:"ItemId,omitempty"` //物品Id - Amount uint32 `protobuf:"varint,3,opt,name=Amount,proto3" json:"Amount,omitempty"` //使用数量 + GridId int32 `protobuf:"varint,1,opt,name=GridId,proto3" json:"GridId"` //格子Id + ItemId int32 `protobuf:"varint,2,opt,name=ItemId,proto3" json:"ItemId"` //物品Id + Amount uint32 `protobuf:"varint,3,opt,name=Amount,proto3" json:"Amount"` //使用数量 } func (x *SellItemReq) Reset() { diff --git a/pb/proto/user/user_msg.proto b/pb/proto/user/user_msg.proto index 15af03494..a442da9fd 100644 --- a/pb/proto/user/user_msg.proto +++ b/pb/proto/user/user_msg.proto @@ -8,9 +8,12 @@ message UserLoginReq { string sec = 1; //密文 } -message UserLoginResp { Cache_UserData data = 1; } +message UserLoginResp { DB_UserData data = 1; } -message UserRegisterReq { string account = 1; } +message UserRegisterReq { + string account = 1; + int32 sid = 2; +} message UserRegisterRsp { ErrorCode Code = 1; diff --git a/pb/user_db.pb.go b/pb/user_db.pb.go index 09013d493..4d34f828b 100644 --- a/pb/user_db.pb.go +++ b/pb/user_db.pb.go @@ -25,9 +25,9 @@ type Cache_UserData struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid,omitempty"` - SessionId string `protobuf:"bytes,2,opt,name=SessionId,proto3" json:"SessionId,omitempty"` - GatewayServiceId string `protobuf:"bytes,3,opt,name=GatewayServiceId,proto3" json:"GatewayServiceId,omitempty"` // DB_UserData UserData = 4; + Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"` + SessionId string `protobuf:"bytes,2,opt,name=SessionId,proto3" json:"SessionId"` + GatewayServiceId string `protobuf:"bytes,3,opt,name=GatewayServiceId,proto3" json:"GatewayServiceId"` // DB_UserData UserData = 4; } func (x *Cache_UserData) Reset() { @@ -88,18 +88,18 @@ type DB_UserData struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty" bson:"_id"` // ID - Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid,omitempty"` - Uuid string `protobuf:"bytes,3,opt,name=uuid,proto3" json:"uuid,omitempty"` //玩家唯一uuid - Binduid string `protobuf:"bytes,4,opt,name=binduid,proto3" json:"binduid,omitempty"` //玩家账号 - Name string `protobuf:"bytes,5,opt,name=name,proto3" json:"name,omitempty"` //玩家名 - Sid int32 `protobuf:"varint,6,opt,name=sid,proto3" json:"sid,omitempty"` //区服id - Createip string `protobuf:"bytes,7,opt,name=createip,proto3" json:"createip,omitempty"` //创建账号时的ip - Lastloginip string `protobuf:"bytes,8,opt,name=lastloginip,proto3" json:"lastloginip,omitempty"` //最后一次登录时的ip - Ctime int64 `protobuf:"varint,9,opt,name=ctime,proto3" json:"ctime,omitempty"` //玩家创号时间戳 - Logintime int64 `protobuf:"varint,10,opt,name=logintime,proto3" json:"logintime,omitempty"` //最后一次登录时间 - FriendPoint int32 `protobuf:"varint,11,opt,name=FriendPoint,proto3" json:"FriendPoint,omitempty"` //友情点 - Avatar int32 `protobuf:"varint,12,opt,name=avatar,proto3" json:"avatar,omitempty"` //头像 + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` // ID + Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"` + Uuid string `protobuf:"bytes,3,opt,name=uuid,proto3" json:"uuid"` //玩家唯一uuid + Binduid string `protobuf:"bytes,4,opt,name=binduid,proto3" json:"binduid"` //玩家账号 + Name string `protobuf:"bytes,5,opt,name=name,proto3" json:"name"` //玩家名 + Sid int32 `protobuf:"varint,6,opt,name=sid,proto3" json:"sid"` //区服id + Createip string `protobuf:"bytes,7,opt,name=createip,proto3" json:"createip"` //创建账号时的ip + Lastloginip string `protobuf:"bytes,8,opt,name=lastloginip,proto3" json:"lastloginip"` //最后一次登录时的ip + Ctime int64 `protobuf:"varint,9,opt,name=ctime,proto3" json:"ctime"` //玩家创号时间戳 + Logintime int64 `protobuf:"varint,10,opt,name=logintime,proto3" json:"logintime"` //最后一次登录时间 + FriendPoint int32 `protobuf:"varint,11,opt,name=FriendPoint,proto3" json:"FriendPoint"` //友情点 + Avatar int32 `protobuf:"varint,12,opt,name=avatar,proto3" json:"avatar"` //头像 } func (x *DB_UserData) Reset() { diff --git a/pb/user_msg.pb.go b/pb/user_msg.pb.go index 1ee7f9132..920926ab5 100644 --- a/pb/user_msg.pb.go +++ b/pb/user_msg.pb.go @@ -26,7 +26,7 @@ type UserLoginReq struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Sec string `protobuf:"bytes,1,opt,name=sec,proto3" json:"sec,omitempty"` //密文 + Sec string `protobuf:"bytes,1,opt,name=sec,proto3" json:"sec"` //密文 } func (x *UserLoginReq) Reset() { @@ -73,7 +73,7 @@ type UserLoginResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Data *Cache_UserData `protobuf:"bytes,1,opt,name=data,proto3" json:"data,omitempty"` + Data *DB_UserData `protobuf:"bytes,1,opt,name=data,proto3" json:"data"` } func (x *UserLoginResp) Reset() { @@ -108,7 +108,7 @@ func (*UserLoginResp) Descriptor() ([]byte, []int) { return file_user_user_msg_proto_rawDescGZIP(), []int{1} } -func (x *UserLoginResp) GetData() *Cache_UserData { +func (x *UserLoginResp) GetData() *DB_UserData { if x != nil { return x.Data } @@ -120,7 +120,8 @@ type UserRegisterReq struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Account string `protobuf:"bytes,1,opt,name=account,proto3" json:"account,omitempty"` + Account string `protobuf:"bytes,1,opt,name=account,proto3" json:"account"` + Sid int32 `protobuf:"varint,2,opt,name=sid,proto3" json:"sid"` } func (x *UserRegisterReq) Reset() { @@ -162,13 +163,20 @@ func (x *UserRegisterReq) GetAccount() string { return "" } +func (x *UserRegisterReq) GetSid() int32 { + if x != nil { + return x.Sid + } + return 0 +} + type UserRegisterRsp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Code ErrorCode `protobuf:"varint,1,opt,name=Code,proto3,enum=ErrorCode" json:"Code,omitempty"` - Account string `protobuf:"bytes,2,opt,name=account,proto3" json:"account,omitempty"` + Code ErrorCode `protobuf:"varint,1,opt,name=Code,proto3,enum=ErrorCode" json:"Code"` + Account string `protobuf:"bytes,2,opt,name=account,proto3" json:"account"` } func (x *UserRegisterRsp) Reset() { @@ -222,7 +230,7 @@ type UserLoadRsp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Data *Cache_UserData `protobuf:"bytes,1,opt,name=data,proto3" json:"data,omitempty"` + Data *Cache_UserData `protobuf:"bytes,1,opt,name=data,proto3" json:"data"` } func (x *UserLoadRsp) Reset() { @@ -270,7 +278,7 @@ type UserCreateReq struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - NickName string `protobuf:"bytes,1,opt,name=NickName,proto3" json:"NickName,omitempty"` //昵称 + NickName string `protobuf:"bytes,1,opt,name=NickName,proto3" json:"NickName"` //昵称 } func (x *UserCreateReq) Reset() { @@ -358,26 +366,27 @@ var file_user_user_msg_proto_rawDesc = []byte{ 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x12, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x20, 0x0a, 0x0c, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x65, - 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x73, 0x65, 0x63, 0x22, 0x34, 0x0a, 0x0d, - 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x23, 0x0a, - 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x43, 0x61, - 0x63, 0x68, 0x65, 0x5f, 0x55, 0x73, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, - 0x74, 0x61, 0x22, 0x2b, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, - 0x65, 0x72, 0x52, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, - 0x4b, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x52, - 0x73, 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, - 0x32, 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x43, 0x6f, - 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x32, 0x0a, 0x0b, - 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x61, 0x64, 0x52, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x64, - 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x43, 0x61, 0x63, 0x68, - 0x65, 0x5f, 0x55, 0x73, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, - 0x22, 0x2b, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, - 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x4e, 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x08, 0x4e, 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x0f, 0x0a, - 0x0d, 0x55, 0x73, 0x65, 0x72, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x73, 0x70, 0x42, 0x06, - 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x73, 0x65, 0x63, 0x22, 0x31, 0x0a, 0x0d, + 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, + 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x44, 0x42, + 0x5f, 0x55, 0x73, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, + 0x3d, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x52, + 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x10, 0x0a, 0x03, + 0x73, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x73, 0x69, 0x64, 0x22, 0x4b, + 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x52, 0x73, + 0x70, 0x12, 0x1e, 0x0a, 0x04, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, + 0x0a, 0x2e, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x43, 0x6f, 0x64, + 0x65, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x07, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x32, 0x0a, 0x0b, 0x55, + 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x61, 0x64, 0x52, 0x73, 0x70, 0x12, 0x23, 0x0a, 0x04, 0x64, 0x61, + 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x43, 0x61, 0x63, 0x68, 0x65, + 0x5f, 0x55, 0x73, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, + 0x2b, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x72, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, + 0x12, 0x1a, 0x0a, 0x08, 0x4e, 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x08, 0x4e, 0x69, 0x63, 0x6b, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0x0f, 0x0a, 0x0d, + 0x55, 0x73, 0x65, 0x72, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x52, 0x73, 0x70, 0x42, 0x06, 0x5a, + 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -401,13 +410,14 @@ var file_user_user_msg_proto_goTypes = []interface{}{ (*UserLoadRsp)(nil), // 4: UserLoadRsp (*UserCreateReq)(nil), // 5: UserCreateReq (*UserCreateRsp)(nil), // 6: UserCreateRsp - (*Cache_UserData)(nil), // 7: Cache_UserData + (*DB_UserData)(nil), // 7: DB_UserData (ErrorCode)(0), // 8: ErrorCode + (*Cache_UserData)(nil), // 9: Cache_UserData } var file_user_user_msg_proto_depIdxs = []int32{ - 7, // 0: UserLoginResp.data:type_name -> Cache_UserData + 7, // 0: UserLoginResp.data:type_name -> DB_UserData 8, // 1: UserRegisterRsp.Code:type_name -> ErrorCode - 7, // 2: UserLoadRsp.data:type_name -> Cache_UserData + 9, // 2: UserLoadRsp.data:type_name -> Cache_UserData 3, // [3:3] is the sub-list for method output_type 3, // [3:3] is the sub-list for method input_type 3, // [3:3] is the sub-list for extension type_name