diff --git a/app/admin/router/sys_router.go b/app/admin/router/sys_router.go index 944f8959..67132a42 100644 --- a/app/admin/router/sys_router.go +++ b/app/admin/router/sys_router.go @@ -1,15 +1,17 @@ package router import ( - "github.com/go-admin-team/go-admin-core/sdk/config" "go-admin/app/admin/apis" "mime" + "github.com/go-admin-team/go-admin-core/sdk/config" + "github.com/gin-gonic/gin" jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth" "github.com/go-admin-team/go-admin-core/sdk/pkg/ws" ginSwagger "github.com/swaggo/gin-swagger" - "github.com/swaggo/gin-swagger/swaggerFiles" + + swaggerfiles "github.com/swaggo/files" "go-admin/common/middleware" "go-admin/common/middleware/handler" @@ -54,11 +56,11 @@ func sysStaticFileRouter(r *gin.RouterGroup) { } func sysSwaggerRouter(r *gin.RouterGroup) { - r.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler)) + r.GET("/swagger/admin/*any", ginSwagger.WrapHandler(swaggerfiles.NewHandler(), ginSwagger.InstanceName("admin"))) } func sysCheckRoleRouterInit(r *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { - wss:=r.Group("").Use(authMiddleware.MiddlewareFunc()) + wss := r.Group("").Use(authMiddleware.MiddlewareFunc()) { wss.GET("/ws/:id/:channel", ws.WebsocketManager.WsClient) wss.GET("/wslogout/:id/:channel", ws.WebsocketManager.UnWsClient) diff --git a/docs/docs.go b/docs/docs.go index 7f5bd264..780b1d87 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -1,22 +1,14 @@ -// GENERATED BY THE COMMAND ABOVE; DO NOT EDIT +// Package docs GENERATED BY SWAG; DO NOT EDIT // This file was generated by swaggo/swag - package docs -import ( - "bytes" - "encoding/json" - "strings" +import "github.com/swaggo/swag" - "github.com/alecthomas/template" - "github.com/swaggo/swag" -) - -var doc = `{ +const docTemplate = `{ "schemes": {{ marshal .Schemes }}, "swagger": "2.0", "info": { - "description": "{{.Description}}", + "description": "{{escape .Description}}", "title": "{{.Title}}", "contact": {}, "license": { @@ -231,7 +223,7 @@ var doc = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/dto.SysDeptControl" + "$ref": "#/definitions/dto.SysDeptInsertReq" } } ], @@ -262,7 +254,7 @@ var doc = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/dto.SysDeptById" + "$ref": "#/definitions/dto.SysDeptDeleteReq" } } ], @@ -287,19 +279,13 @@ var doc = `{ "tags": [ "部门" ], - "summary": "部门列表数据", + "summary": "获取部门数据", "parameters": [ { "type": "string", "description": "deptId", "name": "deptId", "in": "path" - }, - { - "type": "string", - "description": "position", - "name": "position", - "in": "query" } ], "responses": { @@ -339,7 +325,7 @@ var doc = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/dto.SysDeptControl" + "$ref": "#/definitions/dto.SysDeptUpdateReq" } } ], @@ -376,9 +362,24 @@ var doc = `{ ], "responses": { "200": { - "description": "{\"code\": -1, \"message\": \"删除失败\"}", + "description": "{\"code\": 200, \"data\": [...]}", "schema": { - "type": "string" + "allOf": [ + { + "$ref": "#/definitions/response.Response" + }, + { + "type": "object", + "properties": { + "data": { + "type": "array", + "items": { + "$ref": "#/definitions/dto.SysDictDataGetAllResp" + } + } + } + } + ] } } } @@ -458,15 +459,15 @@ var doc = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/dto.SysDictDataControl" + "$ref": "#/definitions/dto.SysDictDataInsertReq" } } ], "responses": { "200": { - "description": "{\"code\": -1, \"message\": \"添加失败\"}", + "description": "{\"code\": 200, \"message\": \"添加成功\"}", "schema": { - "type": "string" + "$ref": "#/definitions/response.Response" } } } @@ -489,15 +490,15 @@ var doc = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/dto.SysDictDataById" + "$ref": "#/definitions/dto.SysDictDataDeleteReq" } } ], "responses": { "200": { - "description": "{\"code\": -1, \"message\": \"删除失败\"}", + "description": "{\"code\": 200, \"message\": \"删除成功\"}", "schema": { - "type": "string" + "$ref": "#/definitions/response.Response" } } } @@ -554,15 +555,15 @@ var doc = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/dto.SysDictDataControl" + "$ref": "#/definitions/dto.SysDictDataUpdateReq" } } ], "responses": { "200": { - "description": "{\"code\": -1, \"message\": \"添加失败\"}", + "description": "{\"code\": 200, \"message\": \"修改成功\"}", "schema": { - "type": "string" + "$ref": "#/definitions/response.Response" } } } @@ -642,15 +643,15 @@ var doc = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/dto.SysDictTypeControl" + "$ref": "#/definitions/dto.SysDictTypeInsertReq" } } ], "responses": { "200": { - "description": "{\"code\": -1, \"message\": \"添加失败\"}", + "description": "{\"code\": 200, \"data\": [...]}", "schema": { - "type": "string" + "$ref": "#/definitions/response.Response" } } } @@ -668,18 +669,20 @@ var doc = `{ "summary": "删除字典类型", "parameters": [ { - "type": "integer", - "description": "dictId", - "name": "dictId", - "in": "path", - "required": true + "description": "body", + "name": "dictCode", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/dto.SysDictTypeDeleteReq" + } } ], "responses": { "200": { - "description": "{\"code\": -1, \"message\": \"删除失败\"}", + "description": "{\"code\": 200, \"data\": [...]}", "schema": { - "type": "string" + "$ref": "#/definitions/response.Response" } } } @@ -778,15 +781,15 @@ var doc = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/dto.SysDictTypeControl" + "$ref": "#/definitions/dto.SysDictTypeUpdateReq" } } ], "responses": { "200": { - "description": "{\"code\": -1, \"message\": \"添加失败\"}", + "description": "{\"code\": 200, \"data\": [...]}", "schema": { - "type": "string" + "$ref": "#/definitions/response.Response" } } } @@ -858,12 +861,6 @@ var doc = `{ ], "summary": "Menu列表数据", "parameters": [ - { - "type": "string", - "description": "menuName", - "name": "menuName", - "in": "query" - }, { "type": "string", "description": "menuName", @@ -901,7 +898,7 @@ var doc = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/dto.SysMenuControl" + "$ref": "#/definitions/dto.SysMenuInsertReq" } } ], @@ -932,7 +929,7 @@ var doc = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/dto.SysMenuById" + "$ref": "#/definitions/dto.SysMenuDeleteReq" } } ], @@ -1003,7 +1000,7 @@ var doc = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/dto.SysMenuControl" + "$ref": "#/definitions/dto.SysMenuUpdateReq" } } ], @@ -1147,9 +1144,9 @@ var doc = `{ ], "responses": { "200": { - "description": "{\"code\": -1, \"message\": \"添加失败\"}", + "description": "{\"code\": 200, \"data\": [...]}", "schema": { - "type": "string" + "$ref": "#/definitions/response.Response" } } } @@ -1178,15 +1175,9 @@ var doc = `{ ], "responses": { "200": { - "description": "{\"code\": 200, \"message\": \"删除成功\"}", + "description": "{\"code\": 200, \"data\": [...]}", "schema": { - "type": "string" - } - }, - "500": { - "description": "{\"code\": 500, \"message\": \"删除失败\"}", - "schema": { - "type": "string" + "$ref": "#/definitions/response.Response" } } } @@ -1220,9 +1211,9 @@ var doc = `{ ], "responses": { "200": { - "description": "{\"code\": -1, \"message\": \"添加失败\"}", + "description": "{\"code\": 200, \"data\": [...]}", "schema": { - "type": "string" + "$ref": "#/definitions/response.Response" } } } @@ -1374,7 +1365,7 @@ var doc = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/dto.SysRoleControl" + "$ref": "#/definitions/dto.SysRoleInsertReq" } } ], @@ -1405,7 +1396,7 @@ var doc = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/dto.SysRoleById" + "$ref": "#/definitions/dto.SysRoleDeleteReq" } } ], @@ -1505,7 +1496,7 @@ var doc = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/dto.SysRoleControl" + "$ref": "#/definitions/dto.SysRoleUpdateReq" } } ], @@ -1715,14 +1706,12 @@ var doc = `{ "summary": "删除接口管理", "parameters": [ { - "description": "ids", - "name": "ids", + "description": "body", + "name": "data", "in": "body", + "required": true, "schema": { - "type": "array", - "items": { - "type": "integer" - } + "$ref": "#/definitions/dto.SysApiDeleteReq" } } ], @@ -1798,7 +1787,7 @@ var doc = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/dto.SysApiControl" + "$ref": "#/definitions/dto.SysApiUpdateReq" } } ], @@ -2119,7 +2108,7 @@ var doc = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/dto.SysLoginLogById" + "$ref": "#/definitions/dto.SysLoginLogDeleteReq" } } ], @@ -2252,7 +2241,7 @@ var doc = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/dto.SysOperaLogById" + "$ref": "#/definitions/dto.SysOperaLogDeleteReq" } } ], @@ -2346,7 +2335,7 @@ var doc = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/dto.SysUserControl" + "$ref": "#/definitions/dto.SysUserInsertReq" } } ], @@ -2411,7 +2400,7 @@ var doc = `{ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/dto.SysUserControl" + "$ref": "#/definitions/dto.SysUserUpdateReq" } } ], @@ -2719,7 +2708,7 @@ var doc = `{ "tags": [ "用户" ], - "summary": "重置密码", + "summary": "修改密码", "parameters": [ { "description": "body", @@ -2814,10 +2803,6 @@ var doc = `{ }, "dto.PassWord": { "type": "object", - "required": [ - "newPassword", - "oldPassword" - ], "properties": { "newPassword": { "type": "string" @@ -2829,10 +2814,6 @@ var doc = `{ }, "dto.ResetSysUserPwdReq": { "type": "object", - "required": [ - "password", - "userId" - ], "properties": { "createBy": { "type": "integer" @@ -2870,7 +2851,18 @@ var doc = `{ } } }, - "dto.SysApiControl": { + "dto.SysApiDeleteReq": { + "type": "object", + "properties": { + "ids": { + "type": "array", + "items": { + "type": "integer" + } + } + } + }, + "dto.SysApiUpdateReq": { "type": "object", "properties": { "action": { @@ -2931,7 +2923,7 @@ var doc = `{ "type": "integer" }, "isFrontend": { - "type": "integer" + "type": "string" }, "remark": { "type": "string" @@ -2941,12 +2933,9 @@ var doc = `{ } } }, - "dto.SysDeptById": { + "dto.SysDeptDeleteReq": { "type": "object", "properties": { - "id": { - "type": "integer" - }, "ids": { "type": "array", "items": { @@ -2955,7 +2944,7 @@ var doc = `{ } } }, - "dto.SysDeptControl": { + "dto.SysDeptInsertReq": { "type": "object", "properties": { "createBy": { @@ -3002,13 +2991,57 @@ var doc = `{ } } }, - "dto.SysDictDataById": { + "dto.SysDeptUpdateReq": { "type": "object", "properties": { "createBy": { "type": "integer" }, - "id": { + "deptId": { + "description": "编码", + "type": "integer" + }, + "deptName": { + "description": "部门名称", + "type": "string" + }, + "deptPath": { + "description": "路径", + "type": "string" + }, + "email": { + "description": "邮箱", + "type": "string" + }, + "leader": { + "description": "负责人", + "type": "string" + }, + "parentId": { + "description": "上级部门", + "type": "integer" + }, + "phone": { + "description": "手机", + "type": "string" + }, + "sort": { + "description": "排序", + "type": "integer" + }, + "status": { + "description": "状态", + "type": "integer" + }, + "updateBy": { + "type": "integer" + } + } + }, + "dto.SysDictDataDeleteReq": { + "type": "object", + "properties": { + "createBy": { "type": "integer" }, "ids": { @@ -3022,7 +3055,59 @@ var doc = `{ } } }, - "dto.SysDictDataControl": { + "dto.SysDictDataGetAllResp": { + "type": "object", + "properties": { + "label": { + "type": "string" + }, + "value": { + "type": "string" + } + } + }, + "dto.SysDictDataInsertReq": { + "type": "object", + "properties": { + "createBy": { + "type": "integer" + }, + "cssClass": { + "type": "string" + }, + "default": { + "type": "string" + }, + "dictLabel": { + "type": "string" + }, + "dictSort": { + "type": "integer" + }, + "dictType": { + "type": "string" + }, + "dictValue": { + "type": "string" + }, + "isDefault": { + "type": "string" + }, + "listClass": { + "type": "string" + }, + "remark": { + "type": "string" + }, + "status": { + "type": "integer" + }, + "updateBy": { + "type": "integer" + } + } + }, + "dto.SysDictDataUpdateReq": { "type": "object", "properties": { "createBy": { @@ -3066,7 +3151,24 @@ var doc = `{ } } }, - "dto.SysDictTypeControl": { + "dto.SysDictTypeDeleteReq": { + "type": "object", + "properties": { + "createBy": { + "type": "integer" + }, + "ids": { + "type": "array", + "items": { + "type": "integer" + } + }, + "updateBy": { + "type": "integer" + } + } + }, + "dto.SysDictTypeInsertReq": { "type": "object", "properties": { "createBy": { @@ -3092,15 +3194,49 @@ var doc = `{ } } }, - "dto.SysLoginLogById": { + "dto.SysDictTypeUpdateReq": { "type": "object", "properties": { "createBy": { "type": "integer" }, + "dictName": { + "type": "string" + }, + "dictType": { + "type": "string" + }, "id": { "type": "integer" }, + "remark": { + "type": "string" + }, + "status": { + "type": "integer" + }, + "updateBy": { + "type": "integer" + } + } + }, + "dto.SysLoginLogDeleteReq": { + "type": "object", + "properties": { + "ids": { + "type": "array", + "items": { + "type": "integer" + } + } + } + }, + "dto.SysMenuDeleteReq": { + "type": "object", + "properties": { + "createBy": { + "type": "integer" + }, "ids": { "type": "array", "items": { @@ -3112,27 +3248,7 @@ var doc = `{ } } }, - "dto.SysMenuById": { - "type": "object", - "properties": { - "createBy": { - "type": "integer" - }, - "id": { - "type": "integer" - }, - "ids": { - "type": "array", - "items": { - "type": "integer" - } - }, - "updateBy": { - "type": "integer" - } - } - }, - "dto.SysMenuControl": { + "dto.SysMenuInsertReq": { "type": "object", "properties": { "action": { @@ -3219,12 +3335,96 @@ var doc = `{ } } }, - "dto.SysOperaLogById": { + "dto.SysMenuUpdateReq": { "type": "object", "properties": { - "id": { + "action": { + "description": "请求方式", + "type": "string" + }, + "apis": { + "type": "array", + "items": { + "type": "integer" + } + }, + "breadcrumb": { + "description": "是否面包屑", + "type": "string" + }, + "component": { + "description": "组件", + "type": "string" + }, + "createBy": { "type": "integer" }, + "icon": { + "description": "图标", + "type": "string" + }, + "isFrame": { + "description": "是否frame", + "type": "string" + }, + "menuId": { + "description": "编码", + "type": "integer" + }, + "menuName": { + "description": "菜单name", + "type": "string" + }, + "menuType": { + "description": "菜单类型", + "type": "string" + }, + "noCache": { + "description": "是否缓存", + "type": "boolean" + }, + "parentId": { + "description": "上级菜单", + "type": "integer" + }, + "path": { + "description": "路径", + "type": "string" + }, + "paths": { + "description": "id路径", + "type": "string" + }, + "permission": { + "description": "权限编码", + "type": "string" + }, + "sort": { + "description": "排序", + "type": "integer" + }, + "sysApi": { + "type": "array", + "items": { + "$ref": "#/definitions/models.SysApi" + } + }, + "title": { + "description": "显示名称", + "type": "string" + }, + "updateBy": { + "type": "integer" + }, + "visible": { + "description": "是否显示", + "type": "string" + } + } + }, + "dto.SysOperaLogDeleteReq": { + "type": "object", + "properties": { "ids": { "type": "array", "items": { @@ -3308,12 +3508,9 @@ var doc = `{ } } }, - "dto.SysRoleById": { + "dto.SysRoleDeleteReq": { "type": "object", "properties": { - "id": { - "type": "integer" - }, "ids": { "type": "array", "items": { @@ -3322,7 +3519,7 @@ var doc = `{ } } }, - "dto.SysRoleControl": { + "dto.SysRoleInsertReq": { "type": "object", "properties": { "admin": { @@ -3391,16 +3588,77 @@ var doc = `{ } } }, - "dto.SysUserControl": { + "dto.SysRoleUpdateReq": { + "type": "object", + "properties": { + "admin": { + "type": "boolean" + }, + "createBy": { + "type": "integer" + }, + "dataScope": { + "type": "string" + }, + "deptIds": { + "type": "array", + "items": { + "type": "integer" + } + }, + "flag": { + "description": "标记", + "type": "string" + }, + "menuIds": { + "type": "array", + "items": { + "type": "integer" + } + }, + "remark": { + "description": "备注", + "type": "string" + }, + "roleId": { + "description": "角色编码", + "type": "integer" + }, + "roleKey": { + "description": "角色代码", + "type": "string" + }, + "roleName": { + "description": "角色名称", + "type": "string" + }, + "roleSort": { + "description": "角色排序", + "type": "integer" + }, + "status": { + "description": "状态", + "type": "string" + }, + "sysDept": { + "type": "array", + "items": { + "$ref": "#/definitions/models.SysDept" + } + }, + "sysMenu": { + "type": "array", + "items": { + "$ref": "#/definitions/models.SysMenu" + } + }, + "updateBy": { + "type": "integer" + } + } + }, + "dto.SysUserInsertReq": { "type": "object", - "required": [ - "deptId", - "email", - "nickName", - "phone", - "status", - "username" - ], "properties": { "avatar": { "type": "string" @@ -3451,6 +3709,55 @@ var doc = `{ } } }, + "dto.SysUserUpdateReq": { + "type": "object", + "properties": { + "avatar": { + "type": "string" + }, + "createBy": { + "type": "integer" + }, + "deptId": { + "type": "integer" + }, + "email": { + "type": "string" + }, + "nickName": { + "type": "string" + }, + "phone": { + "type": "string" + }, + "postId": { + "type": "integer" + }, + "remark": { + "type": "string" + }, + "roleId": { + "type": "integer" + }, + "sex": { + "type": "string" + }, + "status": { + "type": "string", + "default": "1" + }, + "updateBy": { + "type": "integer" + }, + "userId": { + "description": "用户ID", + "type": "integer" + }, + "username": { + "type": "string" + } + } + }, "dto.UpdateStatusReq": { "type": "object", "properties": { @@ -3472,10 +3779,6 @@ var doc = `{ }, "dto.UpdateSysUserStatusReq": { "type": "object", - "required": [ - "status", - "userId" - ], "properties": { "createBy": { "type": "integer" @@ -3575,7 +3878,7 @@ var doc = `{ "type": "integer" }, "isFrontend": { - "type": "integer" + "type": "string" }, "remark": { "type": "string" @@ -4053,49 +4356,18 @@ var doc = `{ } }` -type swaggerInfo struct { - Version string - Host string - BasePath string - Schemes []string - Title string - Description string -} - // SwaggerInfo holds exported Swagger Info so clients can modify it -var SwaggerInfo = swaggerInfo{ - Version: "2.0.0", - Host: "", - BasePath: "", - Schemes: []string{}, - Title: "go-admin API", - Description: "基于Gin + Vue + Element UI的前后端分离权限管理系统的接口文档\n添加qq群: 521386980 进入技术交流群 请先star，谢谢！", -} - -type s struct{} - -func (s *s) ReadDoc() string { - sInfo := SwaggerInfo - sInfo.Description = strings.Replace(sInfo.Description, "\n", "\\n", -1) - - t, err := template.New("swagger_info").Funcs(template.FuncMap{ - "marshal": func(v interface{}) string { - a, _ := json.Marshal(v) - return string(a) - }, - }).Parse(doc) - if err != nil { - return doc - } - - var tpl bytes.Buffer - if err := t.Execute(&tpl, sInfo); err != nil { - return doc - } - - return tpl.String() +var SwaggerInfo = &swag.Spec{ + Version: "2.0.0", + Host: "", + BasePath: "", + Schemes: []string{}, + Title: "go-admin API", + Description: "基于Gin + Vue + Element UI的前后端分离权限管理系统的接口文档\n添加qq群: 521386980 进入技术交流群 请先star，谢谢！", + InfoInstanceName: "swagger", + SwaggerTemplate: docTemplate, } func init() { - swag.Register(swag.Name, &s{}) + swag.Register(SwaggerInfo.InstanceName(), SwaggerInfo) } diff --git a/docs/swagger.json b/docs/swagger.json index fbee1c09..a6ec8185 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -214,7 +214,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/dto.SysDeptControl" + "$ref": "#/definitions/dto.SysDeptInsertReq" } } ], @@ -245,7 +245,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/dto.SysDeptById" + "$ref": "#/definitions/dto.SysDeptDeleteReq" } } ], @@ -270,19 +270,13 @@ "tags": [ "部门" ], - "summary": "部门列表数据", + "summary": "获取部门数据", "parameters": [ { "type": "string", "description": "deptId", "name": "deptId", "in": "path" - }, - { - "type": "string", - "description": "position", - "name": "position", - "in": "query" } ], "responses": { @@ -322,7 +316,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/dto.SysDeptControl" + "$ref": "#/definitions/dto.SysDeptUpdateReq" } } ], @@ -359,9 +353,24 @@ ], "responses": { "200": { - "description": "{\"code\": -1, \"message\": \"删除失败\"}", + "description": "{\"code\": 200, \"data\": [...]}", "schema": { - "type": "string" + "allOf": [ + { + "$ref": "#/definitions/response.Response" + }, + { + "type": "object", + "properties": { + "data": { + "type": "array", + "items": { + "$ref": "#/definitions/dto.SysDictDataGetAllResp" + } + } + } + } + ] } } } @@ -441,15 +450,15 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/dto.SysDictDataControl" + "$ref": "#/definitions/dto.SysDictDataInsertReq" } } ], "responses": { "200": { - "description": "{\"code\": -1, \"message\": \"添加失败\"}", + "description": "{\"code\": 200, \"message\": \"添加成功\"}", "schema": { - "type": "string" + "$ref": "#/definitions/response.Response" } } } @@ -472,15 +481,15 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/dto.SysDictDataById" + "$ref": "#/definitions/dto.SysDictDataDeleteReq" } } ], "responses": { "200": { - "description": "{\"code\": -1, \"message\": \"删除失败\"}", + "description": "{\"code\": 200, \"message\": \"删除成功\"}", "schema": { - "type": "string" + "$ref": "#/definitions/response.Response" } } } @@ -537,15 +546,15 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/dto.SysDictDataControl" + "$ref": "#/definitions/dto.SysDictDataUpdateReq" } } ], "responses": { "200": { - "description": "{\"code\": -1, \"message\": \"添加失败\"}", + "description": "{\"code\": 200, \"message\": \"修改成功\"}", "schema": { - "type": "string" + "$ref": "#/definitions/response.Response" } } } @@ -625,15 +634,15 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/dto.SysDictTypeControl" + "$ref": "#/definitions/dto.SysDictTypeInsertReq" } } ], "responses": { "200": { - "description": "{\"code\": -1, \"message\": \"添加失败\"}", + "description": "{\"code\": 200, \"data\": [...]}", "schema": { - "type": "string" + "$ref": "#/definitions/response.Response" } } } @@ -651,18 +660,20 @@ "summary": "删除字典类型", "parameters": [ { - "type": "integer", - "description": "dictId", - "name": "dictId", - "in": "path", - "required": true + "description": "body", + "name": "dictCode", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/dto.SysDictTypeDeleteReq" + } } ], "responses": { "200": { - "description": "{\"code\": -1, \"message\": \"删除失败\"}", + "description": "{\"code\": 200, \"data\": [...]}", "schema": { - "type": "string" + "$ref": "#/definitions/response.Response" } } } @@ -761,15 +772,15 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/dto.SysDictTypeControl" + "$ref": "#/definitions/dto.SysDictTypeUpdateReq" } } ], "responses": { "200": { - "description": "{\"code\": -1, \"message\": \"添加失败\"}", + "description": "{\"code\": 200, \"data\": [...]}", "schema": { - "type": "string" + "$ref": "#/definitions/response.Response" } } } @@ -841,12 +852,6 @@ ], "summary": "Menu列表数据", "parameters": [ - { - "type": "string", - "description": "menuName", - "name": "menuName", - "in": "query" - }, { "type": "string", "description": "menuName", @@ -884,7 +889,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/dto.SysMenuControl" + "$ref": "#/definitions/dto.SysMenuInsertReq" } } ], @@ -915,7 +920,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/dto.SysMenuById" + "$ref": "#/definitions/dto.SysMenuDeleteReq" } } ], @@ -986,7 +991,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/dto.SysMenuControl" + "$ref": "#/definitions/dto.SysMenuUpdateReq" } } ], @@ -1130,9 +1135,9 @@ ], "responses": { "200": { - "description": "{\"code\": -1, \"message\": \"添加失败\"}", + "description": "{\"code\": 200, \"data\": [...]}", "schema": { - "type": "string" + "$ref": "#/definitions/response.Response" } } } @@ -1161,15 +1166,9 @@ ], "responses": { "200": { - "description": "{\"code\": 200, \"message\": \"删除成功\"}", + "description": "{\"code\": 200, \"data\": [...]}", "schema": { - "type": "string" - } - }, - "500": { - "description": "{\"code\": 500, \"message\": \"删除失败\"}", - "schema": { - "type": "string" + "$ref": "#/definitions/response.Response" } } } @@ -1203,9 +1202,9 @@ ], "responses": { "200": { - "description": "{\"code\": -1, \"message\": \"添加失败\"}", + "description": "{\"code\": 200, \"data\": [...]}", "schema": { - "type": "string" + "$ref": "#/definitions/response.Response" } } } @@ -1357,7 +1356,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/dto.SysRoleControl" + "$ref": "#/definitions/dto.SysRoleInsertReq" } } ], @@ -1388,7 +1387,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/dto.SysRoleById" + "$ref": "#/definitions/dto.SysRoleDeleteReq" } } ], @@ -1488,7 +1487,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/dto.SysRoleControl" + "$ref": "#/definitions/dto.SysRoleUpdateReq" } } ], @@ -1698,14 +1697,12 @@ "summary": "删除接口管理", "parameters": [ { - "description": "ids", - "name": "ids", + "description": "body", + "name": "data", "in": "body", + "required": true, "schema": { - "type": "array", - "items": { - "type": "integer" - } + "$ref": "#/definitions/dto.SysApiDeleteReq" } } ], @@ -1781,7 +1778,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/dto.SysApiControl" + "$ref": "#/definitions/dto.SysApiUpdateReq" } } ], @@ -2102,7 +2099,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/dto.SysLoginLogById" + "$ref": "#/definitions/dto.SysLoginLogDeleteReq" } } ], @@ -2235,7 +2232,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/dto.SysOperaLogById" + "$ref": "#/definitions/dto.SysOperaLogDeleteReq" } } ], @@ -2329,7 +2326,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/dto.SysUserControl" + "$ref": "#/definitions/dto.SysUserInsertReq" } } ], @@ -2394,7 +2391,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/dto.SysUserControl" + "$ref": "#/definitions/dto.SysUserUpdateReq" } } ], @@ -2702,7 +2699,7 @@ "tags": [ "用户" ], - "summary": "重置密码", + "summary": "修改密码", "parameters": [ { "description": "body", @@ -2797,10 +2794,6 @@ }, "dto.PassWord": { "type": "object", - "required": [ - "newPassword", - "oldPassword" - ], "properties": { "newPassword": { "type": "string" @@ -2812,10 +2805,6 @@ }, "dto.ResetSysUserPwdReq": { "type": "object", - "required": [ - "password", - "userId" - ], "properties": { "createBy": { "type": "integer" @@ -2853,7 +2842,18 @@ } } }, - "dto.SysApiControl": { + "dto.SysApiDeleteReq": { + "type": "object", + "properties": { + "ids": { + "type": "array", + "items": { + "type": "integer" + } + } + } + }, + "dto.SysApiUpdateReq": { "type": "object", "properties": { "action": { @@ -2914,7 +2914,7 @@ "type": "integer" }, "isFrontend": { - "type": "integer" + "type": "string" }, "remark": { "type": "string" @@ -2924,12 +2924,9 @@ } } }, - "dto.SysDeptById": { + "dto.SysDeptDeleteReq": { "type": "object", "properties": { - "id": { - "type": "integer" - }, "ids": { "type": "array", "items": { @@ -2938,7 +2935,7 @@ } } }, - "dto.SysDeptControl": { + "dto.SysDeptInsertReq": { "type": "object", "properties": { "createBy": { @@ -2985,13 +2982,57 @@ } } }, - "dto.SysDictDataById": { + "dto.SysDeptUpdateReq": { "type": "object", "properties": { "createBy": { "type": "integer" }, - "id": { + "deptId": { + "description": "编码", + "type": "integer" + }, + "deptName": { + "description": "部门名称", + "type": "string" + }, + "deptPath": { + "description": "路径", + "type": "string" + }, + "email": { + "description": "邮箱", + "type": "string" + }, + "leader": { + "description": "负责人", + "type": "string" + }, + "parentId": { + "description": "上级部门", + "type": "integer" + }, + "phone": { + "description": "手机", + "type": "string" + }, + "sort": { + "description": "排序", + "type": "integer" + }, + "status": { + "description": "状态", + "type": "integer" + }, + "updateBy": { + "type": "integer" + } + } + }, + "dto.SysDictDataDeleteReq": { + "type": "object", + "properties": { + "createBy": { "type": "integer" }, "ids": { @@ -3005,7 +3046,59 @@ } } }, - "dto.SysDictDataControl": { + "dto.SysDictDataGetAllResp": { + "type": "object", + "properties": { + "label": { + "type": "string" + }, + "value": { + "type": "string" + } + } + }, + "dto.SysDictDataInsertReq": { + "type": "object", + "properties": { + "createBy": { + "type": "integer" + }, + "cssClass": { + "type": "string" + }, + "default": { + "type": "string" + }, + "dictLabel": { + "type": "string" + }, + "dictSort": { + "type": "integer" + }, + "dictType": { + "type": "string" + }, + "dictValue": { + "type": "string" + }, + "isDefault": { + "type": "string" + }, + "listClass": { + "type": "string" + }, + "remark": { + "type": "string" + }, + "status": { + "type": "integer" + }, + "updateBy": { + "type": "integer" + } + } + }, + "dto.SysDictDataUpdateReq": { "type": "object", "properties": { "createBy": { @@ -3049,7 +3142,24 @@ } } }, - "dto.SysDictTypeControl": { + "dto.SysDictTypeDeleteReq": { + "type": "object", + "properties": { + "createBy": { + "type": "integer" + }, + "ids": { + "type": "array", + "items": { + "type": "integer" + } + }, + "updateBy": { + "type": "integer" + } + } + }, + "dto.SysDictTypeInsertReq": { "type": "object", "properties": { "createBy": { @@ -3075,15 +3185,49 @@ } } }, - "dto.SysLoginLogById": { + "dto.SysDictTypeUpdateReq": { "type": "object", "properties": { "createBy": { "type": "integer" }, + "dictName": { + "type": "string" + }, + "dictType": { + "type": "string" + }, "id": { "type": "integer" }, + "remark": { + "type": "string" + }, + "status": { + "type": "integer" + }, + "updateBy": { + "type": "integer" + } + } + }, + "dto.SysLoginLogDeleteReq": { + "type": "object", + "properties": { + "ids": { + "type": "array", + "items": { + "type": "integer" + } + } + } + }, + "dto.SysMenuDeleteReq": { + "type": "object", + "properties": { + "createBy": { + "type": "integer" + }, "ids": { "type": "array", "items": { @@ -3095,27 +3239,7 @@ } } }, - "dto.SysMenuById": { - "type": "object", - "properties": { - "createBy": { - "type": "integer" - }, - "id": { - "type": "integer" - }, - "ids": { - "type": "array", - "items": { - "type": "integer" - } - }, - "updateBy": { - "type": "integer" - } - } - }, - "dto.SysMenuControl": { + "dto.SysMenuInsertReq": { "type": "object", "properties": { "action": { @@ -3202,12 +3326,96 @@ } } }, - "dto.SysOperaLogById": { + "dto.SysMenuUpdateReq": { "type": "object", "properties": { - "id": { + "action": { + "description": "请求方式", + "type": "string" + }, + "apis": { + "type": "array", + "items": { + "type": "integer" + } + }, + "breadcrumb": { + "description": "是否面包屑", + "type": "string" + }, + "component": { + "description": "组件", + "type": "string" + }, + "createBy": { "type": "integer" }, + "icon": { + "description": "图标", + "type": "string" + }, + "isFrame": { + "description": "是否frame", + "type": "string" + }, + "menuId": { + "description": "编码", + "type": "integer" + }, + "menuName": { + "description": "菜单name", + "type": "string" + }, + "menuType": { + "description": "菜单类型", + "type": "string" + }, + "noCache": { + "description": "是否缓存", + "type": "boolean" + }, + "parentId": { + "description": "上级菜单", + "type": "integer" + }, + "path": { + "description": "路径", + "type": "string" + }, + "paths": { + "description": "id路径", + "type": "string" + }, + "permission": { + "description": "权限编码", + "type": "string" + }, + "sort": { + "description": "排序", + "type": "integer" + }, + "sysApi": { + "type": "array", + "items": { + "$ref": "#/definitions/models.SysApi" + } + }, + "title": { + "description": "显示名称", + "type": "string" + }, + "updateBy": { + "type": "integer" + }, + "visible": { + "description": "是否显示", + "type": "string" + } + } + }, + "dto.SysOperaLogDeleteReq": { + "type": "object", + "properties": { "ids": { "type": "array", "items": { @@ -3291,12 +3499,9 @@ } } }, - "dto.SysRoleById": { + "dto.SysRoleDeleteReq": { "type": "object", "properties": { - "id": { - "type": "integer" - }, "ids": { "type": "array", "items": { @@ -3305,7 +3510,7 @@ } } }, - "dto.SysRoleControl": { + "dto.SysRoleInsertReq": { "type": "object", "properties": { "admin": { @@ -3374,16 +3579,77 @@ } } }, - "dto.SysUserControl": { + "dto.SysRoleUpdateReq": { + "type": "object", + "properties": { + "admin": { + "type": "boolean" + }, + "createBy": { + "type": "integer" + }, + "dataScope": { + "type": "string" + }, + "deptIds": { + "type": "array", + "items": { + "type": "integer" + } + }, + "flag": { + "description": "标记", + "type": "string" + }, + "menuIds": { + "type": "array", + "items": { + "type": "integer" + } + }, + "remark": { + "description": "备注", + "type": "string" + }, + "roleId": { + "description": "角色编码", + "type": "integer" + }, + "roleKey": { + "description": "角色代码", + "type": "string" + }, + "roleName": { + "description": "角色名称", + "type": "string" + }, + "roleSort": { + "description": "角色排序", + "type": "integer" + }, + "status": { + "description": "状态", + "type": "string" + }, + "sysDept": { + "type": "array", + "items": { + "$ref": "#/definitions/models.SysDept" + } + }, + "sysMenu": { + "type": "array", + "items": { + "$ref": "#/definitions/models.SysMenu" + } + }, + "updateBy": { + "type": "integer" + } + } + }, + "dto.SysUserInsertReq": { "type": "object", - "required": [ - "deptId", - "email", - "nickName", - "phone", - "status", - "username" - ], "properties": { "avatar": { "type": "string" @@ -3434,6 +3700,55 @@ } } }, + "dto.SysUserUpdateReq": { + "type": "object", + "properties": { + "avatar": { + "type": "string" + }, + "createBy": { + "type": "integer" + }, + "deptId": { + "type": "integer" + }, + "email": { + "type": "string" + }, + "nickName": { + "type": "string" + }, + "phone": { + "type": "string" + }, + "postId": { + "type": "integer" + }, + "remark": { + "type": "string" + }, + "roleId": { + "type": "integer" + }, + "sex": { + "type": "string" + }, + "status": { + "type": "string", + "default": "1" + }, + "updateBy": { + "type": "integer" + }, + "userId": { + "description": "用户ID", + "type": "integer" + }, + "username": { + "type": "string" + } + } + }, "dto.UpdateStatusReq": { "type": "object", "properties": { @@ -3455,10 +3770,6 @@ }, "dto.UpdateSysUserStatusReq": { "type": "object", - "required": [ - "status", - "userId" - ], "properties": { "createBy": { "type": "integer" @@ -3558,7 +3869,7 @@ "type": "integer" }, "isFrontend": { - "type": "integer" + "type": "string" }, "remark": { "type": "string" diff --git a/docs/swagger.yaml b/docs/swagger.yaml index 69a667cc..95dee5ae 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -12,9 +12,6 @@ definitions: type: string oldPassword: type: string - required: - - newPassword - - oldPassword type: object dto.ResetSysUserPwdReq: properties: @@ -27,9 +24,6 @@ definitions: userId: description: 用户ID type: integer - required: - - password - - userId type: object dto.RoleDataScopeReq: properties: @@ -45,7 +39,14 @@ definitions: - dataScope - roleId type: object - dto.SysApiControl: + dto.SysApiDeleteReq: + properties: + ids: + items: + type: integer + type: array + type: object + dto.SysApiUpdateReq: properties: action: type: string @@ -86,22 +87,20 @@ definitions: description: 编码 type: integer isFrontend: - type: integer + type: string remark: type: string updateBy: type: integer type: object - dto.SysDeptById: + dto.SysDeptDeleteReq: properties: - id: - type: integer ids: items: type: integer type: array type: object - dto.SysDeptControl: + dto.SysDeptInsertReq: properties: createBy: type: integer @@ -135,11 +134,43 @@ definitions: updateBy: type: integer type: object - dto.SysDictDataById: + dto.SysDeptUpdateReq: properties: createBy: type: integer - id: + deptId: + description: 编码 + type: integer + deptName: + description: 部门名称 + type: string + deptPath: + description: 路径 + type: string + email: + description: 邮箱 + type: string + leader: + description: 负责人 + type: string + parentId: + description: 上级部门 + type: integer + phone: + description: 手机 + type: string + sort: + description: 排序 + type: integer + status: + description: 状态 + type: integer + updateBy: + type: integer + type: object + dto.SysDictDataDeleteReq: + properties: + createBy: type: integer ids: items: @@ -148,7 +179,41 @@ definitions: updateBy: type: integer type: object - dto.SysDictDataControl: + dto.SysDictDataGetAllResp: + properties: + label: + type: string + value: + type: string + type: object + dto.SysDictDataInsertReq: + properties: + createBy: + type: integer + cssClass: + type: string + default: + type: string + dictLabel: + type: string + dictSort: + type: integer + dictType: + type: string + dictValue: + type: string + isDefault: + type: string + listClass: + type: string + remark: + type: string + status: + type: integer + updateBy: + type: integer + type: object + dto.SysDictDataUpdateReq: properties: createBy: type: integer @@ -177,7 +242,18 @@ definitions: updateBy: type: integer type: object - dto.SysDictTypeControl: + dto.SysDictTypeDeleteReq: + properties: + createBy: + type: integer + ids: + items: + type: integer + type: array + updateBy: + type: integer + type: object + dto.SysDictTypeInsertReq: properties: createBy: type: integer @@ -194,12 +270,34 @@ definitions: updateBy: type: integer type: object - dto.SysLoginLogById: + dto.SysDictTypeUpdateReq: properties: createBy: type: integer + dictName: + type: string + dictType: + type: string id: type: integer + remark: + type: string + status: + type: integer + updateBy: + type: integer + type: object + dto.SysLoginLogDeleteReq: + properties: + ids: + items: + type: integer + type: array + type: object + dto.SysMenuDeleteReq: + properties: + createBy: + type: integer ids: items: type: integer @@ -207,20 +305,7 @@ definitions: updateBy: type: integer type: object - dto.SysMenuById: - properties: - createBy: - type: integer - id: - type: integer - ids: - items: - type: integer - type: array - updateBy: - type: integer - type: object - dto.SysMenuControl: + dto.SysMenuInsertReq: properties: action: description: 请求方式 @@ -283,10 +368,71 @@ definitions: description: 是否显示 type: string type: object - dto.SysOperaLogById: + dto.SysMenuUpdateReq: properties: - id: + action: + description: 请求方式 + type: string + apis: + items: + type: integer + type: array + breadcrumb: + description: 是否面包屑 + type: string + component: + description: 组件 + type: string + createBy: type: integer + icon: + description: 图标 + type: string + isFrame: + description: 是否frame + type: string + menuId: + description: 编码 + type: integer + menuName: + description: 菜单name + type: string + menuType: + description: 菜单类型 + type: string + noCache: + description: 是否缓存 + type: boolean + parentId: + description: 上级菜单 + type: integer + path: + description: 路径 + type: string + paths: + description: id路径 + type: string + permission: + description: 权限编码 + type: string + sort: + description: 排序 + type: integer + sysApi: + items: + $ref: '#/definitions/models.SysApi' + type: array + title: + description: 显示名称 + type: string + updateBy: + type: integer + visible: + description: 是否显示 + type: string + type: object + dto.SysOperaLogDeleteReq: + properties: ids: items: type: integer @@ -341,16 +487,14 @@ definitions: updateBy: type: integer type: object - dto.SysRoleById: + dto.SysRoleDeleteReq: properties: - id: - type: integer ids: items: type: integer type: array type: object - dto.SysRoleControl: + dto.SysRoleInsertReq: properties: admin: type: boolean @@ -398,7 +542,55 @@ definitions: updateBy: type: integer type: object - dto.SysUserControl: + dto.SysRoleUpdateReq: + properties: + admin: + type: boolean + createBy: + type: integer + dataScope: + type: string + deptIds: + items: + type: integer + type: array + flag: + description: 标记 + type: string + menuIds: + items: + type: integer + type: array + remark: + description: 备注 + type: string + roleId: + description: 角色编码 + type: integer + roleKey: + description: 角色代码 + type: string + roleName: + description: 角色名称 + type: string + roleSort: + description: 角色排序 + type: integer + status: + description: 状态 + type: string + sysDept: + items: + $ref: '#/definitions/models.SysDept' + type: array + sysMenu: + items: + $ref: '#/definitions/models.SysMenu' + type: array + updateBy: + type: integer + type: object + dto.SysUserInsertReq: properties: avatar: type: string @@ -432,13 +624,39 @@ definitions: type: integer username: type: string - required: - - deptId - - email - - nickName - - phone - - status - - username + type: object + dto.SysUserUpdateReq: + properties: + avatar: + type: string + createBy: + type: integer + deptId: + type: integer + email: + type: string + nickName: + type: string + phone: + type: string + postId: + type: integer + remark: + type: string + roleId: + type: integer + sex: + type: string + status: + default: "1" + type: string + updateBy: + type: integer + userId: + description: 用户ID + type: integer + username: + type: string type: object dto.UpdateStatusReq: properties: @@ -464,9 +682,6 @@ definitions: userId: description: 用户ID type: integer - required: - - status - - userId type: object handler.Login: properties: @@ -524,7 +739,7 @@ definitions: id: type: integer isFrontend: - type: integer + type: string remark: type: string updateBy: @@ -945,7 +1160,7 @@ paths: name: data required: true schema: - $ref: '#/definitions/dto.SysDeptById' + $ref: '#/definitions/dto.SysDeptDeleteReq' responses: "200": description: '{"code": -1, "message": "删除失败"}' @@ -991,7 +1206,7 @@ paths: name: data required: true schema: - $ref: '#/definitions/dto.SysDeptControl' + $ref: '#/definitions/dto.SysDeptInsertReq' responses: "200": description: '{"code": -1, "message": "添加失败"}' @@ -1010,10 +1225,6 @@ paths: in: path name: deptId type: string - - description: position - in: query - name: position - type: string responses: "200": description: '{"code": 200, "data": [...]}' @@ -1021,7 +1232,7 @@ paths: $ref: '#/definitions/response.Response' security: - Bearer: [] - summary: 部门列表数据 + summary: 获取部门数据 tags: - 部门 put: @@ -1039,7 +1250,7 @@ paths: name: data required: true schema: - $ref: '#/definitions/dto.SysDeptControl' + $ref: '#/definitions/dto.SysDeptUpdateReq' responses: "200": description: '{"code": -1, "message": "添加失败"}' @@ -1061,9 +1272,16 @@ paths: type: integer responses: "200": - description: '{"code": -1, "message": "删除失败"}' + description: '{"code": 200, "data": [...]}' schema: - type: string + allOf: + - $ref: '#/definitions/response.Response' + - properties: + data: + items: + $ref: '#/definitions/dto.SysDictDataGetAllResp' + type: array + type: object security: - Bearer: [] summary: 数据字典根据key获取 @@ -1078,12 +1296,12 @@ paths: name: dictCode required: true schema: - $ref: '#/definitions/dto.SysDictDataById' + $ref: '#/definitions/dto.SysDictDataDeleteReq' responses: "200": - description: '{"code": -1, "message": "删除失败"}' + description: '{"code": 200, "message": "删除成功"}' schema: - type: string + $ref: '#/definitions/response.Response' security: - Bearer: [] summary: 删除字典数据 @@ -1132,12 +1350,12 @@ paths: name: data required: true schema: - $ref: '#/definitions/dto.SysDictDataControl' + $ref: '#/definitions/dto.SysDictDataInsertReq' responses: "200": - description: '{"code": -1, "message": "添加失败"}' + description: '{"code": 200, "message": "添加成功"}' schema: - type: string + $ref: '#/definitions/response.Response' security: - Bearer: [] summary: 添加字典数据 @@ -1172,12 +1390,12 @@ paths: name: data required: true schema: - $ref: '#/definitions/dto.SysDictDataControl' + $ref: '#/definitions/dto.SysDictDataUpdateReq' responses: "200": - description: '{"code": -1, "message": "添加失败"}' + description: '{"code": 200, "message": "修改成功"}' schema: - type: string + $ref: '#/definitions/response.Response' security: - Bearer: [] summary: 修改字典数据 @@ -1187,16 +1405,17 @@ paths: delete: description: 删除数据 parameters: - - description: dictId - in: path - name: dictId + - description: body + in: body + name: dictCode required: true - type: integer + schema: + $ref: '#/definitions/dto.SysDictTypeDeleteReq' responses: "200": - description: '{"code": -1, "message": "删除失败"}' + description: '{"code": 200, "data": [...]}' schema: - type: string + $ref: '#/definitions/response.Response' security: - Bearer: [] summary: 删除字典类型 @@ -1245,12 +1464,12 @@ paths: name: data required: true schema: - $ref: '#/definitions/dto.SysDictTypeControl' + $ref: '#/definitions/dto.SysDictTypeInsertReq' responses: "200": - description: '{"code": -1, "message": "添加失败"}' + description: '{"code": 200, "data": [...]}' schema: - type: string + $ref: '#/definitions/response.Response' security: - Bearer: [] summary: 添加字典类型 @@ -1311,12 +1530,12 @@ paths: name: data required: true schema: - $ref: '#/definitions/dto.SysDictTypeControl' + $ref: '#/definitions/dto.SysDictTypeUpdateReq' responses: "200": - description: '{"code": -1, "message": "添加失败"}' + description: '{"code": 200, "data": [...]}' schema: - type: string + $ref: '#/definitions/response.Response' security: - Bearer: [] summary: 修改字典类型 @@ -1372,7 +1591,7 @@ paths: name: data required: true schema: - $ref: '#/definitions/dto.SysMenuById' + $ref: '#/definitions/dto.SysMenuDeleteReq' responses: "200": description: '{"code": 200, "data": [...]}' @@ -1386,10 +1605,6 @@ paths: get: description: 获取JSON parameters: - - description: menuName - in: query - name: menuName - type: string - description: menuName in: query name: menuName @@ -1414,7 +1629,7 @@ paths: name: data required: true schema: - $ref: '#/definitions/dto.SysMenuControl' + $ref: '#/definitions/dto.SysMenuInsertReq' responses: "200": description: '{"code": 200, "data": [...]}' @@ -1458,7 +1673,7 @@ paths: name: data required: true schema: - $ref: '#/definitions/dto.SysMenuControl' + $ref: '#/definitions/dto.SysMenuUpdateReq' responses: "200": description: '{"code": 200, "data": [...]}' @@ -1515,13 +1730,9 @@ paths: $ref: '#/definitions/dto.SysPostDeleteReq' responses: "200": - description: '{"code": 200, "message": "删除成功"}' + description: '{"code": 200, "data": [...]}' schema: - type: string - "500": - description: '{"code": 500, "message": "删除失败"}' - schema: - type: string + $ref: '#/definitions/response.Response' security: - Bearer: [] summary: 删除岗位 @@ -1569,9 +1780,9 @@ paths: $ref: '#/definitions/dto.SysPostInsertReq' responses: "200": - description: '{"code": -1, "message": "添加失败"}' + description: '{"code": 200, "data": [...]}' schema: - type: string + $ref: '#/definitions/response.Response' security: - Bearer: [] summary: 添加岗位 @@ -1591,9 +1802,9 @@ paths: $ref: '#/definitions/dto.SysPostUpdateReq' responses: "200": - description: '{"code": -1, "message": "添加失败"}' + description: '{"code": 200, "data": [...]}' schema: - type: string + $ref: '#/definitions/response.Response' security: - Bearer: [] summary: 修改岗位 @@ -1653,7 +1864,7 @@ paths: name: data required: true schema: - $ref: '#/definitions/dto.SysRoleById' + $ref: '#/definitions/dto.SysRoleDeleteReq' responses: "200": description: '{"code": 200, "data": [...]}' @@ -1707,7 +1918,7 @@ paths: name: data required: true schema: - $ref: '#/definitions/dto.SysRoleControl' + $ref: '#/definitions/dto.SysRoleInsertReq' responses: "200": description: '{"code": 200, "data": [...]}' @@ -1768,7 +1979,7 @@ paths: name: data required: true schema: - $ref: '#/definitions/dto.SysRoleControl' + $ref: '#/definitions/dto.SysRoleUpdateReq' responses: "200": description: '{"code": 200, "data": [...]}' @@ -1840,13 +2051,12 @@ paths: delete: description: 删除接口管理 parameters: - - description: ids + - description: body in: body - name: ids + name: data + required: true schema: - items: - type: integer - type: array + $ref: '#/definitions/dto.SysApiDeleteReq' responses: "200": description: '{"code": 200, "message": "删除成功"}' @@ -1939,7 +2149,7 @@ paths: name: data required: true schema: - $ref: '#/definitions/dto.SysApiControl' + $ref: '#/definitions/dto.SysApiUpdateReq' responses: "200": description: '{"code": 200, "message": "修改成功"}' @@ -2094,7 +2304,7 @@ paths: name: data required: true schema: - $ref: '#/definitions/dto.SysLoginLogById' + $ref: '#/definitions/dto.SysLoginLogDeleteReq' responses: "200": description: '{"code": 200, "data": [...]}' @@ -2169,7 +2379,7 @@ paths: name: data required: true schema: - $ref: '#/definitions/dto.SysOperaLogById' + $ref: '#/definitions/dto.SysOperaLogDeleteReq' responses: "200": description: '{"code": 200, "data": [...]}' @@ -2271,7 +2481,7 @@ paths: name: data required: true schema: - $ref: '#/definitions/dto.SysUserControl' + $ref: '#/definitions/dto.SysUserInsertReq' responses: "200": description: '{"code": 200, "data": [...]}' @@ -2329,7 +2539,7 @@ paths: name: data required: true schema: - $ref: '#/definitions/dto.SysUserControl' + $ref: '#/definitions/dto.SysUserUpdateReq' responses: "200": description: '{"code": 200, "data": [...]}' @@ -2515,7 +2725,7 @@ paths: $ref: '#/definitions/response.Response' security: - Bearer: [] - summary: 重置密码 + summary: 修改密码 tags: - 用户 /api/v1/user/status: diff --git a/go.mod b/go.mod index f7de6868..02502f51 100644 --- a/go.mod +++ b/go.mod @@ -8,23 +8,42 @@ require ( github.com/alibaba/sentinel-golang/pkg/adapters/gin v0.0.0-20220808015021-c5f1f1d055c5 github.com/aliyun/aliyun-oss-go-sdk v0.0.0-20190307165228-86c17b95fcd5 github.com/bitly/go-simplejson v0.5.0 + github.com/bsm/redislock v0.5.0 github.com/bytedance/go-tagexpr/v2 v2.7.12 github.com/casbin/casbin/v2 v2.51.2 + github.com/casbin/redis-watcher/v2 v2.0.0-20220614104201-0e70bf2be930 + github.com/chanxuehong/wechat v0.0.0-20201110083048-0180211b69fd github.com/gin-gonic/gin v1.7.7 github.com/go-admin-team/go-admin-core v1.4.1-0.20220809101213-21187928f7d9 + github.com/go-admin-team/go-admin-core/plugins/logger/zap v0.0.0-20210610020726-2db73adb505d github.com/go-admin-team/go-admin-core/sdk v1.4.1-0.20220809101213-21187928f7d9 + github.com/go-admin-team/gorm-adapter/v3 v3.7.8-0.20220809100335-eaf9f67b3d21 + github.com/go-playground/locales v0.14.0 + github.com/go-playground/universal-translator v0.18.0 + github.com/go-playground/validator/v10 v10.8.0 + github.com/go-redis/redis/v7 v7.4.0 + github.com/go-redis/redis/v8 v8.11.5 + github.com/golang-jwt/jwt/v4 v4.4.2 github.com/google/uuid v1.3.0 + github.com/gorilla/websocket v1.4.2 github.com/huaweicloud/huaweicloud-sdk-go-obs v3.21.12+incompatible + github.com/mojocn/base64Captcha v1.3.1 github.com/mssola/user_agent v0.5.2 + github.com/nsqio/go-nsq v1.0.8 github.com/opentracing/opentracing-go v1.1.0 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.11.0 github.com/qiniu/go-sdk/v7 v7.11.1 github.com/robfig/cron/v3 v3.0.1 + github.com/robinjoseph08/redisqueue/v2 v2.1.0 + github.com/shamsher31/goimgext v1.0.0 github.com/shirou/gopsutil/v3 v3.22.1 + github.com/slok/go-http-metrics v0.9.0 + github.com/smartystreets/goconvey v1.6.4 github.com/spf13/cobra v1.0.0 - github.com/swaggo/gin-swagger v1.2.0 - github.com/swaggo/swag v1.6.7 + github.com/swaggo/files v0.0.0-20220728132757-551d4a08d97a + github.com/swaggo/gin-swagger v1.5.0 + github.com/swaggo/swag v1.8.3 github.com/unrolled/secure v1.0.8 golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 gorm.io/driver/mysql v1.3.5 @@ -42,11 +61,8 @@ require ( github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f // indirect github.com/beorn7/perks v1.0.1 // indirect - github.com/bsm/redislock v0.5.0 // indirect - github.com/casbin/redis-watcher/v2 v2.0.0-20220614104201-0e70bf2be930 // indirect github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/chanxuehong/rand v0.0.0-20201110082127-2f19a1bdd973 // indirect - github.com/chanxuehong/wechat v0.0.0-20201110083048-0180211b69fd // indirect github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect github.com/denisenkom/go-mssqldb v0.12.0 // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect @@ -55,26 +71,18 @@ require ( github.com/ghodss/yaml v1.0.0 // indirect github.com/gin-contrib/sse v0.1.0 // indirect github.com/git-chglog/git-chglog v0.0.0-20190611050339-63a4e637021f // indirect - github.com/go-admin-team/go-admin-core/plugins/logger/zap v0.0.0-20210610020726-2db73adb505d // indirect - github.com/go-admin-team/gorm-adapter/v3 v3.7.8-0.20220809100335-eaf9f67b3d21 // indirect github.com/go-ole/go-ole v1.2.6 // indirect - github.com/go-openapi/jsonpointer v0.19.3 // indirect - github.com/go-openapi/jsonreference v0.19.3 // indirect - github.com/go-openapi/spec v0.19.4 // indirect - github.com/go-openapi/swag v0.19.5 // indirect - github.com/go-playground/locales v0.14.0 // indirect - github.com/go-playground/universal-translator v0.18.0 // indirect - github.com/go-playground/validator/v10 v10.8.0 // indirect - github.com/go-redis/redis/v7 v7.4.0 // indirect - github.com/go-redis/redis/v8 v8.11.5 // indirect + github.com/go-openapi/jsonpointer v0.19.5 // indirect + github.com/go-openapi/jsonreference v0.19.6 // indirect + github.com/go-openapi/spec v0.20.4 // indirect + github.com/go-openapi/swag v0.19.15 // indirect github.com/go-sql-driver/mysql v1.6.0 // indirect - github.com/golang-jwt/jwt/v4 v4.4.2 // indirect github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect github.com/golang-sql/sqlexp v0.0.0-20170517235910-f1bb20e5a188 // indirect github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect github.com/golang/protobuf v1.4.3 // indirect github.com/golang/snappy v0.0.1 // indirect - github.com/gorilla/websocket v1.4.2 // indirect + github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 // indirect github.com/henrylee2cn/ameda v1.4.10 // indirect github.com/henrylee2cn/goutil v0.0.0-20210127050712-89660552f6f8 // indirect github.com/imdario/mergo v0.3.9 // indirect @@ -89,11 +97,13 @@ require ( github.com/jackc/pgx/v4 v4.16.1 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect + github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.11 // indirect + github.com/jtolds/gls v4.20.0+incompatible // indirect github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect github.com/leodido/go-urn v1.2.1 // indirect github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect - github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e // indirect + github.com/mailru/easyjson v0.7.6 // indirect github.com/mattn/go-colorable v0.1.7 // indirect github.com/mattn/go-isatty v0.0.14 // indirect github.com/mattn/go-sqlite3 v1.14.12 // indirect @@ -102,17 +112,14 @@ require ( github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.1 // indirect - github.com/mojocn/base64Captcha v1.3.1 // indirect - github.com/nsqio/go-nsq v1.0.8 // indirect github.com/nyaruka/phonenumbers v1.0.55 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect github.com/prometheus/client_model v0.2.0 // indirect github.com/prometheus/common v0.26.0 // indirect github.com/prometheus/procfs v0.6.0 // indirect - github.com/robinjoseph08/redisqueue/v2 v2.1.0 // indirect github.com/russross/blackfriday/v2 v2.0.1 // indirect - github.com/shamsher31/goimgext v1.0.0 // indirect github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect + github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d // indirect github.com/spf13/cast v1.3.1 // indirect github.com/spf13/pflag v1.0.3 // indirect github.com/tklauser/go-sysconf v0.3.9 // indirect @@ -126,12 +133,12 @@ require ( go.uber.org/zap v1.15.0 // indirect golang.org/x/image v0.0.0-20210220032944-ac19c3e999fb // indirect golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect - golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2 // indirect - golang.org/x/sync v0.0.0-20201207232520-09787c993a3a // indirect + golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4 // indirect + golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect golang.org/x/text v0.3.7 // indirect golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect - golang.org/x/tools v0.0.0-20210106214847-113979e3529a // indirect + golang.org/x/tools v0.1.10 // indirect google.golang.org/protobuf v1.26.0-rc.1 // indirect gopkg.in/AlecAivazis/survey.v1 v1.8.5 // indirect gopkg.in/kyokomi/emoji.v1 v1.5.1 // indirect