feat: 在存在enum的情况下自动化代码时候会校验其赋值并且在错误时候自动包裹

* feat: 优化菜单管理的路径选择框

* fixed: 修复错误的文件命名

* feat: 增加参数管理功能，调整菜单选择组件。

* feat: 恢复config.yaml

* feat: 更新AI功能

* feat: 增加API自动填充功能

* feat: 增加AI自动填充表格导出模板

* feat: 增加AI自动填充表格导出模板和AI自动模板填充

* feat: 新增方法支持选择是否鉴权

---------

Co-authored-by: Azir <2075125282@qq.com>

.github/workflows/ci.yaml

@@ -26,7 +26,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [16.8.0]
+        node-version: [18.16.0]
     steps:
       - name: Check out branch
         uses: actions/checkout@v2
@@ -48,7 +48,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go-version: [1.21]
+        go-version: [1.22]
     steps:
       - name: Set up Go ${{ matrix.go-version }}
         uses: actions/setup-go@v1
@@ -83,8 +83,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [16.8.0]
-        go-version: [1.21]
+        node-version: [18.16.0]
+        go-version: [1.22]
     steps:
       - name: Check out branch
         uses: actions/checkout@v2
@@ -194,8 +194,8 @@ jobs:
     name: devops-prod
     strategy:
       matrix:
-        node-version: ['16.x']
-        go-version: ['1.21']
+        node-version: ['18.x']
+        go-version: ['1.22']
     steps:
       - uses: actions/checkout@v2
       - name: tag major and minor versions

.gitignore

@@ -22,10 +22,13 @@ yarn-error.log*
 *.sln
 *.sw?
 
+rm_file/
 /server/log/
 /server/gva
+/server/server
 /server/latest_log
 /server/__debug_bin*
+server/uploads/
 
 *.iml
 web/.pnpm-debug.log

Makefile

@@ -2,9 +2,9 @@ SHELL = /bin/bash
 
 #SCRIPT_DIR         = $(shell pwd)/etc/script
 #请选择golang版本
-BUILD_IMAGE_SERVER  = golang:1.18
+BUILD_IMAGE_SERVER  = golang:1.22
 #请选择node版本
-BUILD_IMAGE_WEB     = node:16
+BUILD_IMAGE_WEB     = node:20
 #项目名称
 PROJECT_NAME        = github.com/flipped-aurora/gin-vue-admin/server
 #配置文件目录

README-en.md

@@ -1,6 +1,6 @@
 
 <div align=center>
-<img src="http://qmplusimg.henrongyi.top/gvalogo.jpg" width=300" height="300" />
+<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.18-blue"/>
@@ -16,10 +16,6 @@ English | [简体中文](./README.md)
 
 [github](https://github.com/flipped-aurora/gin-vue-admin): https://github.com/flipped-aurora/gin-vue-admin
 
-[Vue3 version branch address](https://github.com/flipped-aurora/gin-vue-admin/tree/vue3Develop): https://github.com/flipped-aurora/gin-vue-admin/tree/vue3Develop
-
-[Approval flow branch](https://github.com/flipped-aurora/gin-vue-admin/tree/gva_workflow): https://github.com/flipped-aurora/gin-vue-admin/tree/gva_workflow
-
 # Project Guidelines
 [Online Documentation](https://www.gin-vue-admin.com/) : https://www.gin-vue-admin.com/
 

README.md

@@ -1,6 +1,6 @@
 
 <div align=center>
-<img src="http://qmplusimg.henrongyi.top/gvalogo.jpg" width=300" height="300" />
+<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"/>
@@ -12,15 +12,6 @@
 
 [English](./README-en.md) | 简体中文
 
-## 不同版本
-
-我们会对以下四个版本持续维护，请选择适合自己的版本使用。最新技术栈为组合式api版本，已支持多语言（I18N）
-
-[组合式API版（主）](https://github.com/flipped-aurora/gin-vue-admin) | 
-[组合式API多语言(i18n)版](https://github.com/flipped-aurora/gin-vue-admin/tree/i18n-dev-new) | 
-[声明式API版](https://github.com/flipped-aurora/gin-vue-admin/tree/v2.4.x) | 
-[声明式API多语言(i18n)版](https://github.com/flipped-aurora/gin-vue-admin/tree/i18n-dev)
-
 # 项目文档
 [在线文档](https://www.gin-vue-admin.com) : https://www.gin-vue-admin.com
 
@@ -42,9 +33,11 @@
 
 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/%E6%8E%88%E6%9D%83.png" width="1000">
+<img src="https://qmplusimg.henrongyi.top/openSource/dashboard.jpg" width="1000">
 
 ## 1. 基本介绍
 
@@ -83,7 +76,7 @@ Gin-vue-admin 的成长离不开大家的支持，如果你愿意为 gin-vue-adm
 
 ```
 - node版本 > v16.8.3
-- golang版本 >= v1.16
+- golang版本 >= v1.22
 - IDE推荐：Goland
 ```
 
@@ -101,11 +94,9 @@ cd server
 # 使用 go mod 并安装go依赖包
 go generate
 
-# 编译 
-go build -o server main.go (windows编译命令为go build -o server.exe main.go )
+# 运行
+go run . 
 
-# 运行二进制
-./server (windows运行命令为 server.exe)
 ```
 
 ### 2.2 web项目

deploy/docker-compose/docker-compose-dev.yaml

@@ -15,7 +15,7 @@ volumes:
 
 services:
   web:
-    image: node:16
+    image: node:20
     container_name: gva-web
     hostname: gva-web           #可以通过容器名访问
     restart: always
@@ -25,7 +25,7 @@ services:
       - server
     working_dir: /web       # 如果docker 设置了workdir 则此处不需要设置
     #若网络不太好，请自行换源，如下
-    #command: bash -c "yarn config set registry https://registry.npm.taobao.org --global && yarn install && yarn serve"
+    #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
@@ -34,7 +34,7 @@ services:
         ipv4_address: 177.7.0.11
 
   server:
-    image: golang:1.18
+    image: golang:1.22
     container_name: gva-server
     hostname: gva-server
     restart: always

server/Dockerfile

@@ -13,6 +13,10 @@ RUN go env -w GO111MODULE=on \
 FROM alpine:latest
 
 LABEL MAINTAINER="SliverHorn@sliver_horn@qq.com"
+# 设置时区
+ENV TZ=Asia/Shanghai
+RUN apk update && apk add --no-cache tzdata openntpd \
+    && ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 WORKDIR /go/src/github.com/flipped-aurora/gin-vue-admin/server
 
@@ -20,5 +24,8 @@ COPY --from=0 /go/src/github.com/flipped-aurora/gin-vue-admin/server/server ./
 COPY --from=0 /go/src/github.com/flipped-aurora/gin-vue-admin/server/resource ./resource/
 COPY --from=0 /go/src/github.com/flipped-aurora/gin-vue-admin/server/config.docker.yaml ./
 
+# 挂载目录：如果使用了sqlite数据库，容器命令示例：docker run -d -v /宿主机路径/gva.db:/go/src/github.com/flipped-aurora/gin-vue-admin/server/gva.db -p 8888:8888 --name gva-server-v1 gva-server:1.0
+# VOLUME ["/go/src/github.com/flipped-aurora/gin-vue-admin/server"]
+
 EXPOSE 8888
 ENTRYPOINT ./server -c config.docker.yaml

server/api/v1/enter.go

@@ -5,9 +5,9 @@ import (
 	"github.com/flipped-aurora/gin-vue-admin/server/api/v1/system"
 )
 
+var ApiGroupApp = new(ApiGroup)
+
 type ApiGroup struct {
 	SystemApiGroup  system.ApiGroup
 	ExampleApiGroup example.ApiGroup
 }
-
-var ApiGroupApp = new(ApiGroup)

server/api/v1/example/exa_breakpoint_continue.go

@@ -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")

server/api/v1/example/exa_file_upload_download.go

@@ -32,8 +32,8 @@ func (b *FileUploadAndDownloadApi) UploadFile(c *gin.Context) {
 	}
 	file, err = fileUploadAndDownloadService.UploadFile(header, noSave) // 文件上传后拿到文件路径
 	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)
@@ -108,3 +108,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)
+}

server/api/v1/system/auto_code_history.go

@@ -2,9 +2,9 @@ package system
 
 import (
 	"github.com/flipped-aurora/gin-vue-admin/server/global"
-	"github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
+	common "github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
 	"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
-	systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request"
+	request "github.com/flipped-aurora/gin-vue-admin/server/model/system/request"
 	"github.com/gin-gonic/gin"
 	"go.uber.org/zap"
 )
@@ -21,13 +21,13 @@ type AutoCodeHistoryApi struct{}
 // @Success   200   {object}  response.Response{data=map[string]interface{},msg=string}  "获取meta信息"
 // @Router    /autoCode/getMeta [post]
 func (a *AutoCodeHistoryApi) First(c *gin.Context) {
-	var info request.GetById
+	var info common.GetById
 	err := c.ShouldBindJSON(&info)
 	if err != nil {
 		response.FailWithMessage(err.Error(), c)
 		return
 	}
-	data, err := autoCodeHistoryService.First(&info)
+	data, err := autoCodeHistoryService.First(c.Request.Context(), info)
 	if err != nil {
 		response.FailWithMessage(err.Error(), c)
 		return
@@ -45,13 +45,13 @@ func (a *AutoCodeHistoryApi) First(c *gin.Context) {
 // @Success   200   {object}  response.Response{msg=string}  "删除回滚记录"
 // @Router    /autoCode/delSysHistory [post]
 func (a *AutoCodeHistoryApi) Delete(c *gin.Context) {
-	var info request.GetById
+	var info common.GetById
 	err := c.ShouldBindJSON(&info)
 	if err != nil {
 		response.FailWithMessage(err.Error(), c)
 		return
 	}
-	err = autoCodeHistoryService.Delete(&info)
+	err = autoCodeHistoryService.Delete(c.Request.Context(), info)
 	if err != nil {
 		global.GVA_LOG.Error("删除失败!", zap.Error(err))
 		response.FailWithMessage("删除失败", c)
@@ -66,17 +66,17 @@ func (a *AutoCodeHistoryApi) Delete(c *gin.Context) {
 // @Security  ApiKeyAuth
 // @accept    application/json
 // @Produce   application/json
-// @Param     data  body      systemReq.RollBack             true  "请求参数"
+// @Param     data  body      request.SysAutoHistoryRollBack             true  "请求参数"
 // @Success   200   {object}  response.Response{msg=string}  "回滚自动生成代码"
 // @Router    /autoCode/rollback [post]
 func (a *AutoCodeHistoryApi) RollBack(c *gin.Context) {
-	var info systemReq.RollBack
+	var info request.SysAutoHistoryRollBack
 	err := c.ShouldBindJSON(&info)
 	if err != nil {
 		response.FailWithMessage(err.Error(), c)
 		return
 	}
-	err = autoCodeHistoryService.RollBack(&info)
+	err = autoCodeHistoryService.RollBack(c.Request.Context(), info)
 	if err != nil {
 		response.FailWithMessage(err.Error(), c)
 		return
@@ -90,17 +90,17 @@ func (a *AutoCodeHistoryApi) RollBack(c *gin.Context) {
 // @Security  ApiKeyAuth
 // @accept    application/json
 // @Produce   application/json
-// @Param     data  body      systemReq.SysAutoHistory                                true  "请求参数"
+// @Param     data  body      common.PageInfo                                true  "请求参数"
 // @Success   200   {object}  response.Response{data=response.PageResult,msg=string}  "查询回滚记录,返回包括列表,总数,页码,每页数量"
 // @Router    /autoCode/getSysHistory [post]
 func (a *AutoCodeHistoryApi) GetList(c *gin.Context) {
-	var search systemReq.SysAutoHistory
-	err := c.ShouldBindJSON(&search)
+	var info common.PageInfo
+	err := c.ShouldBindJSON(&info)
 	if err != nil {
 		response.FailWithMessage(err.Error(), c)
 		return
 	}
-	list, total, err := autoCodeHistoryService.GetList(search.PageInfo)
+	list, total, err := autoCodeHistoryService.GetList(c.Request.Context(), info)
 	if err != nil {
 		global.GVA_LOG.Error("获取失败!", zap.Error(err))
 		response.FailWithMessage("获取失败", c)
@@ -109,7 +109,7 @@ func (a *AutoCodeHistoryApi) GetList(c *gin.Context) {
 	response.OkWithDetailed(response.PageResult{
 		List:     list,
 		Total:    total,
-		Page:     search.Page,
-		PageSize: search.PageSize,
+		Page:     info.Page,
+		PageSize: info.PageSize,
 	}, "获取成功", c)
 }

server/api/v1/system/auto_code_package.go

@@ -0,0 +1,100 @@
+package system
+
+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/system/request"
+	"github.com/flipped-aurora/gin-vue-admin/server/utils"
+	"github.com/gin-gonic/gin"
+	"go.uber.org/zap"
+	"strings"
+)
+
+type AutoCodePackageApi struct{}
+
+// Create
+// @Tags      AutoCodePackage
+// @Summary   创建package
+// @Security  ApiKeyAuth
+// @accept    application/json
+// @Produce   application/json
+// @Param     data  body      request.SysAutoCodePackageCreate                                         true  "创建package"
+// @Success   200   {object}  response.Response{data=map[string]interface{},msg=string}  "创建package成功"
+// @Router    /autoCode/createPackage [post]
+func (a *AutoCodePackageApi) Create(c *gin.Context) {
+	var info request.SysAutoCodePackageCreate
+	_ = c.ShouldBindJSON(&info)
+	if err := utils.Verify(info, utils.AutoPackageVerify); err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	if strings.Contains(info.PackageName, "\\") || strings.Contains(info.PackageName, "/") || strings.Contains(info.PackageName, "..") {
+		response.FailWithMessage("包名不合法", c)
+		return
+	} // PackageName可能导致路径穿越的问题 / 和 \ 都要防止
+	err := autoCodePackageService.Create(c.Request.Context(), &info)
+	if err != nil {
+		global.GVA_LOG.Error("创建失败!", zap.Error(err))
+		response.FailWithMessage("创建失败", c)
+		return
+	}
+	response.OkWithMessage("创建成功", c)
+}
+
+// Delete
+// @Tags      AutoCode
+// @Summary   删除package
+// @Security  ApiKeyAuth
+// @accept    application/json
+// @Produce   application/json
+// @Param     data  body      common.GetById                                         true  "创建package"
+// @Success   200   {object}  response.Response{data=map[string]interface{},msg=string}  "删除package成功"
+// @Router    /autoCode/delPackage [post]
+func (a *AutoCodePackageApi) Delete(c *gin.Context) {
+	var info common.GetById
+	_ = c.ShouldBindJSON(&info)
+	err := autoCodePackageService.Delete(c.Request.Context(), info)
+	if err != nil {
+		global.GVA_LOG.Error("删除失败!", zap.Error(err))
+		response.FailWithMessage("删除失败", c)
+		return
+	}
+	response.OkWithMessage("删除成功", c)
+}
+
+// All
+// @Tags      AutoCodePackage
+// @Summary   获取package
+// @Security  ApiKeyAuth
+// @accept    application/json
+// @Produce   application/json
+// @Success   200  {object}  response.Response{data=map[string]interface{},msg=string}  "创建package成功"
+// @Router    /autoCode/getPackage [post]
+func (a *AutoCodePackageApi) All(c *gin.Context) {
+	data, err := autoCodePackageService.All(c.Request.Context())
+	if err != nil {
+		global.GVA_LOG.Error("获取失败!", zap.Error(err))
+		response.FailWithMessage("获取失败", c)
+		return
+	}
+	response.OkWithDetailed(gin.H{"pkgs": data}, "获取成功", c)
+}
+
+// Templates
+// @Tags      AutoCodePackage
+// @Summary   获取package
+// @Security  ApiKeyAuth
+// @accept    application/json
+// @Produce   application/json
+// @Success   200  {object}  response.Response{data=map[string]interface{},msg=string}  "创建package成功"
+// @Router    /autoCode/getTemplates [get]
+func (a *AutoCodePackageApi) Templates(c *gin.Context) {
+	data, err := autoCodePackageService.Templates(c.Request.Context())
+	if err != nil {
+		global.GVA_LOG.Error("获取失败!", zap.Error(err))
+		response.FailWithMessage("获取失败", c)
+		return
+	}
+	response.OkWithDetailed(data, "获取成功", c)
+}

server/api/v1/system/auto_code_plugin.go

@@ -0,0 +1,119 @@
+package system
+
+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"
+)
+
+type AutoCodePluginApi struct{}
+
+// Install
+// @Tags      AutoCodePlugin
+// @Summary   安装插件
+// @Security  ApiKeyAuth
+// @accept    multipart/form-data
+// @Produce   application/json
+// @Param     plug  formData  file                                              true  "this is a test file"
+// @Success   200   {object}  response.Response{data=[]interface{},msg=string}  "安装插件成功"
+// @Router    /autoCode/installPlugin [post]
+func (a *AutoCodePluginApi) Install(c *gin.Context) {
+	header, err := c.FormFile("plug")
+	if err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	web, server, err := autoCodePluginService.Install(header)
+	webStr := "web插件安装成功"
+	serverStr := "server插件安装成功"
+	if web == -1 {
+		webStr = "web端插件未成功安装，请按照文档自行解压安装，如果为纯后端插件请忽略此条提示"
+	}
+	if server == -1 {
+		serverStr = "server端插件未成功安装，请按照文档自行解压安装，如果为纯前端插件请忽略此条提示"
+	}
+	if err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	response.OkWithData([]interface{}{
+		gin.H{
+			"code": web,
+			"msg":  webStr,
+		},
+		gin.H{
+			"code": server,
+			"msg":  serverStr,
+		}}, c)
+}
+
+// Packaged
+// @Tags      AutoCodePlugin
+// @Summary   打包插件
+// @Security  ApiKeyAuth
+// @accept    application/json
+// @Produce   application/json
+// @Param     plugName  query    string  true  "插件名称"
+// @Success   200   {object}  response.Response{data=map[string]interface{},msg=string}  "打包插件成功"
+// @Router    /autoCode/pubPlug [post]
+func (a *AutoCodePluginApi) Packaged(c *gin.Context) {
+	plugName := c.Query("plugName")
+	zipPath, err := autoCodePluginService.PubPlug(plugName)
+	if err != nil {
+		global.GVA_LOG.Error("打包失败!", zap.Error(err))
+		response.FailWithMessage("打包失败"+err.Error(), c)
+		return
+	}
+	response.OkWithMessage(fmt.Sprintf("打包成功,文件路径为:%s", zipPath), c)
+}
+
+// Packaged
+// @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)
+}
+
+// Packaged
+// @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)
+}

server/api/v1/system/auto_code_template.go

@@ -0,0 +1,108 @@
+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/request"
+	"github.com/flipped-aurora/gin-vue-admin/server/utils"
+	"github.com/gin-gonic/gin"
+	"go.uber.org/zap"
+)
+
+type AutoCodeTemplateApi struct{}
+
+// Preview
+// @Tags      AutoCodeTemplate
+// @Summary   预览创建后的代码
+// @Security  ApiKeyAuth
+// @accept    application/json
+// @Produce   application/json
+// @Param     data  body      request.AutoCode                                      true  "预览创建代码"
+// @Success   200   {object}  response.Response{data=map[string]interface{},msg=string}  "预览创建后的代码"
+// @Router    /autoCode/preview [post]
+func (a *AutoCodeTemplateApi) Preview(c *gin.Context) {
+	var info request.AutoCode
+	err := c.ShouldBindJSON(&info)
+	if err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	err = utils.Verify(info, utils.AutoCodeVerify)
+	if err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	err = info.Pretreatment()
+	if err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	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)
+	} else {
+		response.OkWithDetailed(gin.H{"autoCode": autoCode}, "预览成功", c)
+	}
+}
+
+// Create
+// @Tags      AutoCodeTemplate
+// @Summary   自动代码模板
+// @Security  ApiKeyAuth
+// @accept    application/json
+// @Produce   application/json
+// @Param     data  body      request.AutoCode  true  "创建自动代码"
+// @Success   200   {string}  string                 "{"success":true,"data":{},"msg":"创建成功"}"
+// @Router    /autoCode/createTemp [post]
+func (a *AutoCodeTemplateApi) Create(c *gin.Context) {
+	var info request.AutoCode
+	err := c.ShouldBindJSON(&info)
+	if err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	err = utils.Verify(info, utils.AutoCodeVerify)
+	if err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	err = info.Pretreatment()
+	if err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	err = autoCodeTemplateService.Create(c.Request.Context(), info)
+	if err != nil {
+		global.GVA_LOG.Error("创建失败!", zap.Error(err))
+		response.FailWithMessage(err.Error(), c)
+	} else {
+		response.OkWithMessage("创建成功", c)
+	}
+}
+
+// Create
+// @Tags      AddFunc
+// @Summary   增加方法
+// @Security  ApiKeyAuth
+// @accept    application/json
+// @Produce   application/json
+// @Param     data  body      request.AutoCode  true  "增加方法"
+// @Success   200   {string}  string                 "{"success":true,"data":{},"msg":"创建成功"}"
+// @Router    /autoCode/addFunc [post]
+func (a *AutoCodeTemplateApi) AddFunc(c *gin.Context) {
+	var info request.AutoFunc
+	err := c.ShouldBindJSON(&info)
+	if err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	err = autoCodeTemplateService.AddFunc(info)
+	if err != nil {
+		global.GVA_LOG.Error("注入失败!", zap.Error(err))
+		response.FailWithMessage("注入失败", c)
+	} else {
+		response.OkWithMessage("注入成功", c)
+	}
+}

server/api/v1/system/enter.go

@@ -14,10 +14,14 @@ type ApiGroup struct {
 	DictionaryApi
 	AuthorityMenuApi
 	OperationRecordApi
-	AutoCodeHistoryApi
 	DictionaryDetailApi
 	AuthorityBtnApi
 	SysExportTemplateApi
+	AutoCodePluginApi
+	AutoCodePackageApi
+	AutoCodeHistoryApi
+	AutoCodeTemplateApi
+	SysParamsApi
 }
 
 var (
@@ -27,13 +31,17 @@ var (
 	userService             = service.ServiceGroupApp.SystemServiceGroup.UserService
 	initDBService           = service.ServiceGroupApp.SystemServiceGroup.InitDBService
 	casbinService           = service.ServiceGroupApp.SystemServiceGroup.CasbinService
-	autoCodeService         = service.ServiceGroupApp.SystemServiceGroup.AutoCodeService
 	baseMenuService         = service.ServiceGroupApp.SystemServiceGroup.BaseMenuService
 	authorityService        = service.ServiceGroupApp.SystemServiceGroup.AuthorityService
 	dictionaryService       = service.ServiceGroupApp.SystemServiceGroup.DictionaryService
-	systemConfigService     = service.ServiceGroupApp.SystemServiceGroup.SystemConfigService
-	operationRecordService  = service.ServiceGroupApp.SystemServiceGroup.OperationRecordService
-	autoCodeHistoryService  = service.ServiceGroupApp.SystemServiceGroup.AutoCodeHistoryService
-	dictionaryDetailService = service.ServiceGroupApp.SystemServiceGroup.DictionaryDetailService
 	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
+	autoCodePluginService   = service.ServiceGroupApp.SystemServiceGroup.AutoCodePlugin
+	autoCodePackageService  = service.ServiceGroupApp.SystemServiceGroup.AutoCodePackage
+	autoCodeHistoryService  = service.ServiceGroupApp.SystemServiceGroup.AutoCodeHistory
+	autoCodeTemplateService = service.ServiceGroupApp.SystemServiceGroup.AutoCodeTemplate
 )

server/api/v1/system/sys_api.go

@@ -45,6 +45,97 @@ func (s *SystemApiApi) CreateApi(c *gin.Context) {
 	response.OkWithMessage("创建成功", c)
 }
 
+// SyncApi
+// @Tags      SysApi
+// @Summary   同步API
+// @Security  ApiKeyAuth
+// @accept    application/json
+// @Produce   application/json
+// @Success   200   {object}  response.Response{msg=string}  "同步API"
+// @Router    /api/syncApi [get]
+func (s *SystemApiApi) SyncApi(c *gin.Context) {
+	newApis, deleteApis, ignoreApis, err := apiService.SyncApi()
+	if err != nil {
+		global.GVA_LOG.Error("同步失败!", zap.Error(err))
+		response.FailWithMessage("同步失败", c)
+		return
+	}
+	response.OkWithData(gin.H{
+		"newApis":    newApis,
+		"deleteApis": deleteApis,
+		"ignoreApis": ignoreApis,
+	}, c)
+}
+
+// GetApiGroups
+// @Tags      SysApi
+// @Summary   获取API分组
+// @Security  ApiKeyAuth
+// @accept    application/json
+// @Produce   application/json
+// @Success   200   {object}  response.Response{msg=string}  "获取API分组"
+// @Router    /api/getApiGroups [get]
+func (s *SystemApiApi) GetApiGroups(c *gin.Context) {
+	groups, apiGroupMap, err := apiService.GetApiGroups()
+	if err != nil {
+		global.GVA_LOG.Error("获取失败!", zap.Error(err))
+		response.FailWithMessage("获取失败", c)
+		return
+	}
+	response.OkWithData(gin.H{
+		"groups":      groups,
+		"apiGroupMap": apiGroupMap,
+	}, c)
+}
+
+// IgnoreApi
+// @Tags      IgnoreApi
+// @Summary   忽略API
+// @Security  ApiKeyAuth
+// @accept    application/json
+// @Produce   application/json
+// @Success   200   {object}  response.Response{msg=string}  "同步API"
+// @Router    /api/ignoreApi [post]
+func (s *SystemApiApi) IgnoreApi(c *gin.Context) {
+	var ignoreApi system.SysIgnoreApi
+	err := c.ShouldBindJSON(&ignoreApi)
+	if err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	err = apiService.IgnoreApi(ignoreApi)
+	if err != nil {
+		global.GVA_LOG.Error("忽略失败!", zap.Error(err))
+		response.FailWithMessage("忽略失败", c)
+		return
+	}
+	response.Ok(c)
+}
+
+// EnterSyncApi
+// @Tags      SysApi
+// @Summary   确认同步API
+// @Security  ApiKeyAuth
+// @accept    application/json
+// @Produce   application/json
+// @Success   200   {object}  response.Response{msg=string}  "确认同步API"
+// @Router    /api/enterSyncApi [post]
+func (s *SystemApiApi) EnterSyncApi(c *gin.Context) {
+	var syncApi systemRes.SysSyncApis
+	err := c.ShouldBindJSON(&syncApi)
+	if err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	err = apiService.EnterSyncApi(syncApi)
+	if err != nil {
+		global.GVA_LOG.Error("忽略失败!", zap.Error(err))
+		response.FailWithMessage("忽略失败", c)
+		return
+	}
+	response.Ok(c)
+}
+
 // DeleteApi
 // @Tags      SysApi
 // @Summary   删除api
@@ -179,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)

server/api/v1/system/sys_authority.go

@@ -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)

server/api/v1/system/sys_auto_code.go

@@ -1,108 +1,21 @@
 package system
 
 import (
-	"errors"
 	"fmt"
-	"net/url"
-	"os"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/common"
+	"github.com/goccy/go-json"
+	"io"
 	"strings"
 
 	"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"
-	"github.com/flipped-aurora/gin-vue-admin/server/utils"
-
+	"github.com/flipped-aurora/gin-vue-admin/server/utils/request"
 	"github.com/gin-gonic/gin"
 	"go.uber.org/zap"
 )
 
 type AutoCodeApi struct{}
 
-// PreviewTemp
-// @Tags      AutoCode
-// @Summary   预览创建后的代码
-// @Security  ApiKeyAuth
-// @accept    application/json
-// @Produce   application/json
-// @Param     data  body      system.AutoCodeStruct                                      true  "预览创建代码"
-// @Success   200   {object}  response.Response{data=map[string]interface{},msg=string}  "预览创建后的代码"
-// @Router    /autoCode/preview [post]
-func (autoApi *AutoCodeApi) PreviewTemp(c *gin.Context) {
-	var a system.AutoCodeStruct
-	_ = c.ShouldBindJSON(&a)
-	if err := utils.Verify(a, utils.AutoCodeVerify); err != nil {
-		response.FailWithMessage(err.Error(), c)
-		return
-	}
-	a.Pretreatment() // 处理go关键字
-	a.PackageT = utils.FirstUpper(a.Package)
-	autoCode, err := autoCodeService.PreviewTemp(a)
-	if err != nil {
-		global.GVA_LOG.Error("预览失败!", zap.Error(err))
-		response.FailWithMessage("预览失败", c)
-	} else {
-		response.OkWithDetailed(gin.H{"autoCode": autoCode}, "预览成功", c)
-	}
-}
-
-// CreateTemp
-// @Tags      AutoCode
-// @Summary   自动代码模板
-// @Security  ApiKeyAuth
-// @accept    application/json
-// @Produce   application/json
-// @Param     data  body      system.AutoCodeStruct  true  "创建自动代码"
-// @Success   200   {string}  string                 "{"success":true,"data":{},"msg":"创建成功"}"
-// @Router    /autoCode/createTemp [post]
-func (autoApi *AutoCodeApi) CreateTemp(c *gin.Context) {
-	var a system.AutoCodeStruct
-	_ = c.ShouldBindJSON(&a)
-	if err := utils.Verify(a, utils.AutoCodeVerify); err != nil {
-		response.FailWithMessage(err.Error(), c)
-		return
-	}
-	a.Pretreatment()
-	var apiIds []uint
-	var menuId uint
-	if a.AutoCreateApiToSql {
-		if ids, err := autoCodeService.AutoCreateApi(&a); err != nil {
-			global.GVA_LOG.Error("自动化创建失败!请自行清空垃圾数据!", zap.Error(err))
-			c.Writer.Header().Add("success", "false")
-			c.Writer.Header().Add("msg", url.QueryEscape("自动化创建失败!请自行清空垃圾数据!"))
-			return
-		} else {
-			apiIds = ids
-		}
-	}
-	if a.AutoCreateMenuToSql {
-		if id, err := autoCodeService.AutoCreateMenu(&a); err != nil {
-			global.GVA_LOG.Error("自动化创建失败!请自行清空垃圾数据!", zap.Error(err))
-			c.Writer.Header().Add("success", "false")
-			c.Writer.Header().Add("msg", url.QueryEscape("自动化创建失败!请自行清空垃圾数据!"))
-		} else {
-			menuId = id
-		}
-	}
-	a.PackageT = utils.FirstUpper(a.Package)
-	err := autoCodeService.CreateTemp(a, menuId, apiIds...)
-	if err != nil {
-		if errors.Is(err, system.ErrAutoMove) {
-			c.Writer.Header().Add("success", "true")
-			c.Writer.Header().Add("msg", url.QueryEscape(err.Error()))
-		} else {
-			c.Writer.Header().Add("success", "false")
-			c.Writer.Header().Add("msg", url.QueryEscape(err.Error()))
-			_ = os.Remove("./ginvueadmin.zip")
-		}
-	} else {
-		c.Writer.Header().Add("Content-Disposition", fmt.Sprintf("attachment; filename=%s", "ginvueadmin.zip")) // fmt.Sprintf("attachment; filename=%s", filename)对下载的文件重命名
-		c.Writer.Header().Add("Content-Type", "application/json")
-		c.Writer.Header().Add("success", "true")
-		c.File("./ginvueadmin.zip")
-		_ = os.Remove("./ginvueadmin.zip")
-	}
-}
-
 // GetDB
 // @Tags      AutoCode
 // @Summary   获取当前所有数据库
@@ -110,7 +23,7 @@ func (autoApi *AutoCodeApi) CreateTemp(c *gin.Context) {
 // @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)
@@ -140,8 +53,19 @@ func (autoApi *AutoCodeApi) GetDB(c *gin.Context) {
 // @Success   200  {object}  response.Response{data=map[string]interface{},msg=string}  "获取当前数据库所有表"
 // @Router    /autoCode/getTables [get]
 func (autoApi *AutoCodeApi) GetTables(c *gin.Context) {
-	dbName := c.DefaultQuery("dbName", global.GVA_CONFIG.Mysql.Dbname)
+	dbName := c.Query("dbName")
 	businessDB := c.Query("businessDB")
+	if dbName == "" {
+		dbName = *global.GVA_ACTIVE_DBNAME
+		if businessDB != "" {
+			for _, db := range global.GVA_CONFIG.DBList {
+				if db.AliasName == businessDB {
+					dbName = db.Dbname
+				}
+			}
+		}
+	}
+
 	tables, err := autoCodeService.Database(businessDB).GetTables(businessDB, dbName)
 	if err != nil {
 		global.GVA_LOG.Error("查询table失败!", zap.Error(err))
@@ -161,7 +85,17 @@ func (autoApi *AutoCodeApi) GetTables(c *gin.Context) {
 // @Router    /autoCode/getColumn [get]
 func (autoApi *AutoCodeApi) GetColumn(c *gin.Context) {
 	businessDB := c.Query("businessDB")
-	dbName := c.DefaultQuery("dbName", global.GVA_CONFIG.Mysql.Dbname)
+	dbName := c.Query("dbName")
+	if dbName == "" {
+		dbName = *global.GVA_ACTIVE_DBNAME
+		if businessDB != "" {
+			for _, db := range global.GVA_CONFIG.DBList {
+				if db.AliasName == businessDB {
+					dbName = db.Dbname
+				}
+			}
+		}
+	}
 	tableName := c.Query("tableName")
 	columns, err := autoCodeService.Database(businessDB).GetColumn(businessDB, tableName, dbName)
 	if err != nil {
@@ -172,153 +106,50 @@ func (autoApi *AutoCodeApi) GetColumn(c *gin.Context) {
 	}
 }
 
-// CreatePackage
-// @Tags      AutoCode
-// @Summary   创建package
-// @Security  ApiKeyAuth
-// @accept    application/json
-// @Produce   application/json
-// @Param     data  body      system.SysAutoCode                                         true  "创建package"
-// @Success   200   {object}  response.Response{data=map[string]interface{},msg=string}  "创建package成功"
-// @Router    /autoCode/createPackage [post]
-func (autoApi *AutoCodeApi) CreatePackage(c *gin.Context) {
-	var a system.SysAutoCode
-	_ = c.ShouldBindJSON(&a)
-	if err := utils.Verify(a, utils.AutoPackageVerify); err != nil {
-		response.FailWithMessage(err.Error(), c)
-		return
-	}
-	err := autoCodeService.CreateAutoCode(&a)
-	if err != nil {
-
-		global.GVA_LOG.Error("创建失败!", zap.Error(err))
-		response.FailWithMessage("创建失败", c)
-	} else {
-		response.OkWithMessage("创建成功", c)
-	}
-}
-
-// GetPackage
-// @Tags      AutoCode
-// @Summary   获取package
-// @Security  ApiKeyAuth
-// @accept    application/json
-// @Produce   application/json
-// @Success   200  {object}  response.Response{data=map[string]interface{},msg=string}  "创建package成功"
-// @Router    /autoCode/getPackage [post]
-func (autoApi *AutoCodeApi) GetPackage(c *gin.Context) {
-	pkgs, err := autoCodeService.GetPackage()
-	if err != nil {
-		global.GVA_LOG.Error("获取失败!", zap.Error(err))
-		response.FailWithMessage("获取失败", c)
-	} else {
-		response.OkWithDetailed(gin.H{"pkgs": pkgs}, "获取成功", c)
-	}
-}
-
-// DelPackage
-// @Tags      AutoCode
-// @Summary   删除package
-// @Security  ApiKeyAuth
-// @accept    application/json
-// @Produce   application/json
-// @Param     data  body      system.SysAutoCode                                         true  "创建package"
-// @Success   200   {object}  response.Response{data=map[string]interface{},msg=string}  "删除package成功"
-// @Router    /autoCode/delPackage [post]
-func (autoApi *AutoCodeApi) DelPackage(c *gin.Context) {
-	var a system.SysAutoCode
-	_ = c.ShouldBindJSON(&a)
-	err := autoCodeService.DelPackage(a)
-	if err != nil {
-		global.GVA_LOG.Error("删除失败!", zap.Error(err))
-		response.FailWithMessage("删除失败", c)
-	} else {
-		response.OkWithMessage("删除成功", c)
-	}
-}
-
-// AutoPlug
-// @Tags      AutoCode
-// @Summary   创建插件模板
-// @Security  ApiKeyAuth
-// @accept    application/json
-// @Produce   application/json
-// @Param     data  body      system.SysAutoCode                                         true  "创建插件模板"
-// @Success   200   {object}  response.Response{data=map[string]interface{},msg=string}  "创建插件模板成功"
-// @Router    /autoCode/createPlug [post]
-func (autoApi *AutoCodeApi) AutoPlug(c *gin.Context) {
-	var a system.AutoPlugReq
-	err := c.ShouldBindJSON(&a)
+func (autoApi *AutoCodeApi) LLMAuto(c *gin.Context) {
+	var llm common.JSONMap
+	err := c.ShouldBindJSON(&llm)
 	if err != nil {
 		response.FailWithMessage(err.Error(), c)
 		return
 	}
-	a.Snake = strings.ToLower(a.PlugName)
-	a.NeedModel = a.HasRequest || a.HasResponse
-	err = autoCodeService.CreatePlug(a)
-	if err != nil {
-		global.GVA_LOG.Error("预览失败!", zap.Error(err))
-		response.FailWithMessage("预览失败", c)
+	if global.GVA_CONFIG.AutoCode.AiPath == "" {
+		response.FailWithMessage("请先前往插件市场个人中心获取AiPath并填入config.yaml中", c)
 		return
 	}
-	response.Ok(c)
-}
 
-// InstallPlugin
-// @Tags      AutoCode
-// @Summary   安装插件
-// @Security  ApiKeyAuth
-// @accept    multipart/form-data
-// @Produce   application/json
-// @Param     plug  formData  file                                              true  "this is a test file"
-// @Success   200   {object}  response.Response{data=[]interface{},msg=string}  "安装插件成功"
-// @Router    /autoCode/installPlugin [post]
-func (autoApi *AutoCodeApi) InstallPlugin(c *gin.Context) {
-	header, err := c.FormFile("plug")
+	path := strings.ReplaceAll(global.GVA_CONFIG.AutoCode.AiPath, "{FUNC}", fmt.Sprintf("api/chat/%s", llm["mode"]))
+	res, err := request.HttpRequest(
+		path,
+		"POST",
+		nil,
+		nil,
+		llm,
+	)
 	if err != nil {
-		response.FailWithMessage(err.Error(), c)
+		global.GVA_LOG.Error("大模型生成失败!", zap.Error(err))
+		response.FailWithMessage("大模型生成失败"+err.Error(), c)
 		return
 	}
-	web, server, err := autoCodeService.InstallPlugin(header)
-	webStr := "web插件安装成功"
-	serverStr := "server插件安装成功"
-	if web == -1 {
-		webStr = "web端插件未成功安装，请按照文档自行解压安装，如果为纯后端插件请忽略此条提示"
-	}
-	if server == -1 {
-		serverStr = "server端插件未成功安装，请按照文档自行解压安装，如果为纯前端插件请忽略此条提示"
-	}
+	var resStruct response.Response
+	b, err := io.ReadAll(res.Body)
+	defer res.Body.Close()
 	if err != nil {
-		response.FailWithMessage(err.Error(), c)
+		global.GVA_LOG.Error("大模型生成失败!", zap.Error(err))
+		response.FailWithMessage("大模型生成失败"+err.Error(), c)
+		return
+	}
+	err = json.Unmarshal(b, &resStruct)
+	if err != nil {
+		global.GVA_LOG.Error("大模型生成失败!", zap.Error(err))
+		response.FailWithMessage("大模型生成失败"+err.Error(), c)
 		return
 	}
-	response.OkWithData([]interface{}{
-		gin.H{
-			"code": web,
-			"msg":  webStr,
-		},
-		gin.H{
-			"code": server,
-			"msg":  serverStr,
-		}}, c)
-}
 
-// PubPlug
-// @Tags      AutoCode
-// @Summary   打包插件
-// @Security  ApiKeyAuth
-// @accept    application/json
-// @Produce   application/json
-// @Param     data  body      system.SysAutoCode                                         true  "打包插件"
-// @Success   200   {object}  response.Response{data=map[string]interface{},msg=string}  "打包插件成功"
-// @Router    /autoCode/pubPlug [get]
-func (autoApi *AutoCodeApi) PubPlug(c *gin.Context) {
-	plugName := c.Query("plugName")
-	zipPath, err := autoCodeService.PubPlug(plugName)
-	if err != nil {
-		global.GVA_LOG.Error("打包失败!", zap.Error(err))
-		response.FailWithMessage("打包失败"+err.Error(), c)
+	if resStruct.Code == 7 {
+		global.GVA_LOG.Error("大模型生成失败!"+resStruct.Msg, zap.Error(err))
+		response.FailWithMessage("大模型生成失败"+resStruct.Msg, c)
 		return
 	}
-	response.OkWithMessage(fmt.Sprintf("打包成功,文件路径为:%s", zipPath), c)
+	response.OkWithData(resStruct.Data, c)
 }

server/api/v1/system/sys_captcha.go

@@ -44,7 +44,7 @@ func (b *BaseApi) Captcha(c *gin.Context) {
 	driver := base64Captcha.NewDriverDigit(global.GVA_CONFIG.Captcha.ImgHeight, global.GVA_CONFIG.Captcha.ImgWidth, global.GVA_CONFIG.Captcha.KeyLong, 0.7, 80)
 	// cp := base64Captcha.NewCaptcha(driver, store.UseWithCtx(c))   // v8下使用redis
 	cp := base64Captcha.NewCaptcha(driver, store)
-	id, b64s, err := cp.Generate()
+	id, b64s, _, err := cp.Generate()
 	if err != nil {
 		global.GVA_LOG.Error("验证码获取失败!", zap.Error(err))
 		response.FailWithMessage("验证码获取失败", c)

server/api/v1/system/sys_casbin.go

@@ -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)

server/api/v1/system/sys_export_template.go

@@ -2,6 +2,8 @@ package system
 
 import (
 	"fmt"
+	"net/http"
+
 	"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"
@@ -11,7 +13,6 @@ import (
 	"github.com/flipped-aurora/gin-vue-admin/server/utils"
 	"github.com/gin-gonic/gin"
 	"go.uber.org/zap"
-	"net/http"
 )
 
 type SysExportTemplateApi struct {
@@ -206,7 +207,7 @@ func (sysExportTemplateApi *SysExportTemplateApi) ExportExcel(c *gin.Context) {
 	}
 }
 
-// ExportExcel 导出表格模板
+// ExportTemplate 导出表格模板
 // @Tags SysExportTemplate
 // @Summary 导出表格模板
 // @Security ApiKeyAuth
@@ -229,7 +230,7 @@ func (sysExportTemplateApi *SysExportTemplateApi) ExportTemplate(c *gin.Context)
 	}
 }
 
-// ExportExcel 导入表格
+// ImportExcel 导入表格
 // @Tags SysImportTemplate
 // @Summary 导入表格
 // @Security ApiKeyAuth

server/api/v1/system/sys_menu.go

@@ -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)
 }

server/api/v1/system/sys_params.go

@@ -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)
+}

server/api/v1/system/sys_system.go

@@ -6,7 +6,6 @@ import (
 	"github.com/flipped-aurora/gin-vue-admin/server/model/system"
 	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"
 	"go.uber.org/zap"
 )

server/api/v1/system/sys_user.go

@@ -1,6 +1,7 @@
 package system
 
 import (
+	"github.com/flipped-aurora/gin-vue-admin/server/model/common"
 	"strconv"
 	"time"
 
@@ -76,15 +77,7 @@ func (b *BaseApi) Login(c *gin.Context) {
 
 // TokenNext 登录以后签发jwt
 func (b *BaseApi) TokenNext(c *gin.Context, user system.SysUser) {
-	j := &utils.JWT{SigningKey: []byte(global.GVA_CONFIG.JWT.SigningKey)} // 唯一签名
-	claims := j.CreateClaims(systemReq.BaseClaims{
-		UUID:        user.UUID,
-		ID:          user.ID,
-		NickName:    user.NickName,
-		Username:    user.Username,
-		AuthorityId: user.AuthorityId,
-	})
-	token, err := j.CreateToken(claims)
+	token, claims, err := utils.LoginToken(&user)
 	if err != nil {
 		global.GVA_LOG.Error("获取token失败!", zap.Error(err))
 		response.FailWithMessage("获取token失败", c)
@@ -122,7 +115,7 @@ func (b *BaseApi) TokenNext(c *gin.Context, user system.SysUser) {
 			response.FailWithMessage("jwt作废失败", c)
 			return
 		}
-		if err := jwtService.SetRedisJWT(token, user.Username); err != nil {
+		if err := jwtService.SetRedisJWT(token, user.GetUsername()); err != nil {
 			response.FailWithMessage("设置登录状态失败", c)
 			return
 		}
@@ -207,11 +200,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)
@@ -293,7 +286,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)
@@ -325,7 +319,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)
@@ -358,9 +352,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)
@@ -375,7 +369,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 {
@@ -411,7 +404,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 {
@@ -422,6 +414,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   获取用户信息

server/config.yaml

@@ -2,150 +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
+    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: ""
@@ -157,95 +110,158 @@ 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:
-  transfer-restart: true
-  # root 自动适配项目根目录
-  # 请不要手动配置,他会在项目加载的时候识别出根路径
-  root: ""
-  server: /server
-  server-plug: /plugin/%s
-  server-api: /api/v1/%s
-  server-initialize: /initialize
-  server-model: /model/%s
-  server-request: /model/%s/request/
-  server-router: /router/%s
-  server-service: /service/%s
-  web: /web/src
-  web-api: /api
-  web-form: /view
-  web-table: /view
+    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:
-  endpoint: yourEndpoint
-  access-key-id: yourAccessKeyId
-  access-key-secret: yourAccessKeySecret
-  bucket-name: yourBucketName
-  bucket-url: yourBucketUrl
-  base-path: yourBasePath
+    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
 
 # 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: "/"
 
 # 跨域配置
 # 需要配合 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 # 布尔值

server/config/auto_code.go

@@ -1,18 +1,22 @@
 package config
 
+import (
+	"path/filepath"
+	"strings"
+)
+
 type Autocode struct {
-	SModel          string `mapstructure:"server-model" json:"server-model" yaml:"server-model"`
-	SRouter         string `mapstructure:"server-router" json:"server-router" yaml:"server-router"`
-	Server          string `mapstructure:"server" json:"server" yaml:"server"`
-	SApi            string `mapstructure:"server-api" json:"server-api" yaml:"server-api"`
-	SPlug           string `mapstructure:"server-plug" json:"server-plug" yaml:"server-plug"`
-	SInitialize     string `mapstructure:"server-initialize" json:"server-initialize" yaml:"server-initialize"`
-	Root            string `mapstructure:"root" json:"root" yaml:"root"`
-	WTable          string `mapstructure:"web-table" json:"web-table" yaml:"web-table"`
-	Web             string `mapstructure:"web" json:"web" yaml:"web"`
-	SService        string `mapstructure:"server-service" json:"server-service" yaml:"server-service"`
-	SRequest        string `mapstructure:"server-request" json:"server-request"  yaml:"server-request"`
-	WApi            string `mapstructure:"web-api" json:"web-api" yaml:"web-api"`
-	WForm           string `mapstructure:"web-form" json:"web-form" yaml:"web-form"`
-	TransferRestart bool   `mapstructure:"transfer-restart" json:"transfer-restart" yaml:"transfer-restart"`
+	Web    string `mapstructure:"web" json:"web" yaml:"web"`
+	Root   string `mapstructure:"root" json:"root" yaml:"root"`
+	Server string `mapstructure:"server" json:"server" yaml:"server"`
+	Module string `mapstructure:"module" json:"module" yaml:"module"`
+	AiPath string `mapstructure:"ai-path" json:"ai-path" yaml:"ai-path"`
+}
+
+func (a *Autocode) WebRoot() string {
+	webs := strings.Split(a.Web, "/")
+	if len(webs) == 0 {
+		webs = strings.Split(a.Web, "\\")
+	}
+	return filepath.Join(webs...)
 }

server/config/config.go

@@ -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
@@ -18,15 +19,18 @@ type Server struct {
 	Sqlite Sqlite          `mapstructure:"sqlite" json:"sqlite" yaml:"sqlite"`
 	DBList []SpecializedDB `mapstructure:"db-list" json:"db-list" yaml:"db-list"`
 	// oss
-	Local      Local      `mapstructure:"local" json:"local" yaml:"local"`
-	Qiniu      Qiniu      `mapstructure:"qiniu" json:"qiniu" yaml:"qiniu"`
-	AliyunOSS  AliyunOSS  `mapstructure:"aliyun-oss" json:"aliyun-oss" yaml:"aliyun-oss"`
-	HuaWeiObs  HuaWeiObs  `mapstructure:"hua-wei-obs" json:"hua-wei-obs" yaml:"hua-wei-obs"`
-	TencentCOS TencentCOS `mapstructure:"tencent-cos" json:"tencent-cos" yaml:"tencent-cos"`
-	AwsS3      AwsS3      `mapstructure:"aws-s3" json:"aws-s3" yaml:"aws-s3"`
+	Local        Local        `mapstructure:"local" json:"local" yaml:"local"`
+	Qiniu        Qiniu        `mapstructure:"qiniu" json:"qiniu" yaml:"qiniu"`
+	AliyunOSS    AliyunOSS    `mapstructure:"aliyun-oss" json:"aliyun-oss" yaml:"aliyun-oss"`
+	HuaWeiObs    HuaWeiObs    `mapstructure:"hua-wei-obs" json:"hua-wei-obs" yaml:"hua-wei-obs"`
+	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"`
 
 	Excel Excel `mapstructure:"excel" json:"excel" yaml:"excel"`
 
+	DiskList []DiskList `mapstructure:"disk-list" json:"disk-list" yaml:"disk-list"`
+
 	// 跨域配置
 	Cors CORS `mapstructure:"cors" json:"cors" yaml:"cors"`
 }

server/config/db_list.go

@@ -1,5 +1,10 @@
 package config
 
+import (
+	"gorm.io/gorm/logger"
+	"strings"
+)
+
 type DsnProvider interface {
 	Dsn() string
 }
@@ -9,21 +14,36 @@ type DsnProvider interface {
 
 // GeneralDB 也被 Pgsql 和 Mysql 原样使用
 type GeneralDB struct {
-	Prefix       string `mapstructure:"prefix" json:"prefix" yaml:"prefix"`
-	Port         string `mapstructure:"port" json:"port" yaml:"port"`
-	Config       string `mapstructure:"config" json:"config" yaml:"config"`       // 高级配置
-	Dbname       string `mapstructure:"db-name" json:"db-name" yaml:"db-name"`    // 数据库名
-	Username     string `mapstructure:"username" json:"username" yaml:"username"` // 数据库密码
-	Password     string `mapstructure:"password" json:"password" yaml:"password"` // 数据库密码
-	Path         string `mapstructure:"path" json:"path" yaml:"path"`
-	Engine       string `mapstructure:"engine" json:"engine" yaml:"engine" default:"InnoDB"`        //数据库引擎，默认InnoDB
+	Prefix       string `mapstructure:"prefix" json:"prefix" yaml:"prefix"`                         // 数据库前缀
+	Port         string `mapstructure:"port" json:"port" yaml:"port"`                               // 数据库端口
+	Config       string `mapstructure:"config" json:"config" yaml:"config"`                         // 高级配置
+	Dbname       string `mapstructure:"db-name" json:"db-name" yaml:"db-name"`                      // 数据库名
+	Username     string `mapstructure:"username" json:"username" yaml:"username"`                   // 数据库账号
+	Password     string `mapstructure:"password" json:"password" yaml:"password"`                   // 数据库密码
+	Path         string `mapstructure:"path" json:"path" yaml:"path"`                               // 数据库地址
+	Engine       string `mapstructure:"engine" json:"engine" yaml:"engine" default:"InnoDB"`        // 数据库引擎，默认InnoDB
 	LogMode      string `mapstructure:"log-mode" json:"log-mode" yaml:"log-mode"`                   // 是否开启Gorm全局日志
 	MaxIdleConns int    `mapstructure:"max-idle-conns" json:"max-idle-conns" yaml:"max-idle-conns"` // 空闲中的最大连接数
 	MaxOpenConns int    `mapstructure:"max-open-conns" json:"max-open-conns" yaml:"max-open-conns"` // 打开到数据库的最大连接数
-	Singular     bool   `mapstructure:"singular" json:"singular" yaml:"singular"`                   //是否开启全局禁用复数，true表示开启
+	Singular     bool   `mapstructure:"singular" json:"singular" yaml:"singular"`                   // 是否开启全局禁用复数，true表示开启
 	LogZap       bool   `mapstructure:"log-zap" json:"log-zap" yaml:"log-zap"`                      // 是否通过zap写入日志文件
 }
 
+func (c GeneralDB) LogLevel() logger.LogLevel {
+	switch strings.ToLower(c.LogMode) {
+	case "silent", "Silent":
+		return logger.Silent
+	case "error", "Error":
+		return logger.Error
+	case "warn", "Warn":
+		return logger.Warn
+	case "info", "Info":
+		return logger.Info
+	default:
+		return logger.Info
+	}
+}
+
 type SpecializedDB struct {
 	Type      string `mapstructure:"type" json:"type" yaml:"type"`
 	AliasName string `mapstructure:"alias-name" json:"alias-name" yaml:"alias-name"`

server/config/disk.go

@@ -0,0 +1,9 @@
+package config
+
+type Disk struct {
+	MountPoint string `mapstructure:"mount-point" json:"mount-point" yaml:"mount-point"`
+}
+
+type DiskList struct {
+	Disk `yaml:",inline" mapstructure:",squash"`
+}

server/config/gorm_mssql.go

@@ -3,11 +3,8 @@ package config
 type Mssql struct {
 	GeneralDB `yaml:",inline" mapstructure:",squash"`
 }
-//dsn := "sqlserver://gorm:LoremIpsum86@localhost:9930?database=gorm"
+
+// Dsn "sqlserver://gorm:LoremIpsum86@localhost:9930?database=gorm"
 func (m *Mssql) Dsn() string {
 	return "sqlserver://" + m.Username + ":" + m.Password + "@" + m.Path + ":" + m.Port + "?database=" + m.Dbname + "&encrypt=disable"
 }
-
-func (m *Mssql) GetLogMode() string {
-	return m.LogMode
-}

server/config/gorm_mysql.go

@@ -7,7 +7,3 @@ type Mysql struct {
 func (m *Mysql) Dsn() string {
 	return m.Username + ":" + m.Password + "@tcp(" + m.Path + ":" + m.Port + ")/" + m.Dbname + "?" + m.Config
 }
-
-func (m *Mysql) GetLogMode() string {
-	return m.LogMode
-}

server/config/gorm_oracle.go

@@ -8,7 +8,3 @@ func (m *Oracle) Dsn() string {
 	return "oracle://" + m.Username + ":" + m.Password + "@" + m.Path + ":" + m.Port + "/" + m.Dbname + "?" + m.Config
 
 }
-
-func (m *Oracle) GetLogMode() string {
-	return m.LogMode
-}

server/config/gorm_pgsql.go

@@ -15,7 +15,3 @@ func (p *Pgsql) Dsn() string {
 func (p *Pgsql) LinkDsn(dbname string) string {
 	return "host=" + p.Path + " user=" + p.Username + " password=" + p.Password + " dbname=" + dbname + " port=" + p.Port + " " + p.Config
 }
-
-func (m *Pgsql) GetLogMode() string {
-	return m.LogMode
-}

server/config/gorm_sqlite.go

@@ -11,7 +11,3 @@ type Sqlite struct {
 func (s *Sqlite) Dsn() string {
 	return filepath.Join(s.Path, s.Dbname+".db")
 }
-
-func (s *Sqlite) GetLogMode() string {
-	return s.LogMode
-}

server/config/oss_cloudflare.go

@@ -0,0 +1,10 @@
+package config
+
+type CloudflareR2 struct {
+	Bucket          string `mapstructure:"bucket" json:"bucket" yaml:"bucket"`
+	BaseURL         string `mapstructure:"base-url" json:"base-url" yaml:"base-url"`
+	Path            string `mapstructure:"path" json:"path" yaml:"path"`
+	AccountID       string `mapstructure:"account-id" json:"account-id" yaml:"account-id"`
+	AccessKeyID     string `mapstructure:"access-key-id" json:"access-key-id" yaml:"access-key-id"`
+	SecretAccessKey string `mapstructure:"secret-access-key" json:"secret-access-key" yaml:"secret-access-key"`
+}

server/config/redis.go

@@ -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的哪个数据库

server/config/system.go

@@ -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"` // 使用树形角色分配模式
 }

server/config/zap.go

@@ -2,7 +2,7 @@ package config
 
 import (
 	"go.uber.org/zap/zapcore"
-	"strings"
+	"time"
 )
 
 type Zap struct {
@@ -12,49 +12,60 @@ type Zap struct {
 	Director      string `mapstructure:"director" json:"director"  yaml:"director"`                  // 日志文件夹
 	EncodeLevel   string `mapstructure:"encode-level" json:"encode-level" yaml:"encode-level"`       // 编码级
 	StacktraceKey string `mapstructure:"stacktrace-key" json:"stacktrace-key" yaml:"stacktrace-key"` // 栈名
-
-	MaxAge       int  `mapstructure:"max-age" json:"max-age" yaml:"max-age"`                      // 日志留存时间
-	ShowLine     bool `mapstructure:"show-line" json:"show-line" yaml:"show-line"`                // 显示行
-	LogInConsole bool `mapstructure:"log-in-console" json:"log-in-console" yaml:"log-in-console"` // 输出控制台
+	ShowLine      bool   `mapstructure:"show-line" json:"show-line" yaml:"show-line"`                // 显示行
+	LogInConsole  bool   `mapstructure:"log-in-console" json:"log-in-console" yaml:"log-in-console"` // 输出控制台
+	RetentionDay  int    `mapstructure:"retention-day" json:"retention-day" yaml:"retention-day"`    // 日志保留天数
 }
 
-// ZapEncodeLevel 根据 EncodeLevel 返回 zapcore.LevelEncoder
+// Levels 根据字符串转化为 zapcore.Levels
+func (c *Zap) Levels() []zapcore.Level {
+	levels := make([]zapcore.Level, 0, 7)
+	level, err := zapcore.ParseLevel(c.Level)
+	if err != nil {
+		level = zapcore.DebugLevel
+	}
+	for ; level <= zapcore.FatalLevel; level++ {
+		levels = append(levels, level)
+	}
+	return levels
+}
+
+func (c *Zap) Encoder() zapcore.Encoder {
+	config := zapcore.EncoderConfig{
+		TimeKey:       "time",
+		NameKey:       "name",
+		LevelKey:      "level",
+		CallerKey:     "caller",
+		MessageKey:    "message",
+		StacktraceKey: c.StacktraceKey,
+		LineEnding:    zapcore.DefaultLineEnding,
+		EncodeTime: func(t time.Time, encoder zapcore.PrimitiveArrayEncoder) {
+			encoder.AppendString(c.Prefix + t.Format("2006-01-02 15:04:05.000"))
+		},
+		EncodeLevel:    c.LevelEncoder(),
+		EncodeCaller:   zapcore.FullCallerEncoder,
+		EncodeDuration: zapcore.SecondsDurationEncoder,
+	}
+	if c.Format == "json" {
+		return zapcore.NewJSONEncoder(config)
+	}
+	return zapcore.NewConsoleEncoder(config)
+
+}
+
+// LevelEncoder 根据 EncodeLevel 返回 zapcore.LevelEncoder
 // Author [SliverHorn](https://github.com/SliverHorn)
-func (z *Zap) ZapEncodeLevel() zapcore.LevelEncoder {
+func (c *Zap) LevelEncoder() zapcore.LevelEncoder {
 	switch {
-	case z.EncodeLevel == "LowercaseLevelEncoder": // 小写编码器(默认)
+	case c.EncodeLevel == "LowercaseLevelEncoder": // 小写编码器(默认)
 		return zapcore.LowercaseLevelEncoder
-	case z.EncodeLevel == "LowercaseColorLevelEncoder": // 小写编码器带颜色
+	case c.EncodeLevel == "LowercaseColorLevelEncoder": // 小写编码器带颜色
 		return zapcore.LowercaseColorLevelEncoder
-	case z.EncodeLevel == "CapitalLevelEncoder": // 大写编码器
+	case c.EncodeLevel == "CapitalLevelEncoder": // 大写编码器
 		return zapcore.CapitalLevelEncoder
-	case z.EncodeLevel == "CapitalColorLevelEncoder": // 大写编码器带颜色
+	case c.EncodeLevel == "CapitalColorLevelEncoder": // 大写编码器带颜色
 		return zapcore.CapitalColorLevelEncoder
 	default:
 		return zapcore.LowercaseLevelEncoder
 	}
 }
-
-// TransportLevel 根据字符串转化为 zapcore.Level
-// Author [SliverHorn](https://github.com/SliverHorn)
-func (z *Zap) TransportLevel() zapcore.Level {
-	z.Level = strings.ToLower(z.Level)
-	switch z.Level {
-	case "debug":
-		return zapcore.DebugLevel
-	case "info":
-		return zapcore.InfoLevel
-	case "warn":
-		return zapcore.WarnLevel
-	case "error":
-		return zapcore.ErrorLevel
-	case "dpanic":
-		return zapcore.DPanicLevel
-	case "panic":
-		return zapcore.PanicLevel
-	case "fatal":
-		return zapcore.FatalLevel
-	default:
-		return zapcore.DebugLevel
-	}
-}

server/core/internal/cutter.go

@@ -3,34 +3,46 @@ package internal
 import (
 	"os"
 	"path/filepath"
-	"regexp"
-	"strings"
 	"sync"
 	"time"
 )
 
+// Cutter 实现 io.Writer 接口
+// 用于日志切割, strings.Join([]string{director,layout, formats..., level+".log"}, os.PathSeparator)
 type Cutter struct {
-	level    string        // 日志级别(debug, info, warn, error, dpanic, panic, fatal)
-	format   string        // 时间格式(2006-01-02)
-	Director string        // 日志文件夹
-	file     *os.File      // 文件句柄
-	mutex    *sync.RWMutex // 读写锁
+	level        string        // 日志级别(debug, info, warn, error, dpanic, panic, fatal)
+	layout       string        // 时间格式 2006-01-02 15:04:05
+	formats      []string      // 自定义参数([]string{Director,"2006-01-02", "business"(此参数可不写), level+".log"}
+	director     string        // 日志文件夹
+	retentionDay int           //日志保留天数
+	file         *os.File      // 文件句柄
+	mutex        *sync.RWMutex // 读写锁
 }
 
 type CutterOption func(*Cutter)
 
-// WithCutterFormat 设置时间格式
-func WithCutterFormat(format string) CutterOption {
+// CutterWithLayout 时间格式
+func CutterWithLayout(layout string) CutterOption {
 	return func(c *Cutter) {
-		c.format = format
+		c.layout = layout
 	}
 }
 
-func NewCutter(director string, level string, options ...CutterOption) *Cutter {
+// CutterWithFormats 格式化参数
+func CutterWithFormats(format ...string) CutterOption {
+	return func(c *Cutter) {
+		if len(format) > 0 {
+			c.formats = format
+		}
+	}
+}
+
+func NewCutter(director string, level string, retentionDay int, options ...CutterOption) *Cutter {
 	rotate := &Cutter{
-		level:    level,
-		Director: director,
-		mutex:    new(sync.RWMutex),
+		level:        level,
+		director:     director,
+		retentionDay: retentionDay,
+		mutex:        new(sync.RWMutex),
 	}
 	for i := 0; i < len(options); i++ {
 		options[i](rotate)
@@ -51,41 +63,23 @@ func (c *Cutter) Write(bytes []byte) (n int, err error) {
 		}
 		c.mutex.Unlock()
 	}()
-	var business string
-	if strings.Contains(string(bytes), "business") {
-		var compile *regexp.Regexp
-		compile, err = regexp.Compile(`{"business": "([^,]+)"}`)
-		if err != nil {
-			return 0, err
-		}
-		if compile.Match(bytes) {
-			finds := compile.FindSubmatch(bytes)
-			business = string(finds[len(finds)-1])
-			bytes = compile.ReplaceAll(bytes, []byte(""))
-		}
-		compile, err = regexp.Compile(`"business": "([^,]+)"`)
-		if err != nil {
-			return 0, err
-		}
-		if compile.Match(bytes) {
-			finds := compile.FindSubmatch(bytes)
-			business = string(finds[len(finds)-1])
-			bytes = compile.ReplaceAll(bytes, []byte(""))
-		}
+	length := len(c.formats)
+	values := make([]string, 0, 3+length)
+	values = append(values, c.director)
+	if c.layout != "" {
+		values = append(values, time.Now().Format(c.layout))
 	}
-	format := time.Now().Format(c.format)
-	formats := make([]string, 0, 4)
-	formats = append(formats, c.Director)
-	if format != "" {
-		formats = append(formats, format)
+	for i := 0; i < length; i++ {
+		values = append(values, c.formats[i])
 	}
-	if business != "" {
-		formats = append(formats, business)
+	values = append(values, c.level+".log")
+	filename := filepath.Join(values...)
+	director := filepath.Dir(filename)
+	err = os.MkdirAll(director, os.ModePerm)
+	if err != nil {
+		return 0, err
 	}
-	formats = append(formats, c.level+".log")
-	filename := filepath.Join(formats...)
-	dirname := filepath.Dir(filename)
-	err = os.MkdirAll(dirname, 0755)
+	err = removeNDaysFolders(c.director, c.retentionDay)
 	if err != nil {
 		return 0, err
 	}
@@ -95,3 +89,33 @@ func (c *Cutter) Write(bytes []byte) (n int, err error) {
 	}
 	return c.file.Write(bytes)
 }
+
+func (c *Cutter) Sync() error {
+	c.mutex.Lock()
+	defer c.mutex.Unlock()
+
+	if c.file != nil {
+		return c.file.Sync()
+	}
+	return nil
+}
+
+// 增加日志目录文件清理 小于等于零的值默认忽略不再处理
+func removeNDaysFolders(dir string, days int) error {
+	if days <= 0 {
+		return nil
+	}
+	cutoff := time.Now().AddDate(0, 0, -days)
+	return filepath.Walk(dir, func(path string, info os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+		if info.IsDir() && info.ModTime().Before(cutoff) && path != dir {
+			err = os.RemoveAll(path)
+			if err != nil {
+				return err
+			}
+		}
+		return nil
+	})
+}

server/core/internal/file_rotatelogs.go

@@ -1,21 +0,0 @@
-package internal
-
-import (
-	"github.com/flipped-aurora/gin-vue-admin/server/global"
-	"go.uber.org/zap/zapcore"
-	"os"
-)
-
-var FileRotatelogs = new(fileRotatelogs)
-
-type fileRotatelogs struct{}
-
-// GetWriteSyncer 获取 zapcore.WriteSyncer
-// Author [SliverHorn](https://github.com/SliverHorn)
-func (r *fileRotatelogs) GetWriteSyncer(level string) zapcore.WriteSyncer {
-	fileWriter := NewCutter(global.GVA_CONFIG.Zap.Director, level, WithCutterFormat("2006-01-02"))
-	if global.GVA_CONFIG.Zap.LogInConsole {
-		return zapcore.NewMultiWriteSyncer(zapcore.AddSync(os.Stdout), zapcore.AddSync(fileWriter))
-	}
-	return zapcore.AddSync(fileWriter)
-}

server/core/internal/zap.go

@@ -1,101 +0,0 @@
-package internal
-
-import (
-	"github.com/flipped-aurora/gin-vue-admin/server/global"
-	"go.uber.org/zap"
-	"go.uber.org/zap/zapcore"
-	"time"
-)
-
-var Zap = new(_zap)
-
-type _zap struct{}
-
-// GetEncoder 获取 zapcore.Encoder
-// Author [SliverHorn](https://github.com/SliverHorn)
-func (z *_zap) GetEncoder() zapcore.Encoder {
-	if global.GVA_CONFIG.Zap.Format == "json" {
-		return zapcore.NewJSONEncoder(z.GetEncoderConfig())
-	}
-	return zapcore.NewConsoleEncoder(z.GetEncoderConfig())
-}
-
-// GetEncoderConfig 获取zapcore.EncoderConfig
-// Author [SliverHorn](https://github.com/SliverHorn)
-func (z *_zap) GetEncoderConfig() zapcore.EncoderConfig {
-	return zapcore.EncoderConfig{
-		MessageKey:     "message",
-		LevelKey:       "level",
-		TimeKey:        "time",
-		NameKey:        "logger",
-		CallerKey:      "caller",
-		StacktraceKey:  global.GVA_CONFIG.Zap.StacktraceKey,
-		LineEnding:     zapcore.DefaultLineEnding,
-		EncodeLevel:    global.GVA_CONFIG.Zap.ZapEncodeLevel(),
-		EncodeTime:     z.CustomTimeEncoder,
-		EncodeDuration: zapcore.SecondsDurationEncoder,
-		EncodeCaller:   zapcore.FullCallerEncoder,
-	}
-}
-
-// GetEncoderCore 获取Encoder的 zapcore.Core
-// Author [SliverHorn](https://github.com/SliverHorn)
-func (z *_zap) GetEncoderCore(l zapcore.Level, level zap.LevelEnablerFunc) zapcore.Core {
-	writer := FileRotatelogs.GetWriteSyncer(l.String()) // 日志分割
-	return zapcore.NewCore(z.GetEncoder(), writer, level)
-}
-
-// CustomTimeEncoder 自定义日志输出时间格式
-// Author [SliverHorn](https://github.com/SliverHorn)
-func (z *_zap) CustomTimeEncoder(t time.Time, encoder zapcore.PrimitiveArrayEncoder) {
-	encoder.AppendString(global.GVA_CONFIG.Zap.Prefix + t.Format("2006/01/02 - 15:04:05.000"))
-}
-
-// GetZapCores 根据配置文件的Level获取 []zapcore.Core
-// Author [SliverHorn](https://github.com/SliverHorn)
-func (z *_zap) GetZapCores() []zapcore.Core {
-	cores := make([]zapcore.Core, 0, 7)
-	for level := global.GVA_CONFIG.Zap.TransportLevel(); level <= zapcore.FatalLevel; level++ {
-		cores = append(cores, z.GetEncoderCore(level, z.GetLevelPriority(level)))
-	}
-	return cores
-}
-
-// GetLevelPriority 根据 zapcore.Level 获取 zap.LevelEnablerFunc
-// Author [SliverHorn](https://github.com/SliverHorn)
-func (z *_zap) GetLevelPriority(level zapcore.Level) zap.LevelEnablerFunc {
-	switch level {
-	case zapcore.DebugLevel:
-		return func(level zapcore.Level) bool { // 调试级别
-			return level == zap.DebugLevel
-		}
-	case zapcore.InfoLevel:
-		return func(level zapcore.Level) bool { // 日志级别
-			return level == zap.InfoLevel
-		}
-	case zapcore.WarnLevel:
-		return func(level zapcore.Level) bool { // 警告级别
-			return level == zap.WarnLevel
-		}
-	case zapcore.ErrorLevel:
-		return func(level zapcore.Level) bool { // 错误级别
-			return level == zap.ErrorLevel
-		}
-	case zapcore.DPanicLevel:
-		return func(level zapcore.Level) bool { // dpanic级别
-			return level == zap.DPanicLevel
-		}
-	case zapcore.PanicLevel:
-		return func(level zapcore.Level) bool { // panic级别
-			return level == zap.PanicLevel
-		}
-	case zapcore.FatalLevel:
-		return func(level zapcore.Level) bool { // 终止级别
-			return level == zap.FatalLevel
-		}
-	default:
-		return func(level zapcore.Level) bool { // 调试级别
-			return level == zap.DebugLevel
-		}
-	}
-}

server/core/internal/zap_core.go

@@ -0,0 +1,68 @@
+package internal
+
+import (
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
+	"go.uber.org/zap"
+	"go.uber.org/zap/zapcore"
+	"os"
+	"time"
+)
+
+type ZapCore struct {
+	level zapcore.Level
+	zapcore.Core
+}
+
+func NewZapCore(level zapcore.Level) *ZapCore {
+	entity := &ZapCore{level: level}
+	syncer := entity.WriteSyncer()
+	levelEnabler := zap.LevelEnablerFunc(func(l zapcore.Level) bool {
+		return l == level
+	})
+	entity.Core = zapcore.NewCore(global.GVA_CONFIG.Zap.Encoder(), syncer, levelEnabler)
+	return entity
+}
+
+func (z *ZapCore) WriteSyncer(formats ...string) zapcore.WriteSyncer {
+	cutter := NewCutter(
+		global.GVA_CONFIG.Zap.Director,
+		z.level.String(),
+		global.GVA_CONFIG.Zap.RetentionDay,
+		CutterWithLayout(time.DateOnly),
+		CutterWithFormats(formats...),
+	)
+	if global.GVA_CONFIG.Zap.LogInConsole {
+		multiSyncer := zapcore.NewMultiWriteSyncer(os.Stdout, cutter)
+		return zapcore.AddSync(multiSyncer)
+	}
+	return zapcore.AddSync(cutter)
+}
+
+func (z *ZapCore) Enabled(level zapcore.Level) bool {
+	return z.level == level
+}
+
+func (z *ZapCore) With(fields []zapcore.Field) zapcore.Core {
+	return z.Core.With(fields)
+}
+
+func (z *ZapCore) Check(entry zapcore.Entry, check *zapcore.CheckedEntry) *zapcore.CheckedEntry {
+	if z.Enabled(entry.Level) {
+		return check.AddCore(entry, z)
+	}
+	return check
+}
+
+func (z *ZapCore) Write(entry zapcore.Entry, fields []zapcore.Field) error {
+	for i := 0; i < len(fields); i++ {
+		if fields[i].Key == "business" || fields[i].Key == "folder" || fields[i].Key == "directory" {
+			syncer := z.WriteSyncer(fields[i].String)
+			z.Core = zapcore.NewCore(global.GVA_CONFIG.Zap.Encoder(), syncer, z.level)
+		}
+	}
+	return z.Core.Write(entry, fields)
+}
+
+func (z *ZapCore) Sync() error {
+	return z.Core.Sync()
+}

server/core/server.go

@@ -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,13 +39,17 @@ func RunWindowsServer() {
 
 	fmt.Printf(`
 	欢迎使用 gin-vue-admin
-	当前版本:v2.6.2
+	当前版本:v2.7.6
     加群方式:微信号：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
 	默认自动化文档地址:http://127.0.0.1%s/swagger/index.html
 	默认前端文件运行地址:http://127.0.0.1:8080
-	如果项目让您获得了收益，希望您能请团队喝杯可乐:https://www.gin-vue-admin.com/coffee/index.html
+	--------------------------------------版权声明--------------------------------------
+	** 版权所有方：flipped-aurora开源团队 **
+	** 版权持有公司：北京翻转极光科技有限责任公司 **
+	** 剔除授权标识需购买商用授权：https://gin-vue-admin.com/empower/index.html **
 `, address)
 	global.GVA_LOG.Error(s.ListenAndServe().Error())
 }

server/core/server_other.go

@@ -12,8 +12,8 @@ import (
 
 func initServer(address string, router *gin.Engine) server {
 	s := endless.NewServer(address, router)
-	s.ReadHeaderTimeout = 20 * time.Second
-	s.WriteTimeout = 20 * time.Second
+	s.ReadHeaderTimeout = 10 * time.Minute
+	s.WriteTimeout = 10 * time.Minute
 	s.MaxHeaderBytes = 1 << 20
 	return s
 }

server/core/server_win.go

@@ -14,8 +14,8 @@ func initServer(address string, router *gin.Engine) server {
 	return &http.Server{
 		Addr:           address,
 		Handler:        router,
-		ReadTimeout:    20 * time.Second,
-		WriteTimeout:   20 * time.Second,
+		ReadTimeout:    10 * time.Minute,
+		WriteTimeout:   10 * time.Minute,
 		MaxHeaderBytes: 1 << 20,
 	}
 }

server/core/viper.go

@@ -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 //
@@ -29,14 +28,12 @@ func Viper(path ...string) *viper.Viper {
 				switch gin.Mode() {
 				case gin.DebugMode:
 					config = internal.ConfigDefaultFile
-					fmt.Printf("您正在使用gin模式的%s环境名称,config的路径为%s\n", gin.Mode(), internal.ConfigDefaultFile)
 				case gin.ReleaseMode:
 					config = internal.ConfigReleaseFile
-					fmt.Printf("您正在使用gin模式的%s环境名称,config的路径为%s\n", gin.Mode(), internal.ConfigReleaseFile)
 				case gin.TestMode:
 					config = internal.ConfigTestFile
-					fmt.Printf("您正在使用gin模式的%s环境名称,config的路径为%s\n", gin.Mode(), internal.ConfigTestFile)
 				}
+				fmt.Printf("您正在使用gin模式的%s环境名称,config的路径为%s\n", gin.Mode(), config)
 			} else { // internal.ConfigEnv 常量存储的环境变量不为空 将值赋值于config
 				config = configEnv
 				fmt.Printf("您正在使用%s环境变量,config的路径为%s\n", internal.ConfigEnv, config)

server/core/zap.go

@@ -17,10 +17,14 @@ func Zap() (logger *zap.Logger) {
 		fmt.Printf("create %v directory\n", global.GVA_CONFIG.Zap.Director)
 		_ = os.Mkdir(global.GVA_CONFIG.Zap.Director, os.ModePerm)
 	}
-
-	cores := internal.Zap.GetZapCores()
+	levels := global.GVA_CONFIG.Zap.Levels()
+	length := len(levels)
+	cores := make([]zapcore.Core, 0, length)
+	for i := 0; i < length; i++ {
+		core := internal.NewZapCore(levels[i])
+		cores = append(cores, core)
+	}
 	logger = zap.New(zapcore.NewTee(cores...))
-
 	if global.GVA_CONFIG.Zap.ShowLine {
 		logger = logger.WithOptions(zap.AddCaller())
 	}

server/global/global.go

@@ -1,9 +1,12 @@
 package global
 
 import (
-	"github.com/qiniu/qmgo"
+	"fmt"
 	"sync"
 
+	"github.com/gin-gonic/gin"
+	"github.com/qiniu/qmgo"
+
 	"github.com/flipped-aurora/gin-vue-admin/server/utils/timer"
 	"github.com/songzhibin97/gkit/cache/local_cache"
 
@@ -19,19 +22,21 @@ 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()
 	GVA_Concurrency_Control             = &singleflight.Group{}
-
-	BlackCache local_cache.Cache
-	lock       sync.RWMutex
+	GVA_ROUTERS             gin.RoutesInfo
+	GVA_ACTIVE_DBNAME       *string
+	BlackCache              local_cache.Cache
+	lock                    sync.RWMutex
 )
 
 // GetGlobalDBByDBName 通过名称获取db list中的db
@@ -51,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
+}

server/go.mod

@@ -1,142 +1,179 @@
 module github.com/flipped-aurora/gin-vue-admin/server
 
-go 1.20
+go 1.22.0
+
+toolchain go1.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.71.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.5
+	github.com/casbin/casbin/v2 v2.100.0
+	github.com/casbin/gorm-adapter/v3 v3.28.0
+	github.com/fsnotify/fsnotify v1.7.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/go-sql-driver/mysql v1.7.1
-	github.com/gofrs/uuid/v5 v5.0.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.3
+	github.com/gofrs/uuid/v5 v5.3.0
 	github.com/golang-jwt/jwt/v4 v4.5.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/mojocn/base64Captcha v1.3.5
-	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.8
+	github.com/mojocn/base64Captcha v1.3.6
+	github.com/otiai10/copy v1.14.0
 	github.com/pkg/errors v0.9.1
-	github.com/qiniu/api.v7/v7 v7.4.1
+	github.com/qiniu/go-sdk/v7 v7.23.0
 	github.com/qiniu/qmgo v1.1.8
-	github.com/redis/go-redis/v9 v9.0.5
+	github.com/redis/go-redis/v9 v9.6.2
 	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.9.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.16.0
-	golang.org/x/sync v0.5.0
-	golang.org/x/text v0.14.0
-	gorm.io/driver/mysql v1.5.6
-	gorm.io/driver/postgres v1.5.2
-	gorm.io/driver/sqlserver v1.5.1
-	gorm.io/gorm v1.25.7
-	nhooyr.io/websocket v1.8.7
+	github.com/swaggo/swag v1.16.3
+	github.com/tencentyun/cos-go-sdk-v5 v0.7.55
+	github.com/unrolled/secure v1.16.0
+	github.com/xuri/excelize/v2 v2.9.0
+	go.mongodb.org/mongo-driver v1.17.1
+	go.uber.org/automaxprocs v1.6.0
+	go.uber.org/zap v1.27.0
+	golang.org/x/crypto v0.28.0
+	golang.org/x/sync v0.8.0
+	golang.org/x/text v0.19.0
+	gorm.io/datatypes v1.2.3
+	gorm.io/driver/mysql v1.5.7
+	gorm.io/driver/postgres v1.5.9
+	gorm.io/driver/sqlserver v1.5.3
+	gorm.io/gen v0.3.26
+	gorm.io/gorm v1.25.12
 )
 
 require (
-	github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible // indirect
+	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/bytedance/sonic v1.9.1 // indirect
-	github.com/cespare/xxhash/v2 v2.2.0 // indirect
-	github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // 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.7.1 // indirect
+	github.com/bodgit/plumbing v1.3.0 // indirect
+	github.com/bodgit/sevenzip v1.5.2 // indirect
+	github.com/bodgit/windows v1.0.1 // indirect
+	github.com/bytedance/sonic v1.12.3 // indirect
+	github.com/bytedance/sonic/loader v0.2.0 // indirect
+	github.com/casbin/govaluate v1.2.0 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/clbanning/mxj v1.8.4 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/cloudwego/base64x v0.1.4 // indirect
+	github.com/cloudwego/iasm v0.2.0 // 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/dustin/go-humanize v1.0.1 // indirect
-	github.com/gabriel-vasile/mimetype v1.4.2 // indirect
+	github.com/elastic/go-sysinfo v1.14.2 // indirect
+	github.com/elastic/go-windows v1.0.2 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.6 // indirect
+	github.com/gammazero/toposort v0.1.1 // 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/glebarez/go-sqlite v1.22.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/goccy/go-json v0.10.2 // indirect
+	github.com/go-playground/validator/v10 v10.22.1 // 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.1 // indirect
-	github.com/google/go-querystring v1.0.0 // indirect
-	github.com/google/uuid v1.3.0 // indirect
+	github.com/golang/snappy v0.0.4 // indirect
+	github.com/google/go-querystring v1.1.0 // indirect
+	github.com/google/uuid v1.6.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-20221227161230-091c0ba34f0a // indirect
-	github.com/jackc/pgx/v5 v5.3.1 // indirect
+	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
+	github.com/jackc/pgx/v5 v5.7.1 // 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/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/compress v1.13.6 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
-	github.com/leodido/go-urn v1.2.4 // indirect
-	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
+	github.com/klauspost/compress v1.17.11 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.8 // 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.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/mattn/go-isatty v0.0.20 // indirect
+	github.com/microsoft/go-mssqldb v1.7.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/pelletier/go-toml/v2 v2.0.8 // 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.0-beta.3 // indirect
+	github.com/pelletier/go-toml/v2 v2.2.3 // indirect
+	github.com/pierrec/lz4/v4 v4.1.21 // 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/prometheus/procfs v0.15.1 // 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/sagikazarmark/locafero v0.6.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/sourcegraph/conc v0.3.0 // indirect
+	github.com/spf13/afero v1.11.0 // indirect
+	github.com/spf13/cast v1.7.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/subosito/gotenv v1.4.2 // indirect
-	github.com/tklauser/go-sysconf v0.3.11 // indirect
-	github.com/tklauser/numcpus v0.6.0 // indirect
+	github.com/subosito/gotenv v1.6.0 // indirect
+	github.com/therootcompany/xz v1.0.1 // 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/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
-	golang.org/x/arch v0.3.0 // indirect
-	golang.org/x/image v0.11.0 // indirect
-	golang.org/x/net v0.19.0 // indirect
-	golang.org/x/sys v0.15.0 // indirect
-	golang.org/x/time v0.1.0 // indirect
-	golang.org/x/tools v0.16.1 // indirect
-	google.golang.org/protobuf v1.30.0 // indirect
+	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
+	github.com/xuri/efp v0.0.0-20240408161823-9ad904a10d6d // indirect
+	github.com/xuri/nfp v0.0.0-20240318013403-ab9948c2c4a7 // 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.11.0 // indirect
+	golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c // indirect
+	golang.org/x/image v0.21.0 // indirect
+	golang.org/x/mod v0.21.0 // indirect
+	golang.org/x/net v0.30.0 // indirect
+	golang.org/x/sys v0.26.0 // indirect
+	golang.org/x/time v0.7.0 // indirect
+	golang.org/x/tools v0.26.0 // indirect
+	google.golang.org/protobuf v1.35.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	gorm.io/plugin/dbresolver v1.4.1 // 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
+	howett.net/plist v1.0.1 // indirect
+	modernc.org/fileutil v1.3.0 // indirect
+	modernc.org/libc v1.61.0 // indirect
+	modernc.org/mathutil v1.6.0 // indirect
+	modernc.org/memory v1.8.0 // indirect
+	modernc.org/sqlite v1.33.1 // indirect
 )

server/initialize/ensure_tables.go

@@ -47,9 +47,11 @@ func (e *ensureTables) MigrateTable(ctx context.Context) (context.Context, error
 		sysModel.SysBaseMenuParameter{},
 		sysModel.SysBaseMenuBtn{},
 		sysModel.SysAuthorityBtn{},
-		sysModel.SysAutoCode{},
+		sysModel.SysAutoCodePackage{},
 		sysModel.SysExportTemplate{},
 		sysModel.Condition{},
+		sysModel.JoinTemplate{},
+		sysModel.SysParams{},
 
 		adapter.CasbinRule{},
 
@@ -84,9 +86,10 @@ func (e *ensureTables) TableCreated(ctx context.Context) bool {
 		sysModel.SysBaseMenuParameter{},
 		sysModel.SysBaseMenuBtn{},
 		sysModel.SysAuthorityBtn{},
-		sysModel.SysAutoCode{},
+		sysModel.SysAutoCodePackage{},
 		sysModel.SysExportTemplate{},
 		sysModel.Condition{},
+		sysModel.JoinTemplate{},
 
 		adapter.CasbinRule{},
 

server/initialize/gorm.go

@@ -14,16 +14,22 @@ import (
 func Gorm() *gorm.DB {
 	switch global.GVA_CONFIG.System.DbType {
 	case "mysql":
+		global.GVA_ACTIVE_DBNAME = &global.GVA_CONFIG.Mysql.Dbname
 		return GormMysql()
 	case "pgsql":
+		global.GVA_ACTIVE_DBNAME = &global.GVA_CONFIG.Pgsql.Dbname
 		return GormPgSql()
 	case "oracle":
+		global.GVA_ACTIVE_DBNAME = &global.GVA_CONFIG.Oracle.Dbname
 		return GormOracle()
 	case "mssql":
+		global.GVA_ACTIVE_DBNAME = &global.GVA_CONFIG.Mssql.Dbname
 		return GormMssql()
 	case "sqlite":
+		global.GVA_ACTIVE_DBNAME = &global.GVA_CONFIG.Sqlite.Dbname
 		return GormSqlite()
 	default:
+		global.GVA_ACTIVE_DBNAME = &global.GVA_CONFIG.Mysql.Dbname
 		return GormMysql()
 	}
 }
@@ -33,6 +39,7 @@ func RegisterTables() {
 	err := db.AutoMigrate(
 
 		system.SysApi{},
+		system.SysIgnoreApi{},
 		system.SysUser{},
 		system.SysBaseMenu{},
 		system.JwtBlacklist{},
@@ -44,9 +51,11 @@ func RegisterTables() {
 		system.SysBaseMenuParameter{},
 		system.SysBaseMenuBtn{},
 		system.SysAuthorityBtn{},
-		system.SysAutoCode{},
+		system.SysAutoCodePackage{},
 		system.SysExportTemplate{},
 		system.Condition{},
+		system.JoinTemplate{},
+		system.SysParams{},
 
 		example.ExaFile{},
 		example.ExaCustomer{},
@@ -57,5 +66,12 @@ func RegisterTables() {
 		global.GVA_LOG.Error("register table failed", zap.Error(err))
 		os.Exit(0)
 	}
+
+	err = bizModel()
+
+	if err != nil {
+		global.GVA_LOG.Error("register biz_table failed", zap.Error(err))
+		os.Exit(0)
+	}
 	global.GVA_LOG.Info("register table success")
 }

server/initialize/gorm_biz.go

@@ -0,0 +1,14 @@
+package initialize
+
+import (
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
+)
+
+func bizModel() error {
+	db := global.GVA_DB
+	err := db.AutoMigrate()
+	if err != nil {
+		return err
+	}
+	return nil
+}

server/initialize/internal/gorm.go

@@ -1,20 +1,16 @@
 package internal
 
 import (
+	"github.com/flipped-aurora/gin-vue-admin/server/config"
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
+	"gorm.io/gorm"
+	"gorm.io/gorm/logger"
 	"gorm.io/gorm/schema"
 	"log"
 	"os"
 	"time"
-
-	"github.com/flipped-aurora/gin-vue-admin/server/global"
-	"gorm.io/gorm"
-	"gorm.io/gorm/logger"
 )
 
-type DBBASE interface {
-	GetLogMode() string
-}
-
 var Gorm = new(_gorm)
 
 type _gorm struct{}
@@ -22,41 +18,31 @@ type _gorm struct{}
 // Config gorm 自定义配置
 // Author [SliverHorn](https://github.com/SliverHorn)
 func (g *_gorm) Config(prefix string, singular bool) *gorm.Config {
-	config := &gorm.Config{
+	var general config.GeneralDB
+	switch global.GVA_CONFIG.System.DbType {
+	case "mysql":
+		general = global.GVA_CONFIG.Mysql.GeneralDB
+	case "pgsql":
+		general = global.GVA_CONFIG.Pgsql.GeneralDB
+	case "oracle":
+		general = global.GVA_CONFIG.Oracle.GeneralDB
+	case "sqlite":
+		general = global.GVA_CONFIG.Sqlite.GeneralDB
+	case "mssql":
+		general = global.GVA_CONFIG.Mssql.GeneralDB
+	default:
+		general = global.GVA_CONFIG.Mysql.GeneralDB
+	}
+	return &gorm.Config{
+		Logger: logger.New(NewWriter(general, log.New(os.Stdout, "\r\n", log.LstdFlags)), logger.Config{
+			SlowThreshold: 200 * time.Millisecond,
+			LogLevel:      general.LogLevel(),
+			Colorful:      true,
+		}),
 		NamingStrategy: schema.NamingStrategy{
 			TablePrefix:   prefix,
 			SingularTable: singular,
 		},
 		DisableForeignKeyConstraintWhenMigrating: true,
 	}
-	_default := logger.New(log.New(os.Stdout, "\r\n", log.LstdFlags), logger.Config{
-		SlowThreshold: 200 * time.Millisecond,
-		LogLevel:      logger.Warn,
-		Colorful:      true,
-	})
-	var logMode DBBASE
-	switch global.GVA_CONFIG.System.DbType {
-	case "mysql":
-		logMode = &global.GVA_CONFIG.Mysql
-	case "pgsql":
-		logMode = &global.GVA_CONFIG.Pgsql
-	case "oracle":
-		logMode = &global.GVA_CONFIG.Oracle
-	default:
-		logMode = &global.GVA_CONFIG.Mysql
-	}
-
-	switch logMode.GetLogMode() {
-	case "silent", "Silent":
-		config.Logger = _default.LogMode(logger.Silent)
-	case "error", "Error":
-		config.Logger = _default.LogMode(logger.Error)
-	case "warn", "Warn":
-		config.Logger = _default.LogMode(logger.Warn)
-	case "info", "Info":
-		config.Logger = _default.LogMode(logger.Info)
-	default:
-		config.Logger = _default.LogMode(logger.Info)
-	}
-	return config
 }

server/initialize/internal/gorm_logger_writer.go

@@ -0,0 +1,37 @@
+package internal
+
+import (
+	"fmt"
+	"github.com/flipped-aurora/gin-vue-admin/server/config"
+	"go.uber.org/zap"
+	"gorm.io/gorm/logger"
+)
+
+type Writer struct {
+	config config.GeneralDB
+	writer logger.Writer
+}
+
+func NewWriter(config config.GeneralDB, writer logger.Writer) *Writer {
+	return &Writer{config: config, writer: writer}
+}
+
+// Printf 格式化打印日志
+func (c *Writer) Printf(message string, data ...any) {
+	if c.config.LogZap {
+		switch c.config.LogLevel() {
+		case logger.Silent:
+			zap.L().Debug(fmt.Sprintf(message, data...))
+		case logger.Error:
+			zap.L().Error(fmt.Sprintf(message, data...))
+		case logger.Warn:
+			zap.L().Warn(fmt.Sprintf(message, data...))
+		case logger.Info:
+			zap.L().Info(fmt.Sprintf(message, data...))
+		default:
+			zap.L().Info(fmt.Sprintf(message, data...))
+		}
+		return
+	}
+	c.writer.Printf(message, data...)
+}

server/initialize/internal/logger.go

@@ -1,35 +0,0 @@
-package internal
-
-import (
-	"fmt"
-
-	"github.com/flipped-aurora/gin-vue-admin/server/global"
-	"gorm.io/gorm/logger"
-)
-
-type writer struct {
-	logger.Writer
-}
-
-// NewWriter writer 构造函数
-// Author [SliverHorn](https://github.com/SliverHorn)
-func NewWriter(w logger.Writer) *writer {
-	return &writer{Writer: w}
-}
-
-// Printf 格式化打印日志
-// Author [SliverHorn](https://github.com/SliverHorn)
-func (w *writer) Printf(message string, data ...interface{}) {
-	var logZap bool
-	switch global.GVA_CONFIG.System.DbType {
-	case "mysql":
-		logZap = global.GVA_CONFIG.Mysql.LogZap
-	case "pgsql":
-		logZap = global.GVA_CONFIG.Pgsql.LogZap
-	}
-	if logZap {
-		global.GVA_LOG.Info(fmt.Sprintf(message+"\n", data...))
-	} else {
-		w.Writer.Printf(message, data...)
-	}
-}

server/initialize/other.go

@@ -1,7 +1,10 @@
 package initialize
 
 import (
+	"bufio"
 	"github.com/songzhibin97/gkit/cache/local_cache"
+	"os"
+	"strings"
 
 	"github.com/flipped-aurora/gin-vue-admin/server/global"
 	"github.com/flipped-aurora/gin-vue-admin/server/utils"
@@ -20,4 +23,10 @@ func OtherInit() {
 	global.BlackCache = local_cache.NewCache(
 		local_cache.SetDefaultExpire(dr),
 	)
+	file, err := os.Open("go.mod")
+	if err == nil && global.GVA_CONFIG.AutoCode.Module == "" {
+		scanner := bufio.NewScanner(file)
+		scanner.Scan()
+		global.GVA_CONFIG.AutoCode.Module = strings.TrimPrefix(scanner.Text(), "module ")
+	}
 }

server/initialize/plugin.go

@@ -1,36 +1,15 @@
 package initialize
 
 import (
-	"fmt"
-
 	"github.com/flipped-aurora/gin-vue-admin/server/global"
-	"github.com/flipped-aurora/gin-vue-admin/server/middleware"
-	"github.com/flipped-aurora/gin-vue-admin/server/plugin/email"
-	"github.com/flipped-aurora/gin-vue-admin/server/utils/plugin"
 	"github.com/gin-gonic/gin"
 )
 
-func PluginInit(group *gin.RouterGroup, Plugin ...plugin.Plugin) {
-	for i := range Plugin {
-		PluginGroup := group.Group(Plugin[i].RouterPath())
-		Plugin[i].Register(PluginGroup)
+func InstallPlugin(PrivateGroup *gin.RouterGroup, PublicRouter *gin.RouterGroup, engine *gin.Engine) {
+	if global.GVA_DB == nil {
+		global.GVA_LOG.Info("项目暂未初始化，无法安装插件，初始化后重启项目即可完成插件安装")
+		return
 	}
-}
-
-func InstallPlugin(Router *gin.Engine) {
-	PublicGroup := Router.Group("")
-	fmt.Println("无鉴权插件安装==》", PublicGroup)
-	PrivateGroup := Router.Group("")
-	fmt.Println("鉴权插件安装==》", PrivateGroup)
-	PrivateGroup.Use(middleware.JWTAuth()).Use(middleware.CasbinHandler())
-	//  添加跟角色挂钩权限的插件 示例 本地示例模式于在线仓库模式注意上方的import 可以自行切换 效果相同
-	PluginInit(PrivateGroup, email.CreateEmailPlug(
-		global.GVA_CONFIG.Email.To,
-		global.GVA_CONFIG.Email.From,
-		global.GVA_CONFIG.Email.Host,
-		global.GVA_CONFIG.Email.Secret,
-		global.GVA_CONFIG.Email.Nickname,
-		global.GVA_CONFIG.Email.Port,
-		global.GVA_CONFIG.Email.IsSSL,
-	))
+	bizPluginV1(PrivateGroup, PublicRouter)
+	bizPluginV2(engine)
 }

server/initialize/plugin_biz_v1.go

@@ -0,0 +1,34 @@
+package initialize
+
+import (
+	"fmt"
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
+	"github.com/flipped-aurora/gin-vue-admin/server/plugin/email"
+	"github.com/flipped-aurora/gin-vue-admin/server/utils/plugin"
+	"github.com/gin-gonic/gin"
+)
+
+func PluginInit(group *gin.RouterGroup, Plugin ...plugin.Plugin) {
+	for i := range Plugin {
+		fmt.Println(Plugin[i].RouterPath(), "注册开始!")
+		PluginGroup := group.Group(Plugin[i].RouterPath())
+		Plugin[i].Register(PluginGroup)
+		fmt.Println(Plugin[i].RouterPath(), "注册成功!")
+	}
+}
+
+func bizPluginV1(group ...*gin.RouterGroup) {
+	private := group[0]
+	public := group[1]
+	//  添加跟角色挂钩权限的插件 示例 本地示例模式于在线仓库模式注意上方的import 可以自行切换 效果相同
+	PluginInit(private, email.CreateEmailPlug(
+		global.GVA_CONFIG.Email.To,
+		global.GVA_CONFIG.Email.From,
+		global.GVA_CONFIG.Email.Host,
+		global.GVA_CONFIG.Email.Secret,
+		global.GVA_CONFIG.Email.Nickname,
+		global.GVA_CONFIG.Email.Port,
+		global.GVA_CONFIG.Email.IsSSL,
+	))
+	holder(public, private)
+}

server/initialize/plugin_biz_v2.go

@@ -0,0 +1,16 @@
+package initialize
+
+import (
+	"github.com/flipped-aurora/gin-vue-admin/server/plugin/announcement"
+	"github.com/flipped-aurora/gin-vue-admin/server/utils/plugin/v2"
+	"github.com/gin-gonic/gin"
+)
+
+func PluginInitV2(group *gin.Engine, plugins ...plugin.Plugin) {
+	for i := 0; i < len(plugins); i++ {
+		plugins[i].Register(group)
+	}
+}
+func bizPluginV2(engine *gin.Engine) {
+	PluginInitV2(engine, announcement.Plugin)
+}

server/initialize/redis.go

@@ -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
 }

server/initialize/router.go

@@ -1,6 +1,9 @@
 package initialize
 
 import (
+	"net/http"
+	"os"
+
 	"github.com/flipped-aurora/gin-vue-admin/server/docs"
 	"github.com/flipped-aurora/gin-vue-admin/server/global"
 	"github.com/flipped-aurora/gin-vue-admin/server/middleware"
@@ -8,8 +11,6 @@ import (
 	"github.com/gin-gonic/gin"
 	swaggerFiles "github.com/swaggo/files"
 	ginSwagger "github.com/swaggo/gin-swagger"
-	"net/http"
-	"os"
 )
 
 type justFilesFilesystem struct {
@@ -39,28 +40,31 @@ func Routers() *gin.Engine {
 		Router.Use(gin.Logger())
 	}
 
-	InstallPlugin(Router) // 安装插件
 	systemRouter := router.RouterGroupApp.System
 	exampleRouter := router.RouterGroupApp.Example
 	// 如果想要不使用nginx代理前端网页，可以修改 web/.env.production 下的
 	// VUE_APP_BASE_API = /
 	// VUE_APP_BASE_PATH = http://localhost
 	// 然后执行打包命令 npm run build。在打开下面3行注释
-	//Router.Static("/favicon.ico", "./dist/favicon.ico")
-	//Router.Static("/assets", "./dist/assets")   // dist里面的静态资源
-	//Router.StaticFile("/", "./dist/index.html") // 前端网页入口页面
+	// Router.Static("/favicon.ico", "./dist/favicon.ico")
+	// Router.Static("/assets", "./dist/assets")   // dist里面的静态资源
+	// Router.StaticFile("/", "./dist/index.html") // 前端网页入口页面
 
 	Router.StaticFS(global.GVA_CONFIG.Local.StorePath, justFilesFilesystem{http.Dir(global.GVA_CONFIG.Local.StorePath)}) // Router.Use(middleware.LoadTls())  // 如果需要使用https 请打开此中间件 然后前往 core/server.go 将启动模式 更变为 Router.RunTLS("端口","你的cre/pem文件","你的key文件")
 	// 跨域，如需跨域可以打开下面的注释
 	// Router.Use(middleware.Cors()) // 直接放行全部跨域请求
 	// Router.Use(middleware.CorsByRules()) // 按照配置的规则放行跨域请求
-	//global.GVA_LOG.Info("use middleware cors")
+	// global.GVA_LOG.Info("use middleware cors")
 	docs.SwaggerInfo.BasePath = global.GVA_CONFIG.System.RouterPrefix
 	Router.GET(global.GVA_CONFIG.System.RouterPrefix+"/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler))
 	global.GVA_LOG.Info("register swagger handler")
 	// 方便统一添加路由组前缀 多服务器上线使用
 
 	PublicGroup := Router.Group(global.GVA_CONFIG.System.RouterPrefix)
+	PrivateGroup := Router.Group(global.GVA_CONFIG.System.RouterPrefix)
+
+	PrivateGroup.Use(middleware.JWTAuth()).Use(middleware.CasbinHandler())
+
 	{
 		// 健康监测
 		PublicGroup.GET("/health", func(c *gin.Context) {
@@ -71,8 +75,7 @@ func Routers() *gin.Engine {
 		systemRouter.InitBaseRouter(PublicGroup) // 注册基础功能路由 不做鉴权
 		systemRouter.InitInitRouter(PublicGroup) // 自动初始化相关
 	}
-	PrivateGroup := Router.Group(global.GVA_CONFIG.System.RouterPrefix)
-	PrivateGroup.Use(middleware.JWTAuth()).Use(middleware.CasbinHandler())
+
 	{
 		systemRouter.InitApiRouter(PrivateGroup, PublicGroup)       // 注册功能api路由
 		systemRouter.InitJwtRouter(PrivateGroup)                    // jwt相关路由
@@ -80,19 +83,28 @@ func Routers() *gin.Engine {
 		systemRouter.InitMenuRouter(PrivateGroup)                   // 注册menu路由
 		systemRouter.InitSystemRouter(PrivateGroup)                 // system相关路由
 		systemRouter.InitCasbinRouter(PrivateGroup)                 // 权限相关路由
-		systemRouter.InitAutoCodeRouter(PrivateGroup)               // 创建自动化代码
+		systemRouter.InitAutoCodeRouter(PrivateGroup, PublicGroup)  // 创建自动化代码
 		systemRouter.InitAuthorityRouter(PrivateGroup)              // 注册角色路由
 		systemRouter.InitSysDictionaryRouter(PrivateGroup)          // 字典管理
 		systemRouter.InitAutoCodeHistoryRouter(PrivateGroup)        // 自动化代码历史
 		systemRouter.InitSysOperationRecordRouter(PrivateGroup)     // 操作记录
 		systemRouter.InitSysDictionaryDetailRouter(PrivateGroup)    // 字典详情管理
-		systemRouter.InitAuthorityBtnRouterRouter(PrivateGroup)     // 字典详情管理
+		systemRouter.InitAuthorityBtnRouterRouter(PrivateGroup)     // 按钮权限管理
 		systemRouter.InitSysExportTemplateRouter(PrivateGroup)      // 导出模板
+		systemRouter.InitSysParamsRouter(PrivateGroup, PublicGroup) // 参数管理
 		exampleRouter.InitCustomerRouter(PrivateGroup)              // 客户路由
 		exampleRouter.InitFileUploadAndDownloadRouter(PrivateGroup) // 文件上传下载功能路由
 
 	}
 
+	//插件路由安装
+	InstallPlugin(PrivateGroup, PublicGroup, Router)
+
+	// 注册业务路由
+	initBizRouter(PrivateGroup, PublicGroup)
+
+	global.GVA_ROUTERS = Router.Routes()
+
 	global.GVA_LOG.Info("router register success")
 	return Router
 }

server/initialize/router_biz.go

@@ -0,0 +1,19 @@
+package initialize
+
+import (
+	"github.com/flipped-aurora/gin-vue-admin/server/router"
+	"github.com/gin-gonic/gin"
+)
+
+// 占位方法，保证文件可以正确加载，避免go空变量检测报错，请勿删除。
+func holder(routers ...*gin.RouterGroup) {
+	_ = routers
+	_ = router.RouterGroupApp
+}
+
+func initBizRouter(routers ...*gin.RouterGroup) {
+	privateGroup := routers[0]
+	publicGroup := routers[1]
+
+	holder(publicGroup, privateGroup)
+}

server/main.go

@@ -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
@@ -15,7 +14,7 @@ import (
 //go:generate go mod download
 
 // @title                       Gin-Vue-Admin Swagger API接口文档
-// @version                     v2.6.2
+// @version                     v2.7.6
 // @description                 使用gin+vue进行极速开发的全栈开发基础平台
 // @securityDefinitions.apikey  ApiKeyAuth
 // @in                          header

server/middleware/jwt.go

@@ -3,10 +3,8 @@ 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"
 	"strconv"
 	"time"
 
@@ -67,13 +65,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)
 			}
 		}

server/model/common/basetypes.go

@@ -0,0 +1,36 @@
+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
+}

server/model/common/request/common.go

@@ -1,10 +1,30 @@
 package request
 
+import (
+	"gorm.io/gorm"
+)
+
 // PageInfo Paging common input parameter structure
 type PageInfo struct {
 	Page     int    `json:"page" form:"page"`         // 页码
 	PageSize int    `json:"pageSize" form:"pageSize"` // 每页大小
-	Keyword  string `json:"keyword" form:"keyword"`   //关键字
+	Keyword  string `json:"keyword" form:"keyword"`   // 关键字
+}
+
+func (r *PageInfo) Paginate() func(db *gorm.DB) *gorm.DB {
+	return func(db *gorm.DB) *gorm.DB {
+		if r.Page <= 0 {
+			r.Page = 1
+		}
+		switch {
+		case r.PageSize > 100:
+			r.PageSize = 100
+		case r.PageSize <= 0:
+			r.PageSize = 10
+		}
+		offset := (r.Page - 1) * r.PageSize
+		return db.Offset(offset).Limit(r.PageSize)
+	}
 }
 
 // GetById Find by id structure

server/model/common/response/response.go

@@ -35,7 +35,7 @@ func OkWithMessage(message string, c *gin.Context) {
 }
 
 func OkWithData(data interface{}, c *gin.Context) {
-	Result(SUCCESS, data, "查询成功", c)
+	Result(SUCCESS, data, "成功", c)
 }
 
 func OkWithDetailed(data interface{}, message string, c *gin.Context) {

server/model/system/request/sys_auto_code.go

@@ -0,0 +1,267 @@
+package request
+
+import (
+	"encoding/json"
+	"fmt"
+	model "github.com/flipped-aurora/gin-vue-admin/server/model/system"
+	"github.com/pkg/errors"
+	"go/token"
+	"strings"
+)
+
+type AutoCode struct {
+	Package             string                 `json:"package"`
+	PackageT            string                 `json:"-"`
+	TableName           string                 `json:"tableName" example:"表名"`              // 表名
+	BusinessDB          string                 `json:"businessDB" example:"业务数据库"`          // 业务数据库
+	StructName          string                 `json:"structName" example:"Struct名称"`       // Struct名称
+	PackageName         string                 `json:"packageName" example:"文件名称"`          // 文件名称
+	Description         string                 `json:"description" example:"Struct中文名称"`    // Struct中文名称
+	Abbreviation        string                 `json:"abbreviation" example:"Struct简称"`     // Struct简称
+	HumpPackageName     string                 `json:"humpPackageName" example:"go文件名称"`    // go文件名称
+	GvaModel            bool                   `json:"gvaModel" example:"false"`            // 是否使用gva默认Model
+	AutoMigrate         bool                   `json:"autoMigrate" example:"false"`         // 是否自动迁移表结构
+	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"`        // 是否只生成模板
+	Fields              []*AutoCodeField       `json:"fields"`
+	DictTypes           []string               `json:"-"`
+	PrimaryField        *AutoCodeField         `json:"primaryField"`
+	DataSourceMap       map[string]*DataSource `json:"-"`
+	HasPic              bool                   `json:"-"`
+	HasFile             bool                   `json:"-"`
+	HasTimer            bool                   `json:"-"`
+	NeedSort            bool                   `json:"-"`
+	NeedJSON            bool                   `json:"-"`
+	HasRichText         bool                   `json:"-"`
+	HasDataSource       bool                   `json:"-"`
+	HasSearchTimer      bool                   `json:"-"`
+	HasArray            bool                   `json:"-"`
+	HasExcel            bool                   `json:"-"`
+}
+
+type DataSource struct {
+	DBName      string `json:"dbName"`
+	Table       string `json:"table"`
+	Label       string `json:"label"`
+	Value       string `json:"value"`
+	Association int    `json:"association"` // 关联关系 1 一对一 2 一对多
+}
+
+func (r *AutoCode) Apis() []model.SysApi {
+	return []model.SysApi{
+		{
+			Path:        "/" + r.Abbreviation + "/" + "create" + r.StructName,
+			Description: "新增" + r.Description,
+			ApiGroup:    r.Description,
+			Method:      "POST",
+		},
+		{
+			Path:        "/" + r.Abbreviation + "/" + "delete" + r.StructName,
+			Description: "删除" + r.Description,
+			ApiGroup:    r.Description,
+			Method:      "DELETE",
+		},
+		{
+			Path:        "/" + r.Abbreviation + "/" + "delete" + r.StructName + "ByIds",
+			Description: "批量删除" + r.Description,
+			ApiGroup:    r.Description,
+			Method:      "DELETE",
+		},
+		{
+			Path:        "/" + r.Abbreviation + "/" + "update" + r.StructName,
+			Description: "更新" + r.Description,
+			ApiGroup:    r.Description,
+			Method:      "PUT",
+		},
+		{
+			Path:        "/" + r.Abbreviation + "/" + "find" + r.StructName,
+			Description: "根据ID获取" + r.Description,
+			ApiGroup:    r.Description,
+			Method:      "GET",
+		},
+		{
+			Path:        "/" + r.Abbreviation + "/" + "get" + r.StructName + "List",
+			Description: "获取" + r.Description + "列表",
+			ApiGroup:    r.Description,
+			Method:      "GET",
+		},
+	}
+}
+
+func (r *AutoCode) Menu(template string) model.SysBaseMenu {
+	component := fmt.Sprintf("view/%s/%s/%s.vue", r.Package, r.PackageName, r.PackageName)
+	if template != "package" {
+		component = fmt.Sprintf("plugin/%s/view/%s.vue", r.Package, r.PackageName)
+	}
+	return model.SysBaseMenu{
+		ParentId:  0,
+		Path:      r.Abbreviation,
+		Name:      r.Abbreviation,
+		Component: component,
+		Meta: model.Meta{
+			Title: r.Description,
+		},
+	}
+}
+
+// Pretreatment 预处理
+// Author [SliverHorn](https://github.com/SliverHorn)
+func (r *AutoCode) Pretreatment() error {
+	if token.IsKeyword(r.Abbreviation) {
+		r.Abbreviation = r.Abbreviation + "_"
+	} // go 关键字处理
+	if strings.HasSuffix(r.HumpPackageName, "test") {
+		r.HumpPackageName = r.HumpPackageName + "_"
+	} // test
+	length := len(r.Fields)
+	dict := make(map[string]string, 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
+		}
+		switch r.Fields[i].FieldType {
+		case "file":
+			r.HasFile = true
+			r.NeedJSON = true
+		case "json":
+			r.NeedJSON = true
+		case "array":
+			r.NeedJSON = true
+			r.HasArray = true
+		case "video":
+			r.HasPic = true
+		case "richtext":
+			r.HasRichText = true
+		case "picture":
+			r.HasPic = true
+		case "pictures":
+			r.HasPic = true
+			r.NeedJSON = true
+		case "time.Time":
+			r.HasTimer = true
+			if r.Fields[i].FieldSearchType != "" {
+				r.HasSearchTimer = true
+			}
+		}
+		if r.Fields[i].DataSource != nil {
+			if r.Fields[i].DataSource.Table != "" && r.Fields[i].DataSource.Label != "" && r.Fields[i].DataSource.Value != "" {
+				r.HasDataSource = true
+				r.Fields[i].CheckDataSource = true
+				r.DataSourceMap[r.Fields[i].FieldJson] = r.Fields[i].DataSource
+			}
+		}
+		if !r.GvaModel && r.PrimaryField == nil && r.Fields[i].PrimaryKey {
+			r.PrimaryField = r.Fields[i]
+		} // 自定义主键
+	}
+	{
+		for key := range dict {
+			r.DictTypes = append(r.DictTypes, key)
+		}
+	} // DictTypes => 字典
+	{
+		if r.GvaModel {
+			r.PrimaryField = &AutoCodeField{
+				FieldName:    "ID",
+				FieldType:    "uint",
+				FieldDesc:    "ID",
+				FieldJson:    "ID",
+				DataTypeLong: "20",
+				Comment:      "主键ID",
+				ColumnName:   "id",
+			}
+		}
+	} // GvaModel
+	if r.Package == "" {
+		return errors.New("Package为空!")
+	} // 增加判断：Package不为空
+	packages := []rune(r.Package)
+	if len(packages) > 0 {
+		if packages[0] >= 97 && packages[0] <= 122 {
+			packages[0] = packages[0] - 32
+		}
+		r.PackageT = string(packages)
+	} // PackageT 是 Package 的首字母大写
+	return nil
+}
+
+func (r *AutoCode) History() SysAutoHistoryCreate {
+	bytes, _ := json.Marshal(r)
+	return SysAutoHistoryCreate{
+		Table:       r.TableName,
+		Package:     r.Package,
+		Request:     string(bytes),
+		StructName:  r.StructName,
+		BusinessDB:  r.BusinessDB,
+		Description: r.Description,
+	}
+}
+
+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"`           // 是否前端可见
+	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"`       // 校验失败文字
+	Clearable       bool        `json:"clearable"`       // 是否可清空
+	Sort            bool        `json:"sort"`            // 是否增加排序
+	PrimaryKey      bool        `json:"primaryKey"`      // 是否主键
+	DataSource      *DataSource `json:"dataSource"`      // 数据源
+	CheckDataSource bool        `json:"checkDataSource"` // 是否检查数据源
+	FieldIndexType  string      `json:"fieldIndexType"`  // 索引类型
+}
+
+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"`     // 文件名称
+	Description     string `json:"description"`     // Struct中文名称
+	Abbreviation    string `json:"abbreviation"`    // Struct简称
+	HumpPackageName string `json:"humpPackageName"` // go文件名称
+	Method          string `json:"method"`          // 方法
+	IsPlugin        bool   `json:"isPlugin"`        // 是否插件
+	IsAuth          bool   `json:"isAuth"`          // 是否鉴权
+}
+
+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;"`        //模式
+}

server/model/system/request/sys_auto_code_package.go

@@ -0,0 +1,27 @@
+package request
+
+import (
+	model "github.com/flipped-aurora/gin-vue-admin/server/model/system"
+)
+
+type SysAutoCodePackageCreate struct {
+	Desc        string `json:"desc" example:"描述"`
+	Label       string `json:"label" example:"展示名"`
+	Template    string `json:"template"  example:"模版"`
+	PackageName string `json:"packageName" example:"包名"`
+}
+
+func (r *SysAutoCodePackageCreate) AutoCode() AutoCode {
+	return AutoCode{
+		Package: r.PackageName,
+	}
+}
+
+func (r *SysAutoCodePackageCreate) Create() model.SysAutoCodePackage {
+	return model.SysAutoCodePackage{
+		Desc:        r.Desc,
+		Label:       r.Label,
+		Template:    r.Template,
+		PackageName: r.PackageName,
+	}
+}

server/model/system/request/sys_auto_history.go

@@ -1,13 +1,56 @@
 package request
 
-import "github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
+import (
+	common "github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
+	model "github.com/flipped-aurora/gin-vue-admin/server/model/system"
+)
 
-type SysAutoHistory struct {
-	request.PageInfo
+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
+	ExportTemplateID uint              // 导出模板ID
 }
 
-// GetById Find by id structure
-type RollBack struct {
-	ID          int  `json:"id" form:"id"`                   // 主键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,
+		ExportTemplateID: r.ExportTemplateID,
+	}
+	if entity.Table == "" {
+		entity.Table = r.StructName
+	}
+	return entity
+}
+
+type SysAutoHistoryRollBack struct {
+	common.GetById
+	DeleteApi   bool `json:"deleteApi" form:"deleteApi"`     // 是否删除接口
+	DeleteMenu  bool `json:"deleteMenu" form:"deleteMenu"`   // 是否删除菜单
 	DeleteTable bool `json:"deleteTable" form:"deleteTable"` // 是否删除表
 }
+
+func (r *SysAutoHistoryRollBack) ApiIds(entity model.SysAutoCodeHistory) common.IdsReq {
+	length := len(entity.ApiIDs)
+	ids := make([]int, 0)
+	for i := 0; i < length; i++ {
+		ids = append(ids, int(entity.ApiIDs[i]))
+	}
+	return common.IdsReq{Ids: ids}
+}

server/model/system/request/sys_casbin.go

@@ -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"},
 	}
 }

server/model/system/request/sys_init.go

@@ -7,13 +7,14 @@ import (
 )
 
 type InitDB struct {
-	DBType   string `json:"dbType"`                    // 数据库类型
-	Host     string `json:"host"`                      // 服务器地址
-	Port     string `json:"port"`                      // 数据库连接端口
-	UserName string `json:"userName"`                  // 数据库用户名
-	Password string `json:"password"`                  // 数据库密码
-	DBName   string `json:"dbName" binding:"required"` // 数据库名
-	DBPath   string `json:"dbPath"`                    // sqlite数据库文件路径
+	AdminPassword string `json:"adminPassword" binding:"required"`
+	DBType        string `json:"dbType"`                    // 数据库类型
+	Host          string `json:"host"`                      // 服务器地址
+	Port          string `json:"port"`                      // 数据库连接端口
+	UserName      string `json:"userName"`                  // 数据库用户名
+	Password      string `json:"password"`                  // 数据库密码
+	DBName        string `json:"dbName" binding:"required"` // 数据库名
+	DBPath        string `json:"dbPath"`                    // sqlite数据库文件路径
 }
 
 // MysqlEmptyDsn msyql 空数据库 建库链接

server/model/system/request/sys_menu.go

@@ -14,7 +14,7 @@ type AddMenuAuthorityInfo struct {
 func DefaultMenu() []system.SysBaseMenu {
 	return []system.SysBaseMenu{{
 		GVA_MODEL: global.GVA_MODEL{ID: 1},
-		ParentId:  "0",
+		ParentId:  0,
 		Path:      "dashboard",
 		Name:      "dashboard",
 		Component: "view/dashboard/index.vue",

server/model/system/request/sys_params.go

@@ -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
+}

server/model/system/request/sys_user.go

@@ -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"
 )
 
@@ -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"`
+}

server/model/system/response/sys_api.go

@@ -1,6 +1,8 @@
 package response
 
-import "github.com/flipped-aurora/gin-vue-admin/server/model/system"
+import (
+	"github.com/flipped-aurora/gin-vue-admin/server/model/system"
+)
 
 type SysAPIResponse struct {
 	Api system.SysApi `json:"api"`
@@ -9,3 +11,8 @@ type SysAPIResponse struct {
 type SysAPIListResponse struct {
 	Apis []system.SysApi `json:"apis"`
 }
+
+type SysSyncApis struct {
+	NewApis    []system.SysApi `json:"newApis"`
+	DeleteApis []system.SysApi `json:"deleteApis"`
+}

server/model/system/response/sys_auto_code_history.go

@@ -1,14 +0,0 @@
-package response
-
-import "time"
-
-type AutoCodeHistory struct {
-	ID           uint      `json:"ID" gorm:"column:id"`
-	CreatedAt    time.Time `json:"CreatedAt" gorm:"column:created_at"`
-	UpdatedAt    time.Time `json:"UpdatedAt" gorm:"column:updated_at"`
-	BusinessDB   string    `json:"businessDB" gorm:"column:business_db"`
-	TableName    string    `json:"tableName" gorm:"column:table_name"`
-	StructName   string    `json:"structName" gorm:"column:struct_name"`
-	StructCNName string    `json:"structCNName" gorm:"column:struct_cn_name"`
-	Flag         int       `json:"flag" gorm:"column:flag"`
-}

server/model/system/sys_api.go

@@ -15,3 +15,14 @@ type SysApi struct {
 func (SysApi) TableName() string {
 	return "sys_apis"
 }
+
+type SysIgnoreApi struct {
+	global.GVA_MODEL
+	Path   string `json:"path" gorm:"comment:api路径"`             // api路径
+	Method string `json:"method" gorm:"default:POST;comment:方法"` // 方法:创建POST(默认)|查看GET|更新PUT|删除DELETE
+	Flag   bool   `json:"flag" gorm:"-"`                         // 是否忽略
+}
+
+func (SysIgnoreApi) TableName() string {
+	return "sys_ignore_apis"
+}

server/model/system/sys_authority_menu.go

@@ -2,7 +2,7 @@ package system
 
 type SysMenu struct {
 	SysBaseMenu
-	MenuId      string                 `json:"menuId" gorm:"comment:菜单ID"`
+	MenuId      uint                   `json:"menuId" gorm:"comment:菜单ID"`
 	AuthorityId uint                   `json:"-" gorm:"comment:角色ID"`
 	Children    []SysMenu              `json:"children" gorm:"-"`
 	Parameters  []SysBaseMenuParameter `json:"parameters" gorm:"foreignKey:SysBaseMenuID;references:MenuId"`

server/model/system/sys_auto_code.go

@@ -1,123 +0,0 @@
-package system
-
-import (
-	"errors"
-	"go/token"
-	"strings"
-
-	"github.com/flipped-aurora/gin-vue-admin/server/global"
-)
-
-// AutoCodeStruct 初始版本自动化代码工具
-type AutoCodeStruct struct {
-	StructName          string   `json:"structName"`          // Struct名称
-	TableName           string   `json:"tableName"`           // 表名
-	PackageName         string   `json:"packageName"`         // 文件名称
-	HumpPackageName     string   `json:"humpPackageName"`     // go文件名称
-	Abbreviation        string   `json:"abbreviation"`        // Struct简称
-	Description         string   `json:"description"`         // Struct中文名称
-	AutoCreateApiToSql  bool     `json:"autoCreateApiToSql"`  // 是否自动创建api
-	AutoCreateMenuToSql bool     `json:"autoCreateMenuToSql"` // 是否自动创建menu
-	AutoCreateResource  bool     `json:"autoCreateResource"`  // 是否自动创建资源标识
-	AutoMoveFile        bool     `json:"autoMoveFile"`        // 是否自动移动文件
-	BusinessDB          string   `json:"businessDB"`          // 业务数据库
-	GvaModel            bool     `json:"gvaModel"`            // 是否使用gva默认Model
-	Fields              []*Field `json:"fields"`
-	PrimaryField        *Field   `json:"primaryField"`
-	HasTimer            bool     `json:"-"`
-	HasSearchTimer      bool     `json:"-"`
-	DictTypes           []string `json:"-"`
-	Package             string   `json:"package"`
-	PackageT            string   `json:"-"`
-	NeedSort            bool     `json:"-"`
-	HasPic              bool     `json:"-"`
-	HasRichText         bool     `json:"-"`
-	HasFile             bool     `json:"-"`
-	NeedJSON            bool     `json:"-"`
-}
-
-func (a *AutoCodeStruct) Pretreatment() {
-	a.KeyWord()
-	a.SuffixTest()
-}
-
-// KeyWord 是go关键字的处理加上 _ ，防止编译报错
-// Author [SliverHorn](https://github.com/SliverHorn)
-func (a *AutoCodeStruct) KeyWord() {
-	if token.IsKeyword(a.Abbreviation) {
-		a.Abbreviation = a.Abbreviation + "_"
-	}
-}
-
-// SuffixTest 处理_test 后缀
-// Author [SliverHorn](https://github.com/SliverHorn)
-func (a *AutoCodeStruct) SuffixTest() {
-	if strings.HasSuffix(a.HumpPackageName, "test") {
-		a.HumpPackageName = a.HumpPackageName + "_"
-	}
-}
-
-type Field 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"` // 搜索条件
-	DictType        string `json:"dictType"`        // 字典
-	Require         bool   `json:"require"`         // 是否必填
-	ErrorText       string `json:"errorText"`       // 校验失败文字
-	Clearable       bool   `json:"clearable"`       // 是否可清空
-	Sort            bool   `json:"sort"`            // 是否增加排序
-	PrimaryKey      bool   `json:"primaryKey"`      // 是否主键
-}
-
-var ErrAutoMove error = errors.New("创建代码成功并移动文件成功")
-
-type SysAutoCode struct {
-	global.GVA_MODEL
-	PackageName string `json:"packageName" gorm:"comment:包名"`
-	Label       string `json:"label" gorm:"comment:展示名"`
-	Desc        string `json:"desc" gorm:"comment:描述"`
-}
-
-type AutoPlugReq struct {
-	PlugName    string         `json:"plugName"` // 必然大写开头
-	Snake       string         `json:"snake"`    // 后端自动转为 snake
-	RouterGroup string         `json:"routerGroup"`
-	HasGlobal   bool           `json:"hasGlobal"`
-	HasRequest  bool           `json:"hasRequest"`
-	HasResponse bool           `json:"hasResponse"`
-	NeedModel   bool           `json:"needModel"`
-	Global      []AutoPlugInfo `json:"global,omitempty"`
-	Request     []AutoPlugInfo `json:"request,omitempty"`
-	Response    []AutoPlugInfo `json:"response,omitempty"`
-}
-
-func (a *AutoPlugReq) CheckList() {
-	a.Global = bind(a.Global)
-	a.Request = bind(a.Request)
-	a.Response = bind(a.Response)
-
-}
-func bind(req []AutoPlugInfo) []AutoPlugInfo {
-	var r []AutoPlugInfo
-	for _, info := range req {
-		if info.Effective() {
-			r = append(r, info)
-		}
-	}
-	return r
-}
-
-type AutoPlugInfo struct {
-	Key  string `json:"key"`
-	Type string `json:"type"`
-	Desc string `json:"desc"`
-}
-
-func (a AutoPlugInfo) Effective() bool {
-	return a.Key != "" && a.Type != "" && a.Desc != ""
-}

server/model/system/sys_auto_code_history.go

@@ -0,0 +1,67 @@
+package system
+
+import (
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
+	"gorm.io/gorm"
+	"os"
+	"path"
+	"path/filepath"
+	"strings"
+)
+
+// 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"`
+	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 {
+	templates := make(map[string]string, len(s.Templates))
+	for key, value := range s.Templates {
+		server := filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.Server)
+		{
+			hasServer := strings.Index(key, server)
+			if hasServer != -1 {
+				key = strings.TrimPrefix(key, server)
+				keys := strings.Split(key, string(os.PathSeparator))
+				key = path.Join(keys...)
+			}
+		} // key
+		web := filepath.Join(global.GVA_CONFIG.AutoCode.Root, global.GVA_CONFIG.AutoCode.WebRoot())
+		hasWeb := strings.Index(value, web)
+		if hasWeb != -1 {
+			value = strings.TrimPrefix(value, web)
+			values := strings.Split(value, string(os.PathSeparator))
+			value = path.Join(values...)
+			templates[key] = value
+			continue
+		}
+		hasServer := strings.Index(value, server)
+		if hasServer != -1 {
+			value = strings.TrimPrefix(value, server)
+			values := strings.Split(value, string(os.PathSeparator))
+			value = path.Join(values...)
+			templates[key] = value
+			continue
+		}
+	}
+	s.Templates = templates
+	return nil
+}
+
+func (s *SysAutoCodeHistory) TableName() string {
+	return "sys_auto_code_histories"
+}

server/model/system/sys_auto_code_package.go

@@ -0,0 +1,17 @@
+package system
+
+import (
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
+)
+
+type SysAutoCodePackage struct {
+	global.GVA_MODEL
+	Desc        string `json:"desc" gorm:"comment:描述"`
+	Label       string `json:"label" gorm:"comment:展示名"`
+	Template    string `json:"template"  gorm:"comment:模版"`
+	PackageName string `json:"packageName" gorm:"comment:包名"`
+}
+
+func (s *SysAutoCodePackage) TableName() string {
+	return "sys_auto_code_packages"
+}

server/model/system/sys_autocode_history.go

@@ -1,41 +0,0 @@
-package system
-
-import (
-	"strconv"
-	"strings"
-
-	"github.com/flipped-aurora/gin-vue-admin/server/global"
-	"github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
-)
-
-// SysAutoCodeHistory 自动迁移代码记录,用于回滚,重放使用
-type SysAutoCodeHistory struct {
-	global.GVA_MODEL
-	Package       string `json:"package"`
-	BusinessDB    string `json:"businessDB"`
-	TableName     string `json:"tableName"`
-	MenuID        uint   `json:"menuID"`
-	RequestMeta   string `gorm:"type:text" json:"requestMeta,omitempty"`   // 前端传入的结构化信息
-	AutoCodePath  string `gorm:"type:text" json:"autoCodePath,omitempty"`  // 其他meta信息 path;path
-	InjectionMeta string `gorm:"type:text" json:"injectionMeta,omitempty"` // 注入的内容 RouterPath@functionName@RouterString;
-	StructName    string `json:"structName"`
-	StructCNName  string `json:"structCNName"`
-	ApiIDs        string `json:"apiIDs,omitempty"` // api表注册内容
-	Flag          int    `json:"flag"`             // 表示对应状态 0 代表创建, 1 代表回滚 ...
-}
-
-// ToRequestIds ApiIDs 转换 request.IdsReq
-// Author [SliverHorn](https://github.com/SliverHorn)
-func (m *SysAutoCodeHistory) ToRequestIds() request.IdsReq {
-	if m.ApiIDs == "" {
-		return request.IdsReq{}
-	}
-	slice := strings.Split(m.ApiIDs, ";")
-	ids := make([]int, 0, len(slice))
-	length := len(slice)
-	for i := 0; i < length; i++ {
-		id, _ := strconv.ParseInt(slice[i], 10, 32)
-		ids = append(ids, int(id))
-	}
-	return request.IdsReq{Ids: ids}
-}

server/model/system/sys_base_menu.go

@@ -6,34 +6,34 @@ import (
 
 type SysBaseMenu struct {
 	global.GVA_MODEL
-	MenuLevel     uint                   `json:"-"`
-	ParentId      string                 `json:"parentId" gorm:"comment:父菜单ID"`          // 父菜单ID
-	Path          string                 `json:"path" gorm:"comment:路由path"`              // 路由path
-	Name          string                 `json:"name" gorm:"comment:路由name"`              // 路由name
-	Hidden        bool                   `json:"hidden" gorm:"comment:是否在列表隐藏"`      // 是否在列表隐藏
-	Component     string                 `json:"component" gorm:"comment:对应前端文件路径"` // 对应前端文件路径
-	Sort          int                    `json:"sort" gorm:"comment:排序标记"`              // 排序标记
-	Meta          `json:"meta" gorm:"embedded;comment:附加属性"`                            // 附加属性
-	SysAuthoritys []SysAuthority         `json:"authoritys" gorm:"many2many:sys_authority_menus;"`
-	Children      []SysBaseMenu          `json:"children" gorm:"-"`
-	Parameters    []SysBaseMenuParameter `json:"parameters"`
-	MenuBtn       []SysBaseMenuBtn       `json:"menuBtn"`
+	MenuLevel     uint                                       `json:"-"`
+	ParentId      uint                                       `json:"parentId" gorm:"comment:父菜单ID"`     // 父菜单ID
+	Path          string                                     `json:"path" gorm:"comment:路由path"`        // 路由path
+	Name          string                                     `json:"name" gorm:"comment:路由name"`        // 路由name
+	Hidden        bool                                       `json:"hidden" gorm:"comment:是否在列表隐藏"`     // 是否在列表隐藏
+	Component     string                                     `json:"component" gorm:"comment:对应前端文件路径"` // 对应前端文件路径
+	Sort          int                                        `json:"sort" gorm:"comment:排序标记"`          // 排序标记
+	Meta          `json:"meta" gorm:"embedded;comment:附加属性"` // 附加属性
+	SysAuthoritys []SysAuthority                             `json:"authoritys" gorm:"many2many:sys_authority_menus;"`
+	Children      []SysBaseMenu                              `json:"children" gorm:"-"`
+	Parameters    []SysBaseMenuParameter                     `json:"parameters"`
+	MenuBtn       []SysBaseMenuBtn                           `json:"menuBtn"`
 }
 
 type Meta struct {
 	ActiveName  string `json:"activeName" gorm:"comment:高亮菜单"`
-	KeepAlive   bool   `json:"keepAlive" gorm:"comment:是否缓存"`                 // 是否缓存
+	KeepAlive   bool   `json:"keepAlive" gorm:"comment:是否缓存"`           // 是否缓存
 	DefaultMenu bool   `json:"defaultMenu" gorm:"comment:是否是基础路由（开发中）"` // 是否是基础路由（开发中）
-	Title       string `json:"title" gorm:"comment:菜单名"`                       // 菜单名
-	Icon        string `json:"icon" gorm:"comment:菜单图标"`                      // 菜单图标
-	CloseTab    bool   `json:"closeTab" gorm:"comment:自动关闭tab"`               // 自动关闭tab
+	Title       string `json:"title" gorm:"comment:菜单名"`                // 菜单名
+	Icon        string `json:"icon" gorm:"comment:菜单图标"`                // 菜单图标
+	CloseTab    bool   `json:"closeTab" gorm:"comment:自动关闭tab"`         // 自动关闭tab
 }
 
 type SysBaseMenuParameter struct {
 	global.GVA_MODEL
 	SysBaseMenuID uint
 	Type          string `json:"type" gorm:"comment:地址栏携带参数为params还是query"` // 地址栏携带参数为params还是query
-	Key           string `json:"key" gorm:"comment:地址栏携带参数的key"`              // 地址栏携带参数的key
+	Key           string `json:"key" gorm:"comment:地址栏携带参数的key"`            // 地址栏携带参数的key
 	Value         string `json:"value" gorm:"comment:地址栏携带参数的值"`            // 地址栏携带参数的值
 }
 

server/model/system/sys_export_template.go

@@ -8,14 +8,27 @@ import (
 // 导出模板 结构体  SysExportTemplate
 type SysExportTemplate struct {
 	global.GVA_MODEL
-	DBName       string      `json:"dbName" form:"dbName" gorm:"column:db_name;comment:数据库名称;"`               //数据库名称
-	Name         string      `json:"name" form:"name" gorm:"column:name;comment:模板名称;"`                       //模板名称
-	TableName    string      `json:"tableName" form:"tableName" gorm:"column:table_name;comment:表名称;"`        //表名称
-	TemplateID   string      `json:"templateID" form:"templateID" gorm:"column:template_id;comment:模板标识;"`    //模板标识
-	TemplateInfo string      `json:"templateInfo" form:"templateInfo" gorm:"column:template_info;type:text;"` //模板信息
-	Limit        int         `json:"limit" form:"limit" gorm:"column:limit;comment:导出限制"`
-	Order        string      `json:"order" form:"order" gorm:"column:order;comment:排序"`
-	Conditions   []Condition `json:"conditions" form:"conditions" gorm:"foreignKey:TemplateID;references:TemplateID;comment:条件"`
+	DBName       string         `json:"dbName" form:"dbName" gorm:"column:db_name;comment:数据库名称;"`               //数据库名称
+	Name         string         `json:"name" form:"name" gorm:"column:name;comment:模板名称;"`                       //模板名称
+	TableName    string         `json:"tableName" form:"tableName" gorm:"column:table_name;comment:表名称;"`        //表名称
+	TemplateID   string         `json:"templateID" form:"templateID" gorm:"column:template_id;comment:模板标识;"`    //模板标识
+	TemplateInfo string         `json:"templateInfo" form:"templateInfo" gorm:"column:template_info;type:text;"` //模板信息
+	Limit        *int           `json:"limit" form:"limit" gorm:"column:limit;comment:导出限制"`
+	Order        string         `json:"order" form:"order" gorm:"column:order;comment:排序"`
+	Conditions   []Condition    `json:"conditions" form:"conditions" gorm:"foreignKey:TemplateID;references:TemplateID;comment:条件"`
+	JoinTemplate []JoinTemplate `json:"joinTemplate" form:"joinTemplate" gorm:"foreignKey:TemplateID;references:TemplateID;comment:关联"`
+}
+
+type JoinTemplate struct {
+	global.GVA_MODEL
+	TemplateID string `json:"templateID" form:"templateID" gorm:"column:template_id;comment:模板标识"`
+	JOINS      string `json:"joins" form:"joins" gorm:"column:joins;comment:关联"`
+	Table      string `json:"table" form:"table" gorm:"column:table;comment:关联表"`
+	ON         string `json:"on" form:"on" gorm:"column:on;comment:关联条件"`
+}
+
+func (JoinTemplate) TableName() string {
+	return "sys_export_template_join"
 }
 
 type Condition struct {

server/model/system/sys_operation_record.go

@@ -15,7 +15,7 @@ type SysOperationRecord struct {
 	Path         string        `json:"path" form:"path" gorm:"column:path;comment:请求路径"`                             // 请求路径
 	Status       int           `json:"status" form:"status" gorm:"column:status;comment:请求状态"`                       // 请求状态
 	Latency      time.Duration `json:"latency" form:"latency" gorm:"column:latency;comment:延迟" swaggertype:"string"` // 延迟
-	Agent        string        `json:"agent" form:"agent" gorm:"column:agent;comment:代理"`                            // 代理
+	Agent        string        `json:"agent" form:"agent" gorm:"type:text;column:agent;comment:代理"`                  // 代理
 	ErrorMessage string        `json:"error_message" form:"error_message" gorm:"column:error_message;comment:错误信息"`  // 错误信息
 	Body         string        `json:"body" form:"body" gorm:"type:text;column:body;comment:请求Body"`                 // 请求Body
 	Resp         string        `json:"resp" form:"resp" gorm:"type:text;column:resp;comment:响应Body"`                 // 响应Body

server/model/system/sys_params.go

@@ -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"
+}

server/model/system/sys_user.go

@@ -2,27 +2,61 @@ package system
 
 import (
 	"github.com/flipped-aurora/gin-vue-admin/server/global"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/common"
 	"github.com/gofrs/uuid/v5"
 )
 
+type Login interface {
+	GetUsername() string
+	GetNickname() string
+	GetUUID() uuid.UUID
+	GetUserId() uint
+	GetAuthorityId() uint
+	GetUserInfo() any
+}
+
+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:基础颜色"`                                           // 基础颜色
-	ActiveColor string         `json:"activeColor" gorm:"default:#1890ff;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 {
 	return "sys_users"
 }
+
+func (s *SysUser) GetUsername() string {
+	return s.Username
+}
+
+func (s *SysUser) GetNickname() string {
+	return s.NickName
+}
+
+func (s *SysUser) GetUUID() uuid.UUID {
+	return s.UUID
+}
+
+func (s *SysUser) GetUserId() uint {
+	return s.ID
+}
+
+func (s *SysUser) GetAuthorityId() uint {
+	return s.AuthorityId
+}
+
+func (s *SysUser) GetUserInfo() any {
+	return *s
+}

server/packfile/notUsePackFile.go

@@ -1,4 +0,0 @@
-//go:build !packfile
-// +build !packfile
-
-package packfile

server/packfile/usePackFile.go

@@ -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)
-		}
-	}
-}

server/plugin/announcement/api/enter.go

@@ -0,0 +1,10 @@
+package api
+
+import "github.com/flipped-aurora/gin-vue-admin/server/plugin/announcement/service"
+
+var (
+	Api         = new(api)
+	serviceInfo = service.Service.Info
+)
+
+type api struct{ Info info }

server/plugin/announcement/api/info.go

@@ -0,0 +1,183 @@
+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/announcement/model"
+	"github.com/flipped-aurora/gin-vue-admin/server/plugin/announcement/model/request"
+	"github.com/gin-gonic/gin"
+	"go.uber.org/zap"
+)
+
+var Info = new(info)
+
+type info struct{}
+
+// CreateInfo 创建公告
+// @Tags Info
+// @Summary 创建公告
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body model.Info true "创建公告"
+// @Success 200 {object} response.Response{msg=string} "创建成功"
+// @Router /info/createInfo [post]
+func (a *info) CreateInfo(c *gin.Context) {
+	var info model.Info
+	err := c.ShouldBindJSON(&info)
+	if err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	err = serviceInfo.CreateInfo(&info)
+	if err != nil {
+		global.GVA_LOG.Error("创建失败!", zap.Error(err))
+		response.FailWithMessage("创建失败", c)
+		return
+	}
+	response.OkWithMessage("创建成功", c)
+}
+
+// DeleteInfo 删除公告
+// @Tags Info
+// @Summary 删除公告
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body model.Info true "删除公告"
+// @Success 200 {object} response.Response{msg=string} "删除成功"
+// @Router /info/deleteInfo [delete]
+func (a *info) DeleteInfo(c *gin.Context) {
+	ID := c.Query("ID")
+	err := serviceInfo.DeleteInfo(ID)
+	if err != nil {
+		global.GVA_LOG.Error("删除失败!", zap.Error(err))
+		response.FailWithMessage("删除失败", c)
+		return
+	}
+	response.OkWithMessage("删除成功", c)
+}
+
+// DeleteInfoByIds 批量删除公告
+// @Tags Info
+// @Summary 批量删除公告
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Success 200 {object} response.Response{msg=string} "批量删除成功"
+// @Router /info/deleteInfoByIds [delete]
+func (a *info) DeleteInfoByIds(c *gin.Context) {
+	IDs := c.QueryArray("IDs[]")
+	if err := serviceInfo.DeleteInfoByIds(IDs); err != nil {
+		global.GVA_LOG.Error("批量删除失败!", zap.Error(err))
+		response.FailWithMessage("批量删除失败", c)
+		return
+	}
+	response.OkWithMessage("批量删除成功", c)
+}
+
+// UpdateInfo 更新公告
+// @Tags Info
+// @Summary 更新公告
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body model.Info true "更新公告"
+// @Success 200 {object} response.Response{msg=string} "更新成功"
+// @Router /info/updateInfo [put]
+func (a *info) UpdateInfo(c *gin.Context) {
+	var info model.Info
+	err := c.ShouldBindJSON(&info)
+	if err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	err = serviceInfo.UpdateInfo(info)
+	if err != nil {
+		global.GVA_LOG.Error("更新失败!", zap.Error(err))
+		response.FailWithMessage("更新失败", c)
+		return
+	}
+	response.OkWithMessage("更新成功", c)
+}
+
+// FindInfo 用id查询公告
+// @Tags Info
+// @Summary 用id查询公告
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data query model.Info true "用id查询公告"
+// @Success 200 {object} response.Response{data=model.Info,msg=string} "查询成功"
+// @Router /info/findInfo [get]
+func (a *info) FindInfo(c *gin.Context) {
+	ID := c.Query("ID")
+	reinfo, err := serviceInfo.GetInfo(ID)
+	if err != nil {
+		global.GVA_LOG.Error("查询失败!", zap.Error(err))
+		response.FailWithMessage("查询失败", c)
+		return
+	}
+	response.OkWithData(reinfo, c)
+}
+
+// GetInfoList 分页获取公告列表
+// @Tags Info
+// @Summary 分页获取公告列表
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data query request.InfoSearch true "分页获取公告列表"
+// @Success 200 {object} response.Response{data=response.PageResult,msg=string} "获取成功"
+// @Router /info/getInfoList [get]
+func (a *info) GetInfoList(c *gin.Context) {
+	var pageInfo request.InfoSearch
+	err := c.ShouldBindQuery(&pageInfo)
+	if err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	list, total, err := serviceInfo.GetInfoInfoList(pageInfo)
+	if err != nil {
+		global.GVA_LOG.Error("获取失败!", zap.Error(err))
+		response.FailWithMessage("获取失败", c)
+		return
+	}
+	response.OkWithDetailed(response.PageResult{
+		List:     list,
+		Total:    total,
+		Page:     pageInfo.Page,
+		PageSize: pageInfo.PageSize,
+	}, "获取成功", c)
+}
+
+// GetInfoDataSource 获取Info的数据源
+// @Tags Info
+// @Summary 获取Info的数据源
+// @accept application/json
+// @Produce application/json
+// @Success 200 {object} response.Response{data=object,msg=string} "查询成功"
+// @Router /info/getInfoDataSource [get]
+func (a *info) GetInfoDataSource(c *gin.Context) {
+	// 此接口为获取数据源定义的数据
+	dataSource, err := serviceInfo.GetInfoDataSource()
+	if err != nil {
+		global.GVA_LOG.Error("查询失败!", zap.Error(err))
+		response.FailWithMessage("查询失败", c)
+		return
+	}
+	response.OkWithData(dataSource, c)
+}
+
+// GetInfoPublic 不需要鉴权的公告接口
+// @Tags Info
+// @Summary 不需要鉴权的公告接口
+// @accept application/json
+// @Produce application/json
+// @Param data query request.InfoSearch true "分页获取公告列表"
+// @Success 200 {object} response.Response{data=object,msg=string} "获取成功"
+// @Router /info/getInfoPublic [get]
+func (a *info) GetInfoPublic(c *gin.Context) {
+	// 此接口不需要鉴权 示例为返回了一个固定的消息接口，一般本接口用于C端服务，需要自己实现业务逻辑
+	response.OkWithDetailed(gin.H{"info": "不需要鉴权的公告接口信息"}, "获取成功", c)
+}

server/plugin/announcement/config/config.go

@@ -0,0 +1,4 @@
+package config
+
+type Config struct {
+}

server/plugin/announcement/gen/gen.go

@@ -0,0 +1,17 @@
+package main
+
+import (
+	"gorm.io/gen"
+	"path/filepath" //go:generate go mod tidy
+	//go:generate go mod download
+	//go:generate go run gen.go
+	"github.com/flipped-aurora/gin-vue-admin/server/plugin/announcement/model"
+)
+
+func main() {
+	g := gen.NewGenerator(gen.Config{OutPath: filepath.Join("..", "..", "..", "announcement", "blender", "model", "dao"), Mode: gen.WithoutContext | gen.WithDefaultQuery | gen.WithQueryInterface})
+	g.ApplyBasic(
+		new(model.Info),
+	)
+	g.Execute()
+}

server/plugin/announcement/initialize/api.go

@@ -0,0 +1,49 @@
+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"
+)
+
+func Api(ctx context.Context) {
+	entities := []model.SysApi{
+		{
+			Path:        "/info/createInfo",
+			Description: "新建公告",
+			ApiGroup:    "公告",
+			Method:      "POST",
+		},
+		{
+			Path:        "/info/deleteInfo",
+			Description: "删除公告",
+			ApiGroup:    "公告",
+			Method:      "DELETE",
+		},
+		{
+			Path:        "/info/deleteInfoByIds",
+			Description: "批量删除公告",
+			ApiGroup:    "公告",
+			Method:      "DELETE",
+		},
+		{
+			Path:        "/info/updateInfo",
+			Description: "更新公告",
+			ApiGroup:    "公告",
+			Method:      "PUT",
+		},
+		{
+			Path:        "/info/findInfo",
+			Description: "根据ID获取公告",
+			ApiGroup:    "公告",
+			Method:      "GET",
+		},
+		{
+			Path:        "/info/getInfoList",
+			Description: "获取公告列表",
+			ApiGroup:    "公告",
+			Method:      "GET",
+		},
+	}
+	utils.RegisterApis(entities...)
+}