feat:update api model router tpl

This commit is contained in:
zhangwenjian committed 2020-09-10 14:14:08 +08:00
1 parent fa07a57d22
commit 8a7a9db7fd
12 files changed
+148 -38

No files matched your search

+2 -2
View File
@@ -2,9 +2,9 @@ package {{.ModuleName}}
import (
"github.com/gin-gonic/gin"
"github.com/gin-gonic/gin/binding"
"go-admin/models"
"go-admin/app/admin/models"
"go-admin/app/admin/service/dto"
"go-admin/tools"
"go-admin/tools/app"
"go-admin/tools/app/msg"
+2 -2
View File
@@ -37,9 +37,9 @@ data: data
}
// 删除{{.ClassName}}
export function del{{.ClassName}}({{.PkJsonField}},data) {
export function del{{.ClassName}}(data) {
return request({
url: '/api/v1/{{.ModuleName}}/' + {{.PkJsonField}},
url: '/api/v1/{{.ModuleName}}',
method: 'delete',
data: data
})
+24 -6
View File
@@ -3,10 +3,10 @@ package models
import (
"strconv"
"go-admin/common/dto"
orm "go-admin/common/global"
"go-admin/common/models"
"go-admin/tools"
"go-admin/common/dto"
orm "go-admin/common/global"
"go-admin/common/models"
"go-admin/tools"
{{ range .Columns }}
{{- if eq .GoField "CreatedAt" -}}
@@ -36,6 +36,24 @@ func ({{.ClassName}}) TableName() string {
return "{{.TBName}}"
}
func (e *{{.ClassName}}) Generate() models.ActiveRecord {
o := *e
return &o
}
func (e *{{.ClassName}}) GetId() interface{} {
return e.{{.PkGoField}}
}
func (e *{{.ClassName}}) SetCreateBy(createBy uint) {
e.CreateBy = strconv.Itoa(int(createBy))
}
func (e *{{.ClassName}}) SetUpdateBy(updateBy uint) {
e.UpdateBy = strconv.Itoa(int(updateBy))
}
// 创建{{.ClassName}}
func (e *{{.ClassName}}) Create() ({{.ClassName}}, error) {
var doc {{.ClassName}}
@@ -76,7 +94,7 @@ func (e *{{.ClassName}}) Get() ({{.ClassName}}, error) {
func (e *{{.ClassName}}) GetPage(pageSize int, pageIndex int, v interface{}) ([]{{.ClassName}}, int, error) {
var doc []{{.ClassName}}
table := orm.Eloquent.Table(e.TableName()).Scopes(tools.MakeCondition(v))
table := orm.Eloquent.Table(e.TableName()).Scopes(dto.MakeCondition(v))
// 数据权限控制(如果不需要数据权限请将此处去掉)
dataPermission := new(DataPermission)
@@ -87,7 +105,7 @@ func (e *{{.ClassName}}) GetPage(pageSize int, pageIndex int, v interface{}) ([]
}
var count int64
if err := table.Scopes(tools.Paginate(pageSize, pageIndex)).Find(&doc).Offset(-1).Limit(-1).Count(&count).Error; err != nil {
if err := table.Scopes(dto.Paginate(pageSize, pageIndex)).Find(&doc).Offset(-1).Limit(-1).Count(&count).Error; err != nil {
return nil, 0, err
}
return doc, int(count), nil
+2 -2
View File
@@ -16,7 +16,7 @@ func register{{.ClassName}}Router(v1 *gin.RouterGroup, authMiddleware *jwt.GinJW
r.GET("", {{.ModuleName}}.Get{{.ClassName}}List)
r.POST("", {{.ModuleName}}.Insert{{.ClassName}})
r.PUT("", {{.ModuleName}}.Update{{.ClassName}})
r.DELETE("/:{{.PkJsonField}}", {{.ModuleName}}.Delete{{.ClassName}})
r.DELETE("", {{.ModuleName}}.Delete{{.ClassName}})
}
}
@@ -28,6 +28,6 @@ func register{{.ClassName}}Router(v1 *gin.RouterGroup) {
r.GET("/:{{.PkJsonField}}", {{.ModuleName}}.Get{{.ClassName}})
r.POST("", {{.ModuleName}}.Insert{{.ClassName}})
r.PUT("", {{.ModuleName}}.Update{{.ClassName}})
r.DELETE("/:{{.PkJsonField}}", {{.ModuleName}}.Delete{{.ClassName}})
r.DELETE("", {{.ModuleName}}.Delete{{.ClassName}})
}
}
+8 -4
View File
@@ -3,11 +3,15 @@ package router
import (
"github.com/gin-gonic/gin"
"go-admin/middleware"
"go-admin/apis/{{.ModuleName}}"
"go-admin/app/admin/apis/{{.ModuleName}}"
"go-admin/app/admin/middleware"
jwt "go-admin/pkg/jwtauth"
)
func init() {
routerCheckRole = append(routerCheckRole, register{{.ClassName}}Router)
}
// 需认证的路由代码
func register{{.ClassName}}Router(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
r := v1.Group("/{{.ModuleName}}").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
@@ -15,7 +19,7 @@ func register{{.ClassName}}Router(v1 *gin.RouterGroup, authMiddleware *jwt.GinJW
r.GET("/:{{.PkJsonField}}", {{.ModuleName}}.Get{{.ClassName}})
r.POST("", {{.ModuleName}}.Insert{{.ClassName}})
r.PUT("/:{{.PkJsonField}}", {{.ModuleName}}.Update{{.ClassName}})
r.DELETE("/:{{.PkJsonField}}", {{.ModuleName}}.Delete{{.ClassName}})
l.GET("",{{.ModuleName}}.Get{{.ClassName}}List)
r.DELETE("", {{.ModuleName}}.Delete{{.ClassName}})
r.GET("",{{.ModuleName}}.Get{{.ClassName}}List)
}
}
+6 -2
View File
@@ -3,9 +3,13 @@ package router
import (
"github.com/gin-gonic/gin"
"go-admin/apis/{{.ModuleName}}"
"go-admin/app/admin/apis/{{.ModuleName}}"
)
func init() {
routerNoCheckRole = append(routerNoCheckRole, register{{.ClassName}}Router)
}
// 无需认证的路由代码
func register{{.ClassName}}Router(v1 *gin.RouterGroup) {
r := v1.Group("/{{.ModuleName}}")
@@ -13,7 +17,7 @@ func register{{.ClassName}}Router(v1 *gin.RouterGroup) {
r.GET("/:{{.PkJsonField}}", {{.ModuleName}}.Get{{.ClassName}})
r.POST("", {{.ModuleName}}.Insert{{.ClassName}})
r.PUT("/:{{.PkJsonField}}", {{.ModuleName}}.Update{{.ClassName}})
r.DELETE("/:{{.PkJsonField}}", {{.ModuleName}}.Delete{{.ClassName}})
r.DELETE("", {{.ModuleName}}.Delete{{.ClassName}})
r.GET("",{{.ModuleName}}.Get{{.ClassName}}List)
}
}
+1 -1
View File
@@ -26,6 +26,6 @@ func register{{.ClassName}}Router(v1 *gin.RouterGroup, authMiddleware *jwt.GinJW
r.GET("/:id", actions.PermissionAction(), actions.ViewAction(new(dto.{{.ClassName}}ById)))
r.POST("", actions.CreateAction(new(dto.{{.ClassName}}Control)))
r.PUT("/:id", actions.PermissionAction(), actions.UpdateAction(new(dto.{{.ClassName}}Control)))
r.DELETE("/:id", actions.PermissionAction(), actions.DeleteAction(new(dto.{{.ClassName}}ById)))
r.DELETE("", actions.PermissionAction(), actions.DeleteAction(new(dto.{{.ClassName}}ById)))
}
}
+5 -1
View File
@@ -9,6 +9,10 @@ import (
"go-admin/common/actions"
)
func init() {
routerNoCheckRole = append(routerNoCheckRole, register{{.ClassName}}Router)
}
// 无需认证的路由代码
func register{{.ClassName}}Router(v1 *gin.RouterGroup) {
r := v1.Group("/{{.ModuleName}}")
@@ -21,6 +25,6 @@ func register{{.ClassName}}Router(v1 *gin.RouterGroup) {
r.GET("/:id", actions.ViewAction(new(dto.{{.ClassName}}ById)))
r.POST("", actions.CreateAction(new(dto.{{.ClassName}}Control)))
r.PUT("/:id", actions.UpdateAction(new(dto.{{.ClassName}}Control)))
r.DELETE("/:id", actions.DeleteAction(new(dto.{{.ClassName}}ById)))
r.DELETE("", actions.DeleteAction(new(dto.{{.ClassName}}ById)))
}
}
+1 -5
View File
@@ -428,11 +428,7 @@
cancelButtonText: '取消',
type: 'warning'
}).then(function () {
if (Ids.length > 1) {
return del{{.ClassName}}(Ids.shift(), { 'ids': Ids })
} else {
return del{{.ClassName}}(Ids, { 'ids': [] })
}
return del{{.ClassName}}( { 'ids': Ids })
}).then(() => {
this.getList()
this.msgSuccess('删除成功')