@@ -248,4 +403,5 @@ const back = () => {
-{{- end }}
\ No newline at end of file
+{{- end }}
+{{- end }}
diff --git a/server/resource/plugin/web/view/view.vue.template b/server/resource/plugin/web/view/view.vue.template
index 05a5fb92..8eafe08b 100644
--- a/server/resource/plugin/web/view/view.vue.template
+++ b/server/resource/plugin/web/view/view.vue.template
@@ -1,5 +1,346 @@
{{- $global := . }}
{{- $templateID := printf "%s_%s" .Package .StructName }}
+
+{{- if .IsAdd }}
+// 请在搜索条件中增加如下代码
+{{- range .Fields}} {{- if .FieldSearchType}} {{- if eq .FieldType "bool" }}
+
+
+
+
+
+
+
+
+ {{- else if .DictType}}
+
+ {searchInfo.{{.FieldJson}}=undefined}">
+
+
+
+ {{- else}}
+
+ {{- if eq .FieldType "float64" "int"}}
+ {{if eq .FieldSearchType "BETWEEN" "NOT BETWEEN"}}
+
+—
+
+ {{- else}}
+ {{- if .DictType}}
+
+
+
+ {{- else}}
+
+ {{- end }}
+ {{- end}}
+ {{- else if eq .FieldType "time.Time"}}
+ {{if eq .FieldSearchType "BETWEEN" "NOT BETWEEN"}}
+
+
+{{.FieldDesc}}
+
+
+
+
+
+
+—
+
+ {{- else}}
+
+ {{- end}}
+ {{- else}}
+
+ {{- end}}
+{{ end }}{{ end }}{{ end }}
+
+
+// 表格增加如下列代码
+
+{{- range .Fields}}
+ {{- if .Table}}
+ {{- if .CheckDataSource }}
+
+
+ {{if eq .DataSource.Association 2}}
+
+ {{ "{{ item }}" }}
+
+ {{ else }}
+ {{"{{"}} filterDataSource(dataSource.{{.FieldJson}},scope.row.{{.FieldJson}}) {{"}}"}}
+ {{ end }}
+
+
+ {{- else if .DictType}}
+
+
+ {{"{{"}} filterDict(scope.row.{{.FieldJson}},{{.DictType}}Options) {{"}}"}}
+
+
+ {{- else if eq .FieldType "bool" }}
+
+ {{"{{"}} formatBoolean(scope.row.{{.FieldJson}}) {{"}}"}}
+
+ {{- else if eq .FieldType "time.Time" }}
+
+ {{"{{"}} formatDate(scope.row.{{.FieldJson}}) {{"}}"}}
+
+ {{- else if eq .FieldType "picture" }}
+
+
+
+
+
+ {{- else if eq .FieldType "pictures" }}
+
+
+
+
+
+
+
+ {{- else if eq .FieldType "video" }}
+
+
+
+
+
+ {{- else if eq .FieldType "richtext" }}
+
+
+ [富文本内容]
+
+
+ {{- else if eq .FieldType "file" }}
+
+
+
+ {{"{{"}}file.name{{"}}"}}
+
+
+
+ {{- else if eq .FieldType "json" }}
+
+
+ [JSON]
+
+
+ {{- else if eq .FieldType "array" }}
+
+
+
+
+
+ {{- else }}
+
+ {{- end }}
+ {{- end }}
+ {{- end }}
+
+// 新增表单中增加如下代码
+{{- range .Fields}}
+ {{- if .Form}}
+
+ {{- if .CheckDataSource}}
+
+
+
+ {{- else }}
+ {{- if eq .FieldType "bool" }}
+
+ {{- end }}
+ {{- if eq .FieldType "string" }}
+ {{- if .DictType}}
+
+
+
+ {{- else }}
+
+ {{- end }}
+ {{- end }}
+ {{- if eq .FieldType "richtext" }}
+
+ {{- end }}
+ {{- if eq .FieldType "json" }}
+ // 此字段为json结构,可以前端自行控制展示和数据绑定模式 需绑定json的key为 formData.{{.FieldJson}} 后端会按照json的类型进行存取
+ {{"{{"}} formData.{{.FieldJson}} {{"}}"}}
+ {{- end }}
+ {{- if eq .FieldType "array" }}
+
+ {{- end }}
+ {{- if eq .FieldType "int" }}
+
+ {{- end }}
+ {{- if eq .FieldType "time.Time" }}
+
+ {{- end }}
+ {{- if eq .FieldType "float64" }}
+
+ {{- end }}
+ {{- if eq .FieldType "enum" }}
+
+
+
+ {{- end }}
+ {{- if eq .FieldType "picture" }}
+
+ {{- end }}
+ {{- if eq .FieldType "pictures" }}
+
+ {{- end }}
+ {{- if eq .FieldType "video" }}
+
+ {{- end }}
+ {{- if eq .FieldType "file" }}
+
+ {{- end }}
+ {{- end }}
+
+ {{- end }}
+ {{- end }}
+
+// 查看抽屉中增加如下代码
+
+{{- range .Fields}}
+ {{- if .Desc }}
+
+ {{- if and (ne .FieldType "picture" ) (ne .FieldType "pictures" ) (ne .FieldType "file" ) (ne .FieldType "array" ) }}
+ {{"{{"}} detailFrom.{{.FieldJson}} {{"}}"}}
+ {{- else }}
+ {{- if eq .FieldType "picture" }}
+
+ {{- end }}
+ {{- if eq .FieldType "array" }}
+
+ {{- end }}
+ {{- if eq .FieldType "pictures" }}
+
+ {{- end }}
+ {{- if eq .FieldType "file" }}
+
+
+
+ {{"{{"}}item.name{{"}}"}}
+
+
+ {{- end }}
+ {{- end }}
+
+ {{- end }}
+ {{- end }}
+
+// 字典增加如下代码
+ {{- range $index, $element := .DictTypes}}
+const {{ $element }}Options = ref([])
+ {{- end }}
+// setOptions方法中增加如下调用
+
+{{- range $index, $element := .DictTypes }}
+ {{ $element }}Options.value = await getDictFunc('{{$element}}')
+{{- end }}
+
+// 基础formData结构(变量处和关闭表单处)增加如下字段
+{{- range .Fields}}
+ {{- if .Form}}
+ {{- if eq .FieldType "bool" }}
+{{.FieldJson}}: false,
+ {{- end }}
+ {{- if eq .FieldType "string" }}
+{{.FieldJson}}: '',
+ {{- end }}
+ {{- if eq .FieldType "richtext" }}
+{{.FieldJson}}: '',
+ {{- end }}
+ {{- if eq .FieldType "int" }}
+{{.FieldJson}}: {{- if or .DictType .DataSource}} undefined{{ else }} 0{{- end }},
+ {{- end }}
+ {{- if eq .FieldType "time.Time" }}
+{{.FieldJson}}: new Date(),
+ {{- end }}
+ {{- if eq .FieldType "float64" }}
+{{.FieldJson}}: 0,
+ {{- end }}
+ {{- if eq .FieldType "picture" }}
+{{.FieldJson}}: "",
+ {{- end }}
+ {{- if eq .FieldType "video" }}
+{{.FieldJson}}: "",
+ {{- end }}
+ {{- if eq .FieldType "pictures" }}
+{{.FieldJson}}: [],
+ {{- end }}
+ {{- if eq .FieldType "file" }}
+{{.FieldJson}}: [],
+ {{- end }}
+ {{- if eq .FieldType "json" }}
+{{.FieldJson}}: {},
+ {{- end }}
+ {{- if eq .FieldType "array" }}
+{{.FieldJson}}: [],
+ {{- end }}
+ {{- end }}
+ {{- end }}
+// 验证规则中增加如下字段
+
+{{- range .Fields }}
+ {{- if .Form }}
+ {{- if eq .Require true }}
+{{.FieldJson }} : [{
+ required: true,
+ message: '{{ .ErrorText }}',
+ trigger: ['input','blur'],
+},
+ {{- if eq .FieldType "string" }}
+{
+ whitespace: true,
+ message: '不能只输入空格',
+ trigger: ['input', 'blur'],
+}
+ {{- end }}
+],
+ {{- end }}
+ {{- end }}
+ {{- end }}
+
+{{- if .HasDataSource }}
+// 请引用
+get{{.StructName}}DataSource,
+// 获取数据源
+const dataSource = ref([])
+const getDataSourceFunc = async()=>{
+ const res = await get{{.StructName}}DataSource()
+ if (res.code === 0) {
+ dataSource.value = res.data
+ }
+}
+getDataSourceFunc()
+{{- end }}
+
+{{- else }}
+
{{- if not .OnlyTemplate}}
@@ -912,4 +1253,5 @@ defineOptions({
-{{- end}}
\ No newline at end of file
+{{- end}}
+{{- end}}
diff --git a/web/src/view/systemTools/autoCode/component/previewCodeDialg.vue b/web/src/view/systemTools/autoCode/component/previewCodeDialg.vue
index 6d78672b..ed582332 100644
--- a/web/src/view/systemTools/autoCode/component/previewCodeDialg.vue
+++ b/web/src/view/systemTools/autoCode/component/previewCodeDialg.vue
@@ -1,7 +1,7 @@
{
const isDarkMode = appStore.config.darkMode === 'dark';
if (isDarkMode) {
@@ -39,6 +52,19 @@ const props = defineProps({
default() {
return {}
}
+ },
+ isAdd: {
+ type: Boolean,
+ default: false
+ }
+})
+
+watchEffect(() => {
+ for (const key in props.previewCode) {
+ if (props.isAdd && createKey.some(createKeyItem => key.includes(createKeyItem))) {
+ continue;
+ }
+ useCode.value[key] = props.previewCode[key]
}
})
@@ -48,7 +74,6 @@ onMounted(() => {
markedHighlight({
langPrefix: 'hljs language-',
highlight(code, lang, info) {
- console.log(code,lang,info)
const language = hljs.getLanguage(lang) ? lang : 'plaintext';
if (lang === 'vue') {
return hljs.highlight(code, { language: 'html' }).value;
@@ -57,11 +82,11 @@ onMounted(() => {
}
})
);
- for (const key in props.previewCode) {
+ for (const key in useCode.value) {
if (activeName.value === '') {
activeName.value = key
}
- document.getElementById(key).innerHTML = marked.parse(props.previewCode[key])
+ document.getElementById(key).innerHTML = marked.parse(useCode.value[key])
}
})
diff --git a/web/src/view/systemTools/autoCode/index.vue b/web/src/view/systemTools/autoCode/index.vue
index 1058164c..97d930ea 100644
--- a/web/src/view/systemTools/autoCode/index.vue
+++ b/web/src/view/systemTools/autoCode/index.vue
@@ -693,6 +693,7 @@
导出json
@@ -703,32 +704,35 @@
show-file-list="false"
accept=".json"
>
- 导入json
+ 导入json
清除暂存
暂存
- 预览代码
-
-
生成代码
+
+ {{isAdd?'查看代码':'预览代码'}}
+
@@ -790,6 +794,7 @@
@@ -1217,7 +1222,7 @@ const enterForm = async(isPreview) => {
form.value.humpPackageName = toSQLLine(form.value.packageName)
delete form.value.primaryField
if (isPreview) {
- const data = await preview(form.value)
+ const data = await preview({...form.value,isAdd:!!isAdd.value,fields:form.value.fields.filter(item => !item.disabled)})
preViewCode.value = data.data.autoCode
previewFlag.value = true
} else {
diff --git a/web/src/view/systemTools/autoCodeAdmin/index.vue b/web/src/view/systemTools/autoCodeAdmin/index.vue
index b1561de6..6222479e 100644
--- a/web/src/view/systemTools/autoCodeAdmin/index.vue
+++ b/web/src/view/systemTools/autoCodeAdmin/index.vue
@@ -60,6 +60,9 @@
>
增加方法
+
+ 增加字段
+
-
+
@@ -383,13 +386,16 @@ const enterDialog = async () => {
}
};
-const goAutoCode = (row) => {
+const goAutoCode = (row,isAdd) => {
if (row) {
router.push({
name: "autoCodeEdit",
params: {
id: row.ID,
},
+ query: {
+ isAdd: isAdd
+ },
});
} else {
router.push({ name: "autoCode" });
From a847ad292f4bccab7d461029c29a6d0b0b6300d0 Mon Sep 17 00:00:00 2001
From: pixelmaxQM
Date: Thu, 17 Oct 2024 23:15:59 +0800
Subject: [PATCH 4/4] =?UTF-8?q?feat:=20=E8=87=AA=E5=8A=A8=E5=8C=96?=
=?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=8F=AF=E8=87=AA=E8=A1=8C=E9=85=8D=E7=BD=AE?=
=?UTF-8?q?mod?=
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 27de339b..15783787 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 8494cb17..679303a5 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 e87e8853..4099192f 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 43e727aa..9e5bed5d 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 f10955c3..5ed2f5c6 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 dbacbd1a..1f3edf0f 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 9a4ba9de..cac47ab7 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 6d77a556..ebdc6f45 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 03321c74..edf46518 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 adf5d64c..dfbea23d 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 0988bccf..52c81831 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 06993db3..8774f356 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 f7f8ed0f..fbf03a3a 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 a1887ac2..e759ad63 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 8a634c8c..0d7b7d37 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 d7f72452..26708404 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 42c59f59..255b7af0 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 9129584b..7e25e070 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 cc5cd267..34bf4d89 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 8b28f6f5..14d1eea8 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}}