diff --git a/server/api/v1/example/exa_attachment_category.go b/server/api/v1/example/exa_attachment_category.go index 5cd22930..0436f780 100644 --- a/server/api/v1/example/exa_attachment_category.go +++ b/server/api/v1/example/exa_attachment_category.go @@ -16,7 +16,7 @@ type AttachmentCategoryApi struct{} // @Summary 媒体库分类列表 // @Security AttachmentCategory // @Produce application/json -// @Success 200 {object} response.Response{data=systemRes.SysAttachmentCategoryResponse,msg=string} "媒体库分类列表" +// @Success 200 {object} response.Response{data=example.ExaAttachmentCategory,msg=string} "媒体库分类列表" // @Router /attachmentCategory/getCategoryList [get] func (a *AttachmentCategoryApi) GetCategoryList(c *gin.Context) { res, err := attachmentCategoryService.GetCategoryList() @@ -34,8 +34,7 @@ func (a *AttachmentCategoryApi) GetCategoryList(c *gin.Context) { // @Security AttachmentCategory // @accept application/json // @Produce application/json -// @Param data body example.ExaAttachmentCategory true "" -// @Success 200 {object} response.Response{msg=string} "添加媒体库分类" +// @Param data body example.ExaAttachmentCategory true "媒体库分类数据"// @Success 200 {object} response.Response{msg=string} "添加媒体库分类" // @Router /attachmentCategory/addCategory [post] func (a *AttachmentCategoryApi) AddCategory(c *gin.Context) { var req example.ExaAttachmentCategory diff --git a/server/core/server.go b/server/core/server.go index 3cbe33dc..bffef150 100644 --- a/server/core/server.go +++ b/server/core/server.go @@ -39,7 +39,7 @@ func RunWindowsServer() { fmt.Printf(` 欢迎使用 gin-vue-admin - 当前版本:v2.7.8 + 当前版本:v2.7.9-beta 加群方式:微信号：shouzi_1994 QQ群：470239250 项目地址：https://github.com/flipped-aurora/gin-vue-admin 插件市场:https://plugin.gin-vue-admin.com diff --git a/server/docs/docs.go b/server/docs/docs.go index 28262919..b2f9c413 100644 --- a/server/docs/docs.go +++ b/server/docs/docs.go @@ -551,6 +551,126 @@ const docTemplate = `{ } } }, + "/attachmentCategory/addCategory": { + "post": { + "security": [ + { + "AttachmentCategory": [] + } + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "tags": [ + "AddCategory" + ], + "summary": "添加媒体库分类", + "parameters": [ + { + "description": "媒体库分类数据", + "name": "data", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/example.ExaAttachmentCategory" + } + } + ], + "responses": {} + } + }, + "/attachmentCategory/deleteCategory": { + "post": { + "security": [ + { + "AttachmentCategory": [] + } + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "tags": [ + "DeleteCategory" + ], + "summary": "删除分类", + "parameters": [ + { + "description": "分类id", + "name": "data", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/request.GetById" + } + } + ], + "responses": { + "200": { + "description": "删除分类", + "schema": { + "allOf": [ + { + "$ref": "#/definitions/response.Response" + }, + { + "type": "object", + "properties": { + "msg": { + "type": "string" + } + } + } + ] + } + } + } + } + }, + "/attachmentCategory/getCategoryList": { + "get": { + "security": [ + { + "AttachmentCategory": [] + } + ], + "produces": [ + "application/json" + ], + "tags": [ + "GetCategoryList" + ], + "summary": "媒体库分类列表", + "responses": { + "200": { + "description": "媒体库分类列表", + "schema": { + "allOf": [ + { + "$ref": "#/definitions/response.Response" + }, + { + "type": "object", + "properties": { + "data": { + "$ref": "#/definitions/example.ExaAttachmentCategory" + }, + "msg": { + "type": "string" + } + } + } + ] + } + } + } + } + }, "/authority/copyAuthority": { "post": { "security": [ @@ -2612,12 +2732,12 @@ const docTemplate = `{ "summary": "分页文件列表", "parameters": [ { - "description": "页码, 每页大小", + "description": "页码, 每页大小, 分类id", "name": "data", "in": "body", "required": true, "schema": { - "$ref": "#/definitions/request.PageInfo" + "$ref": "#/definitions/request.ExaAttachmentCategorySearch" } } ], @@ -4457,6 +4577,26 @@ const docTemplate = `{ } } }, + "/sysExportTemplate/ExportTemplate": { + "get": { + "security": [ + { + "ApiKeyAuth": [] + } + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "tags": [ + "SysExportTemplate" + ], + "summary": "导出表格模板", + "responses": {} + } + }, "/sysExportTemplate/createSysExportTemplate": { "post": { "security": [ @@ -4587,7 +4727,7 @@ const docTemplate = `{ "tags": [ "SysExportTemplate" ], - "summary": "导出表格模板", + "summary": "导出表格", "responses": {} } }, @@ -7353,6 +7493,35 @@ const docTemplate = `{ } } }, + "example.ExaAttachmentCategory": { + "type": "object", + "properties": { + "ID": { + "description": "主键ID", + "type": "integer" + }, + "children": { + "type": "array", + "items": { + "$ref": "#/definitions/example.ExaAttachmentCategory" + } + }, + "createdAt": { + "description": "创建时间", + "type": "string" + }, + "name": { + "type": "string" + }, + "pid": { + "type": "integer" + }, + "updatedAt": { + "description": "更新时间", + "type": "string" + } + } + }, "example.ExaCustomer": { "type": "object", "properties": { @@ -7465,6 +7634,10 @@ const docTemplate = `{ "description": "主键ID", "type": "integer" }, + "classId": { + "description": "分类id", + "type": "integer" + }, "createdAt": { "description": "创建时间", "type": "string" @@ -7624,6 +7797,16 @@ const docTemplate = `{ "$ref": "#/definitions/request.AutoCodeField" } }, + "generateServer": { + "description": "是否生成server", + "type": "boolean", + "example": true + }, + "generateWeb": { + "description": "是否生成web", + "type": "boolean", + "example": true + }, "gvaModel": { "description": "是否使用gva默认Model", "type": "boolean", @@ -7846,6 +8029,26 @@ const docTemplate = `{ "request.Empty": { "type": "object" }, + "request.ExaAttachmentCategorySearch": { + "type": "object", + "properties": { + "classId": { + "type": "integer" + }, + "keyword": { + "description": "关键字", + "type": "string" + }, + "page": { + "description": "页码", + "type": "integer" + }, + "pageSize": { + "description": "每页大小", + "type": "integer" + } + } + }, "request.GetAuthorityId": { "type": "object", "properties": { @@ -7938,6 +8141,10 @@ const docTemplate = `{ "description": "数据库连接端口", "type": "string" }, + "template": { + "description": "postgresql指定template", + "type": "string" + }, "userName": { "description": "数据库用户名", "type": "string" @@ -9075,12 +9282,21 @@ const docTemplate = `{ "name": "x-token", "in": "header" } - } + }, + "tags": [ + { + "name": "Base" + }, + { + "description": "用户", + "name": "SysUser" + } + ] }` // SwaggerInfo holds exported Swagger Info so clients can modify it var SwaggerInfo = &swag.Spec{ - Version: "v2.7.8", + Version: "v2.7.9-beta", Host: "", BasePath: "", Schemes: []string{}, diff --git a/server/docs/swagger.json b/server/docs/swagger.json index e857454e..9eb3da45 100644 --- a/server/docs/swagger.json +++ b/server/docs/swagger.json @@ -4,7 +4,7 @@ "description": "使用gin+vue进行极速开发的全栈开发基础平台", "title": "Gin-Vue-Admin Swagger API接口文档", "contact": {}, - "version": "v2.7.8-beta1" + "version": "v2.7.9-beta" }, "paths": { "/api/createApi": { @@ -542,6 +542,126 @@ } } }, + "/attachmentCategory/addCategory": { + "post": { + "security": [ + { + "AttachmentCategory": [] + } + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "tags": [ + "AddCategory" + ], + "summary": "添加媒体库分类", + "parameters": [ + { + "description": "媒体库分类数据", + "name": "data", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/example.ExaAttachmentCategory" + } + } + ], + "responses": {} + } + }, + "/attachmentCategory/deleteCategory": { + "post": { + "security": [ + { + "AttachmentCategory": [] + } + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "tags": [ + "DeleteCategory" + ], + "summary": "删除分类", + "parameters": [ + { + "description": "分类id", + "name": "data", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/request.GetById" + } + } + ], + "responses": { + "200": { + "description": "删除分类", + "schema": { + "allOf": [ + { + "$ref": "#/definitions/response.Response" + }, + { + "type": "object", + "properties": { + "msg": { + "type": "string" + } + } + } + ] + } + } + } + } + }, + "/attachmentCategory/getCategoryList": { + "get": { + "security": [ + { + "AttachmentCategory": [] + } + ], + "produces": [ + "application/json" + ], + "tags": [ + "GetCategoryList" + ], + "summary": "媒体库分类列表", + "responses": { + "200": { + "description": "媒体库分类列表", + "schema": { + "allOf": [ + { + "$ref": "#/definitions/response.Response" + }, + { + "type": "object", + "properties": { + "data": { + "$ref": "#/definitions/example.ExaAttachmentCategory" + }, + "msg": { + "type": "string" + } + } + } + ] + } + } + } + } + }, "/authority/copyAuthority": { "post": { "security": [ @@ -2603,12 +2723,12 @@ "summary": "分页文件列表", "parameters": [ { - "description": "页码, 每页大小", + "description": "页码, 每页大小, 分类id", "name": "data", "in": "body", "required": true, "schema": { - "$ref": "#/definitions/request.PageInfo" + "$ref": "#/definitions/request.ExaAttachmentCategorySearch" } } ], @@ -4448,6 +4568,26 @@ } } }, + "/sysExportTemplate/ExportTemplate": { + "get": { + "security": [ + { + "ApiKeyAuth": [] + } + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "tags": [ + "SysExportTemplate" + ], + "summary": "导出表格模板", + "responses": {} + } + }, "/sysExportTemplate/createSysExportTemplate": { "post": { "security": [ @@ -4578,7 +4718,7 @@ "tags": [ "SysExportTemplate" ], - "summary": "导出表格模板", + "summary": "导出表格", "responses": {} } }, @@ -7344,6 +7484,35 @@ } } }, + "example.ExaAttachmentCategory": { + "type": "object", + "properties": { + "ID": { + "description": "主键ID", + "type": "integer" + }, + "children": { + "type": "array", + "items": { + "$ref": "#/definitions/example.ExaAttachmentCategory" + } + }, + "createdAt": { + "description": "创建时间", + "type": "string" + }, + "name": { + "type": "string" + }, + "pid": { + "type": "integer" + }, + "updatedAt": { + "description": "更新时间", + "type": "string" + } + } + }, "example.ExaCustomer": { "type": "object", "properties": { @@ -7456,6 +7625,10 @@ "description": "主键ID", "type": "integer" }, + "classId": { + "description": "分类id", + "type": "integer" + }, "createdAt": { "description": "创建时间", "type": "string" @@ -7615,6 +7788,16 @@ "$ref": "#/definitions/request.AutoCodeField" } }, + "generateServer": { + "description": "是否生成server", + "type": "boolean", + "example": true + }, + "generateWeb": { + "description": "是否生成web", + "type": "boolean", + "example": true + }, "gvaModel": { "description": "是否使用gva默认Model", "type": "boolean", @@ -7837,6 +8020,26 @@ "request.Empty": { "type": "object" }, + "request.ExaAttachmentCategorySearch": { + "type": "object", + "properties": { + "classId": { + "type": "integer" + }, + "keyword": { + "description": "关键字", + "type": "string" + }, + "page": { + "description": "页码", + "type": "integer" + }, + "pageSize": { + "description": "每页大小", + "type": "integer" + } + } + }, "request.GetAuthorityId": { "type": "object", "properties": { @@ -7929,6 +8132,10 @@ "description": "数据库连接端口", "type": "string" }, + "template": { + "description": "postgresql指定template", + "type": "string" + }, "userName": { "description": "数据库用户名", "type": "string" @@ -9066,5 +9273,14 @@ "name": "x-token", "in": "header" } - } -} + }, + "tags": [ + { + "name": "Base" + }, + { + "description": "用户", + "name": "SysUser" + } + ] +} \ No newline at end of file diff --git a/server/docs/swagger.yaml b/server/docs/swagger.yaml index 1fac6d25..1a1f8cc7 100644 --- a/server/docs/swagger.yaml +++ b/server/docs/swagger.yaml @@ -675,6 +675,26 @@ definitions: description: 栈名 type: string type: object + example.ExaAttachmentCategory: + properties: + ID: + description: 主键ID + type: integer + children: + items: + $ref: '#/definitions/example.ExaAttachmentCategory' + type: array + createdAt: + description: 创建时间 + type: string + name: + type: string + pid: + type: integer + updatedAt: + description: 更新时间 + type: string + type: object example.ExaCustomer: properties: ID: @@ -752,6 +772,9 @@ definitions: ID: description: 主键ID type: integer + classId: + description: 分类id + type: integer createdAt: description: 创建时间 type: string @@ -869,6 +892,14 @@ definitions: items: $ref: '#/definitions/request.AutoCodeField' type: array + generateServer: + description: 是否生成server + example: true + type: boolean + generateWeb: + description: 是否生成web + example: true + type: boolean gvaModel: description: 是否使用gva默认Model example: false @@ -1029,6 +1060,20 @@ definitions: type: object request.Empty: type: object + request.ExaAttachmentCategorySearch: + properties: + classId: + type: integer + keyword: + description: 关键字 + type: string + page: + description: 页码 + type: integer + pageSize: + description: 每页大小 + type: integer + type: object request.GetAuthorityId: properties: authorityId: @@ -1090,6 +1135,9 @@ definitions: port: description: 数据库连接端口 type: string + template: + description: postgresql指定template + type: string userName: description: 数据库用户名 type: string @@ -1881,7 +1929,7 @@ info: contact: {} description: 使用gin+vue进行极速开发的全栈开发基础平台 title: Gin-Vue-Admin Swagger API接口文档 - version: v2.7.8-beta1 + version: v2.7.9-beta paths: /api/createApi: post: @@ -2179,6 +2227,74 @@ paths: summary: 修改基础api tags: - SysApi + /attachmentCategory/addCategory: + post: + consumes: + - application/json + parameters: + - description: 媒体库分类数据 + in: body + name: data + required: true + schema: + $ref: '#/definitions/example.ExaAttachmentCategory' + produces: + - application/json + responses: {} + security: + - AttachmentCategory: [] + summary: 添加媒体库分类 + tags: + - AddCategory + /attachmentCategory/deleteCategory: + post: + consumes: + - application/json + parameters: + - description: 分类id + in: body + name: data + required: true + schema: + $ref: '#/definitions/request.GetById' + produces: + - application/json + responses: + "200": + description: 删除分类 + schema: + allOf: + - $ref: '#/definitions/response.Response' + - properties: + msg: + type: string + type: object + security: + - AttachmentCategory: [] + summary: 删除分类 + tags: + - DeleteCategory + /attachmentCategory/getCategoryList: + get: + produces: + - application/json + responses: + "200": + description: 媒体库分类列表 + schema: + allOf: + - $ref: '#/definitions/response.Response' + - properties: + data: + $ref: '#/definitions/example.ExaAttachmentCategory' + msg: + type: string + type: object + security: + - AttachmentCategory: [] + summary: 媒体库分类列表 + tags: + - GetCategoryList /authority/copyAuthority: post: consumes: @@ -3345,12 +3461,12 @@ paths: consumes: - application/json parameters: - - description: 页码, 每页大小 + - description: 页码, 每页大小, 分类id in: body name: data required: true schema: - $ref: '#/definitions/request.PageInfo' + $ref: '#/definitions/request.ExaAttachmentCategorySearch' produces: - application/json responses: @@ -4409,6 +4525,18 @@ paths: summary: 更新SysDictionaryDetail tags: - SysDictionaryDetail + /sysExportTemplate/ExportTemplate: + get: + consumes: + - application/json + produces: + - application/json + responses: {} + security: + - ApiKeyAuth: [] + summary: 导出表格模板 + tags: + - SysExportTemplate /sysExportTemplate/createSysExportTemplate: post: consumes: @@ -4487,7 +4615,7 @@ paths: responses: {} security: - ApiKeyAuth: [] - summary: 导出表格模板 + summary: 导出表格 tags: - SysExportTemplate /sysExportTemplate/findSysExportTemplate: @@ -5543,3 +5671,7 @@ securityDefinitions: name: x-token type: apiKey swagger: "2.0" +tags: +- name: Base +- description: 用户 + name: SysUser diff --git a/server/main.go b/server/main.go index 226565f9..b6af686b 100644 --- a/server/main.go +++ b/server/main.go @@ -21,7 +21,7 @@ import ( // @Tag.Description 用户 // @title Gin-Vue-Admin Swagger API接口文档 -// @version v2.7.8 +// @version v2.7.9-beta // @description 使用gin+vue进行极速开发的全栈开发基础平台 // @securityDefinitions.apikey ApiKeyAuth // @in header diff --git a/web/package.json b/web/package.json index 29b85a6d..911f753c 100644 --- a/web/package.json +++ b/web/package.json @@ -1,6 +1,6 @@ { "name": "gin-vue-admin", - "version": "2.7.8", + "version": "2.7.9-beta", "private": true, "scripts": { "serve": "node openDocument.js && vite --host --mode development", diff --git a/web/src/core/config.js b/web/src/core/config.js index 9c0137a7..c721303b 100644 --- a/web/src/core/config.js +++ b/web/src/core/config.js @@ -17,7 +17,7 @@ export const viteLogo = (env) => { `> 欢迎使用Gin-Vue-Admin，开源地址：https://github.com/flipped-aurora/gin-vue-admin` ) ) - console.log(greenText(`> 当前版本:v2.7.8`)) + console.log(greenText(`> 当前版本:v2.7.9-beta`)) console.log(greenText(`> 加群方式:微信：shouzi_1994 QQ群：470239250`)) console.log( greenText(`> 项目地址：https://github.com/flipped-aurora/gin-vue-admin`) diff --git a/web/src/core/gin-vue-admin.js b/web/src/core/gin-vue-admin.js index 0280e0a7..bfc0960b 100644 --- a/web/src/core/gin-vue-admin.js +++ b/web/src/core/gin-vue-admin.js @@ -10,7 +10,7 @@ export default { register(app) console.log(` 欢迎使用 Gin-Vue-Admin - 当前版本:v2.7.8 + 当前版本:v2.7.9-beta 加群方式:微信：shouzi_1994 QQ群：622360840 项目地址：https://github.com/flipped-aurora/gin-vue-admin 插件市场:https://plugin.gin-vue-admin.com diff --git a/web/src/view/systemTools/autoCode/index.vue b/web/src/view/systemTools/autoCode/index.vue index b63b3279..79a65224 100644 --- a/web/src/view/systemTools/autoCode/index.vue +++ b/web/src/view/systemTools/autoCode/index.vue @@ -378,7 +378,7 @@ - +