diff --git a/src/modules/common/service/account.impl.go b/src/modules/common/service/account.impl.go index 8c8b4eb9..b9d96e3c 100644 --- a/src/modules/common/service/account.impl.go +++ b/src/modules/common/service/account.impl.go @@ -45,18 +45,18 @@ func (s *AccountImpl) ValidateCaptcha(code, uuid string) error { } if code == "" || uuid == "" { // 验证码信息错误 - return fmt.Errorf("Captcha message error") + return fmt.Errorf("captcha message error") } verifyKey := cachekey.CAPTCHA_CODE_KEY + uuid captcha, _ := redis.Get("", verifyKey) if captcha == "" { // 验证码已失效 - return fmt.Errorf("Captcha is no longer valid") + return fmt.Errorf("captcha is no longer valid") } redis.Del("", verifyKey) if captcha != code { // 验证码错误 - return fmt.Errorf("Captcha error") + return fmt.Errorf("captcha error") } return nil } @@ -74,14 +74,14 @@ func (s *AccountImpl) LoginByUsername(username, password string) (vo.LoginUser, // 查询用户登录账号 sysUser := s.sysUserService.SelectUserByUserName(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 { // 对不起,您的账号已被删除 - 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 { - 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 { 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 { // 清除错误记录次数 s.ClearLoginRecordCache(username) diff --git a/src/modules/system/controller/sys_log_login.go b/src/modules/system/controller/sys_log_login.go index 51de6b7b..ab7b5f17 100644 --- a/src/modules/system/controller/sys_log_login.go +++ b/src/modules/system/controller/sys_log_login.go @@ -95,7 +95,7 @@ func (s *SysLogLoginController) Unlock(c *gin.Context) { c.JSON(200, result.Ok(nil)) return } - c.JSON(200, result.Err(nil)) + c.JSON(200, result.ErrMsg("unlatched")) } // 导出系统登录日志信息