From 118f9b0855c80aaefb9af3cde1fd0336670e2be0 Mon Sep 17 00:00:00 2001
From: pnck <hio131@gmail.com>
Date: Fri, 20 May 2022 14:55:28 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E4=BF=AE=E6=AD=A3=E5=87=A0=E4=B8=AAok?=
 =?UTF-8?q?withdata=20=E7=9A=84=E8=AF=AF=E7=94=A8=20(#1077)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/api/v1/system/sys_api.go          | 2 +-
 server/api/v1/system/sys_initdb.go       | 2 +-
 server/api/v1/system/sys_system.go       | 2 +-
 server/model/common/response/response.go | 2 +-
 server/plugin/email/api/sys_email.go     | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/server/api/v1/system/sys_api.go b/server/api/v1/system/sys_api.go
index 6405ec2e..11d490d3 100644
--- a/server/api/v1/system/sys_api.go
+++ b/server/api/v1/system/sys_api.go
@@ -110,7 +110,7 @@ func (s *SystemApiApi) GetApiById(c *gin.Context) {
 		global.GVA_LOG.Error("获取失败!", zap.Error(err))
 		response.FailWithMessage("获取失败", c)
 	} else {
-		response.OkWithData(systemRes.SysAPIResponse{Api: api}, c)
+		response.OkWithDetailed(systemRes.SysAPIResponse{Api: api}, "获取成功", c)
 	}
 }
 
diff --git a/server/api/v1/system/sys_initdb.go b/server/api/v1/system/sys_initdb.go
index 9479934e..d85268b6 100644
--- a/server/api/v1/system/sys_initdb.go
+++ b/server/api/v1/system/sys_initdb.go
@@ -35,7 +35,7 @@ func (i *DBApi) InitDB(c *gin.Context) {
 		response.FailWithMessage("自动创建数据库失败，请查看后台日志，检查后在进行初始化", c)
 		return
 	}
-	response.OkWithData("自动创建数据库成功", c)
+	response.OkWithMessage("自动创建数据库成功", c)
 }
 
 // CheckDB
diff --git a/server/api/v1/system/sys_system.go b/server/api/v1/system/sys_system.go
index 38cc0389..f325860e 100644
--- a/server/api/v1/system/sys_system.go
+++ b/server/api/v1/system/sys_system.go
@@ -42,7 +42,7 @@ func (s *SystemApi) SetSystemConfig(c *gin.Context) {
 		global.GVA_LOG.Error("设置失败!", zap.Error(err))
 		response.FailWithMessage("设置失败", c)
 	} else {
-		response.OkWithData("设置成功", c)
+		response.OkWithMessage("设置成功", c)
 	}
 }
 
diff --git a/server/model/common/response/response.go b/server/model/common/response/response.go
index f6eaab20..733f7573 100644
--- a/server/model/common/response/response.go
+++ b/server/model/common/response/response.go
@@ -35,7 +35,7 @@ func OkWithMessage(message string, c *gin.Context) {
 }
 
 func OkWithData(data interface{}, c *gin.Context) {
-	Result(SUCCESS, data, "操作成功", c)
+	Result(SUCCESS, data, "查询成功", c)
 }
 
 func OkWithDetailed(data interface{}, message string, c *gin.Context) {
diff --git a/server/plugin/email/api/sys_email.go b/server/plugin/email/api/sys_email.go
index 09605ab9..6a649667 100644
--- a/server/plugin/email/api/sys_email.go
+++ b/server/plugin/email/api/sys_email.go
@@ -22,7 +22,7 @@ func (s *EmailApi) EmailTest(c *gin.Context) {
 		global.GVA_LOG.Error("发送失败!", zap.Error(err))
 		response.FailWithMessage("发送失败", c)
 	} else {
-		response.OkWithData("发送成功", c)
+		response.OkWithMessage("发送成功", c)
 	}
 }
 
@@ -40,6 +40,6 @@ func (s *EmailApi) SendEmail(c *gin.Context) {
 		global.GVA_LOG.Error("发送失败!", zap.Error(err))
 		response.FailWithMessage("发送失败", c)
 	} else {
-		response.OkWithData("发送成功", c)
+		response.OkWithMessage("发送成功", c)
 	}
 }
-- 
GitLab