From a847ad292f4bccab7d461029c29a6d0b0b6300d0 Mon Sep 17 00:00:00 2001 From: pixelmaxQM Date: Thu, 17 Oct 2024 23:15:59 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=87=AA=E5=8A=A8=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=8F=AF=E8=87=AA=E8=A1=8C=E9=85=8D=E7=BD=AEmod?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/model/system/request/sys_auto_code.go | 3 +++ server/model/system/request/sys_auto_code_package.go | 4 ++++ server/model/system/sys_auto_code_package.go | 1 + server/resource/package/server/api/api.go.tpl | 12 ++++++------ server/resource/package/server/model/model.go.tpl | 2 +- .../package/server/model/request/request.go.tpl | 2 +- server/resource/package/server/router/router.go.tpl | 2 +- .../resource/package/server/service/service.go.tpl | 6 +++--- server/resource/plugin/server/api/api.go.template | 12 ++++++------ .../plugin/server/initialize/api.go.template | 4 ++-- .../plugin/server/initialize/gorm.go.template | 3 +-- .../plugin/server/initialize/menu.go.template | 4 ++-- .../plugin/server/initialize/router.go.template | 4 ++-- .../plugin/server/initialize/viper.go.template | 4 ++-- .../resource/plugin/server/model/model.go.template | 2 +- .../plugin/server/model/request/request.go.template | 2 +- server/resource/plugin/server/plugin.go.template | 4 ++-- .../resource/plugin/server/plugin/plugin.go.template | 2 +- .../resource/plugin/server/router/router.go.template | 2 +- .../plugin/server/service/service.go.template | 6 +++--- 20 files changed, 44 insertions(+), 37 deletions(-) diff --git a/server/model/system/request/sys_auto_code.go b/server/model/system/request/sys_auto_code.go index 27de339bf..157837870 100644 --- a/server/model/system/request/sys_auto_code.go +++ b/server/model/system/request/sys_auto_code.go @@ -3,6 +3,7 @@ package request import ( "encoding/json" "fmt" + "github.com/flipped-aurora/gin-vue-admin/server/global" model "github.com/flipped-aurora/gin-vue-admin/server/model/system" "github.com/pkg/errors" "go/token" @@ -28,6 +29,7 @@ type AutoCode struct { OnlyTemplate bool `json:"onlyTemplate" example:"false"` // 是否只生成模板 IsAdd bool `json:"isAdd" example:"false"` // 是否新增 Fields []*AutoCodeField `json:"fields"` + Module string `json:"-"` DictTypes []string `json:"-"` PrimaryField *AutoCodeField `json:"primaryField"` DataSourceMap map[string]*DataSource `json:"-"` @@ -111,6 +113,7 @@ func (r *AutoCode) Menu(template string) model.SysBaseMenu { // Pretreatment 预处理 // Author [SliverHorn](https://github.com/SliverHorn) func (r *AutoCode) Pretreatment() error { + r.Module = global.GVA_CONFIG.AutoCode.Module if token.IsKeyword(r.Abbreviation) { r.Abbreviation = r.Abbreviation + "_" } // go 关键字处理 diff --git a/server/model/system/request/sys_auto_code_package.go b/server/model/system/request/sys_auto_code_package.go index 8494cb178..679303a56 100644 --- a/server/model/system/request/sys_auto_code_package.go +++ b/server/model/system/request/sys_auto_code_package.go @@ -1,6 +1,7 @@ package request import ( + "github.com/flipped-aurora/gin-vue-admin/server/global" model "github.com/flipped-aurora/gin-vue-admin/server/model/system" ) @@ -9,11 +10,13 @@ type SysAutoCodePackageCreate struct { Label string `json:"label" example:"展示名"` Template string `json:"template" example:"模版"` PackageName string `json:"packageName" example:"包名"` + Module string `json:"-" example:"模块"` } func (r *SysAutoCodePackageCreate) AutoCode() AutoCode { return AutoCode{ Package: r.PackageName, + Module: global.GVA_CONFIG.AutoCode.Module, } } @@ -23,5 +26,6 @@ func (r *SysAutoCodePackageCreate) Create() model.SysAutoCodePackage { Label: r.Label, Template: r.Template, PackageName: r.PackageName, + Module: global.GVA_CONFIG.AutoCode.Module, } } diff --git a/server/model/system/sys_auto_code_package.go b/server/model/system/sys_auto_code_package.go index e87e88538..4099192f6 100644 --- a/server/model/system/sys_auto_code_package.go +++ b/server/model/system/sys_auto_code_package.go @@ -10,6 +10,7 @@ type SysAutoCodePackage struct { Label string `json:"label" gorm:"comment:展示名"` Template string `json:"template" gorm:"comment:模版"` PackageName string `json:"packageName" gorm:"comment:包名"` + Module string `json:"-" example:"模块"` } func (s *SysAutoCodePackage) TableName() string { diff --git a/server/resource/package/server/api/api.go.tpl b/server/resource/package/server/api/api.go.tpl index 43e727aa1..9e5bed5da 100644 --- a/server/resource/package/server/api/api.go.tpl +++ b/server/resource/package/server/api/api.go.tpl @@ -2,17 +2,17 @@ package {{.Package}} import ( {{if not .OnlyTemplate}} - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" - "github.com/flipped-aurora/gin-vue-admin/server/model/{{.Package}}" - {{.Package}}Req "github.com/flipped-aurora/gin-vue-admin/server/model/{{.Package}}/request" + "{{.Module}}/global" + "{{.Module}}/model/common/response" + "{{.Module}}/model/{{.Package}}" + {{.Package}}Req "{{.Module}}/model/{{.Package}}/request" "github.com/gin-gonic/gin" "go.uber.org/zap" {{- if .AutoCreateResource}} - "github.com/flipped-aurora/gin-vue-admin/server/utils" + "{{.Module}}/utils" {{- end }} {{- else}} - "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" + "{{.Module}}/model/common/response" "github.com/gin-gonic/gin" {{- end}} ) diff --git a/server/resource/package/server/model/model.go.tpl b/server/resource/package/server/model/model.go.tpl index f10955c33..5ed2f5c63 100644 --- a/server/resource/package/server/model/model.go.tpl +++ b/server/resource/package/server/model/model.go.tpl @@ -31,7 +31,7 @@ package {{.Package}} {{- if not .OnlyTemplate}} import ( {{- if .GvaModel }} - "github.com/flipped-aurora/gin-vue-admin/server/global" + "{{.Module}}/global" {{- end }} {{- if or .HasTimer }} "time" diff --git a/server/resource/package/server/model/request/request.go.tpl b/server/resource/package/server/model/request/request.go.tpl index dbacbd1a6..1f3edf0f8 100644 --- a/server/resource/package/server/model/request/request.go.tpl +++ b/server/resource/package/server/model/request/request.go.tpl @@ -25,7 +25,7 @@ package request import ( {{- if not .OnlyTemplate }} - "github.com/flipped-aurora/gin-vue-admin/server/model/common/request" + "{{.Module}}/model/common/request" {{ if or .HasSearchTimer .GvaModel}}"time"{{ end }} {{- end }} ) diff --git a/server/resource/package/server/router/router.go.tpl b/server/resource/package/server/router/router.go.tpl index 9a4ba9de0..cac47ab78 100644 --- a/server/resource/package/server/router/router.go.tpl +++ b/server/resource/package/server/router/router.go.tpl @@ -1,7 +1,7 @@ package {{.Package}} import ( - {{if .OnlyTemplate}}// {{ end}}"github.com/flipped-aurora/gin-vue-admin/server/middleware" + {{if .OnlyTemplate}}// {{ end}}"{{.Module}}/middleware" "github.com/gin-gonic/gin" ) diff --git a/server/resource/package/server/service/service.go.tpl b/server/resource/package/server/service/service.go.tpl index 6d77a5567..ebdc6f45d 100644 --- a/server/resource/package/server/service/service.go.tpl +++ b/server/resource/package/server/service/service.go.tpl @@ -58,9 +58,9 @@ package {{.Package}} import ( {{- if not .OnlyTemplate }} - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/{{.Package}}" - {{.Package}}Req "github.com/flipped-aurora/gin-vue-admin/server/model/{{.Package}}/request" + "{{.Module}}/global" + "{{.Module}}/model/{{.Package}}" + {{.Package}}Req "{{.Module}}/model/{{.Package}}/request" {{- if .AutoCreateResource }} "gorm.io/gorm" {{- end}} diff --git a/server/resource/plugin/server/api/api.go.template b/server/resource/plugin/server/api/api.go.template index 03321c74f..edf465180 100644 --- a/server/resource/plugin/server/api/api.go.template +++ b/server/resource/plugin/server/api/api.go.template @@ -2,17 +2,17 @@ package api import ( {{if not .OnlyTemplate}} - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" - "github.com/flipped-aurora/gin-vue-admin/server/plugin/{{.Package}}/model" - "github.com/flipped-aurora/gin-vue-admin/server/plugin/{{.Package}}/model/request" + "{{.Module}}/global" + "{{.Module}}/model/common/response" + "{{.Module}}/plugin/{{.Package}}/model" + "{{.Module}}/plugin/{{.Package}}/model/request" "github.com/gin-gonic/gin" "go.uber.org/zap" {{- if .AutoCreateResource}} - "github.com/flipped-aurora/gin-vue-admin/server/utils" + "{{.Module}}/utils" {{- end }} {{- else }} - "github.com/flipped-aurora/gin-vue-admin/server/model/common/response" + "{{.Module}}/model/common/response" "github.com/gin-gonic/gin" {{- end }} ) diff --git a/server/resource/plugin/server/initialize/api.go.template b/server/resource/plugin/server/initialize/api.go.template index adf5d64cf..dfbea23d9 100644 --- a/server/resource/plugin/server/initialize/api.go.template +++ b/server/resource/plugin/server/initialize/api.go.template @@ -2,8 +2,8 @@ package initialize import ( "context" - model "github.com/flipped-aurora/gin-vue-admin/server/model/system" - "github.com/flipped-aurora/gin-vue-admin/server/plugin/plugin-tool/utils" + model "{{.Module}}/model/system" + "{{.Module}}/plugin/plugin-tool/utils" ) func Api(ctx context.Context) { diff --git a/server/resource/plugin/server/initialize/gorm.go.template b/server/resource/plugin/server/initialize/gorm.go.template index 0988bccff..52c818319 100644 --- a/server/resource/plugin/server/initialize/gorm.go.template +++ b/server/resource/plugin/server/initialize/gorm.go.template @@ -3,8 +3,7 @@ package initialize import ( "context" "fmt" - "github.com/flipped-aurora/gin-vue-admin/server/global" - + "{{.Module}}/global" "github.com/pkg/errors" "go.uber.org/zap" ) diff --git a/server/resource/plugin/server/initialize/menu.go.template b/server/resource/plugin/server/initialize/menu.go.template index 06993db3d..8774f356c 100644 --- a/server/resource/plugin/server/initialize/menu.go.template +++ b/server/resource/plugin/server/initialize/menu.go.template @@ -2,8 +2,8 @@ package initialize import ( "context" - model "github.com/flipped-aurora/gin-vue-admin/server/model/system" - "github.com/flipped-aurora/gin-vue-admin/server/plugin/plugin-tool/utils" + model "{{.Module}}/model/system" + "{{.Module}}/plugin/plugin-tool/utils" ) func Menu(ctx context.Context) { diff --git a/server/resource/plugin/server/initialize/router.go.template b/server/resource/plugin/server/initialize/router.go.template index f7f8ed0fb..fbf03a3aa 100644 --- a/server/resource/plugin/server/initialize/router.go.template +++ b/server/resource/plugin/server/initialize/router.go.template @@ -1,8 +1,8 @@ package initialize import ( - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/middleware" + "{{.Module}}/global" + "{{.Module}}/middleware" "github.com/gin-gonic/gin" ) diff --git a/server/resource/plugin/server/initialize/viper.go.template b/server/resource/plugin/server/initialize/viper.go.template index a1887ac28..e759ad637 100644 --- a/server/resource/plugin/server/initialize/viper.go.template +++ b/server/resource/plugin/server/initialize/viper.go.template @@ -2,8 +2,8 @@ package initialize import ( "fmt" - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/plugin/{{ .Package }}/plugin" + "{{.Module}}/global" + "{{.Module}}/plugin/{{ .Package }}/plugin" "github.com/pkg/errors" "go.uber.org/zap" ) diff --git a/server/resource/plugin/server/model/model.go.template b/server/resource/plugin/server/model/model.go.template index 8a634c8cf..0d7b7d375 100644 --- a/server/resource/plugin/server/model/model.go.template +++ b/server/resource/plugin/server/model/model.go.template @@ -30,7 +30,7 @@ package model {{- if not .OnlyTemplate}} import ( {{- if .GvaModel }} - "github.com/flipped-aurora/gin-vue-admin/server/global" + "{{.Module}}/global" {{- end }} {{- if or .HasTimer }} "time" diff --git a/server/resource/plugin/server/model/request/request.go.template b/server/resource/plugin/server/model/request/request.go.template index d7f72452c..267084049 100644 --- a/server/resource/plugin/server/model/request/request.go.template +++ b/server/resource/plugin/server/model/request/request.go.template @@ -24,7 +24,7 @@ Order string `json:"order" form:"order"` package request {{- if not .OnlyTemplate}} import ( - "github.com/flipped-aurora/gin-vue-admin/server/model/common/request" + "{{.Module}}/model/common/request" {{ if or .HasSearchTimer .GvaModel}}"time"{{ end }} ) {{- end}} diff --git a/server/resource/plugin/server/plugin.go.template b/server/resource/plugin/server/plugin.go.template index 42c59f599..255b7af00 100644 --- a/server/resource/plugin/server/plugin.go.template +++ b/server/resource/plugin/server/plugin.go.template @@ -2,8 +2,8 @@ package {{ .Package }} import ( "context" - "github.com/flipped-aurora/gin-vue-admin/server/plugin/{{ .Package }}/initialize" - interfaces "github.com/flipped-aurora/gin-vue-admin/server/utils/plugin/v2" + "{{.Module}}/plugin/{{ .Package }}/initialize" + interfaces "{{.Module}}/utils/plugin/v2" "github.com/gin-gonic/gin" ) diff --git a/server/resource/plugin/server/plugin/plugin.go.template b/server/resource/plugin/server/plugin/plugin.go.template index 9129584bb..7e25e0700 100644 --- a/server/resource/plugin/server/plugin/plugin.go.template +++ b/server/resource/plugin/server/plugin/plugin.go.template @@ -1,5 +1,5 @@ package plugin -import "github.com/flipped-aurora/gin-vue-admin/server/plugin/{{ .Package }}/config" +import "{{.Module}}/plugin/{{ .Package }}/config" var Config config.Config diff --git a/server/resource/plugin/server/router/router.go.template b/server/resource/plugin/server/router/router.go.template index cc5cd2677..34bf4d891 100644 --- a/server/resource/plugin/server/router/router.go.template +++ b/server/resource/plugin/server/router/router.go.template @@ -1,7 +1,7 @@ package router import ( - {{if .OnlyTemplate }} // {{end}}"github.com/flipped-aurora/gin-vue-admin/server/middleware" + {{if .OnlyTemplate }} // {{end}}"{{.Module}}/middleware" "github.com/gin-gonic/gin" ) diff --git a/server/resource/plugin/server/service/service.go.template b/server/resource/plugin/server/service/service.go.template index 8b28f6f53..14d1eea81 100644 --- a/server/resource/plugin/server/service/service.go.template +++ b/server/resource/plugin/server/service/service.go.template @@ -58,9 +58,9 @@ package service import ( {{- if not .OnlyTemplate }} - "github.com/flipped-aurora/gin-vue-admin/server/global" - "github.com/flipped-aurora/gin-vue-admin/server/plugin/{{.Package}}/model" - "github.com/flipped-aurora/gin-vue-admin/server/plugin/{{.Package}}/model/request" + "{{.Module}}/global" + "{{.Module}}/plugin/{{.Package}}/model" + "{{.Module}}/plugin/{{.Package}}/model/request" {{- if .AutoCreateResource }} "gorm.io/gorm" {{- end}}