style: 修改错误提示信息

This commit is contained in:
TsMask
2023-11-10 18:07:48 +08:00
parent cbbedc2658
commit 1a14ab4567
2 changed files with 8 additions and 8 deletions

View File

@@ -45,18 +45,18 @@ func (s *AccountImpl) ValidateCaptcha(code, uuid string) error {
} }
if code == "" || uuid == "" { if code == "" || uuid == "" {
// 验证码信息错误 // 验证码信息错误
return fmt.Errorf("Captcha message error") return fmt.Errorf("captcha message error")
} }
verifyKey := cachekey.CAPTCHA_CODE_KEY + uuid verifyKey := cachekey.CAPTCHA_CODE_KEY + uuid
captcha, _ := redis.Get("", verifyKey) captcha, _ := redis.Get("", verifyKey)
if captcha == "" { if captcha == "" {
// 验证码已失效 // 验证码已失效
return fmt.Errorf("Captcha is no longer valid") return fmt.Errorf("captcha is no longer valid")
} }
redis.Del("", verifyKey) redis.Del("", verifyKey)
if captcha != code { if captcha != code {
// 验证码错误 // 验证码错误
return fmt.Errorf("Captcha error") return fmt.Errorf("captcha error")
} }
return nil return nil
} }
@@ -74,14 +74,14 @@ func (s *AccountImpl) LoginByUsername(username, password string) (vo.LoginUser,
// 查询用户登录账号 // 查询用户登录账号
sysUser := s.sysUserService.SelectUserByUserName(username) sysUser := s.sysUserService.SelectUserByUserName(username)
if sysUser.UserName != username { if sysUser.UserName != username {
return loginUser, fmt.Errorf("User does not exist or wrong password") return loginUser, fmt.Errorf("user does not exist or wrong password")
} }
if sysUser.DelFlag == common.STATUS_YES { if sysUser.DelFlag == common.STATUS_YES {
// 对不起,您的账号已被删除 // 对不起,您的账号已被删除
return loginUser, fmt.Errorf("Sorry, your account has been deleted") return loginUser, fmt.Errorf("sorry, your account has been deleted")
} }
if sysUser.Status == common.STATUS_NO { if sysUser.Status == common.STATUS_NO {
return loginUser, fmt.Errorf("Sorry, your account has been disabled") return loginUser, fmt.Errorf("sorry, your account has been disabled")
} }
// 检验用户密码 // 检验用户密码
@@ -89,7 +89,7 @@ func (s *AccountImpl) LoginByUsername(username, password string) (vo.LoginUser,
if !compareBool { if !compareBool {
redis.SetByExpire("", retrykey, retryCount+1, lockTime) redis.SetByExpire("", retrykey, retryCount+1, lockTime)
// 用户不存在或密码错误 // 用户不存在或密码错误
return loginUser, fmt.Errorf("User does not exist or wrong password") return loginUser, fmt.Errorf("user does not exist or wrong password")
} else { } else {
// 清除错误记录次数 // 清除错误记录次数
s.ClearLoginRecordCache(username) s.ClearLoginRecordCache(username)

View File

@@ -95,7 +95,7 @@ func (s *SysLogLoginController) Unlock(c *gin.Context) {
c.JSON(200, result.Ok(nil)) c.JSON(200, result.Ok(nil))
return return
} }
c.JSON(200, result.Err(nil)) c.JSON(200, result.ErrMsg("unlatched"))
} }
// 导出系统登录日志信息 // 导出系统登录日志信息