上传创号优化

modules/user/api_create.go

@@ -32,17 +32,18 @@ func (this *apiComp) CreateCheck(session comm.IUserSession, req *pb.UserCreateRe
 // 创角
 func (this *apiComp) Create(session comm.IUserSession, req *pb.UserCreateReq) (errdata *pb.ErrorData) {
 	var (
+		user  *pb.DBUser
+		res   []*cfg.Gameatn
 		tasks []*pb.BuriedParam = make([]*pb.BuriedParam, 0)
+		err   error
 	)
 
 	if errdata = this.CreateCheck(session, req); errdata != nil {
 		return
 	}
 
-	// resp := &pb.UserCreateResp{}
-	uid := session.GetUserId()
 	//获取用户
-	self, err := this.module.modelUser.GetUser(session.GetUserId())
+	user, err = this.module.modelUser.GetUser(session.GetUserId())
 	if err != nil {
 		errdata = &pb.ErrorData{
 			Code:    pb.ErrorCode_UserNofound,
@@ -53,7 +54,7 @@ func (this *apiComp) Create(session comm.IUserSession, req *pb.UserCreateReq) (e
 	}
 
 	//已否已创角
-	if self.Created {
+	if user.Created {
 		errdata = &pb.ErrorData{
 			Code:  pb.ErrorCode_RoleCreated,
 			Title: pb.ErrorCode_RoleCreated.ToString(),
@@ -69,14 +70,6 @@ func (this *apiComp) Create(session comm.IUserSession, req *pb.UserCreateReq) (e
 		}
 		return
 	}
-
-	//初始体力
-	// var ps int32
-	// gpd := this.module.configure.GetPlayerlvConf(self.Lv)
-	// if gpd != nil {
-	// 	ps = gpd.PsCeiling
-	// }
-
 	update := map[string]interface{}{
 		"name":    req.NickName, //设置昵称
 		"created": true,         //创角标识
@@ -84,7 +77,6 @@ func (this *apiComp) Create(session comm.IUserSession, req *pb.UserCreateReq) (e
 		"gender":  req.Gender,   //设置性别
 		"ps":      0,            //设置初始体力 调整未0 由策划初始表发放
 	}
-
 	globalConf := this.module.globalConf
 	if req.Gender == 0 {
 		update["avatar"] = globalConf.BoyHeadPortrait
@@ -92,40 +84,42 @@ func (this *apiComp) Create(session comm.IUserSession, req *pb.UserCreateReq) (e
 		update["avatar"] = globalConf.GirlHeadPortrait
 	}
 
-	if err := this.module.modelUser.Change(uid, update); err != nil {
+	if err := this.module.modelUser.Change(session.GetUserId(), update); err != nil {
 		errdata = &pb.ErrorData{
 			Code:  pb.ErrorCode_DBError,
 			Title: pb.ErrorCode_DBError.ToString(),
 		}
 		this.module.Error("创角",
-			log.Field{Key: "uid", Value: uid},
+			log.Field{Key: "uid", Value: session.GetUserId()},
 			log.Field{Key: "params", Value: update},
 			log.Field{Key: "err", Value: err.Error()},
 		)
 		return
 	}
-
-	var (
-		res []*cfg.Gameatn
-	)
-
-	//初始化创角资源
-	if val, err := this.module.configure.GetGlobalInitConf(); err == nil {
-		for _, v := range val.GetDataList() {
-			res = append(res, v.Var...)
-		}
-		_ = this.module.DispenseRes(session, res, true)
-	}
-
-	session.SendMsg(string(this.module.GetType()), UserSubTypeCreate, &pb.UserCreateResp{})
 	if req.Figure != 0 {
 		tasks = append(tasks, comm.GetBuriedParam(comm.Rtype72, 1))
 	}
-	this.mail.SendMailByCid(session, comm.Welcomemail, nil)
+	session.SendMsg(string(this.module.GetType()), UserSubTypeCreate, &pb.UserCreateResp{
-	if len(tasks) > 0 {
+		NickName: req.NickName,
-		go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
+		Figure:   req.Figure,
+		Gender:   req.Gender,
+	})
+
+	//异步逻辑
+	go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) {
+		//初始化创角资源
+		if val, err := this.module.configure.GetGlobalInitConf(); err == nil {
+			for _, v := range val.GetDataList() {
+				res = append(res, v.Var...)
+			}
+			if errdata := this.module.DispenseRes(session, res, true); errdata != nil {
+				this.module.Error("发放资源失败!", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "err", Value: errdata.String()})
+			}
+		}
+		this.mail.SendMailByCid(session, comm.Welcomemail, nil)
+		if len(tasks) > 0 {
 			this.module.ModuleBuried.TriggerBuried(session, tasks...)
-		})
+		}
-	}
+	})
 	return
 }

modules/user/api_info.go

@@ -1,43 +1,38 @@
 package user
 
-import (
+// func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.UserInfoReq) (errdata *pb.ErrorData) {
-	"go_dreamfactory/comm"
+// 	return
-	"go_dreamfactory/pb"
+// }
-)
 
-func (this *apiComp) InfoCheck(session comm.IUserSession, req *pb.UserInfoReq) (errdata *pb.ErrorData) {
+// func (this *apiComp) Info(session comm.IUserSession, req *pb.UserInfoReq) (errdata *pb.ErrorData) {
-	return
+// 	if errdata = this.InfoCheck(session, req); errdata != nil {
-}
+// 		return
+// 	}
 
-func (this *apiComp) Info(session comm.IUserSession, req *pb.UserInfoReq) (errdata *pb.ErrorData) {
+// 	dbUser, err := this.module.GetUser(session.GetUserId())
-	if errdata = this.InfoCheck(session, req); errdata != nil {
+// 	if err != nil {
-		return
+// 		errdata = &pb.ErrorData{
-	}
+// 			Code:    pb.ErrorCode_DBError,
+// 			Title:   pb.ErrorCode_DBError.ToString(),
+// 			Message: err.Error(),
+// 		}
+// 		return
+// 	}
+// 	ue, err := this.module.GetUserExpand(session.GetUserId())
+// 	if err != nil {
+// 		errdata = &pb.ErrorData{
+// 			Code:    pb.ErrorCode_DBError,
+// 			Title:   pb.ErrorCode_DBError.ToString(),
+// 			Message: err.Error(),
+// 		}
+// 		return
+// 	}
 
-	dbUser, err := this.module.GetUser(session.GetUserId())
+// 	rsp := &pb.UserInfoResp{
-	if err != nil {
+// 		Data: dbUser,
-		errdata = &pb.ErrorData{
+// 		Ex:   ue,
-			Code:    pb.ErrorCode_DBError,
+// 	}
-			Title:   pb.ErrorCode_DBError.ToString(),
-			Message: err.Error(),
-		}
-		return
-	}
-	ue, err := this.module.GetUserExpand(session.GetUserId())
-	if err != nil {
-		errdata = &pb.ErrorData{
-			Code:    pb.ErrorCode_DBError,
-			Title:   pb.ErrorCode_DBError.ToString(),
-			Message: err.Error(),
-		}
-		return
-	}
 
-	rsp := &pb.UserInfoResp{
+// 	session.SendMsg(string(this.module.GetType()), UserSubTypeInfo, rsp)
-		Data: dbUser,
+// 	return
-		Ex:   ue,
+// }
-	}
-
-	session.SendMsg(string(this.module.GetType()), UserSubTypeInfo, rsp)
-	return
-}

modules/user/api_login.go

@@ -26,7 +26,6 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (err
 		user          *pb.DBUser
 		expand        *pb.DBUserExpand
 		lastLoginTime int64
-		update        map[string]interface{} = make(map[string]interface{})
 		err           error
 		tasks         []*pb.BuriedParam = make([]*pb.BuriedParam, 0)
 	)
@@ -84,13 +83,7 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (err
 		user.Channel = req.Channel
 		user.Vcode = req.Vcode
 		user.Vname = req.Vname
-		update["logintime"] = user.Logintime
+		update := utils.StructToMap(user)
-		update["lastloginip"] = user.Lastloginip
-		update["offlinetime"] = user.Offlinetime
-		update["Channel"] = user.Channel
-		update["vcode"] = user.Vcode
-		update["vname"] = user.Vname
-
 		if expand, err = this.module.GetUserExpand(session.GetUserId()); err != nil {
 			if err != mongo.ErrNoDocuments {
 				errdata = &pb.ErrorData{