liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

Browse Source
This commit is contained in:
meixiongfeng 2023-03-16 12:36:35 +08:00
commit 94a883422a
2 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
modules/user/api_create.go
View File

@ -96,34 +96,34 @@ func (this *apiComp) Create(session comm.IUserSession, req *pb.UserCreateReq) (c
//初始化用户设置 //初始化用户设置
// this.module.modelSetting.InitSetting(session.GetUserId()) // this.module.modelSetting.InitSetting(session.GetUserId())
go func() { // go func() {
//初始化公会 date3.10 // //初始化公会 date3.10
sociaty := this.module.CrossCreateSociaty(uid, req.NickName) // sociaty := this.module.CrossCreateSociaty(uid, req.NickName)
if sociaty == nil { // if sociaty == nil {
return // return
} // }
this.module.Debugf("公会ID:%v", sociaty.Id) // this.module.Debugf("公会ID:%v", sociaty.Id)
exUpdate := map[string]interface{}{ // exUpdate := map[string]interface{}{
"sociatyId": sociaty.Id, // "sociatyId": sociaty.Id,
} // }
if err := this.module.ModuleUser.ChangeUserExpand(uid, exUpdate); err != nil { // if err := this.module.ModuleUser.ChangeUserExpand(uid, exUpdate); err != nil {
code = pb.ErrorCode_DBError // code = pb.ErrorCode_DBError
this.module.Error("更新玩家公会ID", // this.module.Error("更新玩家公会ID",
log.Field{Key: "uid", Value: uid}, // log.Field{Key: "uid", Value: uid},
log.Field{Key: "sociatyId", Value: sociaty.Id}, // log.Field{Key: "sociatyId", Value: sociaty.Id},
log.Field{Key: "err", Value: err.Error()}, // log.Field{Key: "err", Value: err.Error()},
) // )
return // return
} // }
}() // }()
if err := session.SendMsg(string(this.module.GetType()), UserSubTypeCreate, &pb.UserCreateResp{IsSucc: true}); err != nil { if err := session.SendMsg(string(this.module.GetType()), UserSubTypeCreate, &pb.UserCreateResp{IsSucc: true}); err != nil {
code = pb.ErrorCode_SystemError code = pb.ErrorCode_SystemError
} }
if req.Figure != 0 { if req.Figure != 0 {
this.module.ModuleRtask.TriggerTask(uid,&comm.TaskParam{TT:comm.Rtype72,Params: []int32{1}}) this.module.ModuleRtask.TriggerTask(uid, comm.GettaskParam(comm.Rtype72,1))
} }
this.mail.SendMailByCid(session, comm.Welcomemail, nil) this.mail.SendMailByCid(session, comm.Welcomemail, nil)

2
modules/user/module.go
View File

@ -245,6 +245,7 @@ func (this *User) CrossUserSession(uid string) *pb.CacheUser {
} }
// 跨服创建玩家公会 date 3.10 // 跨服创建玩家公会 date 3.10
// Deprecated
func (this *User) CrossCreateSociaty(uid, sociatyName string) *pb.DBSociaty { func (this *User) CrossCreateSociaty(uid, sociatyName string) *pb.DBSociaty {
sociaty := &pb.DBSociaty{} sociaty := &pb.DBSociaty{}
this.service.AcrossClusterRpcCall(context.Background(), this.GetCrossTag(), this.service.AcrossClusterRpcCall(context.Background(), this.GetCrossTag(),
@ -253,6 +254,7 @@ func (this *User) CrossCreateSociaty(uid, sociatyName string) *pb.DBSociaty {
} }
// date 3.10 // date 3.10
// Deprecated
func (this *User) RpcCreateSociaty(ctx context.Context, req *pb.RPCGeneralReqA2, rsp *pb.DBSociaty) error { func (this *User) RpcCreateSociaty(ctx context.Context, req *pb.RPCGeneralReqA2, rsp *pb.DBSociaty) error {
conn, err := db.Local() conn, err := db.Local()
if err != nil { if err != nil {