Merge branch 'dev'
This commit is contained in:
commit
372248c819
219 files changed
+9367
-8029
No files matched your search
@@ -1,9 +1,10 @@
|
||||
package {{.ModuleName}}
|
||||
package apis
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
"github.com/go-admin-team/go-admin-core/sdk/api"
|
||||
"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
|
||||
_ "github.com/go-admin-team/go-admin-core/sdk/pkg/response"
|
||||
|
||||
@@ -11,11 +12,10 @@ import (
|
||||
"go-admin/app/{{.PackageName}}/service"
|
||||
"go-admin/app/{{.PackageName}}/service/dto"
|
||||
"go-admin/common/actions"
|
||||
"go-admin/common/apis"
|
||||
)
|
||||
|
||||
type {{.ClassName}} struct {
|
||||
apis.Api
|
||||
api.Api
|
||||
}
|
||||
|
||||
// Get{{.ClassName}}List 获取{{.TableComment}}列表
|
||||
@@ -111,7 +111,7 @@ func (e {{.ClassName}}) Get{{.ClassName}}(c *gin.Context) {
|
||||
return
|
||||
}
|
||||
|
||||
e.OK( object, "查看成功")
|
||||
e.OK( object, "查询成功")
|
||||
}
|
||||
|
||||
// Insert{{.ClassName}} 创建{{.TableComment}}
|
||||
|
||||
@@ -4,7 +4,7 @@ import (
|
||||
"github.com/gin-gonic/gin"
|
||||
jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
|
||||
|
||||
"go-admin/app/{{.PackageName}}/apis/{{.ModuleName}}"
|
||||
"go-admin/app/{{.PackageName}}/apis"
|
||||
"go-admin/common/middleware"
|
||||
)
|
||||
|
||||
@@ -14,7 +14,7 @@ func init() {
|
||||
|
||||
// register{{.ClassName}}Router
|
||||
func register{{.ClassName}}Router(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
|
||||
api := &{{.ModuleName}}.{{.ClassName}}{}
|
||||
api := apis.{{.ClassName}}{}
|
||||
r := v1.Group("/{{.ModuleName}}").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole())
|
||||
{
|
||||
r.GET("", api.Get{{.ClassName}}List)
|
||||
|
||||
@@ -4,7 +4,7 @@ import (
|
||||
"github.com/gin-gonic/gin"
|
||||
jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth"
|
||||
|
||||
"go-admin/app/{{.PackageName}}/apis/{{.ModuleName}}"
|
||||
"go-admin/app/{{.PackageName}}/apis"
|
||||
)
|
||||
|
||||
func init() {
|
||||
@@ -13,7 +13,7 @@ func init() {
|
||||
|
||||
// register{{.ClassName}}Router
|
||||
func register{{.ClassName}}Router(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) {
|
||||
api := &{{.ModuleName}}.{{.ClassName}}{}
|
||||
api := apis.{{.ClassName}}{}
|
||||
r := v1.Group("/{{.ModuleName}}").Use(authMiddleware.MiddlewareFunc())
|
||||
{
|
||||
r.GET("", api.Get{{.ClassName}})
|
||||
|
||||
@@ -3,13 +3,13 @@ package service
|
||||
import (
|
||||
"errors"
|
||||
|
||||
"github.com/go-admin-team/go-admin-core/sdk/service"
|
||||
"gorm.io/gorm"
|
||||
|
||||
"go-admin/app/{{.PackageName}}/models"
|
||||
"go-admin/common/actions"
|
||||
cDto "go-admin/common/dto"
|
||||
"go-admin/app/{{.PackageName}}/service/dto"
|
||||
"go-admin/common/service"
|
||||
)
|
||||
|
||||
type {{.ClassName}} struct {
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
<el-form ref="queryForm" :model="queryParams" :inline="true" label-width="68px">
|
||||
{{range .Columns}}
|
||||
{{- $x := .IsQuery -}}
|
||||
{{- if ($x) -}}
|
||||
{{- if (eq $x "1") -}}
|
||||
<el-form-item label="{{.ColumnComment}}" prop="{{.JsonField}}">
|
||||
{{- if ne .FkTableName "" -}}
|
||||
<el-select v-model="queryParams.{{.JsonField}}"
|
||||
@@ -294,7 +294,8 @@
|
||||
// 表单校验
|
||||
rules: {
|
||||
{{- range .Columns -}}
|
||||
{{- if eq .IsRequired "1" -}}
|
||||
{{- $x := .IsQuery -}}
|
||||
{{- if (eq $x "1") -}}
|
||||
{{.JsonField}}:
|
||||
[
|
||||
{required: true, message: '{{.ColumnComment}}不能为空', trigger: 'blur'}
|
||||
@@ -341,7 +342,7 @@
|
||||
this.form = {
|
||||
{{ range .Columns}}
|
||||
{{- $x := .IsInsert -}}
|
||||
{{- if ($x) -}}
|
||||
{{- if (eq $x "1") -}}
|
||||
{{- if eq .GoField "CreatedAt" -}}
|
||||
{{- else if eq .GoField "UpdatedAt" -}}
|
||||
{{- else if eq .GoField "DeletedAt" -}}
|
||||
|
||||
Reference in new issue
Block a user