Update go.mod

路由组件错误请狂下的排错处理
锁定关键信息ID
2026-09-25 05:50:19 +00:00 · 2023-10-11 11:29:07 +08:00 · 2022-02-14 15:01:49 +08:00 · 2022-02-14 15:00:46 +08:00 · 2022-02-14 15:00:45 +08:00 · 2022-02-14 15:00:44 +08:00
85 changed files with 6051 additions and 1088 deletions
@@ -19,6 +19,8 @@
 [插件仓库以及开发规范](https://github.com/flipped-aurora/gva-plugins):https://github.com/flipped-aurora/gva-plugins

 [审批流分支](https://github.com/flipped-aurora/gin-vue-admin/tree/gva_workflow): https://github.com/flipped-aurora/gin-vue-admin/tree/gva_workflow
+						       
+[setup语法糖版本地址](https://github.com/flipped-aurora/gin-vue-admin/tree/gva-vue3-setup): https://github.com/flipped-aurora/gin-vue-admin/tree/gva-vue3-setup

 # 项目文档
 [在线文档](https://www.gin-vue-admin.com) : https://www.gin-vue-admin.com
@@ -21,7 +21,7 @@ var autoCodeExampleService = service.ServiceGroupApp.AutoCodeServiceGroup.AutoCo
 // @accept application/json
 // @Produce application/json
 // @Param data body autocode.AutoCodeExample true "AutoCodeExample模型"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"创建成功"}"
+// @Success 200 {object} response.Response{msg=string} "创建AutoCodeExample"
 // @Router /autoCodeExample/createAutoCodeExample [post]
 func (autoCodeExampleApi *AutoCodeExampleApi) CreateAutoCodeExample(c *gin.Context) {
 	var autoCodeExample autocode.AutoCodeExample
@@ -40,7 +40,7 @@ func (autoCodeExampleApi *AutoCodeExampleApi) CreateAutoCodeExample(c *gin.Conte
 // @accept application/json
 // @Produce application/json
 // @Param data body autocode.AutoCodeExample true "AutoCodeExample模型"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}"
+// @Success 200 {object} response.Response{msg=string} "删除AutoCodeExample"
 // @Router /autoCodeExample/deleteAutoCodeExample [delete]
 func (autoCodeExampleApi *AutoCodeExampleApi) DeleteAutoCodeExample(c *gin.Context) {
 	var autoCodeExample autocode.AutoCodeExample
@@ -59,7 +59,7 @@ func (autoCodeExampleApi *AutoCodeExampleApi) DeleteAutoCodeExample(c *gin.Conte
 // @accept application/json
 // @Produce application/json
 // @Param data body autocode.AutoCodeExample true "更新AutoCodeExample"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"更新成功"}"
+// @Success 200 {object} response.Response{msg=string} "更新AutoCodeExample"
 // @Router /autoCodeExample/updateAutoCodeExample [put]
 func (autoCodeExampleApi *AutoCodeExampleApi) UpdateAutoCodeExample(c *gin.Context) {
 	var autoCodeExample autocode.AutoCodeExample
@@ -78,7 +78,7 @@ func (autoCodeExampleApi *AutoCodeExampleApi) UpdateAutoCodeExample(c *gin.Conte
 // @accept application/json
 // @Produce application/json
 // @Param data query autocode.AutoCodeExample true "用id查询AutoCodeExample"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}"
+// @Success 200 {object} response.Response{data=map[string]interface{},msg=string} "用id查询AutoCodeExample"
 // @Router /autoCodeExample/findAutoCodeExample [get]
 func (autoCodeExampleApi *AutoCodeExampleApi) FindAutoCodeExample(c *gin.Context) {
 	var autoCodeExample autocode.AutoCodeExample
@@ -101,7 +101,7 @@ func (autoCodeExampleApi *AutoCodeExampleApi) FindAutoCodeExample(c *gin.Context
 // @accept application/json
 // @Produce application/json
 // @Param data query autocodeReq.AutoCodeExampleSearch true "页码, 每页大小, 搜索条件"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
+// @Success 200 {object} response.Response{data=response.PageResult,msg=string} "分页获取AutoCodeExample列表,返回包括列表,总数,页码,每页数量"
 // @Router /autoCodeExample/getAutoCodeExampleList [get]
 func (autoCodeExampleApi *AutoCodeExampleApi) GetAutoCodeExampleList(c *gin.Context) {
 	var pageInfo autocodeReq.AutoCodeExampleSearch
@@ -6,6 +6,8 @@ import (
 	"mime/multipart"
 	"strconv"

+	"github.com/flipped-aurora/gin-vue-admin/server/model/example"
+
 	"github.com/flipped-aurora/gin-vue-admin/server/global"
 	"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
 	exampleRes "github.com/flipped-aurora/gin-vue-admin/server/model/example/response"
@@ -20,7 +22,7 @@ import (
 // @accept multipart/form-data
 // @Produce  application/json
 // @Param file formData file true "an example for breakpoint resume, 断点续传示例"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"切片创建成功"}"
+// @Success 200 {object} response.Response{msg=string} "断点续传到服务器"
 // @Router /fileUploadAndDownload/breakpointContinue [post]
 func (u *FileUploadAndDownloadApi) BreakpointContinue(c *gin.Context) {
 	fileMd5 := c.Request.FormValue("fileMd5")
@@ -79,7 +81,7 @@ func (u *FileUploadAndDownloadApi) BreakpointContinue(c *gin.Context) {
 // @accept multipart/form-data
 // @Produce  application/json
 // @Param file formData file true "Find the file, 查找文件"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"查找成功"}"
+// @Success 200 {object} response.Response{data=exampleRes.FileResponse,msg=string} "查找文件,返回包括文件详情"
 // @Router /fileUploadAndDownload/findFile [post]
 func (u *FileUploadAndDownloadApi) FindFile(c *gin.Context) {
 	fileMd5 := c.Query("fileMd5")
@@ -100,7 +102,7 @@ func (u *FileUploadAndDownloadApi) FindFile(c *gin.Context) {
 // @accept multipart/form-data
 // @Produce  application/json
 // @Param file formData file true "上传文件完成"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"file uploaded, 文件创建成功"}"
+// @Success 200 {object} response.Response{data=exampleRes.FilePathResponse,msg=string} "创建文件,返回包括文件路径"
 // @Router /fileUploadAndDownload/findFile [post]
 func (b *FileUploadAndDownloadApi) BreakpointContinueFinish(c *gin.Context) {
 	fileMd5 := c.Query("fileMd5")
@@ -120,21 +122,21 @@ func (b *FileUploadAndDownloadApi) BreakpointContinueFinish(c *gin.Context) {
 // @accept multipart/form-data
 // @Produce  application/json
 // @Param file formData file true "删除缓存切片"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"缓存切片删除成功"}"
+// @Success 200 {object} response.Response{msg=string} "删除切片"
 // @Router /fileUploadAndDownload/removeChunk [post]
 func (u *FileUploadAndDownloadApi) RemoveChunk(c *gin.Context) {
-	fileMd5 := c.Query("fileMd5")
-	fileName := c.Query("fileName")
-	filePath := c.Query("filePath")
-	err := utils.RemoveChunk(fileMd5)
-	if err != nil {
-		return
-	}
-	err = fileUploadAndDownloadService.DeleteFileChunk(fileMd5, fileName, filePath)
+	var file example.ExaFile
+	c.ShouldBindJSON(&file)
+	err := utils.RemoveChunk(file.FileMd5)
 	if err != nil {
 		global.GVA_LOG.Error("缓存切片删除失败!", zap.Error(err))
-		response.FailWithDetailed(exampleRes.FilePathResponse{FilePath: filePath}, "缓存切片删除失败", c)
+		return
+	}
+	err = fileUploadAndDownloadService.DeleteFileChunk(file.FileMd5, file.FileName, file.FilePath)
+	if err != nil {
+		global.GVA_LOG.Error(err.Error(), zap.Error(err))
+		response.FailWithMessage(err.Error(), c)
 	} else {
-		response.OkWithDetailed(exampleRes.FilePathResponse{FilePath: filePath}, "缓存切片删除成功", c)
+		response.OkWithMessage("缓存切片删除成功", c)
 	}
 }
@@ -19,7 +19,7 @@ type CustomerApi struct{}
 // @accept application/json
 // @Produce application/json
 // @Param data body example.ExaCustomer true "客户用户名, 客户手机号码"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"创建成功"}"
+// @Success 200 {object} response.Response{msg=string} "创建客户"
 // @Router /customer/customer [post]
 func (e *CustomerApi) CreateExaCustomer(c *gin.Context) {
 	var customer example.ExaCustomer
@@ -44,7 +44,7 @@ func (e *CustomerApi) CreateExaCustomer(c *gin.Context) {
 // @accept application/json
 // @Produce application/json
 // @Param data body example.ExaCustomer true "客户ID"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}"
+// @Success 200 {object} response.Response{msg=string} "删除客户"
 // @Router /customer/customer [delete]
 func (e *CustomerApi) DeleteExaCustomer(c *gin.Context) {
 	var customer example.ExaCustomer
@@ -67,7 +67,7 @@ func (e *CustomerApi) DeleteExaCustomer(c *gin.Context) {
 // @accept application/json
 // @Produce application/json
 // @Param data body example.ExaCustomer true "客户ID, 客户信息"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"更新成功"}"
+// @Success 200 {object} response.Response{msg=string} "更新客户信息"
 // @Router /customer/customer [put]
 func (e *CustomerApi) UpdateExaCustomer(c *gin.Context) {
 	var customer example.ExaCustomer
@@ -94,7 +94,7 @@ func (e *CustomerApi) UpdateExaCustomer(c *gin.Context) {
 // @accept application/json
 // @Produce application/json
 // @Param data query example.ExaCustomer true "客户ID"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
+// @Success 200 {object} response.Response{data=exampleRes.ExaCustomerResponse,msg=string} "获取单一客户信息,返回包括客户详情"
 // @Router /customer/customer [get]
 func (e *CustomerApi) GetExaCustomer(c *gin.Context) {
 	var customer example.ExaCustomer
@@ -118,7 +118,7 @@ func (e *CustomerApi) GetExaCustomer(c *gin.Context) {
 // @accept application/json
 // @Produce application/json
 // @Param data query request.PageInfo true "页码, 每页大小"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
+// @Success 200 {object} response.Response{data=response.PageResult,msg=string} "分页获取权限客户列表,返回包括列表,总数,页码,每页数量"
 // @Router /customer/customerList [get]
 func (e *CustomerApi) GetExaCustomerList(c *gin.Context) {
 	var pageInfo request.PageInfo
@@ -44,7 +44,7 @@ func (e *ExcelApi) ExportExcel(c *gin.Context) {
 // @accept multipart/form-data
 // @Produce  application/json
 // @Param file formData file true "导入Excel文件"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"导入成功"}"
+// @Success 200 {object} response.Response{msg=string} "导入Excel文件"
 // @Router /excel/importExcel [post]
 func (e *ExcelApi) ImportExcel(c *gin.Context) {
 	_, header, err := c.Request.FormFile("file")
@@ -61,7 +61,7 @@ func (e *ExcelApi) ImportExcel(c *gin.Context) {
 // @Summary 加载Excel数据
 // @Security ApiKeyAuth
 // @Produce  application/json
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"加载数据成功"}"
+// @Success 200 {object} response.Response{data=response.PageResult,msg=string} "加载Excel数据,返回包括列表,总数,页码,每页数量"
 // @Router /excel/loadExcel [get]
 func (e *ExcelApi) LoadExcel(c *gin.Context) {
 	menus, err := excelService.ParseExcel2InfoList()
@@ -18,7 +18,7 @@ type FileUploadAndDownloadApi struct{}
 // @accept multipart/form-data
 // @Produce  application/json
 // @Param file formData file true "上传文件示例"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"上传成功"}"
+// @Success 200 {object} response.Response{data=exampleRes.ExaFileResponse,msg=string} "上传文件示例,返回包括文件详情"
 // @Router /fileUploadAndDownload/upload [post]
 func (u *FileUploadAndDownloadApi) UploadFile(c *gin.Context) {
 	var file example.ExaFileUploadAndDownload
@@ -43,7 +43,7 @@ func (u *FileUploadAndDownloadApi) UploadFile(c *gin.Context) {
 // @Security ApiKeyAuth
 // @Produce  application/json
 // @Param data body example.ExaFileUploadAndDownload true "传入文件里面id即可"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}"
+// @Success 200 {object} response.Response{msg=string} "删除文件"
 // @Router /fileUploadAndDownload/deleteFile [post]
 func (u *FileUploadAndDownloadApi) DeleteFile(c *gin.Context) {
 	var file example.ExaFileUploadAndDownload
@@ -62,7 +62,7 @@ func (u *FileUploadAndDownloadApi) DeleteFile(c *gin.Context) {
 // @accept application/json
 // @Produce application/json
 // @Param data body request.PageInfo true "页码, 每页大小"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
+// @Success 200 {object} response.Response{data=response.PageResult,msg=string} "分页文件列表,返回包括列表,总数,页码,每页数量"
 // @Router /fileUploadAndDownload/getFileList [post]
 func (u *FileUploadAndDownloadApi) GetFileList(c *gin.Context) {
 	var pageInfo request.PageInfo
@@ -21,7 +21,7 @@ type SystemApiApi struct{}
 // @accept application/json
 // @Produce application/json
 // @Param data body system.SysApi true "api路径, api中文描述, api组, 方法"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"创建成功"}"
+// @Success 200 {object} response.Response{msg=string} "创建基础api"
 // @Router /api/createApi [post]
 func (s *SystemApiApi) CreateApi(c *gin.Context) {
 	var api system.SysApi
@@ -44,7 +44,7 @@ func (s *SystemApiApi) CreateApi(c *gin.Context) {
 // @accept application/json
 // @Produce application/json
 // @Param data body system.SysApi true "ID"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}"
+// @Success 200 {object} response.Response{msg=string} "删除api"
 // @Router /api/deleteApi [post]
 func (s *SystemApiApi) DeleteApi(c *gin.Context) {
 	var api system.SysApi
@@ -67,7 +67,7 @@ func (s *SystemApiApi) DeleteApi(c *gin.Context) {
 // @accept application/json
 // @Produce application/json
 // @Param data body systemReq.SearchApiParams true "分页获取API列表"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
+// @Success 200 {object} response.Response{data=response.PageResult,msg=string} "分页获取API列表,返回包括列表,总数,页码,每页数量"
 // @Router /api/getApiList [post]
 func (s *SystemApiApi) GetApiList(c *gin.Context) {
 	var pageInfo systemReq.SearchApiParams
@@ -89,13 +89,14 @@ func (s *SystemApiApi) GetApiList(c *gin.Context) {
 	}
 }

+// todo
 // @Tags SysApi
 // @Summary 根据id获取api
 // @Security ApiKeyAuth
 // @accept application/json
 // @Produce application/json
 // @Param data body request.GetById true "根据id获取api"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
+// @Success 200 {object} response.Response{data=systemRes.SysAPIResponse} "根据id获取api,返回包括api详情"
 // @Router /api/getApiById [post]
 func (s *SystemApiApi) GetApiById(c *gin.Context) {
 	var idInfo request.GetById
@@ -114,12 +115,12 @@ func (s *SystemApiApi) GetApiById(c *gin.Context) {
 }

 // @Tags SysApi
-// @Summary 创建基础api
+// @Summary 修改基础api
 // @Security ApiKeyAuth
 // @accept application/json
 // @Produce application/json
 // @Param data body system.SysApi true "api路径, api中文描述, api组, 方法"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"修改成功"}"
+// @Success 200 {object} response.Response{msg=string} "修改基础api"
 // @Router /api/updateApi [post]
 func (s *SystemApiApi) UpdateApi(c *gin.Context) {
 	var api system.SysApi
@@ -141,7 +142,7 @@ func (s *SystemApiApi) UpdateApi(c *gin.Context) {
 // @Security ApiKeyAuth
 // @accept application/json
 // @Produce application/json
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
+// @Success 200 {object} response.Response{data=systemRes.SysAPIListResponse,msg=string} "获取所有的Api 不分页,返回包括api列表"
 // @Router /api/getAllApis [post]
 func (s *SystemApiApi) GetAllApis(c *gin.Context) {
 	if err, apis := apiService.GetAllApis(); err != nil {
@@ -158,7 +159,7 @@ func (s *SystemApiApi) GetAllApis(c *gin.Context) {
 // @accept application/json
 // @Produce application/json
 // @Param data body request.IdsReq true "ID"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}"
+// @Success 200 {object} response.Response{msg=string} "删除选中Api"
 // @Router /api/deleteApisByIds [delete]
 func (s *SystemApiApi) DeleteApisByIds(c *gin.Context) {
 	var ids request.IdsReq
@@ -21,7 +21,7 @@ type AuthorityApi struct{}
 // @accept application/json
 // @Produce application/json
 // @Param data body system.SysAuthority true "权限id, 权限名, 父角色id"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"创建成功"}"
+// @Success 200 {object} response.Response{data=systemRes.SysAuthorityResponse,msg=string} "创建角色,返回包括系统角色详情"
 // @Router /authority/createAuthority [post]
 func (a *AuthorityApi) CreateAuthority(c *gin.Context) {
 	var authority system.SysAuthority
@@ -46,7 +46,7 @@ func (a *AuthorityApi) CreateAuthority(c *gin.Context) {
 // @accept application/json
 // @Produce application/json
 // @Param data body response.SysAuthorityCopyResponse true "旧角色id, 新权限id, 新权限名, 新父角色id"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"拷贝成功"}"
+// @Success 200 {object} response.Response{data=systemRes.SysAuthorityResponse,msg=string} "拷贝角色,返回包括系统角色详情"
 // @Router /authority/copyAuthority [post]
 func (a *AuthorityApi) CopyAuthority(c *gin.Context) {
 	var copyInfo systemRes.SysAuthorityCopyResponse
@@ -73,7 +73,7 @@ func (a *AuthorityApi) CopyAuthority(c *gin.Context) {
 // @accept application/json
 // @Produce application/json
 // @Param data body system.SysAuthority true "删除角色"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}"
+// @Success 200 {object} response.Response{msg=string} "删除角色"
 // @Router /authority/deleteAuthority [post]
 func (a *AuthorityApi) DeleteAuthority(c *gin.Context) {
 	var authority system.SysAuthority
@@ -96,7 +96,7 @@ func (a *AuthorityApi) DeleteAuthority(c *gin.Context) {
 // @accept application/json
 // @Produce application/json
 // @Param data body system.SysAuthority true "权限id, 权限名, 父角色id"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"更新成功"}"
+// @Success 200 {object} response.Response{data=systemRes.SysAuthorityResponse,msg=string} "更新角色信息,返回包括系统角色详情"
 // @Router /authority/updateAuthority [post]
 func (a *AuthorityApi) UpdateAuthority(c *gin.Context) {
 	var auth system.SysAuthority
@@ -119,7 +119,7 @@ func (a *AuthorityApi) UpdateAuthority(c *gin.Context) {
 // @accept application/json
 // @Produce application/json
 // @Param data body request.PageInfo true "页码, 每页大小"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
+// @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
@@ -147,7 +147,7 @@ func (a *AuthorityApi) GetAuthorityList(c *gin.Context) {
 // @accept application/json
 // @Produce application/json
 // @Param data body system.SysAuthority true "设置角色资源权限"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"设置成功"}"
+// @Success 200 {object} response.Response{msg=string} "设置角色资源权限"
 // @Router /authority/setDataAuthority [post]
 func (a *AuthorityApi) SetDataAuthority(c *gin.Context) {
 	var auth system.SysAuthority
@@ -24,7 +24,7 @@ type AutoCodeApi struct{}
 // @accept application/json
 // @Produce application/json
 // @Param data body system.AutoCodeStruct true "预览创建代码"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"创建成功"}"
+// @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
@@ -94,7 +94,7 @@ func (autoApi *AutoCodeApi) CreateTemp(c *gin.Context) {
 // @Security ApiKeyAuth
 // @accept application/json
 // @Produce application/json
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
+// @Success 200 {object} response.Response{data=map[string]interface{},msg=string} "获取当前所有数据库"
 // @Router /autoCode/getDatabase [get]
 func (autoApi *AutoCodeApi) GetDB(c *gin.Context) {
 	dbs, err := autoCodeService.Database().GetDB()
@@ -111,7 +111,7 @@ func (autoApi *AutoCodeApi) GetDB(c *gin.Context) {
 // @Security ApiKeyAuth
 // @accept application/json
 // @Produce application/json
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
+// @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)
@@ -130,7 +130,7 @@ func (autoApi *AutoCodeApi) GetTables(c *gin.Context) {
 // @Security ApiKeyAuth
 // @accept application/json
 // @Produce application/json
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
+// @Success 200 {object} response.Response{data=map[string]interface{},msg=string} "获取当前表所有字段"
 // @Router /autoCode/getColumn [get]
 func (autoApi *AutoCodeApi) GetColumn(c *gin.Context) {
 	dbName := c.DefaultQuery("dbName", global.GVA_CONFIG.Mysql.Dbname)
@@ -18,7 +18,7 @@ type AutoCodeHistoryApi struct{}
 // @accept application/json
 // @Produce application/json
 // @Param data body request.GetById true "请求参数"
-// @Success 200 {object} response.Response{} "获取成功!"
+// @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
@@ -38,7 +38,7 @@ func (a *AutoCodeHistoryApi) First(c *gin.Context) {
 // @accept application/json
 // @Produce application/json
 // @Param data body request.GetById true "请求参数"
-// @Success 200 {object} response.Response{} "删除成功!"
+// @Success 200 {object} response.Response{msg=string} "删除回滚记录"
 // @Router /autoCode/delSysHistory [post]
 func (a *AutoCodeHistoryApi) Delete(c *gin.Context) {
 	var info request.GetById
@@ -59,7 +59,7 @@ func (a *AutoCodeHistoryApi) Delete(c *gin.Context) {
 // @accept application/json
 // @Produce application/json
 // @Param data body request.GetById true "请求参数"
-// @Success 200 {object} response.Response{} "回滚成功!"
+// @Success 200 {object} response.Response{msg=string} "回滚自动生成代码"
 // @Router /autoCode/rollback [post]
 func (a *AutoCodeHistoryApi) RollBack(c *gin.Context) {
 	var info request.GetById
@@ -78,7 +78,7 @@ func (a *AutoCodeHistoryApi) RollBack(c *gin.Context) {
 // @accept application/json
 // @Produce application/json
 // @Param data body systemReq.SysAutoHistory true "请求参数"
-// @Success 200 {object} response.Response{} "获取成功!"
+// @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
@@ -15,12 +15,13 @@ var store = base64Captcha.DefaultMemStore

 type BaseApi struct{}

+// Captcha
 // @Tags Base
 // @Summary 生成验证码
 // @Security ApiKeyAuth
 // @accept application/json
 // @Produce application/json
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"验证码获取成功"}"
+// @Success 200 {object} response.Response{data=systemRes.SysCaptchaResponse,msg=string} "生成验证码,返回包括随机数id,base64,验证码长度"
 // @Router /base/captcha [post]
 func (b *BaseApi) Captcha(c *gin.Context) {
 	// 字符,公式,验证码配置
@@ -18,7 +18,7 @@ type CasbinApi struct{}
 // @accept application/json
 // @Produce application/json
 // @Param data body request.CasbinInReceive true "权限id, 权限模型列表"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"更新成功"}"
+// @Success 200 {object} response.Response{msg=string} "更新角色api权限"
 // @Router /casbin/UpdateCasbin [post]
 func (cas *CasbinApi) UpdateCasbin(c *gin.Context) {
 	var cmr request.CasbinInReceive
@@ -41,7 +41,7 @@ func (cas *CasbinApi) UpdateCasbin(c *gin.Context) {
 // @accept application/json
 // @Produce application/json
 // @Param data body request.CasbinInReceive true "权限id, 权限模型列表"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
+// @Success 200 {object} response.Response{data=systemRes.PolicyPathResponse,msg=string} "获取权限列表,返回包括casbin详情列表"
 // @Router /casbin/getPolicyPathByAuthorityId [post]
 func (cas *CasbinApi) GetPolicyPathByAuthorityId(c *gin.Context) {
 	var casbin request.CasbinInReceive
@@ -18,7 +18,7 @@ type DictionaryApi struct{}
 // @accept application/json
 // @Produce application/json
 // @Param data body system.SysDictionary true "SysDictionary模型"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"创建成功"}"
+// @Success 200 {object} response.Response{msg=string} "创建SysDictionary"
 // @Router /sysDictionary/createSysDictionary [post]
 func (s *DictionaryApi) CreateSysDictionary(c *gin.Context) {
 	var dictionary system.SysDictionary
@@ -37,7 +37,7 @@ func (s *DictionaryApi) CreateSysDictionary(c *gin.Context) {
 // @accept application/json
 // @Produce application/json
 // @Param data body system.SysDictionary true "SysDictionary模型"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}"
+// @Success 200 {object} response.Response{msg=string} "删除SysDictionary"
 // @Router /sysDictionary/deleteSysDictionary [delete]
 func (s *DictionaryApi) DeleteSysDictionary(c *gin.Context) {
 	var dictionary system.SysDictionary
@@ -56,7 +56,7 @@ func (s *DictionaryApi) DeleteSysDictionary(c *gin.Context) {
 // @accept application/json
 // @Produce application/json
 // @Param data body system.SysDictionary true "SysDictionary模型"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"更新成功"}"
+// @Success 200 {object} response.Response{msg=string} "更新SysDictionary"
 // @Router /sysDictionary/updateSysDictionary [put]
 func (s *DictionaryApi) UpdateSysDictionary(c *gin.Context) {
 	var dictionary system.SysDictionary
@@ -75,7 +75,7 @@ func (s *DictionaryApi) UpdateSysDictionary(c *gin.Context) {
 // @accept application/json
 // @Produce application/json
 // @Param data query system.SysDictionary true "ID或字典英名"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}"
+// @Success 200 {object} response.Response{data=map[string]interface{},msg=string} "用id查询SysDictionary"
 // @Router /sysDictionary/findSysDictionary [get]
 func (s *DictionaryApi) FindSysDictionary(c *gin.Context) {
 	var dictionary system.SysDictionary
@@ -94,7 +94,7 @@ func (s *DictionaryApi) FindSysDictionary(c *gin.Context) {
 // @accept application/json
 // @Produce application/json
 // @Param data query request.SysDictionarySearch true "页码, 每页大小, 搜索条件"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
+// @Success 200 {object} response.Response{data=response.PageResult,msg=string} "分页获取SysDictionary列表,返回包括列表,总数,页码,每页数量"
 // @Router /sysDictionary/getSysDictionaryList [get]
 func (s *DictionaryApi) GetSysDictionaryList(c *gin.Context) {
 	var pageInfo request.SysDictionarySearch
@@ -18,7 +18,7 @@ type DictionaryDetailApi struct{}
 // @accept application/json
 // @Produce application/json
 // @Param data body system.SysDictionaryDetail true "SysDictionaryDetail模型"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"创建成功"}"
+// @Success 200 {object} response.Response{msg=string} "创建SysDictionaryDetail"
 // @Router /sysDictionaryDetail/createSysDictionaryDetail [post]
 func (s *DictionaryDetailApi) CreateSysDictionaryDetail(c *gin.Context) {
 	var detail system.SysDictionaryDetail
@@ -37,7 +37,7 @@ func (s *DictionaryDetailApi) CreateSysDictionaryDetail(c *gin.Context) {
 // @accept application/json
 // @Produce application/json
 // @Param data body system.SysDictionaryDetail true "SysDictionaryDetail模型"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}"
+// @Success 200 {object} response.Response{msg=string} "删除SysDictionaryDetail"
 // @Router /sysDictionaryDetail/deleteSysDictionaryDetail [delete]
 func (s *DictionaryDetailApi) DeleteSysDictionaryDetail(c *gin.Context) {
 	var detail system.SysDictionaryDetail
@@ -56,7 +56,7 @@ func (s *DictionaryDetailApi) DeleteSysDictionaryDetail(c *gin.Context) {
 // @accept application/json
 // @Produce application/json
 // @Param data body system.SysDictionaryDetail true "更新SysDictionaryDetail"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"更新成功"}"
+// @Success 200 {object} response.Response{msg=string} "更新SysDictionaryDetail"
 // @Router /sysDictionaryDetail/updateSysDictionaryDetail [put]
 func (s *DictionaryDetailApi) UpdateSysDictionaryDetail(c *gin.Context) {
 	var detail system.SysDictionaryDetail
@@ -75,7 +75,7 @@ func (s *DictionaryDetailApi) UpdateSysDictionaryDetail(c *gin.Context) {
 // @accept application/json
 // @Produce application/json
 // @Param data query system.SysDictionaryDetail true "用id查询SysDictionaryDetail"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}"
+// @Success 200 {object} response.Response{data=map[string]interface{},msg=string} "用id查询SysDictionaryDetail"
 // @Router /sysDictionaryDetail/findSysDictionaryDetail [get]
 func (s *DictionaryDetailApi) FindSysDictionaryDetail(c *gin.Context) {
 	var detail system.SysDictionaryDetail
@@ -98,7 +98,7 @@ func (s *DictionaryDetailApi) FindSysDictionaryDetail(c *gin.Context) {
 // @accept application/json
 // @Produce application/json
 // @Param data query request.SysDictionaryDetailSearch true "页码, 每页大小, 搜索条件"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
+// @Success 200 {object} response.Response{data=response.PageResult,msg=string} "分页获取SysDictionaryDetail列表,返回包括列表,总数,页码,每页数量"
 // @Router /sysDictionaryDetail/getSysDictionaryDetailList [get]
 func (s *DictionaryDetailApi) GetSysDictionaryDetailList(c *gin.Context) {
 	var pageInfo request.SysDictionaryDetailSearch
@@ -16,7 +16,7 @@ type DBApi struct{}
 // @Summary 初始化用户数据库
 // @Produce  application/json
 // @Param data body request.InitDB true "初始化数据库参数"
-// @Success 200 {string} string "{"code":0,"data":{},"msg":"自动创建数据库成功"}"
+// @Success 200 {object} response.Response{data=string} "初始化用户数据库"
 // @Router /init/initdb [post]
 func (i *DBApi) InitDB(c *gin.Context) {
 	if global.GVA_DB != nil {
@@ -42,16 +42,19 @@ func (i *DBApi) InitDB(c *gin.Context) {
 // @Tags CheckDB
 // @Summary 初始化用户数据库
 // @Produce  application/json
-// @Success 200 {string} string "{"code":0,"data":{},"msg":"探测完成"}"
+// @Success 200 {object} response.Response{data=map[string]interface{},msg=string} "初始化用户数据库"
 // @Router /init/checkdb [post]
 func (i *DBApi) CheckDB(c *gin.Context) {
+	var (
+		message  = "前往初始化数据库"
+		needInit = true
+	)
+
 	if global.GVA_DB != nil {
-		global.GVA_LOG.Info("数据库无需初始化")
-		response.OkWithDetailed(gin.H{"needInit": false}, "数据库无需初始化", c)
-		return
-	} else {
-		global.GVA_LOG.Info("前往初始化数据库")
-		response.OkWithDetailed(gin.H{"needInit": true}, "前往初始化数据库", c)
-		return
+		message = "数据库无需初始化"
+		needInit = false
 	}
+	global.GVA_LOG.Info(message)
+	response.OkWithDetailed(gin.H{"needInit": needInit}, message, c)
+	return
 }
@@ -15,7 +15,7 @@ type JwtApi struct{}
 // @Security ApiKeyAuth
 // @accept application/json
 // @Produce application/json
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"拉黑成功"}"
+// @Success 200 {object} response.Response{msg=string} "jwt加入黑名单"
 // @Router /jwt/jsonInBlacklist [post]
 func (j *JwtApi) JsonInBlacklist(c *gin.Context) {
 	token := c.Request.Header.Get("x-token")
@@ -20,7 +20,7 @@ type AuthorityMenuApi struct{}
 // @Security ApiKeyAuth
 // @Produce  application/json
 // @Param data body request.Empty true "空"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
+// @Success 200 {object} response.Response{data=systemRes.SysMenusResponse,msg=string} "获取用户动态路由,返回包括系统菜单详情列表"
 // @Router /menu/getMenu [post]
 func (a *AuthorityMenuApi) GetMenu(c *gin.Context) {
 	if err, menus := menuService.GetMenuTree(utils.GetUserAuthorityId(c)); err != nil {
@@ -39,7 +39,7 @@ func (a *AuthorityMenuApi) GetMenu(c *gin.Context) {
 // @Security ApiKeyAuth
 // @Produce  application/json
 // @Param data body request.Empty true "空"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
+// @Success 200 {object} response.Response{data=systemRes.SysBaseMenusResponse,msg=string} "获取用户动态路由,返回包括系统菜单列表"
 // @Router /menu/getBaseMenuTree [post]
 func (a *AuthorityMenuApi) GetBaseMenuTree(c *gin.Context) {
 	if err, menus := menuService.GetBaseMenuTree(); err != nil {
@@ -56,7 +56,7 @@ func (a *AuthorityMenuApi) GetBaseMenuTree(c *gin.Context) {
 // @accept application/json
 // @Produce application/json
 // @Param data body systemReq.AddMenuAuthorityInfo true "角色ID"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"添加成功"}"
+// @Success 200 {object} response.Response{msg=string} "增加menu和角色关联关系"
 // @Router /menu/addMenuAuthority [post]
 func (a *AuthorityMenuApi) AddMenuAuthority(c *gin.Context) {
 	var authorityMenu systemReq.AddMenuAuthorityInfo
@@ -79,7 +79,7 @@ func (a *AuthorityMenuApi) AddMenuAuthority(c *gin.Context) {
 // @accept application/json
 // @Produce application/json
 // @Param data body request.GetAuthorityId true "角色ID"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
+// @Success 200 {object} response.Response{data=map[string]interface{},msg=string} "获取指定角色menu"
 // @Router /menu/getMenuAuthority [post]
 func (a *AuthorityMenuApi) GetMenuAuthority(c *gin.Context) {
 	var param request.GetAuthorityId
@@ -102,7 +102,7 @@ func (a *AuthorityMenuApi) GetMenuAuthority(c *gin.Context) {
 // @accept application/json
 // @Produce application/json
 // @Param data body system.SysBaseMenu true "路由path, 父菜单ID, 路由name, 对应前端文件路径, 排序标记"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"添加成功"}"
+// @Success 200 {object} response.Response{msg=string} "新增菜单"
 // @Router /menu/addBaseMenu [post]
 func (a *AuthorityMenuApi) AddBaseMenu(c *gin.Context) {
 	var menu system.SysBaseMenu
@@ -130,7 +130,7 @@ func (a *AuthorityMenuApi) AddBaseMenu(c *gin.Context) {
 // @accept application/json
 // @Produce application/json
 // @Param data body request.GetById true "菜单id"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}"
+// @Success 200 {object} response.Response{msg=string} "删除菜单"
 // @Router /menu/deleteBaseMenu [post]
 func (a *AuthorityMenuApi) DeleteBaseMenu(c *gin.Context) {
 	var menu request.GetById
@@ -153,7 +153,7 @@ func (a *AuthorityMenuApi) DeleteBaseMenu(c *gin.Context) {
 // @accept application/json
 // @Produce application/json
 // @Param data body system.SysBaseMenu true "路由path, 父菜单ID, 路由name, 对应前端文件路径, 排序标记"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"更新成功"}"
+// @Success 200 {object} response.Response{msg=string} "更新菜单"
 // @Router /menu/updateBaseMenu [post]
 func (a *AuthorityMenuApi) UpdateBaseMenu(c *gin.Context) {
 	var menu system.SysBaseMenu
@@ -180,7 +180,7 @@ func (a *AuthorityMenuApi) UpdateBaseMenu(c *gin.Context) {
 // @accept application/json
 // @Produce application/json
 // @Param data body request.GetById true "菜单id"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
+// @Success 200 {object} response.Response{data=systemRes.SysBaseMenuResponse,msg=string} "根据id获取菜单,返回包括系统菜单列表"
 // @Router /menu/getBaseMenuById [post]
 func (a *AuthorityMenuApi) GetBaseMenuById(c *gin.Context) {
 	var idInfo request.GetById
@@ -203,7 +203,7 @@ func (a *AuthorityMenuApi) GetBaseMenuById(c *gin.Context) {
 // @accept application/json
 // @Produce application/json
 // @Param data body request.PageInfo true "页码, 每页大小"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
+// @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
@@ -19,7 +19,7 @@ type OperationRecordApi struct{}
 // @accept application/json
 // @Produce application/json
 // @Param data body system.SysOperationRecord true "创建SysOperationRecord"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
+// @Success 200 {object} response.Response{msg=string} "创建SysOperationRecord"
 // @Router /sysOperationRecord/createSysOperationRecord [post]
 func (s *OperationRecordApi) CreateSysOperationRecord(c *gin.Context) {
 	var sysOperationRecord system.SysOperationRecord
@@ -38,7 +38,7 @@ func (s *OperationRecordApi) CreateSysOperationRecord(c *gin.Context) {
 // @accept application/json
 // @Produce application/json
 // @Param data body system.SysOperationRecord true "SysOperationRecord模型"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}"
+// @Success 200 {object} response.Response{msg=string} "删除SysOperationRecord"
 // @Router /sysOperationRecord/deleteSysOperationRecord [delete]
 func (s *OperationRecordApi) DeleteSysOperationRecord(c *gin.Context) {
 	var sysOperationRecord system.SysOperationRecord
@@ -57,7 +57,7 @@ func (s *OperationRecordApi) DeleteSysOperationRecord(c *gin.Context) {
 // @accept application/json
 // @Produce application/json
 // @Param data body request.IdsReq true "批量删除SysOperationRecord"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"批量删除成功"}"
+// @Success 200 {object} response.Response{msg=string} "批量删除SysOperationRecord"
 // @Router /sysOperationRecord/deleteSysOperationRecordByIds [delete]
 func (s *OperationRecordApi) DeleteSysOperationRecordByIds(c *gin.Context) {
 	var IDS request.IdsReq
@@ -76,7 +76,7 @@ func (s *OperationRecordApi) DeleteSysOperationRecordByIds(c *gin.Context) {
 // @accept application/json
 // @Produce application/json
 // @Param data query system.SysOperationRecord true "Id"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}"
+// @Success 200 {object} response.Response{data=map[string]interface{},msg=string} "用id查询SysOperationRecord"
 // @Router /sysOperationRecord/findSysOperationRecord [get]
 func (s *OperationRecordApi) FindSysOperationRecord(c *gin.Context) {
 	var sysOperationRecord system.SysOperationRecord
@@ -99,7 +99,7 @@ func (s *OperationRecordApi) FindSysOperationRecord(c *gin.Context) {
 // @accept application/json
 // @Produce application/json
 // @Param data query request.SysOperationRecordSearch true "页码, 每页大小, 搜索条件"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
+// @Success 200 {object} response.Response{data=response.PageResult,msg=string} "分页获取SysOperationRecord列表,返回包括列表,总数,页码,每页数量"
 // @Router /sysOperationRecord/getSysOperationRecordList [get]
 func (s *OperationRecordApi) GetSysOperationRecordList(c *gin.Context) {
 	var pageInfo systemReq.SysOperationRecordSearch
@@ -17,7 +17,7 @@ type SystemApi struct{}
 // @Summary 获取配置文件内容
 // @Security ApiKeyAuth
 // @Produce  application/json
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
+// @Success 200 {object} response.Response{data=systemRes.SysConfigResponse,msg=string} "获取配置文件内容,返回包括系统配置"
 // @Router /system/getSystemConfig [post]
 func (s *SystemApi) GetSystemConfig(c *gin.Context) {
 	if err, config := systemConfigService.GetSystemConfig(); err != nil {
@@ -33,7 +33,7 @@ func (s *SystemApi) GetSystemConfig(c *gin.Context) {
 // @Security ApiKeyAuth
 // @Produce  application/json
 // @Param data body system.System true "设置配置文件内容"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"设置成功"}"
+// @Success 200 {object} response.Response{data=string} "设置配置文件内容"
 // @Router /system/setSystemConfig [post]
 func (s *SystemApi) SetSystemConfig(c *gin.Context) {
 	var sys system.System
@@ -50,7 +50,7 @@ func (s *SystemApi) SetSystemConfig(c *gin.Context) {
 // @Summary 重启系统
 // @Security ApiKeyAuth
 // @Produce  application/json
-// @Success 200 {string} string "{"code":0,"data":{},"msg":"重启系统成功"}"
+// @Success 200 {object} response.Response{msg=string} "重启系统"
 // @Router /system/reloadSystem [post]
 func (s *SystemApi) ReloadSystem(c *gin.Context) {
 	err := utils.Reload()
@@ -66,7 +66,7 @@ func (s *SystemApi) ReloadSystem(c *gin.Context) {
 // @Summary 获取服务器信息
 // @Security ApiKeyAuth
 // @Produce  application/json
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
+// @Success 200 {object} response.Response{data=map[string]interface{},msg=string} "获取服务器信息"
 // @Router /system/getServerInfo [post]
 func (s *SystemApi) GetServerInfo(c *gin.Context) {
 	if server, err := systemConfigService.GetServerInfo(); err != nil {
@@ -20,7 +20,7 @@ import (
 // @Summary 用户登录
 // @Produce  application/json
 // @Param data body systemReq.Login true "用户名, 密码, 验证码"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"登陆成功"}"
+// @Success 200 {object} response.Response{data=systemRes.LoginResponse,msg=string} "返回包括用户信息,token,过期时间"
 // @Router /base/login [post]
 func (b *BaseApi) Login(c *gin.Context) {
 	var l systemReq.Login
@@ -104,7 +104,7 @@ func (b *BaseApi) tokenNext(c *gin.Context, user system.SysUser) {
 // @Summary 用户注册账号
 // @Produce  application/json
 // @Param data body systemReq.Register true "用户名, 昵称, 密码, 角色ID"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"注册成功"}"
+// @Success 200 {object} response.Response{data=systemRes.SysUserResponse,msg=string} "用户注册账号,返回包括用户信息"
 // @Router /user/register [post]
 func (b *BaseApi) Register(c *gin.Context) {
 	var r systemReq.Register
@@ -134,7 +134,7 @@ func (b *BaseApi) Register(c *gin.Context) {
 // @Security ApiKeyAuth
 // @Produce  application/json
 // @Param data body systemReq.ChangePasswordStruct true "用户名, 原密码, 新密码"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"修改成功"}"
+// @Success 200 {object} response.Response{msg=string} "用户修改密码"
 // @Router /user/changePassword [post]
 func (b *BaseApi) ChangePassword(c *gin.Context) {
 	var user systemReq.ChangePasswordStruct
@@ -158,7 +158,7 @@ func (b *BaseApi) ChangePassword(c *gin.Context) {
 // @accept application/json
 // @Produce application/json
 // @Param data body request.PageInfo true "页码, 每页大小"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
+// @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
@@ -186,7 +186,7 @@ func (b *BaseApi) GetUserList(c *gin.Context) {
 // @accept application/json
 // @Produce application/json
 // @Param data body systemReq.SetUserAuth true "用户UUID, 角色ID"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"修改成功"}"
+// @Success 200 {object} response.Response{msg=string} "设置用户权限"
 // @Router /user/setUserAuthority [post]
 func (b *BaseApi) SetUserAuthority(c *gin.Context) {
 	var sua systemReq.SetUserAuth
@@ -222,7 +222,7 @@ func (b *BaseApi) SetUserAuthority(c *gin.Context) {
 // @accept application/json
 // @Produce application/json
 // @Param data body systemReq.SetUserAuthorities true "用户UUID, 角色ID"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"修改成功"}"
+// @Success 200 {object} response.Response{msg=string} "设置用户权限"
 // @Router /user/setUserAuthorities [post]
 func (b *BaseApi) SetUserAuthorities(c *gin.Context) {
 	var sua systemReq.SetUserAuthorities
@@ -241,7 +241,7 @@ func (b *BaseApi) SetUserAuthorities(c *gin.Context) {
 // @accept application/json
 // @Produce application/json
 // @Param data body request.GetById true "用户ID"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}"
+// @Success 200 {object} response.Response{msg=string} "删除用户"
 // @Router /user/deleteUser [delete]
 func (b *BaseApi) DeleteUser(c *gin.Context) {
 	var reqId request.GetById
@@ -269,7 +269,7 @@ func (b *BaseApi) DeleteUser(c *gin.Context) {
 // @accept application/json
 // @Produce application/json
 // @Param data body system.SysUser true "ID, 用户名, 昵称, 头像链接"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"设置成功"}"
+// @Success 200 {object} response.Response{data=map[string]interface{},msg=string} "设置用户信息"
 // @Router /user/setUserInfo [put]
 func (b *BaseApi) SetUserInfo(c *gin.Context) {
 	var user system.SysUser
@@ -286,12 +286,32 @@ func (b *BaseApi) SetUserInfo(c *gin.Context) {
 	}
 }

+// @Tags SysUser
+// @Summary 设置用户信息
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body system.SysUser true "ID, 用户名, 昵称, 头像链接"
+// @Success 200 {object} response.Response{data=map[string]interface{},msg=string} "设置用户信息"
+// @Router /user/SetSelfInfo [put]
+func (b *BaseApi) SetSelfInfo(c *gin.Context) {
+	var user system.SysUser
+	_ = c.ShouldBindJSON(&user)
+	user.ID = utils.GetUserID(c)
+	if err, ReqUser := userService.SetUserInfo(user); err != nil {
+		global.GVA_LOG.Error("设置失败!", zap.Error(err))
+		response.FailWithMessage("设置失败", c)
+	} else {
+		response.OkWithDetailed(gin.H{"userInfo": ReqUser}, "设置成功", c)
+	}
+}
+
 // @Tags SysUser
 // @Summary 获取用户信息
 // @Security ApiKeyAuth
 // @accept application/json
 // @Produce application/json
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
+// @Success 200 {object} response.Response{data=map[string]interface{},msg=string} "获取用户信息"
 // @Router /user/getUserInfo [get]
 func (b *BaseApi) GetUserInfo(c *gin.Context) {
 	uuid := utils.GetUserUuid(c)
@@ -308,7 +328,7 @@ func (b *BaseApi) GetUserInfo(c *gin.Context) {
 // @Security ApiKeyAuth
 // @Produce  application/json
 // @Param data body system.SysUser true "ID"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"修改成功"}"
+// @Success 200 {object} response.Response{msg=string} "用户修改密码"
 // @Router /user/resetPassword [post]
 func (b *BaseApi) ResetPassword(c *gin.Context) {
 	var user system.SysUser
@@ -153,6 +153,15 @@ tencent-cos:
  base-url: 'https://gin.vue.admin'
  path-prefix: 'github.com/flipped-aurora/gin-vue-admin/server'

+# aws s3 configuration
+aws-s3:
+  bucket: xxxxx-10005608
+  region: ap-shanghai
+  secret-id: xxxxxxxx
+  secret-key: xxxxxxxx
+  base-url: https://gin.vue.admin
+  path-prefix: github.com/flipped-aurora/gin-vue-admin/server
+
 # huawei obs configuration
 hua-wei-obs:
  path: 'you-path'
@@ -20,6 +20,7 @@ type Server struct {
 	AliyunOSS  AliyunOSS  `mapstructure:"aliyun-oss" json:"aliyunOSS" yaml:"aliyun-oss"`
 	HuaWeiObs  HuaWeiObs  `mapstructure:"hua-wei-obs" json:"huaWeiObs" yaml:"hua-wei-obs"`
 	TencentCOS TencentCOS `mapstructure:"tencent-cos" json:"tencentCOS" yaml:"tencent-cos"`
+	AwsS3      AwsS3      `mapstructure:"aws-s3" json:"awsS3" yaml:"aws-s3"`

 	Excel Excel `mapstructure:"excel" json:"excel" yaml:"excel"`
 	Timer Timer `mapstructure:"timer" json:"timer" yaml:"timer"`
@@ -16,3 +16,7 @@ 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
+}
@@ -24,3 +24,7 @@ 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
+}
@@ -0,0 +1,10 @@
+package config
+
+type AwsS3 struct {
+	Bucket     string `mapstructure:"bucket" json:"bucket" yaml:"bucket"`
+	Region     string `mapstructure:"region" json:"region" yaml:"region"`
+	SecretID   string `mapstructure:"secret-id" json:"secretID" yaml:"secret-id"`
+	SecretKey  string `mapstructure:"secret-key" json:"secretKey" yaml:"secret-key"`
+	BaseURL    string `mapstructure:"base-url" json:"baseURL" yaml:"base-url"`
+	PathPrefix string `mapstructure:"path-prefix" json:"pathPrefix" yaml:"path-prefix"`
+}
@@ -5,6 +5,7 @@ go 1.16
 require (
 	github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751
 	github.com/aliyun/aliyun-oss-go-sdk v2.1.6+incompatible
+	github.com/aws/aws-sdk-go v1.42.27
 	github.com/casbin/casbin/v2 v2.11.0
 	github.com/casbin/gorm-adapter/v3 v3.0.2
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
@@ -15,8 +16,10 @@ require (
 	github.com/gin-gonic/gin v1.6.3
 	github.com/go-redis/redis/v8 v8.11.0
 	github.com/go-sql-driver/mysql v1.5.0
+	github.com/gofrs/uuid v4.0.0+incompatible
 	github.com/gookit/color v1.3.1
 	github.com/huaweicloud/huaweicloud-sdk-go-obs v3.21.8+incompatible
+	github.com/jackc/pgx/v4 v4.15.0 // indirect
 	github.com/jordan-wright/email v0.0.0-20200824153738-3f5bafa1cd84
 	github.com/mojocn/base64Captcha v1.3.1
 	github.com/natefinch/lumberjack v2.0.0+incompatible
@@ -35,10 +38,11 @@ require (
 	github.com/unrolled/secure v1.0.7
 	github.com/xuri/excelize/v2 v2.4.1
 	go.uber.org/zap v1.16.0
+	golang.org/x/crypto v0.0.0-20220213190939-1e6e3497d506 // indirect
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
 	gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
 	gorm.io/driver/mysql v1.0.1
-	gorm.io/driver/postgres v0.2.6
-	gorm.io/gorm v1.20.11
+	gorm.io/driver/postgres v1.2.3
+	gorm.io/gorm v1.22.5
 	nhooyr.io/websocket v1.8.6
 )
@@ -18,6 +18,7 @@ github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible h1
 github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
 github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc=
 github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE=
+github.com/Masterminds/semver/v3 v3.1.1/go.mod h1:VPu/7SZ7ePZ3QOrcuXROw5FAcLl4a0cBrbBpGY/8hQs=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI=
@@ -37,6 +38,8 @@ github.com/aliyun/aliyun-oss-go-sdk v2.1.6+incompatible/go.mod h1:T/Aws4fEfogEE9
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
+github.com/aws/aws-sdk-go v1.42.27 h1:kxsBXQg3ee6LLbqjp5/oUeDgG7TENFrWYDmEVnd7spU=
+github.com/aws/aws-sdk-go v1.42.27/go.mod h1:OGr6lGMAKGlG9CVrYnWYDKIyb829c6EVBRjxqjmPepc=
 github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f h1:ZNv7On9kyUzm7fvRZumSyy/IUiSC7AzL0I1jKKtwooA=
 github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod h1:AuiFmCCPBSrqvVMvuqFuk0qogytodnVFVSN5CeJB8Gc=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
@@ -108,8 +111,10 @@ github.com/gin-gonic/gin v1.6.3 h1:ahKqKTFpO5KTPHxWZjEdPScmYaGtLo8Y4DMHoEsnp14=
 github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
+github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
 github.com/go-ole/go-ole v1.2.4 h1:nNBDSCOigTSiarFpYE9J/KtEA1IOW4CNeqT9TQDqCxI=
 github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM=
 github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
@@ -154,6 +159,8 @@ github.com/gobwas/ws v1.0.2 h1:CoAavW/wd/kulfZmSIBt6p24n4j7tHgNVCjsfHVNUbo=
 github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM=
 github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4+jfEaewE=
 github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
+github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw=
+github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
 github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY=
@@ -249,10 +256,19 @@ github.com/jackc/pgconn v1.5.0/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr
 github.com/jackc/pgconn v1.5.1-0.20200601181101-fa742c524853/go.mod h1:QeD3lBfpTFe8WUnPZWN5KY/mB8FGMIYRdd8P8Jr0fAI=
 github.com/jackc/pgconn v1.6.1 h1:lwofaXKPbIx6qEaK8mNm7uZuOwxHw+PnAFGDsDFpkRI=
 github.com/jackc/pgconn v1.6.1/go.mod h1:g8mKMqmSUO6AzAvha7vy07g1rbGOlc7iF0nU0ei83hc=
+github.com/jackc/pgconn v1.8.0/go.mod h1:1C2Pb36bGIP9QHGBYCjnyhqu7Rv3sGshaQUvmfGIB/o=
+github.com/jackc/pgconn v1.9.0/go.mod h1:YctiPyvzfU11JFxoXokUOOKQXQmDMoJL9vJzHH8/2JY=
+github.com/jackc/pgconn v1.9.1-0.20210724152538-d89c8390a530/go.mod h1:4z2w8XhRbP1hYxkpTuBjTS3ne3J48K83+u0zoyvg2pI=
+github.com/jackc/pgconn v1.10.1/go.mod h1:4z2w8XhRbP1hYxkpTuBjTS3ne3J48K83+u0zoyvg2pI=
+github.com/jackc/pgconn v1.11.0 h1:HiHArx4yFbwl91X3qqIHtUFoiIfLNJXCQRsnzkiwwaQ=
+github.com/jackc/pgconn v1.11.0/go.mod h1:4z2w8XhRbP1hYxkpTuBjTS3ne3J48K83+u0zoyvg2pI=
 github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE=
 github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8=
 github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2 h1:JVX6jT/XfzNqIjye4717ITLaNwV9mWbJx0dLCpcRzdA=
 github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE=
+github.com/jackc/pgmock v0.0.0-20201204152224-4fe30f7445fd/go.mod h1:hrBW0Enj2AZTNpt/7Y5rr2xe/9Mn757Wtb2xeBzPv2c=
+github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65 h1:DadwsjnMwFjfWc9y5Wi/+Zz7xoE5ALHsRQlOctkOiHc=
+github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65/go.mod h1:5R2h2EEX+qri8jOWMbJCtaPWkrrNc7OHwsp2TCqp7ak=
 github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=
 github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg=
 github.com/jackc/pgproto3 v1.1.0 h1:FYYE4yRw+AgI8wXIinMlNjBbp/UitDJwfj5LqqewP1A=
@@ -264,8 +280,14 @@ github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:
 github.com/jackc/pgproto3/v2 v2.0.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
 github.com/jackc/pgproto3/v2 v2.0.2 h1:q1Hsy66zh4vuNsajBUF2PNqfAMMfxU5mk594lPE9vjY=
 github.com/jackc/pgproto3/v2 v2.0.2/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
+github.com/jackc/pgproto3/v2 v2.0.6/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
+github.com/jackc/pgproto3/v2 v2.1.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
+github.com/jackc/pgproto3/v2 v2.2.0 h1:r7JypeP2D3onoQTCxWdTpCtJ4D+qpKr0TxvoyMhZ5ns=
+github.com/jackc/pgproto3/v2 v2.2.0/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
 github.com/jackc/pgservicefile v0.0.0-20200307190119-3430c5407db8 h1:Q3tB+ExeflWUW7AFcAhXqk40s9mnNYLk1nOkKNZ5GnU=
 github.com/jackc/pgservicefile v0.0.0-20200307190119-3430c5407db8/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E=
+github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b h1:C8S2+VttkHFdOOCXJe+YGfa4vHYwlt4Zx+IVXQ97jYg=
+github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E=
 github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01CGwFsrv11mJRHWJ6aifDLfdV3aVjFF0zg=
 github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90/go.mod h1:KcahbBH1nCMSo2DXpzsoWOAfFkdEtEJpPbVLq8eE+mc=
 github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrUS8lot6TQqcg7mtthZ9T0EoIBFiJcmcyw=
@@ -274,6 +296,10 @@ github.com/jackc/pgtype v1.3.1-0.20200510190516-8cd94a14c75a/go.mod h1:vaogEUkAL
 github.com/jackc/pgtype v1.3.1-0.20200606141011-f6355165a91c/go.mod h1:cvk9Bgu/VzJ9/lxTO5R5sf80p0DiucVtN7ZxvaC4GmQ=
 github.com/jackc/pgtype v1.4.0 h1:pHQfb4jh9iKqHyxPthq1fr+0HwSNIl3btYPbw2m2lbM=
 github.com/jackc/pgtype v1.4.0/go.mod h1:JCULISAZBFGrHaOXIIFiyfzW5VY0GRitRr8NeJsrdig=
+github.com/jackc/pgtype v1.8.1-0.20210724151600-32e20a603178/go.mod h1:C516IlIV9NKqfsMCXTdChteoXmwgUceqaLfjg2e3NlM=
+github.com/jackc/pgtype v1.9.0/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4=
+github.com/jackc/pgtype v1.10.0 h1:ILnBWrRMSXGczYvmkYD6PsYyVFUNLTnIUJHHDLmqk38=
+github.com/jackc/pgtype v1.10.0/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4=
 github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y=
 github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM=
 github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc=
@@ -282,15 +308,28 @@ github.com/jackc/pgx/v4 v4.6.1-0.20200510190926-94ba730bb1e9/go.mod h1:t3/cdRQl6
 github.com/jackc/pgx/v4 v4.6.1-0.20200606145419-4e5062306904/go.mod h1:ZDaNWkt9sW1JMiNn0kdYBaLelIhw7Pg4qd+Vk6tw7Hg=
 github.com/jackc/pgx/v4 v4.7.1 h1:aqUSOcStk6fik+lSE+tqfFhvt/EwT8q/oMtJbP9CjXI=
 github.com/jackc/pgx/v4 v4.7.1/go.mod h1:nu42q3aPjuC1M0Nak4bnoprKlXPINqopEKqbq5AZSC4=
+github.com/jackc/pgx/v4 v4.12.1-0.20210724153913-640aa07df17c/go.mod h1:1QD0+tgSXP7iUjYm9C1NxKhny7lq6ee99u/z+IHFcgs=
+github.com/jackc/pgx/v4 v4.14.0/go.mod h1:jT3ibf/A0ZVCp89rtCIN0zCJxcE74ypROmHEZYsG/j8=
+github.com/jackc/pgx/v4 v4.15.0 h1:B7dTkXsdILD3MF987WGGCcg+tvLW6bZJdEcqVFeU//w=
+github.com/jackc/pgx/v4 v4.15.0/go.mod h1:D/zyOyXiaM1TmVWnOM18p0xdDtdakRBa0RsVGI3U3bw=
 github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v1.1.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v1.1.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
+github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
+github.com/jackc/puddle v1.2.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
+github.com/jackc/puddle v1.2.1/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869/go.mod h1:cJ6Cj7dQo+O6GJNiMx+Pa94qKj+TG8ONdKHgMNIyyag=
 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
-github.com/jinzhu/now v1.1.1 h1:g39TucaRWyV3dwDO++eEc6qf8TVIQ/Da48WmqjZ3i7E=
 github.com/jinzhu/now v1.1.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
+github.com/jinzhu/now v1.1.2/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
+github.com/jinzhu/now v1.1.4 h1:tHnRBy1i5F2Dh8BAFxqFzxKqqvezXrL2OW1TnX+Mlas=
+github.com/jinzhu/now v1.1.4/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
+github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
+github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
+github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
+github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
 github.com/jordan-wright/email v0.0.0-20200824153738-3f5bafa1cd84 h1:pS0A6cr4aHYZnYwC7Uw+rwgb39+nzkm2QhwZ+S6Gn5I=
 github.com/jordan-wright/email v0.0.0-20200824153738-3f5bafa1cd84/go.mod h1:1c7szIrayyPPB/987hsnvNzLushdWf4o/79s3P08L8A=
@@ -329,6 +368,8 @@ github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.3.0 h1:/qkRGz8zljWiDcFvgpwUpwIAPu3r07TDvs3Rws+o/pU=
 github.com/lib/pq v1.3.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/lib/pq v1.10.2 h1:AqzbZs4ZoCBp+GtejcpCpcxM3zlSMx29dXbUSeVtJb8=
+github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4=
 github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
@@ -434,6 +475,8 @@ github.com/shirou/gopsutil v3.21.9+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu
 github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4=
 github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc h1:jUIKcSPO9MoMJBbEoyE/RJoE8vz7Mb8AjvifMMwSyvY=
 github.com/shopspring/decimal v0.0.0-20200227202807-02e2044944cc/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
+github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ=
+github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
@@ -514,15 +557,18 @@ go.opentelemetry.io/otel/sdk v1.0.0-RC2/go.mod h1:fgwHyiDn4e5k40TD9VX243rOxXR+jz
 go.opentelemetry.io/otel/trace v1.0.0-RC2/go.mod h1:JPQ+z6nNw9mqEGT8o3eoPTdnNI+Aj5JcxEsVGREIAy4=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
+go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
 go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk=
 go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
+go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=
 go.uber.org/multierr v1.5.0 h1:KCa4XfM8CWFCpxXRGok+Q0SS/0XBhMDbHHGABQLvD2A=
 go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
 go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee h1:0mgffUl7nfd+FpvXMVz4IDEaUSmT1ysygQC7qYo7sG4=
 go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=
 go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
+go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM=
 go.uber.org/zap v1.16.0 h1:uFRZXykJGK9lLY4HtgSw44DnIcAM+kRBP7x5m+NpAOM=
 go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
@@ -537,8 +583,13 @@ golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
+golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 h1:/UOmuWzQfxxo9UtlXMwuQU8CMgg1eZXqTRwkSQJWKOI=
 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20220213190939-1e6e3497d506 h1:EuGTJDfeg/PGZJp3gq1K+14eSLFTsrj1eg8KQuiUyKg=
+golang.org/x/crypto v0.0.0-20220213190939-1e6e3497d506/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -561,6 +612,7 @@ golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU
 golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
 golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
 golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
+golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
@@ -591,8 +643,10 @@ golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20210421230115-4e50805a0758/go.mod h1:72T/g9IO56b78aLF+1Kcs5dz7/ng1VjMUvfKvpfy+jM=
-golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985 h1:4CSI6oo7cOjJKajidEljs9h+uP0rRZBPPPhcCbj5mw8=
 golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20211216030914-fe4d6282115f h1:hEYJvxw1lSnWIl8X9ofsYMklzaDs90JI2az5YMd4fPM=
+golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -628,6 +682,7 @@ golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -644,6 +699,7 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210816074244-15123e1e1f71 h1:ikCpsnYR+Ew0vu99XlDp55lGgDJdIMx3f4a18jfse/s=
 golang.org/x/sys v0.0.0-20210816074244-15123e1e1f71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -653,6 +709,8 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -683,6 +741,7 @@ golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtn
 golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.0.0-20201120155355-20be4ac4bd6e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.5 h1:ouewzE6p+/VEB31YYnTbEJdi8pFqKp4P4n85vwo3DHA=
@@ -768,14 +827,17 @@ gorm.io/driver/mysql v1.0.1 h1:omJoilUzyrAp0xNoio88lGJCroGdIOen9hq2A/+3ifw=
 gorm.io/driver/mysql v1.0.1/go.mod h1:KtqSthtg55lFp3S5kUXqlGaelnWpKitn4k1xZTnoiPw=
 gorm.io/driver/postgres v0.2.6 h1:hoE6SzA5wKOo6AYxz2V7ooxnzD6S6ToLAHHDDawt+b0=
 gorm.io/driver/postgres v0.2.6/go.mod h1:AsPyuhKFOplSmQwOPsycVKbe0dRxF8v18KZ7p9i8dIs=
+gorm.io/driver/postgres v1.2.3 h1:f4t0TmNMy9gh3TU2PX+EppoA6YsgFnyq8Ojtddb42To=
+gorm.io/driver/postgres v1.2.3/go.mod h1:pJV6RgYQPG47aM1f0QeOzFH9HxQc8JcmAgjRCgS0wjs=
 gorm.io/driver/sqlserver v0.2.4 h1:AGofGL/TfzTZotzIHlaLISfxEKJpzj0ATbtXJW+ga1A=
 gorm.io/driver/sqlserver v0.2.4/go.mod h1:TcPfkdce5b8qlCMgyUeUdm7HQa1ZzWUuxzI+odcueLA=
 gorm.io/gorm v0.2.19/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
 gorm.io/gorm v0.2.23/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
 gorm.io/gorm v1.9.19/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
 gorm.io/gorm v1.20.7/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
-gorm.io/gorm v1.20.11 h1:jYHQ0LLUViV85V8dM1TP9VBBkfzKTnuTXDjYObkI6yc=
-gorm.io/gorm v1.20.11/go.mod h1:0HFTzE/SqkGTzK6TlDPPQbAYCluiVvhzoA1+aVyzenw=
+gorm.io/gorm v1.22.3/go.mod h1:F+OptMscr0P2F2qU97WT1WimdH9GaQPoDW7AYd5i2Y0=
+gorm.io/gorm v1.22.5 h1:lYREBgc02Be/5lSCTuysZZDb6ffL2qrat6fg9CFbvXU=
+gorm.io/gorm v1.22.5/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
@@ -10,6 +10,10 @@ import (
 	"gorm.io/gorm/logger"
 )

+type DBBASE interface {
+	GetLogMode() string
+}
+
 var Gorm = new(_gorm)

 type _gorm struct{}
@@ -23,7 +27,19 @@ func (g *_gorm) Config() *gorm.Config {
 		LogLevel:      logger.Warn,
 		Colorful:      true,
 	})
-	switch global.GVA_CONFIG.Mysql.LogMode {
+	var logMode DBBASE
+	switch global.GVA_CONFIG.System.DbType {
+	case "mysql":
+		logMode = &global.GVA_CONFIG.Mysql
+		break
+	case "pgsql":
+		logMode = &global.GVA_CONFIG.Pgsql
+		break
+	default:
+		logMode = &global.GVA_CONFIG.Mysql
+	}
+
+	switch logMode.GetLogMode() {
 	case "silent", "Silent":
 		config.Logger = _default.LogMode(logger.Silent)
 	case "error", "Error":
@@ -1,8 +1,8 @@
 package response

 type PageResult struct {
-	List     interface{} `json:"list"`
-	Total    int64       `json:"total"`
-	Page     int         `json:"page"`
-	PageSize int         `json:"pageSize"`
+	List     interface{} `json:"list" comment:"列表"`
+	Total    int64       `json:"total" comment:"总数" example:"10"`
+	Page     int         `json:"page" comment:"页码" example:"1"`
+	PageSize int         `json:"pageSize" comment:"每页数量" example:"10"`
 }
@@ -7,18 +7,18 @@ import (
 // file struct, 文件结构体
 type ExaFile struct {
 	global.GVA_MODEL
-	FileName     string
-	FileMd5      string
-	FilePath     string
+	FileName     string `json:"fileName" example:"test"`
+	FileMd5      string `json:"fileMd5" example:"D45547AD2A4695DA2871D5C73FBA6555"`
+	FilePath     string `json:"filePath" example:"xxx/xxx"`
 	ExaFileChunk []ExaFileChunk
-	ChunkTotal   int
-	IsFinish     bool
+	ChunkTotal   int  `example:"10"`
+	IsFinish     bool `example:"true"`
 }

 // file chunk struct, 切片结构体
 type ExaFileChunk struct {
 	global.GVA_MODEL
-	ExaFileID       uint
-	FileChunkNumber int
-	FileChunkPath   string
+	ExaFileID       uint   `example:"1"`
+	FileChunkNumber int    `example:"2"`
+	FileChunkPath   string `example:"xxx/xxx"`
 }
@@ -7,9 +7,9 @@ import (

 type ExaCustomer struct {
 	global.GVA_MODEL
-	CustomerName       string         `json:"customerName" form:"customerName" gorm:"comment:客户名"`                // 客户名
-	CustomerPhoneData  string         `json:"customerPhoneData" form:"customerPhoneData" gorm:"comment:客户手机号"`    // 客户手机号
-	SysUserID          uint           `json:"sysUserId" form:"sysUserId" gorm:"comment:管理ID"`                     // 管理ID
-	SysUserAuthorityID string         `json:"sysUserAuthorityID" form:"sysUserAuthorityID" gorm:"comment:管理角色ID"` // 管理角色ID
-	SysUser            system.SysUser `json:"sysUser" form:"sysUser" gorm:"comment:管理详情"`                         // 管理详情
+	CustomerName       string         `json:"customerName" form:"customerName" gorm:"comment:客户名" example:"admin"`                   // 客户名
+	CustomerPhoneData  string         `json:"customerPhoneData" form:"customerPhoneData" gorm:"comment:客户手机号" example:"16675126721"` // 客户手机号
+	SysUserID          uint           `json:"sysUserId" form:"sysUserId" gorm:"comment:管理ID" example:"111"`                          // 管理ID
+	SysUserAuthorityID string         `json:"sysUserAuthorityID" form:"sysUserAuthorityID" gorm:"comment:管理角色ID" example:"888"`      // 管理角色ID
+	SysUser            system.SysUser `json:"sysUser" form:"sysUser" gorm:"comment:管理详情"`                                            // 管理详情
 }
@@ -6,8 +6,8 @@ import (

 type ExaFileUploadAndDownload struct {
 	global.GVA_MODEL
-	Name string `json:"name" gorm:"comment:文件名"` // 文件名
-	Url  string `json:"url" gorm:"comment:文件地址"` // 文件地址
-	Tag  string `json:"tag" gorm:"comment:文件标签"` // 文件标签
-	Key  string `json:"key" gorm:"comment:编号"`   // 编号
+	Name string `json:"name" gorm:"comment:文件名" example:"file_name"`             // 文件名
+	Url  string `json:"url" gorm:"comment:文件地址" example:"www.filepath.com/file"` // 文件地址
+	Tag  string `json:"tag" gorm:"comment:文件标签" example:"file_tag"`              // 文件标签
+	Key  string `json:"key" gorm:"comment:编号" example:"number"`                  // 编号
 }
@@ -3,9 +3,9 @@ package response
 import "github.com/flipped-aurora/gin-vue-admin/server/model/example"

 type FilePathResponse struct {
-	FilePath string `json:"filePath"`
+	FilePath string `json:"filePath" comment:"文件路径" example:"xxx/xx"`
 }

 type FileResponse struct {
-	File example.ExaFile `json:"file"`
+	File example.ExaFile `json:"file" comment:"文件详情"`
 }
@@ -3,5 +3,5 @@ package response
 import "github.com/flipped-aurora/gin-vue-admin/server/model/example"

 type ExaCustomerResponse struct {
-	Customer example.ExaCustomer `json:"customer"`
+	Customer example.ExaCustomer `json:"customer" comment:"客户详情"`
 }
@@ -3,5 +3,5 @@ package response
 import "github.com/flipped-aurora/gin-vue-admin/server/model/example"

 type ExaFileResponse struct {
-	File example.ExaFileUploadAndDownload `json:"file"`
+	File example.ExaFileUploadAndDownload `json:"file" comment:"文件详情"`
 }
@@ -2,8 +2,8 @@ package request

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

 // Casbin structure for input parameters
@@ -43,12 +43,15 @@ func (i *InitDB) PgsqlEmptyDsn() string {
 // Author [SliverHorn](https://github.com/SliverHorn)
 func (i *InitDB) ToMysqlConfig() config.Mysql {
 	return config.Mysql{
-		Path:     i.Host,
-		Port:     i.Port,
-		Dbname:   i.DBName,
-		Username: i.UserName,
-		Password: i.Password,
-		Config:   "charset=utf8mb4&parseTime=True&loc=Local",
+		Path:         i.Host,
+		Port:         i.Port,
+		Dbname:       i.DBName,
+		Username:     i.UserName,
+		Password:     i.Password,
+		MaxIdleConns: 10,
+		MaxOpenConns: 100,
+		LogMode:      "error",
+		Config:       "charset=utf8mb4&parseTime=True&loc=Local",
 	}
 }

@@ -56,11 +59,14 @@ func (i *InitDB) ToMysqlConfig() config.Mysql {
 // Author [SliverHorn](https://github.com/SliverHorn)
 func (i *InitDB) ToPgsqlConfig() config.Pgsql {
 	return config.Pgsql{
-		Path:     i.Host,
-		Port:     i.Port,
-		Dbname:   i.DBName,
-		Username: i.UserName,
-		Password: i.Password,
-		Config:   "sslmode=disable TimeZone=Asia/Shanghai",
+		Path:         i.Host,
+		Port:         i.Port,
+		Dbname:       i.DBName,
+		Username:     i.UserName,
+		Password:     i.Password,
+		MaxIdleConns: 10,
+		MaxOpenConns: 100,
+		LogMode:      "error",
+		Config:       "sslmode=disable TimeZone=Asia/Shanghai",
 	}
 }
@@ -3,9 +3,9 @@ package response
 import "github.com/flipped-aurora/gin-vue-admin/server/model/system"

 type SysAPIResponse struct {
-	Api system.SysApi `json:"api"`
+	Api system.SysApi `json:"api" comment:"api详情"`
 }

 type SysAPIListResponse struct {
-	Apis []system.SysApi `json:"apis"`
+	Apis []system.SysApi `json:"apis" comment:"api列表"`
 }
@@ -3,10 +3,10 @@ package response
 import "github.com/flipped-aurora/gin-vue-admin/server/model/system"

 type SysAuthorityResponse struct {
-	Authority system.SysAuthority `json:"authority"`
+	Authority system.SysAuthority `json:"authority" comment:"系统角色详情"`
 }

 type SysAuthorityCopyResponse struct {
-	Authority      system.SysAuthority `json:"authority"`
-	OldAuthorityId string              `json:"oldAuthorityId"` // 旧角色ID
+	Authority      system.SysAuthority `json:"authority"  comment:"系统角色详情"`
+	OldAuthorityId string              `json:"oldAuthorityId"  comment:"旧角色ID"` // 旧角色ID
 }
@@ -1,7 +1,7 @@
 package response

 type SysCaptchaResponse struct {
-	CaptchaId     string `json:"captchaId"`
-	PicPath       string `json:"picPath"`
-	CaptchaLength int    `json:"captchaLength""`
+	CaptchaId     string `json:"captchaId" example:"axxbbas" comment:"随机数id"`                      // 随机数id
+	PicPath       string `json:"picPath" example:"data:img/png;base64,///" comment:"base64 图像字符串"` // base64 图像字符串
+	CaptchaLength int    `json:"captchaLength" example:"6"  comment:"验证码长度" `                      // 验证码长度
 }
@@ -5,5 +5,5 @@ import (
 )

 type PolicyPathResponse struct {
-	Paths []request.CasbinInfo `json:"paths"`
+	Paths []request.CasbinInfo `json:"paths" comment:"casbin详情列表"`
 }
@@ -3,13 +3,13 @@ package response
 import "github.com/flipped-aurora/gin-vue-admin/server/model/system"

 type SysMenusResponse struct {
-	Menus []system.SysMenu `json:"menus"`
+	Menus []system.SysMenu `json:"menus" comment:"系统菜单详情列表"`
 }

 type SysBaseMenusResponse struct {
-	Menus []system.SysBaseMenu `json:"menus"`
+	Menus []system.SysBaseMenu `json:"menus" comment:"系统菜单列表"`
 }

 type SysBaseMenuResponse struct {
-	Menu system.SysBaseMenu `json:"menu"`
+	Menu system.SysBaseMenu `json:"menu" comment:"系统菜单列表"`
 }
@@ -3,5 +3,5 @@ package response
 import "github.com/flipped-aurora/gin-vue-admin/server/config"

 type SysConfigResponse struct {
-	Config config.Server `json:"config"`
+	Config config.Server `json:"config" comment:"系统配置"`
 }
@@ -5,11 +5,11 @@ import (
 )

 type SysUserResponse struct {
-	User system.SysUser `json:"user"`
+	User system.SysUser `json:"user" comment:"用户信息"`
 }

 type LoginResponse struct {
-	User      system.SysUser `json:"user"`
-	Token     string         `json:"token"`
-	ExpiresAt int64          `json:"expiresAt"`
+	User      system.SysUser `json:"user" comment:"用户信息"`
+	Token     string         `json:"token" comment:"token" example:"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyX2lkIjo0NTg0NywidXNlcm5hbWUiOiLlvawiLCJhdmF0YXIiOiJodHRwczovL3d3dy5odW94aWFuLmNuL3VwbG9hZC9pbWFnZS8yMDIxLzcvMTUvYzg0ZDA1YjM1YWU1NThhNWUxMGYxNjNkZDg3ZjNmMmIuanBnIiwiZXhwIjoxNjQyMTMwODY2LCJpc3MiOiJhc3IiLCJuYmYiOjE2NDE1MjUwNjZ9.Huye4E5mUDG1KxQP7lhPVwve2yUx7RfGazerv6nW-uY"`
+	ExpiresAt int64          `json:"expiresAt" comment:"过期时间" example:"1641791563"`
 }
@@ -6,8 +6,8 @@ import (

 type SysApi struct {
 	global.GVA_MODEL
-	Path        string `json:"path" gorm:"comment:api路径"`             // api路径
-	Description string `json:"description" gorm:"comment:api中文描述"`    // api中文描述
-	ApiGroup    string `json:"apiGroup" gorm:"comment:api组"`          // api组
-	Method      string `json:"method" gorm:"default:POST;comment:方法"` // 方法:创建POST(默认)|查看GET|更新PUT|删除DELETE
+	Path        string `json:"path" gorm:"comment:api路径" example:"/api"`            // api路径
+	Description string `json:"description" gorm:"comment:api中文描述" example:"测试api"`  // api中文描述
+	ApiGroup    string `json:"apiGroup" gorm:"comment:api组" example:"api_group"`    // api组
+	Method      string `json:"method" gorm:"default:POST;comment:方法" example:"GET"` // 方法:创建POST(默认)|查看GET|更新PUT|删除DELETE
 }
@@ -8,11 +8,12 @@ type SysAuthority struct {
 	CreatedAt       time.Time      // 创建时间
 	UpdatedAt       time.Time      // 更新时间
 	DeletedAt       *time.Time     `sql:"index"`
-	AuthorityId     string         `json:"authorityId" gorm:"not null;unique;primary_key;comment:角色ID;size:90"` // 角色ID
-	AuthorityName   string         `json:"authorityName" gorm:"comment:角色名"`                                    // 角色名
-	ParentId        string         `json:"parentId" gorm:"comment:父角色ID"`                                       // 父角色ID
+	AuthorityId     string         `json:"authorityId" gorm:"not null;unique;primary_key;comment:角色ID;size:90" example:"e07122e1-56ee-4016-8070-2d9d3e6550ab"` // 角色ID
+	AuthorityName   string         `json:"authorityName" gorm:"comment:角色名" example:"admin2"`                                                                  // 角色名
+	ParentId        string         `json:"parentId" gorm:"comment:父角色ID" example:"admin"`                                                                      // 父角色ID
 	DataAuthorityId []SysAuthority `json:"dataAuthorityId" gorm:"many2many:sys_data_authority_id"`
 	Children        []SysAuthority `json:"children" gorm:"-"`
 	SysBaseMenus    []SysBaseMenu  `json:"menus" gorm:"many2many:sys_authority_menus;"`
+	Users           []SysUser      `json:"-" gorm:"many2many:sys_user_authority;"`
 	DefaultRouter   string         `json:"defaultRouter" gorm:"comment:默认菜单;default:dashboard"` // 默认菜单(默认dashboard)
 }
@@ -2,8 +2,8 @@ package system

 type SysMenu struct {
 	SysBaseMenu
-	MenuId      string                 `json:"menuId" gorm:"comment:菜单ID"`
-	AuthorityId string                 `json:"-" gorm:"comment:角色ID"`
+	MenuId      string                 `json:"menuId" gorm:"comment:菜单ID" example:"menu_id"`
+	AuthorityId string                 `json:"-" gorm:"comment:角色ID" example:"role_id"`
 	Children    []SysMenu              `json:"children" gorm:"-"`
 	Parameters  []SysBaseMenuParameter `json:"parameters" gorm:"foreignKey:SysBaseMenuID;references:MenuId"`
 }
@@ -6,13 +6,13 @@ 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:排序标记"`          // 排序标记
+	MenuLevel     uint                              `json:"-" example:"2"`
+	ParentId      string                            `json:"parentId" gorm:"comment:父菜单ID" example:"1"`       // 父菜单ID
+	Path          string                            `json:"path" gorm:"comment:路由path" example:"/"`          // 路由path
+	Name          string                            `json:"name" gorm:"comment:路由name" example:"主页"`         // 路由name
+	Hidden        bool                              `json:"hidden" gorm:"comment:是否在列表隐藏" example:"true"`    // 是否在列表隐藏
+	Component     string                            `json:"component" gorm:"comment:对应前端文件路径" example:".//"` // 对应前端文件路径
+	Sort          int                               `json:"sort" gorm:"comment:排序标记" example:"1"`            // 排序标记
 	Meta          `json:"meta" gorm:"comment:附加属性"` // 附加属性
 	SysAuthoritys []SysAuthority                    `json:"authoritys" gorm:"many2many:sys_authority_menus;"`
 	Children      []SysBaseMenu                     `json:"children" gorm:"-"`
@@ -20,17 +20,17 @@ type SysBaseMenu struct {
 }

 type Meta struct {
-	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
+	KeepAlive   bool   `json:"keepAlive" gorm:"comment:是否缓存" example:"true"`           // 是否缓存
+	DefaultMenu bool   `json:"defaultMenu" gorm:"comment:是否是基础路由（开发中）" example:"true"` // 是否是基础路由（开发中）
+	Title       string `json:"title" gorm:"comment:菜单名" example:"menu"`                // 菜单名
+	Icon        string `json:"icon" gorm:"comment:菜单图标" example:"/icon"`               // 菜单图标
+	CloseTab    bool   `json:"closeTab" gorm:"comment:自动关闭tab" example:"true"`         // 自动关闭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
-	Value         string `json:"value" gorm:"comment:地址栏携带参数的值"`            // 地址栏携带参数的值
+	SysBaseMenuID uint   `example:"1"`
+	Type          string `json:"type" gorm:"comment:地址栏携带参数为params还是query" example:"params"` // 地址栏携带参数为params还是query
+	Key           string `json:"key" gorm:"comment:地址栏携带参数的key" example:"key"`               // 地址栏携带参数的key
+	Value         string `json:"value" gorm:"comment:地址栏携带参数的值" example:"value"`             // 地址栏携带参数的值
 }
@@ -7,15 +7,15 @@ import (

 type SysUser struct {
 	global.GVA_MODEL
-	UUID        uuid.UUID      `json:"uuid" gorm:"comment:用户UUID"`                                                           // 用户UUID
-	Username    string         `json:"userName" gorm:"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 string         `json:"authorityId" gorm:"default:888;comment:用户角色ID"`                                        // 用户角色ID
+	UUID        uuid.UUID      `json:"uuid" gorm:"comment:用户UUID" example:"c0523f1a-3358-495f-bdc6-20f173ffc513"`                                                                     // 用户UUID
+	Username    string         `json:"userName" gorm:"comment:用户登录名" example:"admin"`                                                                                                 // 用户登录名
+	Password    string         `json:"-"  gorm:"comment:用户登录密码" example:"0a828a36-ad1c-43b0-8b6a-3bad4bbbaf80"`                                                                       // 用户登录密码
+	NickName    string         `json:"nickName" gorm:"default:系统用户;comment:用户昵称" example:"别名"`                                                                                        // 用户昵称
+	SideMode    string         `json:"sideMode" gorm:"default:dark;comment:用户侧边主题" example:"dark"`                                                                                    // 用户侧边主题
+	HeaderImg   string         `json:"headerImg" gorm:"default:https://qmplusimg.henrongyi.top/gva_header.jpg;comment:用户头像" example:"https://qmplusimg.henrongyi.top/gva_header.jpg"` // 用户头像
+	BaseColor   string         `json:"baseColor" gorm:"default:#fff;comment:基础颜色" example:"#fff"`                                                                                     // 基础颜色
+	ActiveColor string         `json:"activeColor" gorm:"default:#1890ff;comment:活跃颜色" example:"#1890ff"`                                                                             // 活跃颜色
+	AuthorityId string         `json:"authorityId" gorm:"default:888;comment:用户角色ID" example:"888"`                                                                                   // 用户角色ID
 	Authority   SysAuthority   `json:"authority" gorm:"foreignKey:AuthorityId;references:AuthorityId;comment:用户角色"`
 	Authorities []SysAuthority `json:"authorities" gorm:"many2many:sys_user_authority;"`
 }
@@ -18,6 +18,7 @@ func (s *UserRouter) InitUserRouter(Router *gin.RouterGroup) {
 		userRouter.POST("setUserAuthority", baseApi.SetUserAuthority)     // 设置用户权限
 		userRouter.DELETE("deleteUser", baseApi.DeleteUser)               // 删除用户
 		userRouter.PUT("setUserInfo", baseApi.SetUserInfo)                // 设置用户信息
+		userRouter.PUT("setSelfInfo", baseApi.SetSelfInfo)                // 设置自身信息
 		userRouter.POST("setUserAuthorities", baseApi.SetUserAuthorities) // 设置用户权限组
 		userRouter.POST("resetPassword", baseApi.ResetPassword)           // 设置用户权限组
 	}
@@ -56,7 +56,7 @@ func (e *FileUploadAndDownloadService) CreateFileChunk(id uint, fileChunkPath st
 func (e *FileUploadAndDownloadService) DeleteFileChunk(fileMd5 string, fileName string, filePath string) error {
 	var chunks []example.ExaFileChunk
 	var file example.ExaFile
-	err := global.GVA_DB.Where("file_md5 = ? AND file_name = ?", fileMd5, fileName).First(&file).Update("IsFinish", true).Update("file_path", filePath).Error
+	err := global.GVA_DB.Where("file_md5 = ? ", fileMd5).First(&file).Update("IsFinish", true).Update("file_path", filePath).Error
 	if err != nil {
 		return err
 	}
@@ -83,6 +83,12 @@ func (authorityService *AuthorityService) UpdateAuthority(auth system.SysAuthori
 //@return: err error

 func (authorityService *AuthorityService) DeleteAuthority(auth *system.SysAuthority) (err error) {
+	if errors.Is(global.GVA_DB.Debug().Preload("Users").First(&auth).Error, gorm.ErrRecordNotFound) {
+		return errors.New("该角色不存在")
+	}
+	if len(auth.Users) != 0 {
+		return errors.New("此角色有用户正在使用禁止删除")
+	}
 	if !errors.Is(global.GVA_DB.Where("authority_id = ?", auth.AuthorityId).First(&system.SysUser{}).Error, gorm.ErrRecordNotFound) {
 		return errors.New("此角色有用户正在使用禁止删除")
 	}
@@ -32,8 +32,19 @@ func (dictionaryService *DictionaryService) CreateSysDictionary(sysDictionary sy
 //@return: err error

 func (dictionaryService *DictionaryService) DeleteSysDictionary(sysDictionary system.SysDictionary) (err error) {
-	err = global.GVA_DB.Delete(&sysDictionary).Delete(&sysDictionary.SysDictionaryDetails).Error
-	return err
+	err = global.GVA_DB.Where("id = ?", sysDictionary.ID).Preload("SysDictionaryDetails").First(&sysDictionary).Error
+	if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
+		return errors.New("请不要搞事")
+	}
+	if err != nil {
+		return err
+	}
+	err = global.GVA_DB.Delete(&sysDictionary).Error
+	if err != nil {
+		return err
+	}
+
+	return global.GVA_DB.Model(&system.SysDictionaryDetail{}).Delete(sysDictionary.SysDictionaryDetails).Error
 }

 //@author: [piexlmax](https://github.com/piexlmax)
@@ -46,6 +46,13 @@ func (userService *UserService) Login(u *system.SysUser) (err error, userInter *
 	var user system.SysUser
 	u.Password = utils.MD5V([]byte(u.Password))
 	err = global.GVA_DB.Where("username = ? AND password = ?", u.Username, u.Password).Preload("Authorities").Preload("Authority").First(&user).Error
+	if err == nil {
+		var am system.SysMenu
+		ferr := global.GVA_DB.First(&am, "name = ? AND authority_id = ?", user.Authority.DefaultRouter, user.AuthorityId).Error
+		if errors.Is(ferr, gorm.ErrRecordNotFound) {
+			user.Authority.DefaultRouter = "404"
+		}
+	}
 	return err, &user
 }

@@ -163,6 +170,14 @@ func (userService *UserService) SetUserInfo(reqUser system.SysUser) (err error,
 func (userService *UserService) GetUserInfo(uuid uuid.UUID) (err error, user system.SysUser) {
 	var reqUser system.SysUser
 	err = global.GVA_DB.Preload("Authorities").Preload("Authority").First(&reqUser, "uuid = ?", uuid).Error
+	if err != nil {
+		return err, reqUser
+	}
+	var am system.SysMenu
+	ferr := global.GVA_DB.First(&am, "name = ? AND authority_id = ?", reqUser.Authority.DefaultRouter, reqUser.AuthorityId).Error
+	if errors.Is(ferr, gorm.ErrRecordNotFound) {
+		reqUser.Authority.DefaultRouter = "404"
+	}
 	return err, reqUser
 }

@@ -22,14 +22,15 @@ func (a *api) Initialize() error {
 		{ApiGroup: "jwt", Method: "POST", Path: "/jwt/jsonInBlacklist", Description: "jwt加入黑名单(退出，必选)"},

 		{ApiGroup: "系统用户", Method: "DELETE", Path: "/user/deleteUser", Description: "删除用户"},
-		{ApiGroup: "系统用户", Method: "POST", Path: "/user/register", Description: "用户注册(必选)"},
+		{ApiGroup: "系统用户", Method: "POST", Path: "/user/register", Description: "用户注册"},
 		{ApiGroup: "系统用户", Method: "POST", Path: "/user/getUserList", Description: "获取用户列表"},
-		{ApiGroup: "系统用户", Method: "PUT", Path: "/user/setUserInfo", Description: "设置用户信息(必选)"},
+		{ApiGroup: "系统用户", Method: "PUT", Path: "/user/setUserInfo", Description: "设置用户信息"},
+		{ApiGroup: "系统用户", Method: "PUT", Path: "/user/setSelfInfo", Description: "设置自身信息(必选)"},
 		{ApiGroup: "系统用户", Method: "GET", Path: "/user/getUserInfo", Description: "获取自身信息(必选)"},
 		{ApiGroup: "系统用户", Method: "POST", Path: "/user/setUserAuthorities", Description: "设置权限组"},
-		{ApiGroup: "系统用户", Method: "POST", Path: "/user/changePassword", Description: "修改密码（建(选择)"},
+		{ApiGroup: "系统用户", Method: "POST", Path: "/user/changePassword", Description: "修改密码(建议选择)"},
 		{ApiGroup: "系统用户", Method: "POST", Path: "/user/setUserAuthority", Description: "修改用户角色(必选)"},
-		{ApiGroup: "系统用户", Method: "POST", Path: "/api/resetPassword", Description: "重置用户密码"},
+		{ApiGroup: "系统用户", Method: "POST", Path: "/user/resetPassword", Description: "重置用户密码"},

 		{ApiGroup: "api", Method: "POST", Path: "/api/createApi", Description: "创建api"},
 		{ApiGroup: "api", Method: "POST", Path: "/api/deleteApi", Description: "删除Api"},
@@ -59,6 +60,11 @@ func (a *api) Initialize() error {
 		{ApiGroup: "菜单", Method: "POST", Path: "/menu/getMenuAuthority", Description: "获取指定角色menu"},
 		{ApiGroup: "菜单", Method: "POST", Path: "/menu/addMenuAuthority", Description: "增加menu和角色关联关系"},

+		{ApiGroup: "分片上传", Method: "POST", Path: "/fileUploadAndDownload/findFile", Description: "寻找目标文件（秒传）"},
+		{ApiGroup: "分片上传", Method: "POST", Path: "/fileUploadAndDownload/breakpointContinue", Description: "断点续传"},
+		{ApiGroup: "分片上传", Method: "POST", Path: "/fileUploadAndDownload/breakpointContinueFinish", Description: "断点续传完成"},
+		{ApiGroup: "分片上传", Method: "POST", Path: "/fileUploadAndDownload/removeChunk", Description: "上传完成移除文件"},
+
 		{ApiGroup: "文件上传与下载", Method: "POST", Path: "/fileUploadAndDownload/upload", Description: "文件上传示例"},
 		{ApiGroup: "文件上传与下载", Method: "POST", Path: "/fileUploadAndDownload/deleteFile", Description: "删除文件"},
 		{ApiGroup: "文件上传与下载", Method: "POST", Path: "/fileUploadAndDownload/getFileList", Description: "获取上传文件列表"},
@@ -48,11 +48,18 @@ func (c *casbin) Initialize() error {

 		{PType: "p", V0: "888", V1: "/user/getUserInfo", V2: "GET"},
 		{PType: "p", V0: "888", V1: "/user/setUserInfo", V2: "PUT"},
+		{PType: "p", V0: "888", V1: "/user/setSelfInfo", V2: "PUT"},
 		{PType: "p", V0: "888", V1: "/user/getUserList", V2: "POST"},
 		{PType: "p", V0: "888", V1: "/user/deleteUser", V2: "DELETE"},
 		{PType: "p", V0: "888", V1: "/user/changePassword", V2: "POST"},
 		{PType: "p", V0: "888", V1: "/user/setUserAuthority", V2: "POST"},
 		{PType: "p", V0: "888", V1: "/user/setUserAuthorities", V2: "POST"},
+		{PType: "p", V0: "888", V1: "/user/resetPassword", V2: "POST"},
+
+		{PType: "p", V0: "888", V1: "/fileUploadAndDownload/findFile", V2: "GET"},
+		{PType: "p", V0: "888", V1: "/fileUploadAndDownload/breakpointContinueFinish", V2: "POST"},
+		{PType: "p", V0: "888", V1: "/fileUploadAndDownload/breakpointContinue", V2: "POST"},
+		{PType: "p", V0: "888", V1: "/fileUploadAndDownload/removeChunk", V2: "POST"},

 		{PType: "p", V0: "888", V1: "/fileUploadAndDownload/upload", V2: "POST"},
 		{PType: "p", V0: "888", V1: "/fileUploadAndDownload/deleteFile", V2: "POST"},
@@ -19,12 +19,12 @@ func (d *dictionary) Initialize() error {
 	status := new(bool)
 	*status = true
 	entities := []system.SysDictionary{
-		{Name: "性别", Type: "gender", Status: status, Desc: "性别字典"},
-		{Name: "数据库int类型", Type: "int", Status: status, Desc: "int类型对应的数据库类型"},
-		{Name: "数据库时间日期类型", Type: "time.Time", Status: status, Desc: "数据库时间日期类型"},
-		{Name: "数据库浮点型", Type: "float64", Status: status, Desc: "数据库浮点型"},
-		{Name: "数据库字符串", Type: "string", Status: status, Desc: "数据库字符串"},
-		{Name: "数据库bool类型", Type: "bool", Status: status, Desc: "数据库bool类型"},
+		{GVA_MODEL: global.GVA_MODEL{ID: 1}, Name: "性别", Type: "gender", Status: status, Desc: "性别字典"},
+		{GVA_MODEL: global.GVA_MODEL{ID: 2}, Name: "数据库int类型", Type: "int", Status: status, Desc: "int类型对应的数据库类型"},
+		{GVA_MODEL: global.GVA_MODEL{ID: 3}, Name: "数据库时间日期类型", Type: "time.Time", Status: status, Desc: "数据库时间日期类型"},
+		{GVA_MODEL: global.GVA_MODEL{ID: 4}, Name: "数据库浮点型", Type: "float64", Status: status, Desc: "数据库浮点型"},
+		{GVA_MODEL: global.GVA_MODEL{ID: 5}, Name: "数据库字符串", Type: "string", Status: status, Desc: "数据库字符串"},
+		{GVA_MODEL: global.GVA_MODEL{ID: 6}, Name: "数据库bool类型", Type: "bool", Status: status, Desc: "数据库bool类型"},
 	}
 	if err := global.GVA_DB.Create(&entities).Error; err != nil {
 		return errors.Wrap(err, d.TableName()+"表数据初始化失败!")
@@ -17,31 +17,31 @@ func (m *menu) TableName() string {

 func (m *menu) Initialize() error {
 	entities := []system.SysBaseMenu{
-		{MenuLevel: 0, Hidden: false, ParentId: "0", Path: "dashboard", Name: "dashboard", Component: "view/dashboard/index.vue", Sort: 1, Meta: system.Meta{Title: "仪表盘", Icon: "odometer"}},
-		{MenuLevel: 0, Hidden: false, ParentId: "0", Path: "about", Name: "about", Component: "view/about/index.vue", Sort: 7, Meta: system.Meta{Title: "关于我们", Icon: "info-filled"}},
-		{MenuLevel: 0, Hidden: false, ParentId: "0", Path: "admin", Name: "superAdmin", Component: "view/superAdmin/index.vue", Sort: 3, Meta: system.Meta{Title: "超级管理员", Icon: "user"}},
-		{MenuLevel: 0, Hidden: false, ParentId: "3", Path: "authority", Name: "authority", Component: "view/superAdmin/authority/authority.vue", Sort: 1, Meta: system.Meta{Title: "角色管理", Icon: "avatar"}},
-		{MenuLevel: 0, Hidden: false, ParentId: "3", Path: "menu", Name: "menu", Component: "view/superAdmin/menu/menu.vue", Sort: 2, Meta: system.Meta{Title: "菜单管理", Icon: "tickets", KeepAlive: true}},
-		{MenuLevel: 0, Hidden: false, ParentId: "3", Path: "api", Name: "api", Component: "view/superAdmin/api/api.vue", Sort: 3, Meta: system.Meta{Title: "api管理", Icon: "platform", KeepAlive: true}},
-		{MenuLevel: 0, Hidden: false, ParentId: "3", Path: "user", Name: "user", Component: "view/superAdmin/user/user.vue", Sort: 4, Meta: system.Meta{Title: "用户管理", Icon: "coordinate"}},
-		{MenuLevel: 0, Hidden: true, ParentId: "0", Path: "person", Name: "person", Component: "view/person/person.vue", Sort: 4, Meta: system.Meta{Title: "个人信息", Icon: "message"}},
-		{MenuLevel: 0, Hidden: false, ParentId: "0", Path: "example", Name: "example", Component: "view/example/index.vue", Sort: 6, Meta: system.Meta{Title: "示例文件", Icon: "management"}},
-		{MenuLevel: 0, Hidden: false, ParentId: "9", Path: "excel", Name: "excel", Component: "view/example/excel/excel.vue", Sort: 4, Meta: system.Meta{Title: "excel导入导出", Icon: "takeaway-box"}},
-		{MenuLevel: 0, Hidden: false, ParentId: "9", Path: "upload", Name: "upload", Component: "view/example/upload/upload.vue", Sort: 5, Meta: system.Meta{Title: "媒体库（上传下载）", Icon: "upload"}},
-		{MenuLevel: 0, Hidden: false, ParentId: "9", Path: "breakpoint", Name: "breakpoint", Component: "view/example/breakpoint/breakpoint.vue", Sort: 6, Meta: system.Meta{Title: "断点续传", Icon: "upload-filled"}},
-		{MenuLevel: 0, Hidden: false, ParentId: "9", Path: "customer", Name: "customer", Component: "view/example/customer/customer.vue", Sort: 7, Meta: system.Meta{Title: "客户列表（资源示例）", Icon: "avatar"}},
-		{MenuLevel: 0, Hidden: false, ParentId: "0", Path: "systemTools", Name: "systemTools", Component: "view/systemTools/index.vue", Sort: 5, Meta: system.Meta{Title: "系统工具", Icon: "tools"}},
-		{MenuLevel: 0, Hidden: false, ParentId: "14", Path: "autoCode", Name: "autoCode", Component: "view/systemTools/autoCode/index.vue", Sort: 1, Meta: system.Meta{Title: "代码生成器", Icon: "cpu", KeepAlive: true}},
-		{MenuLevel: 0, Hidden: false, ParentId: "14", Path: "formCreate", Name: "formCreate", Component: "view/systemTools/formCreate/index.vue", Sort: 2, Meta: system.Meta{Title: "表单生成器", Icon: "magic-stick", KeepAlive: true}},
-		{MenuLevel: 0, Hidden: false, ParentId: "14", Path: "system", Name: "system", Component: "view/systemTools/system/system.vue", Sort: 3, Meta: system.Meta{Title: "系统配置", Icon: "operation"}},
-		{MenuLevel: 0, Hidden: false, ParentId: "3", Path: "dictionary", Name: "dictionary", Component: "view/superAdmin/dictionary/sysDictionary.vue", Sort: 5, Meta: system.Meta{Title: "字典管理", Icon: "notebook"}},
-		{MenuLevel: 0, Hidden: true, ParentId: "3", Path: "dictionaryDetail/:id", Name: "dictionaryDetail", Component: "view/superAdmin/dictionary/sysDictionaryDetail.vue", Sort: 1, Meta: system.Meta{Title: "字典详情", Icon: "order"}},
-		{MenuLevel: 0, Hidden: false, ParentId: "3", Path: "operation", Name: "operation", Component: "view/superAdmin/operation/sysOperationRecord.vue", Sort: 6, Meta: system.Meta{Title: "操作历史", Icon: "pie-chart"}},
-		{MenuLevel: 0, Hidden: false, ParentId: "9", Path: "simpleUploader", Name: "simpleUploader", Component: "view/example/simpleUploader/simpleUploader", Sort: 6, Meta: system.Meta{Title: "断点续传（插件版）", Icon: "upload"}},
-		{MenuLevel: 0, Hidden: false, ParentId: "0", Path: "https://www.gin-vue-admin.com", Name: "https://www.gin-vue-admin.com", Component: "/", Sort: 0, Meta: system.Meta{Title: "官方网站", Icon: "home-filled"}},
-		{MenuLevel: 0, Hidden: false, ParentId: "0", Path: "state", Name: "state", Component: "view/system/state.vue", Sort: 6, Meta: system.Meta{Title: "服务器状态", Icon: "cloudy"}},
-		{MenuLevel: 0, Hidden: false, ParentId: "14", Path: "autoCodeAdmin", Name: "autoCodeAdmin", Component: "view/systemTools/autoCodeAdmin/index.vue", Sort: 1, Meta: system.Meta{Title: "自动化代码管理", Icon: "magic-stick"}},
-		{MenuLevel: 0, Hidden: true, ParentId: "14", Path: "autoCodeEdit/:id", Name: "autoCodeEdit", Component: "view/systemTools/autoCode/index.vue", Sort: 0, Meta: system.Meta{Title: "自动化代码（复用）", Icon: "magic-stick"}},
+		{GVA_MODEL: global.GVA_MODEL{ID: 1}, MenuLevel: 0, Hidden: false, ParentId: "0", Path: "dashboard", Name: "dashboard", Component: "view/dashboard/index.vue", Sort: 1, Meta: system.Meta{Title: "仪表盘", Icon: "odometer"}},
+		{GVA_MODEL: global.GVA_MODEL{ID: 2}, MenuLevel: 0, Hidden: false, ParentId: "0", Path: "about", Name: "about", Component: "view/about/index.vue", Sort: 7, Meta: system.Meta{Title: "关于我们", Icon: "info-filled"}},
+		{GVA_MODEL: global.GVA_MODEL{ID: 3}, MenuLevel: 0, Hidden: false, ParentId: "0", Path: "admin", Name: "superAdmin", Component: "view/superAdmin/index.vue", Sort: 3, Meta: system.Meta{Title: "超级管理员", Icon: "user"}},
+		{GVA_MODEL: global.GVA_MODEL{ID: 4}, MenuLevel: 0, Hidden: false, ParentId: "3", Path: "authority", Name: "authority", Component: "view/superAdmin/authority/authority.vue", Sort: 1, Meta: system.Meta{Title: "角色管理", Icon: "avatar"}},
+		{GVA_MODEL: global.GVA_MODEL{ID: 5}, MenuLevel: 0, Hidden: false, ParentId: "3", Path: "menu", Name: "menu", Component: "view/superAdmin/menu/menu.vue", Sort: 2, Meta: system.Meta{Title: "菜单管理", Icon: "tickets", KeepAlive: true}},
+		{GVA_MODEL: global.GVA_MODEL{ID: 6}, MenuLevel: 0, Hidden: false, ParentId: "3", Path: "api", Name: "api", Component: "view/superAdmin/api/api.vue", Sort: 3, Meta: system.Meta{Title: "api管理", Icon: "platform", KeepAlive: true}},
+		{GVA_MODEL: global.GVA_MODEL{ID: 7}, MenuLevel: 0, Hidden: false, ParentId: "3", Path: "user", Name: "user", Component: "view/superAdmin/user/user.vue", Sort: 4, Meta: system.Meta{Title: "用户管理", Icon: "coordinate"}},
+		{GVA_MODEL: global.GVA_MODEL{ID: 8}, MenuLevel: 0, Hidden: true, ParentId: "0", Path: "person", Name: "person", Component: "view/person/person.vue", Sort: 4, Meta: system.Meta{Title: "个人信息", Icon: "message"}},
+		{GVA_MODEL: global.GVA_MODEL{ID: 9}, MenuLevel: 0, Hidden: false, ParentId: "0", Path: "example", Name: "example", Component: "view/example/index.vue", Sort: 6, Meta: system.Meta{Title: "示例文件", Icon: "management"}},
+		{GVA_MODEL: global.GVA_MODEL{ID: 10}, MenuLevel: 0, Hidden: false, ParentId: "9", Path: "excel", Name: "excel", Component: "view/example/excel/excel.vue", Sort: 4, Meta: system.Meta{Title: "excel导入导出", Icon: "takeaway-box"}},
+		{GVA_MODEL: global.GVA_MODEL{ID: 11}, MenuLevel: 0, Hidden: false, ParentId: "9", Path: "upload", Name: "upload", Component: "view/example/upload/upload.vue", Sort: 5, Meta: system.Meta{Title: "媒体库（上传下载）", Icon: "upload"}},
+		{GVA_MODEL: global.GVA_MODEL{ID: 12}, MenuLevel: 0, Hidden: false, ParentId: "9", Path: "breakpoint", Name: "breakpoint", Component: "view/example/breakpoint/breakpoint.vue", Sort: 6, Meta: system.Meta{Title: "断点续传", Icon: "upload-filled"}},
+		{GVA_MODEL: global.GVA_MODEL{ID: 13}, MenuLevel: 0, Hidden: false, ParentId: "9", Path: "customer", Name: "customer", Component: "view/example/customer/customer.vue", Sort: 7, Meta: system.Meta{Title: "客户列表（资源示例）", Icon: "avatar"}},
+		{GVA_MODEL: global.GVA_MODEL{ID: 14}, MenuLevel: 0, Hidden: false, ParentId: "0", Path: "systemTools", Name: "systemTools", Component: "view/systemTools/index.vue", Sort: 5, Meta: system.Meta{Title: "系统工具", Icon: "tools"}},
+		{GVA_MODEL: global.GVA_MODEL{ID: 15}, MenuLevel: 0, Hidden: false, ParentId: "14", Path: "autoCode", Name: "autoCode", Component: "view/systemTools/autoCode/index.vue", Sort: 1, Meta: system.Meta{Title: "代码生成器", Icon: "cpu", KeepAlive: true}},
+		{GVA_MODEL: global.GVA_MODEL{ID: 16}, MenuLevel: 0, Hidden: false, ParentId: "14", Path: "formCreate", Name: "formCreate", Component: "view/systemTools/formCreate/index.vue", Sort: 2, Meta: system.Meta{Title: "表单生成器", Icon: "magic-stick", KeepAlive: true}},
+		{GVA_MODEL: global.GVA_MODEL{ID: 17}, MenuLevel: 0, Hidden: false, ParentId: "14", Path: "system", Name: "system", Component: "view/systemTools/system/system.vue", Sort: 3, Meta: system.Meta{Title: "系统配置", Icon: "operation"}},
+		{GVA_MODEL: global.GVA_MODEL{ID: 18}, MenuLevel: 0, Hidden: false, ParentId: "3", Path: "dictionary", Name: "dictionary", Component: "view/superAdmin/dictionary/sysDictionary.vue", Sort: 5, Meta: system.Meta{Title: "字典管理", Icon: "notebook"}},
+		{GVA_MODEL: global.GVA_MODEL{ID: 19}, MenuLevel: 0, Hidden: true, ParentId: "3", Path: "dictionaryDetail/:id", Name: "dictionaryDetail", Component: "view/superAdmin/dictionary/sysDictionaryDetail.vue", Sort: 1, Meta: system.Meta{Title: "字典详情", Icon: "order"}},
+		{GVA_MODEL: global.GVA_MODEL{ID: 20}, MenuLevel: 0, Hidden: false, ParentId: "3", Path: "operation", Name: "operation", Component: "view/superAdmin/operation/sysOperationRecord.vue", Sort: 6, Meta: system.Meta{Title: "操作历史", Icon: "pie-chart"}},
+		{GVA_MODEL: global.GVA_MODEL{ID: 21}, MenuLevel: 0, Hidden: false, ParentId: "9", Path: "simpleUploader", Name: "simpleUploader", Component: "view/example/simpleUploader/simpleUploader", Sort: 6, Meta: system.Meta{Title: "断点续传（插件版）", Icon: "upload"}},
+		{GVA_MODEL: global.GVA_MODEL{ID: 22}, MenuLevel: 0, Hidden: false, ParentId: "0", Path: "https://www.gin-vue-admin.com", Name: "https://www.gin-vue-admin.com", Component: "/", Sort: 0, Meta: system.Meta{Title: "官方网站", Icon: "home-filled"}},
+		{GVA_MODEL: global.GVA_MODEL{ID: 23}, MenuLevel: 0, Hidden: false, ParentId: "0", Path: "state", Name: "state", Component: "view/system/state.vue", Sort: 6, Meta: system.Meta{Title: "服务器状态", Icon: "cloudy"}},
+		{GVA_MODEL: global.GVA_MODEL{ID: 24}, MenuLevel: 0, Hidden: false, ParentId: "14", Path: "autoCodeAdmin", Name: "autoCodeAdmin", Component: "view/systemTools/autoCodeAdmin/index.vue", Sort: 1, Meta: system.Meta{Title: "自动化代码管理", Icon: "magic-stick"}},
+		{GVA_MODEL: global.GVA_MODEL{ID: 25}, MenuLevel: 0, Hidden: true, ParentId: "14", Path: "autoCodeEdit/:id", Name: "autoCodeEdit", Component: "view/systemTools/autoCode/index.vue", Sort: 0, Meta: system.Meta{Title: "自动化代码（复用）", Icon: "magic-stick"}},
 	}
 	if err := global.GVA_DB.Create(&entities).Error; err != nil { // 创建 model.User 初始化数据
 		return errors.Wrap(err, m.TableName()+"表数据初始化失败!")
@@ -0,0 +1,94 @@
+package upload
+
+import (
+	"errors"
+	"fmt"
+	"mime/multipart"
+	"time"
+
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/credentials"
+	"github.com/aws/aws-sdk-go/aws/session"
+	"github.com/aws/aws-sdk-go/service/s3"
+	"github.com/aws/aws-sdk-go/service/s3/s3manager"
+	"go.uber.org/zap"
+)
+
+type AwsS3 struct{}
+
+//@author: [WqyJh](https://github.com/WqyJh)
+//@object: *AwsS3
+//@function: UploadFile
+//@description: Upload file to Aws S3 using aws-sdk-go. See https://docs.aws.amazon.com/sdk-for-go/v1/developer-guide/s3-example-basic-bucket-operations.html#s3-examples-bucket-ops-upload-file-to-bucket
+//@param: file *multipart.FileHeader
+//@return: string, string, error
+
+func (*AwsS3) UploadFile(file *multipart.FileHeader) (string, string, error) {
+	session := newSession()
+	uploader := s3manager.NewUploader(session)
+
+	fileKey := fmt.Sprintf("%d%s", time.Now().Unix(), file.Filename)
+	filename := global.GVA_CONFIG.AwsS3.PathPrefix + "/" + fileKey
+	f, openError := file.Open()
+	if openError != nil {
+		global.GVA_LOG.Error("function file.Open() Filed", zap.Any("err", openError.Error()))
+		return "", "", errors.New("function file.Open() Filed, err:" + openError.Error())
+	}
+	defer f.Close() // 创建文件 defer 关闭
+
+	_, err := uploader.Upload(&s3manager.UploadInput{
+		Bucket: aws.String(global.GVA_CONFIG.AwsS3.Bucket),
+		Key:    aws.String(filename),
+		Body:   f,
+	})
+	if err != nil {
+		global.GVA_LOG.Error("function uploader.Upload() Filed", zap.Any("err", err.Error()))
+		return "", "", err
+	}
+
+	return global.GVA_CONFIG.AwsS3.BaseURL + "/" + filename, fileKey, nil
+}
+
+//@author: [WqyJh](https://github.com/WqyJh)
+//@object: *AwsS3
+//@function: DeleteFile
+//@description: Delete file from Aws S3 using aws-sdk-go. See https://docs.aws.amazon.com/sdk-for-go/v1/developer-guide/s3-example-basic-bucket-operations.html#s3-examples-bucket-ops-delete-bucket-item
+//@param: file *multipart.FileHeader
+//@return: string, string, error
+
+func (*AwsS3) DeleteFile(key string) error {
+	session := newSession()
+	svc := s3.New(session)
+	filename := global.GVA_CONFIG.AwsS3.PathPrefix + "/" + key
+	bucket := global.GVA_CONFIG.AwsS3.Bucket
+
+	_, err := svc.DeleteObject(&s3.DeleteObjectInput{
+		Bucket: aws.String(bucket),
+		Key:    aws.String(filename),
+	})
+	if err != nil {
+		global.GVA_LOG.Error("function svc.DeleteObject() Filed", zap.Any("err", err.Error()))
+		return errors.New("function svc.DeleteObject() Filed, err:" + err.Error())
+	}
+
+	_ = svc.WaitUntilObjectNotExists(&s3.HeadObjectInput{
+		Bucket: aws.String(bucket),
+		Key:    aws.String(filename),
+	})
+	return nil
+}
+
+// newSession Create S3 session
+func newSession() *session.Session {
+	sess, _ := session.NewSession(&aws.Config{
+		Region: aws.String(global.GVA_CONFIG.AwsS3.Region),
+		Credentials: credentials.NewStaticCredentials(
+			global.GVA_CONFIG.AwsS3.SecretID,
+			global.GVA_CONFIG.AwsS3.SecretKey,
+			"",
+		),
+	})
+	return sess
+}
@@ -29,6 +29,8 @@ func NewOss() OSS {
 		return &AliyunOSS{}
 	case "huawei-obs":
 		return HuaWeiObs
+	case "aws-s3":
+		return &AwsS3{}
 	default:
 		return &Local{}
 	}
@@ -3,5 +3,6 @@ ENV = 'production'
 VITE_CLI_PORT = 8080
 VITE_SERVER_PORT = 8888
 VITE_BASE_API = /api
-#下方修改为你的线上ip
-VITE_BASE_PATH = http://8.141.61.63
+#下方修改为你的线上ip 如果 https模式下则使用域名 并且配置代理 （不建议上线使用表单生成器）
+#VITE_BASE_PATH = http://x.x.x.x 
+VITE_BASE_PATH = https://demo.gin-vue-admin.com
@@ -50,4 +50,4 @@
        "vite-plugin-banner": "^0.1.3",
        "vite-plugin-importer": "^0.2.5"
    }
-}
+}
@@ -16,6 +16,15 @@ export const findFile = (params) => {
  })
 }

+export const breakpointContinue = (data) => {
+  return service({
+      url: '/fileUploadAndDownload/breakpointContinue',
+      method: 'post',
+      headers: { 'Content-Type': 'multipart/form-data' },
+      data
+  })
+}
+
 export const breakpointContinueFinish = (params) => {
  return service({
    url: '/fileUploadAndDownload/breakpointContinueFinish',
@@ -112,6 +112,22 @@ export const setUserInfo = (data) => {
  })
 }

+// @Tags SysUser
+// @Summary 设置用户信息
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body model.SysUser true "设置用户信息"
+// @Success 200 {string} string "{"success":true,"data":{},"msg":"修改成功"}"
+// @Router /user/setSelfInfo [put]
+export const setSelfInfo = (data) => {
+  return service({
+    url: '/user/setSelfInfo',
+    method: 'put',
+    data: data
+  })
+}
+
 // @Tags User
 // @Summary 设置用户权限
 // @Security ApiKeyAuth
@@ -142,9 +158,10 @@ export const getUserInfo = () => {
  })
 }

-export const resetPassword = () => {
+export const resetPassword = (data) => {
  return service({
    url: '/user/resetPassword',
-    method: 'post'
+    method: 'post',
+    data: data
  })
 }
@@ -19,7 +19,7 @@
 </template>

 <script>
-const path = process.env.VUE_APP_BASE_API
+const path = import.meta.env.VITE_BASE_API
 import { getFileList } from '@/api/fileUploadAndDownload'
 export default {
  props: {
@@ -6,71 +6,70 @@ let asyncRouterFlag = 0
 const whiteList = ['Login', 'Init']

 const getRouter = async() => {
-    await store.dispatch('router/SetAsyncRouter')
-    await store.dispatch('user/GetUserInfo')
-    const asyncRouters = store.getters['router/asyncRouters']
-    asyncRouters.forEach(asyncRouter => {
-        router.addRoute(asyncRouter)
-    })
+  await store.dispatch('router/SetAsyncRouter')
+  await store.dispatch('user/GetUserInfo')
+  const asyncRouters = store.getters['router/asyncRouters']
+  asyncRouters.forEach(asyncRouter => {
+    router.addRoute(asyncRouter)
+  })
 }

 async function handleKeepAlive(to) {
-    if (to.matched && to.matched.length > 2) {
-        for (let i = 1; i < to.matched.length; i++) {
-            const element = to.matched[i - 1]
-            if (element.name === 'layout') {
-                to.matched.splice(i, 1)
-                await handleKeepAlive(to)
-            }
-            // 如果没有按需加载完成则等待加载
-            if (typeof element.components.default === 'function') {
-                await element.components.default()
-                await handleKeepAlive(to)
-            }
-        }
+  if (to.matched && to.matched.length > 2) {
+    for (let i = 1; i < to.matched.length; i++) {
+      const element = to.matched[i - 1]
+      if (element.name === 'layout') {
+        to.matched.splice(i, 1)
+        await handleKeepAlive(to)
+      }
+      // 如果没有按需加载完成则等待加载
+      if (typeof element.components.default === 'function') {
+        await element.components.default()
+        await handleKeepAlive(to)
+      }
    }
+  }
 }

 router.beforeEach(async(to, from, next) => {
-    handleKeepAlive(to)
-    const token = store.getters['user/token']
-        // 在白名单中的判断情况
-    document.title = getPageTitle(to.meta.title)
-    if (whiteList.indexOf(to.name) > -1) {
-        if (token) {
-            if (!asyncRouterFlag) {
-                asyncRouterFlag++
-                await getRouter()
-            }
-            next({ name: store.getters['user/userInfo'].authority.defaultRouter })
-        } else {
-            next()
-        }
+  handleKeepAlive(to)
+  const token = store.getters['user/token']
+  // 在白名单中的判断情况
+  document.title = getPageTitle(to.meta.title)
+  if (whiteList.indexOf(to.name) > -1) {
+    if (token) {
+      if (!asyncRouterFlag && whiteList.indexOf(from.name) < 0) {
+        asyncRouterFlag++
+        await getRouter()
+      }
+      next({ name: store.getters['user/userInfo'].authority.defaultRouter })
    } else {
-        // 不在白名单中并且已经登陆的时候
-        if (token) {
-            // 添加flag防止多次获取动态路由和栈溢出
-            if (!asyncRouterFlag) {
-                asyncRouterFlag++
-                await getRouter()
-
-                next({...to, replace: true })
-            } else {
-                if (to.matched.length) {
-                    next()
-                } else {
-                    next({ path: '/layout/404' })
-                }
-            }
-        }
-        // 不在白名单中并且未登陆的时候
-        if (!token) {
-            next({
-                name: 'Login',
-                query: {
-                    redirect: document.location.hash
-                }
-            })
-        }
+      next()
    }
-})
+  } else {
+    // 不在白名单中并且已经登陆的时候
+    if (token) {
+      // 添加flag防止多次获取动态路由和栈溢出
+      if (!asyncRouterFlag && whiteList.indexOf(from.name) < 0) {
+        asyncRouterFlag++
+        await getRouter()
+        next({ ...to, replace: true })
+      } else {
+        if (to.matched.length) {
+          next()
+        } else {
+          next({ path: '/layout/404' })
+        }
+      }
+    }
+    // 不在白名单中并且未登陆的时候
+    if (!token) {
+      next({
+        name: 'Login',
+        query: {
+          redirect: document.location.hash
+        }
+      })
+    }
+  }
+})
@@ -5,14 +5,15 @@ import { asyncMenu } from '@/api/menu'
 const routerList = []
 const keepAliveRouters = []

-const formatRouter = (routes) => {
+const formatRouter = (routes, routeMap) => {
  routes && routes.forEach(item => {
    if ((!item.children || item.children.every(ch => ch.hidden)) && item.name !== '404' && !item.hidden) {
      routerList.push({ label: item.meta.title, value: item.name })
    }
    item.meta.hidden = item.hidden
+    routeMap[item.name] = item
    if (item.children && item.children.length > 0) {
-      formatRouter(item.children)
+      formatRouter(item.children, routeMap)
    }
  })
 }
@@ -21,7 +22,7 @@ const KeepAliveFilter = (routes) => {
  routes && routes.forEach(item => {
    // 子菜单中有 keep-alive 的，父菜单也必须 keep-alive，否则无效。这里将子菜单中有 keep-alive 的父菜单也加入。
    if ((item.children && item.children.some(ch => ch.meta.keepAlive) || item.meta.keepAlive)) {
-      item.component().then(val => { keepAliveRouters.push(val.default.name) })
+      item.component && item.component().then(val => { keepAliveRouters.push(val.default.name) })
    }
    if (item.children && item.children.length > 0) {
      KeepAliveFilter(item.children)
@@ -33,6 +34,7 @@ export const router = {
  namespaced: true,
  state: {
    asyncRouters: [],
+    routeMap: {},
    routerList: routerList,
    keepAliveRouters: keepAliveRouters
  },
@@ -47,6 +49,9 @@ export const router = {
    // 设置需要缓存的路由
    setKeepAliveRouters(state, keepAliveRouters) {
      state.keepAliveRouters = keepAliveRouters
+    },
+    serRouteMap(state, routeMap) {
+      state.routeMap = routeMap
    }
  },
  actions: {
@@ -62,6 +67,7 @@ export const router = {
        children: []
      }]
      const asyncRouterRes = await asyncMenu()
+      const routeMap = {}
      const asyncRouter = asyncRouterRes.data.menus
      asyncRouter.push({
        path: '404',
@@ -72,7 +78,7 @@ export const router = {
        },
        component: 'view/error/index.vue'
      })
-      formatRouter(asyncRouter)
+      formatRouter(asyncRouter, routeMap)
      baseRouter[0].children = asyncRouter
      baseRouter.push({
        path: '/:catchAll(.*)',
@@ -82,6 +88,7 @@ export const router = {
      asyncRouterHandle(baseRouter)
      KeepAliveFilter(asyncRouter)
      commit('setAsyncRouter', baseRouter)
+      commit('serRouteMap', routeMap)
      commit('setRouterList', routerList)
      commit('setKeepAliveRouters', keepAliveRouters)
      return true
@@ -97,6 +104,9 @@ export const router = {
    },
    keepAliveRouters(state) {
      return state.keepAliveRouters
+    },
+    routeMap(state) {
+      return state.routeMap
    }
  }
 }
@@ -1,4 +1,4 @@
-import { login, getUserInfo, setUserInfo } from '@/api/user'
+import { login, getUserInfo, setSelfInfo } from '@/api/user'
 import { jsonInBlacklist } from '@/api/jwt'
 import router from '@/router/index'
 import { ElMessage } from 'element-plus'
@@ -81,7 +81,7 @@ export const user = {
      }
    },
    async changeSideMode({ commit, state }, data) {
-      const res = await setUserInfo({ sideMode: data, ID: state.userInfo.ID })
+      const res = await setSelfInfo({ sideMode: data })
      if (res.code === 0) {
        commit('ChangeSideMode', data)
        ElMessage({
@@ -4,113 +4,113 @@ import { store } from '@/store'
 import { emitter } from '@/utils/bus.js'

 const service = axios.create({
-    baseURL: import.meta.env.VITE_BASE_API,
-    timeout: 99999
+  baseURL: import.meta.env.VITE_BASE_API,
+  timeout: 99999
 })
 let acitveAxios = 0
 let timer
 const showLoading = () => {
-    acitveAxios++
-    if (timer) {
-        clearTimeout(timer)
+  acitveAxios++
+  if (timer) {
+    clearTimeout(timer)
+  }
+  timer = setTimeout(() => {
+    if (acitveAxios > 0) {
+      emitter.emit('showLoading')
    }
-    timer = setTimeout(() => {
-        if (acitveAxios > 0) {
-            emitter.emit('showLoading')
-        }
-    }, 400)
+  }, 400)
 }

 const closeLoading = () => {
-        acitveAxios--
-        if (acitveAxios <= 0) {
-            clearTimeout(timer)
-            emitter.emit('closeLoading')
-        }
-    }
-    // http request 拦截器
+  acitveAxios--
+  if (acitveAxios <= 0) {
+    clearTimeout(timer)
+    emitter.emit('closeLoading')
+  }
+}
+// http request 拦截器
 service.interceptors.request.use(
-    config => {
-        if (!config.donNotShowLoading) {
-            showLoading()
-        }
-        const token = store.getters['user/token']
-        const user = store.getters['user/userInfo']
-        config.data = JSON.stringify(config.data)
-        config.headers = {
-            'Content-Type': 'application/json',
-            'x-token': token,
-            'x-user-id': user.ID
-        }
-        return config
-    },
-    error => {
-        closeLoading()
-        ElMessage({
-            showClose: true,
-            message: error,
-            type: 'error'
-        })
-        return error
+  config => {
+    if (!config.donNotShowLoading) {
+      showLoading()
    }
+    const token = store.getters['user/token']
+    const user = store.getters['user/userInfo']
+    config.headers = {
+      'Content-Type': 'application/json',
+      'x-token': token,
+      'x-user-id': user.ID,
+      ...config.headers
+    }
+    return config
+  },
+  error => {
+    closeLoading()
+    ElMessage({
+      showClose: true,
+      message: error,
+      type: 'error'
+    })
+    return error
+  }
 )

 // http response 拦截器
 service.interceptors.response.use(
-    response => {
-        closeLoading()
-        if (response.headers['new-token']) {
-            store.commit('user/setToken', response.headers['new-token'])
-        }
-        if (response.data.code === 0 || response.headers.success === 'true') {
-            if (response.headers.msg) {
-                response.data.msg = decodeURI(response.headers.msg)
-            }
-            return response.data
-        } else {
-            ElMessage({
-                showClose: true,
-                message: response.data.msg||decodeURI(response.headers.msg),
-                type: 'error'
-            })
-            if (response.data.data && response.data.data.reload) {
-                store.commit('user/LoginOut')
-            }
-            return response.data.msg ? response.data : response
-        }
-    },
-    error => {
-        closeLoading()
-        switch (error.response.status) {
-            case 500:
-                ElMessageBox.confirm(`
+  response => {
+    closeLoading()
+    if (response.headers['new-token']) {
+      store.commit('user/setToken', response.headers['new-token'])
+    }
+    if (response.data.code === 0 || response.headers.success === 'true') {
+      if (response.headers.msg) {
+        response.data.msg = decodeURI(response.headers.msg)
+      }
+      return response.data
+    } else {
+      ElMessage({
+        showClose: true,
+        message: response.data.msg || decodeURI(response.headers.msg),
+        type: 'error'
+      })
+      if (response.data.data && response.data.data.reload) {
+        store.commit('user/LoginOut')
+      }
+      return response.data.msg ? response.data : response
+    }
+  },
+  error => {
+    closeLoading()
+    switch (error.response.status) {
+      case 500:
+        ElMessageBox.confirm(`
        <p>检测到接口错误${error}</p>
        <p>错误码<span style="color:red"> 500 </span>：此类错误内容常见于后台panic，请先查看后台日志，如果影响您正常使用可强制登出清理缓存</p>
        `, '接口报错', {
-                        dangerouslyUseHTMLString: true,
-                        distinguishCancelAndClose: true,
-                        confirmButtonText: '清理缓存',
-                        cancelButtonText: '取消'
-                    })
-                    .then(() => {
-                        store.commit('user/LoginOut')
-                    })
-                break
-            case 404:
-                ElMessageBox.confirm(`
+          dangerouslyUseHTMLString: true,
+          distinguishCancelAndClose: true,
+          confirmButtonText: '清理缓存',
+          cancelButtonText: '取消'
+        })
+          .then(() => {
+            store.commit('user/LoginOut')
+          })
+        break
+      case 404:
+        ElMessageBox.confirm(`
          <p>检测到接口错误${error}</p>
          <p>错误码<span style="color:red"> 404 </span>：此类错误多为接口未注册（或未重启）或者请求路径（方法）与api路径（方法）不符--如果为自动化代码请检查是否存在空格</p>
          `, '接口报错', {
-                    dangerouslyUseHTMLString: true,
-                    distinguishCancelAndClose: true,
-                    confirmButtonText: '我知道了',
-                    cancelButtonText: '取消'
-                })
-                break
-        }
-
-        return error
+          dangerouslyUseHTMLString: true,
+          distinguishCancelAndClose: true,
+          confirmButtonText: '我知道了',
+          cancelButtonText: '取消'
+        })
+        break
    }
+
+    return error
+  }
 )

-export default service
+export default service
@@ -3,8 +3,8 @@
    <div class="big">
      <div class="inner">
        <img src="../../assets/notFound.png">
-        <p>页面被神秘力量吸走了，请联系我们修复</p>
-        <p style="font-size:18px;line-height:40px;">常见问题为菜单未分配仪表盘，可自行分配仪表盘或修改默认路由</p>
+        <p>页面被神秘力量吸走了（如果您是开源版请联系我们修复）</p>
+        <p style="font-size:18px;line-height:40px;">常见问题为当前此角色无当前路由，如果确定要使用本路由，请到角色管理进行分配</p>
        <p>↓</p>
        <img src="../../assets/qm.png" class="leftPic">
      </div>
@@ -33,11 +33,11 @@

 <script>
 import SparkMD5 from 'spark-md5'
-import axios from 'axios'
 import {
  findFile,
  breakpointContinueFinish,
-  removeChunk
+  removeChunk,
+  breakpointContinue
 } from '@/api/breakpoint'
 export default {
  name: 'BreakPoint',
@@ -47,13 +47,18 @@ export default {
      fileMd5: '',
      formDataList: [],
      waitUpLoad: [],
-      waitNum: 0,
+      waitNum: NaN,
      limitFileSize: false,
      percentage: 0,
      percentageFlage: true,
      customColor: '#409eff'
    }
  },
+  watch: {
+    waitNum() {
+      this.percentage = Math.floor(((this.formDataList.length - this.waitNum) / this.formDataList.length) * 100)
+    }
+  },
  methods: {
    // 选中文件的函数
    async choseFile(e) {
@@ -107,6 +112,7 @@ export default {
            })
          } else {
            this.waitUpLoad = [] // 秒传则没有需要上传的切片
+            this.$message.success('文件已秒传')
          }
          this.waitNum = this.waitUpLoad.length // 记录长度用于百分比展示
        }
@@ -121,7 +127,6 @@ export default {
        this.$message('请先上传文件')
        return
      }
-      this.percentage = Math.floor(((this.formDataList.length - this.waitNum) / this.formDataList.length) * 100)
      if (this.percentage === 100) {
        this.percentageFlage = false
      }
@@ -145,7 +150,10 @@ export default {
    },
    async upLoadFileSlice(item) {
      // 切片上传
-      await axios.post(import.meta.env.VITE_BASE_API + '/fileUploadAndDownload/breakpointContinue', item.formData)
+      const fileRe = await breakpointContinue(item.formData)
+      if (fileRe.code !== 0) {
+        return
+      }
      this.waitNum-- // 百分数增加
      if (this.waitNum === 0) {
        // 切片传完以后 合成文件
@@ -154,13 +162,14 @@ export default {
          fileMd5: this.fileMd5
        }
        const res = await breakpointContinueFinish(params)
-        if (res.success) {
+        if (res.code === 0) {
          // 合成文件过后 删除缓存切片
          const params = {
            fileName: this.file.name,
            fileMd5: this.fileMd5,
            filePath: res.data.filePath
          }
+          this.$message.success('上传成功')
          await removeChunk(params)
        }
      }
@@ -24,7 +24,7 @@
        <el-table-column align="left" label="按钮组" min-width="160">
          <template #default="scope">
            <el-button size="small" type="text" icon="edit" @click="updateCustomer(scope.row)">变更</el-button>
-            <el-popover :visible="scope.row.visible" placement="top" width="160">
+            <el-popover v-model:visible="scope.row.visible" placement="top" width="160">
              <p>确定要删除吗？</p>
              <div style="text-align: right; margin-top: 8px;">
                <el-button size="mini" type="text" @click="scope.row.visible = false">取消</el-button>
@@ -39,7 +39,7 @@ export default {
    }
  },
  computed: {
-    ...mapGetters('router', ['asyncRouters']),
+    ...mapGetters('router', ['asyncRouters', 'routeMap']),
    ...mapGetters('user', ['baseColor', 'activeColor', 'sideMode'])
  },
  watch: {
@@ -63,11 +63,11 @@ export default {
  },
  methods: {
    ...mapMutations('history', ['addHistory']),
-    selectMenuItem(index, _, ele) {
+    selectMenuItem(index) {
      const query = {}
      const params = {}
-      ele?.route?.parameters &&
-      ele.route.parameters.forEach(item => {
+      this.routeMap[index]?.parameters &&
+      this.routeMap[index].parameters.forEach(item => {
        if (item.type === 'query') {
          query[item.key] = item.value
        } else {
@@ -130,7 +130,7 @@

 <script>
 import ChooseImg from '@/components/chooseImg/index.vue'
-import { setUserInfo, changePassword } from '@/api/user.js'
+import { setSelfInfo, changePassword } from '@/api/user.js'

 import { mapGetters, mapMutations } from 'vuex'
 const path = import.meta.env.VITE_BASE_API
@@ -208,7 +208,7 @@ export default {
      this.$refs.chooseImg.open()
    },
    async enterImg(url) {
-      const res = await setUserInfo({ headerImg: url, ID: this.userInfo.ID })
+      const res = await setSelfInfo({ headerImg: url })
      if (res.code === 0) {
        this.ResetUserInfo({ headerImg: url })
        this.$message({
@@ -226,7 +226,7 @@ export default {
      this.editFlag = false
    },
    async enterEdit() {
-      const res = await setUserInfo({ nickName: this.nickName, ID: this.userInfo.ID })
+      const res = await setSelfInfo({ nickName: this.nickName })
      if (res.code === 0) {
        this.ResetUserInfo({ nickName: this.nickName })
        this.$message({
@@ -228,6 +228,9 @@ export default {
    // 排序
    sortChange({ prop, order }) {
      if (prop) {
+        if (prop === 'ID') {
+          prop = 'id'
+        }
        this.searchInfo.orderKey = toSQLLine(prop)
        this.searchInfo.desc = order === 'descending'
      }
@@ -56,7 +56,7 @@
          <template #default="scope">
            <el-button size="mini" icon="document" type="text" @click="toDetile(scope.row)">详情</el-button>
            <el-button size="mini" icon="edit" type="text" @click="updateSysDictionary(scope.row)">变更</el-button>
-            <el-popover :visible="scope.row.visible" placement="top" width="160">
+            <el-popover v-model:visible="scope.row.visible" placement="top" width="160">
              <p>确定要删除吗？</p>
              <div style="text-align: right; margin-top: 8px;">
                <el-button size="mini" type="text" @click="scope.row.visible = false">取消</el-button>
@@ -49,7 +49,7 @@
        <el-table-column align="left" label="按钮组">
          <template #default="scope">
            <el-button size="small" type="text" icon="edit" @click="updateSysDictionaryDetail(scope.row)">变更</el-button>
-            <el-popover :visible="scope.row.visible" placement="top" width="160">
+            <el-popover v-model:visible="scope.row.visible" placement="top" width="160">
              <p>确定要删除吗？</p>
              <div style="text-align: right; margin-top: 8px;">
                <el-button size="mini" type="text" @click="scope.row.visible = false">取消</el-button>
@@ -1160,6 +1160,9 @@ export default {
  },
  created() {
    this.metaData = this.meta
+    if (this.metaData.icon === '') {
+      this.metaData.icon = this.options[0].label
+    }
  },
  methods: {}
 }
@@ -58,7 +58,7 @@
      </el-table>
    </div>
    <el-dialog v-model="dialogFormVisible" :before-close="handleClose" :title="dialogTitle">
-      <warning-bar title="新增菜单，需要在角色管理内篇日志权限才可使用" />
+      <warning-bar title="新增菜单，需要在角色管理内配置权限才可使用" />
      <el-form
        v-if="dialogFormVisible"
        ref="menuForm"
@@ -91,7 +91,7 @@
        </el-table-column>
        <el-table-column align="left" label="按钮组">
          <template #default="scope">
-            <el-popover :visible="scope.row.visible" placement="top" width="160">
+            <el-popover v-model:visible="scope.row.visible" placement="top" width="160">
              <p>确定要删除吗？</p>
              <div style="text-align: right; margin-top: 8px;">
                <el-button size="mini" type="text" @click="scope.row.visible = false">取消</el-button>
@@ -47,7 +47,7 @@
        </el-table-column>
        <el-table-column align="left" label="操作" min-width="150">
          <template #default="scope">
-            <el-popover :visible="scope.row.visible" placement="top" width="160">
+            <el-popover v-model:visible="scope.row.visible" placement="top" width="160">
              <p>确定要删除此用户吗</p>
              <div style="text-align: right; margin-top: 8px;">
                <el-button size="mini" type="text" @click="scope.row.visible = false">取消</el-button>
@@ -128,7 +128,7 @@ import { mapGetters } from 'vuex'
 import CustomPic from '@/components/customPic/index.vue'
 import ChooseImg from '@/components/chooseImg/index.vue'
 import warningBar from '@/components/warningBar/warningBar.vue'
-import { setUserInfo, resetPassword } from '@/api/user.js'
+import { setSelfInfo, resetPassword } from '@/api/user.js'
 export default {
  name: 'Api',
  components: { CustomPic, ChooseImg, warningBar },
@@ -230,7 +230,7 @@ export default {
      row.editFlag = true
    },
    async enterEdit(row) {
-      const res = await setUserInfo({ nickName: row.nickName, ID: row.ID })
+      const res = await setSelfInfo({ nickName: row.nickName })
      if (res.code === 0) {
        this.$message({
          type: 'success',
@@ -117,7 +117,7 @@
              :disabled="(scope.$index + 1) === form.fields.length"
              @click="moveDownField(scope.$index)"
            >下移</el-button>
-            <el-popover :visible="scope.row.visible" placement="top">
+            <el-popover v-model:visible="scope.row.visible" placement="top">
              <p>确定删除吗？</p>
              <div style="text-align: right; margin-top: 8px;">
                <el-button size="mini" type="text" @click="scope.row.visible = false">取消</el-button>
Author	SHA1	Message	Date
songzhibin97	8e843894ba	Update go.mod	2023-10-11 11:29:07 +08:00
piexlmax	d81027ee8a	路由组件错误请狂下的排错处理	2022-02-14 15:01:49 +08:00
piexlmax	1baf7edfd2	锁定关键信息ID	2022-02-14 15:00:46 +08:00
piexlmax	4667eeb699	增加初始化数据库连接池和日志配置	2022-02-14 15:00:45 +08:00
piexlmax	160d0d87ac	修复log-mode失效的问题	2022-02-14 15:00:44 +08:00
piexlmax	be9b60c5e4	当页面默认路由不在权限范围内时可以正常登录跳转404	2022-02-14 15:00:43 +08:00
piexlmax	8603c6ff28	Merge remote-tracking branch 'origin/v2.4.x' into v2.4.x	2022-02-11 11:10:46 +08:00
piexlmax	81cd28ceae	修复提示信息	2022-02-11 11:10:32 +08:00
piexlmax	791317bbf5	修复路由无法携带参数的bug	2022-01-25 23:36:40 +08:00
piexlmax	1b7ee2cb6f	修改角色删除逻辑，有用户占用状态的角色禁止删除	2022-01-20 16:04:30 +08:00
奇淼（piexlmax	e542e3cac2	Merge pull request #888 from songzhibin97/v2.4.x- fix:#887	2022-01-17 10:05:34 +08:00
piexlmax	301ceb109d	fixed: #882	2022-01-14 18:15:18 +08:00
songzhibin97	08364093dd	fix:#887	2022-01-14 12:11:49 +08:00
songzhibin97	f263045705	feat:添加swagger返回结构体注释	2022-01-10 13:14:43 +08:00
songzhibin97	b86e98e52b	style:swagger optimize	2022-01-10 11:20:29 +08:00
songzhibin97	0791c59391	style:方便linker捕获	2022-01-09 14:46:58 +08:00
奇淼（piexlmax	5d62035a08	Merge pull request #877 from 854350999/v2.4.x 优化swagger	2022-01-08 10:23:30 +08:00
piexlmax	ab996609b2	修改前端接口调用防止越权	2022-01-07 19:38:13 +08:00
piexlmax	5d10f4cbab	后端增加 setSelfInfo 接口防止越权操作	2022-01-07 19:27:26 +08:00
854350999@qq.com	c5e81a8bd6	优化swagger	2022-01-07 16:33:15 +08:00
piexlmax	6b4c4e82ea	格式化前端文件	2022-01-07 14:30:57 +08:00
WqyJh	3a15adec52	添加AWS S3上传功能	2022-01-07 14:30:22 +08:00
奇淼（piexlmax	b083586a47	Merge pull request #865 from supine-win/patch-5 Update icon.vue	2022-01-07 10:59:35 +08:00
piexlmax	84d34c5e3d	修改充值用户密码无权限的初始数据bug	2022-01-05 17:22:56 +08:00
piexlmax	82ed0efa26	错别字调整	2022-01-05 15:13:14 +08:00
piexlmax	5c00eb8e33	修复删除气泡取消后无法再次弹出的问题	2022-01-05 14:29:13 +08:00
piexlmax	7c804d9e3f	登录后调整获取菜单逻辑，不再重复请求getMenu	2022-01-01 20:08:55 +08:00
supine-win	c01a2e6629	Update icon.vue fixed vue warning	2022-01-01 05:10:13 +08:00
奇淼（piexlmax	93ef058b76	Update README.md	2022-01-01 01:00:41 +08:00
奇淼（piexlmax	d4b59b866f	Merge pull request #860 from flipped-aurora/gva-2.4.6+ 修复了api下存在的bug，部署模式添加https指导	2022-01-01 00:59:30 +08:00
奇淼（piexlmax	ec928167e7	Merge branch 'master' into gva-2.4.6+	2022-01-01 00:59:16 +08:00
piexlmax	e38225a4cb	fixed: #862	2022-01-01 00:44:43 +08:00
piexlmax	161b708325	fixed: #863	2021-12-31 22:54:51 +08:00
piexlmax	ae43fd74b7	修复切片上传后端部分	2021-12-31 22:52:39 +08:00
piexlmax	7905ce82fc	修复了初始化没有切片上传相关权限的bug	2021-12-31 03:16:46 +08:00
piexlmax	a414af7405	修复了api下存在的bug，部署模式添加https指导	2021-12-31 03:14:07 +08:00
奇淼（piexlmax	088206922d	Merge pull request #856 from tscuite/master 修改后端地址为域名	2021-12-29 10:50:15 +08:00
tscuite	eadb9feff0	修改后端地址为域名修改后端地址为域名	2021-12-28 10:07:25 +08:00