Browse Source

update:Repair code generator

QM303176530 5 years ago
parent
commit
fcde25b9ee
2 changed files with 33 additions and 32 deletions
  1. 25 24
      server/resource/template/te/api.go.tpl
  2. 8 8
      server/resource/template/te/router.go.tpl

+ 25 - 24
server/resource/template/te/api.go.tpl

@@ -2,7 +2,8 @@ package api
 
 import (
 	"fmt"
-	// 请自行引入model路径
+	"gin-vue-admin/global/response"
+    "gin-vue-admin/model"
 	"github.com/gin-gonic/gin"
 )
 
@@ -12,7 +13,7 @@ import (
 // @Security ApiKeyAuth
 // @accept application/json
 // @Produce application/json
-// @Param data body {{.PackageName}}.{{.StructName}} true "创建{{.StructName}}"
+// @Param data body model.{{.StructName}} true "创建{{.StructName}}"
 // @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
 // @Router /{{.Abbreviation}}/create{{.StructName}} [post]
 func Create{{.StructName}}(c *gin.Context) {
@@ -20,9 +21,9 @@ func Create{{.StructName}}(c *gin.Context) {
 	_ = c.ShouldBindJSON(&{{.Abbreviation}})
 	err := {{.Abbreviation}}.Create{{.StructName}}()
 	if err != nil {
-		servers.ReportFormat(c, false, fmt.Sprintf("创建失败:%v", err), gin.H{})
+	    response.Result(response.ERROR, gin.H{}, fmt.Sprintf("创建失败,%v", err), c)
 	} else {
-		servers.ReportFormat(c, true, "创建成功", gin.H{})
+		response.Result(response.SUCCESS, gin.H{}, "创建成功", c)
 	}
 }
 
@@ -32,7 +33,7 @@ func Create{{.StructName}}(c *gin.Context) {
 // @Security ApiKeyAuth
 // @accept application/json
 // @Produce application/json
-// @Param data body {{.PackageName}}.{{.StructName}} true "删除{{.StructName}}"
+// @Param data body model.{{.StructName}} true "删除{{.StructName}}"
 // @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}"
 // @Router /{{.Abbreviation}}/delete{{.StructName}} [post]
 func Delete{{.StructName}}(c *gin.Context) {
@@ -40,9 +41,9 @@ func Delete{{.StructName}}(c *gin.Context) {
 	_ = c.ShouldBindJSON(&{{.Abbreviation}})
 	err := {{.Abbreviation}}.Delete{{.StructName}}()
 	if err != nil {
-		servers.ReportFormat(c, false, fmt.Sprintf("删除失败:%v", err), gin.H{})
+		response.Result(response.ERROR, gin.H{}, fmt.Sprintf("删除失败,%v", err), c)
 	} else {
-		servers.ReportFormat(c, true, "创建成功", gin.H{})
+		response.Result(response.SUCCESS, gin.H{}, "删除成功", c)
 	}
 }
 
@@ -52,7 +53,7 @@ func Delete{{.StructName}}(c *gin.Context) {
 // @Security ApiKeyAuth
 // @accept application/json
 // @Produce application/json
-// @Param data body {{.PackageName}}.{{.StructName}} true "更新{{.StructName}}"
+// @Param data body model.{{.StructName}} true "更新{{.StructName}}"
 // @Success 200 {string} string "{"success":true,"data":{},"msg":"更新成功"}"
 // @Router /{{.Abbreviation}}/update{{.StructName}} [post]
 func Update{{.StructName}}(c *gin.Context) {
@@ -60,11 +61,11 @@ func Update{{.StructName}}(c *gin.Context) {
 	_ = c.ShouldBindJSON(&{{.Abbreviation}})
 	err,re{{.Abbreviation}} := {{.Abbreviation}}.Update{{.StructName}}()
 	if err != nil {
-		servers.ReportFormat(c, false, fmt.Sprintf("更新失败:%v", err), gin.H{})
+		response.Result(response.ERROR, gin.H{}, fmt.Sprintf("更新失败,%v", err), c)
 	} else {
-		servers.ReportFormat(c, true, "更新成功", gin.H{
-		    "re{{.Abbreviation}}":re{{.Abbreviation}},
-		})
+		response.Result(response.SUCCESS, gin.H{
+            "re{{.Abbreviation}}":re{{.Abbreviation}},
+        }, "更新成功", c)
 	}
 }
 
@@ -74,7 +75,7 @@ func Update{{.StructName}}(c *gin.Context) {
 // @Security ApiKeyAuth
 // @accept application/json
 // @Produce application/json
-// @Param data body {{.PackageName}}.{{.StructName}} true "用id查询{{.StructName}}"
+// @Param data body model.{{.StructName}} true "用id查询{{.StructName}}"
 // @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}"
 // @Router /{{.Abbreviation}}/find{{.StructName}} [post]
 func Find{{.StructName}}(c *gin.Context) {
@@ -82,11 +83,11 @@ func Find{{.StructName}}(c *gin.Context) {
 	_ = c.ShouldBindJSON(&{{.Abbreviation}})
 	err,re{{.Abbreviation}} := {{.Abbreviation}}.FindById()
 	if err != nil {
-		servers.ReportFormat(c, false, fmt.Sprintf("查询失败:%v", err), gin.H{})
+		response.Result(response.ERROR, gin.H{}, fmt.Sprintf("查询失败,%v", err), c)
 	} else {
-		servers.ReportFormat(c, true, "查询成功", gin.H{
-		    "re{{.Abbreviation}}":re{{.Abbreviation}},
-		})
+		response.Result(response.SUCCESS, gin.H{
+             "re{{.Abbreviation}}":re{{.Abbreviation}},
+        }, "查询成功", c)
 	}
 }
 
@@ -104,13 +105,13 @@ func Get{{.StructName}}List(c *gin.Context) {
 	_ = c.ShouldBindJSON(&pageInfo)
 	err, list, total := new({{.PackageName}}.{{.StructName}}).GetInfoList(pageInfo)
 	if err != nil {
-		servers.ReportFormat(c, false, fmt.Sprintf("获取数据失败,%v", err), gin.H{})
+		response.Result(response.ERROR, gin.H{}, fmt.Sprintf("获取数据失败,%v", err), c)
 	} else {
-		servers.ReportFormat(c, true, "获取数据成功", gin.H{
-			"{{.PackageName}}List": list,
-			"total":    total,
-			"page":     pageInfo.Page,
-			"pageSize": pageInfo.PageSize,
-		})
+	    response.Result(response.SUCCESS, gin.H{
+            "{{.PackageName}}List": list,
+            "total":    total,
+            "page":     pageInfo.Page,
+            "pageSize": pageInfo.PageSize,
+        }, "获取数据成功", c)
 	}
 }

+ 8 - 8
server/resource/template/te/router.go.tpl

@@ -1,18 +1,18 @@
 package router
 
 import (
-	"gin-vue-admin/controller/api"
-	"gin-vue-admin/middleware"
-	"github.com/gin-gonic/gin"
+	"gin-vue-admin/api/v1"
+    "gin-vue-admin/middleware"
+    "github.com/gin-gonic/gin"
 )
 
 func Init{{.StructName}}Router(Router *gin.RouterGroup) {
 	{{.StructName}}Router := Router.Group("{{.Abbreviation}}").Use(middleware.JWTAuth()).Use(middleware.CasbinHandler())
 	{
-		{{.StructName}}Router.POST("create{{.StructName}}", api.Create{{.StructName}})     // 新建{{.StructName}}
-		{{.StructName}}Router.POST("delete{{.StructName}}", api.Delete{{.StructName}})   //删除{{.StructName}}
-		{{.StructName}}Router.POST("update{{.StructName}}", api.Update{{.StructName}})   //更新{{.StructName}}
-		{{.StructName}}Router.POST("find{{.StructName}}", api.Find{{.StructName}})           // 根据ID获取{{.StructName}}
-		{{.StructName}}Router.POST("get{{.StructName}}List", api.Get{{.StructName}}List) //获取{{.StructName}}列表
+		{{.StructName}}Router.POST("create{{.StructName}}", v1.Create{{.StructName}})     // 新建{{.StructName}}
+		{{.StructName}}Router.POST("delete{{.StructName}}", v1.Delete{{.StructName}})   //删除{{.StructName}}
+		{{.StructName}}Router.POST("update{{.StructName}}", v1.Update{{.StructName}})   //更新{{.StructName}}
+		{{.StructName}}Router.POST("find{{.StructName}}", v1.Find{{.StructName}})           // 根据ID获取{{.StructName}}
+		{{.StructName}}Router.POST("get{{.StructName}}List", v1.Get{{.StructName}}List) //获取{{.StructName}}列表
 	}
 }