fixed user phone bind error when custom configed Sms feature

internal/servants/web/core.go

@@ -281,19 +281,12 @@ func (s *coreSrv) GetCollections(req *web.GetCollectionsReq) (*web.GetCollection
 func (s *coreSrv) UserPhoneBind(req *web.UserPhoneBindReq) mir.Error {
 	// 手机重复性检查
 	u, err := s.Ds.GetUserByPhone(req.Phone)
-	if err != nil {
-		logrus.Errorf("Ds.GetUserByPhone err: %v", err)
-		return _errExistedUserPhone
-	}
-	if u.Model == nil || u.ID == 0 {
-		return _errExistedUserPhone
-	}
-	if u.ID == req.User.ID {
+	if err == nil && u.Model != nil && u.ID != 0 && u.ID != req.User.ID {
 		return _errExistedUserPhone
 	}
 
 	// 如果禁止phone verify 则允许通过任意验证码
-	if !_EnablePhoneVerify {
+	if _EnablePhoneVerify {
 		c, err := s.Ds.GetLatestPhoneCaptcha(req.Phone)
 		if err != nil {
 			return _errErrorPhoneCaptcha

internal/servants/web/pub.go

@@ -204,6 +204,7 @@ func (s *pubSrv) SendCaptcha(req *web.SendCaptchaReq) mir.Error {
 
 	// 验证图片验证码
 	if res, err := s.Redis.Get(ctx, "PaoPaoCaptcha:"+req.ImgCaptchaID).Result(); err != nil || res != req.ImgCaptcha {
+		logrus.Debugf("get captcha err:%s expect:%s got:%s", err, res, req.ImgCaptcha)
 		return _errErrorCaptchaPassword
 	}
 	s.Redis.Del(ctx, "PaoPaoCaptcha:"+req.ImgCaptchaID).Result()