user auth fix

@@ -50,6 +50,16 @@ type UCenterGetUserResponse struct {
 	CustomerAccount int64  `json:"customerAccount"`
 	CustomerAccount int64  `json:"customerAccount"`
 }
 }
 
 
+type UCenter_GetUserResponse struct {
+	Id              int64  `json:"id"`
+	Phone           string `json:"phone"`
+	NickName        string `json:"nickname"`
+	Avatar          string `json:"avatar"`
+	ImToken         string `json:"imtoken"`
+	Accid           string `json:"accid"`
+	CustomerAccount string `json:"customerAccount"`
+}
+
 /*修改用户信息  UCenterPutUser */
 /*修改用户信息  UCenterPutUser */
 type UCenterPutUserRequest struct {
 type UCenterPutUserRequest struct {
 	Phone    string `json:"phone,omitempty"`
 	Phone    string `json:"phone,omitempty"`

@@ -260,7 +260,7 @@ func CheckToken(request *protocol.CheckTokenRequest) (rsp *protocol.CheckTokenRe
 		userAuth *models.UserAuth
 		userAuth *models.UserAuth
 	)
 	)
 	if len(request.Token) == 0 {
 	if len(request.Token) == 0 {
-		err = common.NewErrorWithMsg(4141, "token not empty")
+		err = protocol.NewErrWithMessage(4141)
 		return
 		return
 	}
 	}
 	userAuth, err = models.GetUserAuthByToken(request.Token)
 	userAuth, err = models.GetUserAuthByToken(request.Token)
@@ -371,7 +371,7 @@ func CheckSmsCode(phone, code, sendType string) (result bool, err error) {
 	)
 	)
 	result = false
 	result = false
 	if value, err = redis.Hget(sendType, phone); err != nil { //protocol.SmsLoginCode
 	if value, err = redis.Hget(sendType, phone); err != nil { //protocol.SmsLoginCode
-		log.Error(fmt.Sprintf("smscode not exists"))
+		log.Error(fmt.Sprintf("%v smscode not exists", phone))
 		err = protocol.NewErrWithMessage(1009, fmt.Errorf("smscode expire"))
 		err = protocol.NewErrWithMessage(1009, fmt.Errorf("smscode expire"))
 		return
 		return
 	}
 	}

@@ -25,7 +25,7 @@ func CheckSmsCode(header *protocol.RequestHeader, request *protocol.CheckSmsCode
 		log.Error(err)
 		log.Error(err)
 		return
 		return
 	}
 	}
-	if result, err = auth.CheckSmsCode(user.Phone, request.Captcha, protocol.SmsCode); err != nil {
+	if result, err = auth.CheckSmsCode(strings.TrimSpace(user.Phone), request.Captcha, protocol.SmsCode); err != nil {
 		log.Error(err)
 		log.Error(err)
 		return
 		return
 	}
 	}
@@ -50,10 +50,10 @@ func ChangePhone(header *protocol.RequestHeader, request *protocol.ChangePhoneRe
 		return
 		return
 	}
 	}
 	//判断库里面是否已经有这个手机号的用户
 	//判断库里面是否已经有这个手机号的用户
-	//if _, err = repository.User.GetUsersByMobile(request.Phone); err == nil {
-	//	err = protocol.NewErrWithMessage(2029)
-	//	return
-	//}
+	if _, err = models.GetUserByMobile(request.Phone); err == nil {
+		err = protocol.NewErrWithMessage(2029)
+		return
+	}
 	if !result {
 	if !result {
 		err = protocol.NewErrWithMessage(1012)
 		err = protocol.NewErrWithMessage(1012)
 		return
 		return
@@ -85,7 +85,7 @@ func ResetPassword(header *protocol.RequestHeader, request *protocol.ResetPasswo
 		user            *models.User
 		user            *models.User
 		message         *protocol.Message
 		message         *protocol.Message
 		getUserRequest  *protocol.UCenterGetUserRequest = &protocol.UCenterGetUserRequest{}
 		getUserRequest  *protocol.UCenterGetUserRequest = &protocol.UCenterGetUserRequest{}
-		getUserResponse *protocol.UCenterGetUserResponse
+		getUserResponse *protocol.UCenter_GetUserResponse
 		result          bool
 		result          bool
 	)
 	)
 	if len(request.NewPwd) < 6 {
 	if len(request.NewPwd) < 6 {
@@ -117,6 +117,7 @@ func ResetPassword(header *protocol.RequestHeader, request *protocol.ResetPasswo
 	} else {
 	} else {
 		err = protocol.NewErrWithMessage(1)
 		err = protocol.NewErrWithMessage(1)
 		log.Error("用户中心获取数据失败: err_no:%v msg:%v", message.Errno, message.Errmsg)
 		log.Error("用户中心获取数据失败: err_no:%v msg:%v", message.Errno, message.Errmsg)
+		return
 	}
 	}
 	if getUserResponse.Id != user.UserCenterId {
 	if getUserResponse.Id != user.UserCenterId {
 		err = protocol.NewErrWithMessage(1)
 		err = protocol.NewErrWithMessage(1)
@@ -152,8 +153,10 @@ func ChangePassword(header *protocol.RequestHeader, request *protocol.ChangePass
 	}
 	}
 	var message protocol.Message
 	var message protocol.Message
 	if _, err = agg.RequestUserCenter(protocol.MethodLogin, http.MethodPost, &protocol.UCenterLoginRequest{
 	if _, err = agg.RequestUserCenter(protocol.MethodLogin, http.MethodPost, &protocol.UCenterLoginRequest{
-		PassWord: request.OldPwd,
-		Phone:    user.Phone,
+		PassWord:  request.OldPwd,
+		Phone:     user.Phone,
+		Type:      1,
+		GrantType: protocol.LoginTypePassPord,
 	}, &message); err != nil {
 	}, &message); err != nil {
 		log.Error(err)
 		log.Error(err)
 		return
 		return