feat: 发布2.7.9版本

feat: 调整初始化数据
feat: 调整自动化代码富文本模式下的可选查询条件
2026-09-25 05:50:19 +00:00 · 2025-02-16 11:52:41 +08:00 · 2025-02-15 16:58:33 +08:00 · 2025-02-13 16:20:52 +08:00 · 2025-02-13 15:39:09 +08:00 · 2025-02-13 15:33:01 +08:00
318 changed files with 24084 additions and 14634 deletions
@@ -1,4 +1,3 @@
-.idea/
 /web/node_modules
 /web/dist

@@ -33,3 +32,11 @@ server/uploads/
 *.iml
 web/.pnpm-debug.log
 web/pnpm-lock.yaml
+
+# binary files
+*.exe
+
+# SQLite database files
+*.db
+*.sqlite
+*.sqlite3
@@ -13,16 +13,9 @@ CONFIG_FILE         = config.yaml
 IMAGE_NAME          = gva
 #镜像地址
 REPOSITORY          = registry.cn-hangzhou.aliyuncs.com/${IMAGE_NAME}
-
-ifeq ($(TAGS_OPT),)
-TAGS_OPT            = latest
-else
-endif
-
-ifeq ($(PLUGIN),)
-PLUGIN            = email
-else
-endif
+#镜像版本
+TAGS_OPT           ?= latest
+PLUGIN             ?= email

 #容器环境前后端共同打包
 build: build-web build-server
@@ -48,7 +41,7 @@ build-image-server:
 build-local:
 	if [ -d "build" ];then rm -rf build; else echo "OK!"; fi \
 	&& if [ -f "/.dockerenv" ];then echo "OK!"; else  make build-web-local && make build-server-local; fi \
-	&& mkdir build && cp -r web/dist build/ && cp server/server build/ && cp -r server/resource build/resource 
+	&& mkdir build && cp -r web/dist build/ && cp server/server build/ && cp -r server/resource build/resource

 #本地环境打包前端
 build-web-local:
@@ -63,13 +56,17 @@ build-server-local:
 	&& go build -ldflags "-B 0x$(shell head -c20 /dev/urandom|od -An -tx1|tr -d ' \n') -X main.Version=${TAGS_OPT}" -v

 #打包前后端二合一镜像
-image: build 
+image: build
 	docker build -t ${REPOSITORY}/gin-vue-admin:${TAGS_OPT} -f deploy/docker/Dockerfile .

 #尝鲜版
 images: build build-image-web build-image-server
 	docker build -t ${REPOSITORY}/all:${TAGS_OPT} -f deploy/docker/Dockerfile .
-	
+
+#swagger 文档生成
+doc:
+	@cd server && swag init
+
 #插件快捷打包： make plugin PLUGIN="这里是插件文件夹名称,默认为email"
 plugin:
 	if [ -d ".plugin" ];then rm -rf .plugin ; else echo "OK!"; fi && mkdir -p .plugin/${PLUGIN}/{server/plugin,web/plugin} \
@@ -2,6 +2,7 @@
 <div align=center>
 <img src="http://qmplusimg.henrongyi.top/gvalogo.jpg" width="300" height="300" />
 </div>
+
 <div align=center>
 <img src="https://img.shields.io/badge/golang-1.20-blue"/>
 <img src="https://img.shields.io/badge/gin-1.9.1-lightBlue"/>
@@ -10,8 +11,31 @@
 <img src="https://img.shields.io/badge/gorm-1.25.2-red"/>
 </div>

+<div align=center>
+<a href="https://trendshift.io/repositories/3250" target="_blank"><img src="https://trendshift.io/api/badge/repositories/3250" alt="Calcium-Ion%2Fnew-api | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
+</div>
+
 [English](./README-en.md) | 简体中文

+## ✨一分钟生成前后端基础代码
+
+<table>
+  <tr>
+    <td width="200">
+      <p>📄 创建基础模板</p>
+      <p>🤖 AI生成结构</p>
+      <p>⏰ 生成代码</p>
+      <p>🏷️ 分配权限</p>
+      <p>🎉 基础CURD生成完成</p>   
+    </td>
+    <td>
+      <video src="https://private-user-images.githubusercontent.com/165128580/384700666-4d039215-af29-4f86-bb4f-60dbab38f58e.mp4?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MzEyNTIxNDYsIm5iZiI6MTczMTI1MTg0NiwicGF0aCI6Ii8xNjUxMjg1ODAvMzg0NzAwNjY2LTRkMDM5MjE1LWFmMjktNGY4Ni1iYjRmLTYwZGJhYjM4ZjU4ZS5tcDQ_WC1BbXotQWxnb3JpdGhtPUFXUzQtSE1BQy1TSEEyNTYmWC1BbXotQ3JlZGVudGlhbD1BS0lBVkNPRFlMU0E1M1BRSzRaQSUyRjIwMjQxMTEwJTJGdXMtZWFzdC0xJTJGczMlMkZhd3M0X3JlcXVlc3QmWC1BbXotRGF0ZT0yMDI0MTExMFQxNTE3MjZaJlgtQW16LUV4cGlyZXM9MzAwJlgtQW16LVNpZ25hdHVyZT00NjJkMDcwZjJkMjAyMmU1N2I2MzQxY2RhODFlNzgzNGRiMDFhMmY2NTYyM2ZmODdhNDVmMWE1NzlhMDdlOTI5JlgtQW16LVNpZ25lZEhlYWRlcnM9aG9zdCJ9.ZJbswpLzF2RHjemcGirKOP0L1fvpl3FUqIiQ_-yjeUo" data-canonical-src="https://private-user-images.githubusercontent.com/165128580/384700666-4d039215-af29-4f86-bb4f-60dbab38f58e.mp4?jwt=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJnaXRodWIuY29tIiwiYXVkIjoicmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbSIsImtleSI6ImtleTUiLCJleHAiOjE3MzEyNTIxNDYsIm5iZiI6MTczMTI1MTg0NiwicGF0aCI6Ii8xNjUxMjg1ODAvMzg0NzAwNjY2LTRkMDM5MjE1LWFmMjktNGY4Ni1iYjRmLTYwZGJhYjM4ZjU4ZS5tcDQ_WC1BbXotQWxnb3JpdGhtPUFXUzQtSE1BQy1TSEEyNTYmWC1BbXotQ3JlZGVudGlhbD1BS0lBVkNPRFlMU0E1M1BRSzRaQSUyRjIwMjQxMTEwJTJGdXMtZWFzdC0xJTJGczMlMkZhd3M0X3JlcXVlc3QmWC1BbXotRGF0ZT0yMDI0MTExMFQxNTE3MjZaJlgtQW16LUV4cGlyZXM9MzAwJlgtQW16LVNpZ25hdHVyZT00NjJkMDcwZjJkMjAyMmU1N2I2MzQxY2RhODFlNzgzNGRiMDFhMmY2NTYyM2ZmODdhNDVmMWE1NzlhMDdlOTI5JlgtQW16LVNpZ25lZEhlYWRlcnM9aG9zdCJ9.ZJbswpLzF2RHjemcGirKOP0L1fvpl3FUqIiQ_-yjeUo" controls="controls" muted="muted" class="d-block rounded-bottom-2 border-top width-fit" style="max-height:640px; min-height: 200px">
+</video>
+    </td>
+  </tr>
+</table>
+
+
 # 项目文档
 [在线文档](https://www.gin-vue-admin.com) : https://www.gin-vue-admin.com

@@ -33,8 +57,8 @@

 3.您完全可以通过我们的教程和文档完成一切操作，因此我们不再提供免费的技术服务，如需服务请进行[付费支持](https://www.gin-vue-admin.com/coffee/payment.html)

-4.如果您将此项目用于商业用途，请遵守Apache2.0协议并保留作者技术支持声明。您需保留如下版权声明信息，以及日志和代码中所包含的版权声明信息。所需保留信息均为文案性质，不会影响任何业务内容，如决定商用且必须剔除请[购买授权](https://www.gin-vue-admin.com/empower/index.html)
-
+4.如果您将此项目用于商业用途，请遵守Apache2.0协议并保留作者技术支持声明。您需保留如下版权声明信息，以及日志和代码中所包含的版权声明信息。所需保留信息均为文案性质，不会影响任何业务内容，如决定商用【产生收益的商业行为均在商用行列】或者必须剔除请[购买授权](https://www.gin-vue-admin.com/empower/index.html)
+\
 <img src="https://qmplusimg.henrongyi.top/openSource/login.jpg" width="1000">

 <img src="https://qmplusimg.henrongyi.top/openSource/dashboard.jpg" width="1000">
@@ -1,99 +0,0 @@
-version: "3"
-
-# 声明一个名为network的networks,subnet为network的子网地址,默认网关是177.7.0.1
-networks:
-  network:
-    ipam:
-      driver: default
-      config:
-        - subnet: '177.7.0.0/16'
-        
-# 设置mysql，redis持久化保存
-volumes:
-  mysql:
-  redis:
-
-services:
-  web:
-    image: node:20
-    container_name: gva-web
-    hostname: gva-web           #可以通过容器名访问
-    restart: always
-    ports:
-      - '8080:8080'
-    depends_on:
-      - server
-    working_dir: /web       # 如果docker 设置了workdir 则此处不需要设置
-    #若网络不太好，请自行换源，如下
-    #command: bash -c "yarn config set registry https://registry.npmmirror.com --global && yarn install && yarn serve"
-    command: bash -c "yarn install && yarn serve"
-    volumes:
-      - ../../web:/web
-    networks:
-      network:
-        ipv4_address: 177.7.0.11
-
-  server:
-    image: golang:1.22
-    container_name: gva-server
-    hostname: gva-server
-    restart: always
-    ports:
-      - '8888:8888'
-    depends_on:
-      mysql:
-        condition: service_healthy
-      redis:
-        condition: service_healthy
-    volumes:
-      - ../../server:/server
-    working_dir: /server    # 如果docker 设置了workdir 则此处不需要设置 
-    command: bash -c "go env -w GOPROXY=https://goproxy.cn,direct && go mod tidy && go run main.go"
-    links:
-      - mysql
-      - redis
-    networks:
-      network:
-        ipv4_address: 177.7.0.12
-
-  mysql:
-    image: mysql:8.0.21    # 如果您是 arm64 架构：如 MacOS 的 M1，请修改镜像为 image: mysql/mysql-server:8.0.21
-    container_name: gva-mysql
-    hostname: gva-mysql
-    command: mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci #设置utf8字符集
-    restart: always
-    ports:
-      - "13306:3306"  # host物理直接映射端口为13306
-    environment:
-      #MYSQL_ROOT_PASSWORD: 'Aa@6447985' # root管理员用户密码
-      MYSQL_DATABASE: 'qmPlus' # 初始化启动时要创建的数据库的名称
-      MYSQL_USER: 'gva'
-      MYSQL_PASSWORD: 'Aa@6447985'
-    healthcheck:
-      test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-u", "gva", "-pAa@6447985"]
-      interval: 10s
-      timeout: 5s
-      retries: 3
-    volumes:
-      - mysql:/var/lib/mysql
-    networks:
-      network:
-        ipv4_address: 177.7.0.13
-
-  redis:
-    image: redis:6.0.6
-    container_name: gva-redis # 容器名
-    hostname: gva-redis
-    restart: always
-    ports:
-      - '16379:6379'
-    healthcheck:
-      test: ["CMD-SHELL", "redis-cli ping | grep PONG || exit 1"]
-      interval: 10s
-      timeout: 5s
-      retries: 3
-    volumes:
-      - redis:/data
-    networks:
-      network:
-        ipv4_address: 177.7.0.14
@@ -5,9 +5,11 @@ import "github.com/flipped-aurora/gin-vue-admin/server/service"
 type ApiGroup struct {
 	CustomerApi
 	FileUploadAndDownloadApi
+	AttachmentCategoryApi
 }

 var (
 	customerService              = service.ServiceGroupApp.ExampleServiceGroup.CustomerService
 	fileUploadAndDownloadService = service.ServiceGroupApp.ExampleServiceGroup.FileUploadAndDownloadService
+	attachmentCategoryService    = service.ServiceGroupApp.ExampleServiceGroup.AttachmentCategoryService
 )
@@ -0,0 +1,82 @@
+package example
+
+import (
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
+	common "github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/example"
+	"github.com/gin-gonic/gin"
+	"go.uber.org/zap"
+)
+
+type AttachmentCategoryApi struct{}
+
+// GetCategoryList
+// @Tags      GetCategoryList
+// @Summary   媒体库分类列表
+// @Security  AttachmentCategory
+// @Produce   application/json
+// @Success   200   {object}  response.Response{data=example.ExaAttachmentCategory,msg=string}  "媒体库分类列表"
+// @Router    /attachmentCategory/getCategoryList [get]
+func (a *AttachmentCategoryApi) GetCategoryList(c *gin.Context) {
+	res, err := attachmentCategoryService.GetCategoryList()
+	if err != nil {
+		global.GVA_LOG.Error("获取分类列表失败!", zap.Error(err))
+		response.FailWithMessage("获取分类列表失败", c)
+		return
+	}
+	response.OkWithData(res, c)
+}
+
+// AddCategory
+// @Tags      AddCategory
+// @Summary   添加媒体库分类
+// @Security  AttachmentCategory
+// @accept    application/json
+// @Produce   application/json
+// @Param     data  body      example.ExaAttachmentCategory  true  "媒体库分类数据"// @Success   200   {object}  response.Response{msg=string}   "添加媒体库分类"
+// @Router    /attachmentCategory/addCategory [post]
+func (a *AttachmentCategoryApi) AddCategory(c *gin.Context) {
+	var req example.ExaAttachmentCategory
+	if err := c.ShouldBindJSON(&req); err != nil {
+		global.GVA_LOG.Error("参数错误!", zap.Error(err))
+		response.FailWithMessage("参数错误", c)
+		return
+	}
+
+	if err := attachmentCategoryService.AddCategory(&req); err != nil {
+		global.GVA_LOG.Error("创建/更新失败!", zap.Error(err))
+		response.FailWithMessage("创建/更新失败："+err.Error(), c)
+		return
+	}
+	response.OkWithMessage("创建/更新成功", c)
+}
+
+// DeleteCategory
+// @Tags      DeleteCategory
+// @Summary   删除分类
+// @Security  AttachmentCategory
+// @accept    application/json
+// @Produce   application/json
+// @Param     data  body      common.GetById                true  "分类id"
+// @Success   200   {object}  response.Response{msg=string}  "删除分类"
+// @Router    /attachmentCategory/deleteCategory [post]
+func (a *AttachmentCategoryApi) DeleteCategory(c *gin.Context) {
+	var req common.GetById
+	if err := c.ShouldBindJSON(&req); err != nil {
+		response.FailWithMessage("参数错误", c)
+		return
+	}
+
+	if req.ID == 0 {
+		response.FailWithMessage("参数错误", c)
+		return
+	}
+
+	if err := attachmentCategoryService.DeleteCategory(&req.ID); err != nil {
+		response.FailWithMessage("删除失败", c)
+		return
+	}
+
+	response.OkWithMessage("删除成功", c)
+}
@@ -84,7 +84,7 @@ func (b *FileUploadAndDownloadApi) BreakpointContinue(c *gin.Context) {
 // @Produce   application/json
 // @Param     file  formData  file                                                        true  "Find the file, 查找文件"
 // @Success   200   {object}  response.Response{data=exampleRes.FileResponse,msg=string}  "查找文件,返回包括文件详情"
-// @Router    /fileUploadAndDownload/findFile [post]
+// @Router    /fileUploadAndDownload/findFile [get]
 func (b *FileUploadAndDownloadApi) FindFile(c *gin.Context) {
 	fileMd5 := c.Query("fileMd5")
 	fileName := c.Query("fileName")
@@ -2,12 +2,13 @@ package example

 import (
 	"github.com/flipped-aurora/gin-vue-admin/server/global"
-	"github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
 	"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
 	"github.com/flipped-aurora/gin-vue-admin/server/model/example"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/example/request"
 	exampleRes "github.com/flipped-aurora/gin-vue-admin/server/model/example/response"
 	"github.com/gin-gonic/gin"
 	"go.uber.org/zap"
+	"strconv"
 )

 type FileUploadAndDownloadApi struct{}
@@ -25,15 +26,16 @@ func (b *FileUploadAndDownloadApi) UploadFile(c *gin.Context) {
 	var file example.ExaFileUploadAndDownload
 	noSave := c.DefaultQuery("noSave", "0")
 	_, header, err := c.Request.FormFile("file")
+	classId, _ := strconv.Atoi(c.DefaultPostForm("classId", "0"))
 	if err != nil {
 		global.GVA_LOG.Error("接收文件失败!", zap.Error(err))
 		response.FailWithMessage("接收文件失败", c)
 		return
 	}
-	file, err = fileUploadAndDownloadService.UploadFile(header, noSave) // 文件上传后拿到文件路径
+	file, err = fileUploadAndDownloadService.UploadFile(header, noSave, classId) // 文件上传后拿到文件路径
 	if err != nil {
-		global.GVA_LOG.Error("修改数据库链接失败!", zap.Error(err))
-		response.FailWithMessage("修改数据库链接失败", c)
+		global.GVA_LOG.Error("上传文件失败!", zap.Error(err))
+		response.FailWithMessage("上传文件失败", c)
 		return
 	}
 	response.OkWithDetailed(exampleRes.ExaFileResponse{File: file}, "上传成功", c)
@@ -85,11 +87,11 @@ func (b *FileUploadAndDownloadApi) DeleteFile(c *gin.Context) {
 // @Security  ApiKeyAuth
 // @accept    application/json
 // @Produce   application/json
-// @Param     data  body      request.PageInfo                                        true  "页码, 每页大小"
+// @Param     data  body      request.ExaAttachmentCategorySearch                                        true  "页码, 每页大小, 分类id"
 // @Success   200   {object}  response.Response{data=response.PageResult,msg=string}  "分页文件列表,返回包括列表,总数,页码,每页数量"
 // @Router    /fileUploadAndDownload/getFileList [post]
 func (b *FileUploadAndDownloadApi) GetFileList(c *gin.Context) {
-	var pageInfo request.PageInfo
+	var pageInfo request.ExaAttachmentCategorySearch
 	err := c.ShouldBindJSON(&pageInfo)
 	if err != nil {
 		response.FailWithMessage(err.Error(), c)
@@ -108,3 +110,26 @@ func (b *FileUploadAndDownloadApi) GetFileList(c *gin.Context) {
 		PageSize: pageInfo.PageSize,
 	}, "获取成功", c)
 }
+
+// ImportURL
+// @Tags      ExaFileUploadAndDownload
+// @Summary   导入URL
+// @Security  ApiKeyAuth
+// @Produce   application/json
+// @Param     data  body      example.ExaFileUploadAndDownload  true  "对象"
+// @Success   200   {object}  response.Response{msg=string}     "导入URL"
+// @Router    /fileUploadAndDownload/importURL [post]
+func (b *FileUploadAndDownloadApi) ImportURL(c *gin.Context) {
+	var file []example.ExaFileUploadAndDownload
+	err := c.ShouldBindJSON(&file)
+	if err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	if err := fileUploadAndDownloadService.ImportURL(&file); err != nil {
+		global.GVA_LOG.Error("导入URL失败!", zap.Error(err))
+		response.FailWithMessage("导入URL失败", c)
+		return
+	}
+	response.OkWithMessage("导入URL成功", c)
+}
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"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/system/request"
 	"github.com/gin-gonic/gin"
 	"go.uber.org/zap"
 )
@@ -57,7 +58,7 @@ func (a *AutoCodePluginApi) Install(c *gin.Context) {
 // @Produce   application/json
 // @Param     plugName  query    string  true  "插件名称"
 // @Success   200   {object}  response.Response{data=map[string]interface{},msg=string}  "打包插件成功"
-// @Router    /autoCode/pubPlug [get]
+// @Router    /autoCode/pubPlug [post]
 func (a *AutoCodePluginApi) Packaged(c *gin.Context) {
 	plugName := c.Query("plugName")
 	zipPath, err := autoCodePluginService.PubPlug(plugName)
@@ -68,3 +69,51 @@ func (a *AutoCodePluginApi) Packaged(c *gin.Context) {
 	}
 	response.OkWithMessage(fmt.Sprintf("打包成功,文件路径为:%s", zipPath), c)
 }
+
+// InitMenu
+// @Tags      AutoCodePlugin
+// @Summary   打包插件
+// @Security  ApiKeyAuth
+// @accept    application/json
+// @Produce   application/json
+// @Success   200   {object}  response.Response{data=map[string]interface{},msg=string}  "打包插件成功"
+// @Router    /autoCode/initMenu [post]
+func (a *AutoCodePluginApi) InitMenu(c *gin.Context) {
+	var menuInfo request.InitMenu
+	err := c.ShouldBindJSON(&menuInfo)
+	if err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	err = autoCodePluginService.InitMenu(menuInfo)
+	if err != nil {
+		global.GVA_LOG.Error("创建初始化Menu失败!", zap.Error(err))
+		response.FailWithMessage("创建初始化Menu失败"+err.Error(), c)
+		return
+	}
+	response.OkWithMessage("文件变更成功", c)
+}
+
+// InitAPI
+// @Tags      AutoCodePlugin
+// @Summary   打包插件
+// @Security  ApiKeyAuth
+// @accept    application/json
+// @Produce   application/json
+// @Success   200   {object}  response.Response{data=map[string]interface{},msg=string}  "打包插件成功"
+// @Router    /autoCode/initAPI [post]
+func (a *AutoCodePluginApi) InitAPI(c *gin.Context) {
+	var apiInfo request.InitApi
+	err := c.ShouldBindJSON(&apiInfo)
+	if err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	err = autoCodePluginService.InitAPI(apiInfo)
+	if err != nil {
+		global.GVA_LOG.Error("创建初始化API失败!", zap.Error(err))
+		response.FailWithMessage("创建初始化API失败"+err.Error(), c)
+		return
+	}
+	response.OkWithMessage("文件变更成功", c)
+}
@@ -40,8 +40,8 @@ func (a *AutoCodeTemplateApi) Preview(c *gin.Context) {
 	info.PackageT = utils.FirstUpper(info.Package)
 	autoCode, err := autoCodeTemplateService.Preview(c.Request.Context(), info)
 	if err != nil {
-		global.GVA_LOG.Error("预览失败!", zap.Error(err))
-		response.FailWithMessage("预览失败", c)
+		global.GVA_LOG.Error(err.Error(), zap.Error(err))
+		response.FailWithMessage("预览失败:"+err.Error(), c)
 	} else {
 		response.OkWithDetailed(gin.H{"autoCode": autoCode}, "预览成功", c)
 	}
@@ -82,7 +82,7 @@ func (a *AutoCodeTemplateApi) Create(c *gin.Context) {
 	}
 }

-// Create
+// AddFunc
 // @Tags      AddFunc
 // @Summary   增加方法
 // @Security  ApiKeyAuth
@@ -98,11 +98,24 @@ func (a *AutoCodeTemplateApi) AddFunc(c *gin.Context) {
 		response.FailWithMessage(err.Error(), c)
 		return
 	}
-	err = autoCodeTemplateService.AddFunc(info)
+	var tempMap map[string]string
+	if info.IsPreview {
+		info.Router = "填充router"
+		info.FuncName = "填充funcName"
+		info.Method = "填充method"
+		info.Description = "填充description"
+		tempMap, err = autoCodeTemplateService.GetApiAndServer(info)
+	} else {
+		err = autoCodeTemplateService.AddFunc(info)
+	}
 	if err != nil {
 		global.GVA_LOG.Error("注入失败!", zap.Error(err))
 		response.FailWithMessage("注入失败", c)
 	} else {
+		if info.IsPreview {
+			response.OkWithDetailed(tempMap, "注入成功", c)
+			return
+		}
 		response.OkWithMessage("注入成功", c)
 	}
 }
@@ -21,6 +21,7 @@ type ApiGroup struct {
 	AutoCodePackageApi
 	AutoCodeHistoryApi
 	AutoCodeTemplateApi
+	SysParamsApi
 }

 var (
@@ -35,6 +36,7 @@ var (
 	dictionaryService       = service.ServiceGroupApp.SystemServiceGroup.DictionaryService
 	authorityBtnService     = service.ServiceGroupApp.SystemServiceGroup.AuthorityBtnService
 	systemConfigService     = service.ServiceGroupApp.SystemServiceGroup.SystemConfigService
+	sysParamsService        = service.ServiceGroupApp.SystemServiceGroup.SysParamsService
 	operationRecordService  = service.ServiceGroupApp.SystemServiceGroup.OperationRecordService
 	dictionaryDetailService = service.ServiceGroupApp.SystemServiceGroup.DictionaryDetailService
 	autoCodeService         = service.ServiceGroupApp.SystemServiceGroup.AutoCodeService
@@ -74,7 +74,7 @@ func (s *SystemApiApi) SyncApi(c *gin.Context) {
 // @accept    application/json
 // @Produce   application/json
 // @Success   200   {object}  response.Response{msg=string}  "获取API分组"
-// @Router    /api/getApiGroups [post]
+// @Router    /api/getApiGroups [get]
 func (s *SystemApiApi) GetApiGroups(c *gin.Context) {
 	groups, apiGroupMap, err := apiService.GetApiGroups()
 	if err != nil {
@@ -270,7 +270,8 @@ func (s *SystemApiApi) UpdateApi(c *gin.Context) {
 // @Success   200  {object}  response.Response{data=systemRes.SysAPIListResponse,msg=string}  "获取所有的Api 不分页,返回包括api列表"
 // @Router    /api/getAllApis [post]
 func (s *SystemApiApi) GetAllApis(c *gin.Context) {
-	apis, err := apiService.GetAllApis()
+	authorityID := utils.GetUserAuthorityId(c)
+	apis, err := apiService.GetAllApis(authorityID)
 	if err != nil {
 		global.GVA_LOG.Error("获取失败!", zap.Error(err))
 		response.FailWithMessage("获取失败", c)
@@ -2,7 +2,6 @@ package system

 import (
 	"github.com/flipped-aurora/gin-vue-admin/server/global"
-	"github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
 	"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
 	"github.com/flipped-aurora/gin-vue-admin/server/model/system"
 	systemRes "github.com/flipped-aurora/gin-vue-admin/server/model/system/response"
@@ -37,6 +36,10 @@ func (a *AuthorityApi) CreateAuthority(c *gin.Context) {
 		return
 	}

+	if *authority.ParentId == 0 && global.GVA_CONFIG.System.UseStrictAuth {
+		authority.ParentId = utils.Pointer(utils.GetUserAuthorityId(c))
+	}
+
 	if authBack, err = authorityService.CreateAuthority(authority); err != nil {
 		global.GVA_LOG.Error("创建失败!", zap.Error(err))
 		response.FailWithMessage("创建失败"+err.Error(), c)
@@ -77,7 +80,8 @@ func (a *AuthorityApi) CopyAuthority(c *gin.Context) {
 		response.FailWithMessage(err.Error(), c)
 		return
 	}
-	authBack, err := authorityService.CopyAuthority(copyInfo)
+	adminAuthorityID := utils.GetUserAuthorityId(c)
+	authBack, err := authorityService.CopyAuthority(adminAuthorityID, copyInfo)
 	if err != nil {
 		global.GVA_LOG.Error("拷贝失败!", zap.Error(err))
 		response.FailWithMessage("拷贝失败"+err.Error(), c)
@@ -124,7 +128,7 @@ func (a *AuthorityApi) DeleteAuthority(c *gin.Context) {
 // @Produce   application/json
 // @Param     data  body      system.SysAuthority                                                true  "权限id, 权限名, 父角色id"
 // @Success   200   {object}  response.Response{data=systemRes.SysAuthorityResponse,msg=string}  "更新角色信息,返回包括系统角色详情"
-// @Router    /authority/updateAuthority [post]
+// @Router    /authority/updateAuthority [put]
 func (a *AuthorityApi) UpdateAuthority(c *gin.Context) {
 	var auth system.SysAuthority
 	err := c.ShouldBindJSON(&auth)
@@ -156,29 +160,14 @@ func (a *AuthorityApi) UpdateAuthority(c *gin.Context) {
 // @Success   200   {object}  response.Response{data=response.PageResult,msg=string}  "分页获取角色列表,返回包括列表,总数,页码,每页数量"
 // @Router    /authority/getAuthorityList [post]
 func (a *AuthorityApi) GetAuthorityList(c *gin.Context) {
-	var pageInfo request.PageInfo
-	err := c.ShouldBindJSON(&pageInfo)
-	if err != nil {
-		response.FailWithMessage(err.Error(), c)
-		return
-	}
-	err = utils.Verify(pageInfo, utils.PageInfoVerify)
-	if err != nil {
-		response.FailWithMessage(err.Error(), c)
-		return
-	}
-	list, total, err := authorityService.GetAuthorityInfoList(pageInfo)
+	authorityID := utils.GetUserAuthorityId(c)
+	list, err := authorityService.GetAuthorityInfoList(authorityID)
 	if err != nil {
 		global.GVA_LOG.Error("获取失败!", zap.Error(err))
 		response.FailWithMessage("获取失败"+err.Error(), c)
 		return
 	}
-	response.OkWithDetailed(response.PageResult{
-		List:     list,
-		Total:    total,
-		Page:     pageInfo.Page,
-		PageSize: pageInfo.PageSize,
-	}, "获取成功", c)
+	response.OkWithDetailed(list, "获取成功", c)
 }

 // SetDataAuthority
@@ -202,7 +191,8 @@ func (a *AuthorityApi) SetDataAuthority(c *gin.Context) {
 		response.FailWithMessage(err.Error(), c)
 		return
 	}
-	err = authorityService.SetDataAuthority(auth)
+	adminAuthorityID := utils.GetUserAuthorityId(c)
+	err = authorityService.SetDataAuthority(adminAuthorityID, auth)
 	if err != nil {
 		global.GVA_LOG.Error("设置失败!", zap.Error(err))
 		response.FailWithMessage("设置失败"+err.Error(), c)
@@ -1,6 +1,8 @@
 package system

 import (
+	"fmt"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/common"
 	"github.com/goccy/go-json"
 	"io"
 	"strings"
@@ -21,7 +23,7 @@ type AutoCodeApi struct{}
 // @accept    application/json
 // @Produce   application/json
 // @Success   200  {object}  response.Response{data=map[string]interface{},msg=string}  "获取当前所有数据库"
-// @Router    /autoCode/getDatabase [get]
+// @Router    /autoCode/getDB [get]
 func (autoApi *AutoCodeApi) GetDB(c *gin.Context) {
 	businessDB := c.Query("businessDB")
 	dbs, err := autoCodeService.Database(businessDB).GetDB(businessDB)
@@ -105,18 +107,24 @@ func (autoApi *AutoCodeApi) GetColumn(c *gin.Context) {
 }

 func (autoApi *AutoCodeApi) LLMAuto(c *gin.Context) {
-	prompt := c.Query("prompt")
-	mode := c.Query("mode")
-	params := make(map[string]string)
-	params["prompt"] = prompt
-	params["mode"] = mode
-	path := strings.ReplaceAll(global.GVA_CONFIG.AutoCode.AiPath, "{FUNC}", "api/chat/ai")
+	var llm common.JSONMap
+	err := c.ShouldBindJSON(&llm)
+	if err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	if global.GVA_CONFIG.AutoCode.AiPath == "" {
+		response.FailWithMessage("请先前往插件市场个人中心获取AiPath并填入config.yaml中", c)
+		return
+	}
+
+	path := strings.ReplaceAll(global.GVA_CONFIG.AutoCode.AiPath, "{FUNC}", fmt.Sprintf("api/chat/%s", llm["mode"]))
 	res, err := request.HttpRequest(
 		path,
 		"POST",
 		nil,
-		params,
 		nil,
+		llm,
 	)
 	if err != nil {
 		global.GVA_LOG.Error("大模型生成失败!", zap.Error(err))
@@ -33,7 +33,8 @@ func (cas *CasbinApi) UpdateCasbin(c *gin.Context) {
 		response.FailWithMessage(err.Error(), c)
 		return
 	}
-	err = casbinService.UpdateCasbin(cmr.AuthorityId, cmr.CasbinInfos)
+	adminAuthorityID := utils.GetUserAuthorityId(c)
+	err = casbinService.UpdateCasbin(adminAuthorityID, cmr.AuthorityId, cmr.CasbinInfos)
 	if err != nil {
 		global.GVA_LOG.Error("更新失败!", zap.Error(err))
 		response.FailWithMessage("更新失败", c)
@@ -213,7 +213,7 @@ func (sysExportTemplateApi *SysExportTemplateApi) ExportExcel(c *gin.Context) {
 // @Security ApiKeyAuth
 // @accept application/json
 // @Produce application/json
-// @Router /sysExportTemplate/exportExcel [get]
+// @Router /sysExportTemplate/ExportTemplate [get]
 func (sysExportTemplateApi *SysExportTemplateApi) ExportTemplate(c *gin.Context) {
 	templateID := c.Query("templateID")
 	if templateID == "" {
@@ -45,7 +45,8 @@ func (a *AuthorityMenuApi) GetMenu(c *gin.Context) {
 // @Success   200   {object}  response.Response{data=systemRes.SysBaseMenusResponse,msg=string}  "获取用户动态路由,返回包括系统菜单列表"
 // @Router    /menu/getBaseMenuTree [post]
 func (a *AuthorityMenuApi) GetBaseMenuTree(c *gin.Context) {
-	menus, err := menuService.GetBaseMenuTree()
+	authority := utils.GetUserAuthorityId(c)
+	menus, err := menuService.GetBaseMenuTree(authority)
 	if err != nil {
 		global.GVA_LOG.Error("获取失败!", zap.Error(err))
 		response.FailWithMessage("获取失败", c)
@@ -74,7 +75,8 @@ func (a *AuthorityMenuApi) AddMenuAuthority(c *gin.Context) {
 		response.FailWithMessage(err.Error(), c)
 		return
 	}
-	if err := menuService.AddMenuAuthority(authorityMenu.Menus, authorityMenu.AuthorityId); err != nil {
+	adminAuthorityID := utils.GetUserAuthorityId(c)
+	if err := menuService.AddMenuAuthority(authorityMenu.Menus, adminAuthorityID, authorityMenu.AuthorityId); err != nil {
 		global.GVA_LOG.Error("添加失败!", zap.Error(err))
 		response.FailWithMessage("添加失败", c)
 	} else {
@@ -171,7 +173,7 @@ func (a *AuthorityMenuApi) DeleteBaseMenu(c *gin.Context) {
 	err = baseMenuService.DeleteBaseMenu(menu.ID)
 	if err != nil {
 		global.GVA_LOG.Error("删除失败!", zap.Error(err))
-		response.FailWithMessage("删除失败", c)
+		response.FailWithMessage("删除失败:"+err.Error(), c)
 		return
 	}
 	response.OkWithMessage("删除成功", c)
@@ -252,27 +254,12 @@ func (a *AuthorityMenuApi) GetBaseMenuById(c *gin.Context) {
 // @Success   200   {object}  response.Response{data=response.PageResult,msg=string}  "分页获取基础menu列表,返回包括列表,总数,页码,每页数量"
 // @Router    /menu/getMenuList [post]
 func (a *AuthorityMenuApi) GetMenuList(c *gin.Context) {
-	var pageInfo request.PageInfo
-	err := c.ShouldBindJSON(&pageInfo)
-	if err != nil {
-		response.FailWithMessage(err.Error(), c)
-		return
-	}
-	err = utils.Verify(pageInfo, utils.PageInfoVerify)
-	if err != nil {
-		response.FailWithMessage(err.Error(), c)
-		return
-	}
-	menuList, total, err := menuService.GetInfoList()
+	authorityID := utils.GetUserAuthorityId(c)
+	menuList, err := menuService.GetInfoList(authorityID)
 	if err != nil {
 		global.GVA_LOG.Error("获取失败!", zap.Error(err))
 		response.FailWithMessage("获取失败", c)
 		return
 	}
-	response.OkWithDetailed(response.PageResult{
-		List:     menuList,
-		Total:    total,
-		Page:     pageInfo.Page,
-		PageSize: pageInfo.PageSize,
-	}, "获取成功", c)
+	response.OkWithDetailed(menuList, "获取成功", c)
 }
@@ -0,0 +1,171 @@
+package system
+
+import (
+	"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/system"
+	systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request"
+	"github.com/gin-gonic/gin"
+	"go.uber.org/zap"
+)
+
+type SysParamsApi struct{}
+
+// CreateSysParams 创建参数
+// @Tags SysParams
+// @Summary 创建参数
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body system.SysParams true "创建参数"
+// @Success 200 {object} response.Response{msg=string} "创建成功"
+// @Router /sysParams/createSysParams [post]
+func (sysParamsApi *SysParamsApi) CreateSysParams(c *gin.Context) {
+	var sysParams system.SysParams
+	err := c.ShouldBindJSON(&sysParams)
+	if err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	err = sysParamsService.CreateSysParams(&sysParams)
+	if err != nil {
+		global.GVA_LOG.Error("创建失败!", zap.Error(err))
+		response.FailWithMessage("创建失败:"+err.Error(), c)
+		return
+	}
+	response.OkWithMessage("创建成功", c)
+}
+
+// DeleteSysParams 删除参数
+// @Tags SysParams
+// @Summary 删除参数
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body system.SysParams true "删除参数"
+// @Success 200 {object} response.Response{msg=string} "删除成功"
+// @Router /sysParams/deleteSysParams [delete]
+func (sysParamsApi *SysParamsApi) DeleteSysParams(c *gin.Context) {
+	ID := c.Query("ID")
+	err := sysParamsService.DeleteSysParams(ID)
+	if err != nil {
+		global.GVA_LOG.Error("删除失败!", zap.Error(err))
+		response.FailWithMessage("删除失败:"+err.Error(), c)
+		return
+	}
+	response.OkWithMessage("删除成功", c)
+}
+
+// DeleteSysParamsByIds 批量删除参数
+// @Tags SysParams
+// @Summary 批量删除参数
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Success 200 {object} response.Response{msg=string} "批量删除成功"
+// @Router /sysParams/deleteSysParamsByIds [delete]
+func (sysParamsApi *SysParamsApi) DeleteSysParamsByIds(c *gin.Context) {
+	IDs := c.QueryArray("IDs[]")
+	err := sysParamsService.DeleteSysParamsByIds(IDs)
+	if err != nil {
+		global.GVA_LOG.Error("批量删除失败!", zap.Error(err))
+		response.FailWithMessage("批量删除失败:"+err.Error(), c)
+		return
+	}
+	response.OkWithMessage("批量删除成功", c)
+}
+
+// UpdateSysParams 更新参数
+// @Tags SysParams
+// @Summary 更新参数
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body system.SysParams true "更新参数"
+// @Success 200 {object} response.Response{msg=string} "更新成功"
+// @Router /sysParams/updateSysParams [put]
+func (sysParamsApi *SysParamsApi) UpdateSysParams(c *gin.Context) {
+	var sysParams system.SysParams
+	err := c.ShouldBindJSON(&sysParams)
+	if err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	err = sysParamsService.UpdateSysParams(sysParams)
+	if err != nil {
+		global.GVA_LOG.Error("更新失败!", zap.Error(err))
+		response.FailWithMessage("更新失败:"+err.Error(), c)
+		return
+	}
+	response.OkWithMessage("更新成功", c)
+}
+
+// FindSysParams 用id查询参数
+// @Tags SysParams
+// @Summary 用id查询参数
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data query system.SysParams true "用id查询参数"
+// @Success 200 {object} response.Response{data=system.SysParams,msg=string} "查询成功"
+// @Router /sysParams/findSysParams [get]
+func (sysParamsApi *SysParamsApi) FindSysParams(c *gin.Context) {
+	ID := c.Query("ID")
+	resysParams, err := sysParamsService.GetSysParams(ID)
+	if err != nil {
+		global.GVA_LOG.Error("查询失败!", zap.Error(err))
+		response.FailWithMessage("查询失败:"+err.Error(), c)
+		return
+	}
+	response.OkWithData(resysParams, c)
+}
+
+// GetSysParamsList 分页获取参数列表
+// @Tags SysParams
+// @Summary 分页获取参数列表
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data query systemReq.SysParamsSearch true "分页获取参数列表"
+// @Success 200 {object} response.Response{data=response.PageResult,msg=string} "获取成功"
+// @Router /sysParams/getSysParamsList [get]
+func (sysParamsApi *SysParamsApi) GetSysParamsList(c *gin.Context) {
+	var pageInfo systemReq.SysParamsSearch
+	err := c.ShouldBindQuery(&pageInfo)
+	if err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	list, total, err := sysParamsService.GetSysParamsInfoList(pageInfo)
+	if err != nil {
+		global.GVA_LOG.Error("获取失败!", zap.Error(err))
+		response.FailWithMessage("获取失败:"+err.Error(), c)
+		return
+	}
+	response.OkWithDetailed(response.PageResult{
+		List:     list,
+		Total:    total,
+		Page:     pageInfo.Page,
+		PageSize: pageInfo.PageSize,
+	}, "获取成功", c)
+}
+
+// GetSysParam 根据key获取参数value
+// @Tags SysParams
+// @Summary 根据key获取参数value
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param key query string true "key"
+// @Success 200 {object} response.Response{data=system.SysParams,msg=string} "获取成功"
+// @Router /sysParams/getSysParam [get]
+func (sysParamsApi *SysParamsApi) GetSysParam(c *gin.Context) {
+	k := c.Query("key")
+	params, err := sysParamsService.GetSysParam(k)
+	if err != nil {
+		global.GVA_LOG.Error("获取失败!", zap.Error(err))
+		response.FailWithMessage("获取失败:"+err.Error(), c)
+		return
+	}
+	response.OkWithDetailed(params, "获取成功", c)
+}
@@ -5,13 +5,13 @@ import (
 	"time"

 	"github.com/flipped-aurora/gin-vue-admin/server/global"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/common"
 	"github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
 	"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
 	"github.com/flipped-aurora/gin-vue-admin/server/model/system"
 	systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request"
 	systemRes "github.com/flipped-aurora/gin-vue-admin/server/model/system/response"
 	"github.com/flipped-aurora/gin-vue-admin/server/utils"
-
 	"github.com/gin-gonic/gin"
 	"github.com/redis/go-redis/v9"
 	"go.uber.org/zap"
@@ -199,11 +199,11 @@ func (b *BaseApi) ChangePassword(c *gin.Context) {
 // @Security  ApiKeyAuth
 // @accept    application/json
 // @Produce   application/json
-// @Param     data  body      request.PageInfo                                        true  "页码, 每页大小"
+// @Param     data  body      systemReq.GetUserList                                        true  "页码, 每页大小"
 // @Success   200   {object}  response.Response{data=response.PageResult,msg=string}  "分页获取用户列表,返回包括列表,总数,页码,每页数量"
 // @Router    /user/getUserList [post]
 func (b *BaseApi) GetUserList(c *gin.Context) {
-	var pageInfo request.PageInfo
+	var pageInfo systemReq.GetUserList
 	err := c.ShouldBindJSON(&pageInfo)
 	if err != nil {
 		response.FailWithMessage(err.Error(), c)
@@ -256,17 +256,17 @@ func (b *BaseApi) SetUserAuthority(c *gin.Context) {
 		return
 	}
 	claims := utils.GetUserInfo(c)
-	j := &utils.JWT{SigningKey: []byte(global.GVA_CONFIG.JWT.SigningKey)} // 唯一签名
 	claims.AuthorityId = sua.AuthorityId
-	if token, err := j.CreateToken(*claims); err != nil {
+	token, err := utils.NewJWT().CreateToken(*claims)
+	if err != nil {
 		global.GVA_LOG.Error("修改失败!", zap.Error(err))
 		response.FailWithMessage(err.Error(), c)
-	} else {
-		c.Header("new-token", token)
-		c.Header("new-expires-at", strconv.FormatInt(claims.ExpiresAt.Unix(), 10))
-		utils.SetToken(c, token, int((claims.ExpiresAt.Unix()-time.Now().Unix())/60))
-		response.OkWithMessage("修改成功", c)
+		return
 	}
+	c.Header("new-token", token)
+	c.Header("new-expires-at", strconv.FormatInt(claims.ExpiresAt.Unix(), 10))
+	utils.SetToken(c, token, int((claims.ExpiresAt.Unix()-time.Now().Unix())/60))
+	response.OkWithMessage("修改成功", c)
 }

 // SetUserAuthorities
@@ -285,7 +285,8 @@ func (b *BaseApi) SetUserAuthorities(c *gin.Context) {
 		response.FailWithMessage(err.Error(), c)
 		return
 	}
-	err = userService.SetUserAuthorities(sua.ID, sua.AuthorityIds)
+	authorityID := utils.GetUserAuthorityId(c)
+	err = userService.SetUserAuthorities(authorityID, sua.ID, sua.AuthorityIds)
 	if err != nil {
 		global.GVA_LOG.Error("修改失败!", zap.Error(err))
 		response.FailWithMessage("修改失败", c)
@@ -317,7 +318,7 @@ func (b *BaseApi) DeleteUser(c *gin.Context) {
 	}
 	jwtId := utils.GetUserID(c)
 	if jwtId == uint(reqId.ID) {
-		response.FailWithMessage("删除失败, 自杀失败", c)
+		response.FailWithMessage("删除失败, 无法删除自己。", c)
 		return
 	}
 	err = userService.DeleteUser(reqId.ID)
@@ -350,9 +351,9 @@ func (b *BaseApi) SetUserInfo(c *gin.Context) {
 		response.FailWithMessage(err.Error(), c)
 		return
 	}
-
 	if len(user.AuthorityIds) != 0 {
-		err = userService.SetUserAuthorities(user.ID, user.AuthorityIds)
+		authorityID := utils.GetUserAuthorityId(c)
+		err = userService.SetUserAuthorities(authorityID, user.ID, user.AuthorityIds)
 		if err != nil {
 			global.GVA_LOG.Error("设置失败!", zap.Error(err))
 			response.FailWithMessage("设置失败", c)
@@ -367,7 +368,6 @@ func (b *BaseApi) SetUserInfo(c *gin.Context) {
 		HeaderImg: user.HeaderImg,
 		Phone:     user.Phone,
 		Email:     user.Email,
-		SideMode:  user.SideMode,
 		Enable:    user.Enable,
 	})
 	if err != nil {
@@ -403,7 +403,6 @@ func (b *BaseApi) SetSelfInfo(c *gin.Context) {
 		HeaderImg: user.HeaderImg,
 		Phone:     user.Phone,
 		Email:     user.Email,
-		SideMode:  user.SideMode,
 		Enable:    user.Enable,
 	})
 	if err != nil {
@@ -414,6 +413,32 @@ func (b *BaseApi) SetSelfInfo(c *gin.Context) {
 	response.OkWithMessage("设置成功", c)
 }

+// SetSelfSetting
+// @Tags      SysUser
+// @Summary   设置用户配置
+// @Security  ApiKeyAuth
+// @accept    application/json
+// @Produce   application/json
+// @Param     data  body      map[string]interface{}  true  "用户配置数据"
+// @Success   200   {object}  response.Response{data=map[string]interface{},msg=string}  "设置用户配置"
+// @Router    /user/SetSelfSetting [put]
+func (b *BaseApi) SetSelfSetting(c *gin.Context) {
+	var req common.JSONMap
+	err := c.ShouldBindJSON(&req)
+	if err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+
+	err = userService.SetSelfSetting(req, utils.GetUserID(c))
+	if err != nil {
+		global.GVA_LOG.Error("设置失败!", zap.Error(err))
+		response.FailWithMessage("设置失败", c)
+		return
+	}
+	response.OkWithMessage("设置成功", c)
+}
+
 // GetUserInfo
 // @Tags      SysUser
 // @Summary   获取用户信息
@@ -2,151 +2,103 @@

 # jwt configuration
 jwt:
-  signing-key: qmPlus
-  expires-time: 7d
-  buffer-time: 1d
-  issuer: qmPlus
+    signing-key: qmPlus
+    expires-time: 7d
+    buffer-time: 1d
+    issuer: qmPlus
 # zap logger configuration
 zap:
-  level: info
-  format: console
-  prefix: "[github.com/flipped-aurora/gin-vue-admin/server]"
-  director: log
-  show-line: true
-  encode-level: LowercaseColorLevelEncoder
-  stacktrace-key: stacktrace
-  log-in-console: true
-  retention-day: -1
+    level: info
+    format: console
+    prefix: "[github.com/flipped-aurora/gin-vue-admin/server]"
+    director: log
+    show-line: true
+    encode-level: LowercaseColorLevelEncoder
+    stacktrace-key: stacktrace
+    log-in-console: true
+    retention-day: -1

 # redis configuration
 redis:
-  #是否使用redis集群模式
-  useCluster: false
-  #使用集群模式addr和db默认无效
-  addr: 127.0.0.1:6379
-  password: ""
-  db: 0
-  clusterAddrs:
-    - "172.21.0.3:7000"
-    - "172.21.0.4:7001"
-    - "172.21.0.2:7002"
+    #是否使用redis集群模式
+    useCluster: false
+    #使用集群模式addr和db默认无效
+    addr: 127.0.0.1:6379
+    password: ""
+    db: 0
+    clusterAddrs:
+        - "172.21.0.3:7000"
+        - "172.21.0.4:7001"
+        - "172.21.0.2:7002"

+# redis-list configuration
+redis-list:
+    - name: cache           # 数据库的名称,注意: name 需要在 redis-list 中唯一
+      useCluster: false     # 是否使用redis集群模式
+      addr: 127.0.0.1:6379  # 使用集群模式addr和db默认无效
+      password: ""
+      db: 0
+      clusterAddrs:
+          - "172.21.0.3:7000"
+          - "172.21.0.4:7001"
+          - "172.21.0.2:7002"

 # mongo configuration
 mongo:
-  coll: ''
-  options: ''
-  database: ''
-  username: ''
-  password: ''
-  auth-source: ''
-  min-pool-size: 0
-  max-pool-size: 100
-  socket-timeout-ms: 0
-  connect-timeout-ms: 0
-  is-zap: false
-  hosts:
-    - host: ''
-      port: ''
+    coll: ''
+    options: ''
+    database: ''
+    username: ''
+    password: ''
+    auth-source: ''
+    min-pool-size: 0
+    max-pool-size: 100
+    socket-timeout-ms: 0
+    connect-timeout-ms: 0
+    is-zap: false
+    hosts:
+        - host: ''
+          port: ''

 # email configuration
 email:
-  to: xxx@qq.com
-  port: 465
-  from: xxx@163.com
-  host: smtp.163.com
-  is-ssl: true
-  secret: xxx
-  nickname: test
+    to: xxx@qq.com
+    port: 465
+    from: xxx@163.com
+    host: smtp.163.com
+    is-ssl: true
+    secret: xxx
+    nickname: test

 # system configuration
 system:
-  env: local # 修改为public可以关闭路由日志输出
-  addr: 8888
-  db-type: mysql
-  oss-type: local # 控制oss选择走本地还是 七牛等其他仓 自行增加其他oss仓可以在 server/utils/upload/upload.go 中 NewOss函数配置
-  use-redis: false # 使用redis
-  use-mongo: false     # 使用mongo
-  use-multipoint: false
-  # IP限制次数 一个小时15000次
-  iplimit-count: 15000
-  #  IP限制一个小时
-  iplimit-time: 3600
-  #  路由全局前缀
-  router-prefix: ""
+    env: local # 修改为public可以关闭路由日志输出
+    addr: 8888
+    db-type: mysql
+    oss-type: local # 控制oss选择走本地还是 七牛等其他仓 自行增加其他oss仓可以在 server/utils/upload/upload.go 中 NewOss函数配置
+    use-redis: false # 使用redis
+    use-mongo: false     # 使用mongo
+    use-multipoint: false
+    # IP限制次数 一个小时15000次
+    iplimit-count: 15000
+    #  IP限制一个小时
+    iplimit-time: 3600
+    #  路由全局前缀
+    router-prefix: ""
+    #  严格角色模式 打开后权限将会存在上下级关系
+    use-strict-auth: false

 # captcha configuration
 captcha:
-  key-long: 6
-  img-width: 240
-  img-height: 80
-  open-captcha: 0 # 0代表一直开启，大于0代表限制次数
-  open-captcha-timeout: 3600 # open-captcha大于0时才生效
+    key-long: 6
+    img-width: 240
+    img-height: 80
+    open-captcha: 0 # 0代表一直开启，大于0代表限制次数
+    open-captcha-timeout: 3600 # open-captcha大于0时才生效

 # mysql connect configuration
 # 未初始化之前请勿手动修改数据库信息！！！如果一定要手动初始化请看（https://gin-vue-admin.com/docs/first_master）
 mysql:
-  path: ""
-  port: ""
-  config: ""
-  db-name: ""
-  username: ""
-  password: ""
-  max-idle-conns: 10
-  max-open-conns: 100
-  log-mode: ""
-  log-zap: false
-
-# pgsql connect configuration
-# 未初始化之前请勿手动修改数据库信息！！！如果一定要手动初始化请看（https://gin-vue-admin.com/docs/first_master）
-pgsql:
-  path: ""
-  port: ""
-  config: ""
-  db-name: ""
-  username: ""
-  password: ""
-  max-idle-conns: 10
-  max-open-conns: 100
-  log-mode: ""
-  log-zap: false
-oracle:
-  path: ""
-  port: ""
-  config: ""
-  db-name: ""
-  username: ""
-  password: ""
-  max-idle-conns: 10
-  max-open-conns: 100
-  log-mode: ""
-  log-zap: false
-mssql:
-  path: ""
-  port: ""
-  config: ""
-  db-name: ""
-  username: ""
-  password: ""
-  max-idle-conns: 10
-  max-open-conns: 100
-  log-mode: ""
-  log-zap: false
-sqlite:
-  path: ""
-  port: ""
-  config: ""
-  db-name: ""
-  username: ""
-  password: ""
-  max-idle-conns: 10
-  max-open-conns: 100
-  log-mode: ""
-  log-zap: false
-db-list:
-  - disable: true # 是否禁用
-    type: "" # 数据库的类型,目前支持mysql、pgsql、mssql、oracle
-    alias-name: "" # 数据库的名称,注意: alias-name 需要在db-list中唯一
    path: ""
    port: ""
    config: ""
@@ -158,97 +110,168 @@ db-list:
    log-mode: ""
    log-zap: false

+# pgsql connect configuration
+# 未初始化之前请勿手动修改数据库信息！！！如果一定要手动初始化请看（https://gin-vue-admin.com/docs/first_master）
+pgsql:
+    path: ""
+    port: ""
+    config: ""
+    db-name: ""
+    username: ""
+    password: ""
+    max-idle-conns: 10
+    max-open-conns: 100
+    log-mode: ""
+    log-zap: false
+oracle:
+    path: ""
+    port: ""
+    config: ""
+    db-name: ""
+    username: ""
+    password: ""
+    max-idle-conns: 10
+    max-open-conns: 100
+    log-mode: ""
+    log-zap: false
+mssql:
+    path: ""
+    port: ""
+    config: ""
+    db-name: ""
+    username: ""
+    password: ""
+    max-idle-conns: 10
+    max-open-conns: 100
+    log-mode: ""
+    log-zap: false
+sqlite:
+    path: ""
+    port: ""
+    config: ""
+    db-name: ""
+    username: ""
+    password: ""
+    max-idle-conns: 10
+    max-open-conns: 100
+    log-mode: ""
+    log-zap: false
+db-list:
+    - disable: true # 是否禁用
+      type: "" # 数据库的类型,目前支持mysql、pgsql、mssql、oracle
+      alias-name: "" # 数据库的名称,注意: alias-name 需要在db-list中唯一
+      path: ""
+      port: ""
+      config: ""
+      db-name: ""
+      username: ""
+      password: ""
+      max-idle-conns: 10
+      max-open-conns: 100
+      log-mode: ""
+      log-zap: false
+
 # local configuration
 local:
-  path: uploads/file
-  store-path: uploads/file
+    path: uploads/file
+    store-path: uploads/file

 # autocode configuration
 autocode:
-  web: web/src
-  root: "" # root 自动适配项目根目录, 请不要手动配置,他会在项目加载的时候识别出根路径
-  server: server
-  module: 'github.com/flipped-aurora/gin-vue-admin/server'
-  ai-path: ""  # AI服务路径
+    web: web/src
+    root: "" # root 自动适配项目根目录, 请不要手动配置,他会在项目加载的时候识别出根路径
+    server: server
+    module: 'github.com/flipped-aurora/gin-vue-admin/server'
+    ai-path: ""  # AI服务路径

 # qiniu configuration (请自行七牛申请对应的 公钥 私钥 bucket 和 域名地址)
 qiniu:
-  zone: ZoneHuaDong
-  bucket: ""
-  img-path: ""
-  use-https: false
-  access-key: ""
-  secret-key: ""
-  use-cdn-domains: false
+    zone: ZoneHuaDong
+    bucket: ""
+    img-path: ""
+    use-https: false
+    access-key: ""
+    secret-key: ""
+    use-cdn-domains: false

-# aliyun oss configuration
-aliyun-oss:
+# minio oss configuration
+minio:
  endpoint: yourEndpoint
  access-key-id: yourAccessKeyId
  access-key-secret: yourAccessKeySecret
  bucket-name: yourBucketName
-  bucket-url: yourBucketUrl
-  base-path: yourBasePath
+  use-ssl: false
+  base-path: ""
+  bucket-url: "http://host:9000/yourBucketName"
+
+# aliyun oss configuration
+aliyun-oss:
+    endpoint: yourEndpoint
+    access-key-id: yourAccessKeyId
+    access-key-secret: yourAccessKeySecret
+    bucket-name: yourBucketName
+    bucket-url: yourBucketUrl
+    base-path: yourBasePath

 # tencent cos configuration
 tencent-cos:
-  bucket: xxxxx-10005608
-  region: ap-shanghai
-  secret-id: your-secret-id
-  secret-key: your-secret-key
-  base-url: https://gin.vue.admin
-  path-prefix: github.com/flipped-aurora/gin-vue-admin/server
+    bucket: xxxxx-10005608
+    region: ap-shanghai
+    secret-id: your-secret-id
+    secret-key: your-secret-key
+    base-url: https://gin.vue.admin
+    path-prefix: github.com/flipped-aurora/gin-vue-admin/server

 # aws s3 configuration (minio compatible)
 aws-s3:
-  bucket: xxxxx-10005608
-  region: ap-shanghai
-  endpoint: ""
-  s3-force-path-style: false
-  disable-ssl: false
-  secret-id: your-secret-id
-  secret-key: your-secret-key
-  base-url: https://gin.vue.admin
-  path-prefix: github.com/flipped-aurora/gin-vue-admin/server
+    bucket: xxxxx-10005608
+    region: ap-shanghai
+    endpoint: ""
+    s3-force-path-style: false
+    disable-ssl: false
+    secret-id: your-secret-id
+    secret-key: your-secret-key
+    base-url: https://gin.vue.admin
+    path-prefix: github.com/flipped-aurora/gin-vue-admin/server

 # cloudflare r2 configuration
 cloudflare-r2:
-  bucket: xxxx0bucket
-  base-url: https://gin.vue.admin.com
-  path: uploads
-  account-id: xxx_account_id
-  access-key-id: xxx_key_id
-  secret-access-key: xxx_secret_key
+    bucket: xxxx0bucket
+    base-url: https://gin.vue.admin.com
+    path: uploads
+    account-id: xxx_account_id
+    access-key-id: xxx_key_id
+    secret-access-key: xxx_secret_key

 # huawei obs configuration
 hua-wei-obs:
-  path: you-path
-  bucket: you-bucket
-  endpoint: you-endpoint
-  access-key: you-access-key
-  secret-key: you-secret-key
+    path: you-path
+    bucket: you-bucket
+    endpoint: you-endpoint
+    access-key: you-access-key
+    secret-key: you-secret-key

 # excel configuration
 excel:
-  dir: ./resource/excel/
+    dir: ./resource/excel/

 # disk usage configuration
 disk-list:
-  - mount-point: "/"
+    - mount-point: "/"

 # 跨域配置
 # 需要配合 server/initialize/router.go -> `Router.Use(middleware.CorsByRules())` 使用
 cors:
-  mode: strict-whitelist # 放行模式: allow-all, 放行全部; whitelist, 白名单模式, 来自白名单内域名的请求添加 cors 头; strict-whitelist 严格白名单模式, 白名单外的请求一律拒绝
-  whitelist:
-    - allow-origin: example1.com
-      allow-headers: Content-Type,AccessToken,X-CSRF-Token, Authorization, Token,X-Token,X-User-Id
-      allow-methods: POST, GET
-      expose-headers: Content-Length, Access-Control-Allow-Origin, Access-Control-Allow-Headers, Content-Type
+    mode: strict-whitelist # 放行模式: allow-all, 放行全部; whitelist, 白名单模式, 来自白名单内域名的请求添加 cors 头; strict-whitelist 严格白名单模式, 白名单外的请求一律拒绝
+    whitelist:
+        - allow-origin: example1.com
+          allow-headers: Content-Type,AccessToken,X-CSRF-Token, Authorization, Token,X-Token,X-User-Id
+          allow-methods: POST, GET
+          expose-headers: Content-Length, Access-Control-Allow-Origin, Access-Control-Allow-Headers, Content-Type

-      allow-credentials: true # 布尔值
-    - allow-origin: example2.com
-      allow-headers: content-type
-      allow-methods: GET, POST
-      expose-headers: Content-Length, Access-Control-Allow-Origin, Access-Control-Allow-Headers, Content-Type
-      allow-credentials: true # 布尔值
+          allow-credentials: true # 布尔值
+        - allow-origin: example2.com
+          allow-headers: content-type
+          allow-methods: GET, POST
+          expose-headers: Content-Length, Access-Control-Allow-Origin, Access-Control-Allow-Headers, Content-Type
+          allow-credentials: true # 布尔值
@@ -1,13 +1,14 @@
 package config

 type Server struct {
-	JWT     JWT     `mapstructure:"jwt" json:"jwt" yaml:"jwt"`
-	Zap     Zap     `mapstructure:"zap" json:"zap" yaml:"zap"`
-	Redis   Redis   `mapstructure:"redis" json:"redis" yaml:"redis"`
-	Mongo   Mongo   `mapstructure:"mongo" json:"mongo" yaml:"mongo"`
-	Email   Email   `mapstructure:"email" json:"email" yaml:"email"`
-	System  System  `mapstructure:"system" json:"system" yaml:"system"`
-	Captcha Captcha `mapstructure:"captcha" json:"captcha" yaml:"captcha"`
+	JWT       JWT     `mapstructure:"jwt" json:"jwt" yaml:"jwt"`
+	Zap       Zap     `mapstructure:"zap" json:"zap" yaml:"zap"`
+	Redis     Redis   `mapstructure:"redis" json:"redis" yaml:"redis"`
+	RedisList []Redis `mapstructure:"redis-list" json:"redis-list" yaml:"redis-list"`
+	Mongo     Mongo   `mapstructure:"mongo" json:"mongo" yaml:"mongo"`
+	Email     Email   `mapstructure:"email" json:"email" yaml:"email"`
+	System    System  `mapstructure:"system" json:"system" yaml:"system"`
+	Captcha   Captcha `mapstructure:"captcha" json:"captcha" yaml:"captcha"`
 	// auto
 	AutoCode Autocode `mapstructure:"autocode" json:"autocode" yaml:"autocode"`
 	// gorm
@@ -25,6 +26,7 @@ type Server struct {
 	TencentCOS   TencentCOS   `mapstructure:"tencent-cos" json:"tencent-cos" yaml:"tencent-cos"`
 	AwsS3        AwsS3        `mapstructure:"aws-s3" json:"aws-s3" yaml:"aws-s3"`
 	CloudflareR2 CloudflareR2 `mapstructure:"cloudflare-r2" json:"cloudflare-r2" yaml:"cloudflare-r2"`
+	Minio        Minio        `mapstructure:"minio" json:"minio" yaml:"minio"`

 	Excel Excel `mapstructure:"excel" json:"excel" yaml:"excel"`

@@ -0,0 +1,11 @@
+package config
+
+type Minio struct {
+	Endpoint        string `mapstructure:"endpoint" json:"endpoint" yaml:"endpoint"`
+	AccessKeyId     string `mapstructure:"access-key-id" json:"access-key-id" yaml:"access-key-id"`
+	AccessKeySecret string `mapstructure:"access-key-secret" json:"access-key-secret" yaml:"access-key-secret"`
+	BucketName      string `mapstructure:"bucket-name" json:"bucket-name" yaml:"bucket-name"`
+	UseSSL          bool   `mapstructure:"use-ssl" json:"use-ssl" yaml:"use-ssl"`
+	BasePath        string `mapstructure:"base-path" json:"base-path" yaml:"base-path"`
+	BucketUrl       string `mapstructure:"bucket-url" json:"bucket-url" yaml:"bucket-url"`
+}
@@ -1,6 +1,7 @@
 package config

 type Redis struct {
+	Name         string   `mapstructure:"name" json:"name" yaml:"name"`                         // 代表当前实例的名字
 	Addr         string   `mapstructure:"addr" json:"addr" yaml:"addr"`                         // 服务器地址:端口
 	Password     string   `mapstructure:"password" json:"password" yaml:"password"`             // 密码
 	DB           int      `mapstructure:"db" json:"db" yaml:"db"`                               // 单实例模式下redis的哪个数据库
@@ -7,7 +7,8 @@ type System struct {
 	Addr          int    `mapstructure:"addr" json:"addr" yaml:"addr"` // 端口值
 	LimitCountIP  int    `mapstructure:"iplimit-count" json:"iplimit-count" yaml:"iplimit-count"`
 	LimitTimeIP   int    `mapstructure:"iplimit-time" json:"iplimit-time" yaml:"iplimit-time"`
-	UseMultipoint bool   `mapstructure:"use-multipoint" json:"use-multipoint" yaml:"use-multipoint"` // 多点登录拦截
-	UseRedis      bool   `mapstructure:"use-redis" json:"use-redis" yaml:"use-redis"`                // 使用redis
-	UseMongo      bool   `mapstructure:"use-mongo" json:"use-mongo" yaml:"use-mongo"`                // 使用mongo
+	UseMultipoint bool   `mapstructure:"use-multipoint" json:"use-multipoint" yaml:"use-multipoint"`    // 多点登录拦截
+	UseRedis      bool   `mapstructure:"use-redis" json:"use-redis" yaml:"use-redis"`                   // 使用redis
+	UseMongo      bool   `mapstructure:"use-mongo" json:"use-mongo" yaml:"use-mongo"`                   // 使用mongo
+	UseStrictAuth bool   `mapstructure:"use-strict-auth" json:"use-strict-auth" yaml:"use-strict-auth"` // 使用树形角色分配模式
 }
@@ -16,7 +16,9 @@ func RunWindowsServer() {
 	if global.GVA_CONFIG.System.UseMultipoint || global.GVA_CONFIG.System.UseRedis {
 		// 初始化redis服务
 		initialize.Redis()
+		initialize.RedisList()
 	}
+
 	if global.GVA_CONFIG.System.UseMongo {
 		err := initialize.Mongo.Initialization()
 		if err != nil {
@@ -29,7 +31,6 @@ func RunWindowsServer() {
 	}

 	Router := initialize.Routers()
-	Router.Static("/form-generator", "./resource/page")

 	address := fmt.Sprintf(":%d", global.GVA_CONFIG.System.Addr)
 	s := initServer(address, Router)
@@ -38,8 +39,8 @@ func RunWindowsServer() {

 	fmt.Printf(`
 	欢迎使用 gin-vue-admin
-	当前版本:v2.7.1
-    加群方式:微信号：shouzi_1994 QQ群：470239250
+	当前版本:v2.7.9
+	加群方式:微信号：shouzi_1994 QQ群：470239250
 	项目地址：https://github.com/flipped-aurora/gin-vue-admin
 	插件市场:https://plugin.gin-vue-admin.com
 	GVA讨论社区:https://support.qq.com/products/371961
@@ -12,7 +12,6 @@ import (
 	"github.com/spf13/viper"

 	"github.com/flipped-aurora/gin-vue-admin/server/global"
-	_ "github.com/flipped-aurora/gin-vue-admin/server/packfile"
 )

 // Viper //
@@ -1,4 +1,7 @@
 definitions:
+  common.JSONMap:
+    additionalProperties: true
+    type: object
  config.AliyunOSS:
    properties:
      access-key-id:
@@ -150,6 +153,23 @@ definitions:
        description: 本地文件存储路径
        type: string
    type: object
+  config.Minio:
+    properties:
+      access-key-id:
+        type: string
+      access-key-secret:
+        type: string
+      base-path:
+        type: string
+      bucket-name:
+        type: string
+      bucket-url:
+        type: string
+      endpoint:
+        type: string
+      use-ssl:
+        type: boolean
+    type: object
  config.Mongo:
    properties:
      auth-source:
@@ -409,6 +429,9 @@ definitions:
      db:
        description: 单实例模式下redis的哪个数据库
        type: integer
+      name:
+        description: 代表当前实例的名字
+        type: string
      password:
        description: 密码
        type: string
@@ -454,6 +477,8 @@ definitions:
        allOf:
        - $ref: '#/definitions/config.Local'
        description: oss
+      minio:
+        $ref: '#/definitions/config.Minio'
      mongo:
        $ref: '#/definitions/config.Mongo'
      mssql:
@@ -470,6 +495,10 @@ definitions:
        $ref: '#/definitions/config.Qiniu'
      redis:
        $ref: '#/definitions/config.Redis'
+      redis-list:
+        items:
+          $ref: '#/definitions/config.Redis'
+        type: array
      sqlite:
        $ref: '#/definitions/config.Sqlite'
      system:
@@ -597,6 +626,9 @@ definitions:
      use-redis:
        description: 使用redis
        type: boolean
+      use-strict-auth:
+        description: 使用树形角色分配模式
+        type: boolean
    type: object
  config.TencentCOS:
    properties:
@@ -643,6 +675,26 @@ definitions:
        description: 栈名
        type: string
    type: object
+  example.ExaAttachmentCategory:
+    properties:
+      ID:
+        description: 主键ID
+        type: integer
+      children:
+        items:
+          $ref: '#/definitions/example.ExaAttachmentCategory'
+        type: array
+      createdAt:
+        description: 创建时间
+        type: string
+      name:
+        type: string
+      pid:
+        type: integer
+      updatedAt:
+        description: 更新时间
+        type: string
+    type: object
  example.ExaCustomer:
    properties:
      ID:
@@ -720,6 +772,9 @@ definitions:
      ID:
        description: 主键ID
        type: integer
+      classId:
+        description: 分类id
+        type: integer
      createdAt:
        description: 创建时间
        type: string
@@ -800,6 +855,164 @@ definitions:
        type: array
    type: object
  request.AutoCode:
+    properties:
+      abbreviation:
+        description: Struct简称
+        example: Struct简称
+        type: string
+      autoCreateApiToSql:
+        description: 是否自动创建api
+        example: false
+        type: boolean
+      autoCreateBtnAuth:
+        description: 是否自动创建按钮权限
+        example: false
+        type: boolean
+      autoCreateMenuToSql:
+        description: 是否自动创建menu
+        example: false
+        type: boolean
+      autoCreateResource:
+        description: 是否自动创建资源标识
+        example: false
+        type: boolean
+      autoMigrate:
+        description: 是否自动迁移表结构
+        example: false
+        type: boolean
+      businessDB:
+        description: 业务数据库
+        example: 业务数据库
+        type: string
+      description:
+        description: Struct中文名称
+        example: Struct中文名称
+        type: string
+      fields:
+        items:
+          $ref: '#/definitions/request.AutoCodeField'
+        type: array
+      generateServer:
+        description: 是否生成server
+        example: true
+        type: boolean
+      generateWeb:
+        description: 是否生成web
+        example: true
+        type: boolean
+      gvaModel:
+        description: 是否使用gva默认Model
+        example: false
+        type: boolean
+      humpPackageName:
+        description: go文件名称
+        example: go文件名称
+        type: string
+      isAdd:
+        description: 是否新增
+        example: false
+        type: boolean
+      isTree:
+        description: 是否树形结构
+        example: false
+        type: boolean
+      onlyTemplate:
+        description: 是否只生成模板
+        example: false
+        type: boolean
+      package:
+        type: string
+      packageName:
+        description: 文件名称
+        example: 文件名称
+        type: string
+      primaryField:
+        $ref: '#/definitions/request.AutoCodeField'
+      structName:
+        description: Struct名称
+        example: Struct名称
+        type: string
+      tableName:
+        description: 表名
+        example: 表名
+        type: string
+      treeJson:
+        description: 展示的树json字段
+        example: 展示的树json字段
+        type: string
+    type: object
+  request.AutoCodeField:
+    properties:
+      checkDataSource:
+        description: 是否检查数据源
+        type: boolean
+      clearable:
+        description: 是否可清空
+        type: boolean
+      columnName:
+        description: 数据库字段
+        type: string
+      comment:
+        description: 数据库字段描述
+        type: string
+      dataSource:
+        allOf:
+        - $ref: '#/definitions/request.DataSource'
+        description: 数据源
+      dataTypeLong:
+        description: 数据库字段长度
+        type: string
+      defaultValue:
+        description: 是否必填
+        type: string
+      desc:
+        description: 是否前端详情
+        type: boolean
+      dictType:
+        description: 字典
+        type: string
+      errorText:
+        description: 校验失败文字
+        type: string
+      excel:
+        description: 是否导入/导出
+        type: boolean
+      fieldDesc:
+        description: 中文名
+        type: string
+      fieldIndexType:
+        description: 索引类型
+        type: string
+      fieldJson:
+        description: FieldJson
+        type: string
+      fieldName:
+        description: Field名
+        type: string
+      fieldSearchHide:
+        description: 是否隐藏查询条件
+        type: boolean
+      fieldSearchType:
+        description: 搜索条件
+        type: string
+      fieldType:
+        description: Field数据类型
+        type: string
+      form:
+        description: Front           bool        `json:"front"`           // 是否前端可见
+        type: boolean
+      primaryKey:
+        description: 是否主键
+        type: boolean
+      require:
+        description: 是否必填
+        type: boolean
+      sort:
+        description: 是否增加排序
+        type: boolean
+      table:
+        description: 是否前端表格列
+        type: boolean
    type: object
  request.CasbinInReceive:
    properties:
@@ -829,8 +1042,38 @@ definitions:
        description: 密码
        type: string
    type: object
+  request.DataSource:
+    properties:
+      association:
+        description: 关联关系 1 一对一 2 一对多
+        type: integer
+      dbName:
+        type: string
+      hasDeletedAt:
+        type: boolean
+      label:
+        type: string
+      table:
+        type: string
+      value:
+        type: string
+    type: object
  request.Empty:
    type: object
+  request.ExaAttachmentCategorySearch:
+    properties:
+      classId:
+        type: integer
+      keyword:
+        description: 关键字
+        type: string
+      page:
+        description: 页码
+        type: integer
+      pageSize:
+        description: 每页大小
+        type: integer
+    type: object
  request.GetAuthorityId:
    properties:
      authorityId:
@@ -843,6 +1086,26 @@ definitions:
        description: 主键ID
        type: integer
    type: object
+  request.GetUserList:
+    properties:
+      email:
+        type: string
+      keyword:
+        description: 关键字
+        type: string
+      nickName:
+        type: string
+      page:
+        description: 页码
+        type: integer
+      pageSize:
+        description: 每页大小
+        type: integer
+      phone:
+        type: string
+      username:
+        type: string
+    type: object
  request.IdsReq:
    properties:
      ids:
@@ -872,6 +1135,9 @@ definitions:
      port:
        description: 数据库连接端口
        type: string
+      template:
+        description: postgresql指定template
+        type: string
      userName:
        description: 数据库用户名
        type: string
@@ -1577,23 +1843,51 @@ definitions:
        description: 用户id
        type: integer
    type: object
+  system.SysParams:
+    properties:
+      ID:
+        description: 主键ID
+        type: integer
+      createdAt:
+        description: 创建时间
+        type: string
+      desc:
+        description: 参数说明
+        type: string
+      key:
+        description: 参数键
+        type: string
+      name:
+        description: 参数名称
+        type: string
+      updatedAt:
+        description: 更新时间
+        type: string
+      value:
+        description: 参数值
+        type: string
+    required:
+    - key
+    - name
+    - value
+    type: object
  system.SysUser:
    properties:
      ID:
        description: 主键ID
        type: integer
      authorities:
+        description: 多用户角色
        items:
          $ref: '#/definitions/system.SysAuthority'
        type: array
      authority:
-        $ref: '#/definitions/system.SysAuthority'
+        allOf:
+        - $ref: '#/definitions/system.SysAuthority'
+        description: 用户角色
      authorityId:
        description: 用户角色ID
        type: integer
-      baseColor:
-        description: 基础颜色
-        type: string
      createdAt:
        description: 创建时间
        type: string
@@ -1609,12 +1903,13 @@ definitions:
      nickName:
        description: 用户昵称
        type: string
+      originSetting:
+        allOf:
+        - $ref: '#/definitions/common.JSONMap'
+        description: 配置
      phone:
        description: 用户手机号
        type: string
-      sideMode:
-        description: 用户侧边主题
-        type: string
      updatedAt:
        description: 更新时间
        type: string
@@ -1634,7 +1929,7 @@ info:
  contact: {}
  description: 使用gin+vue进行极速开发的全栈开发基础平台
  title: Gin-Vue-Admin Swagger API接口文档
-  version: v2.7.1
+  version: v2.7.9-beta
 paths:
  /api/createApi:
    post:
@@ -1812,7 +2107,7 @@ paths:
      tags:
      - SysApi
  /api/getApiGroups:
-    post:
+    get:
      consumes:
      - application/json
      produces:
@@ -1932,6 +2227,74 @@ paths:
      summary: 修改基础api
      tags:
      - SysApi
+  /attachmentCategory/addCategory:
+    post:
+      consumes:
+      - application/json
+      parameters:
+      - description: 媒体库分类数据
+        in: body
+        name: data
+        required: true
+        schema:
+          $ref: '#/definitions/example.ExaAttachmentCategory'
+      produces:
+      - application/json
+      responses: {}
+      security:
+      - AttachmentCategory: []
+      summary: 添加媒体库分类
+      tags:
+      - AddCategory
+  /attachmentCategory/deleteCategory:
+    post:
+      consumes:
+      - application/json
+      parameters:
+      - description: 分类id
+        in: body
+        name: data
+        required: true
+        schema:
+          $ref: '#/definitions/request.GetById'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 删除分类
+          schema:
+            allOf:
+            - $ref: '#/definitions/response.Response'
+            - properties:
+                msg:
+                  type: string
+              type: object
+      security:
+      - AttachmentCategory: []
+      summary: 删除分类
+      tags:
+      - DeleteCategory
+  /attachmentCategory/getCategoryList:
+    get:
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 媒体库分类列表
+          schema:
+            allOf:
+            - $ref: '#/definitions/response.Response'
+            - properties:
+                data:
+                  $ref: '#/definitions/example.ExaAttachmentCategory'
+                msg:
+                  type: string
+              type: object
+      security:
+      - AttachmentCategory: []
+      summary: 媒体库分类列表
+      tags:
+      - GetCategoryList
  /authority/copyAuthority:
    post:
      consumes:
@@ -2079,7 +2442,7 @@ paths:
      tags:
      - Authority
  /authority/updateAuthority:
-    post:
+    put:
      consumes:
      - application/json
      parameters:
@@ -2347,7 +2710,7 @@ paths:
      summary: 获取当前表所有字段
      tags:
      - AutoCode
-  /autoCode/getDatabase:
+  /autoCode/getDB:
    get:
      consumes:
      - application/json
@@ -2504,6 +2867,54 @@ paths:
      summary: 获取package
      tags:
      - AutoCodePackage
+  /autoCode/initAPI:
+    post:
+      consumes:
+      - application/json
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 打包插件成功
+          schema:
+            allOf:
+            - $ref: '#/definitions/response.Response'
+            - properties:
+                data:
+                  additionalProperties: true
+                  type: object
+                msg:
+                  type: string
+              type: object
+      security:
+      - ApiKeyAuth: []
+      summary: 打包插件
+      tags:
+      - AutoCodePlugin
+  /autoCode/initMenu:
+    post:
+      consumes:
+      - application/json
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 打包插件成功
+          schema:
+            allOf:
+            - $ref: '#/definitions/response.Response'
+            - properties:
+                data:
+                  additionalProperties: true
+                  type: object
+                msg:
+                  type: string
+              type: object
+      security:
+      - ApiKeyAuth: []
+      summary: 打包插件
+      tags:
+      - AutoCodePlugin
  /autoCode/installPlugin:
    post:
      consumes:
@@ -2567,7 +2978,7 @@ paths:
      tags:
      - AutoCodeTemplate
  /autoCode/pubPlug:
-    get:
+    post:
      consumes:
      - application/json
      parameters:
@@ -2989,6 +3400,34 @@ paths:
      tags:
      - ExaFileUploadAndDownload
  /fileUploadAndDownload/findFile:
+    get:
+      consumes:
+      - multipart/form-data
+      parameters:
+      - description: Find the file, 查找文件
+        in: formData
+        name: file
+        required: true
+        type: file
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 查找文件,返回包括文件详情
+          schema:
+            allOf:
+            - $ref: '#/definitions/response.Response'
+            - properties:
+                data:
+                  $ref: '#/definitions/response.FileResponse'
+                msg:
+                  type: string
+              type: object
+      security:
+      - ApiKeyAuth: []
+      summary: 查找文件
+      tags:
+      - ExaFileUploadAndDownload
    post:
      consumes:
      - multipart/form-data
@@ -3022,12 +3461,12 @@ paths:
      consumes:
      - application/json
      parameters:
-      - description: 页码, 每页大小
+      - description: 页码, 每页大小, 分类id
        in: body
        name: data
        required: true
        schema:
-          $ref: '#/definitions/request.PageInfo'
+          $ref: '#/definitions/request.ExaAttachmentCategorySearch'
      produces:
      - application/json
      responses:
@@ -3047,6 +3486,32 @@ paths:
      summary: 分页文件列表
      tags:
      - ExaFileUploadAndDownload
+  /fileUploadAndDownload/importURL:
+    post:
+      parameters:
+      - description: 对象
+        in: body
+        name: data
+        required: true
+        schema:
+          $ref: '#/definitions/example.ExaFileUploadAndDownload'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 导入URL
+          schema:
+            allOf:
+            - $ref: '#/definitions/response.Response'
+            - properties:
+                msg:
+                  type: string
+              type: object
+      security:
+      - ApiKeyAuth: []
+      summary: 导入URL
+      tags:
+      - ExaFileUploadAndDownload
  /fileUploadAndDownload/removeChunk:
    post:
      consumes:
@@ -4060,6 +4525,18 @@ paths:
      summary: 更新SysDictionaryDetail
      tags:
      - SysDictionaryDetail
+  /sysExportTemplate/ExportTemplate:
+    get:
+      consumes:
+      - application/json
+      produces:
+      - application/json
+      responses: {}
+      security:
+      - ApiKeyAuth: []
+      summary: 导出表格模板
+      tags:
+      - SysExportTemplate
  /sysExportTemplate/createSysExportTemplate:
    post:
      consumes:
@@ -4138,7 +4615,7 @@ paths:
      responses: {}
      security:
      - ApiKeyAuth: []
-      summary: 导出表格模板
+      summary: 导出表格
      tags:
      - SysExportTemplate
  /sysExportTemplate/findSysExportTemplate:
@@ -4553,6 +5030,243 @@ paths:
      summary: 分页获取SysOperationRecord列表
      tags:
      - SysOperationRecord
+  /sysParams/createSysParams:
+    post:
+      consumes:
+      - application/json
+      parameters:
+      - description: 创建参数
+        in: body
+        name: data
+        required: true
+        schema:
+          $ref: '#/definitions/system.SysParams'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 创建成功
+          schema:
+            allOf:
+            - $ref: '#/definitions/response.Response'
+            - properties:
+                msg:
+                  type: string
+              type: object
+      security:
+      - ApiKeyAuth: []
+      summary: 创建参数
+      tags:
+      - SysParams
+  /sysParams/deleteSysParams:
+    delete:
+      consumes:
+      - application/json
+      parameters:
+      - description: 删除参数
+        in: body
+        name: data
+        required: true
+        schema:
+          $ref: '#/definitions/system.SysParams'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 删除成功
+          schema:
+            allOf:
+            - $ref: '#/definitions/response.Response'
+            - properties:
+                msg:
+                  type: string
+              type: object
+      security:
+      - ApiKeyAuth: []
+      summary: 删除参数
+      tags:
+      - SysParams
+  /sysParams/deleteSysParamsByIds:
+    delete:
+      consumes:
+      - application/json
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 批量删除成功
+          schema:
+            allOf:
+            - $ref: '#/definitions/response.Response'
+            - properties:
+                msg:
+                  type: string
+              type: object
+      security:
+      - ApiKeyAuth: []
+      summary: 批量删除参数
+      tags:
+      - SysParams
+  /sysParams/findSysParams:
+    get:
+      consumes:
+      - application/json
+      parameters:
+      - description: 主键ID
+        in: query
+        name: ID
+        type: integer
+      - description: 创建时间
+        in: query
+        name: createdAt
+        type: string
+      - description: 参数说明
+        in: query
+        name: desc
+        type: string
+      - description: 参数键
+        in: query
+        name: key
+        required: true
+        type: string
+      - description: 参数名称
+        in: query
+        name: name
+        required: true
+        type: string
+      - description: 更新时间
+        in: query
+        name: updatedAt
+        type: string
+      - description: 参数值
+        in: query
+        name: value
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 查询成功
+          schema:
+            allOf:
+            - $ref: '#/definitions/response.Response'
+            - properties:
+                data:
+                  $ref: '#/definitions/system.SysParams'
+                msg:
+                  type: string
+              type: object
+      security:
+      - ApiKeyAuth: []
+      summary: 用id查询参数
+      tags:
+      - SysParams
+  /sysParams/getSysParam:
+    get:
+      consumes:
+      - application/json
+      parameters:
+      - description: key
+        in: query
+        name: key
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 获取成功
+          schema:
+            allOf:
+            - $ref: '#/definitions/response.Response'
+            - properties:
+                data:
+                  $ref: '#/definitions/system.SysParams'
+                msg:
+                  type: string
+              type: object
+      security:
+      - ApiKeyAuth: []
+      summary: 根据key获取参数value
+      tags:
+      - SysParams
+  /sysParams/getSysParamsList:
+    get:
+      consumes:
+      - application/json
+      parameters:
+      - in: query
+        name: endCreatedAt
+        type: string
+      - in: query
+        name: key
+        type: string
+      - description: 关键字
+        in: query
+        name: keyword
+        type: string
+      - in: query
+        name: name
+        type: string
+      - description: 页码
+        in: query
+        name: page
+        type: integer
+      - description: 每页大小
+        in: query
+        name: pageSize
+        type: integer
+      - in: query
+        name: startCreatedAt
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 获取成功
+          schema:
+            allOf:
+            - $ref: '#/definitions/response.Response'
+            - properties:
+                data:
+                  $ref: '#/definitions/response.PageResult'
+                msg:
+                  type: string
+              type: object
+      security:
+      - ApiKeyAuth: []
+      summary: 分页获取参数列表
+      tags:
+      - SysParams
+  /sysParams/updateSysParams:
+    put:
+      consumes:
+      - application/json
+      parameters:
+      - description: 更新参数
+        in: body
+        name: data
+        required: true
+        schema:
+          $ref: '#/definitions/system.SysParams'
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 更新成功
+          schema:
+            allOf:
+            - $ref: '#/definitions/response.Response'
+            - properties:
+                msg:
+                  type: string
+              type: object
+      security:
+      - ApiKeyAuth: []
+      summary: 更新参数
+      tags:
+      - SysParams
  /system/getServerInfo:
    post:
      produces:
@@ -4672,6 +5386,38 @@ paths:
      summary: 设置用户信息
      tags:
      - SysUser
+  /user/SetSelfSetting:
+    put:
+      consumes:
+      - application/json
+      parameters:
+      - description: 用户配置数据
+        in: body
+        name: data
+        required: true
+        schema:
+          additionalProperties: true
+          type: object
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: 设置用户配置
+          schema:
+            allOf:
+            - $ref: '#/definitions/response.Response'
+            - properties:
+                data:
+                  additionalProperties: true
+                  type: object
+                msg:
+                  type: string
+              type: object
+      security:
+      - ApiKeyAuth: []
+      summary: 设置用户配置
+      tags:
+      - SysUser
  /user/admin_register:
    post:
      parameters:
@@ -4786,7 +5532,7 @@ paths:
        name: data
        required: true
        schema:
-          $ref: '#/definitions/request.PageInfo'
+          $ref: '#/definitions/request.GetUserList'
      produces:
      - application/json
      responses:
@@ -4925,3 +5671,7 @@ securityDefinitions:
    name: x-token
    type: apiKey
 swagger: "2.0"
+tags:
+- name: Base
+- description: 用户
+  name: SysUser
@@ -1,9 +1,11 @@
 package global

 import (
+	"fmt"
+	"sync"
+
 	"github.com/gin-gonic/gin"
 	"github.com/qiniu/qmgo"
-	"sync"

 	"github.com/flipped-aurora/gin-vue-admin/server/utils/timer"
 	"github.com/songzhibin97/gkit/cache/local_cache"
@@ -20,12 +22,13 @@ import (
 )

 var (
-	GVA_DB     *gorm.DB
-	GVA_DBList map[string]*gorm.DB
-	GVA_REDIS  redis.UniversalClient
-	GVA_MONGO  *qmgo.QmgoClient
-	GVA_CONFIG config.Server
-	GVA_VP     *viper.Viper
+	GVA_DB        *gorm.DB
+	GVA_DBList    map[string]*gorm.DB
+	GVA_REDIS     redis.UniversalClient
+	GVA_REDISList map[string]redis.UniversalClient
+	GVA_MONGO     *qmgo.QmgoClient
+	GVA_CONFIG    config.Server
+	GVA_VP        *viper.Viper
 	// GVA_LOG    *oplogging.Logger
 	GVA_LOG                 *zap.Logger
 	GVA_Timer               timer.Timer = timer.NewTimerTask()
@@ -53,3 +56,11 @@ func MustGetGlobalDBByDBName(dbname string) *gorm.DB {
 	}
 	return db
 }
+
+func GetRedis(name string) redis.UniversalClient {
+	redis, ok := GVA_REDISList[name]
+	if !ok || redis == nil {
+		panic(fmt.Sprintf("redis `%s` no init", name))
+	}
+	return redis
+}
@@ -1,163 +1,177 @@
 module github.com/flipped-aurora/gin-vue-admin/server

-go 1.22
+go 1.22.2

 require (
-	github.com/aliyun/aliyun-oss-go-sdk v2.2.7+incompatible
-	github.com/aws/aws-sdk-go v1.44.307
-	github.com/casbin/casbin/v2 v2.87.1
-	github.com/casbin/gorm-adapter/v3 v3.18.0
-	github.com/flipped-aurora/ws v1.0.2
-	github.com/fsnotify/fsnotify v1.6.0
+	github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible
+	github.com/aws/aws-sdk-go v1.55.6
+	github.com/casbin/casbin/v2 v2.103.0
+	github.com/casbin/gorm-adapter/v3 v3.32.0
+	github.com/fsnotify/fsnotify v1.8.0
 	github.com/fvbock/endless v0.0.0-20170109170031-447134032cb6
-	github.com/gin-gonic/gin v1.9.1
-	github.com/glebarez/sqlite v1.8.0
+	github.com/gin-gonic/gin v1.10.0
+	github.com/glebarez/sqlite v1.11.0
 	github.com/go-sql-driver/mysql v1.8.1
-	github.com/goccy/go-json v0.10.2
-	github.com/gofrs/uuid/v5 v5.0.0
-	github.com/golang-jwt/jwt/v4 v4.5.0
+	github.com/goccy/go-json v0.10.4
+	github.com/golang-jwt/jwt/v5 v5.2.1
+	github.com/google/uuid v1.6.0
 	github.com/gookit/color v1.5.4
-	github.com/huaweicloud/huaweicloud-sdk-go-obs v3.21.8+incompatible
-	github.com/jordan-wright/email v0.0.0-20200824153738-3f5bafa1cd84
-	github.com/mholt/archiver/v4 v4.0.0-alpha.8
-	github.com/mojocn/base64Captcha v1.3.6
-	github.com/otiai10/copy v1.7.0
+	github.com/huaweicloud/huaweicloud-sdk-go-obs v3.24.9+incompatible
+	github.com/jordan-wright/email v4.0.1-0.20210109023952-943e75fe5223+incompatible
+	github.com/mholt/archiver/v4 v4.0.0-alpha.9
+	github.com/minio/minio-go/v7 v7.0.84
+	github.com/mojocn/base64Captcha v1.3.8
+	github.com/otiai10/copy v1.14.1
 	github.com/pkg/errors v0.9.1
-	github.com/qiniu/api.v7/v7 v7.4.1
-	github.com/qiniu/qmgo v1.1.8
-	github.com/redis/go-redis/v9 v9.0.5
+	github.com/qiniu/go-sdk/v7 v7.25.2
+	github.com/qiniu/qmgo v1.1.9
+	github.com/redis/go-redis/v9 v9.7.0
 	github.com/robfig/cron/v3 v3.0.1
-	github.com/shirou/gopsutil/v3 v3.23.6
-	github.com/songzhibin97/gkit v1.2.11
-	github.com/spf13/viper v1.16.0
-	github.com/stretchr/testify v1.8.4
+	github.com/shirou/gopsutil/v3 v3.24.5
+	github.com/songzhibin97/gkit v1.2.13
+	github.com/spf13/viper v1.19.0
+	github.com/stretchr/testify v1.10.0
 	github.com/swaggo/files v1.0.1
 	github.com/swaggo/gin-swagger v1.6.0
-	github.com/swaggo/swag v1.16.2
-	github.com/tencentyun/cos-go-sdk-v5 v0.7.42
-	github.com/unrolled/secure v1.13.0
-	github.com/xuri/excelize/v2 v2.8.0
-	go.mongodb.org/mongo-driver v1.12.1
-	go.uber.org/automaxprocs v1.5.3
-	go.uber.org/zap v1.24.0
-	golang.org/x/crypto v0.22.0
-	golang.org/x/sync v0.6.0
-	golang.org/x/text v0.14.0
-	gorm.io/datatypes v1.2.1
-	gorm.io/driver/mysql v1.5.6
-	gorm.io/driver/postgres v1.5.7
-	gorm.io/driver/sqlserver v1.5.1
+	github.com/swaggo/swag v1.16.4
+	github.com/tencentyun/cos-go-sdk-v5 v0.7.60
+	github.com/unrolled/secure v1.17.0
+	github.com/xuri/excelize/v2 v2.9.0
+	go.mongodb.org/mongo-driver v1.17.2
+	go.uber.org/automaxprocs v1.6.0
+	go.uber.org/zap v1.27.0
+	golang.org/x/crypto v0.32.0
+	golang.org/x/sync v0.10.0
+	golang.org/x/text v0.21.0
+	gorm.io/datatypes v1.2.5
+	gorm.io/driver/mysql v1.5.7
+	gorm.io/driver/postgres v1.5.11
+	gorm.io/driver/sqlserver v1.5.4
 	gorm.io/gen v0.3.26
-	gorm.io/gorm v1.25.10
-	nhooyr.io/websocket v1.8.7
+	gorm.io/gorm v1.25.12
 )

 require (
 	filippo.io/edwards25519 v1.1.0 // indirect
+	github.com/BurntSushi/toml v1.4.0 // indirect
 	github.com/KyleBanks/depth v1.2.1 // indirect
-	github.com/andybalholm/brotli v1.0.4 // indirect
-	github.com/bodgit/plumbing v1.2.0 // indirect
-	github.com/bodgit/sevenzip v1.3.0 // indirect
-	github.com/bodgit/windows v1.0.0 // indirect
-	github.com/bytedance/sonic v1.9.1 // indirect
-	github.com/casbin/govaluate v1.1.1 // indirect
-	github.com/cespare/xxhash/v2 v2.2.0 // indirect
-	github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
+	github.com/STARRY-S/zip v0.1.0 // indirect
+	github.com/alex-ant/gomath v0.0.0-20160516115720-89013a210a82 // indirect
+	github.com/andybalholm/brotli v1.1.1 // indirect
+	github.com/bmatcuk/doublestar/v4 v4.8.0 // indirect
+	github.com/bodgit/plumbing v1.3.0 // indirect
+	github.com/bodgit/sevenzip v1.6.0 // indirect
+	github.com/bodgit/windows v1.0.1 // indirect
+	github.com/bytedance/sonic v1.12.7 // indirect
+	github.com/bytedance/sonic/loader v0.2.3 // indirect
+	github.com/casbin/govaluate v1.3.0 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/clbanning/mxj v1.8.4 // indirect
-	github.com/connesc/cipherio v0.2.1 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/cloudwego/base64x v0.1.5 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
-	github.com/dsnet/compress v0.0.1 // indirect
+	github.com/dsnet/compress v0.0.2-0.20230904184137-39efe44ab707 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
-	github.com/gabriel-vasile/mimetype v1.4.2 // indirect
-	github.com/gin-contrib/sse v0.1.0 // indirect
-	github.com/glebarez/go-sqlite v1.21.1 // indirect
-	github.com/go-ole/go-ole v1.2.6 // indirect
-	github.com/go-openapi/jsonpointer v0.20.2 // indirect
-	github.com/go-openapi/jsonreference v0.20.3 // indirect
-	github.com/go-openapi/spec v0.20.12 // indirect
-	github.com/go-openapi/swag v0.22.5 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.8 // indirect
+	github.com/gammazero/toposort v0.1.1 // indirect
+	github.com/gin-contrib/sse v1.0.0 // indirect
+	github.com/glebarez/go-sqlite v1.22.0 // indirect
+	github.com/go-ini/ini v1.67.0 // indirect
+	github.com/go-ole/go-ole v1.3.0 // indirect
+	github.com/go-openapi/jsonpointer v0.21.0 // indirect
+	github.com/go-openapi/jsonreference v0.21.0 // indirect
+	github.com/go-openapi/spec v0.21.0 // indirect
+	github.com/go-openapi/swag v0.23.0 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-playground/validator/v10 v10.14.0 // indirect
+	github.com/go-playground/validator/v10 v10.24.0 // indirect
+	github.com/gofrs/flock v0.12.1 // indirect
 	github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
 	github.com/golang-sql/sqlexp v0.1.0 // indirect
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
-	github.com/google/go-querystring v1.0.0 // indirect
-	github.com/google/uuid v1.3.0 // indirect
+	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
+	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
-	github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9 // indirect
-	github.com/jackc/pgx/v5 v5.5.5 // indirect
-	github.com/jackc/puddle/v2 v2.2.1 // indirect
+	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
+	github.com/jackc/pgx/v5 v5.7.2 // indirect
+	github.com/jackc/puddle/v2 v2.2.2 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/compress v1.15.9 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
-	github.com/klauspost/pgzip v1.2.5 // indirect
-	github.com/leodido/go-urn v1.2.4 // indirect
-	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
-	github.com/magiconair/properties v1.8.7 // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/mattn/go-isatty v0.0.19 // indirect
-	github.com/microsoft/go-mssqldb v1.1.0 // indirect
+	github.com/klauspost/compress v1.17.11 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.9 // indirect
+	github.com/klauspost/pgzip v1.2.6 // indirect
+	github.com/leodido/go-urn v1.4.0 // indirect
+	github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 // indirect
+	github.com/magiconair/properties v1.8.9 // indirect
+	github.com/mailru/easyjson v0.9.0 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/microsoft/go-mssqldb v1.8.0 // indirect
+	github.com/minio/md5-simd v1.1.2 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
-	github.com/montanaflynn/stats v0.7.0 // indirect
-	github.com/mozillazg/go-httpheader v0.2.1 // indirect
-	github.com/nwaples/rardecode/v2 v2.0.0-beta.2 // indirect
-	github.com/pelletier/go-toml/v2 v2.0.8 // indirect
-	github.com/pierrec/lz4/v4 v4.1.15 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
+	github.com/montanaflynn/stats v0.7.1 // indirect
+	github.com/mozillazg/go-httpheader v0.4.0 // indirect
+	github.com/ncruces/go-strftime v0.1.9 // indirect
+	github.com/nwaples/rardecode/v2 v2.0.1 // indirect
+	github.com/otiai10/mint v1.6.3 // indirect
+	github.com/pelletier/go-toml/v2 v2.2.3 // indirect
+	github.com/pierrec/lz4/v4 v4.1.22 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+	github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
 	github.com/richardlehane/mscfb v1.0.4 // indirect
-	github.com/richardlehane/msoleps v1.0.3 // indirect
+	github.com/richardlehane/msoleps v1.0.4 // indirect
+	github.com/rs/xid v1.6.0 // indirect
+	github.com/sagikazarmark/locafero v0.7.0 // indirect
+	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
 	github.com/shoenig/go-m1cpu v0.1.6 // indirect
-	github.com/spf13/afero v1.9.5 // indirect
-	github.com/spf13/cast v1.5.1 // indirect
-	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+	github.com/sorairolake/lzip-go v0.3.5 // indirect
+	github.com/sourcegraph/conc v0.3.0 // indirect
+	github.com/spf13/afero v1.12.0 // indirect
+	github.com/spf13/cast v1.7.1 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/subosito/gotenv v1.4.2 // indirect
+	github.com/subosito/gotenv v1.6.0 // indirect
 	github.com/therootcompany/xz v1.0.1 // indirect
-	github.com/tklauser/go-sysconf v0.3.11 // indirect
-	github.com/tklauser/numcpus v0.6.0 // indirect
+	github.com/tklauser/go-sysconf v0.3.14 // indirect
+	github.com/tklauser/numcpus v0.9.0 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
-	github.com/ugorji/go/codec v1.2.11 // indirect
-	github.com/ulikunitz/xz v0.5.10 // indirect
+	github.com/ugorji/go/codec v1.2.12 // indirect
+	github.com/ulikunitz/xz v0.5.12 // indirect
 	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
 	github.com/xdg-go/scram v1.1.2 // indirect
 	github.com/xdg-go/stringprep v1.0.4 // indirect
-	github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
-	github.com/xuri/efp v0.0.0-20230802181842-ad255f2331ca // indirect
-	github.com/xuri/nfp v0.0.0-20230819163627-dc951e3ffe1a // indirect
-	github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
-	github.com/yusufpapurcu/wmi v1.2.3 // indirect
-	go.uber.org/atomic v1.9.0 // indirect
-	go.uber.org/multierr v1.8.0 // indirect
-	go4.org v0.0.0-20200411211856-f5505b9728dd // indirect
-	golang.org/x/arch v0.3.0 // indirect
-	golang.org/x/image v0.15.0 // indirect
-	golang.org/x/mod v0.14.0 // indirect
-	golang.org/x/net v0.21.0 // indirect
-	golang.org/x/sys v0.19.0 // indirect
-	golang.org/x/time v0.1.0 // indirect
-	golang.org/x/tools v0.17.0 // indirect
-	google.golang.org/protobuf v1.33.0 // indirect
+	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
+	github.com/xuri/efp v0.0.0-20241211021726-c4e992084aa6 // indirect
+	github.com/xuri/nfp v0.0.0-20250111060730-82a408b9aa71 // indirect
+	github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
+	github.com/yusufpapurcu/wmi v1.2.4 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
+	go4.org v0.0.0-20230225012048-214862532bf5 // indirect
+	golang.org/x/arch v0.13.0 // indirect
+	golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 // indirect
+	golang.org/x/image v0.23.0 // indirect
+	golang.org/x/mod v0.22.0 // indirect
+	golang.org/x/net v0.34.0 // indirect
+	golang.org/x/sys v0.29.0 // indirect
+	golang.org/x/time v0.9.0 // indirect
+	golang.org/x/tools v0.29.0 // indirect
+	google.golang.org/protobuf v1.36.3 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	gorm.io/hints v1.1.0 // indirect
-	gorm.io/plugin/dbresolver v1.5.0 // indirect
-	modernc.org/libc v1.24.1 // indirect
-	modernc.org/mathutil v1.5.0 // indirect
-	modernc.org/memory v1.6.0 // indirect
-	modernc.org/sqlite v1.23.0 // indirect
+	gorm.io/hints v1.1.2 // indirect
+	gorm.io/plugin/dbresolver v1.5.3 // indirect
+	modernc.org/fileutil v1.3.0 // indirect
+	modernc.org/libc v1.61.9 // indirect
+	modernc.org/mathutil v1.7.1 // indirect
+	modernc.org/memory v1.8.2 // indirect
+	modernc.org/sqlite v1.34.5 // indirect
 )
@@ -18,7 +18,7 @@ func init() {
 	system.RegisterInit(initOrderEnsureTables, &ensureTables{})
 }

-func (ensureTables) InitializerName() string {
+func (e *ensureTables) InitializerName() string {
 	return "ensure_tables_created"
 }
 func (e *ensureTables) InitializeData(ctx context.Context) (next context.Context, err error) {
@@ -51,6 +51,7 @@ func (e *ensureTables) MigrateTable(ctx context.Context) (context.Context, error
 		sysModel.SysExportTemplate{},
 		sysModel.Condition{},
 		sysModel.JoinTemplate{},
+		sysModel.SysParams{},

 		adapter.CasbinRule{},

@@ -55,11 +55,13 @@ func RegisterTables() {
 		system.SysExportTemplate{},
 		system.Condition{},
 		system.JoinTemplate{},
+		system.SysParams{},

 		example.ExaFile{},
 		example.ExaCustomer{},
 		example.ExaFileChunk{},
 		example.ExaFileUploadAndDownload{},
+		example.ExaAttachmentCategory{},
 	)
 	if err != nil {
 		global.GVA_LOG.Error("register table failed", zap.Error(err))
@@ -1,3 +1,5 @@
+package initialize
+
 /*
 * @Author: 逆光飞翔 191180776@qq.com
 * @Date: 2022-12-08 17:25:49
@@ -6,7 +8,6 @@
 * @FilePath: \server\initialize\gorm_mssql.go
 * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 */
-package initialize

 import (
 	"github.com/flipped-aurora/gin-vue-admin/server/config"
@@ -44,8 +45,8 @@ func GormMssqlByConfig(m config.Mssql) *gorm.DB {
 		return nil
 	}
 	mssqlConfig := sqlserver.Config{
-		DSN:                       m.Dsn(), // DSN data source name
-		DefaultStringSize:         191,     // string 类型字段的默认长度
+		DSN:               m.Dsn(), // DSN data source name
+		DefaultStringSize: 191,     // string 类型字段的默认长度
 	}
 	if db, err := gorm.Open(sqlserver.New(mssqlConfig), internal.Gorm.Config(m.Prefix, m.Singular)); err != nil {
 		panic(err)
@@ -6,8 +6,6 @@ import (
 	"gorm.io/gorm"
 	"gorm.io/gorm/logger"
 	"gorm.io/gorm/schema"
-	"log"
-	"os"
 	"time"
 )

@@ -34,7 +32,7 @@ func (g *_gorm) Config(prefix string, singular bool) *gorm.Config {
 		general = global.GVA_CONFIG.Mysql.GeneralDB
 	}
 	return &gorm.Config{
-		Logger: logger.New(NewWriter(general, log.New(os.Stdout, "\r\n", log.LstdFlags)), logger.Config{
+		Logger: logger.New(NewWriter(general), logger.Config{
 			SlowThreshold: 200 * time.Millisecond,
 			LogLevel:      general.LogLevel(),
 			Colorful:      true,
@@ -3,7 +3,7 @@ package internal
 import (
 	"fmt"
 	"github.com/flipped-aurora/gin-vue-admin/server/config"
-	"go.uber.org/zap"
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
 	"gorm.io/gorm/logger"
 )

@@ -12,26 +12,30 @@ type Writer struct {
 	writer logger.Writer
 }

-func NewWriter(config config.GeneralDB, writer logger.Writer) *Writer {
-	return &Writer{config: config, writer: writer}
+func NewWriter(config config.GeneralDB) *Writer {
+	return &Writer{config: config}
 }

 // Printf 格式化打印日志
 func (c *Writer) Printf(message string, data ...any) {
+
+	// 当有日志时候均需要输出到控制台
+	fmt.Printf(message, data...)
+
+	// 当开启了zap的情况，会打印到日志记录
 	if c.config.LogZap {
 		switch c.config.LogLevel() {
 		case logger.Silent:
-			zap.L().Debug(fmt.Sprintf(message, data...))
+			global.GVA_LOG.Debug(fmt.Sprintf(message, data...))
 		case logger.Error:
-			zap.L().Error(fmt.Sprintf(message, data...))
+			global.GVA_LOG.Error(fmt.Sprintf(message, data...))
 		case logger.Warn:
-			zap.L().Warn(fmt.Sprintf(message, data...))
+			global.GVA_LOG.Warn(fmt.Sprintf(message, data...))
 		case logger.Info:
-			zap.L().Info(fmt.Sprintf(message, data...))
+			global.GVA_LOG.Info(fmt.Sprintf(message, data...))
 		default:
-			zap.L().Info(fmt.Sprintf(message, data...))
+			global.GVA_LOG.Info(fmt.Sprintf(message, data...))
 		}
 		return
 	}
-	c.writer.Printf(message, data...)
 }
@@ -3,14 +3,14 @@ package initialize
 import (
 	"context"

+	"github.com/flipped-aurora/gin-vue-admin/server/config"
 	"github.com/flipped-aurora/gin-vue-admin/server/global"

 	"github.com/redis/go-redis/v9"
 	"go.uber.org/zap"
 )

-func Redis() {
-	redisCfg := global.GVA_CONFIG.Redis
+func initRedisClient(redisCfg config.Redis) (redis.UniversalClient, error) {
 	var client redis.UniversalClient
 	// 使用集群模式
 	if redisCfg.UseCluster {
@@ -28,10 +28,32 @@ func Redis() {
 	}
 	pong, err := client.Ping(context.Background()).Result()
 	if err != nil {
-		global.GVA_LOG.Error("redis connect ping failed, err:", zap.Error(err))
-		panic(err)
-	} else {
-		global.GVA_LOG.Info("redis connect ping response:", zap.String("pong", pong))
-		global.GVA_REDIS = client
+		global.GVA_LOG.Error("redis connect ping failed, err:", zap.String("name", redisCfg.Name), zap.Error(err))
+		return nil, err
 	}
+
+	global.GVA_LOG.Info("redis connect ping response:", zap.String("name", redisCfg.Name), zap.String("pong", pong))
+	return client, nil
+}
+
+func Redis() {
+	redisClient, err := initRedisClient(global.GVA_CONFIG.Redis)
+	if err != nil {
+		panic(err)
+	}
+	global.GVA_REDIS = redisClient
+}
+
+func RedisList() {
+	redisMap := make(map[string]redis.UniversalClient)
+
+	for _, redisCfg := range global.GVA_CONFIG.RedisList {
+		client, err := initRedisClient(redisCfg)
+		if err != nil {
+			panic(err)
+		}
+		redisMap[redisCfg.Name] = client
+	}
+
+	global.GVA_REDISList = redisMap
 }
@@ -77,22 +77,24 @@ func Routers() *gin.Engine {
 	}

 	{
-		systemRouter.InitApiRouter(PrivateGroup, PublicGroup)       // 注册功能api路由
-		systemRouter.InitJwtRouter(PrivateGroup)                    // jwt相关路由
-		systemRouter.InitUserRouter(PrivateGroup)                   // 注册用户路由
-		systemRouter.InitMenuRouter(PrivateGroup)                   // 注册menu路由
-		systemRouter.InitSystemRouter(PrivateGroup)                 // system相关路由
-		systemRouter.InitCasbinRouter(PrivateGroup)                 // 权限相关路由
-		systemRouter.InitAutoCodeRouter(PrivateGroup, PublicGroup)  // 创建自动化代码
-		systemRouter.InitAuthorityRouter(PrivateGroup)              // 注册角色路由
-		systemRouter.InitSysDictionaryRouter(PrivateGroup)          // 字典管理
-		systemRouter.InitAutoCodeHistoryRouter(PrivateGroup)        // 自动化代码历史
-		systemRouter.InitSysOperationRecordRouter(PrivateGroup)     // 操作记录
-		systemRouter.InitSysDictionaryDetailRouter(PrivateGroup)    // 字典详情管理
-		systemRouter.InitAuthorityBtnRouterRouter(PrivateGroup)     // 按钮权限管理
-		systemRouter.InitSysExportTemplateRouter(PrivateGroup)      // 导出模板
-		exampleRouter.InitCustomerRouter(PrivateGroup)              // 客户路由
-		exampleRouter.InitFileUploadAndDownloadRouter(PrivateGroup) // 文件上传下载功能路由
+		systemRouter.InitApiRouter(PrivateGroup, PublicGroup)          // 注册功能api路由
+		systemRouter.InitJwtRouter(PrivateGroup)                       // jwt相关路由
+		systemRouter.InitUserRouter(PrivateGroup)                      // 注册用户路由
+		systemRouter.InitMenuRouter(PrivateGroup)                      // 注册menu路由
+		systemRouter.InitSystemRouter(PrivateGroup)                    // system相关路由
+		systemRouter.InitCasbinRouter(PrivateGroup)                    // 权限相关路由
+		systemRouter.InitAutoCodeRouter(PrivateGroup, PublicGroup)     // 创建自动化代码
+		systemRouter.InitAuthorityRouter(PrivateGroup)                 // 注册角色路由
+		systemRouter.InitSysDictionaryRouter(PrivateGroup)             // 字典管理
+		systemRouter.InitAutoCodeHistoryRouter(PrivateGroup)           // 自动化代码历史
+		systemRouter.InitSysOperationRecordRouter(PrivateGroup)        // 操作记录
+		systemRouter.InitSysDictionaryDetailRouter(PrivateGroup)       // 字典详情管理
+		systemRouter.InitAuthorityBtnRouterRouter(PrivateGroup)        // 按钮权限管理
+		systemRouter.InitSysExportTemplateRouter(PrivateGroup)         // 导出模板
+		systemRouter.InitSysParamsRouter(PrivateGroup, PublicGroup)    // 参数管理
+		exampleRouter.InitCustomerRouter(PrivateGroup)                 // 客户路由
+		exampleRouter.InitFileUploadAndDownloadRouter(PrivateGroup)    // 文件上传下载功能路由
+		exampleRouter.InitAttachmentCategoryRouterRouter(PrivateGroup) // 文件上传下载分类

 	}

@@ -1,12 +1,11 @@
 package main

 import (
-	_ "go.uber.org/automaxprocs"
-	"go.uber.org/zap"
-
 	"github.com/flipped-aurora/gin-vue-admin/server/core"
 	"github.com/flipped-aurora/gin-vue-admin/server/global"
 	"github.com/flipped-aurora/gin-vue-admin/server/initialize"
+	_ "go.uber.org/automaxprocs"
+	"go.uber.org/zap"
 )

 //go:generate go env -w GO111MODULE=on
@@ -14,8 +13,15 @@ import (
 //go:generate go mod tidy
 //go:generate go mod download

+// 这部分 @Tag 设置用于排序, 需要排序的接口请按照下面的格式添加
+// swag init 对 @Tag 只会从入口文件解析, 默认 main.go
+// 也可通过 --generalInfo flag 指定其他文件
+// @Tag.Name        Base
+// @Tag.Name        SysUser
+// @Tag.Description 用户
+
 // @title                       Gin-Vue-Admin Swagger API接口文档
-// @version                     v2.7.1
+// @version                     v2.7.9
 // @description                 使用gin+vue进行极速开发的全栈开发基础平台
 // @securityDefinitions.apikey  ApiKeyAuth
 // @in                          header
@@ -3,16 +3,13 @@ package middleware
 import (
 	"errors"
 	"github.com/flipped-aurora/gin-vue-admin/server/global"
-	"github.com/flipped-aurora/gin-vue-admin/server/model/system"
 	"github.com/flipped-aurora/gin-vue-admin/server/utils"
-	"github.com/golang-jwt/jwt/v4"
-	"go.uber.org/zap"
+	"github.com/golang-jwt/jwt/v5"
 	"strconv"
 	"time"

 	"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
 	"github.com/flipped-aurora/gin-vue-admin/server/service"
-
 	"github.com/gin-gonic/gin"
 )

@@ -67,13 +64,7 @@ func JWTAuth() gin.HandlerFunc {
 			c.Header("new-expires-at", strconv.FormatInt(newClaims.ExpiresAt.Unix(), 10))
 			utils.SetToken(c, newToken, int(dr.Seconds()))
 			if global.GVA_CONFIG.System.UseMultipoint {
-				RedisJwtToken, err := jwtService.GetRedisJWT(newClaims.Username)
-				if err != nil {
-					global.GVA_LOG.Error("get redis jwt failed", zap.Error(err))
-				} else { // 当之前的取成功时才进行拉黑操作
-					_ = jwtService.JsonInBlacklist(system.JwtBlacklist{Jwt: RedisJwtToken})
-				}
-				// 无论如何都要记录当前的活跃状态
+				// 记录新的活跃jwt
 				_ = jwtService.SetRedisJWT(newToken, newClaims.Username)
 			}
 		}
@@ -27,7 +27,7 @@ type LimitConfig struct {
 func (l LimitConfig) LimitWithTime() gin.HandlerFunc {
 	return func(c *gin.Context) {
 		if err := l.CheckOrMark(l.GenerationKey(c), l.Expire, l.Limit); err != nil {
-			c.JSON(http.StatusOK, gin.H{"code": response.ERROR, "msg": err})
+			c.JSON(http.StatusOK, gin.H{"code": response.ERROR, "msg": err.Error()})
 			c.Abort()
 			return
 		} else {
@@ -0,0 +1,43 @@
+package common
+
+import (
+	"database/sql/driver"
+	"encoding/json"
+	"errors"
+)
+
+type JSONMap map[string]interface{}
+
+func (m JSONMap) Value() (driver.Value, error) {
+	if m == nil {
+		return nil, nil
+	}
+	return json.Marshal(m)
+}
+
+func (m *JSONMap) Scan(value interface{}) error {
+	if value == nil {
+		*m = make(map[string]interface{})
+		return nil
+	}
+	var err error
+	switch value.(type) {
+	case []byte:
+		err = json.Unmarshal(value.([]byte), m)
+	case string:
+		err = json.Unmarshal([]byte(value.(string)), m)
+	default:
+		err = errors.New("basetypes.JSONMap.Scan: invalid value type")
+	}
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+type TreeNode[T any] interface {
+	GetChildren() []T
+	SetChildren(children T)
+	GetID() int
+	GetParentID() int
+}
@@ -0,0 +1,16 @@
+package example
+
+import (
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
+)
+
+type ExaAttachmentCategory struct {
+	global.GVA_MODEL
+	Name     string                   `json:"name" form:"name" gorm:"default:null;type:varchar(255);column:name;comment:分类名称;"`
+	Pid      uint                     `json:"pid" form:"pid" gorm:"default:0;type:int;column:pid;comment:父节点ID;"`
+	Children []*ExaAttachmentCategory `json:"children" gorm:"-"`
+}
+
+func (ExaAttachmentCategory) TableName() string {
+	return "exa_attachment_category"
+}
@@ -6,10 +6,11 @@ import (

 type ExaFileUploadAndDownload struct {
 	global.GVA_MODEL
-	Name string `json:"name" gorm:"comment:文件名"` // 文件名
-	Url  string `json:"url" gorm:"comment:文件地址"` // 文件地址
-	Tag  string `json:"tag" gorm:"comment:文件标签"` // 文件标签
-	Key  string `json:"key" gorm:"comment:编号"`   // 编号
+	Name    string `json:"name" form:"name" gorm:"column:name;comment:文件名"`                                // 文件名
+	ClassId int    `json:"classId" form:"classId" gorm:"default:0;type:int;column:class_id;comment:分类id;"` // 分类id
+	Url     string `json:"url" form:"url" gorm:"column:url;comment:文件地址"`                                  // 文件地址
+	Tag     string `json:"tag" form:"tag" gorm:"column:tag;comment:文件标签"`                                  // 文件标签
+	Key     string `json:"key" form:"key" gorm:"column:key;comment:编号"`                                    // 编号
 }

 func (ExaFileUploadAndDownload) TableName() string {
@@ -0,0 +1,10 @@
+package request
+
+import (
+	"github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
+)
+
+type ExaAttachmentCategorySearch struct {
+	ClassId int `json:"classId" form:"classId"`
+	request.PageInfo
+}
@@ -1,11 +1,11 @@
 package request

 import (
-	"github.com/gofrs/uuid/v5"
-	jwt "github.com/golang-jwt/jwt/v4"
+	jwt "github.com/golang-jwt/jwt/v5"
+	"github.com/google/uuid"
 )

-// Custom claims structure
+// CustomClaims structure
 type CustomClaims struct {
 	BaseClaims
 	BufferTime int64
@@ -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"
@@ -24,9 +25,16 @@ type AutoCode struct {
 	AutoCreateResource  bool                   `json:"autoCreateResource" example:"false"`  // 是否自动创建资源标识
 	AutoCreateApiToSql  bool                   `json:"autoCreateApiToSql" example:"false"`  // 是否自动创建api
 	AutoCreateMenuToSql bool                   `json:"autoCreateMenuToSql" example:"false"` // 是否自动创建menu
+	AutoCreateBtnAuth   bool                   `json:"autoCreateBtnAuth" example:"false"`   // 是否自动创建按钮权限
+	OnlyTemplate        bool                   `json:"onlyTemplate" example:"false"`        // 是否只生成模板
+	IsTree              bool                   `json:"isTree" example:"false"`              // 是否树形结构
+	TreeJson            string                 `json:"treeJson" example:"展示的树json字段"`       // 展示的树json字段
+	IsAdd               bool                   `json:"isAdd" example:"false"`               // 是否新增
 	Fields              []*AutoCodeField       `json:"fields"`
+	GenerateWeb         bool                   `json:"generateWeb" example:"true"`    // 是否生成web
+	GenerateServer      bool                   `json:"generateServer" example:"true"` // 是否生成server
+	Module              string                 `json:"-"`
 	DictTypes           []string               `json:"-"`
-	FrontFields         []*AutoCodeField       `json:"-"`
 	PrimaryField        *AutoCodeField         `json:"primaryField"`
 	DataSourceMap       map[string]*DataSource `json:"-"`
 	HasPic              bool                   `json:"-"`
@@ -37,13 +45,17 @@ type AutoCode struct {
 	HasRichText         bool                   `json:"-"`
 	HasDataSource       bool                   `json:"-"`
 	HasSearchTimer      bool                   `json:"-"`
+	HasArray            bool                   `json:"-"`
+	HasExcel            bool                   `json:"-"`
 }

 type DataSource struct {
-	Table       string `json:"table"`
-	Label       string `json:"label"`
-	Value       string `json:"value"`
-	Association int    `json:"association"` // 关联关系 1 一对一 2 一对多
+	DBName       string `json:"dbName"`
+	Table        string `json:"table"`
+	Label        string `json:"label"`
+	Value        string `json:"value"`
+	Association  int    `json:"association"` // 关联关系 1 一对一 2 一对多
+	HasDeletedAt bool   `json:"hasDeletedAt"`
 }

 func (r *AutoCode) Apis() []model.SysApi {
@@ -106,6 +118,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 关键字处理
@@ -114,18 +127,17 @@ func (r *AutoCode) Pretreatment() error {
 	} // test
 	length := len(r.Fields)
 	dict := make(map[string]string, length)
-	r.FrontFields = make([]*AutoCodeField, 0, length)
 	r.DataSourceMap = make(map[string]*DataSource, length)
 	for i := 0; i < length; i++ {
+		if r.Fields[i].Excel {
+			r.HasExcel = true
+		}
 		if r.Fields[i].DictType != "" {
 			dict[r.Fields[i].DictType] = ""
 		}
 		if r.Fields[i].Sort {
 			r.NeedSort = true
 		}
-		if r.Fields[i].Front {
-			r.FrontFields = append(r.FrontFields, r.Fields[i])
-		}
 		switch r.Fields[i].FieldType {
 		case "file":
 			r.HasFile = true
@@ -134,6 +146,7 @@ func (r *AutoCode) Pretreatment() error {
 			r.NeedJSON = true
 		case "array":
 			r.NeedJSON = true
+			r.HasArray = true
 		case "video":
 			r.HasPic = true
 		case "richtext":
@@ -178,6 +191,11 @@ func (r *AutoCode) Pretreatment() error {
 			}
 		}
 	} // GvaModel
+	{
+		if r.IsAdd && r.PrimaryField == nil {
+			r.PrimaryField = new(AutoCodeField)
+		}
+	} // 新增字段模式下不关注主键
 	if r.Package == "" {
 		return errors.New("Package为空!")
 	} // 增加判断：Package不为空
@@ -204,17 +222,21 @@ func (r *AutoCode) History() SysAutoHistoryCreate {
 }

 type AutoCodeField struct {
-	FieldName       string      `json:"fieldName"`       // Field名
-	FieldDesc       string      `json:"fieldDesc"`       // 中文名
-	FieldType       string      `json:"fieldType"`       // Field数据类型
-	FieldJson       string      `json:"fieldJson"`       // FieldJson
-	DataTypeLong    string      `json:"dataTypeLong"`    // 数据库字段长度
-	Comment         string      `json:"comment"`         // 数据库字段描述
-	ColumnName      string      `json:"columnName"`      // 数据库字段
-	FieldSearchType string      `json:"fieldSearchType"` // 搜索条件
-	FieldSearchHide bool        `json:"fieldSearchHide"` // 是否隐藏查询条件
-	DictType        string      `json:"dictType"`        // 字典
-	Front           bool        `json:"front"`           // 是否前端可见
+	FieldName       string `json:"fieldName"`       // Field名
+	FieldDesc       string `json:"fieldDesc"`       // 中文名
+	FieldType       string `json:"fieldType"`       // Field数据类型
+	FieldJson       string `json:"fieldJson"`       // FieldJson
+	DataTypeLong    string `json:"dataTypeLong"`    // 数据库字段长度
+	Comment         string `json:"comment"`         // 数据库字段描述
+	ColumnName      string `json:"columnName"`      // 数据库字段
+	FieldSearchType string `json:"fieldSearchType"` // 搜索条件
+	FieldSearchHide bool   `json:"fieldSearchHide"` // 是否隐藏查询条件
+	DictType        string `json:"dictType"`        // 字典
+	//Front           bool        `json:"front"`           // 是否前端可见
+	Form            bool        `json:"form"`            // 是否前端新建/编辑
+	Table           bool        `json:"table"`           // 是否前端表格列
+	Desc            bool        `json:"desc"`            // 是否前端详情
+	Excel           bool        `json:"excel"`           // 是否导入/导出
 	Require         bool        `json:"require"`         // 是否必填
 	DefaultValue    string      `json:"defaultValue"`    // 是否必填
 	ErrorText       string      `json:"errorText"`       // 校验失败文字
@@ -230,6 +252,7 @@ type AutoFunc struct {
 	Package         string `json:"package"`
 	FuncName        string `json:"funcName"`        // 方法名称
 	Router          string `json:"router"`          // 路由名称
+	FuncDesc        string `json:"funcDesc"`        // 方法介绍
 	BusinessDB      string `json:"businessDB"`      // 业务库
 	StructName      string `json:"structName"`      // Struct名称
 	PackageName     string `json:"packageName"`     // 文件名称
@@ -238,4 +261,26 @@ type AutoFunc struct {
 	HumpPackageName string `json:"humpPackageName"` // go文件名称
 	Method          string `json:"method"`          // 方法
 	IsPlugin        bool   `json:"isPlugin"`        // 是否插件
+	IsAuth          bool   `json:"isAuth"`          // 是否鉴权
+	IsPreview       bool   `json:"isPreview"`       // 是否预览
+	IsAi            bool   `json:"isAi"`            // 是否AI
+	ApiFunc         string `json:"apiFunc"`         // API方法
+	ServerFunc      string `json:"serverFunc"`      // 服务方法
+	JsFunc          string `json:"jsFunc"`          // JS方法
+}
+
+type InitMenu struct {
+	PlugName   string `json:"plugName"`
+	ParentMenu string `json:"parentMenu"`
+	Menus      []uint `json:"menus"`
+}
+
+type InitApi struct {
+	PlugName string `json:"plugName"`
+	APIs     []uint `json:"apis"`
+}
+
+type LLMAutoCode struct {
+	Prompt string `json:"prompt" form:"prompt" gorm:"column:prompt;comment:提示语;type:text;"` //提示语
+	Mode   string `json:"mode" form:"mode" gorm:"column:mode;comment:模式;type:text;"`        //模式
 }
@@ -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,
 	}
 }
@@ -6,30 +6,33 @@ import (
 )

 type SysAutoHistoryCreate struct {
-	Table       string            // 表名
-	Package     string            // 模块名/插件名
-	Request     string            // 前端传入的结构化信息
-	StructName  string            // 结构体名称
-	BusinessDB  string            // 业务库
-	Description string            // Struct中文名称
-	Injections  map[string]string // 注入路径
-	Templates   map[string]string // 模板信息
-	ApiIDs      []uint            // api表注册内容
-	MenuID      uint              // 菜单ID
+	Table            string            // 表名
+	Package          string            // 模块名/插件名
+	Request          string            // 前端传入的结构化信息
+	StructName       string            // 结构体名称
+	BusinessDB       string            // 业务库
+	Description      string            // Struct中文名称
+	Injections       map[string]string // 注入路径
+	Templates        map[string]string // 模板信息
+	ApiIDs           []uint            // api表注册内容
+	MenuID           uint              // 菜单ID
+	ExportTemplateID uint              // 导出模板ID
 }

 func (r *SysAutoHistoryCreate) Create() model.SysAutoCodeHistory {
 	entity := model.SysAutoCodeHistory{
-		Package:     r.Package,
-		Request:     r.Request,
-		Table:       r.Table,
-		StructName:  r.StructName,
-		BusinessDB:  r.BusinessDB,
-		Description: r.Description,
-		Injections:  r.Injections,
-		Templates:   r.Templates,
-		ApiIDs:      r.ApiIDs,
-		MenuID:      r.MenuID,
+		Package:          r.Package,
+		Request:          r.Request,
+		Table:            r.Table,
+		StructName:       r.StructName,
+		Abbreviation:     r.StructName,
+		BusinessDB:       r.BusinessDB,
+		Description:      r.Description,
+		Injections:       r.Injections,
+		Templates:        r.Templates,
+		ApiIDs:           r.ApiIDs,
+		MenuID:           r.MenuID,
+		ExportTemplateID: r.ExportTemplateID,
 	}
 	if entity.Table == "" {
 		entity.Table = r.StructName
@@ -1,12 +1,12 @@
 package request

-// Casbin info structure
+// CasbinInfo Casbin info structure
 type CasbinInfo struct {
 	Path   string `json:"path"`   // 路径
 	Method string `json:"method"` // 方法
 }

-// Casbin structure for input parameters
+// CasbinInReceive Casbin structure for input parameters
 type CasbinInReceive struct {
 	AuthorityId uint         `json:"authorityId"` // 权限id
 	CasbinInfos []CasbinInfo `json:"casbinInfos"`
@@ -17,10 +17,11 @@ func DefaultCasbin() []CasbinInfo {
 		{Path: "/menu/getMenu", Method: "POST"},
 		{Path: "/jwt/jsonInBlacklist", Method: "POST"},
 		{Path: "/base/login", Method: "POST"},
-		{Path: "/user/admin_register", Method: "POST"},
 		{Path: "/user/changePassword", Method: "POST"},
 		{Path: "/user/setUserAuthority", Method: "POST"},
-		{Path: "/user/setUserInfo", Method: "PUT"},
 		{Path: "/user/getUserInfo", Method: "GET"},
+		{Path: "/user/setSelfInfo", Method: "PUT"},
+		{Path: "/fileUploadAndDownload/upload", Method: "POST"},
+		{Path: "/sysDictionary/findSysDictionary", Method: "GET"},
 	}
 }
@@ -15,6 +15,7 @@ type InitDB struct {
 	Password      string `json:"password"`                  // 数据库密码
 	DBName        string `json:"dbName" binding:"required"` // 数据库名
 	DBPath        string `json:"dbPath"`                    // sqlite数据库文件路径
+	Template      string `json:"template"`                  // postgresql指定template
 }

 // MysqlEmptyDsn msyql 空数据库 建库链接
@@ -5,7 +5,7 @@ import (
 	"github.com/flipped-aurora/gin-vue-admin/server/model/system"
 )

-// Add menu authority info structure
+// AddMenuAuthorityInfo Add menu authority info structure
 type AddMenuAuthorityInfo struct {
 	Menus       []system.SysBaseMenu `json:"menus"`
 	AuthorityId uint                 `json:"authorityId"` // 角色ID
@@ -0,0 +1,14 @@
+package request
+
+import (
+	"github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
+	"time"
+)
+
+type SysParamsSearch struct {
+	StartCreatedAt *time.Time `json:"startCreatedAt" form:"startCreatedAt"`
+	EndCreatedAt   *time.Time `json:"endCreatedAt" form:"endCreatedAt"`
+	Name           string     `json:"name" form:"name" `
+	Key            string     `json:"key" form:"key" `
+	request.PageInfo
+}
@@ -1,6 +1,7 @@
 package request

 import (
+	common "github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
 	"github.com/flipped-aurora/gin-vue-admin/server/model/system"
 )

@@ -17,7 +18,7 @@ type Register struct {
 	Email        string `json:"email" example:"电子邮箱"`
 }

-// User login structure
+// Login User login structure
 type Login struct {
 	Username  string `json:"username"`  // 用户名
 	Password  string `json:"password"`  // 密码
@@ -25,19 +26,19 @@ type Login struct {
 	CaptchaId string `json:"captchaId"` // 验证码ID
 }

-// Modify password structure
+// ChangePasswordReq Modify password structure
 type ChangePasswordReq struct {
 	ID          uint   `json:"-"`           // 从 JWT 中提取 user id，避免越权
 	Password    string `json:"password"`    // 密码
 	NewPassword string `json:"newPassword"` // 新密码
 }

-// Modify  user's auth structure
+// SetUserAuth Modify user's auth structure
 type SetUserAuth struct {
 	AuthorityId uint `json:"authorityId"` // 角色ID
 }

-// Modify  user's auth structure
+// SetUserAuthorities Modify user's auth structure
 type SetUserAuthorities struct {
 	ID           uint
 	AuthorityIds []uint `json:"authorityIds"` // 角色ID
@@ -54,3 +55,11 @@ type ChangeUserInfo struct {
 	Enable       int                   `json:"enable" gorm:"comment:冻结用户"`                                                           //冻结用户
 	Authorities  []system.SysAuthority `json:"-" gorm:"many2many:sys_user_authority;"`
 }
+
+type GetUserList struct {
+	common.PageInfo
+	Username string `json:"username" form:"username"`
+	NickName string `json:"nickName" form:"nickName"`
+	Phone    string `json:"phone" form:"phone"`
+	Email    string `json:"email" form:"email"`
+}
@@ -12,19 +12,21 @@ import (
 // SysAutoCodeHistory 自动迁移代码记录,用于回滚,重放使用
 type SysAutoCodeHistory struct {
 	global.GVA_MODEL
-	Table           string             `json:"tableName" gorm:"column:table_name;comment:表名"`
-	Package         string             `json:"package" gorm:"column:package;comment:模块名/插件名"`
-	Request         string             `json:"request" gorm:"type:text;column:request;comment:前端传入的结构化信息"`
-	StructName      string             `json:"structName" gorm:"column:struct_name;comment:结构体名称"`
-	BusinessDB      string             `json:"businessDb" gorm:"column:business_db;comment:业务库"`
-	Description     string             `json:"description" gorm:"column:description;comment:Struct中文名称"`
-	Templates       map[string]string  `json:"template" gorm:"serializer:json;type:text;column:templates;comment:模板信息"`
-	Injections      map[string]string  `json:"injections" gorm:"serializer:json;type:text;column:Injections;comment:注入路径"`
-	Flag            int                `json:"flag" gorm:"column:flag;comment:[0:创建,1:回滚]"`
-	ApiIDs          []uint             `json:"apiIDs" gorm:"serializer:json;column:api_ids;comment:api表注册内容"`
-	MenuID          uint               `json:"menuId" gorm:"column:menu_id;comment:菜单ID"`
-	AutoCodePackage SysAutoCodePackage `json:"autoCodePackage" gorm:"foreignKey:ID;references:PackageID"`
-	PackageID       uint               `json:"packageID" gorm:"column:package_id;comment:包ID"`
+	Table            string             `json:"tableName" gorm:"column:table_name;comment:表名"`
+	Package          string             `json:"package" gorm:"column:package;comment:模块名/插件名"`
+	Request          string             `json:"request" gorm:"type:text;column:request;comment:前端传入的结构化信息"`
+	StructName       string             `json:"structName" gorm:"column:struct_name;comment:结构体名称"`
+	Abbreviation     string             `json:"abbreviation" gorm:"column:abbreviation;comment:结构体名称缩写"`
+	BusinessDB       string             `json:"businessDb" gorm:"column:business_db;comment:业务库"`
+	Description      string             `json:"description" gorm:"column:description;comment:Struct中文名称"`
+	Templates        map[string]string  `json:"template" gorm:"serializer:json;type:text;column:templates;comment:模板信息"`
+	Injections       map[string]string  `json:"injections" gorm:"serializer:json;type:text;column:Injections;comment:注入路径"`
+	Flag             int                `json:"flag" gorm:"column:flag;comment:[0:创建,1:回滚]"`
+	ApiIDs           []uint             `json:"apiIDs" gorm:"serializer:json;column:api_ids;comment:api表注册内容"`
+	MenuID           uint               `json:"menuId" gorm:"column:menu_id;comment:菜单ID"`
+	ExportTemplateID uint               `json:"exportTemplateID" gorm:"column:export_template_id;comment:导出模板ID"`
+	AutoCodePackage  SysAutoCodePackage `json:"autoCodePackage" gorm:"foreignKey:ID;references:PackageID"`
+	PackageID        uint               `json:"packageID" gorm:"column:package_id;comment:包ID"`
 }

 func (s *SysAutoCodeHistory) BeforeCreate(db *gorm.DB) error {
@@ -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 {
@@ -0,0 +1,20 @@
+// 自动生成模板SysParams
+package system
+
+import (
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
+)
+
+// 参数 结构体  SysParams
+type SysParams struct {
+	global.GVA_MODEL
+	Name  string `json:"name" form:"name" gorm:"column:name;comment:参数名称;" binding:"required"`   //参数名称
+	Key   string `json:"key" form:"key" gorm:"column:key;comment:参数键;" binding:"required"`       //参数键
+	Value string `json:"value" form:"value" gorm:"column:value;comment:参数值;" binding:"required"` //参数值
+	Desc  string `json:"desc" form:"desc" gorm:"column:desc;comment:参数说明;"`                      //参数说明
+}
+
+// TableName 参数 SysParams自定义表名 sys_params
+func (SysParams) TableName() string {
+	return "sys_params"
+}
@@ -2,7 +2,8 @@ package system

 import (
 	"github.com/flipped-aurora/gin-vue-admin/server/global"
-	"github.com/gofrs/uuid/v5"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/common"
+	"github.com/google/uuid"
 )

 type Login interface {
@@ -18,19 +19,18 @@ var _ Login = new(SysUser)

 type SysUser struct {
 	global.GVA_MODEL
-	UUID        uuid.UUID      `json:"uuid" gorm:"index;comment:用户UUID"`                                                     // 用户UUID
-	Username    string         `json:"userName" gorm:"index;comment:用户登录名"`                                                  // 用户登录名
-	Password    string         `json:"-"  gorm:"comment:用户登录密码"`                                                             // 用户登录密码
-	NickName    string         `json:"nickName" gorm:"default:系统用户;comment:用户昵称"`                                            // 用户昵称
-	SideMode    string         `json:"sideMode" gorm:"default:dark;comment:用户侧边主题"`                                          // 用户侧边主题
-	HeaderImg   string         `json:"headerImg" gorm:"default:https://qmplusimg.henrongyi.top/gva_header.jpg;comment:用户头像"` // 用户头像
-	BaseColor   string         `json:"baseColor" gorm:"default:#fff;comment:基础颜色"`                                           // 基础颜色
-	AuthorityId uint           `json:"authorityId" gorm:"default:888;comment:用户角色ID"`                                        // 用户角色ID
-	Authority   SysAuthority   `json:"authority" gorm:"foreignKey:AuthorityId;references:AuthorityId;comment:用户角色"`
-	Authorities []SysAuthority `json:"authorities" gorm:"many2many:sys_user_authority;"`
-	Phone       string         `json:"phone"  gorm:"comment:用户手机号"`                     // 用户手机号
-	Email       string         `json:"email"  gorm:"comment:用户邮箱"`                      // 用户邮箱
-	Enable      int            `json:"enable" gorm:"default:1;comment:用户是否被冻结 1正常 2冻结"` //用户是否被冻结 1正常 2冻结
+	UUID          uuid.UUID      `json:"uuid" gorm:"index;comment:用户UUID"`                                                                   // 用户UUID
+	Username      string         `json:"userName" gorm:"index;comment:用户登录名"`                                                                // 用户登录名
+	Password      string         `json:"-"  gorm:"comment:用户登录密码"`                                                                           // 用户登录密码
+	NickName      string         `json:"nickName" gorm:"default:系统用户;comment:用户昵称"`                                                          // 用户昵称
+	HeaderImg     string         `json:"headerImg" gorm:"default:https://qmplusimg.henrongyi.top/gva_header.jpg;comment:用户头像"`               // 用户头像
+	AuthorityId   uint           `json:"authorityId" gorm:"default:888;comment:用户角色ID"`                                                      // 用户角色ID
+	Authority     SysAuthority   `json:"authority" gorm:"foreignKey:AuthorityId;references:AuthorityId;comment:用户角色"`                        // 用户角色
+	Authorities   []SysAuthority `json:"authorities" gorm:"many2many:sys_user_authority;"`                                                   // 多用户角色
+	Phone         string         `json:"phone"  gorm:"comment:用户手机号"`                                                                        // 用户手机号
+	Email         string         `json:"email"  gorm:"comment:用户邮箱"`                                                                         // 用户邮箱
+	Enable        int            `json:"enable" gorm:"default:1;comment:用户是否被冻结 1正常 2冻结"`                                                    //用户是否被冻结 1正常 2冻结
+	OriginSetting common.JSONMap `json:"originSetting" form:"originSetting" gorm:"type:text;default:null;column:origin_setting;comment:配置;"` //配置
 }

 func (SysUser) TableName() string {
@@ -1,4 +0,0 @@
-//go:build !packfile
-// +build !packfile
-
-package packfile
@@ -1,45 +0,0 @@
-//go:build packfile
-// +build packfile
-
-package packfile
-
-import (
-	"fmt"
-	"os"
-	"path/filepath"
-	"strings"
-)
-
-//go:generate go-bindata -o=staticFile.go -pkg=packfile -tags=packfile ../resource/... ../config.yaml
-
-func writeFile(path string, data []byte) {
-	// 如果文件夹不存在，预先创建文件夹
-	if lastSeparator := strings.LastIndex(path, "/"); lastSeparator != -1 {
-		dirPath := path[:lastSeparator]
-		if _, err := os.Stat(dirPath); err != nil && os.IsNotExist(err) {
-			os.MkdirAll(dirPath, os.ModePerm)
-		}
-	}
-
-	// 已存在的文件，不应该覆盖重写，可能在前端更改了配置文件等
-	if _, err := os.Stat(path); os.IsNotExist(err) {
-		if err2 := os.WriteFile(path, data, os.ModePerm); err2 != nil {
-			fmt.Printf("Write file failed: %s\n", path)
-		}
-	} else {
-		fmt.Printf("File exist, skip: %s\n", path)
-	}
-}
-
-func init() {
-	for key := range _bindata {
-		filePath, _ := filepath.Abs(strings.TrimPrefix(key, "."))
-		data, err := Asset(key)
-		if err != nil {
-			// Asset was not found.
-			fmt.Printf("Fail to find: %s\n", filePath)
-		} else {
-			writeFile(filePath, data)
-		}
-	}
-}
@@ -8,10 +8,10 @@ import (
 // Info 公告 结构体
 type Info struct {
 	global.GVA_MODEL
-	Title       string         `json:"title" form:"title" gorm:"column:title;comment:公告标题;"`                                             //标题
-	Content     string         `json:"content" form:"content" gorm:"column:content;comment:公告内容;type:text;"`                             //内容
-	UserID      *int           `json:"userID" form:"userID" gorm:"column:user_id;comment:发布者;"`                                          //作者
-	Attachments datatypes.JSON `json:"attachments" form:"attachments" gorm:"column:attachments;comment:相关附件;"swaggertype:"array,object"` //附件
+	Title       string         `json:"title" form:"title" gorm:"column:title;comment:公告标题;"`                                              //标题
+	Content     string         `json:"content" form:"content" gorm:"column:content;comment:公告内容;type:text;"`                              //内容
+	UserID      *int           `json:"userID" form:"userID" gorm:"column:user_id;comment:发布者;"`                                           //作者
+	Attachments datatypes.JSON `json:"attachments" form:"attachments" gorm:"column:attachments;comment:相关附件;" swaggertype:"array,object"` //附件
 }

 // TableName 公告 Info自定义表名 gva_announcements_info
@@ -1,84 +0,0 @@
-package ws
-
-import (
-	"github.com/flipped-aurora/ws/core/biz"
-	"github.com/flipped-aurora/ws/core/data"
-	"github.com/gin-gonic/gin"
-	"go.uber.org/zap"
-	"nhooyr.io/websocket"
-)
-
-type wsPlugin struct {
-	logger               *zap.Logger                       // 日志输出对象
-	manageBuf            int64                             // buffer
-	registeredMsgHandler map[int32]func(biz.IMessage) bool // 消息处理
-	checkMap             map[string]biz.CheckFunc          // 用户校验
-
-	admin     biz.IManage
-	adminCase *biz.AdminCase
-}
-
-func DefaultRegisteredMsgHandler(admin biz.IManage, logger *zap.Logger) map[int32]func(biz.IMessage) bool {
-	return map[int32]func(msg biz.IMessage) bool{
-		1: func(msg biz.IMessage) bool {
-			// w.admin 里面找到注册客户端的方法
-			client, ok := admin.FindClient(msg.GetTo())
-			if !ok {
-				logger.Info("没有找到该用户")
-				return false
-			}
-			return client.SendMes(msg)
-		},
-	}
-}
-
-func DefaultCheckMap() map[string]biz.CheckFunc {
-	return map[string]biz.CheckFunc{
-		"gva_ws": func(c interface{}) (string, bool) {
-			// 先断言是gin.content
-			cc, ok := c.(*gin.Context)
-			if !ok {
-				return "", false
-			}
-			token := cc.Query("jwt")
-			// 可以携带jwt
-			if len(token) == 0 {
-				return "", false
-			}
-			// 解析 jwt...
-
-			return token, true
-		},
-	}
-}
-
-func (w *wsPlugin) Register(g *gin.RouterGroup) {
-	// gva_ws 为身份校验函数
-	g.GET("/ws", w.adminCase.HandlerWS("gva_ws", &websocket.AcceptOptions{
-		InsecureSkipVerify: true,
-	}))
-	g.POST("/sendMsg", w.adminCase.SendMsg("gva_ws"))
-}
-
-func (w *wsPlugin) RouterPath() string {
-	return "gva_ws"
-}
-
-func GenerateWs(logger *zap.Logger, manageBuf int64, checkMap map[string]biz.CheckFunc) *wsPlugin {
-	m := data.NewManage(manageBuf)
-	t := data.NewTopic()
-	h := data.NewHandle()
-	admin := data.NewAdmin(m, t, h, logger)
-	for s, checkFunc := range checkMap {
-		admin.AddCheckFunc(s, checkFunc)
-	}
-	registeredMsgHandler := DefaultRegisteredMsgHandler(admin, logger)
-
-	for key, handler := range registeredMsgHandler {
-		admin.RegisteredMsgHandler(key, handler)
-	}
-	return &wsPlugin{
-		logger: logger, manageBuf: manageBuf,
-		registeredMsgHandler: registeredMsgHandler, checkMap: checkMap, admin: admin, adminCase: biz.NewAdmin(admin),
-	}
-}
@@ -1,10 +1,9 @@
 {{if .IsPlugin}}
-// {{.FuncName}} 等待开发的的{{.Description}}接口
+// {{.FuncName}} {{.FuncDesc}}
 // @Tags {{.StructName}}
-// @Summary 等待开发的的{{.Description}}接口
-// @accept application/json
+// @Summary {{.FuncDesc}}
+// @Accept application/json
 // @Produce application/json
-// @Param data query request.{{.StructName}}Search true "分页获取{{.Description}}列表"
 // @Success 200 {object} response.Response{data=object,msg=string} "获取成功"
 // @Router /{{.Abbreviation}}/{{.Router}} [{{.Method}}]
 func (a *{{.Abbreviation}}) {{.FuncName}}(c *gin.Context) {
@@ -20,10 +19,10 @@ func (a *{{.Abbreviation}}) {{.FuncName}}(c *gin.Context) {

 {{- else -}}

-// {{.FuncName}} 等待开发的的{{.Description}}接口
+// {{.FuncName}} {{.FuncDesc}}
 // @Tags {{.StructName}}
-// @Summary 等待开发的的{{.Description}}接口
-// @accept application/json
+// @Summary {{.FuncDesc}}
+// @Accept application/json
 // @Produce application/json
 // @Param data query {{.Package}}Req.{{.StructName}}Search true "成功"
 // @Success 200 {object} response.Response{data=object,msg=string} "成功"
@@ -38,4 +37,4 @@ func ({{.Abbreviation}}Api *{{.StructName}}Api){{.FuncName}}(c *gin.Context) {
   	}
   	response.OkWithData("返回数据",c)
 }
-{{end}}
+{{end}}
@@ -0,0 +1,32 @@
+{{if .IsPlugin}}
+// {{.FuncName}} {{.FuncDesc}}
+// @Tags {{.StructName}}
+// @Summary {{.FuncDesc}}
+// @Accept application/json
+// @Produce application/json
+// @Success 200 {object} response.Response{data=object,msg=string} "获取成功"
+// @Router /{{.Abbreviation}}/{{.Router}} [{{.Method}}]
+export const {{.Router}} = () => {
+  return service({
+    url: '/{{.Abbreviation}}/{{.Router}}',
+    method: '{{.Method}}'
+  })
+}
+
+{{- else -}}
+
+// {{.FuncName}} {{.FuncDesc}}
+// @Tags {{.StructName}}
+// @Summary {{.FuncDesc}}
+// @Accept application/json
+// @Produce application/json
+// @Success 200 {object} response.Response{data=object,msg=string} "成功"
+// @Router /{{.Abbreviation}}/{{.Router}} [{{.Method}}]
+export const {{.Router}} = () => {
+  return service({
+    url: '/{{.Abbreviation}}/{{.Router}}',
+    method: '{{.Method}}'
+  })
+}
+
+{{- end -}}
@@ -6,7 +6,7 @@
 {{- end}}
 {{if .IsPlugin}}

-// {{.FuncName}} 请实现方法
+// {{.FuncName}} {{.FuncDesc}}
 // Author [yourname](https://github.com/yourname)
 func (s *{{.Abbreviation}}) {{.FuncName}}() (err error) {
 	db := {{$db}}.Model(&model.{{.StructName}}{})
@@ -15,7 +15,7 @@ func (s *{{.Abbreviation}}) {{.FuncName}}() (err error) {

 {{- else -}}

-// {{.FuncName}} 请实现方法
+// {{.FuncName}} {{.FuncDesc}}
 // Author [yourname](https://github.com/yourname)
 func ({{.Abbreviation}}Service *{{.StructName}}Service){{.FuncName}}() (err error) {
 	// 请在这里实现自己的业务逻辑
@@ -1,24 +1,33 @@
 package {{.Package}}

 import (
-	"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"
+	{{if not .OnlyTemplate}}
+	"{{.Module}}/global"
+    "{{.Module}}/model/common/response"
+    "{{.Module}}/model/{{.Package}}"
+    {{- if not .IsTree}}
+    {{.Package}}Req "{{.Module}}/model/{{.Package}}/request"
+    {{- end }}
    "github.com/gin-gonic/gin"
    "go.uber.org/zap"
    {{- if .AutoCreateResource}}
-    "github.com/flipped-aurora/gin-vue-admin/server/utils"
+    "{{.Module}}/utils"
    {{- end }}
+    {{- else}}
+    "{{.Module}}/model/common/response"
+    "github.com/gin-gonic/gin"
+    {{- end}}
 )

 type {{.StructName}}Api struct {}

+{{if not .OnlyTemplate}}
+
 // Create{{.StructName}} 创建{{.Description}}
 // @Tags {{.StructName}}
 // @Summary 创建{{.Description}}
 // @Security ApiKeyAuth
-// @accept application/json
+// @Accept application/json
 // @Produce application/json
 // @Param data body {{.Package}}.{{.StructName}} true "创建{{.Description}}"
 // @Success 200 {object} response.Response{msg=string} "创建成功"
@@ -36,7 +45,7 @@ func ({{.Abbreviation}}Api *{{.StructName}}Api) Create{{.StructName}}(c *gin.Con
 	err = {{.Abbreviation}}Service.Create{{.StructName}}(&{{.Abbreviation}})
 	if err != nil {
        global.GVA_LOG.Error("创建失败!", zap.Error(err))
-		response.FailWithMessage("创建失败", c)
+		response.FailWithMessage("创建失败:" + err.Error(), c)
 		return
 	}
    response.OkWithMessage("创建成功", c)
@@ -46,7 +55,7 @@ func ({{.Abbreviation}}Api *{{.StructName}}Api) Create{{.StructName}}(c *gin.Con
 // @Tags {{.StructName}}
 // @Summary 删除{{.Description}}
 // @Security ApiKeyAuth
-// @accept application/json
+// @Accept application/json
 // @Produce application/json
 // @Param data body {{.Package}}.{{.StructName}} true "删除{{.Description}}"
 // @Success 200 {object} response.Response{msg=string} "删除成功"
@@ -59,7 +68,7 @@ func ({{.Abbreviation}}Api *{{.StructName}}Api) Delete{{.StructName}}(c *gin.Con
 	err := {{.Abbreviation}}Service.Delete{{.StructName}}({{.PrimaryField.FieldJson}} {{- if .AutoCreateResource -}},userID{{- end -}})
 	if err != nil {
        global.GVA_LOG.Error("删除失败!", zap.Error(err))
-		response.FailWithMessage("删除失败", c)
+		response.FailWithMessage("删除失败:" + err.Error(), c)
 		return
 	}
 	response.OkWithMessage("删除成功", c)
@@ -69,7 +78,7 @@ func ({{.Abbreviation}}Api *{{.StructName}}Api) Delete{{.StructName}}(c *gin.Con
 // @Tags {{.StructName}}
 // @Summary 批量删除{{.Description}}
 // @Security ApiKeyAuth
-// @accept application/json
+// @Accept application/json
 // @Produce application/json
 // @Success 200 {object} response.Response{msg=string} "批量删除成功"
 // @Router /{{.Abbreviation}}/delete{{.StructName}}ByIds [delete]
@@ -81,7 +90,7 @@ func ({{.Abbreviation}}Api *{{.StructName}}Api) Delete{{.StructName}}ByIds(c *gi
 	err := {{.Abbreviation}}Service.Delete{{.StructName}}ByIds({{.PrimaryField.FieldJson}}s{{- if .AutoCreateResource }},userID{{- end }})
 	if err != nil {
        global.GVA_LOG.Error("批量删除失败!", zap.Error(err))
-		response.FailWithMessage("批量删除失败", c)
+		response.FailWithMessage("批量删除失败:" + err.Error(), c)
 		return
 	}
 	response.OkWithMessage("批量删除成功", c)
@@ -91,7 +100,7 @@ func ({{.Abbreviation}}Api *{{.StructName}}Api) Delete{{.StructName}}ByIds(c *gi
 // @Tags {{.StructName}}
 // @Summary 更新{{.Description}}
 // @Security ApiKeyAuth
-// @accept application/json
+// @Accept application/json
 // @Produce application/json
 // @Param data body {{.Package}}.{{.StructName}} true "更新{{.Description}}"
 // @Success 200 {object} response.Response{msg=string} "更新成功"
@@ -109,7 +118,7 @@ func ({{.Abbreviation}}Api *{{.StructName}}Api) Update{{.StructName}}(c *gin.Con
 	err = {{.Abbreviation}}Service.Update{{.StructName}}({{.Abbreviation}})
 	if err != nil {
        global.GVA_LOG.Error("更新失败!", zap.Error(err))
-		response.FailWithMessage("更新失败", c)
+		response.FailWithMessage("更新失败:" + err.Error(), c)
 		return
 	}
 	response.OkWithMessage("更新成功", c)
@@ -119,9 +128,9 @@ func ({{.Abbreviation}}Api *{{.StructName}}Api) Update{{.StructName}}(c *gin.Con
 // @Tags {{.StructName}}
 // @Summary 用id查询{{.Description}}
 // @Security ApiKeyAuth
-// @accept application/json
+// @Accept application/json
 // @Produce application/json
-// @Param data query {{.Package}}.{{.StructName}} true "用id查询{{.Description}}"
+// @Param {{.PrimaryField.FieldJson}} query {{.PrimaryField.FieldType}} true "用id查询{{.Description}}"
 // @Success 200 {object} response.Response{data={{.Package}}.{{.StructName}},msg=string} "查询成功"
 // @Router /{{.Abbreviation}}/find{{.StructName}} [get]
 func ({{.Abbreviation}}Api *{{.StructName}}Api) Find{{.StructName}}(c *gin.Context) {
@@ -129,17 +138,36 @@ func ({{.Abbreviation}}Api *{{.StructName}}Api) Find{{.StructName}}(c *gin.Conte
 	re{{.Abbreviation}}, err := {{.Abbreviation}}Service.Get{{.StructName}}({{.PrimaryField.FieldJson}})
 	if err != nil {
        global.GVA_LOG.Error("查询失败!", zap.Error(err))
-		response.FailWithMessage("查询失败", c)
+		response.FailWithMessage("查询失败:" + err.Error(), c)
 		return
 	}
 	response.OkWithData(re{{.Abbreviation}}, c)
 }

+{{- if .IsTree }}
+// Get{{.StructName}}List 分页获取{{.Description}}列表,Tree模式下不接受参数
+// @Tags {{.StructName}}
+// @Summary 分页获取{{.Description}}列表
+// @Security ApiKeyAuth
+// @Accept application/json
+// @Produce application/json
+// @Success 200 {object} response.Response{data=response.PageResult,msg=string} "获取成功"
+// @Router /{{.Abbreviation}}/get{{.StructName}}List [get]
+func ({{.Abbreviation}}Api *{{.StructName}}Api) Get{{.StructName}}List(c *gin.Context) {
+	list, err := {{.Abbreviation}}Service.Get{{.StructName}}InfoList()
+	if err != nil {
+	    global.GVA_LOG.Error("获取失败!", zap.Error(err))
+        response.FailWithMessage("获取失败:" + err.Error(), c)
+        return
+    }
+    response.OkWithDetailed(list, "获取成功", c)
+}
+{{- else }}
 // Get{{.StructName}}List 分页获取{{.Description}}列表
 // @Tags {{.StructName}}
 // @Summary 分页获取{{.Description}}列表
 // @Security ApiKeyAuth
-// @accept application/json
+// @Accept application/json
 // @Produce application/json
 // @Param data query {{.Package}}Req.{{.StructName}}Search true "分页获取{{.Description}}列表"
 // @Success 200 {object} response.Response{data=response.PageResult,msg=string} "获取成功"
@@ -154,7 +182,7 @@ func ({{.Abbreviation}}Api *{{.StructName}}Api) Get{{.StructName}}List(c *gin.Co
 	list, total, err := {{.Abbreviation}}Service.Get{{.StructName}}InfoList(pageInfo)
 	if err != nil {
 	    global.GVA_LOG.Error("获取失败!", zap.Error(err))
-        response.FailWithMessage("获取失败", c)
+        response.FailWithMessage("获取失败:" + err.Error(), c)
        return
    }
    response.OkWithDetailed(response.PageResult{
@@ -164,12 +192,13 @@ func ({{.Abbreviation}}Api *{{.StructName}}Api) Get{{.StructName}}List(c *gin.Co
        PageSize: pageInfo.PageSize,
    }, "获取成功", c)
 }
+{{- end }}

 {{- if .HasDataSource }}
 // Get{{.StructName}}DataSource 获取{{.StructName}}的数据源
 // @Tags {{.StructName}}
 // @Summary 获取{{.StructName}}的数据源
-// @accept application/json
+// @Accept application/json
 // @Produce application/json
 // @Success 200 {object} response.Response{data=object,msg=string} "查询成功"
 // @Router /{{.Abbreviation}}/get{{.StructName}}DataSource [get]
@@ -178,24 +207,26 @@ func ({{.Abbreviation}}Api *{{.StructName}}Api) Get{{.StructName}}DataSource(c *
    dataSource, err := {{.Abbreviation}}Service.Get{{.StructName}}DataSource()
    if err != nil {
        global.GVA_LOG.Error("查询失败!", zap.Error(err))
-   		response.FailWithMessage("查询失败", c)
+   		response.FailWithMessage("查询失败:" + err.Error(), c)
   		return
    }
   response.OkWithData(dataSource, c)
 }
 {{- end }}

+{{- end }}
+
 // Get{{.StructName}}Public 不需要鉴权的{{.Description}}接口
 // @Tags {{.StructName}}
 // @Summary 不需要鉴权的{{.Description}}接口
-// @accept application/json
+// @Accept application/json
 // @Produce application/json
-// @Param data query {{.Package}}Req.{{.StructName}}Search true "分页获取{{.Description}}列表"
 // @Success 200 {object} response.Response{data=object,msg=string} "获取成功"
 // @Router /{{.Abbreviation}}/get{{.StructName}}Public [get]
 func ({{.Abbreviation}}Api *{{.StructName}}Api) Get{{.StructName}}Public(c *gin.Context) {
    // 此接口不需要鉴权
    // 示例为返回了一个固定的消息接口，一般本接口用于C端服务，需要自己实现业务逻辑
+    {{.Abbreviation}}Service.Get{{.StructName}}Public()
    response.OkWithDetailed(gin.H{
       "info": "不需要鉴权的{{.Description}}接口信息",
    }, "获取成功", c)
@@ -1,9 +1,35 @@
+{{- if .IsAdd}}
+// 在结构体中新增如下字段
+{{- range .Fields}}
+{{- if eq .FieldType "enum" }}
+{{.FieldName}}  string `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};type:enum({{.DataTypeLong}});comment:{{.Comment}};" {{- if .Require }} binding:"required"{{- end -}}`
+{{- else if eq .FieldType "picture" }}
+{{.FieldName}}  string `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require }} binding:"required"{{- end -}}`
+{{- else if eq .FieldType "video" }}
+{{.FieldName}}  string `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require }} binding:"required"{{- end -}}`
+{{- else if eq .FieldType "file" }}
+{{.FieldName}}  datatypes.JSON `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require }} binding:"required"{{- end }} swaggertype:"array,object"`
+{{- else if eq .FieldType "pictures" }}
+{{.FieldName}}  datatypes.JSON `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require }} binding:"required"{{- end }} swaggertype:"array,object"`
+{{- else if eq .FieldType "richtext" }}
+{{.FieldName}}  *string `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}type:text;" {{- if .Require }} binding:"required"{{- end -}}`
+{{- else if eq .FieldType "json" }}
+{{.FieldName}}  datatypes.JSON `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}type:text;" {{- if .Require }} binding:"required"{{- end }} swaggertype:"object"`
+{{- else if eq .FieldType "array" }}
+{{.FieldName}}  datatypes.JSON `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}type:text;" {{- if .Require }} binding:"required"{{- end }} swaggertype:"array,object"`
+{{- else }}
+{{.FieldName}}  *{{.FieldType}} `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require }} binding:"required"{{- end -}}`
+{{- end }}  {{ if .FieldDesc }}//{{.FieldDesc}}{{ end }}
+{{- end }}
+
+{{ else }}
 // 自动生成模板{{.StructName}}
 package {{.Package}}

+{{- if not .OnlyTemplate}}
 import (
 	{{- if .GvaModel }}
-	"github.com/flipped-aurora/gin-vue-admin/server/global"
+	"{{.Module}}/global"
 	{{- end }}
 	{{- if or .HasTimer }}
 	"time"
@@ -12,9 +38,11 @@ import (
 	"gorm.io/datatypes"
 	{{- end }}
 )
+{{- end }}

 // {{.Description}} 结构体  {{.StructName}}
 type {{.StructName}} struct {
+{{- if not .OnlyTemplate}}
 {{- if .GvaModel }}
    global.GVA_MODEL
 {{- end }}
@@ -26,26 +54,29 @@ type {{.StructName}} struct {
    {{- else if eq .FieldType "video" }}
    {{.FieldName}}  string `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require }} binding:"required"{{- end -}}`
    {{- else if eq .FieldType "file" }}
-    {{.FieldName}}  datatypes.JSON `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require }} binding:"required"{{- end -}} swaggertype:"array,object"`
+    {{.FieldName}}  datatypes.JSON `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require }} binding:"required"{{- end }} swaggertype:"array,object"`
    {{- else if eq .FieldType "pictures" }}
-    {{.FieldName}}  datatypes.JSON `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require }} binding:"required"{{- end -}} swaggertype:"array,object"`
+    {{.FieldName}}  datatypes.JSON `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require }} binding:"required"{{- end }} swaggertype:"array,object"`
    {{- else if eq .FieldType "richtext" }}
-    {{.FieldName}}  string `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}type:text;" {{- if .Require }} binding:"required"{{- end -}}`
+    {{.FieldName}}  *string `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}type:text;" {{- if .Require }} binding:"required"{{- end -}}`
    {{- else if eq .FieldType "json" }}
-    {{.FieldName}}  datatypes.JSON `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}type:text;" {{- if .Require }} binding:"required"{{- end -}} swaggertype:"object"`
+    {{.FieldName}}  datatypes.JSON `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}type:text;" {{- if .Require }} binding:"required"{{- end }} swaggertype:"object"`
    {{- else if eq .FieldType "array" }}
-    {{.FieldName}}  datatypes.JSON `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}type:text;" {{- if .Require }} binding:"required"{{- end -}} swaggertype:"array,object"`
-    {{- else if ne .FieldType "string" }}
-    {{.FieldName}}  *{{.FieldType}} `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require }} binding:"required"{{- end -}}`
+    {{.FieldName}}  datatypes.JSON `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}type:text;" {{- if .Require }} binding:"required"{{- end }} swaggertype:"array,object"`
    {{- else }}
-    {{.FieldName}}  {{.FieldType}} `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require }} binding:"required"{{- end -}}`
-    {{- end }}  {{ if .FieldDesc }}//{{.FieldDesc}} {{ end }}
+    {{.FieldName}}  *{{.FieldType}} `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require }} binding:"required"{{- end -}}`
+    {{- end }}  {{ if .FieldDesc }}//{{.FieldDesc}}{{ end }}
 {{- end }}
    {{- if .AutoCreateResource }}
    CreatedBy  uint   `gorm:"column:created_by;comment:创建者"`
    UpdatedBy  uint   `gorm:"column:updated_by;comment:更新者"`
    DeletedBy  uint   `gorm:"column:deleted_by;comment:删除者"`
    {{- end }}
+    {{- if .IsTree }}
+    Children   []*{{.StructName}} `json:"children" gorm:"-"`     //子节点
+    ParentID   int             `json:"parentID" gorm:"column:parent_id;comment:父节点"`
+    {{- end }}
+{{- end }}
 }

 {{ if .TableName }}
@@ -54,3 +85,27 @@ func ({{.StructName}}) TableName() string {
    return "{{.TableName}}"
 }
 {{ end }}
+
+{{if .IsTree }}
+// GetChildren 实现TreeNode接口
+func (s *{{.StructName}}) GetChildren() []*{{.StructName}} {
+    return s.Children
+}
+
+// SetChildren 实现TreeNode接口
+func (s *{{.StructName}}) SetChildren(children *{{.StructName}}) {
+	s.Children = append(s.Children, children)
+}
+
+// GetID 实现TreeNode接口
+func (s *{{.StructName}}) GetID() int {
+    return int({{if not .GvaModel}}*{{- end }}s.{{.PrimaryField.FieldName}})
+}
+
+// GetParentID 实现TreeNode接口
+func (s *{{.StructName}}) GetParentID() int {
+    return s.ParentID
+}
+{{ end }}
+
+{{ end }}
@@ -1,11 +1,35 @@
+{{- if .IsAdd}}
+// 在结构体中新增如下字段
+{{- range .Fields}}
+    {{- if ne .FieldSearchType ""}}
+        {{- if eq .FieldSearchType "BETWEEN" "NOT BETWEEN"}}
+Start{{.FieldName}}  *{{.FieldType}}  `json:"start{{.FieldName}}" form:"start{{.FieldName}}"`
+End{{.FieldName}}  *{{.FieldType}}  `json:"end{{.FieldName}}" form:"end{{.FieldName}}"`
+        {{- else }}
+            {{- if or (eq .FieldType "enum") (eq .FieldType "picture") (eq .FieldType "pictures") (eq .FieldType "video") (eq .FieldType "json") }}
+{{.FieldName}}  string `json:"{{.FieldJson}}" form:"{{.FieldJson}}" `
+            {{- else }}
+{{.FieldName}}  *{{.FieldType}} `json:"{{.FieldJson}}" form:"{{.FieldJson}}" `
+            {{- end }}
+        {{- end }}
+    {{- end}}
+{{- end }}
+{{- if .NeedSort}}
+Sort  string `json:"sort" form:"sort"`
+Order string `json:"order" form:"order"`
+{{- end}}
+{{- else }}
 package request

 import (
-	"github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
+{{- if not .OnlyTemplate }}
+	"{{.Module}}/model/common/request"
 	{{ if or .HasSearchTimer .GvaModel}}"time"{{ end }}
+{{- end }}
 )

 type {{.StructName}}Search struct{
+{{- if not .OnlyTemplate}}
 {{- if .GvaModel }}
    StartCreatedAt *time.Time `json:"startCreatedAt" form:"startCreatedAt"`
    EndCreatedAt   *time.Time `json:"endCreatedAt" form:"endCreatedAt"`
@@ -16,18 +40,10 @@ type {{.StructName}}Search struct{
    Start{{.FieldName}}  *{{.FieldType}}  `json:"start{{.FieldName}}" form:"start{{.FieldName}}"`
    End{{.FieldName}}  *{{.FieldType}}  `json:"end{{.FieldName}}" form:"end{{.FieldName}}"`
        {{- else }}
-            {{- if eq .FieldType "enum" }}
-    {{.FieldName}}  string `json:"{{.FieldJson}}" form:"{{.FieldJson}}"`
-            {{- else if eq .FieldType "picture" }}
-    {{.FieldName}}  string `json:"{{.FieldJson}}" form:"{{.FieldJson}}" `
-            {{- else if eq .FieldType "video" }}
-    {{.FieldName}}  string `json:"{{.FieldJson}}" form:"{{.FieldJson}}" `
-            {{- else if eq .FieldType "richtext" }}
-    {{.FieldName}}  string `json:"{{.FieldJson}}" form:"{{.FieldJson}}" `
-            {{- else if ne .FieldType "string" }}
-    {{.FieldName}}  *{{.FieldType}} `json:"{{.FieldJson}}" form:"{{.FieldJson}}" `
+            {{- if or (eq .FieldType "enum") (eq .FieldType "picture") (eq .FieldType "pictures") (eq .FieldType "video") (eq .FieldType "json") }}
+            {{.FieldName}}  string `json:"{{.FieldJson}}" form:"{{.FieldJson}}" `
            {{- else }}
-    {{.FieldName}}  {{.FieldType}} `json:"{{.FieldJson}}" form:"{{.FieldJson}}" `
+    {{.FieldName}}  *{{.FieldType}} `json:"{{.FieldJson}}" form:"{{.FieldJson}}" `
            {{- end }}
        {{- end }}
    {{- end}}
@@ -37,4 +53,6 @@ type {{.StructName}}Search struct{
    Sort  string `json:"sort" form:"sort"`
    Order string `json:"order" form:"order"`
    {{- end}}
+{{- end}}
 }
+{{- end }}
@@ -1,7 +1,7 @@
 package {{.Package}}

 import (
-	"github.com/flipped-aurora/gin-vue-admin/server/middleware"
+	{{if .OnlyTemplate}}// {{ end}}"{{.Module}}/middleware"
 	"github.com/gin-gonic/gin"
 )

@@ -9,9 +9,15 @@ type {{.StructName}}Router struct {}

 // Init{{.StructName}}Router 初始化 {{.Description}} 路由信息
 func (s *{{.StructName}}Router) Init{{.StructName}}Router(Router *gin.RouterGroup,PublicRouter *gin.RouterGroup) {
+	{{- if not .OnlyTemplate}}
 	{{.Abbreviation}}Router := Router.Group("{{.Abbreviation}}").Use(middleware.OperationRecord())
 	{{.Abbreviation}}RouterWithoutRecord := Router.Group("{{.Abbreviation}}")
+	{{- else }}
+	// {{.Abbreviation}}Router := Router.Group("{{.Abbreviation}}").Use(middleware.OperationRecord())
+    // {{.Abbreviation}}RouterWithoutRecord := Router.Group("{{.Abbreviation}}")
+	{{- end}}
 	{{.Abbreviation}}RouterWithoutAuth := PublicRouter.Group("{{.Abbreviation}}")
+	{{- if not .OnlyTemplate}}
 	{
 		{{.Abbreviation}}Router.POST("create{{.StructName}}", {{.Abbreviation}}Api.Create{{.StructName}})   // 新建{{.Description}}
 		{{.Abbreviation}}Router.DELETE("delete{{.StructName}}", {{.Abbreviation}}Api.Delete{{.StructName}}) // 删除{{.Description}}
@@ -26,6 +32,11 @@ func (s *{{.StructName}}Router) Init{{.StructName}}Router(Router *gin.RouterGrou
 	{{- if .HasDataSource}}
 	    {{.Abbreviation}}RouterWithoutAuth.GET("get{{.StructName}}DataSource", {{.Abbreviation}}Api.Get{{.StructName}}DataSource)  // 获取{{.Description}}数据源
 	{{- end}}
-	    {{.Abbreviation}}RouterWithoutAuth.GET("get{{.StructName}}Public", {{.Abbreviation}}Api.Get{{.StructName}}Public)  // 获取{{.Description}}列表
+	    {{.Abbreviation}}RouterWithoutAuth.GET("get{{.StructName}}Public", {{.Abbreviation}}Api.Get{{.StructName}}Public)  // {{.Description}}开放接口
 	}
+	{{- else}}
+	{
+	    {{.Abbreviation}}RouterWithoutAuth.GET("get{{.StructName}}Public", {{.Abbreviation}}Api.Get{{.StructName}}Public)  // {{.Description}}开放接口
+	}
+    {{ end }}
 }
@@ -1,16 +1,3 @@
-package {{.Package}}
-
-import (
-	"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"
-    {{- if .AutoCreateResource }}
-    "gorm.io/gorm"
-    {{- end}}
-)
-
-type {{.StructName}}Service struct {}
-
 {{- $db := "" }}
 {{- if eq .BusinessDB "" }}
 {{- $db = "global.GVA_DB" }}
@@ -18,16 +5,97 @@ type {{.StructName}}Service struct {}
 {{- $db =  printf "global.MustGetGlobalDBByDBName(\"%s\")" .BusinessDB   }}
 {{- end}}

+{{- if .IsAdd}}
+
+// Get{{.StructName}}InfoList 新增搜索语句
+        {{- range .Fields}}
+            {{- if .FieldSearchType}}
+                {{- if or (eq .FieldType "enum") (eq .FieldType "pictures") (eq .FieldType "picture") (eq .FieldType "video") (eq .FieldType "json") }}
+if info.{{.FieldName}} != "" {
+        {{- if or (eq .FieldType "enum") }}
+    db = db.Where("{{.ColumnName}} {{.FieldSearchType}} ?",{{if eq .FieldSearchType "LIKE"}}"%"+ {{ end }}*info.{{.FieldName}}{{if eq .FieldSearchType "LIKE"}}+"%"{{ end }})
+        {{- else}}
+// 数据类型为复杂类型，请根据业务需求自行实现复杂类型的查询业务
+        {{- end}}
+}
+    {{- else if eq .FieldSearchType "BETWEEN" "NOT BETWEEN"}}
+if info.Start{{.FieldName}} != nil && info.End{{.FieldName}} != nil {
+    db = db.Where("{{.ColumnName}} {{.FieldSearchType}} ? AND ? ",info.Start{{.FieldName}},info.End{{.FieldName}})
+}
+    {{- else}}
+if info.{{.FieldName}} != nil{{- if eq .FieldType "string" }} && *info.{{.FieldName}} != ""{{- end }} {
+    db = db.Where("{{.ColumnName}} {{.FieldSearchType}} ?",{{if eq .FieldSearchType "LIKE"}}"%"+{{ end }}*info.{{.FieldName}}{{if eq .FieldSearchType "LIKE"}}+"%"{{ end }})
+}
+            {{- end }}
+        {{- end }}
+    {{- end }}
+
+
+// Get{{.StructName}}InfoList 新增排序语句 请自行在搜索语句中添加orderMap内容
+       {{- range .Fields}}
+            {{- if .Sort}}
+orderMap["{{.ColumnName}}"] = true
+         	{{- end}}
+       {{- end}}
+
+
+{{- if .HasDataSource }}
+//  Get{{.StructName}}DataSource()方法新增关联语句
+	{{range $key, $value := .DataSourceMap}}
+{{$key}} := make([]map[string]any, 0)
+{{ $dataDB := "" }}
+{{- if eq $value.DBName "" }}
+{{ $dataDB = $db }}
+{{- else}}
+{{ $dataDB = printf "global.MustGetGlobalDBByDBName(\"%s\")" $value.DBName }}
+{{- end}}
+{{$dataDB}}.Table("{{$value.Table}}"){{- if $value.HasDeletedAt}}.Where("deleted_at IS NULL"){{ end }}.Select("{{$value.Label}} as label,{{$value.Value}} as value").Scan(&{{$key}})
+res["{{$key}}"] = {{$key}}
+	{{- end }}
+{{- end }}
+{{- else}}
+package {{.Package}}
+
+import (
+{{- if not .OnlyTemplate }}
+	"{{.Module}}/global"
+	"{{.Module}}/model/{{.Package}}"
+	{{- if not .IsTree}}
+    {{.Package}}Req "{{.Module}}/model/{{.Package}}/request"
+    {{- else }}
+    "{{.Module}}/utils"
+    "errors"
+    {{- end }}
+    {{- if .AutoCreateResource }}
+    "gorm.io/gorm"
+    {{- end}}
+{{- end }}
+)
+
+type {{.StructName}}Service struct {}
+
+{{- if not .OnlyTemplate }}
 // Create{{.StructName}} 创建{{.Description}}记录
-// Author [piexlmax](https://github.com/piexlmax)
+// Author [yourname](https://github.com/yourname)
 func ({{.Abbreviation}}Service *{{.StructName}}Service) Create{{.StructName}}({{.Abbreviation}} *{{.Package}}.{{.StructName}}) (err error) {
 	err = {{$db}}.Create({{.Abbreviation}}).Error
 	return err
 }

 // Delete{{.StructName}} 删除{{.Description}}记录
-// Author [piexlmax](https://github.com/piexlmax)
+// Author [yourname](https://github.com/yourname)
 func ({{.Abbreviation}}Service *{{.StructName}}Service)Delete{{.StructName}}({{.PrimaryField.FieldJson}} string{{- if .AutoCreateResource -}},userID uint{{- end -}}) (err error) {
+	{{- if .IsTree }}
+       var count int64
+	   err = {{$db}}.Find(&{{.Package}}.{{.StructName}}{},"parent_id = ?",{{.PrimaryField.FieldJson}}).Count(&count).Error
+	   if count > 0 {
+           return errors.New("此节点存在子节点不允许删除")
+       }
+       if err != nil {
+           return err
+       }
+	{{- end }}
+
 	{{- if .AutoCreateResource }}
 	err = {{$db}}.Transaction(func(tx *gorm.DB) error {
 	    if err := tx.Model(&{{.Package}}.{{.StructName}}{}).Where("{{.PrimaryField.ColumnName}} = ?", {{.PrimaryField.FieldJson}}).Update("deleted_by", userID).Error; err != nil {
@@ -45,7 +113,7 @@ func ({{.Abbreviation}}Service *{{.StructName}}Service)Delete{{.StructName}}({{.
 }

 // Delete{{.StructName}}ByIds 批量删除{{.Description}}记录
-// Author [piexlmax](https://github.com/piexlmax)
+// Author [yourname](https://github.com/yourname)
 func ({{.Abbreviation}}Service *{{.StructName}}Service)Delete{{.StructName}}ByIds({{.PrimaryField.FieldJson}}s []string {{- if .AutoCreateResource }},deleted_by uint{{- end}}) (err error) {
 	{{- if .AutoCreateResource }}
 	err = {{$db}}.Transaction(func(tx *gorm.DB) error {
@@ -64,21 +132,35 @@ func ({{.Abbreviation}}Service *{{.StructName}}Service)Delete{{.StructName}}ById
 }

 // Update{{.StructName}} 更新{{.Description}}记录
-// Author [piexlmax](https://github.com/piexlmax)
+// Author [yourname](https://github.com/yourname)
 func ({{.Abbreviation}}Service *{{.StructName}}Service)Update{{.StructName}}({{.Abbreviation}} {{.Package}}.{{.StructName}}) (err error) {
 	err = {{$db}}.Model(&{{.Package}}.{{.StructName}}{}).Where("{{.PrimaryField.ColumnName}} = ?",{{.Abbreviation}}.{{.PrimaryField.FieldName}}).Updates(&{{.Abbreviation}}).Error
 	return err
 }

 // Get{{.StructName}} 根据{{.PrimaryField.FieldJson}}获取{{.Description}}记录
-// Author [piexlmax](https://github.com/piexlmax)
+// Author [yourname](https://github.com/yourname)
 func ({{.Abbreviation}}Service *{{.StructName}}Service)Get{{.StructName}}({{.PrimaryField.FieldJson}} string) ({{.Abbreviation}} {{.Package}}.{{.StructName}}, err error) {
 	err = {{$db}}.Where("{{.PrimaryField.ColumnName}} = ?", {{.PrimaryField.FieldJson}}).First(&{{.Abbreviation}}).Error
 	return
 }

+
+{{- if .IsTree }}
+// Get{{.StructName}}InfoList 分页获取{{.Description}}记录,Tree模式下不添加分页和搜索
+// Author [yourname](https://github.com/yourname)
+func ({{.Abbreviation}}Service *{{.StructName}}Service)Get{{.StructName}}InfoList() (list []*{{.Package}}.{{.StructName}},err error) {
+    // 创建db
+	db := {{$db}}.Model(&{{.Package}}.{{.StructName}}{})
+    var {{.Abbreviation}}s []*{{.Package}}.{{.StructName}}
+
+	err = db.Find(&{{.Abbreviation}}s).Error
+
+	return utils.BuildTree({{.Abbreviation}}s), err
+}
+{{- else }}
 // Get{{.StructName}}InfoList 分页获取{{.Description}}记录
-// Author [piexlmax](https://github.com/piexlmax)
+// Author [yourname](https://github.com/yourname)
 func ({{.Abbreviation}}Service *{{.StructName}}Service)Get{{.StructName}}InfoList(info {{.Package}}Req.{{.StructName}}Search) (list []{{.Package}}.{{.StructName}}, total int64, err error) {
 	limit := info.PageSize
 	offset := info.PageSize * (info.Page - 1)
@@ -93,17 +175,21 @@ func ({{.Abbreviation}}Service *{{.StructName}}Service)Get{{.StructName}}InfoLis
 {{- end }}
        {{- range .Fields}}
            {{- if .FieldSearchType}}
-                {{- if or (eq .FieldType "string") (eq .FieldType "enum") (eq .FieldType "picture") (eq .FieldType "video") (eq .FieldType "richtext") }}
+                {{- if or (eq .FieldType "enum") (eq .FieldType "pictures") (eq .FieldType "picture") (eq .FieldType "video") (eq .FieldType "json") }}
    if info.{{.FieldName}} != "" {
-        db = db.Where("{{.ColumnName}} {{.FieldSearchType}} ?",{{if eq .FieldSearchType "LIKE"}}"%"+ {{ end }}info.{{.FieldName}}{{if eq .FieldSearchType "LIKE"}}+"%"{{ end }})
+        {{- if or (eq .FieldType "enum")}}
+        db = db.Where("{{.ColumnName}} {{.FieldSearchType}} ?",{{if eq .FieldSearchType "LIKE"}}"%"+ {{ end }}*info.{{.FieldName}}{{if eq .FieldSearchType "LIKE"}}+"%"{{ end }})
+        {{- else}}
+        // 数据类型为复杂类型，请根据业务需求自行实现复杂类型的查询业务
+        {{- end}}
    }
    {{- else if eq .FieldSearchType "BETWEEN" "NOT BETWEEN"}}
        if info.Start{{.FieldName}} != nil && info.End{{.FieldName}} != nil {
            db = db.Where("{{.ColumnName}} {{.FieldSearchType}} ? AND ? ",info.Start{{.FieldName}},info.End{{.FieldName}})
        }
    {{- else}}
-    if info.{{.FieldName}} != nil {
-        db = db.Where("{{.ColumnName}} {{.FieldSearchType}} ?",{{if eq .FieldSearchType "LIKE"}}"%"+{{ end }}info.{{.FieldName}}{{if eq .FieldSearchType "LIKE"}}+"%"{{ end }})
+    if info.{{.FieldName}} != nil{{- if eq .FieldType "string" }} && *info.{{.FieldName}} != ""{{- end }} {
+        db = db.Where("{{.ColumnName}} {{.FieldSearchType}} ?",{{if eq .FieldSearchType "LIKE"}}"%"+{{ end }}*info.{{.FieldName}}{{if eq .FieldSearchType "LIKE"}}+"%"{{ end }})
    }
            {{- end }}
        {{- end }}
@@ -132,19 +218,33 @@ func ({{.Abbreviation}}Service *{{.StructName}}Service)Get{{.StructName}}InfoLis
 	if limit != 0 {
       db = db.Limit(limit).Offset(offset)
    }
-	
+
 	err = db.Find(&{{.Abbreviation}}s).Error
 	return  {{.Abbreviation}}s, total, err
 }

+{{- end }}
+
 {{- if .HasDataSource }}
 func ({{.Abbreviation}}Service *{{.StructName}}Service)Get{{.StructName}}DataSource() (res map[string][]map[string]any, err error) {
 	res = make(map[string][]map[string]any)
 	{{range $key, $value := .DataSourceMap}}
 	   {{$key}} := make([]map[string]any, 0)
-       {{$db}}.Table("{{$value.Table}}").Select("{{$value.Label}} as label,{{$value.Value}} as value").Scan(&{{$key}})
+	   {{ $dataDB := "" }}
+	   {{- if eq $value.DBName "" }}
+       {{ $dataDB = $db }}
+       {{- else}}
+       {{ $dataDB = printf "global.MustGetGlobalDBByDBName(\"%s\")" $value.DBName }}
+       {{- end}}
+       {{$dataDB}}.Table("{{$value.Table}}"){{- if $value.HasDeletedAt}}.Where("deleted_at IS NULL"){{ end }}.Select("{{$value.Label}} as label,{{$value.Value}} as value").Scan(&{{$key}})
 	   res["{{$key}}"] = {{$key}}
 	{{- end }}
 	return
 }
-{{- end }}
+{{- end }}
+{{- end }}
+func ({{.Abbreviation}}Service *{{.StructName}}Service)Get{{.StructName}}Public() {
+    // 此方法为获取数据源定义的数据
+    // 请自行实现
+}
+{{- end }}
@@ -1,9 +1,10 @@
 import service from '@/utils/request'

+{{- if not .OnlyTemplate}}
 // @Tags {{.StructName}}
 // @Summary 创建{{.Description}}
 // @Security ApiKeyAuth
-// @accept application/json
+// @Accept application/json
 // @Produce application/json
 // @Param data body model.{{.StructName}} true "创建{{.Description}}"
 // @Success 200 {string} string "{"success":true,"data":{},"msg":"创建成功"}"
@@ -19,7 +20,7 @@ export const create{{.StructName}} = (data) => {
 // @Tags {{.StructName}}
 // @Summary 删除{{.Description}}
 // @Security ApiKeyAuth
-// @accept application/json
+// @Accept application/json
 // @Produce application/json
 // @Param data body model.{{.StructName}} true "删除{{.Description}}"
 // @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}"
@@ -35,7 +36,7 @@ export const delete{{.StructName}} = (params) => {
 // @Tags {{.StructName}}
 // @Summary 批量删除{{.Description}}
 // @Security ApiKeyAuth
-// @accept application/json
+// @Accept application/json
 // @Produce application/json
 // @Param data body request.IdsReq true "批量删除{{.Description}}"
 // @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}"
@@ -51,7 +52,7 @@ export const delete{{.StructName}}ByIds = (params) => {
 // @Tags {{.StructName}}
 // @Summary 更新{{.Description}}
 // @Security ApiKeyAuth
-// @accept application/json
+// @Accept application/json
 // @Produce application/json
 // @Param data body model.{{.StructName}} true "更新{{.Description}}"
 // @Success 200 {string} string "{"success":true,"data":{},"msg":"更新成功"}"
@@ -67,7 +68,7 @@ export const update{{.StructName}} = (data) => {
 // @Tags {{.StructName}}
 // @Summary 用id查询{{.Description}}
 // @Security ApiKeyAuth
-// @accept application/json
+// @Accept application/json
 // @Produce application/json
 // @Param data query model.{{.StructName}} true "用id查询{{.Description}}"
 // @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}"
@@ -83,7 +84,7 @@ export const find{{.StructName}} = (params) => {
 // @Tags {{.StructName}}
 // @Summary 分页获取{{.Description}}列表
 // @Security ApiKeyAuth
-// @accept application/json
+// @Accept application/json
 // @Produce application/json
 // @Param data query request.PageInfo true "分页获取{{.Description}}列表"
 // @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
@@ -100,7 +101,7 @@ export const get{{.StructName}}List = (params) => {
 // @Tags {{.StructName}}
 // @Summary 获取数据源
 // @Security ApiKeyAuth
-// @accept application/json
+// @Accept application/json
 // @Produce application/json
 // @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}"
 // @Router /{{.Abbreviation}}/find{{.StructName}}DataSource [get]
@@ -111,3 +112,19 @@ export const get{{.StructName}}DataSource = () => {
  })
 }
 {{- end}}
+
+{{- end}}
+
+// @Tags {{.StructName}}
+// @Summary 不需要鉴权的{{.Description}}接口
+// @Accept application/json
+// @Produce application/json
+// @Param data query {{.Package}}Req.{{.StructName}}Search true "分页获取{{.Description}}列表"
+// @Success 200 {object} response.Response{data=object,msg=string} "获取成功"
+// @Router /{{.Abbreviation}}/get{{.StructName}}Public [get]
+export const get{{.StructName}}Public = () => {
+  return service({
+    url: '/{{.Abbreviation}}/get{{.StructName}}Public',
+    method: 'get',
+  })
+}
@@ -1,8 +1,186 @@
+{{- if .IsAdd }}
+// 新增表单中增加如下代码
+{{- range .Fields}}
+          {{- if .Form}}
+<el-form-item label="{{.FieldDesc}}:"  prop="{{.FieldJson}}" >
+          {{- if .CheckDataSource}}
+    <el-select {{if eq .DataSource.Association 2}} multiple {{ end }} v-model="formData.{{.FieldJson}}" placeholder="请选择{{.FieldDesc}}" style="width:100%" :clearable="{{.Clearable}}" >
+        <el-option v-for="(item,key) in dataSource.{{.FieldJson}}" :key="key" :label="item.label" :value="item.value" />
+    </el-select>
+          {{- else }}
+          {{- if eq .FieldType "bool" }}
+    <el-switch v-model="formData.{{.FieldJson}}" active-color="#13ce66" inactive-color="#ff4949" active-text="是" inactive-text="否" clearable ></el-switch>
+          {{- end }}
+          {{- if eq .FieldType "string" }}
+          {{- if .DictType}}
+    <el-select {{if eq .FieldType "array"}}multiple {{end}}v-model="formData.{{ .FieldJson }}" placeholder="请选择{{.FieldDesc}}" style="width:100%" :clearable="{{.Clearable}}" >
+        <el-option v-for="(item,key) in {{ .DictType }}Options" :key="key" :label="item.label" :value="item.value" />
+    </el-select>
+          {{- else }}
+    <el-input v-model="formData.{{.FieldJson}}" :clearable="{{.Clearable}}"  placeholder="请输入{{.FieldDesc}}" />
+          {{- end }}
+          {{- end }}
+          {{- if eq .FieldType "richtext" }}
+    <RichEdit v-model="formData.{{.FieldJson}}"/>
+          {{- end }}
+          {{- if eq .FieldType "json" }}
+    // 此字段为json结构，可以前端自行控制展示和数据绑定模式 需绑定json的key为 formData.{{.FieldJson}} 后端会按照json的类型进行存取
+    {{"{{"}} formData.{{.FieldJson}} {{"}}"}}
+          {{- end }}
+           {{- if eq .FieldType "array" }}
+    <ArrayCtrl v-model="formData.{{ .FieldJson }}" editable/>
+           {{- end }}
+          {{- if eq .FieldType "int" }}
+    <el-input v-model.number="formData.{{ .FieldJson }}" :clearable="{{.Clearable}}" placeholder="请输入{{.FieldDesc}}" />
+          {{- end }}
+          {{- if eq .FieldType "time.Time" }}
+    <el-date-picker v-model="formData.{{ .FieldJson }}" type="date" style="width:100%" placeholder="选择日期" :clearable="{{.Clearable}}"  />
+          {{- end }}
+          {{- if eq .FieldType "float64" }}
+    <el-input-number v-model="formData.{{ .FieldJson }}"  style="width:100%" :precision="2" :clearable="{{.Clearable}}"  />
+          {{- end }}
+          {{- if eq .FieldType "enum" }}
+    <el-select v-model="formData.{{ .FieldJson }}" placeholder="请选择{{.FieldDesc}}" style="width:100%" :clearable="{{.Clearable}}" >
+       <el-option v-for="item in [{{.DataTypeLong}}]" :key="item" :label="item" :value="item" />
+    </el-select>
+          {{- end }}
+          {{- if eq .FieldType "picture" }}
+    <SelectImage
+     v-model="formData.{{ .FieldJson }}"
+     file-type="image"
+    />
+          {{- end }}
+          {{- if eq .FieldType "pictures" }}
+    <SelectImage
+     multiple
+     v-model="formData.{{ .FieldJson }}"
+     file-type="image"
+     />
+          {{- end }}
+          {{- if eq .FieldType "video" }}
+    <SelectImage
+    v-model="formData.{{ .FieldJson }}"
+    file-type="video"
+    />
+           {{- end }}
+          {{- if eq .FieldType "file" }}
+    <SelectFile v-model="formData.{{ .FieldJson }}" />
+          {{- end }}
+          {{- end }}
+</el-form-item>
+          {{- end }}
+          {{- end }}
+
+// 字典增加如下代码
+    {{- range $index, $element := .DictTypes}}
+const {{ $element }}Options = ref([])
+    {{- end }}
+
+// init方法中增加如下调用
+
+{{- 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 .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 }}
 <template>
  <div>
    <div class="gva-form-box">
      <el-form :model="formData" ref="elFormRef" label-position="right" :rules="rule" label-width="80px">
+        {{- if .IsTree }}
+          <el-form-item label="父节点:" prop="parentID" >
+              <el-tree-select
+                  v-model="formData.parentID"
+                  :data="[rootNode,...tableData]"
+                  check-strictly
+                  :render-after-expand="false"
+                  :props="defaultProps"
+                  clearable
+                  style="width: 240px"
+                  placeholder="根节点"
+              />
+          </el-form-item>
+        {{- end }}
      {{- range .Fields}}
+      {{- if .Form }}
        <el-form-item label="{{.FieldDesc}}:" prop="{{.FieldJson}}">
       {{- if .CheckDataSource}}
        <el-select {{if eq .DataSource.Association 2}} multiple {{ end }} v-model="formData.{{.FieldJson}}" placeholder="请选择{{.FieldDesc}}" style="width:100%" :clearable="{{.Clearable}}" >
@@ -14,7 +192,7 @@
      {{- end }}
      {{- if eq .FieldType "string" }}
      {{- if .DictType}}
-           <el-select v-model="formData.{{ .FieldJson }}" placeholder="请选择{{.FieldDesc}}" style="width:100%" :clearable="{{.Clearable}}" >
+           <el-select {{if eq .FieldType "array"}}multiple {{end}}v-model="formData.{{ .FieldJson }}" placeholder="请选择{{.FieldDesc}}" style="width:100%" :clearable="{{.Clearable}}" >
              <el-option v-for="(item,key) in {{ .DictType }}Options" :key="key" :label="item.label" :value="item.value" />
           </el-select>
      {{- else }}
@@ -54,11 +232,15 @@
          // 此字段为json结构，可以前端自行控制展示和数据绑定模式 需绑定json的key为 formData.{{.FieldJson}} 后端会按照json的类型进行存取
          {{"{{"}} formData.{{.FieldJson}} {{"}}"}}
       {{- end }}
+       {{- if eq .FieldType "array" }}
+          <ArrayCtrl v-model="formData.{{ .FieldJson }}" editable/>
+       {{- end }}
       {{- end }}
       </el-form-item>
+      {{- end }}
      {{- end }}
        <el-form-item>
-          <el-button type="primary" @click="save">保存</el-button>
+          <el-button :loading="btnLoading" type="primary" @click="save">保存</el-button>
          <el-button type="primary" @click="back">返回</el-button>
        </el-form-item>
      </el-form>
@@ -71,6 +253,9 @@ import {
  {{- if .HasDataSource }}
    get{{.StructName}}DataSource,
  {{- end }}
+  {{- if .IsTree }}
+    get{{.StructName}}List,
+  {{- end }}
  create{{.StructName}},
  update{{.StructName}},
  find{{.StructName}}
@@ -86,9 +271,12 @@ import { useRoute, useRouter } from "vue-router"
 import { ElMessage } from 'element-plus'
 import { ref, reactive } from 'vue'
 {{- if .HasPic }}
+// 图片选择组件
 import SelectImage from '@/components/selectImage/selectImage.vue'
 {{- end }}
+
 {{- if .HasFile }}
+// 文件选择组件
 import SelectFile from '@/components/selectFile/selectFile.vue'
 {{- end }}

@@ -97,15 +285,54 @@ import SelectFile from '@/components/selectFile/selectFile.vue'
 import RichEdit from '@/components/richtext/rich-edit.vue'
 {{- end }}

+{{- if .HasArray}}
+// 数组控制组件
+import ArrayCtrl from '@/components/arrayCtrl/arrayCtrl.vue'
+{{- end }}
+
+
 const route = useRoute()
 const router = useRouter()

+{{- if .IsTree }}
+const tableData = ref([])
+
+const defaultProps = {
+  children: "children",
+  label: "{{ .TreeJson }}",
+  value: "{{ .PrimaryField.FieldJson }}"
+}
+
+const rootNode = {
+  {{ .PrimaryField.FieldJson }}: 0,
+  {{ .TreeJson }}: '根节点',
+  children: []
+}
+
+const getTableData = async() => {
+  const table = await get{{.StructName}}List()
+  if (table.code === 0) {
+    tableData.value = table.data || []
+  }
+}
+
+getTableData()
+
+{{- end }}
+
+// 提交按钮loading
+const btnLoading = ref(false)
+
 const type = ref('')
    {{- range $index, $element := .DictTypes}}
 const {{ $element }}Options = ref([])
    {{- end }}
 const formData = ref({
+        {{- if .IsTree }}
+            parentID: undefined,
+        {{- end }}
        {{- range .Fields}}
+          {{- if .Form }}
            {{- if eq .FieldType "bool" }}
            {{.FieldJson}}: false,
            {{- end }}
@@ -116,7 +343,7 @@ const formData = ref({
            {{.FieldJson}}: '',
            {{- end }}
            {{- if eq .FieldType "int" }}
-            {{.FieldJson}}: {{- if or .DictType .DataSource }} undefined{{ else }} 0{{- end }},
+            {{.FieldJson}}: {{- if or .DataSource }} undefined{{ else }} 0{{- end }},
            {{- end }}
            {{- if eq .FieldType "time.Time" }}
            {{.FieldJson}}: new Date(),
@@ -142,6 +369,7 @@ const formData = ref({
            {{- if eq .FieldType "array" }}
            {{.FieldJson}}: [],
            {{- end }}
+          {{- end }}
        {{- end }}
        })
 // 验证规则
@@ -190,8 +418,9 @@ const init = async () => {
 init()
 // 保存按钮
 const save = async() => {
+      btnLoading.value = true
      elFormRef.value?.validate( async (valid) => {
-         if (!valid) return
+         if (!valid) return btnLoading.value = false
            let res
           switch (type.value) {
             case 'create':
@@ -204,6 +433,7 @@ const save = async() => {
               res = await create{{.StructName}}(formData.value)
               break
           }
+           btnLoading.value = false
           if (res.code === 0) {
             ElMessage({
               type: 'success',
@@ -222,3 +452,13 @@ const back = () => {

 <style>
 </style>
+{{- else }}
+<template>
+<div>form</div>
+</template>
+<script setup>
+</script>
+<style>
+</style>
+{{- end }}
+{{- end }}
@@ -1,5 +1,376 @@
+{{- $global := . }}
+{{- $templateID := printf "%s_%s" .Package .StructName }}
+{{- if .IsAdd }}
+// 请在搜索条件中增加如下代码
+{{- range .Fields}}  {{- if .FieldSearchType}} {{- if eq .FieldType "bool" }}
+<el-form-item label="{{.FieldDesc}}" prop="{{.FieldJson}}">
+<el-select v-model="searchInfo.{{.FieldJson}}" clearable placeholder="请选择">
+    <el-option
+        key="true"
+        label="是"
+        value="true">
+    </el-option>
+    <el-option
+        key="false"
+        label="否"
+        value="false">
+    </el-option>
+</el-select>
+</el-form-item>
+           {{- else if .DictType}}
+<el-form-item label="{{.FieldDesc}}" prop="{{.FieldJson}}">
+    <el-select {{if eq .FieldType "array"}}multiple {{end}}v-model="searchInfo.{{.FieldJson}}" clearable placeholder="请选择" @clear="()=>{searchInfo.{{.FieldJson}}=undefined}">
+        <el-option v-for="(item,key) in {{ .DictType }}Options" :key="key" :label="item.label" :value="item.value" />
+    </el-select>
+</el-form-item>
+           {{- else if .CheckDataSource}}
+<el-form-item label="{{.FieldDesc}}" prop="{{.FieldJson}}">
+    <el-select {{if eq .DataSource.Association 2}} multiple {{ end }} v-model="searchInfo.{{.FieldJson}}" placeholder="请选择{{.FieldDesc}}" :clearable="{{.Clearable}}" >
+        <el-option v-for="(item,key) in dataSource.{{.FieldJson}}" :key="key" :label="item.label" :value="item.value" />
+    </el-select>
+</el-form-item>
+            {{- else}}
+<el-form-item label="{{.FieldDesc}}" prop="{{.FieldJson}}">
+        {{- if eq .FieldType "float64" "int"}}
+            {{if eq .FieldSearchType "BETWEEN" "NOT BETWEEN"}}
+<el-input v-model.number="searchInfo.start{{.FieldName}}" placeholder="最小值" />
+—
+<el-input v-model.number="searchInfo.end{{.FieldName}}" placeholder="最大值" />
+           {{- else}}
+<el-input v-model.number="searchInfo.{{.FieldJson}}" placeholder="搜索条件" />
+          {{- end}}
+        {{- else if eq .FieldType "time.Time"}}
+            {{if eq .FieldSearchType "BETWEEN" "NOT BETWEEN"}}
+<template #label>
+<span>
+{{.FieldDesc}}
+    <el-tooltip content="搜索范围是开始日期（包含）至结束日期（不包含）">
+      <el-icon><QuestionFilled /></el-icon>
+    </el-tooltip>
+</span>
+</template>
+<el-date-picker v-model="searchInfo.start{{.FieldName}}" type="datetime" placeholder="开始日期" :disabled-date="time=> searchInfo.end{{.FieldName}} ? time.getTime() > searchInfo.end{{.FieldName}}.getTime() : false"></el-date-picker>
+—
+<el-date-picker v-model="searchInfo.end{{.FieldName}}" type="datetime" placeholder="结束日期" :disabled-date="time=> searchInfo.start{{.FieldName}} ? time.getTime() < searchInfo.start{{.FieldName}}.getTime() : false"></el-date-picker>
+           {{- else}}
+<el-date-picker v-model="searchInfo.{{.FieldJson}}" type="datetime" placeholder="搜索条件"></el-date-picker>
+          {{- end}}
+        {{- else}}
+    <el-input v-model="searchInfo.{{.FieldJson}}" placeholder="搜索条件" />
+        {{- end}}
+</el-form-item>{{ end }}{{ end }}{{ end }}
+
+
+// 表格增加如下列代码
+
+{{- range .Fields}}
+        {{- if .Table}}
+        {{- if .CheckDataSource }}
+<el-table-column {{- if .Sort}} sortable{{- end}} align="left" label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="120">
+    <template #default="scope">
+        {{- if eq .DataSource.Association 2}}
+        <el-tag v-for="(item,key) in filterDataSource(dataSource.{{.FieldJson}},scope.row.{{.FieldJson}})" :key="key">
+             {{ "{{ item }}" }}
+        </el-tag>
+        {{- else }}
+        <span>{{"{{"}} filterDataSource(dataSource.{{.FieldJson}},scope.row.{{.FieldJson}}) {{"}}"}}</span>
+        {{- end }}
+    </template>
+</el-table-column>
+        {{- else if .DictType}}
+<el-table-column {{- if .Sort}} sortable{{- end}} align="left" label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="120">
+    <template #default="scope">
+    {{if eq .FieldType "array"}}
+    <el-tag class="mr-1" v-for="item in scope.row.{{.FieldJson}}" :key="item"> {{"{{"}} filterDict(item,{{.DictType}}Options) {{"}}"}}</el-tag>
+    {{- else }}
+    {{"{{"}} filterDict(scope.row.{{.FieldJson}},{{.DictType}}Options) {{"}}"}}
+    {{end}}
+    </template>
+</el-table-column>
+        {{- else if eq .FieldType "bool" }}
+<el-table-column {{- if .Sort}} sortable{{- end}} align="left" label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="120">
+    <template #default="scope">{{"{{"}} formatBoolean(scope.row.{{.FieldJson}}) {{"}}"}}</template>
+</el-table-column>
+         {{- else if eq .FieldType "time.Time" }}
+<el-table-column {{- if .Sort}} sortable{{- end}} align="left" label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="180">
+   <template #default="scope">{{"{{"}} formatDate(scope.row.{{.FieldJson}}) {{"}}"}}</template>
+</el-table-column>
+          {{- else if eq .FieldType "picture" }}
+<el-table-column label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="200">
+    <template #default="scope">
+      <el-image preview-teleported style="width: 100px; height: 100px" :src="getUrl(scope.row.{{.FieldJson}})" fit="cover"/>
+    </template>
+</el-table-column>
+           {{- else if eq .FieldType "pictures" }}
+<el-table-column label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="200">
+   <template #default="scope">
+      <div class="multiple-img-box">
+         <el-image preview-teleported v-for="(item,index) in scope.row.{{.FieldJson}}" :key="index" style="width: 80px; height: 80px" :src="getUrl(item)" fit="cover"/>
+     </div>
+   </template>
+</el-table-column>
+           {{- else if eq .FieldType "video" }}
+<el-table-column label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="200">
+   <template #default="scope">
+    <video
+       style="width: 100px; height: 100px"
+       muted
+       preload="metadata"
+       >
+         <source :src="getUrl(scope.row.{{.FieldJson}}) + '#t=1'">
+       </video>
+   </template>
+</el-table-column>
+           {{- else if eq .FieldType "richtext" }}
+<el-table-column label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="200">
+   <template #default="scope">
+      [富文本内容]
+   </template>
+</el-table-column>
+           {{- else if eq .FieldType "file" }}
+<el-table-column label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="200">
+    <template #default="scope">
+         <div class="file-list">
+           <el-tag v-for="file in scope.row.{{.FieldJson}}" :key="file.uid" @click="downloadFile(file.url)">{{"{{"}}file.name{{"}}"}}</el-tag>
+         </div>
+    </template>
+</el-table-column>
+         {{- else if eq .FieldType "json" }}
+<el-table-column label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="200">
+    <template #default="scope">
+        [JSON]
+    </template>
+</el-table-column>
+           {{- else if eq .FieldType "array" }}
+<el-table-column label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="200">
+    <template #default="scope">
+       <ArrayCtrl v-model="scope.row.{{ .FieldJson }}"/>
+    </template>
+</el-table-column>
+          {{- else }}
+<el-table-column {{- if .Sort}} sortable{{- end}} align="left" label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="120" />
+          {{- end }}
+        {{- end }}
+        {{- end }}
+
+// 新增表单中增加如下代码
+{{- range .Fields}}
+          {{- if .Form}}
+<el-form-item label="{{.FieldDesc}}:"  prop="{{.FieldJson}}" >
+          {{- if .CheckDataSource}}
+    <el-select {{if eq .DataSource.Association 2}} multiple {{ end }} v-model="formData.{{.FieldJson}}" placeholder="请选择{{.FieldDesc}}" style="width:100%" :clearable="{{.Clearable}}" >
+        <el-option v-for="(item,key) in dataSource.{{.FieldJson}}" :key="key" :label="item.label" :value="item.value" />
+    </el-select>
+          {{- else }}
+          {{- if eq .FieldType "bool" }}
+    <el-switch v-model="formData.{{.FieldJson}}" active-color="#13ce66" inactive-color="#ff4949" active-text="是" inactive-text="否" clearable ></el-switch>
+          {{- end }}
+          {{- if eq .FieldType "string" }}
+          {{- if .DictType}}
+    <el-select v-model="formData.{{ .FieldJson }}" placeholder="请选择{{.FieldDesc}}" style="width:100%" :clearable="{{.Clearable}}" >
+        <el-option v-for="(item,key) in {{ .DictType }}Options" :key="key" :label="item.label" :value="item.value" />
+    </el-select>
+          {{- else }}
+    <el-input v-model="formData.{{.FieldJson}}" :clearable="{{.Clearable}}"  placeholder="请输入{{.FieldDesc}}" />
+          {{- end }}
+          {{- end }}
+          {{- if eq .FieldType "richtext" }}
+    <RichEdit v-model="formData.{{.FieldJson}}"/>
+          {{- end }}
+          {{- if eq .FieldType "json" }}
+    // 此字段为json结构，可以前端自行控制展示和数据绑定模式 需绑定json的key为 formData.{{.FieldJson}} 后端会按照json的类型进行存取
+    {{"{{"}} formData.{{.FieldJson}} {{"}}"}}
+          {{- end }}
+          {{- if eq .FieldType "array" }}
+            {{- if .DictType}}
+    <el-select {{if eq .FieldType "array"}}multiple {{end}}v-model="formData.{{ .FieldJson }}" placeholder="请选择{{.FieldDesc}}" style="width:100%" :clearable="{{.Clearable}}" >
+        <el-option v-for="(item,key) in {{ .DictType }}Options" :key="key" :label="item.label" :value="item.value" />
+    </el-select>
+            {{- else }}
+    <ArrayCtrl v-model="formData.{{ .FieldJson }}" editable/>
+             {{- end }}
+           {{- end }}
+          {{- if eq .FieldType "int" }}
+    <el-input v-model.number="formData.{{ .FieldJson }}" :clearable="{{.Clearable}}" placeholder="请输入{{.FieldDesc}}" />
+          {{- end }}
+          {{- if eq .FieldType "time.Time" }}
+    <el-date-picker v-model="formData.{{ .FieldJson }}" type="date" style="width:100%" placeholder="选择日期" :clearable="{{.Clearable}}"  />
+          {{- end }}
+          {{- if eq .FieldType "float64" }}
+    <el-input-number v-model="formData.{{ .FieldJson }}"  style="width:100%" :precision="2" :clearable="{{.Clearable}}"  />
+          {{- end }}
+          {{- if eq .FieldType "enum" }}
+    <el-select v-model="formData.{{ .FieldJson }}" placeholder="请选择{{.FieldDesc}}" style="width:100%" :clearable="{{.Clearable}}" >
+       <el-option v-for="item in [{{.DataTypeLong}}]" :key="item" :label="item" :value="item" />
+    </el-select>
+          {{- end }}
+          {{- if eq .FieldType "picture" }}
+    <SelectImage
+     v-model="formData.{{ .FieldJson }}"
+     file-type="image"
+    />
+          {{- end }}
+          {{- if eq .FieldType "pictures" }}
+    <SelectImage
+     multiple
+     v-model="formData.{{ .FieldJson }}"
+     file-type="image"
+     />
+          {{- end }}
+          {{- if eq .FieldType "video" }}
+    <SelectImage
+    v-model="formData.{{ .FieldJson }}"
+    file-type="video"
+    />
+           {{- end }}
+          {{- if eq .FieldType "file" }}
+    <SelectFile v-model="formData.{{ .FieldJson }}" />
+          {{- end }}
+          {{- end }}
+</el-form-item>
+          {{- end }}
+          {{- end }}
+
+// 查看抽屉中增加如下代码
+
+{{- range .Fields}}
+              {{- if .Desc }}
+<el-descriptions-item label="{{ .FieldDesc }}">
+{{- if .CheckDataSource }}
+    <template #default="scope">
+        {{- if eq .DataSource.Association 2}}
+        <el-tag v-for="(item,key) in filterDataSource(dataSource.{{.FieldJson}},detailFrom.{{.FieldJson}})" :key="key">
+             {{ "{{ item }}" }}
+        </el-tag>
+        {{- else }}
+        <span>{{"{{"}} filterDataSource(dataSource.{{.FieldJson}},detailFrom.{{.FieldJson}}) {{"}}"}}</span>
+        {{- end }}
+    </template>
+                {{- else if and (ne .FieldType "picture" ) (ne .FieldType "pictures" ) (ne .FieldType "file" ) (ne .FieldType "array" ) }}
+    {{"{{"}} detailFrom.{{.FieldJson}} {{"}}"}}
+                {{- else }}
+                    {{- if eq .FieldType "picture" }}
+    <el-image style="width: 50px; height: 50px" :preview-src-list="returnArrImg(detailFrom.{{ .FieldJson }})" :src="getUrl(detailFrom.{{ .FieldJson }})" fit="cover" />
+                    {{- end }}
+                    {{- if eq .FieldType "array" }}
+    <ArrayCtrl v-model="detailFrom.{{ .FieldJson }}"/>
+                    {{- end }}
+                    {{- if eq .FieldType "pictures" }}
+    <el-image style="width: 50px; height: 50px; margin-right: 10px" :preview-src-list="returnArrImg(detailFrom.{{ .FieldJson }})" :initial-index="index" v-for="(item,index) in detailFrom.{{ .FieldJson }}" :key="index" :src="getUrl(item)" fit="cover" />
+                    {{- end }}
+                    {{- if eq .FieldType "richtext" }}
+    <RichView v-model="detailFrom.{{.FieldJson}}" />
+                     {{- end }}
+                    {{- if eq .FieldType "file" }}
+    <div class="fileBtn" v-for="(item,index) in detailFrom.{{ .FieldJson }}" :key="index">
+        <el-button type="primary" text bg @click="onDownloadFile(item.url)">
+          <el-icon style="margin-right: 5px"><Download /></el-icon>
+          {{"{{"}}item.name{{"}}"}}
+        </el-button>
+    </div>
+                    {{- end }}
+                {{- end }}
+</el-descriptions-item>
+              {{- 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 .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}}
 <template>
  <div>
+  {{- if not .IsTree }}
    <div class="gva-search-box">
      <el-form ref="elSearchFormRef" :inline="true" :model="searchInfo" class="demo-form-inline" :rules="searchRule" @keyup.enter="onSubmit">
      {{- if .GvaModel }}
@@ -34,10 +405,16 @@
            </el-form-item>
           {{- else if .DictType}}
           <el-form-item label="{{.FieldDesc}}" prop="{{.FieldJson}}">
-            <el-select v-model="searchInfo.{{.FieldJson}}" clearable placeholder="请选择" @clear="()=>{searchInfo.{{.FieldJson}}=undefined}">
+            <el-select {{if eq .FieldType "array"}} multiple {{end}}v-model="searchInfo.{{.FieldJson}}" clearable placeholder="请选择" @clear="()=>{searchInfo.{{.FieldJson}}=undefined}">
              <el-option v-for="(item,key) in {{ .DictType }}Options" :key="key" :label="item.label" :value="item.value" />
            </el-select>
            </el-form-item>
+           {{- else if .CheckDataSource}}
+            <el-form-item label="{{.FieldDesc}}" prop="{{.FieldJson}}">
+               <el-select {{if eq .DataSource.Association 2}} multiple {{ end }} v-model="searchInfo.{{.FieldJson}}" placeholder="请选择{{.FieldDesc}}" :clearable="{{.Clearable}}" >
+                   <el-option v-for="(item,key) in dataSource.{{.FieldJson}}" :key="key" :label="item.label" :value="item.value" />
+               </el-select>
+            </el-form-item>
            {{- else}}
        <el-form-item label="{{.FieldDesc}}" prop="{{.FieldJson}}">
        {{- if eq .FieldType "float64" "int"}}
@@ -46,13 +423,7 @@
            —
            <el-input v-model.number="searchInfo.end{{.FieldName}}" placeholder="最大值" />
           {{- else}}
-             {{- if .DictType}}
-              <el-select v-model="searchInfo.{{.FieldJson}}" placeholder="请选择" style="width:100%" :clearable="true" >
-               <el-option v-for="(item,key) in {{ .DictType }}Options" :key="key" :label="item.label" :value="item.value" />
-             </el-select>
-                    {{- else}}
             <el-input v-model.number="searchInfo.{{.FieldJson}}" placeholder="搜索条件" />
-                    {{- end }}
          {{- end}}
        {{- else if eq .FieldType "time.Time"}}
            {{if eq .FieldSearchType "BETWEEN" "NOT BETWEEN"}}
@@ -73,7 +444,6 @@
        {{- else}}
         <el-input v-model="searchInfo.{{.FieldJson}}" placeholder="搜索条件" />
        {{- end}}
-
        </el-form-item>{{ end }}{{ end }}{{ end }}{{ end }}

        <template v-if="showAllQuery">
@@ -95,7 +465,7 @@
                      </el-form-item>
                     {{- else if .DictType}}
                     <el-form-item label="{{.FieldDesc}}" prop="{{.FieldJson}}">
-                      <el-select v-model="searchInfo.{{.FieldJson}}" clearable placeholder="请选择" @clear="()=>{searchInfo.{{.FieldJson}}=undefined}">
+                      <el-select {{if eq .FieldType "array"}}multiple {{end}}v-model="searchInfo.{{.FieldJson}}" clearable placeholder="请选择" @clear="()=>{searchInfo.{{.FieldJson}}=undefined}">
                        <el-option v-for="(item,key) in {{ .DictType }}Options" :key="key" :label="item.label" :value="item.value" />
                      </el-select>
                      </el-form-item>
@@ -107,13 +477,7 @@
                      —
                      <el-input v-model.number="searchInfo.end{{.FieldName}}" placeholder="最大值" />
                     {{- else}}
-                       {{- if .DictType}}
-                        <el-select v-model="searchInfo.{{.FieldJson}}" placeholder="请选择" style="width:100%" :clearable="true" >
-                         <el-option v-for="(item,key) in {{ .DictType }}Options" :key="key" :label="item.label" :value="item.value" />
-                       </el-select>
-                              {{- else}}
                       <el-input v-model.number="searchInfo.{{.FieldJson}}" placeholder="搜索条件" />
-                              {{- end }}
                    {{- end}}
                  {{- else if eq .FieldType "time.Time"}}
                      {{if eq .FieldSearchType "BETWEEN" "NOT BETWEEN"}}
@@ -147,10 +511,16 @@
        </el-form-item>
      </el-form>
    </div>
+  {{- end }}
    <div class="gva-table-box">
        <div class="gva-btn-list">
-            <el-button type="primary" icon="plus" @click="openDialog">新增</el-button>
-            <el-button icon="delete" style="margin-left: 10px;" :disabled="!multipleSelection.length" @click="onDelete">删除</el-button>
+            <el-button {{ if $global.AutoCreateBtnAuth }}v-auth="btnAuth.add"{{ end }} type="primary" icon="plus" @click="openDialog()">新增</el-button>
+            <el-button {{ if $global.AutoCreateBtnAuth }}v-auth="btnAuth.batchDelete"{{ end }} icon="delete" style="margin-left: 10px;" :disabled="!multipleSelection.length" @click="onDelete">删除</el-button>
+            {{ if .HasExcel -}}
+            <ExportTemplate {{ if $global.AutoCreateBtnAuth }}v-auth="btnAuth.exportTemplate"{{ end }} template-id="{{$templateID}}" />
+            <ExportExcel {{ if $global.AutoCreateBtnAuth }}v-auth="btnAuth.exportExcel"{{ end }} template-id="{{$templateID}}" />
+            <ImportExcel {{ if $global.AutoCreateBtnAuth }}v-auth="btnAuth.importExcel"{{ end }} template-id="{{$templateID}}" @on-success="getTableData" />
+            {{- end }}
        </div>
        <el-table
        ref="multipleTable"
@@ -165,27 +535,32 @@
        >
        <el-table-column type="selection" width="55" />
        {{ if .GvaModel }}
-        <el-table-column align="left" label="日期" prop="createdAt" width="180">
+        <el-table-column align="left" label="日期" prop="createdAt" {{- if .IsTree }} min-{{- end }}width="180">
            <template #default="scope">{{ "{{ formatDate(scope.row.CreatedAt) }}" }}</template>
        </el-table-column>
        {{ end }}
-        {{- range .FrontFields}}
+        {{- range .Fields}}
+        {{- if .Table}}
        {{- if .CheckDataSource }}
        <el-table-column {{- if .Sort}} sortable{{- end}} align="left" label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="120">
          <template #default="scope">
-                {{if eq .DataSource.Association 2}}
+                {{- if eq .DataSource.Association 2}}
                    <el-tag v-for="(item,key) in filterDataSource(dataSource.{{.FieldJson}},scope.row.{{.FieldJson}})" :key="key">
                        {{ "{{ item }}" }}
                    </el-tag>
-                {{ else }}
+                {{- else }}
                    <span>{{"{{"}} filterDataSource(dataSource.{{.FieldJson}},scope.row.{{.FieldJson}}) {{"}}"}}</span>
-                {{ end }}
+                {{- end }}
         </template>
         </el-table-column>
        {{- else if .DictType}}
        <el-table-column {{- if .Sort}} sortable{{- end}} align="left" label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="120">
            <template #default="scope">
-            {{"{{"}} filterDict(scope.row.{{.FieldJson}},{{.DictType}}Options) {{"}}"}}
+                {{if eq .FieldType "array"}}
+                <el-tag class="mr-1" v-for="item in scope.row.{{.FieldJson}}" :key="item"> {{"{{"}} filterDict(item,{{.DictType}}Options) {{"}}"}}</el-tag>
+                {{- else }}
+                {{"{{"}} filterDict(scope.row.{{.FieldJson}},{{.DictType}}Options) {{"}}"}}
+                {{end}}
            </template>
        </el-table-column>
        {{- else if eq .FieldType "bool" }}
@@ -199,14 +574,14 @@
          {{- else if eq .FieldType "picture" }}
          <el-table-column label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="200">
              <template #default="scope">
-                <el-image style="width: 100px; height: 100px" :src="getUrl(scope.row.{{.FieldJson}})" fit="cover"/>
+                <el-image preview-teleported style="width: 100px; height: 100px" :src="getUrl(scope.row.{{.FieldJson}})" fit="cover"/>
              </template>
          </el-table-column>
           {{- else if eq .FieldType "pictures" }}
           <el-table-column label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="200">
              <template #default="scope">
                 <div class="multiple-img-box">
-                    <el-image v-for="(item,index) in scope.row.{{.FieldJson}}" :key="index" style="width: 80px; height: 80px" :src="getUrl(item)" fit="cover"/>
+                    <el-image preview-teleported v-for="(item,index) in scope.row.{{.FieldJson}}" :key="index" style="width: 80px; height: 80px" :src="getUrl(item)" fit="cover"/>
                </div>
              </template>
           </el-table-column>
@@ -242,14 +617,25 @@
                  [JSON]
              </template>
          </el-table-column>
-        {{- else }}
-        <el-table-column {{- if .Sort}} sortable{{- end}} align="left" label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="120" />
+           {{- else if eq .FieldType "array" }}
+           <el-table-column label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="200">
+               <template #default="scope">
+                  <ArrayCtrl v-model="scope.row.{{ .FieldJson }}"/>
+               </template>
+           </el-table-column>
+          {{- else }}
+          <el-table-column {{- if .Sort}} sortable{{- end}} align="left" label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="120" />
+          {{- end }}
        {{- end }}
        {{- end }}
-        <el-table-column align="left" label="操作" fixed="right" min-width="240">
+        <el-table-column align="left" label="操作" fixed="right" :min-width="appStore.operateMinWith">
            <template #default="scope">
-            <el-button type="primary" link icon="edit" class="table-button" @click="update{{.StructName}}Func(scope.row)">变更</el-button>
-            <el-button type="primary" link icon="delete" @click="deleteRow(scope.row)">删除</el-button>
+            {{- if .IsTree }}
+            <el-button {{ if $global.AutoCreateBtnAuth }}v-auth="btnAuth.add"{{ end }} type="primary" link class="table-button" @click="openDialog(scope.row)"><el-icon style="margin-right: 5px"><InfoFilled /></el-icon>新增子节点</el-button>
+            {{- end }}
+            <el-button {{ if $global.AutoCreateBtnAuth }}v-auth="btnAuth.info"{{ end }} type="primary" link class="table-button" @click="getDetails(scope.row)"><el-icon style="margin-right: 5px"><InfoFilled /></el-icon>查看</el-button>
+            <el-button {{ if $global.AutoCreateBtnAuth }}v-auth="btnAuth.edit"{{ end }} type="primary" link icon="edit" class="table-button" @click="update{{.StructName}}Func(scope.row)">编辑</el-button>
+            <el-button {{ if .IsTree }}v-if="!scope.row.children?.length" {{ end }} {{if $global.AutoCreateBtnAuth }}v-auth="btnAuth.delete"{{ end }} type="primary" link icon="delete" @click="deleteRow(scope.row)">删除</el-button>
            </template>
        </el-table-column>
        </el-table>
@@ -265,19 +651,34 @@
            />
        </div>
    </div>
-    <el-drawer destroy-on-close size="800" v-model="dialogFormVisible" :show-close="false" :before-close="closeDialog">
+    <el-drawer destroy-on-close :size="appStore.drawerSize" v-model="dialogFormVisible" :show-close="false" :before-close="closeDialog">
       <template #header>
              <div class="flex justify-between items-center">
-                <span class="text-lg">{{"{{"}}type==='create'?'添加':'修改'{{"}}"}}</span>
+                <span class="text-lg">{{"{{"}}type==='create'?'新增':'编辑'{{"}}"}}</span>
                <div>
-                  <el-button type="primary" @click="enterDialog">确 定</el-button>
+                  <el-button :loading="btnLoading" type="primary" @click="enterDialog">确 定</el-button>
                  <el-button @click="closeDialog">取 消</el-button>
                </div>
              </div>
            </template>

          <el-form :model="formData" label-position="top" ref="elFormRef" :rules="rule" label-width="80px">
-        {{- range .FrontFields}}
+          {{- if .IsTree }}
+            <el-form-item label="父节点:" prop="parentID" >
+                <el-tree-select
+                    v-model="formData.parentID"
+                    :data="[rootNode,...tableData]"
+                    check-strictly
+                    :render-after-expand="false"
+                    :props="defaultProps"
+                    clearable
+                    style="width: 240px"
+                    placeholder="根节点"
+                />
+            </el-form-item>
+          {{- end }}
+        {{- range .Fields}}
+          {{- if .Form}}
            <el-form-item label="{{.FieldDesc}}:"  prop="{{.FieldJson}}" >
          {{- if .CheckDataSource}}
            <el-select {{if eq .DataSource.Association 2}} multiple {{ end }} v-model="formData.{{.FieldJson}}" placeholder="请选择{{.FieldDesc}}" style="width:100%" :clearable="{{.Clearable}}" >
@@ -304,9 +705,13 @@
              {{"{{"}} formData.{{.FieldJson}} {{"}}"}}
          {{- end }}
           {{- if eq .FieldType "array" }}
-           <el-tag v-for="(item,key) in formData.{{.FieldJson}}" :key="key">
-              {{ "{{ item }}" }}
-           </el-tag>
+             {{- if .DictType}}
+               <el-select multiple v-model="formData.{{ .FieldJson }}" placeholder="请选择{{.FieldDesc}}" style="width:100%" :clearable="{{.Clearable}}" >
+                 <el-option v-for="(item,key) in {{ .DictType }}Options" :key="key" :label="item.label" :value="item.value" />
+               </el-select>
+             {{- else }}
+              <ArrayCtrl v-model="formData.{{ .FieldJson }}" editable/>
+              {{- end }}
           {{- end }}
          {{- if eq .FieldType "int" }}
              <el-input v-model.number="formData.{{ .FieldJson }}" :clearable="{{.Clearable}}" placeholder="请输入{{.FieldDesc}}" />
@@ -347,8 +752,74 @@
          {{- end }}
            </el-form-item>
          {{- end }}
+          {{- end }}
          </el-form>
    </el-drawer>
+
+    <el-drawer destroy-on-close :size="appStore.drawerSize" v-model="detailShow" :show-close="true" :before-close="closeDetailShow" title="查看">
+            <el-descriptions :column="1" border>
+            {{- if .IsTree }}
+            <el-descriptions-item label="父节点">
+                <el-tree-select
+                  v-model="detailFrom.parentID"
+                  :data="[rootNode,...tableData]"
+                  check-strictly
+                  disabled
+                  :render-after-expand="false"
+                  :props="defaultProps"
+                  clearable
+                  style="width: 240px"
+                  placeholder="根节点"
+                />
+            </el-descriptions-item>
+            {{- end }}
+            {{- range .Fields}}
+              {{- if .Desc }}
+                    <el-descriptions-item label="{{ .FieldDesc }}">
+                    {{- if .CheckDataSource }}
+                       {{- if eq .DataSource.Association 2}}
+                       <el-tag v-for="(item,key) in filterDataSource(dataSource.{{.FieldJson}},detailFrom.{{.FieldJson}})" :key="key">
+                            {{ "{{ item }}" }}
+                       </el-tag>
+                       {{- else }}
+                       <span>{{"{{"}} filterDataSource(dataSource.{{.FieldJson}},detailFrom.{{.FieldJson}}) {{"}}"}}</span>
+                       {{- end }}
+                 {{- else if .DictType}}
+                        {{if eq .FieldType "array"}}
+                        <el-tag class="mr-1" v-for="item in detailFrom.{{.FieldJson}}" :key="item"> {{"{{"}} filterDict(item,{{.DictType}}Options) {{"}}"}}</el-tag>
+                        {{- else }}
+                        {{"{{"}} filterDict(detailFrom.{{.FieldJson}},{{.DictType}}Options) {{"}}"}}
+                        {{end}}
+                {{- else if and (ne .FieldType "picture" ) (ne .FieldType "richtext" ) (ne .FieldType "pictures" ) (ne .FieldType "file" ) (ne .FieldType "array" ) }}
+                        {{"{{"}} detailFrom.{{.FieldJson}} {{"}}"}}
+                {{- else }}
+                    {{- if eq .FieldType "picture" }}
+                            <el-image style="width: 50px; height: 50px" :preview-src-list="returnArrImg(detailFrom.{{ .FieldJson }})" :src="getUrl(detailFrom.{{ .FieldJson }})" fit="cover" />
+                    {{- end }}
+                    {{- if eq .FieldType "array" }}
+                            <ArrayCtrl v-model="detailFrom.{{ .FieldJson }}"/>
+                    {{- end }}
+                    {{- if eq .FieldType "pictures" }}
+                            <el-image style="width: 50px; height: 50px; margin-right: 10px" :preview-src-list="returnArrImg(detailFrom.{{ .FieldJson }})" :initial-index="index" v-for="(item,index) in detailFrom.{{ .FieldJson }}" :key="index" :src="getUrl(item)" fit="cover" />
+                    {{- end }}
+                    {{- if eq .FieldType "richtext" }}
+                            <RichView v-model="detailFrom.{{.FieldJson}}" />
+                    {{- end }}
+                    {{- if eq .FieldType "file" }}
+                            <div class="fileBtn" v-for="(item,index) in detailFrom.{{ .FieldJson }}" :key="index">
+                              <el-button type="primary" text bg @click="onDownloadFile(item.url)">
+                                <el-icon style="margin-right: 5px"><Download /></el-icon>
+                                {{"{{"}}item.name{{"}}"}}
+                              </el-button>
+                            </div>
+                    {{- end }}
+                {{- end }}
+                    </el-descriptions-item>
+              {{- end }}
+            {{- end }}
+            </el-descriptions>
+        </el-drawer>
+
  </div>
 </template>

@@ -376,23 +847,52 @@ import SelectImage from '@/components/selectImage/selectImage.vue'
 {{- if .HasRichText }}
 // 富文本组件
 import RichEdit from '@/components/richtext/rich-edit.vue'
+import RichView from '@/components/richtext/rich-view.vue'
 {{- end }}

-
 {{- if .HasFile }}
 // 文件选择组件
 import SelectFile from '@/components/selectFile/selectFile.vue'
 {{- end }}

+{{- if .HasArray}}
+// 数组控制组件
+import ArrayCtrl from '@/components/arrayCtrl/arrayCtrl.vue'
+{{- end }}
+
 // 全量引入格式化工具 请按需保留
-import { getDictFunc, formatDate, formatBoolean, filterDict ,filterDataSource, ReturnArrImg, onDownloadFile } from '@/utils/format'
+import { getDictFunc, formatDate, formatBoolean, filterDict ,filterDataSource, returnArrImg, onDownloadFile } from '@/utils/format'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { ref, reactive } from 'vue'
+{{- if .AutoCreateBtnAuth }}
+// 引入按钮权限标识
+import { useBtnAuth } from '@/utils/btnAuth'
+{{- end }}
+import { useAppStore } from "@/pinia"
+
+{{if .HasExcel -}}
+// 导出组件
+import ExportExcel from '@/components/exportExcel/exportExcel.vue'
+// 导入组件
+import ImportExcel from '@/components/exportExcel/importExcel.vue'
+// 导出模板组件
+import ExportTemplate from '@/components/exportExcel/exportTemplate.vue'
+{{- end}}
+

 defineOptions({
    name: '{{.StructName}}'
 })

+{{- if .AutoCreateBtnAuth }}
+// 按钮权限实例化
+    const btnAuth = useBtnAuth()
+{{- end }}
+
+// 提交按钮loading
+const btnLoading = ref(false)
+const appStore = useAppStore()
+
 // 控制更多查询条件显示/隐藏状态
 const showAllQuery = ref(false)

@@ -401,43 +901,48 @@ const showAllQuery = ref(false)
 const {{ $element }}Options = ref([])
    {{- end }}
 const formData = ref({
-        {{- range .FrontFields}}
-        {{- 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}}: [],
+        {{- if .IsTree }}
+            parentID:undefined,
        {{- end }}
+        {{- 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 .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 }}
        })

@@ -456,7 +961,8 @@ const formData = ref({

 // 验证规则
 const rule = reactive({
-    {{- range .FrontFields }}
+    {{- range .Fields }}
+        {{- if .Form }}
            {{- if eq .Require true }}
               {{.FieldJson }} : [{
                   required: true,
@@ -472,6 +978,7 @@ const rule = reactive({
              {{- end }}
              ],
            {{- end }}
+        {{- end }}
    {{- end }}
 })

@@ -489,7 +996,7 @@ const searchRule = reactive({
      }
    }, trigger: 'change' }
  ],
-  {{- range .FrontFields }}
+  {{- range .Fields }}
    {{- if .FieldSearchType}}
      {{- if eq .FieldType "time.Time" }}
        {{.FieldJson }} : [{ validator: (rule, value, callback) => {
@@ -522,12 +1029,14 @@ const searchInfo = ref({})
 // 排序
 const sortChange = ({ prop, order }) => {
  const sortMap = {
-    {{- range .FrontFields}}
+    {{- range .Fields}}
+     {{- if .Table}}
      {{- if and .Sort}}
        {{- if not (eq .ColumnName "")}}
            {{.FieldJson}}: '{{.ColumnName}}',
        {{- end}}
      {{- end}}
+     {{- end}}
    {{- end}}
  }

@@ -542,6 +1051,7 @@ const sortChange = ({ prop, order }) => {
 }
 {{- end}}

+{{- if not .IsTree }}
 // 重置
 const onReset = () => {
  searchInfo.value = {}
@@ -553,8 +1063,7 @@ const onSubmit = () => {
  elSearchFormRef.value?.validate(async(valid) => {
    if (!valid) return
    page.value = 1
-    pageSize.value = 10
-    {{- range .FrontFields}}{{- if eq .FieldType "bool" }}
+    {{- range .Fields}}{{- if eq .FieldType "bool" }}
    if (searchInfo.value.{{.FieldJson}} === ""){
        searchInfo.value.{{.FieldJson}}=null
    }{{ end }}{{ end }}
@@ -584,6 +1093,28 @@ const getTableData = async() => {
    pageSize.value = table.data.pageSize
  }
 }
+{{- else }}
+// 树选择器配置
+const defaultProps = {
+  children: "children",
+  label: "{{ .TreeJson }}",
+  value: "{{ .PrimaryField.FieldJson }}"
+}
+
+const rootNode = {
+  {{ .PrimaryField.FieldJson }}: 0,
+  {{ .TreeJson }}: '根节点',
+  children: []
+}
+
+// 查询
+const getTableData = async() => {
+  const table = await get{{.StructName}}List()
+  if (table.code === 0) {
+    tableData.value = table.data || []
+  }
+}
+{{- end }}

 getTableData()

@@ -684,8 +1215,11 @@ const delete{{.StructName}}Func = async (row) => {
 const dialogFormVisible = ref(false)

 // 打开弹窗
-const openDialog = () => {
+const openDialog = ({{- if .IsTree -}}row{{- end -}}) => {
    type.value = 'create'
+    {{- if .IsTree }}
+    formData.value.parentID = row ? row.{{.PrimaryField.FieldJson}} : undefined
+    {{- end }}
    dialogFormVisible.value = true
 }

@@ -693,7 +1227,8 @@ const openDialog = () => {
 const closeDialog = () => {
    dialogFormVisible.value = false
    formData.value = {
-    {{- range .FrontFields}}
+    {{- range .Fields}}
+      {{- if .Form}}
        {{- if eq .FieldType "bool" }}
        {{.FieldJson}}: false,
        {{- end }}
@@ -704,7 +1239,7 @@ const closeDialog = () => {
        {{.FieldJson}}: '',
        {{- end }}
        {{- if eq .FieldType "int" }}
-        {{.FieldJson}}: {{- if or .DictType .DataSource }} undefined{{ else }} 0{{- end }},
+        {{.FieldJson}}: {{- if .DataSource }} undefined{{ else }} 0{{- end }},
        {{- end }}
        {{- if eq .FieldType "time.Time" }}
        {{.FieldJson}}: new Date(),
@@ -727,13 +1262,18 @@ const closeDialog = () => {
        {{- if eq .FieldType "json" }}
        {{.FieldJson}}: {},
        {{- end }}
+        {{- if eq .FieldType "array" }}
+        {{.FieldJson}}: [],
        {{- end }}
+      {{- end }}
+    {{- end }}
        }
 }
 // 弹窗确定
 const enterDialog = async () => {
+     btnLoading.value = true
     elFormRef.value?.validate( async (valid) => {
-             if (!valid) return
+             if (!valid) return btnLoading.value = false
              let res
              switch (type.value) {
                case 'create':
@@ -746,6 +1286,7 @@ const enterDialog = async () => {
                  res = await create{{.StructName}}(formData.value)
                  break
              }
+              btnLoading.value = false
              if (res.code === 0) {
                ElMessage({
                  type: 'success',
@@ -761,6 +1302,37 @@ const downloadFile = (url) => {
    window.open(getUrl(url), '_blank')
 }
 {{end}}
+
+const detailFrom = ref({})
+
+// 查看详情控制标记
+const detailShow = ref(false)
+
+
+// 打开详情弹窗
+const openDetailShow = () => {
+  detailShow.value = true
+}
+
+
+// 打开详情
+const getDetails = async (row) => {
+  // 打开弹窗
+  const res = await find{{.StructName}}({ {{.PrimaryField.FieldJson}}: row.{{.PrimaryField.FieldJson}} })
+  if (res.code === 0) {
+    detailFrom.value = res.data
+    openDetailShow()
+  }
+}
+
+
+// 关闭详情弹窗
+const closeDetailShow = () => {
+  detailShow.value = false
+  detailFrom.value = {}
+}
+
+
 </script>

 <style>
@@ -780,3 +1352,17 @@ const downloadFile = (url) => {
 }
 {{end}}
 </style>
+{{- else}}
+<template>
+<div>form</div>
+</template>
+<script setup>
+defineOptions({
+  name: '{{.StructName}}'
+})
+</script>
+<style>
+</style>
+{{- end }}
+
+{{- end }}
@@ -1 +0,0 @@
-<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="renderer" content="webkit"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>variant-form</title><link href="css/app.7832f89c.css" rel="preload" as="style"><link href="css/chunk-vendors.a16c4353.css" rel="preload" as="style"><link href="js/app.9fe02340.js" rel="preload" as="script"><link href="js/chunk-vendors.2e7c88f1.js" rel="preload" as="script"><link href="css/chunk-vendors.a16c4353.css" rel="stylesheet"><link href="css/app.7832f89c.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but variant-form doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="js/chunk-vendors.2e7c88f1.js"></script><script src="js/app.9fe02340.js"></script></body></html>
@@ -1,26 +1,33 @@
 package api

 import (
-	"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"
+{{if not .OnlyTemplate}}
+	"{{.Module}}/global"
+    "{{.Module}}/model/common/response"
+    "{{.Module}}/plugin/{{.Package}}/model"
+    {{- if not .IsTree}}
+    "{{.Module}}/plugin/{{.Package}}/model/request"
+    {{- end }}
    "github.com/gin-gonic/gin"
    "go.uber.org/zap"
    {{- if .AutoCreateResource}}
-    "github.com/flipped-aurora/gin-vue-admin/server/utils"
+    "{{.Module}}/utils"
    {{- end }}
+{{- else }}
+    "{{.Module}}/model/common/response"
+    "github.com/gin-gonic/gin"
+{{- end }}
 )

 var {{.StructName}} = new({{.Abbreviation}})

 type {{.Abbreviation}} struct {}
-
+{{if not .OnlyTemplate}}
 // Create{{.StructName}} 创建{{.Description}}
 // @Tags {{.StructName}}
 // @Summary 创建{{.Description}}
 // @Security ApiKeyAuth
-// @accept application/json
+// @Accept application/json
 // @Produce application/json
 // @Param data body model.{{.StructName}} true "创建{{.Description}}"
 // @Success 200 {object} response.Response{msg=string} "创建成功"
@@ -38,7 +45,7 @@ func (a *{{.Abbreviation}}) Create{{.StructName}}(c *gin.Context) {
 	err = service{{ .StructName }}.Create{{.StructName}}(&info)
 	if err != nil {
        global.GVA_LOG.Error("创建失败!", zap.Error(err))
-		response.FailWithMessage("创建失败", c)
+		response.FailWithMessage("创建失败:" + err.Error(), c)
 		return
 	}
    response.OkWithMessage("创建成功", c)
@@ -48,7 +55,7 @@ func (a *{{.Abbreviation}}) Create{{.StructName}}(c *gin.Context) {
 // @Tags {{.StructName}}
 // @Summary 删除{{.Description}}
 // @Security ApiKeyAuth
-// @accept application/json
+// @Accept application/json
 // @Produce application/json
 // @Param data body model.{{.StructName}} true "删除{{.Description}}"
 // @Success 200 {object} response.Response{msg=string} "删除成功"
@@ -61,7 +68,7 @@ func (a *{{.Abbreviation}}) Delete{{.StructName}}(c *gin.Context) {
 	err := service{{ .StructName }}.Delete{{.StructName}}({{.PrimaryField.FieldJson}} {{- if .AutoCreateResource -}},userID{{- end -}})
 	if err != nil {
        global.GVA_LOG.Error("删除失败!", zap.Error(err))
-		response.FailWithMessage("删除失败", c)
+		response.FailWithMessage("删除失败:" + err.Error(), c)
 		return
 	}
    response.OkWithMessage("删除成功", c)
@@ -71,7 +78,7 @@ func (a *{{.Abbreviation}}) Delete{{.StructName}}(c *gin.Context) {
 // @Tags {{.StructName}}
 // @Summary 批量删除{{.Description}}
 // @Security ApiKeyAuth
-// @accept application/json
+// @Accept application/json
 // @Produce application/json
 // @Success 200 {object} response.Response{msg=string} "批量删除成功"
 // @Router /{{.Abbreviation}}/delete{{.StructName}}ByIds [delete]
@@ -83,7 +90,7 @@ func (a *{{.Abbreviation}}) Delete{{.StructName}}ByIds(c *gin.Context) {
 	err := service{{ .StructName }}.Delete{{.StructName}}ByIds({{.PrimaryField.FieldJson}}s{{- if .AutoCreateResource }},userID{{- end }})
 	if err != nil {
        global.GVA_LOG.Error("批量删除失败!", zap.Error(err))
-		response.FailWithMessage("批量删除失败", c)
+		response.FailWithMessage("批量删除失败:" + err.Error(), c)
 		return
 	}
    response.OkWithMessage("批量删除成功", c)
@@ -93,7 +100,7 @@ func (a *{{.Abbreviation}}) Delete{{.StructName}}ByIds(c *gin.Context) {
 // @Tags {{.StructName}}
 // @Summary 更新{{.Description}}
 // @Security ApiKeyAuth
-// @accept application/json
+// @Accept application/json
 // @Produce application/json
 // @Param data body model.{{.StructName}} true "更新{{.Description}}"
 // @Success 200 {object} response.Response{msg=string} "更新成功"
@@ -111,7 +118,7 @@ func (a *{{.Abbreviation}}) Update{{.StructName}}(c *gin.Context) {
 	err = service{{ .StructName }}.Update{{.StructName}}(info)
    if err != nil {
        global.GVA_LOG.Error("更新失败!", zap.Error(err))
-		response.FailWithMessage("更新失败", c)
+		response.FailWithMessage("更新失败:" + err.Error(), c)
 		return
 	}
    response.OkWithMessage("更新成功", c)
@@ -121,9 +128,9 @@ func (a *{{.Abbreviation}}) Update{{.StructName}}(c *gin.Context) {
 // @Tags {{.StructName}}
 // @Summary 用id查询{{.Description}}
 // @Security ApiKeyAuth
-// @accept application/json
+// @Accept application/json
 // @Produce application/json
-// @Param data query model.{{.StructName}} true "用id查询{{.Description}}"
+// @Param {{.PrimaryField.FieldJson}} query {{.PrimaryField.FieldType}} true "用id查询{{.Description}}"
 // @Success 200 {object} response.Response{data=model.{{.StructName}},msg=string} "查询成功"
 // @Router /{{.Abbreviation}}/find{{.StructName}} [get]
 func (a *{{.Abbreviation}}) Find{{.StructName}}(c *gin.Context) {
@@ -131,17 +138,36 @@ func (a *{{.Abbreviation}}) Find{{.StructName}}(c *gin.Context) {
 	re{{.Abbreviation}}, err := service{{ .StructName }}.Get{{.StructName}}({{.PrimaryField.FieldJson}})
 	if err != nil {
        global.GVA_LOG.Error("查询失败!", zap.Error(err))
-		response.FailWithMessage("查询失败", c)
+		response.FailWithMessage("查询失败:" + err.Error(), c)
 		return
 	}
    response.OkWithData(re{{.Abbreviation}}, c)
 }

+{{- if .IsTree }}
 // Get{{.StructName}}List 分页获取{{.Description}}列表
 // @Tags {{.StructName}}
 // @Summary 分页获取{{.Description}}列表
 // @Security ApiKeyAuth
-// @accept application/json
+// @Accept application/json
+// @Produce application/json
+// @Success 200 {object} response.Response{data=response.PageResult,msg=string} "获取成功"
+// @Router /{{.Abbreviation}}/get{{.StructName}}List [get]
+func (a *{{.Abbreviation}}) Get{{.StructName}}List(c *gin.Context) {
+	list, err := service{{ .StructName }}.Get{{.StructName}}InfoList()
+	if err != nil {
+	    global.GVA_LOG.Error("获取失败!", zap.Error(err))
+        response.FailWithMessage("获取失败:" + err.Error(), c)
+        return
+    }
+    response.OkWithDetailed(list, "获取成功", c)
+}
+{{- else }}
+// Get{{.StructName}}List 分页获取{{.Description}}列表
+// @Tags {{.StructName}}
+// @Summary 分页获取{{.Description}}列表
+// @Security ApiKeyAuth
+// @Accept application/json
 // @Produce application/json
 // @Param data query request.{{.StructName}}Search true "分页获取{{.Description}}列表"
 // @Success 200 {object} response.Response{data=response.PageResult,msg=string} "获取成功"
@@ -156,7 +182,7 @@ func (a *{{.Abbreviation}}) Get{{.StructName}}List(c *gin.Context) {
 	list, total, err := service{{ .StructName }}.Get{{.StructName}}InfoList(pageInfo)
 	if err != nil {
 	    global.GVA_LOG.Error("获取失败!", zap.Error(err))
-        response.FailWithMessage("获取失败", c)
+        response.FailWithMessage("获取失败:" + err.Error(), c)
        return
    }
    response.OkWithDetailed(response.PageResult{
@@ -166,12 +192,13 @@ func (a *{{.Abbreviation}}) Get{{.StructName}}List(c *gin.Context) {
        PageSize: pageInfo.PageSize,
    }, "获取成功", c)
 }
+{{- end }}

 {{- if .HasDataSource }}
 // Get{{.StructName}}DataSource 获取{{.StructName}}的数据源
 // @Tags {{.StructName}}
 // @Summary 获取{{.StructName}}的数据源
-// @accept application/json
+// @Accept application/json
 // @Produce application/json
 // @Success 200 {object} response.Response{data=object,msg=string} "查询成功"
 // @Router /{{.Abbreviation}}/get{{.StructName}}DataSource [get]
@@ -180,22 +207,22 @@ func (a *{{.Abbreviation}}) Get{{.StructName}}DataSource(c *gin.Context) {
   dataSource, err := service{{ .StructName }}.Get{{.StructName}}DataSource()
   if err != nil {
 		global.GVA_LOG.Error("查询失败!", zap.Error(err))
-        response.FailWithMessage("查询失败", c)
+        response.FailWithMessage("查询失败:" + err.Error(), c)
 		return
   }
    response.OkWithData(dataSource, c)
 }
 {{- end }}
-
+{{- end }}
 // Get{{.StructName}}Public 不需要鉴权的{{.Description}}接口
 // @Tags {{.StructName}}
 // @Summary 不需要鉴权的{{.Description}}接口
-// @accept application/json
+// @Accept application/json
 // @Produce application/json
-// @Param data query request.{{.StructName}}Search true "分页获取{{.Description}}列表"
 // @Success 200 {object} response.Response{data=object,msg=string} "获取成功"
 // @Router /{{.Abbreviation}}/get{{.StructName}}Public [get]
 func (a *{{.Abbreviation}}) Get{{.StructName}}Public(c *gin.Context) {
    // 此接口不需要鉴权 示例为返回了一个固定的消息接口，一般本接口用于C端服务，需要自己实现业务逻辑
+    service{{ .StructName }}.Get{{.StructName}}Public()
    response.OkWithDetailed(gin.H{"info": "不需要鉴权的{{.Description}}接口信息"}, "获取成功", c)
 }
@@ -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) {
@@ -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"
 )
@@ -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) {
@@ -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"
 )

@@ -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"
 )
@@ -1,8 +1,34 @@
+{{- if .IsAdd}}
+// 在结构体中新增如下字段
+{{- range .Fields}}
+{{- if eq .FieldType "enum" }}
+{{.FieldName}}  string `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};type:enum({{.DataTypeLong}});comment:{{.Comment}};" {{- if .Require }} binding:"required"{{- end -}}`
+{{- else if eq .FieldType "picture" }}
+{{.FieldName}}  string `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require }} binding:"required"{{- end -}}`
+{{- else if eq .FieldType "video" }}
+{{.FieldName}}  string `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require }} binding:"required"{{- end -}}`
+{{- else if eq .FieldType "file" }}
+{{.FieldName}}  datatypes.JSON `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require }} binding:"required"{{- end }} swaggertype:"array,object"`
+{{- else if eq .FieldType "pictures" }}
+{{.FieldName}}  datatypes.JSON `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require }} binding:"required"{{- end }} swaggertype:"array,object"`
+{{- else if eq .FieldType "richtext" }}
+{{.FieldName}}  *string `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}type:text;" {{- if .Require }} binding:"required"{{- end -}}`
+{{- else if eq .FieldType "json" }}
+{{.FieldName}}  datatypes.JSON `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}type:text;" {{- if .Require }} binding:"required"{{- end }} swaggertype:"object"`
+{{- else if eq .FieldType "array" }}
+{{.FieldName}}  datatypes.JSON `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}type:text;" {{- if .Require }} binding:"required"{{- end }} swaggertype:"array,object"`
+{{- else }}
+{{.FieldName}}  *{{.FieldType}} `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require }} binding:"required"{{- end -}}`
+{{- end }}  {{ if .FieldDesc }}//{{.FieldDesc}}{{ end }}
+{{- end }}
+
+{{ else }}
 package model

+{{- if not .OnlyTemplate}}
 import (
 	{{- if .GvaModel }}
-	"github.com/flipped-aurora/gin-vue-admin/server/global"
+	"{{.Module}}/global"
 	{{- end }}
 	{{- if or .HasTimer }}
 	"time"
@@ -11,9 +37,11 @@ import (
 	"gorm.io/datatypes"
 	{{- end }}
 )
+{{- end }}

 // {{.StructName}} {{.Description}} 结构体
 type {{.StructName}} struct {
+{{- if not .OnlyTemplate}}
 {{- if .GvaModel }}
    global.GVA_MODEL
 {{- end }}
@@ -25,26 +53,29 @@ type {{.StructName}} struct {
    {{- else if eq .FieldType "video" }}
    {{.FieldName}}  string `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require }} binding:"required"{{- end -}}`
    {{- else if eq .FieldType "file" }}
-    {{.FieldName}}  datatypes.JSON `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require }} binding:"required"{{- end -}} swaggertype:"array,object"`
+    {{.FieldName}}  datatypes.JSON `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require }} binding:"required"{{- end }} swaggertype:"array,object"`
    {{- else if eq .FieldType "pictures" }}
-    {{.FieldName}}  datatypes.JSON `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require }} binding:"required"{{- end -}} swaggertype:"array,object"`
+    {{.FieldName}}  datatypes.JSON `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require }} binding:"required"{{- end }} swaggertype:"array,object"`
    {{- else if eq .FieldType "richtext" }}
-    {{.FieldName}}  string `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}type:text;" {{- if .Require }} binding:"required"{{- end -}}`
+    {{.FieldName}}  *string `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}type:text;" {{- if .Require }} binding:"required"{{- end -}}`
    {{- else if eq .FieldType "json" }}
-    {{.FieldName}}  datatypes.JSON `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}type:text;" {{- if .Require }} binding:"required"{{- end -}} swaggertype:"object"`
+    {{.FieldName}}  datatypes.JSON `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}type:text;" {{- if .Require }} binding:"required"{{- end }} swaggertype:"object"`
    {{- else if eq .FieldType "array" }}
-    {{.FieldName}}  datatypes.JSON `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}type:text;" {{- if .Require }} binding:"required"{{- end -}} swaggertype:"array,object"`
-    {{- else if ne .FieldType "string" }}
-    {{.FieldName}}  *{{.FieldType}} `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require }} binding:"required"{{- end -}}`
+    {{.FieldName}}  datatypes.JSON `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}type:text;" {{- if .Require }} binding:"required"{{- end }} swaggertype:"array,object"`
    {{- else }}
-    {{.FieldName}}  {{.FieldType}} `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require }} binding:"required"{{- end -}}`
-    {{- end }}  {{ if .FieldDesc }}//{{.FieldDesc}} {{ end }}
+    {{.FieldName}}  *{{.FieldType}} `json:"{{.FieldJson}}" form:"{{.FieldJson}}" gorm:"{{- if ne .FieldIndexType "" -}}{{ .FieldIndexType }};{{- end -}}{{- if .PrimaryKey -}}primarykey;{{- end -}}{{- if .DefaultValue -}}default:{{ .DefaultValue }};{{- end -}}column:{{.ColumnName}};comment:{{.Comment}};{{- if .DataTypeLong -}}size:{{.DataTypeLong}};{{- end -}}" {{- if .Require }} binding:"required"{{- end -}}`
+    {{- end }}  {{ if .FieldDesc }}//{{.FieldDesc}}{{ end }}
 {{- end }}
    {{- if .AutoCreateResource }}
    CreatedBy  uint   `gorm:"column:created_by;comment:创建者"`
    UpdatedBy  uint   `gorm:"column:updated_by;comment:更新者"`
    DeletedBy  uint   `gorm:"column:deleted_by;comment:删除者"`
    {{- end }}
+    {{- if .IsTree }}
+    Children   []*{{.StructName}} `json:"children" gorm:"-"`     //子节点
+    ParentID   int             `json:"parentID" gorm:"column:parent_id;comment:父节点"`
+    {{- end }}
+    {{- end }}
 }

 {{ if .TableName }}
@@ -53,3 +84,29 @@ func ({{.StructName}}) TableName() string {
    return "{{.TableName}}"
 }
 {{ end }}
+
+
+{{if .IsTree }}
+// GetChildren 实现TreeNode接口
+func (s *{{.StructName}}) GetChildren() []*{{.StructName}} {
+    return s.Children
+}
+
+// SetChildren 实现TreeNode接口
+func (s *{{.StructName}}) SetChildren(children *{{.StructName}}) {
+	s.Children = append(s.Children, children)
+}
+
+// GetID 实现TreeNode接口
+func (s *{{.StructName}}) GetID() int {
+    return int({{if not .GvaModel}}*{{- end }}s.{{.PrimaryField.FieldName}})
+}
+
+// GetParentID 实现TreeNode接口
+func (s *{{.StructName}}) GetParentID() int {
+    return s.ParentID
+}
+{{ end }}
+
+
+{{ end }}
@@ -1,11 +1,34 @@
+{{- if .IsAdd}}
+// 在结构体中新增如下字段
+{{- range .Fields}}
+    {{- if ne .FieldSearchType ""}}
+        {{- if eq .FieldSearchType "BETWEEN" "NOT BETWEEN"}}
+Start{{.FieldName}}  *{{.FieldType}}  `json:"start{{.FieldName}}" form:"start{{.FieldName}}"`
+End{{.FieldName}}  *{{.FieldType}}  `json:"end{{.FieldName}}" form:"end{{.FieldName}}"`
+        {{- else }}
+            {{- if or (eq .FieldType "enum") (eq .FieldType "picture") (eq .FieldType "pictures") (eq .FieldType "video") (eq .FieldType "json") }}
+{{.FieldName}}  string `json:"{{.FieldJson}}" form:"{{.FieldJson}}" `
+            {{- else }}
+{{.FieldName}}  *{{.FieldType}} `json:"{{.FieldJson}}" form:"{{.FieldJson}}" `
+            {{- end }}
+        {{- end }}
+    {{- end}}
+{{- end }}
+{{- if .NeedSort}}
+Sort  string `json:"sort" form:"sort"`
+Order string `json:"order" form:"order"`
+{{- end}}
+{{- else }}
 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}}
 type {{.StructName}}Search struct{
+{{- if not .OnlyTemplate}}
+
 {{- if .GvaModel }}
    StartCreatedAt *time.Time `json:"startCreatedAt" form:"startCreatedAt"`
    EndCreatedAt   *time.Time `json:"endCreatedAt" form:"endCreatedAt"`
@@ -16,18 +39,10 @@ type {{.StructName}}Search struct{
    Start{{.FieldName}}  *{{.FieldType}}  `json:"start{{.FieldName}}" form:"start{{.FieldName}}"`
    End{{.FieldName}}  *{{.FieldType}}  `json:"end{{.FieldName}}" form:"end{{.FieldName}}"`
        {{- else }}
-            {{- if eq .FieldType "enum" }}
-    {{.FieldName}}  string `json:"{{.FieldJson}}" form:"{{.FieldJson}}"`
-            {{- else if eq .FieldType "picture" }}
+            {{- if or (eq .FieldType "enum") (eq .FieldType "picture") (eq .FieldType "pictures") (eq .FieldType "video") (eq .FieldType "json") }}
    {{.FieldName}}  string `json:"{{.FieldJson}}" form:"{{.FieldJson}}" `
-            {{- else if eq .FieldType "video" }}
-    {{.FieldName}}  string `json:"{{.FieldJson}}" form:"{{.FieldJson}}" `
-            {{- else if eq .FieldType "richtext" }}
-    {{.FieldName}}  string `json:"{{.FieldJson}}" form:"{{.FieldJson}}" `
-            {{- else if ne .FieldType "string" }}
-    {{.FieldName}}  *{{.FieldType}} `json:"{{.FieldJson}}" form:"{{.FieldJson}}" `
            {{- else }}
-    {{.FieldName}}  {{.FieldType}} `json:"{{.FieldJson}}" form:"{{.FieldJson}}" `
+    {{.FieldName}}  *{{.FieldType}} `json:"{{.FieldJson}}" form:"{{.FieldJson}}" `
            {{- end }}
        {{- end }}
    {{- end}}
@@ -37,4 +52,6 @@ type {{.StructName}}Search struct{
    Sort  string `json:"sort" form:"sort"`
    Order string `json:"order" form:"order"`
    {{- end}}
+{{- end }}
 }
+{{- end }}
@@ -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"
 )

@@ -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
@@ -1,7 +1,7 @@
 package router

 import (
-	"github.com/flipped-aurora/gin-vue-admin/server/middleware"
+	{{if .OnlyTemplate }} // {{end}}"{{.Module}}/middleware"
 	"github.com/gin-gonic/gin"
 )

@@ -11,6 +11,7 @@ type {{.Abbreviation}} struct {}

 // Init 初始化 {{.Description}} 路由信息
 func (r *{{.Abbreviation}}) Init(public *gin.RouterGroup, private *gin.RouterGroup) {
+{{- if not .OnlyTemplate }}
 	{
 	    group := private.Group("{{.Abbreviation}}").Use(middleware.OperationRecord())
 		group.POST("create{{.StructName}}", api{{.StructName}}.Create{{.StructName}})   // 新建{{.Description}}
@@ -23,11 +24,23 @@ func (r *{{.Abbreviation}}) Init(public *gin.RouterGroup, private *gin.RouterGro
 		group.GET("find{{.StructName}}", api{{.StructName}}.Find{{.StructName}})        // 根据ID获取{{.Description}}
 		group.GET("get{{.StructName}}List", api{{.StructName}}.Get{{.StructName}}List)  // 获取{{.Description}}列表
 	}
-	{{- if .HasDataSource}}
 	{
 	    group := public.Group("{{.Abbreviation}}")
+    	{{- if .HasDataSource}}
 	    group.GET("get{{.StructName}}DataSource", api{{.StructName}}.Get{{.StructName}}DataSource)  // 获取{{.Description}}数据源
-	    group.GET("get{{.StructName}}Public", api{{.StructName}}.Get{{.StructName}}Public)  // 获取{{.Description}}列表
+	    {{- end}}
+	    group.GET("get{{.StructName}}Public", api{{.StructName}}.Get{{.StructName}}Public)  // {{.Description}}开放接口
 	}
-	{{- end}}
+{{- else}}
+     // {
+	 //   group := private.Group("{{.Abbreviation}}").Use(middleware.OperationRecord())
+	 // }
+	 // {
+     //   group := private.Group("{{.Abbreviation}}")
+     // }
+    {
+	    group := public.Group("{{.Abbreviation}}")
+	    group.GET("get{{.StructName}}Public", api{{.StructName}}.Get{{.StructName}}Public)  // {{.Description}}开放接口
+    }
+{{- end}}
 }
@@ -1,12 +1,77 @@
+{{- $db := "" }}
+{{- if eq .BusinessDB "" }}
+ {{- $db = "global.GVA_DB" }}
+{{- else}}
+ {{- $db =  printf "global.MustGetGlobalDBByDBName(\"%s\")" .BusinessDB   }}
+{{- end}}
+
+{{- if .IsAdd}}
+
+// Get{{.StructName}}InfoList 新增搜索语句
+        {{- range .Fields}}
+            {{- if .FieldSearchType}}
+                {{- if or (eq .FieldType "enum") (eq .FieldType "pictures") (eq .FieldType "picture") (eq .FieldType "video") (eq .FieldType "json") }}
+if info.{{.FieldName}} != "" {
+        {{- if or (eq .FieldType "enum") }}
+    db = db.Where("{{.ColumnName}} {{.FieldSearchType}} ?",{{if eq .FieldSearchType "LIKE"}}"%"+ {{ end }}*info.{{.FieldName}}{{if eq .FieldSearchType "LIKE"}}+"%"{{ end }})
+        {{- else}}
+// 数据类型为复杂类型，请根据业务需求自行实现复杂类型的查询业务
+        {{- end}}
+}
+    {{- else if eq .FieldSearchType "BETWEEN" "NOT BETWEEN"}}
+if info.Start{{.FieldName}} != nil && info.End{{.FieldName}} != nil {
+    db = db.Where("{{.ColumnName}} {{.FieldSearchType}} ? AND ? ",info.Start{{.FieldName}},info.End{{.FieldName}})
+}
+    {{- else}}
+if info.{{.FieldName}} != nil{{- if eq .FieldType "string" }} && *info.{{.FieldName}} != ""{{- end }} {
+    db = db.Where("{{.ColumnName}} {{.FieldSearchType}} ?",{{if eq .FieldSearchType "LIKE"}}"%"+{{ end }}*info.{{.FieldName}}{{if eq .FieldSearchType "LIKE"}}+"%"{{ end }})
+}
+            {{- end }}
+        {{- end }}
+    {{- end }}
+
+
+// Get{{.StructName}}InfoList 新增排序语句 请自行在搜索语句中添加orderMap内容
+       {{- range .Fields}}
+            {{- if .Sort}}
+orderMap["{{.ColumnName}}"] = true
+         	{{- end}}
+       {{- end}}
+
+
+{{- if .HasDataSource }}
+//  Get{{.StructName}}DataSource()方法新增关联语句
+	{{range $key, $value := .DataSourceMap}}
+{{$key}} := make([]map[string]any, 0)
+{{ $dataDB := "" }}
+{{- if eq $value.DBName "" }}
+{{ $dataDB = $db }}
+{{- else}}
+{{ $dataDB = printf "global.MustGetGlobalDBByDBName(\"%s\")" $value.DBName }}
+{{- end}}
+{{$dataDB}}.Table("{{$value.Table}}"){{- if $value.HasDeletedAt}}.Where("deleted_at IS NULL"){{ end }}.Select("{{$value.Label}} as label,{{$value.Value}} as value").Scan(&{{$key}})
+res["{{$key}}"] = {{$key}}
+	{{- end }}
+{{- end }}
+{{- else}}
 package service

 import (
-	"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"
+{{- if not .OnlyTemplate }}
+	"{{.Module}}/global"
+	"{{.Module}}/plugin/{{.Package}}/model"
+	{{- if not .IsTree }}
+    "{{.Module}}/plugin/{{.Package}}/model/request"
+    {{- else }}
+    "errors"
+    {{- end }}
    {{- if .AutoCreateResource }}
    "gorm.io/gorm"
    {{- end}}
+{{- if .IsTree }}
+    "{{.Module}}/utils"
+{{- end }}
+{{- end }}
 )

 var {{.StructName}} = new({{.Abbreviation}})
@@ -19,17 +84,29 @@ type {{.Abbreviation}} struct {}
 {{- else}}
 {{- $db =  printf "global.MustGetGlobalDBByDBName(\"%s\")" .BusinessDB   }}
 {{- end}}
-
+{{- if not .OnlyTemplate }}
 // Create{{.StructName}} 创建{{.Description}}记录
-// Author [piexlmax](https://github.com/piexlmax)
+// Author [yourname](https://github.com/yourname)
 func (s *{{.Abbreviation}}) Create{{.StructName}}({{.Abbreviation}} *model.{{.StructName}}) (err error) {
 	err = {{$db}}.Create({{.Abbreviation}}).Error
 	return err
 }

 // Delete{{.StructName}} 删除{{.Description}}记录
-// Author [piexlmax](https://github.com/piexlmax)
+// Author [yourname](https://github.com/yourname)
 func (s *{{.Abbreviation}}) Delete{{.StructName}}({{.PrimaryField.FieldJson}} string{{- if .AutoCreateResource -}},userID uint{{- end -}}) (err error) {
+
+	{{- if .IsTree }}
+       var count int64
+       err = {{$db}}.Find(&model.{{.StructName}}{},"parent_id = ?",{{.PrimaryField.FieldJson}}).Count(&count).Error
+       if count > 0 {
+          return errors.New("此节点存在子节点不允许删除")
+       }
+       if err != nil {
+          return err
+       }
+    {{- end }}
+
 	{{- if .AutoCreateResource }}
 	err = {{$db}}.Transaction(func(tx *gorm.DB) error {
 	    if err := tx.Model(&model.{{.StructName}}{}).Where("{{.PrimaryField.ColumnName}} = ?", {{.PrimaryField.FieldJson}}).Update("deleted_by", userID).Error; err != nil {
@@ -47,7 +124,7 @@ func (s *{{.Abbreviation}}) Delete{{.StructName}}({{.PrimaryField.FieldJson}} st
 }

 // Delete{{.StructName}}ByIds 批量删除{{.Description}}记录
-// Author [piexlmax](https://github.com/piexlmax)
+// Author [yourname](https://github.com/yourname)
 func (s *{{.Abbreviation}}) Delete{{.StructName}}ByIds({{.PrimaryField.FieldJson}}s []string {{- if .AutoCreateResource }},deleted_by uint{{- end}}) (err error) {
 	{{- if .AutoCreateResource }}
 	err = {{$db}}.Transaction(func(tx *gorm.DB) error {
@@ -66,21 +143,35 @@ func (s *{{.Abbreviation}}) Delete{{.StructName}}ByIds({{.PrimaryField.FieldJson
 }

 // Update{{.StructName}} 更新{{.Description}}记录
-// Author [piexlmax](https://github.com/piexlmax)
+// Author [yourname](https://github.com/yourname)
 func (s *{{.Abbreviation}}) Update{{.StructName}}({{.Abbreviation}} model.{{.StructName}}) (err error) {
 	err = {{$db}}.Model(&model.{{.StructName}}{}).Where("{{.PrimaryField.ColumnName}} = ?",{{.Abbreviation}}.{{.PrimaryField.FieldName}}).Updates(&{{.Abbreviation}}).Error
 	return err
 }

 // Get{{.StructName}} 根据{{.PrimaryField.FieldJson}}获取{{.Description}}记录
-// Author [piexlmax](https://github.com/piexlmax)
+// Author [yourname](https://github.com/yourname)
 func (s *{{.Abbreviation}}) Get{{.StructName}}({{.PrimaryField.FieldJson}} string) ({{.Abbreviation}} model.{{.StructName}}, err error) {
 	err = {{$db}}.Where("{{.PrimaryField.ColumnName}} = ?", {{.PrimaryField.FieldJson}}).First(&{{.Abbreviation}}).Error
 	return
 }

+
+{{- if .IsTree }}
+// Get{{.StructName}}InfoList 分页获取{{.Description}}记录,Tree模式下不添加分页和搜索
+// Author [yourname](https://github.com/yourname)
+func (s *{{.Abbreviation}}) Get{{.StructName}}InfoList() (list []*model.{{.StructName}},err error) {
+    // 创建db
+	db := {{$db}}.Model(&model.{{.StructName}}{})
+    var {{.Abbreviation}}s []*model.{{.StructName}}
+
+	err = db.Find(&{{.Abbreviation}}s).Error
+
+	return utils.BuildTree({{.Abbreviation}}s), err
+}
+{{- else }}
 // Get{{.StructName}}InfoList 分页获取{{.Description}}记录
-// Author [piexlmax](https://github.com/piexlmax)
+// Author [yourname](https://github.com/yourname)
 func (s *{{.Abbreviation}}) Get{{.StructName}}InfoList(info request.{{.StructName}}Search) (list []model.{{.StructName}}, total int64, err error) {
 	limit := info.PageSize
 	offset := info.PageSize * (info.Page - 1)
@@ -95,17 +186,21 @@ func (s *{{.Abbreviation}}) Get{{.StructName}}InfoList(info request.{{.StructNam
 {{- end }}
        {{- range .Fields}}
            {{- if .FieldSearchType}}
-                {{- if or (eq .FieldType "string") (eq .FieldType "enum") (eq .FieldType "picture") (eq .FieldType "video") (eq .FieldType "richtext") }}
+                {{- if or (eq .FieldType "enum") (eq .FieldType "pictures") (eq .FieldType "picture") (eq .FieldType "video") (eq .FieldType "json") }}
    if info.{{.FieldName}} != "" {
-        db = db.Where("{{.ColumnName}} {{.FieldSearchType}} ?",{{if eq .FieldSearchType "LIKE"}}"%"+ {{ end }}info.{{.FieldName}}{{if eq .FieldSearchType "LIKE"}}+"%"{{ end }})
-    }
+            {{- if or (eq .FieldType "enum")}}
+            db = db.Where("{{.ColumnName}} {{.FieldSearchType}} ?",{{if eq .FieldSearchType "LIKE"}}"%"+ {{ end }}*info.{{.FieldName}}{{if eq .FieldSearchType "LIKE"}}+"%"{{ end }})
+            {{- else}}
+            // 数据类型为复杂类型，请根据业务需求自行实现复杂类型的查询业务
+            {{- end}}
+        }
    {{- else if eq .FieldSearchType "BETWEEN" "NOT BETWEEN"}}
        if info.Start{{.FieldName}} != nil && info.End{{.FieldName}} != nil {
            db = db.Where("{{.ColumnName}} {{.FieldSearchType}} ? AND ? ",info.Start{{.FieldName}},info.End{{.FieldName}})
        }
    {{- else}}
-    if info.{{.FieldName}} != nil {
-        db = db.Where("{{.ColumnName}} {{.FieldSearchType}} ?",{{if eq .FieldSearchType "LIKE"}}"%"+{{ end }}info.{{.FieldName}}{{if eq .FieldSearchType "LIKE"}}+"%"{{ end }})
+    if info.{{.FieldName}} != nil{{- if eq .FieldType "string" }} && *info.{{.FieldName}} != ""{{- end }} {
+        db = db.Where("{{.ColumnName}} {{.FieldSearchType}} ?",{{if eq .FieldSearchType "LIKE"}}"%"+{{ end }}*info.{{.FieldName}}{{if eq .FieldSearchType "LIKE"}}+"%"{{ end }})
    }
            {{- end }}
        {{- end }}
@@ -118,9 +213,9 @@ func (s *{{.Abbreviation}}) Get{{.StructName}}InfoList(info request.{{.StructNam
        var OrderStr string
        orderMap := make(map[string]bool)
       {{- range .Fields}}
-            {{- if .Sort}}
-         	orderMap["{{.ColumnName}}"] = true
-         	{{- end}}
+        {{- if .Sort}}
+        orderMap["{{.ColumnName}}"] = true
+        {{- end}}
       {{- end}}
       if orderMap[info.Sort] {
          OrderStr = info.Sort
@@ -137,15 +232,27 @@ func (s *{{.Abbreviation}}) Get{{.StructName}}InfoList(info request.{{.StructNam
 	err = db.Find(&{{.Abbreviation}}s).Error
 	return  {{.Abbreviation}}s, total, err
 }
-
+{{- end }}
 {{- if .HasDataSource }}
 func (s *{{.Abbreviation}})Get{{.StructName}}DataSource() (res map[string][]map[string]any, err error) {
 	res = make(map[string][]map[string]any)
 	{{range $key, $value := .DataSourceMap}}
 	   {{$key}} := make([]map[string]any, 0)
-       {{$db}}.Table("{{$value.Table}}").Select("{{$value.Label}} as label,{{$value.Value}} as value").Scan(&{{$key}})
+	   {{ $dataDB := "" }}
+       {{- if eq $value.DBName "" }}
+       {{ $dataDB = $db }}
+       {{- else}}
+       {{ $dataDB = printf "global.MustGetGlobalDBByDBName(\"%s\")" $value.DBName }}
+       {{- end}}
+       {{$dataDB}}.Table("{{$value.Table}}"){{- if $value.HasDeletedAt}}.Where("deleted_at IS NULL"){{ end }}.Select("{{$value.Label}} as label,{{$value.Value}} as value").Scan(&{{$key}})
 	   res["{{$key}}"] = {{$key}}
 	{{- end }}
 	return
 }
-{{- end }}
+{{- end }}
+{{- end }}
+
+func (s *{{.Abbreviation}})Get{{.StructName}}Public() {
+
+}
+{{- end }}
@@ -1,9 +1,9 @@
 import service from '@/utils/request'
-
+{{- if not .OnlyTemplate}}
 // @Tags {{.StructName}}
 // @Summary 创建{{.Description}}
 // @Security ApiKeyAuth
-// @accept application/json
+// @Accept application/json
 // @Produce application/json
 // @Param data body model.{{.StructName}} true "创建{{.Description}}"
 // @Success 200 {string} string "{"success":true,"data":{},"msg":"创建成功"}"
@@ -19,7 +19,7 @@ export const create{{.StructName}} = (data) => {
 // @Tags {{.StructName}}
 // @Summary 删除{{.Description}}
 // @Security ApiKeyAuth
-// @accept application/json
+// @Accept application/json
 // @Produce application/json
 // @Param data body model.{{.StructName}} true "删除{{.Description}}"
 // @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}"
@@ -35,7 +35,7 @@ export const delete{{.StructName}} = (params) => {
 // @Tags {{.StructName}}
 // @Summary 批量删除{{.Description}}
 // @Security ApiKeyAuth
-// @accept application/json
+// @Accept application/json
 // @Produce application/json
 // @Param data body request.IdsReq true "批量删除{{.Description}}"
 // @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}"
@@ -51,7 +51,7 @@ export const delete{{.StructName}}ByIds = (params) => {
 // @Tags {{.StructName}}
 // @Summary 更新{{.Description}}
 // @Security ApiKeyAuth
-// @accept application/json
+// @Accept application/json
 // @Produce application/json
 // @Param data body model.{{.StructName}} true "更新{{.Description}}"
 // @Success 200 {string} string "{"success":true,"data":{},"msg":"更新成功"}"
@@ -67,7 +67,7 @@ export const update{{.StructName}} = (data) => {
 // @Tags {{.StructName}}
 // @Summary 用id查询{{.Description}}
 // @Security ApiKeyAuth
-// @accept application/json
+// @Accept application/json
 // @Produce application/json
 // @Param data query model.{{.StructName}} true "用id查询{{.Description}}"
 // @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}"
@@ -83,7 +83,7 @@ export const find{{.StructName}} = (params) => {
 // @Tags {{.StructName}}
 // @Summary 分页获取{{.Description}}列表
 // @Security ApiKeyAuth
-// @accept application/json
+// @Accept application/json
 // @Produce application/json
 // @Param data query request.PageInfo true "分页获取{{.Description}}列表"
 // @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
@@ -100,7 +100,7 @@ export const get{{.StructName}}List = (params) => {
 // @Tags {{.StructName}}
 // @Summary 获取数据源
 // @Security ApiKeyAuth
-// @accept application/json
+// @Accept application/json
 // @Produce application/json
 // @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}"
 // @Router /{{.Abbreviation}}/find{{.StructName}}DataSource [get]
@@ -111,3 +111,17 @@ export const get{{.StructName}}DataSource = () => {
  })
 }
 {{- end}}
+{{- end}}
+// @Tags {{.StructName}}
+// @Summary 不需要鉴权的{{.Description}}接口
+// @Accept application/json
+// @Produce application/json
+// @Param data query request.{{.StructName}}Search true "分页获取{{.Description}}列表"
+// @Success 200 {object} response.Response{data=object,msg=string} "获取成功"
+// @Router /{{.Abbreviation}}/get{{.StructName}}Public [get]
+export const get{{.StructName}}Public = () => {
+  return service({
+    url: '/{{.Abbreviation}}/get{{.StructName}}Public',
+    method: 'get',
+  })
+}
@@ -1,8 +1,186 @@
+{{- if .IsAdd }}
+// 新增表单中增加如下代码
+{{- range .Fields}}
+          {{- if .Form}}
+<el-form-item label="{{.FieldDesc}}:"  prop="{{.FieldJson}}" >
+          {{- if .CheckDataSource}}
+    <el-select {{if eq .DataSource.Association 2}} multiple {{ end }} v-model="formData.{{.FieldJson}}" placeholder="请选择{{.FieldDesc}}" style="width:100%" :clearable="{{.Clearable}}" >
+        <el-option v-for="(item,key) in dataSource.{{.FieldJson}}" :key="key" :label="item.label" :value="item.value" />
+    </el-select>
+          {{- else }}
+          {{- if eq .FieldType "bool" }}
+    <el-switch v-model="formData.{{.FieldJson}}" active-color="#13ce66" inactive-color="#ff4949" active-text="是" inactive-text="否" clearable ></el-switch>
+          {{- end }}
+          {{- if eq .FieldType "string" }}
+          {{- if .DictType}}
+    <el-select {{if eq .FieldType "array"}}multiple {{end}}v-model="formData.{{ .FieldJson }}" placeholder="请选择{{.FieldDesc}}" style="width:100%" :clearable="{{.Clearable}}" >
+        <el-option v-for="(item,key) in {{ .DictType }}Options" :key="key" :label="item.label" :value="item.value" />
+    </el-select>
+          {{- else }}
+    <el-input v-model="formData.{{.FieldJson}}" :clearable="{{.Clearable}}"  placeholder="请输入{{.FieldDesc}}" />
+          {{- end }}
+          {{- end }}
+          {{- if eq .FieldType "richtext" }}
+    <RichEdit v-model="formData.{{.FieldJson}}"/>
+          {{- end }}
+          {{- if eq .FieldType "json" }}
+    // 此字段为json结构，可以前端自行控制展示和数据绑定模式 需绑定json的key为 formData.{{.FieldJson}} 后端会按照json的类型进行存取
+    {{"{{"}} formData.{{.FieldJson}} {{"}}"}}
+          {{- end }}
+           {{- if eq .FieldType "array" }}
+    <ArrayCtrl v-model="formData.{{ .FieldJson }}" editable/>
+           {{- end }}
+          {{- if eq .FieldType "int" }}
+    <el-input v-model.number="formData.{{ .FieldJson }}" :clearable="{{.Clearable}}" placeholder="请输入{{.FieldDesc}}" />
+          {{- end }}
+          {{- if eq .FieldType "time.Time" }}
+    <el-date-picker v-model="formData.{{ .FieldJson }}" type="date" style="width:100%" placeholder="选择日期" :clearable="{{.Clearable}}"  />
+          {{- end }}
+          {{- if eq .FieldType "float64" }}
+    <el-input-number v-model="formData.{{ .FieldJson }}"  style="width:100%" :precision="2" :clearable="{{.Clearable}}"  />
+          {{- end }}
+          {{- if eq .FieldType "enum" }}
+    <el-select v-model="formData.{{ .FieldJson }}" placeholder="请选择{{.FieldDesc}}" style="width:100%" :clearable="{{.Clearable}}" >
+       <el-option v-for="item in [{{.DataTypeLong}}]" :key="item" :label="item" :value="item" />
+    </el-select>
+          {{- end }}
+          {{- if eq .FieldType "picture" }}
+    <SelectImage
+     v-model="formData.{{ .FieldJson }}"
+     file-type="image"
+    />
+          {{- end }}
+          {{- if eq .FieldType "pictures" }}
+    <SelectImage
+     multiple
+     v-model="formData.{{ .FieldJson }}"
+     file-type="image"
+     />
+          {{- end }}
+          {{- if eq .FieldType "video" }}
+    <SelectImage
+    v-model="formData.{{ .FieldJson }}"
+    file-type="video"
+    />
+           {{- end }}
+          {{- if eq .FieldType "file" }}
+    <SelectFile v-model="formData.{{ .FieldJson }}" />
+          {{- end }}
+          {{- end }}
+</el-form-item>
+          {{- end }}
+          {{- end }}
+
+// 字典增加如下代码
+    {{- range $index, $element := .DictTypes}}
+const {{ $element }}Options = ref([])
+    {{- end }}
+
+// init方法中增加如下调用
+
+{{- 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 .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 }}
 <template>
  <div>
    <div class="gva-form-box">
      <el-form :model="formData" ref="elFormRef" label-position="right" :rules="rule" label-width="80px">
+        {{- if .IsTree }}
+          <el-form-item label="父节点:" prop="parentID" >
+              <el-tree-select
+                  v-model="formData.parentID"
+                  :data="[rootNode,...tableData]"
+                  check-strictly
+                  :render-after-expand="false"
+                  :props="defaultProps"
+                  clearable
+                  style="width: 240px"
+                  placeholder="根节点"
+              />
+          </el-form-item>
+        {{- end }}
      {{- range .Fields}}
+      {{- if .Form }}
        <el-form-item label="{{.FieldDesc}}:" prop="{{.FieldJson}}">
       {{- if .CheckDataSource}}
        <el-select {{if eq .DataSource.Association 2}} multiple {{ end }} v-model="formData.{{.FieldJson}}" placeholder="请选择{{.FieldDesc}}" style="width:100%" :clearable="{{.Clearable}}" >
@@ -14,7 +192,7 @@
      {{- end }}
      {{- if eq .FieldType "string" }}
      {{- if .DictType}}
-           <el-select v-model="formData.{{ .FieldJson }}" placeholder="请选择{{.FieldDesc}}" style="width:100%" :clearable="{{.Clearable}}" >
+           <el-select {{if eq .FieldType "array"}}multiple {{end}}v-model="formData.{{ .FieldJson }}" placeholder="请选择{{.FieldDesc}}" style="width:100%" :clearable="{{.Clearable}}" >
              <el-option v-for="(item,key) in {{ .DictType }}Options" :key="key" :label="item.label" :value="item.value" />
           </el-select>
      {{- else }}
@@ -54,11 +232,15 @@
          // 此字段为json结构，可以前端自行控制展示和数据绑定模式 需绑定json的key为 formData.{{.FieldJson}} 后端会按照json的类型进行存取
          {{"{{"}} formData.{{.FieldJson}} {{"}}"}}
       {{- end }}
+       {{- if eq .FieldType "array" }}
+          <ArrayCtrl v-model="formData.{{ .FieldJson }}" editable/>
+       {{- end }}
       {{- end }}
       </el-form-item>
+      {{- end }}
      {{- end }}
        <el-form-item>
-          <el-button type="primary" @click="save">保存</el-button>
+          <el-button :loading="btnLoading" type="primary" @click="save">保存</el-button>
          <el-button type="primary" @click="back">返回</el-button>
        </el-form-item>
      </el-form>
@@ -71,10 +253,13 @@ import {
  {{- if .HasDataSource }}
    get{{.StructName}}DataSource,
  {{- end }}
+  {{- if .IsTree }}
+    get{{.StructName}}List,
+  {{- end }}
  create{{.StructName}},
  update{{.StructName}},
  find{{.StructName}}
-} from '@/plugin/{{.Package}}/api/{{.PackageName}}'
+} from '@/api/{{.Package}}/{{.PackageName}}'

 defineOptions({
    name: '{{.StructName}}Form'
@@ -86,9 +271,12 @@ import { useRoute, useRouter } from "vue-router"
 import { ElMessage } from 'element-plus'
 import { ref, reactive } from 'vue'
 {{- if .HasPic }}
+// 图片选择组件
 import SelectImage from '@/components/selectImage/selectImage.vue'
 {{- end }}
+
 {{- if .HasFile }}
+// 文件选择组件
 import SelectFile from '@/components/selectFile/selectFile.vue'
 {{- end }}

@@ -97,15 +285,54 @@ import SelectFile from '@/components/selectFile/selectFile.vue'
 import RichEdit from '@/components/richtext/rich-edit.vue'
 {{- end }}

+{{- if .HasArray}}
+// 数组控制组件
+import ArrayCtrl from '@/components/arrayCtrl/arrayCtrl.vue'
+{{- end }}
+
+
 const route = useRoute()
 const router = useRouter()

+{{- if .IsTree }}
+const tableData = ref([])
+
+const defaultProps = {
+  children: "children",
+  label: "{{ .TreeJson }}",
+  value: "{{ .PrimaryField.FieldJson }}"
+}
+
+const rootNode = {
+  {{ .PrimaryField.FieldJson }}: 0,
+  {{ .TreeJson }}: '根节点',
+  children: []
+}
+
+const getTableData = async() => {
+  const table = await get{{.StructName}}List()
+  if (table.code === 0) {
+    tableData.value = table.data || []
+  }
+}
+
+getTableData()
+
+{{- end }}
+
+// 提交按钮loading
+const btnLoading = ref(false)
+
 const type = ref('')
    {{- range $index, $element := .DictTypes}}
 const {{ $element }}Options = ref([])
    {{- end }}
 const formData = ref({
+        {{- if .IsTree }}
+            parentID: undefined,
+        {{- end }}
        {{- range .Fields}}
+          {{- if .Form }}
            {{- if eq .FieldType "bool" }}
            {{.FieldJson}}: false,
            {{- end }}
@@ -116,7 +343,7 @@ const formData = ref({
            {{.FieldJson}}: '',
            {{- end }}
            {{- if eq .FieldType "int" }}
-            {{.FieldJson}}: {{- if or .DictType .DataSource }} undefined{{ else }} 0{{- end }},
+            {{.FieldJson}}: {{- if or .DataSource }} undefined{{ else }} 0{{- end }},
            {{- end }}
            {{- if eq .FieldType "time.Time" }}
            {{.FieldJson}}: new Date(),
@@ -142,6 +369,7 @@ const formData = ref({
            {{- if eq .FieldType "array" }}
            {{.FieldJson}}: [],
            {{- end }}
+          {{- end }}
        {{- end }}
        })
 // 验证规则
@@ -190,8 +418,9 @@ const init = async () => {
 init()
 // 保存按钮
 const save = async() => {
+      btnLoading.value = true
      elFormRef.value?.validate( async (valid) => {
-         if (!valid) return
+         if (!valid) return btnLoading.value = false
            let res
           switch (type.value) {
             case 'create':
@@ -204,6 +433,7 @@ const save = async() => {
               res = await create{{.StructName}}(formData.value)
               break
           }
+           btnLoading.value = false
           if (res.code === 0) {
             ElMessage({
               type: 'success',
@@ -222,3 +452,13 @@ const back = () => {

 <style>
 </style>
+{{- else }}
+<template>
+<div>form</div>
+</template>
+<script setup>
+</script>
+<style>
+</style>
+{{- end }}
+{{- end }}
@@ -1,5 +1,376 @@
+{{- $global := . }}
+{{- $templateID := printf "%s_%s" .Package .StructName }}
+{{- if .IsAdd }}
+// 请在搜索条件中增加如下代码
+{{- range .Fields}}  {{- if .FieldSearchType}} {{- if eq .FieldType "bool" }}
+<el-form-item label="{{.FieldDesc}}" prop="{{.FieldJson}}">
+<el-select v-model="searchInfo.{{.FieldJson}}" clearable placeholder="请选择">
+    <el-option
+        key="true"
+        label="是"
+        value="true">
+    </el-option>
+    <el-option
+        key="false"
+        label="否"
+        value="false">
+    </el-option>
+</el-select>
+</el-form-item>
+           {{- else if .DictType}}
+<el-form-item label="{{.FieldDesc}}" prop="{{.FieldJson}}">
+    <el-select {{if eq .FieldType "array"}}multiple {{end}}v-model="searchInfo.{{.FieldJson}}" clearable placeholder="请选择" @clear="()=>{searchInfo.{{.FieldJson}}=undefined}">
+        <el-option v-for="(item,key) in {{ .DictType }}Options" :key="key" :label="item.label" :value="item.value" />
+    </el-select>
+</el-form-item>
+           {{- else if .CheckDataSource}}
+<el-form-item label="{{.FieldDesc}}" prop="{{.FieldJson}}">
+    <el-select {{if eq .DataSource.Association 2}} multiple {{ end }} v-model="searchInfo.{{.FieldJson}}" placeholder="请选择{{.FieldDesc}}" :clearable="{{.Clearable}}" >
+        <el-option v-for="(item,key) in dataSource.{{.FieldJson}}" :key="key" :label="item.label" :value="item.value" />
+    </el-select>
+</el-form-item>
+            {{- else}}
+<el-form-item label="{{.FieldDesc}}" prop="{{.FieldJson}}">
+        {{- if eq .FieldType "float64" "int"}}
+            {{if eq .FieldSearchType "BETWEEN" "NOT BETWEEN"}}
+<el-input v-model.number="searchInfo.start{{.FieldName}}" placeholder="最小值" />
+—
+<el-input v-model.number="searchInfo.end{{.FieldName}}" placeholder="最大值" />
+           {{- else}}
+<el-input v-model.number="searchInfo.{{.FieldJson}}" placeholder="搜索条件" />
+          {{- end}}
+        {{- else if eq .FieldType "time.Time"}}
+            {{if eq .FieldSearchType "BETWEEN" "NOT BETWEEN"}}
+<template #label>
+<span>
+{{.FieldDesc}}
+    <el-tooltip content="搜索范围是开始日期（包含）至结束日期（不包含）">
+      <el-icon><QuestionFilled /></el-icon>
+    </el-tooltip>
+</span>
+</template>
+<el-date-picker v-model="searchInfo.start{{.FieldName}}" type="datetime" placeholder="开始日期" :disabled-date="time=> searchInfo.end{{.FieldName}} ? time.getTime() > searchInfo.end{{.FieldName}}.getTime() : false"></el-date-picker>
+—
+<el-date-picker v-model="searchInfo.end{{.FieldName}}" type="datetime" placeholder="结束日期" :disabled-date="time=> searchInfo.start{{.FieldName}} ? time.getTime() < searchInfo.start{{.FieldName}}.getTime() : false"></el-date-picker>
+           {{- else}}
+<el-date-picker v-model="searchInfo.{{.FieldJson}}" type="datetime" placeholder="搜索条件"></el-date-picker>
+          {{- end}}
+        {{- else}}
+    <el-input v-model="searchInfo.{{.FieldJson}}" placeholder="搜索条件" />
+        {{- end}}
+</el-form-item>{{ end }}{{ end }}{{ end }}
+
+
+// 表格增加如下列代码
+
+{{- range .Fields}}
+        {{- if .Table}}
+        {{- if .CheckDataSource }}
+<el-table-column {{- if .Sort}} sortable{{- end}} align="left" label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="120">
+    <template #default="scope">
+        {{- if eq .DataSource.Association 2}}
+        <el-tag v-for="(item,key) in filterDataSource(dataSource.{{.FieldJson}},scope.row.{{.FieldJson}})" :key="key">
+             {{ "{{ item }}" }}
+        </el-tag>
+        {{- else }}
+        <span>{{"{{"}} filterDataSource(dataSource.{{.FieldJson}},scope.row.{{.FieldJson}}) {{"}}"}}</span>
+        {{- end }}
+    </template>
+</el-table-column>
+        {{- else if .DictType}}
+<el-table-column {{- if .Sort}} sortable{{- end}} align="left" label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="120">
+    <template #default="scope">
+    {{if eq .FieldType "array"}}
+    <el-tag class="mr-1" v-for="item in scope.row.{{.FieldJson}}" :key="item"> {{"{{"}} filterDict(item,{{.DictType}}Options) {{"}}"}}</el-tag>
+    {{- else }}
+    {{"{{"}} filterDict(scope.row.{{.FieldJson}},{{.DictType}}Options) {{"}}"}}
+    {{end}}
+    </template>
+</el-table-column>
+        {{- else if eq .FieldType "bool" }}
+<el-table-column {{- if .Sort}} sortable{{- end}} align="left" label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="120">
+    <template #default="scope">{{"{{"}} formatBoolean(scope.row.{{.FieldJson}}) {{"}}"}}</template>
+</el-table-column>
+         {{- else if eq .FieldType "time.Time" }}
+<el-table-column {{- if .Sort}} sortable{{- end}} align="left" label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="180">
+   <template #default="scope">{{"{{"}} formatDate(scope.row.{{.FieldJson}}) {{"}}"}}</template>
+</el-table-column>
+          {{- else if eq .FieldType "picture" }}
+<el-table-column label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="200">
+    <template #default="scope">
+      <el-image preview-teleported style="width: 100px; height: 100px" :src="getUrl(scope.row.{{.FieldJson}})" fit="cover"/>
+    </template>
+</el-table-column>
+           {{- else if eq .FieldType "pictures" }}
+<el-table-column label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="200">
+   <template #default="scope">
+      <div class="multiple-img-box">
+         <el-image preview-teleported v-for="(item,index) in scope.row.{{.FieldJson}}" :key="index" style="width: 80px; height: 80px" :src="getUrl(item)" fit="cover"/>
+     </div>
+   </template>
+</el-table-column>
+           {{- else if eq .FieldType "video" }}
+<el-table-column label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="200">
+   <template #default="scope">
+    <video
+       style="width: 100px; height: 100px"
+       muted
+       preload="metadata"
+       >
+         <source :src="getUrl(scope.row.{{.FieldJson}}) + '#t=1'">
+       </video>
+   </template>
+</el-table-column>
+           {{- else if eq .FieldType "richtext" }}
+<el-table-column label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="200">
+   <template #default="scope">
+      [富文本内容]
+   </template>
+</el-table-column>
+           {{- else if eq .FieldType "file" }}
+<el-table-column label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="200">
+    <template #default="scope">
+         <div class="file-list">
+           <el-tag v-for="file in scope.row.{{.FieldJson}}" :key="file.uid" @click="downloadFile(file.url)">{{"{{"}}file.name{{"}}"}}</el-tag>
+         </div>
+    </template>
+</el-table-column>
+         {{- else if eq .FieldType "json" }}
+<el-table-column label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="200">
+    <template #default="scope">
+        [JSON]
+    </template>
+</el-table-column>
+           {{- else if eq .FieldType "array" }}
+<el-table-column label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="200">
+    <template #default="scope">
+       <ArrayCtrl v-model="scope.row.{{ .FieldJson }}"/>
+    </template>
+</el-table-column>
+          {{- else }}
+<el-table-column {{- if .Sort}} sortable{{- end}} align="left" label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="120" />
+          {{- end }}
+        {{- end }}
+        {{- end }}
+
+// 新增表单中增加如下代码
+{{- range .Fields}}
+          {{- if .Form}}
+<el-form-item label="{{.FieldDesc}}:"  prop="{{.FieldJson}}" >
+          {{- if .CheckDataSource}}
+    <el-select {{if eq .DataSource.Association 2}} multiple {{ end }} v-model="formData.{{.FieldJson}}" placeholder="请选择{{.FieldDesc}}" style="width:100%" :clearable="{{.Clearable}}" >
+        <el-option v-for="(item,key) in dataSource.{{.FieldJson}}" :key="key" :label="item.label" :value="item.value" />
+    </el-select>
+          {{- else }}
+          {{- if eq .FieldType "bool" }}
+    <el-switch v-model="formData.{{.FieldJson}}" active-color="#13ce66" inactive-color="#ff4949" active-text="是" inactive-text="否" clearable ></el-switch>
+          {{- end }}
+          {{- if eq .FieldType "string" }}
+          {{- if .DictType}}
+    <el-select v-model="formData.{{ .FieldJson }}" placeholder="请选择{{.FieldDesc}}" style="width:100%" :clearable="{{.Clearable}}" >
+        <el-option v-for="(item,key) in {{ .DictType }}Options" :key="key" :label="item.label" :value="item.value" />
+    </el-select>
+          {{- else }}
+    <el-input v-model="formData.{{.FieldJson}}" :clearable="{{.Clearable}}"  placeholder="请输入{{.FieldDesc}}" />
+          {{- end }}
+          {{- end }}
+          {{- if eq .FieldType "richtext" }}
+    <RichEdit v-model="formData.{{.FieldJson}}"/>
+          {{- end }}
+          {{- if eq .FieldType "json" }}
+    // 此字段为json结构，可以前端自行控制展示和数据绑定模式 需绑定json的key为 formData.{{.FieldJson}} 后端会按照json的类型进行存取
+    {{"{{"}} formData.{{.FieldJson}} {{"}}"}}
+          {{- end }}
+           {{- if eq .FieldType "array" }}
+             {{- if .DictType}}
+               <el-select multiple v-model="formData.{{ .FieldJson }}" placeholder="请选择{{.FieldDesc}}" style="width:100%" :clearable="{{.Clearable}}" >
+                   <el-option v-for="(item,key) in {{ .DictType }}Options" :key="key" :label="item.label" :value="item.value" />
+               </el-select>
+            {{- else }}
+    <ArrayCtrl v-model="formData.{{ .FieldJson }}" editable/>
+           {{- end }}
+           {{- end }}
+          {{- if eq .FieldType "int" }}
+    <el-input v-model.number="formData.{{ .FieldJson }}" :clearable="{{.Clearable}}" placeholder="请输入{{.FieldDesc}}" />
+          {{- end }}
+          {{- if eq .FieldType "time.Time" }}
+    <el-date-picker v-model="formData.{{ .FieldJson }}" type="date" style="width:100%" placeholder="选择日期" :clearable="{{.Clearable}}"  />
+          {{- end }}
+          {{- if eq .FieldType "float64" }}
+    <el-input-number v-model="formData.{{ .FieldJson }}"  style="width:100%" :precision="2" :clearable="{{.Clearable}}"  />
+          {{- end }}
+          {{- if eq .FieldType "enum" }}
+    <el-select v-model="formData.{{ .FieldJson }}" placeholder="请选择{{.FieldDesc}}" style="width:100%" :clearable="{{.Clearable}}" >
+       <el-option v-for="item in [{{.DataTypeLong}}]" :key="item" :label="item" :value="item" />
+    </el-select>
+          {{- end }}
+          {{- if eq .FieldType "picture" }}
+    <SelectImage
+     v-model="formData.{{ .FieldJson }}"
+     file-type="image"
+    />
+          {{- end }}
+          {{- if eq .FieldType "pictures" }}
+    <SelectImage
+     multiple
+     v-model="formData.{{ .FieldJson }}"
+     file-type="image"
+     />
+          {{- end }}
+          {{- if eq .FieldType "video" }}
+    <SelectImage
+    v-model="formData.{{ .FieldJson }}"
+    file-type="video"
+    />
+           {{- end }}
+          {{- if eq .FieldType "file" }}
+    <SelectFile v-model="formData.{{ .FieldJson }}" />
+          {{- end }}
+          {{- end }}
+</el-form-item>
+          {{- end }}
+          {{- end }}
+
+// 查看抽屉中增加如下代码
+
+{{- range .Fields}}
+              {{- if .Desc }}
+<el-descriptions-item label="{{ .FieldDesc }}">
+{{- if .CheckDataSource }}
+    <template #default="scope">
+        {{- if eq .DataSource.Association 2}}
+        <el-tag v-for="(item,key) in filterDataSource(dataSource.{{.FieldJson}},detailFrom.{{.FieldJson}})" :key="key">
+             {{ "{{ item }}" }}
+        </el-tag>
+        {{- else }}
+        <span>{{"{{"}} filterDataSource(dataSource.{{.FieldJson}},detailFrom.{{.FieldJson}}) {{"}}"}}</span>
+        {{- end }}
+    </template>
+                {{- else if and (ne .FieldType "picture" ) (ne .FieldType "pictures" ) (ne .FieldType "file" ) (ne .FieldType "array" ) }}
+    {{"{{"}} detailFrom.{{.FieldJson}} {{"}}"}}
+                {{- else }}
+                    {{- if eq .FieldType "picture" }}
+    <el-image style="width: 50px; height: 50px" :preview-src-list="returnArrImg(detailFrom.{{ .FieldJson }})" :src="getUrl(detailFrom.{{ .FieldJson }})" fit="cover" />
+                    {{- end }}
+                    {{- if eq .FieldType "array" }}
+    <ArrayCtrl v-model="detailFrom.{{ .FieldJson }}"/>
+                    {{- end }}
+                    {{- if eq .FieldType "pictures" }}
+    <el-image style="width: 50px; height: 50px; margin-right: 10px" :preview-src-list="returnArrImg(detailFrom.{{ .FieldJson }})" :initial-index="index" v-for="(item,index) in detailFrom.{{ .FieldJson }}" :key="index" :src="getUrl(item)" fit="cover" />
+                    {{- end }}
+                    {{- if eq .FieldType "richtext" }}
+    <RichView v-model="detailFrom.{{.FieldJson}}" />
+                     {{- end }}
+                    {{- if eq .FieldType "file" }}
+    <div class="fileBtn" v-for="(item,index) in detailFrom.{{ .FieldJson }}" :key="index">
+        <el-button type="primary" text bg @click="onDownloadFile(item.url)">
+          <el-icon style="margin-right: 5px"><Download /></el-icon>
+          {{"{{"}}item.name{{"}}"}}
+        </el-button>
+    </div>
+                    {{- end }}
+                {{- end }}
+</el-descriptions-item>
+              {{- 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 .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}}
 <template>
  <div>
+  {{- if not .IsTree }}
    <div class="gva-search-box">
      <el-form ref="elSearchFormRef" :inline="true" :model="searchInfo" class="demo-form-inline" :rules="searchRule" @keyup.enter="onSubmit">
      {{- if .GvaModel }}
@@ -34,10 +405,16 @@
            </el-form-item>
           {{- else if .DictType}}
           <el-form-item label="{{.FieldDesc}}" prop="{{.FieldJson}}">
-            <el-select v-model="searchInfo.{{.FieldJson}}" clearable placeholder="请选择" @clear="()=>{searchInfo.{{.FieldJson}}=undefined}">
+            <el-select {{if eq .FieldType "array"}} multiple {{end}}v-model="searchInfo.{{.FieldJson}}" clearable placeholder="请选择" @clear="()=>{searchInfo.{{.FieldJson}}=undefined}">
              <el-option v-for="(item,key) in {{ .DictType }}Options" :key="key" :label="item.label" :value="item.value" />
            </el-select>
            </el-form-item>
+           {{- else if .CheckDataSource}}
+            <el-form-item label="{{.FieldDesc}}" prop="{{.FieldJson}}">
+               <el-select {{if eq .DataSource.Association 2}} multiple {{ end }} v-model="searchInfo.{{.FieldJson}}" placeholder="请选择{{.FieldDesc}}" :clearable="{{.Clearable}}" >
+                   <el-option v-for="(item,key) in dataSource.{{.FieldJson}}" :key="key" :label="item.label" :value="item.value" />
+               </el-select>
+            </el-form-item>
            {{- else}}
        <el-form-item label="{{.FieldDesc}}" prop="{{.FieldJson}}">
        {{- if eq .FieldType "float64" "int"}}
@@ -46,13 +423,7 @@
            —
            <el-input v-model.number="searchInfo.end{{.FieldName}}" placeholder="最大值" />
           {{- else}}
-             {{- if .DictType}}
-              <el-select v-model="searchInfo.{{.FieldJson}}" placeholder="请选择" style="width:100%" :clearable="true" >
-               <el-option v-for="(item,key) in {{ .DictType }}Options" :key="key" :label="item.label" :value="item.value" />
-             </el-select>
-                    {{- else}}
             <el-input v-model.number="searchInfo.{{.FieldJson}}" placeholder="搜索条件" />
-                    {{- end }}
          {{- end}}
        {{- else if eq .FieldType "time.Time"}}
            {{if eq .FieldSearchType "BETWEEN" "NOT BETWEEN"}}
@@ -73,7 +444,6 @@
        {{- else}}
         <el-input v-model="searchInfo.{{.FieldJson}}" placeholder="搜索条件" />
        {{- end}}
-
        </el-form-item>{{ end }}{{ end }}{{ end }}{{ end }}

        <template v-if="showAllQuery">
@@ -95,7 +465,7 @@
                      </el-form-item>
                     {{- else if .DictType}}
                     <el-form-item label="{{.FieldDesc}}" prop="{{.FieldJson}}">
-                      <el-select v-model="searchInfo.{{.FieldJson}}" clearable placeholder="请选择" @clear="()=>{searchInfo.{{.FieldJson}}=undefined}">
+                      <el-select {{if eq .FieldType "array"}}multiple {{end}}v-model="searchInfo.{{.FieldJson}}" clearable placeholder="请选择" @clear="()=>{searchInfo.{{.FieldJson}}=undefined}">
                        <el-option v-for="(item,key) in {{ .DictType }}Options" :key="key" :label="item.label" :value="item.value" />
                      </el-select>
                      </el-form-item>
@@ -107,13 +477,7 @@
                      —
                      <el-input v-model.number="searchInfo.end{{.FieldName}}" placeholder="最大值" />
                     {{- else}}
-                       {{- if .DictType}}
-                        <el-select v-model="searchInfo.{{.FieldJson}}" placeholder="请选择" style="width:100%" :clearable="true" >
-                         <el-option v-for="(item,key) in {{ .DictType }}Options" :key="key" :label="item.label" :value="item.value" />
-                       </el-select>
-                              {{- else}}
                       <el-input v-model.number="searchInfo.{{.FieldJson}}" placeholder="搜索条件" />
-                              {{- end }}
                    {{- end}}
                  {{- else if eq .FieldType "time.Time"}}
                      {{if eq .FieldSearchType "BETWEEN" "NOT BETWEEN"}}
@@ -147,10 +511,16 @@
        </el-form-item>
      </el-form>
    </div>
+  {{- end }}
    <div class="gva-table-box">
        <div class="gva-btn-list">
-            <el-button type="primary" icon="plus" @click="openDialog">新增</el-button>
-            <el-button icon="delete" style="margin-left: 10px;" :disabled="!multipleSelection.length" @click="onDelete">删除</el-button>
+            <el-button {{ if $global.AutoCreateBtnAuth }}v-auth="btnAuth.add"{{ end }} type="primary" icon="plus" @click="openDialog()">新增</el-button>
+            <el-button {{ if $global.AutoCreateBtnAuth }}v-auth="btnAuth.batchDelete"{{ end }} icon="delete" style="margin-left: 10px;" :disabled="!multipleSelection.length" @click="onDelete">删除</el-button>
+            {{ if .HasExcel -}}
+            <ExportTemplate {{ if $global.AutoCreateBtnAuth }}v-auth="btnAuth.exportTemplate"{{ end }} template-id="{{$templateID}}" />
+            <ExportExcel {{ if $global.AutoCreateBtnAuth }}v-auth="btnAuth.exportExcel"{{ end }} template-id="{{$templateID}}" />
+            <ImportExcel {{ if $global.AutoCreateBtnAuth }}v-auth="btnAuth.importExcel"{{ end }} template-id="{{$templateID}}" @on-success="getTableData" />
+            {{- end }}
        </div>
        <el-table
        ref="multipleTable"
@@ -165,27 +535,32 @@
        >
        <el-table-column type="selection" width="55" />
        {{ if .GvaModel }}
-        <el-table-column align="left" label="日期" prop="createdAt" width="180">
+        <el-table-column align="left" label="日期" prop="createdAt" {{- if .IsTree }} min-{{- end }}width="180">
            <template #default="scope">{{ "{{ formatDate(scope.row.CreatedAt) }}" }}</template>
        </el-table-column>
        {{ end }}
-        {{- range .FrontFields}}
+        {{- range .Fields}}
+        {{- if .Table}}
        {{- if .CheckDataSource }}
        <el-table-column {{- if .Sort}} sortable{{- end}} align="left" label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="120">
          <template #default="scope">
-                {{if eq .DataSource.Association 2}}
+                {{- if eq .DataSource.Association 2}}
                    <el-tag v-for="(item,key) in filterDataSource(dataSource.{{.FieldJson}},scope.row.{{.FieldJson}})" :key="key">
                        {{ "{{ item }}" }}
                    </el-tag>
-                {{ else }}
+                {{- else }}
                    <span>{{"{{"}} filterDataSource(dataSource.{{.FieldJson}},scope.row.{{.FieldJson}}) {{"}}"}}</span>
-                {{ end }}
+                {{- end }}
         </template>
         </el-table-column>
        {{- else if .DictType}}
        <el-table-column {{- if .Sort}} sortable{{- end}} align="left" label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="120">
            <template #default="scope">
-            {{"{{"}} filterDict(scope.row.{{.FieldJson}},{{.DictType}}Options) {{"}}"}}
+                {{if eq .FieldType "array"}}
+                <el-tag class="mr-1" v-for="item in scope.row.{{.FieldJson}}" :key="item"> {{"{{"}} filterDict(item,{{.DictType}}Options) {{"}}"}}</el-tag>
+                {{- else }}
+                {{"{{"}} filterDict(scope.row.{{.FieldJson}},{{.DictType}}Options) {{"}}"}}
+                {{end}}
            </template>
        </el-table-column>
        {{- else if eq .FieldType "bool" }}
@@ -199,14 +574,14 @@
          {{- else if eq .FieldType "picture" }}
          <el-table-column label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="200">
              <template #default="scope">
-                <el-image style="width: 100px; height: 100px" :src="getUrl(scope.row.{{.FieldJson}})" fit="cover"/>
+                <el-image preview-teleported style="width: 100px; height: 100px" :src="getUrl(scope.row.{{.FieldJson}})" fit="cover"/>
              </template>
          </el-table-column>
           {{- else if eq .FieldType "pictures" }}
           <el-table-column label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="200">
              <template #default="scope">
                 <div class="multiple-img-box">
-                    <el-image v-for="(item,index) in scope.row.{{.FieldJson}}" :key="index" style="width: 80px; height: 80px" :src="getUrl(item)" fit="cover"/>
+                    <el-image preview-teleported v-for="(item,index) in scope.row.{{.FieldJson}}" :key="index" style="width: 80px; height: 80px" :src="getUrl(item)" fit="cover"/>
                </div>
              </template>
           </el-table-column>
@@ -242,14 +617,25 @@
                  [JSON]
              </template>
          </el-table-column>
-        {{- else }}
-        <el-table-column {{- if .Sort}} sortable{{- end}} align="left" label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="120" />
+           {{- else if eq .FieldType "array" }}
+           <el-table-column label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="200">
+               <template #default="scope">
+                  <ArrayCtrl v-model="scope.row.{{ .FieldJson }}"/>
+               </template>
+           </el-table-column>
+          {{- else }}
+          <el-table-column {{- if .Sort}} sortable{{- end}} align="left" label="{{.FieldDesc}}" prop="{{.FieldJson}}" width="120" />
+          {{- end }}
        {{- end }}
        {{- end }}
        <el-table-column align="left" label="操作" fixed="right" min-width="240">
            <template #default="scope">
-            <el-button type="primary" link icon="edit" class="table-button" @click="update{{.StructName}}Func(scope.row)">变更</el-button>
-            <el-button type="primary" link icon="delete" @click="deleteRow(scope.row)">删除</el-button>
+            {{- if .IsTree }}
+            <el-button {{ if $global.AutoCreateBtnAuth }}v-auth="btnAuth.add"{{ end }} type="primary" link class="table-button" @click="openDialog(scope.row)"><el-icon style="margin-right: 5px"><InfoFilled /></el-icon>新增子节点</el-button>
+            {{- end }}
+            <el-button {{ if $global.AutoCreateBtnAuth }}v-auth="btnAuth.info"{{ end }} type="primary" link class="table-button" @click="getDetails(scope.row)"><el-icon style="margin-right: 5px"><InfoFilled /></el-icon>查看</el-button>
+            <el-button {{ if $global.AutoCreateBtnAuth }}v-auth="btnAuth.edit"{{ end }} type="primary" link icon="edit" class="table-button" @click="update{{.StructName}}Func(scope.row)">编辑</el-button>
+            <el-button {{ if .IsTree }}v-if="!scope.row.children?.length"{{ end }} {{ if $global.AutoCreateBtnAuth }}v-auth="btnAuth.delete"{{ end }} type="primary" link icon="delete" @click="deleteRow(scope.row)">删除</el-button>
            </template>
        </el-table-column>
        </el-table>
@@ -268,16 +654,31 @@
    <el-drawer destroy-on-close size="800" v-model="dialogFormVisible" :show-close="false" :before-close="closeDialog">
       <template #header>
              <div class="flex justify-between items-center">
-                <span class="text-lg">{{"{{"}}type==='create'?'添加':'修改'{{"}}"}}</span>
+                <span class="text-lg">{{"{{"}}type==='create'?'新增':'编辑'{{"}}"}}</span>
                <div>
-                  <el-button type="primary" @click="enterDialog">确 定</el-button>
+                  <el-button :loading="btnLoading" type="primary" @click="enterDialog">确 定</el-button>
                  <el-button @click="closeDialog">取 消</el-button>
                </div>
              </div>
            </template>

          <el-form :model="formData" label-position="top" ref="elFormRef" :rules="rule" label-width="80px">
-        {{- range .FrontFields}}
+          {{- if .IsTree }}
+            <el-form-item label="父节点:" prop="parentID" >
+                <el-tree-select
+                    v-model="formData.parentID"
+                    :data="[rootNode,...tableData]"
+                    check-strictly
+                    :render-after-expand="false"
+                    :props="defaultProps"
+                    clearable
+                    style="width: 240px"
+                    placeholder="根节点"
+                />
+            </el-form-item>
+          {{- end }}
+        {{- range .Fields}}
+          {{- if .Form}}
            <el-form-item label="{{.FieldDesc}}:"  prop="{{.FieldJson}}" >
          {{- if .CheckDataSource}}
            <el-select {{if eq .DataSource.Association 2}} multiple {{ end }} v-model="formData.{{.FieldJson}}" placeholder="请选择{{.FieldDesc}}" style="width:100%" :clearable="{{.Clearable}}" >
@@ -304,9 +705,13 @@
              {{"{{"}} formData.{{.FieldJson}} {{"}}"}}
          {{- end }}
           {{- if eq .FieldType "array" }}
-           <el-tag v-for="(item,key) in formData.{{.FieldJson}}" :key="key">
-              {{ "{{ item }}" }}
-           </el-tag>
+             {{- if .DictType}}
+               <el-select multiple v-model="formData.{{ .FieldJson }}" placeholder="请选择{{.FieldDesc}}" style="width:100%" :clearable="{{.Clearable}}" >
+                 <el-option v-for="(item,key) in {{ .DictType }}Options" :key="key" :label="item.label" :value="item.value" />
+               </el-select>
+             {{- else }}
+              <ArrayCtrl v-model="formData.{{ .FieldJson }}" editable/>
+              {{- end }}
           {{- end }}
          {{- if eq .FieldType "int" }}
              <el-input v-model.number="formData.{{ .FieldJson }}" :clearable="{{.Clearable}}" placeholder="请输入{{.FieldDesc}}" />
@@ -347,8 +752,74 @@
          {{- end }}
            </el-form-item>
          {{- end }}
+          {{- end }}
          </el-form>
    </el-drawer>
+
+    <el-drawer destroy-on-close size="800" v-model="detailShow" :show-close="true" :before-close="closeDetailShow" title="查看">
+            <el-descriptions :column="1" border>
+            {{- if .IsTree }}
+            <el-descriptions-item label="父节点">
+                <el-tree-select
+                  v-model="detailFrom.parentID"
+                  :data="[rootNode,...tableData]"
+                  check-strictly
+                  disabled
+                  :render-after-expand="false"
+                  :props="defaultProps"
+                  clearable
+                  style="width: 240px"
+                  placeholder="根节点"
+                />
+            </el-descriptions-item>
+            {{- end }}
+            {{- range .Fields}}
+              {{- if .Desc }}
+                    <el-descriptions-item label="{{ .FieldDesc }}">
+                    {{- if .CheckDataSource }}
+                       {{- if eq .DataSource.Association 2}}
+                       <el-tag v-for="(item,key) in filterDataSource(dataSource.{{.FieldJson}},detailFrom.{{.FieldJson}})" :key="key">
+                            {{ "{{ item }}" }}
+                       </el-tag>
+                       {{- else }}
+                       <span>{{"{{"}} filterDataSource(dataSource.{{.FieldJson}},detailFrom.{{.FieldJson}}) {{"}}"}}</span>
+                       {{- end }}
+                 {{- else if .DictType}}
+                        {{if eq .FieldType "array"}}
+                        <el-tag class="mr-1" v-for="item in detailFrom.{{.FieldJson}}" :key="item"> {{"{{"}} filterDict(item,{{.DictType}}Options) {{"}}"}}</el-tag>
+                        {{- else }}
+                        {{"{{"}} filterDict(detailFrom.{{.FieldJson}},{{.DictType}}Options) {{"}}"}}
+                        {{end}}
+                {{- else if and (ne .FieldType "picture" ) (ne .FieldType "richtext" ) (ne .FieldType "pictures" ) (ne .FieldType "file" ) (ne .FieldType "array" ) }}
+                        {{"{{"}} detailFrom.{{.FieldJson}} {{"}}"}}
+                {{- else }}
+                    {{- if eq .FieldType "picture" }}
+                            <el-image style="width: 50px; height: 50px" :preview-src-list="returnArrImg(detailFrom.{{ .FieldJson }})" :src="getUrl(detailFrom.{{ .FieldJson }})" fit="cover" />
+                    {{- end }}
+                    {{- if eq .FieldType "array" }}
+                            <ArrayCtrl v-model="detailFrom.{{ .FieldJson }}"/>
+                    {{- end }}
+                    {{- if eq .FieldType "richtext" }}
+                            <RichView v-model="detailFrom.{{.FieldJson}}" />
+                    {{- end }}
+                    {{- if eq .FieldType "pictures" }}
+                            <el-image style="width: 50px; height: 50px; margin-right: 10px" :preview-src-list="returnArrImg(detailFrom.{{ .FieldJson }})" :initial-index="index" v-for="(item,index) in detailFrom.{{ .FieldJson }}" :key="index" :src="getUrl(item)" fit="cover" />
+                    {{- end }}
+                    {{- if eq .FieldType "file" }}
+                            <div class="fileBtn" v-for="(item,index) in detailFrom.{{ .FieldJson }}" :key="index">
+                              <el-button type="primary" text bg @click="onDownloadFile(item.url)">
+                                <el-icon style="margin-right: 5px"><Download /></el-icon>
+                                {{"{{"}}item.name{{"}}"}}
+                              </el-button>
+                            </div>
+                    {{- end }}
+                {{- end }}
+                    </el-descriptions-item>
+              {{- end }}
+            {{- end }}
+            </el-descriptions>
+        </el-drawer>
+
  </div>
 </template>

@@ -376,23 +847,50 @@ import SelectImage from '@/components/selectImage/selectImage.vue'
 {{- if .HasRichText }}
 // 富文本组件
 import RichEdit from '@/components/richtext/rich-edit.vue'
+import RichView from '@/components/richtext/rich-view.vue'
 {{- end }}

-
 {{- if .HasFile }}
 // 文件选择组件
 import SelectFile from '@/components/selectFile/selectFile.vue'
 {{- end }}

+{{- if .HasArray}}
+// 数组控制组件
+import ArrayCtrl from '@/components/arrayCtrl/arrayCtrl.vue'
+{{- end }}
+
 // 全量引入格式化工具 请按需保留
-import { getDictFunc, formatDate, formatBoolean, filterDict ,filterDataSource, ReturnArrImg, onDownloadFile } from '@/utils/format'
+import { getDictFunc, formatDate, formatBoolean, filterDict ,filterDataSource, returnArrImg, onDownloadFile } from '@/utils/format'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { ref, reactive } from 'vue'
+{{- if .AutoCreateBtnAuth }}
+// 引入按钮权限标识
+import { useBtnAuth } from '@/utils/btnAuth'
+{{- end }}
+
+{{if .HasExcel -}}
+// 导出组件
+import ExportExcel from '@/components/exportExcel/exportExcel.vue'
+// 导入组件
+import ImportExcel from '@/components/exportExcel/importExcel.vue'
+// 导出模板组件
+import ExportTemplate from '@/components/exportExcel/exportTemplate.vue'
+{{- end}}
+

 defineOptions({
    name: '{{.StructName}}'
 })

+{{- if .AutoCreateBtnAuth }}
+// 按钮权限实例化
+    const btnAuth = useBtnAuth()
+{{- end }}
+
+// 提交按钮loading
+const btnLoading = ref(false)
+
 // 控制更多查询条件显示/隐藏状态
 const showAllQuery = ref(false)

@@ -401,43 +899,48 @@ const showAllQuery = ref(false)
 const {{ $element }}Options = ref([])
    {{- end }}
 const formData = ref({
-        {{- range .FrontFields}}
-        {{- 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}}: [],
+        {{- if .IsTree }}
+            parentID:undefined,
        {{- end }}
+        {{- 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 .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 }}
        })

@@ -456,7 +959,8 @@ const formData = ref({

 // 验证规则
 const rule = reactive({
-    {{- range .FrontFields }}
+    {{- range .Fields }}
+        {{- if .Form }}
            {{- if eq .Require true }}
               {{.FieldJson }} : [{
                   required: true,
@@ -472,6 +976,7 @@ const rule = reactive({
              {{- end }}
              ],
            {{- end }}
+        {{- end }}
    {{- end }}
 })

@@ -489,7 +994,7 @@ const searchRule = reactive({
      }
    }, trigger: 'change' }
  ],
-  {{- range .FrontFields }}
+  {{- range .Fields }}
    {{- if .FieldSearchType}}
      {{- if eq .FieldType "time.Time" }}
        {{.FieldJson }} : [{ validator: (rule, value, callback) => {
@@ -522,12 +1027,14 @@ const searchInfo = ref({})
 // 排序
 const sortChange = ({ prop, order }) => {
  const sortMap = {
-    {{- range .FrontFields}}
+    {{- range .Fields}}
+     {{- if .Table}}
      {{- if and .Sort}}
        {{- if not (eq .ColumnName "")}}
            {{.FieldJson}}: '{{.ColumnName}}',
        {{- end}}
      {{- end}}
+     {{- end}}
    {{- end}}
  }

@@ -542,6 +1049,7 @@ const sortChange = ({ prop, order }) => {
 }
 {{- end}}

+{{- if not .IsTree }}
 // 重置
 const onReset = () => {
  searchInfo.value = {}
@@ -553,8 +1061,7 @@ const onSubmit = () => {
  elSearchFormRef.value?.validate(async(valid) => {
    if (!valid) return
    page.value = 1
-    pageSize.value = 10
-    {{- range .FrontFields}}{{- if eq .FieldType "bool" }}
+    {{- range .Fields}}{{- if eq .FieldType "bool" }}
    if (searchInfo.value.{{.FieldJson}} === ""){
        searchInfo.value.{{.FieldJson}}=null
    }{{ end }}{{ end }}
@@ -584,6 +1091,28 @@ const getTableData = async() => {
    pageSize.value = table.data.pageSize
  }
 }
+{{- else }}
+// 树选择器配置
+const defaultProps = {
+  children: "children",
+  label: "{{ .TreeJson }}",
+  value: "{{ .PrimaryField.FieldJson }}"
+}
+
+const rootNode = {
+  {{ .PrimaryField.FieldJson }}: 0,
+  {{ .TreeJson }}: '根节点',
+  children: []
+}
+
+// 查询
+const getTableData = async() => {
+  const table = await get{{.StructName}}List()
+  if (table.code === 0) {
+    tableData.value = table.data || []
+  }
+}
+{{- end }}

 getTableData()

@@ -684,8 +1213,11 @@ const delete{{.StructName}}Func = async (row) => {
 const dialogFormVisible = ref(false)

 // 打开弹窗
-const openDialog = () => {
+const openDialog = ({{- if .IsTree -}}row{{- end -}}) => {
    type.value = 'create'
+    {{- if .IsTree }}
+    formData.value.parentID = row ? row.{{.PrimaryField.FieldJson}} : undefined
+    {{- end }}
    dialogFormVisible.value = true
 }

@@ -693,7 +1225,8 @@ const openDialog = () => {
 const closeDialog = () => {
    dialogFormVisible.value = false
    formData.value = {
-    {{- range .FrontFields}}
+    {{- range .Fields}}
+      {{- if .Form}}
        {{- if eq .FieldType "bool" }}
        {{.FieldJson}}: false,
        {{- end }}
@@ -704,7 +1237,7 @@ const closeDialog = () => {
        {{.FieldJson}}: '',
        {{- end }}
        {{- if eq .FieldType "int" }}
-        {{.FieldJson}}: {{- if or .DictType .DataSource }} undefined{{ else }} 0{{- end }},
+        {{.FieldJson}}: {{- if .DataSource }} undefined{{ else }} 0{{- end }},
        {{- end }}
        {{- if eq .FieldType "time.Time" }}
        {{.FieldJson}}: new Date(),
@@ -727,13 +1260,18 @@ const closeDialog = () => {
        {{- if eq .FieldType "json" }}
        {{.FieldJson}}: {},
        {{- end }}
+        {{- if eq .FieldType "array" }}
+        {{.FieldJson}}: [],
        {{- end }}
+      {{- end }}
+    {{- end }}
        }
 }
 // 弹窗确定
 const enterDialog = async () => {
+     btnLoading.value = true
     elFormRef.value?.validate( async (valid) => {
-             if (!valid) return
+             if (!valid) return btnLoading.value = false
              let res
              switch (type.value) {
                case 'create':
@@ -746,6 +1284,7 @@ const enterDialog = async () => {
                  res = await create{{.StructName}}(formData.value)
                  break
              }
+              btnLoading.value = false
              if (res.code === 0) {
                ElMessage({
                  type: 'success',
@@ -761,6 +1300,37 @@ const downloadFile = (url) => {
    window.open(getUrl(url), '_blank')
 }
 {{end}}
+
+const detailFrom = ref({})
+
+// 查看详情控制标记
+const detailShow = ref(false)
+
+
+// 打开详情弹窗
+const openDetailShow = () => {
+  detailShow.value = true
+}
+
+
+// 打开详情
+const getDetails = async (row) => {
+  // 打开弹窗
+  const res = await find{{.StructName}}({ {{.PrimaryField.FieldJson}}: row.{{.PrimaryField.FieldJson}} })
+  if (res.code === 0) {
+    detailFrom.value = res.data
+    openDetailShow()
+  }
+}
+
+
+// 关闭详情弹窗
+const closeDetailShow = () => {
+  detailShow.value = false
+  detailFrom.value = {}
+}
+
+
 </script>

 <style>
@@ -780,3 +1350,17 @@ const downloadFile = (url) => {
 }
 {{end}}
 </style>
+{{- else}}
+<template>
+<div>form</div>
+</template>
+<script setup>
+defineOptions({
+  name: '{{.StructName}}'
+})
+</script>
+<style>
+</style>
+{{- end }}
+
+{{- end }}
@@ -7,9 +7,11 @@ import (
 type RouterGroup struct {
 	CustomerRouter
 	FileUploadAndDownloadRouter
+	AttachmentCategoryRouter
 }

 var (
 	exaCustomerApi              = api.ApiGroupApp.ExampleApiGroup.CustomerApi
 	exaFileUploadAndDownloadApi = api.ApiGroupApp.ExampleApiGroup.FileUploadAndDownloadApi
+	attachmentCategoryApi       = api.ApiGroupApp.ExampleApiGroup.AttachmentCategoryApi
 )
@@ -0,0 +1,16 @@
+package example
+
+import (
+	"github.com/gin-gonic/gin"
+)
+
+type AttachmentCategoryRouter struct{}
+
+func (r *AttachmentCategoryRouter) InitAttachmentCategoryRouterRouter(Router *gin.RouterGroup) {
+	router := Router.Group("attachmentCategory")
+	{
+		router.GET("getCategoryList", attachmentCategoryApi.GetCategoryList) // 分类列表
+		router.POST("addCategory", attachmentCategoryApi.AddCategory)        // 添加/编辑分类
+		router.POST("deleteCategory", attachmentCategoryApi.DeleteCategory)  // 删除分类
+	}
+}
@@ -17,5 +17,6 @@ func (e *FileUploadAndDownloadRouter) InitFileUploadAndDownloadRouter(Router *gi
 		fileUploadAndDownloadRouter.GET("findFile", exaFileUploadAndDownloadApi.FindFile)                                  // 查询当前文件成功的切片
 		fileUploadAndDownloadRouter.POST("breakpointContinueFinish", exaFileUploadAndDownloadApi.BreakpointContinueFinish) // 切片传输完成
 		fileUploadAndDownloadRouter.POST("removeChunk", exaFileUploadAndDownloadApi.RemoveChunk)                           // 删除切片
+		fileUploadAndDownloadRouter.POST("importURL", exaFileUploadAndDownloadApi.ImportURL)                               // 导入URL
 	}
 }
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="renderer" content="webkit"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>variant-form</title><link href="css/app.7832f89c.css" rel="preload" as="style"><link href="css/chunk-vendors.a16c4353.css" rel="preload" as="style"><link href="js/app.9fe02340.js" rel="preload" as="script"><link href="js/chunk-vendors.2e7c88f1.js" rel="preload" as="script"><link href="css/chunk-vendors.a16c4353.css" rel="stylesheet"><link href="css/app.7832f89c.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but variant-form doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="js/chunk-vendors.2e7c88f1.js"></script><script src="js/app.9fe02340.js"></script></body></html>