diff --git a/modules/user/api_create.go b/modules/user/api_create.go index 698085003..19d037399 100644 --- a/modules/user/api_create.go +++ b/modules/user/api_create.go @@ -96,9 +96,28 @@ func (this *apiComp) Create(session comm.IUserSession, req *pb.UserCreateReq) (c //初始化用户设置 // this.module.modelSetting.InitSetting(session.GetUserId()) - //初始化公会 date3.10 - this.module.CrossCreateSociaty(uid, req.NickName) + go func() { + //初始化公会 date3.10 + sociaty := this.module.CrossCreateSociaty(uid, req.NickName) + if sociaty == nil { + return + } + this.module.Debugf("公会ID:%v", sociaty.Id) + exUpdate := map[string]interface{}{ + "sociatyId": sociaty.Id, + } + if err := this.module.ModuleUser.ChangeUserExpand(uid, exUpdate); err != nil { + code = pb.ErrorCode_DBError + this.module.Error("更新玩家公会ID", + log.Field{Key: "uid", Value: uid}, + log.Field{Key: "sociatyId", Value: sociaty.Id}, + log.Field{Key: "err", Value: err.Error()}, + ) + return + } + + }() if err := session.SendMsg(string(this.module.GetType()), UserSubTypeCreate, &pb.UserCreateResp{IsSucc: true}); err != nil { code = pb.ErrorCode_SystemError } diff --git a/modules/user/module.go b/modules/user/module.go index 1e9dc9211..86718f344 100644 --- a/modules/user/module.go +++ b/modules/user/module.go @@ -245,21 +245,22 @@ func (this *User) CrossUserSession(uid string) *pb.CacheUser { } // 跨服创建玩家公会 date 3.10 -func (this *User) CrossCreateSociaty(uid, sociatyName string) *pb.EmptyResp { +func (this *User) CrossCreateSociaty(uid, sociatyName string) *pb.DBSociaty { + sociaty:= &pb.DBSociaty{} this.service.AcrossClusterRpcCall(context.Background(), this.GetCrossTag(), - comm.Service_Worker, Rpc_CreateSociaty, &pb.RPCGeneralReqA2{Param1: uid, Param2: sociatyName}, &pb.EmptyResp{}) - return nil + comm.Service_Worker, Rpc_CreateSociaty, &pb.RPCGeneralReqA2{Param1: uid, Param2: sociatyName}, sociaty) + return sociaty } // date 3.10 -func (this *User) RpcCreateSociaty(ctx context.Context, req *pb.RPCGeneralReqA2, reply *pb.EmptyResp) error { +func (this *User) RpcCreateSociaty(ctx context.Context, req *pb.RPCGeneralReqA2, rsp *pb.DBSociaty) error { conn, err := db.Local() if err != nil { return err } model := db.NewDBModel(comm.TableSociaty, 0, conn) - sociaty := &pb.DBSociaty{} + sociaty:= &pb.DBSociaty{} _id := primitive.NewObjectID().Hex() sociaty.Creater = req.Param1 sociaty.Name = req.Param2 @@ -280,6 +281,8 @@ func (this *User) RpcCreateSociaty(ctx context.Context, req *pb.RPCGeneralReqA2, return err } } + + rsp.Id = sociaty.Id return nil }