Prechádzať zdrojové kódy

修改模板文件,规范化代码

SliverHorn 4 rokov pred
rodič
commit
2716d5624a

+ 2 - 2
server/api/v1/sys_api.go

@@ -102,8 +102,8 @@ func GetApiById(c *gin.Context) {
 	}
 	err, api := service.GetApiById(idInfo.Id)
 	if err != nil {
-		global.GVA_LOG.Error("获取数据失败!", zap.Any("err", err))
-		response.FailWithMessage("获取数据失败", c)
+		global.GVA_LOG.Error("获取失败!", zap.Any("err", err))
+		response.FailWithMessage("获取失败", c)
 	} else {
 		response.OkWithData(response.SysAPIResponse{Api: api}, c)
 	}

+ 2 - 2
server/api/v1/sys_dictionary_detail.go

@@ -103,8 +103,8 @@ func GetSysDictionaryDetailList(c *gin.Context) {
 	var pageInfo request.SysDictionaryDetailSearch
 	_ = c.ShouldBindQuery(&pageInfo)
 	if err, list, total := service.GetSysDictionaryDetailInfoList(pageInfo); err != nil {
-		global.GVA_LOG.Error("获取数据失败!", zap.Any("err", err))
-		response.FailWithMessage("获取数据失败", c)
+		global.GVA_LOG.Error("获取失败!", zap.Any("err", err))
+		response.FailWithMessage("获取失败", c)
 	} else {
 		response.OkWithDetailed(response.PageResult{
 			List:     list,

+ 3 - 3
server/api/v1/sys_user.go

@@ -166,15 +166,15 @@ func GetUserList(c *gin.Context) {
 		return
 	}
 	if err, list, total := service.GetUserInfoList(pageInfo); err != nil {
-		global.GVA_LOG.Error("获取数据失败", zap.Any("err", err))
-		response.FailWithMessage("获取数据失败", c)
+		global.GVA_LOG.Error("获取失败", zap.Any("err", err))
+		response.FailWithMessage("获取失败", c)
 	} else {
 		response.OkWithDetailed(response.PageResult{
 			List:     list,
 			Total:    total,
 			Page:     pageInfo.Page,
 			PageSize: pageInfo.PageSize,
-		}, "获取数据成功", c)
+		}, "获取成功", c)
 	}
 }
 

+ 35 - 35
server/resource/template/server/api.go.tpl

@@ -1,13 +1,13 @@
 package v1
 
 import (
-	"fmt"
-	"gin-vue-admin/global/response"
-	"gin-vue-admin/model"
-	"gin-vue-admin/model/request"
-	resp "gin-vue-admin/model/response"
-	"gin-vue-admin/service"
-	"github.com/gin-gonic/gin"
+	"gin-vue-admin/global"
+    "gin-vue-admin/model"
+    "gin-vue-admin/model/request"
+    "gin-vue-admin/model/response"
+    "gin-vue-admin/service"
+    "github.com/gin-gonic/gin"
+    "go.uber.org/zap"
 )
 
 // @Tags {{.StructName}}
@@ -21,9 +21,9 @@ import (
 func Create{{.StructName}}(c *gin.Context) {
 	var {{.Abbreviation}} model.{{.StructName}}
 	_ = c.ShouldBindJSON(&{{.Abbreviation}})
-	err := service.Create{{.StructName}}({{.Abbreviation}})
-	if err != nil {
-		response.FailWithMessage(fmt.Sprintf("创建失败,%v", err), c)
+	if err := service.Create{{.StructName}}({{.Abbreviation}}); err != nil {
+        global.GVA_LOG.Error("创建失败!", zap.Any("err", err))
+		response.FailWithMessage("创建失败", c)
 	} else {
 		response.OkWithMessage("创建成功", c)
 	}
@@ -40,9 +40,9 @@ func Create{{.StructName}}(c *gin.Context) {
 func Delete{{.StructName}}(c *gin.Context) {
 	var {{.Abbreviation}} model.{{.StructName}}
 	_ = c.ShouldBindJSON(&{{.Abbreviation}})
-	err := service.Delete{{.StructName}}({{.Abbreviation}})
-	if err != nil {
-		response.FailWithMessage(fmt.Sprintf("删除失败,%v", err), c)
+	if err := service.Delete{{.StructName}}({{.Abbreviation}}); err != nil {
+        global.GVA_LOG.Error("删除失败!", zap.Any("err", err))
+		response.FailWithMessage("删除失败", c)
 	} else {
 		response.OkWithMessage("删除成功", c)
 	}
@@ -54,16 +54,16 @@ func Delete{{.StructName}}(c *gin.Context) {
 // @accept application/json
 // @Produce application/json
 // @Param data body request.IdsReq true "批量删除{{.StructName}}"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}"
+// @Success 200 {string} string "{"success":true,"data":{},"msg":"批量删除成功"}"
 // @Router /{{.Abbreviation}}/delete{{.StructName}}ByIds [delete]
 func Delete{{.StructName}}ByIds(c *gin.Context) {
 	var IDS request.IdsReq
     _ = c.ShouldBindJSON(&IDS)
-	err := service.Delete{{.StructName}}ByIds(IDS)
-	if err != nil {
-		response.FailWithMessage(fmt.Sprintf("删除失败,%v", err), c)
+	if err := service.Delete{{.StructName}}ByIds(IDS); err != nil {
+        global.GVA_LOG.Error("批量删除失败!", zap.Any("err", err))
+		response.FailWithMessage("批量删除失败", c)
 	} else {
-		response.OkWithMessage("删除成功", c)
+		response.OkWithMessage("批量删除成功", c)
 	}
 }
 
@@ -78,9 +78,9 @@ func Delete{{.StructName}}ByIds(c *gin.Context) {
 func Update{{.StructName}}(c *gin.Context) {
 	var {{.Abbreviation}} model.{{.StructName}}
 	_ = c.ShouldBindJSON(&{{.Abbreviation}})
-	err := service.Update{{.StructName}}(&{{.Abbreviation}})
-	if err != nil {
-		response.FailWithMessage(fmt.Sprintf("更新失败,%v", err), c)
+	if err := service.Update{{.StructName}}(&{{.Abbreviation}}); err != nil {
+        global.GVA_LOG.Error("更新失败!", zap.Any("err", err))
+		response.FailWithMessage("更新失败", c)
 	} else {
 		response.OkWithMessage("更新成功", c)
 	}
@@ -97,9 +97,9 @@ func Update{{.StructName}}(c *gin.Context) {
 func Find{{.StructName}}(c *gin.Context) {
 	var {{.Abbreviation}} model.{{.StructName}}
 	_ = c.ShouldBindQuery(&{{.Abbreviation}})
-	err, re{{.Abbreviation}} := service.Get{{.StructName}}({{.Abbreviation}}.ID)
-	if err != nil {
-		response.FailWithMessage(fmt.Sprintf("查询失败,%v", err), c)
+	if err, re{{.Abbreviation}} := service.Get{{.StructName}}({{.Abbreviation}}.ID); err != nil {
+        global.GVA_LOG.Error("查询失败!", zap.Any("err", err))
+		response.FailWithMessage("查询失败", c)
 	} else {
 		response.OkWithData(gin.H{"re{{.Abbreviation}}": re{{.Abbreviation}}}, c)
 	}
@@ -116,15 +116,15 @@ func Find{{.StructName}}(c *gin.Context) {
 func Get{{.StructName}}List(c *gin.Context) {
 	var pageInfo request.{{.StructName}}Search
 	_ = c.ShouldBindQuery(&pageInfo)
-	err, list, total := service.Get{{.StructName}}InfoList(pageInfo)
-	if err != nil {
-		response.FailWithMessage(fmt.Sprintf("获取数据失败,%v", err), c)
-	} else {
-		response.OkWithData(resp.PageResult{
-			List:     list,
-			Total:    total,
-			Page:     pageInfo.Page,
-			PageSize: pageInfo.PageSize,
-		}, c)
-	}
+	if err, list, total := service.Get{{.StructName}}InfoList(pageInfo); err != nil {
+	    global.GVA_LOG.Error("获取失败", zap.Any("err", err))
+        response.FailWithMessage("获取失败", c)
+    } else {
+        response.OkWithDetailed(response.PageResult{
+            List:     list,
+            Total:    total,
+            Page:     pageInfo.Page,
+            PageSize: pageInfo.PageSize,
+        }, "获取成功", c)
+    }
 }