fix:修改

common/src/qfw/util/jy/publicRegister.go

@@ -40,10 +40,10 @@ func NewRegister(mgo *mongodb.MongodbSim, baseService, mainMysql *mysql.Mysql, m
 	}
 }
 
-func (t *RegisterStruct) PublicRegister(phone, email, regsource string, data map[string]interface{}, afterFunc func(string) string) (string, string, string) {
+func (t *RegisterStruct) PublicRegister(phone, email, regsource string, data map[string]interface{}, afterFunc func(string) string) (string, string) {
 	var (
-		saveSuccess        bool
-		saveid, returnSign string
+		saveSuccess bool
+		saveid      string
 	)
 	RegLock.Lock()
 	reg := RegMap[phone]
@@ -58,7 +58,7 @@ func (t *RegisterStruct) PublicRegister(phone, email, regsource string, data map
 	reg.Lock.Lock()
 	defer reg.Lock.Unlock()
 	if userId := t.userIsExists(phone); userId != "" { //用户已存在
-		return userId, returnSign, "userExists"
+		return userId, "userExists"
 	}
 	//保存用户之前，先清理rid
 	//clearRidByRid(rid)
@@ -97,36 +97,38 @@ func (t *RegisterStruct) PublicRegister(phone, email, regsource string, data map
 		saveid = t.Mgo.Save("user", data)
 		saveSuccess = saveid != ""
 	}
-	if saveSuccess && saveid != "" {
-		//用户中台同步
-		func(userid string) {
-			// formdata := map[string]interface{}{
-			// 	"appid":    "10000",
-			// 	"phone":    phone,
-			// 	"password": qutil.GetMd5String(password),
-			// 	"company":  s_entname,
-			// }
-			// ck, _ := l.GetCookie("SESSIONID")
-			// usercenter.AddBaseUser(mongodb, qutil.ObjToString(config.Sysconfig["userCenterApi"]), userid, formdata, ck)
-			if ok := AddUser(*t.Mgo, userid, pb.UserAddReq{
-				Appid:    "10000",
-				Phone:    phone,
-				Password: "",
-				Company:  util.InterfaceToStr(data["s_company"]),
-			}, *t.Middleground); !ok {
-				log.Println("usercenter add error", userid, phone)
+	if saveSuccess {
+		if saveid != "" {
+			//用户中台同步
+			func(userid string) {
+				// formdata := map[string]interface{}{
+				// 	"appid":    "10000",
+				// 	"phone":    phone,
+				// 	"password": qutil.GetMd5String(password),
+				// 	"company":  s_entname,
+				// }
+				// ck, _ := l.GetCookie("SESSIONID")
+				// usercenter.AddBaseUser(mongodb, qutil.ObjToString(config.Sysconfig["userCenterApi"]), userid, formdata, ck)
+				if ok := AddUser(*t.Mgo, userid, pb.UserAddReq{
+					Appid:    "10000",
+					Phone:    phone,
+					Password: "",
+					Company:  util.InterfaceToStr(data["s_company"]),
+				}, *t.Middleground); !ok {
+					log.Println("usercenter add error", userid, phone)
+				}
+			}(saveid)
+			baseId, ok := t.Mgo.FindById("user", saveid, `{"base_user_id":1}`)
+			if ok && baseId != nil && len(*baseId) > 0 {
+				data["base_user_id"] = (*baseId)["base_user_id"]
+			}
+			if afterFunc != nil {
+				afterFunc(saveid)
 			}
-		}(saveid)
-		baseId, ok := t.Mgo.FindById("user", saveid, `{"base_user_id":1}`)
-		if ok && baseId != nil && len(*baseId) > 0 {
-			data["base_user_id"] = (*baseId)["base_user_id"]
-		}
-		if afterFunc != nil {
-			returnSign = afterFunc(saveid)
 		}
-		return saveid, returnSign, "y"
+		return saveid, "y"
 	} else {
-		return saveid, returnSign, "saveError"
+		return saveid, "saveError"
 	}
 }