From 0e414cabf43916ebdf738fbcf6391aa54b4208a7 Mon Sep 17 00:00:00 2001
From: Sun <95302870@qq.com>
Date: Mon, 15 Jan 2024 15:09:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=9B=B8=E5=85=B3=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E9=87=87=E7=94=A8=E8=BF=94=E5=9B=9E=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 service/api/api_v1/common/apiReturn/apiReturn.go | 4 ++--
 service/api/api_v1/system/login.go               | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

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(&param); 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
 	}