diff --git a/service/api/api_v1/common/apiReturn/apiReturn.go b/service/api/api_v1/common/apiReturn/apiReturn.go index 2f76238..0f42590 100644 --- a/service/api/api_v1/common/apiReturn/apiReturn.go +++ b/service/api/api_v1/common/apiReturn/apiReturn.go @@ -100,14 +100,14 @@ func ErrorParamFomat(ctx *gin.Context, errMsg string) { // // 返回错误 数据库 func ErrorDatabase(ctx *gin.Context, errMsg string) { // Error(ctx, global.Lang.GetAndInsert("common.db_error", "[", errMsg, "]")) - ErrorByCodeAndMsg(ctx, 1202, errMsg) + ErrorByCodeAndMsg(ctx, 1200, errMsg) } // 返回错误 数据记录未找到 func ErrorDataNotFound(ctx *gin.Context) { // ErrorCode(ctx, ERROR_CODE_DATA_RECORD_NOT_FOUND, "未找到数据记录", nil) - ErrorByCode(ctx, 1202) + ErrorByCode(ctx, -1) } func ErrorByCode(ctx *gin.Context, code int) { diff --git a/service/api/api_v1/system/login.go b/service/api/api_v1/system/login.go index 94a4ab0..a20e1fb 100644 --- a/service/api/api_v1/system/login.go +++ b/service/api/api_v1/system/login.go @@ -35,12 +35,12 @@ type LoginLoginVerify struct { func (l LoginApi) Login(c *gin.Context) { param := LoginLoginVerify{} if err := c.ShouldBindJSON(¶m); err != nil { - apiReturn.Error(c, global.Lang.Get("common.api_error_param_format")) + apiReturn.ErrorParamFomat(c, err.Error()) return } if errMsg, err := base.ValidateInputStruct(param); err != nil { - apiReturn.Error(c, errMsg) + apiReturn.ErrorParamFomat(c, errMsg) return } @@ -57,7 +57,7 @@ func (l LoginApi) Login(c *gin.Context) { if info, err = mUser.GetUserInfoByUsernameAndPassword(param.Username, cmn.PasswordEncryption(param.Password)); err != nil { // 未找到记录 账号或密码错误 if err == gorm.ErrRecordNotFound { - apiReturn.Error(c, global.Lang.Get("login.err_username_password")) + apiReturn.ErrorByCode(c, 1003) return } else { // 未知错误 @@ -69,7 +69,7 @@ func (l LoginApi) Login(c *gin.Context) { // 停用或未激活 if info.Status != 1 { - apiReturn.Error(c, global.Lang.Get("login.err_username_deactivation")) + apiReturn.ErrorByCode(c, 1004) return }