fix

controller/auth.go

@@ -118,10 +118,7 @@ func (a *AuthController) Register(c *gin.Context) {
 
 	item, err := msg_code.GetMsgCode(req.Email, req.SmsCode)
 	if err != nil {
-		if err == utils.ErrNoRow {
-			resp.Fail("校验验证码失败，Err:"+err.Error(), c)
-			return
-		} else {
+		if err != nil {
 			resp.Fail("校验验证码失败，Err:"+err.Error(), c)
 			return
 		}
@@ -355,7 +352,7 @@ func (a *AuthController) BindMobile(c *gin.Context) {
 
 	emailItem := new(english_report_email.Email)
 	userEmail, err := emailItem.GetByMobile(req.Mobile, req.CountryCode)
-	if err != nil && err == utils.ErrNoRow {
+	if err != nil && err != utils.ErrNoRow {
 			resp.FailData("获取客户邮箱信息失败 ", "Err:"+err.Error(), c)
 			return
 	}
@@ -408,7 +405,6 @@ func (a *AuthController) ForgetPwd(c *gin.Context) {
 		resp.FailData("参数解析失败", errs.Translate(global.Trans), c)
 		return
 	}
-	userinfo := services.GetInfoByClaims(c)
 
 	if req.Account == "" {
 		resp.Fail("账号不能为空", c)
@@ -425,9 +421,10 @@ func (a *AuthController) ForgetPwd(c *gin.Context) {
 		return
 	}
 
+	userEmail := new(english_report_email.Email)
 	emailItem := new(english_report_email.Email)
 	if req.Type == 1 {
-		_, err = emailItem.GetByEmail(req.Account)
+		userEmail, err = emailItem.GetByEmail(req.Account)
 		if err != nil {
 			if err == utils.ErrNoRow {
 				resp.Unregistered("账号未注册", c)
@@ -437,7 +434,7 @@ func (a *AuthController) ForgetPwd(c *gin.Context) {
 			return
 		}
 	} else {
-		_, err = emailItem.GetByMobile(req.Account, req.CountryCode)
+		userEmail, err = emailItem.GetByMobile(req.Account, req.CountryCode)
 		if err != nil {
 			if err == utils.ErrNoRow {
 				resp.Unbound("手机号未绑定", c)
@@ -464,7 +461,7 @@ func (a *AuthController) ForgetPwd(c *gin.Context) {
 	}
 
 	emailitem := english_report_email.Email{
-		Id:       userinfo.Id,
+		Id:       userEmail.Id,
 		Password: req.Password,
 	}
 	emailitem.ModifyTime = time.Now()

utils/constants.go

@@ -23,7 +23,7 @@ const (
 )
 
 const (
-	APPNAME          = "弘则人力资源管理系统"
+	APPNAME          = "弘则英文研报系统"
 	EmailSendToUsers = "317699326@qq.com;984198890@qq.com;hsun@hzinsights.com;xyxie@hzinsights.com"
 )