|
|
@@ -594,7 +594,7 @@ func (this *UserAccount) Authentication(doType string) {
|
|
|
// A账户已绑定微信，此微信必须与当前账户绑定的微信一致
|
|
|
|
|
|
func (this *UserAccount) PhoneBind() {
|
|
|
- log.Println("绑定手机号开始1")
|
|
|
+
|
|
|
sessVal := this.Session().GetMultiple()
|
|
|
userId, _ := sessVal["mgoUserId"].(string)
|
|
|
step, _ := this.GetInteger("step")
|
|
|
@@ -603,6 +603,7 @@ func (this *UserAccount) PhoneBind() {
|
|
|
code := this.GetString("code")
|
|
|
mode := this.GetString("mode")
|
|
|
email := this.GetString("email")
|
|
|
+ log.Println("绑定手机号开始1", phone, code, mode, email)
|
|
|
if step == 1 {
|
|
|
//校验图形验证码
|
|
|
if pass, err := imgCaptchaCheck(this.Session(), userId, code); !pass || err != nil {
|
|
|
@@ -709,6 +710,7 @@ func (this *UserAccount) PhoneBind() {
|
|
|
jy.CreateUserMerge(util.MQFW, util.Mysql, this.Session(), config.Middleground).FlushSession(userId) //刷新session
|
|
|
|
|
|
} else if mode == "mergeBind" { //跳转绑定-不合并绑定无效
|
|
|
+ log.Println("绑定手机号开始5", qutil.Int64All((*uData)["l_registedate"]), config.AutoMergeTimeStamp)
|
|
|
if qutil.Int64All((*uData)["l_registedate"]) > config.AutoMergeTimeStamp { //新微信直接绑定
|
|
|
data := map[string]interface{}{
|
|
|
"s_unionid": (*uData)["s_unionid"],
|
