diff --git a/server/api/v1/autocode/autocodeExample.go b/server/api/v1/autocode/autocodeExample.go index 4c5a8a3e..3b9cdca6 100644 --- a/server/api/v1/autocode/autocodeExample.go +++ b/server/api/v1/autocode/autocodeExample.go @@ -78,7 +78,7 @@ func (autoCodeExampleApi *AutoCodeExampleApi) UpdateAutoCodeExample(c *gin.Conte // @Security ApiKeyAuth // @accept application/json // @Produce application/json -// @Param data query autocode.AutoCodeExample true "用id查询AutoCodeExample" +// @Param data body autocode.AutoCodeExample true "用id查询AutoCodeExample" // @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}" // @Router /autoCodeExample/findAutoCodeExample [get] func (autoCodeExampleApi *AutoCodeExampleApi) FindAutoCodeExample(c *gin.Context) { @@ -101,7 +101,7 @@ func (autoCodeExampleApi *AutoCodeExampleApi) FindAutoCodeExample(c *gin.Context // @Security ApiKeyAuth // @accept application/json // @Produce application/json -// @Param data query autocodeReq.AutoCodeExampleSearch true "页码, 每页大小, 搜索条件" +// @Param data body autocodeReq.AutoCodeExampleSearch true "页码, 每页大小, 搜索条件" // @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}" // @Router /autoCodeExample/getAutoCodeExampleList [get] func (autoCodeExampleApi *AutoCodeExampleApi) GetAutoCodeExampleList(c *gin.Context) { diff --git a/server/api/v1/example/exa_customer.go b/server/api/v1/example/exa_customer.go index 686b1f0d..284df6f3 100644 --- a/server/api/v1/example/exa_customer.go +++ b/server/api/v1/example/exa_customer.go @@ -94,7 +94,7 @@ func (e *CustomerApi) UpdateExaCustomer(c *gin.Context) { // @Security ApiKeyAuth // @accept application/json // @Produce application/json -// @Param data query example.ExaCustomer true "客户ID" +// @Param data body example.ExaCustomer true "客户ID" // @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}" // @Router /customer/customer [get] func (e *CustomerApi) GetExaCustomer(c *gin.Context) { @@ -118,7 +118,7 @@ func (e *CustomerApi) GetExaCustomer(c *gin.Context) { // @Security ApiKeyAuth // @accept application/json // @Produce application/json -// @Param data query request.PageInfo true "页码, 每页大小" +// @Param data body request.PageInfo true "页码, 每页大小" // @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}" // @Router /customer/customerList [get] func (e *CustomerApi) GetExaCustomerList(c *gin.Context) { diff --git a/server/api/v1/system/sys_captcha.go b/server/api/v1/system/sys_captcha.go index 29450f36..057bb99f 100644 --- a/server/api/v1/system/sys_captcha.go +++ b/server/api/v1/system/sys_captcha.go @@ -10,7 +10,7 @@ import ( ) // 当开启多服务器部署时，替换下面的配置，使用redis共享存储验证码 -//var store = captcha.NewDefaultRedisStore() +// var store = captcha.NewDefaultRedisStore() var store = base64Captcha.DefaultMemStore type BaseApi struct { @@ -27,7 +27,6 @@ func (b *BaseApi) Captcha(c *gin.Context) { // 字符,公式,验证码配置 // 生成默认数字的driver driver := base64Captcha.NewDriverDigit(global.GVA_CONFIG.Captcha.ImgHeight, global.GVA_CONFIG.Captcha.ImgWidth, global.GVA_CONFIG.Captcha.KeyLong, 0.7, 80) - //cp := base64Captcha.NewCaptcha(driver, store.UseWithCtx(c)) // v8下使用redis cp := base64Captcha.NewCaptcha(driver, store) if id, b64s, err := cp.Generate(); err != nil { global.GVA_LOG.Error("验证码获取失败!", zap.Any("err", err)) diff --git a/server/api/v1/system/sys_dictionary.go b/server/api/v1/system/sys_dictionary.go index 42da16f0..bf6a2ff8 100644 --- a/server/api/v1/system/sys_dictionary.go +++ b/server/api/v1/system/sys_dictionary.go @@ -75,7 +75,7 @@ func (s *DictionaryApi) UpdateSysDictionary(c *gin.Context) { // @Security ApiKeyAuth // @accept application/json // @Produce application/json -// @Param data query system.SysDictionary true "ID或字典英名" +// @Param data body system.SysDictionary true "ID或字典英名" // @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}" // @Router /sysDictionary/findSysDictionary [get] func (s *DictionaryApi) FindSysDictionary(c *gin.Context) { @@ -94,7 +94,7 @@ func (s *DictionaryApi) FindSysDictionary(c *gin.Context) { // @Security ApiKeyAuth // @accept application/json // @Produce application/json -// @Param data query request.SysDictionarySearch true "页码, 每页大小, 搜索条件" +// @Param data body request.SysDictionarySearch true "页码, 每页大小, 搜索条件" // @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}" // @Router /sysDictionary/getSysDictionaryList [get] func (s *DictionaryApi) GetSysDictionaryList(c *gin.Context) { diff --git a/server/api/v1/system/sys_dictionary_detail.go b/server/api/v1/system/sys_dictionary_detail.go index 590fef8b..d9a1ff33 100644 --- a/server/api/v1/system/sys_dictionary_detail.go +++ b/server/api/v1/system/sys_dictionary_detail.go @@ -75,7 +75,7 @@ func (s *DictionaryDetailApi) UpdateSysDictionaryDetail(c *gin.Context) { // @Security ApiKeyAuth // @accept application/json // @Produce application/json -// @Param data query system.SysDictionaryDetail true "用id查询SysDictionaryDetail" +// @Param data body system.SysDictionaryDetail true "用id查询SysDictionaryDetail" // @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}" // @Router /sysDictionaryDetail/findSysDictionaryDetail [get] func (s *DictionaryDetailApi) FindSysDictionaryDetail(c *gin.Context) { @@ -98,7 +98,7 @@ func (s *DictionaryDetailApi) FindSysDictionaryDetail(c *gin.Context) { // @Security ApiKeyAuth // @accept application/json // @Produce application/json -// @Param data query request.SysDictionaryDetailSearch true "页码, 每页大小, 搜索条件" +// @Param data body request.SysDictionaryDetailSearch true "页码, 每页大小, 搜索条件" // @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}" // @Router /sysDictionaryDetail/getSysDictionaryDetailList [get] func (s *DictionaryDetailApi) GetSysDictionaryDetailList(c *gin.Context) { diff --git a/server/api/v1/system/sys_menu.go b/server/api/v1/system/sys_menu.go index 8333f26a..f9fecbfb 100644 --- a/server/api/v1/system/sys_menu.go +++ b/server/api/v1/system/sys_menu.go @@ -81,7 +81,7 @@ func (a *AuthorityMenuApi) AddMenuAuthority(c *gin.Context) { // @Produce application/json // @Param data body request.GetAuthorityId true "角色ID" // @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}" -// @Router /menu/getMenuAuthority [post] +// @Router /menu/GetMenuAuthority [post] func (a *AuthorityMenuApi) GetMenuAuthority(c *gin.Context) { var param request.GetAuthorityId _ = c.ShouldBindJSON(¶m) diff --git a/server/api/v1/system/sys_operation_record.go b/server/api/v1/system/sys_operation_record.go index ba18e024..38c07512 100644 --- a/server/api/v1/system/sys_operation_record.go +++ b/server/api/v1/system/sys_operation_record.go @@ -76,7 +76,7 @@ func (s *OperationRecordApi) DeleteSysOperationRecordByIds(c *gin.Context) { // @Security ApiKeyAuth // @accept application/json // @Produce application/json -// @Param data query system.SysOperationRecord true "Id" +// @Param data body system.SysOperationRecord true "Id" // @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}" // @Router /sysOperationRecord/findSysOperationRecord [get] func (s *OperationRecordApi) FindSysOperationRecord(c *gin.Context) { @@ -99,7 +99,7 @@ func (s *OperationRecordApi) FindSysOperationRecord(c *gin.Context) { // @Security ApiKeyAuth // @accept application/json // @Produce application/json -// @Param data query request.SysOperationRecordSearch true "页码, 每页大小, 搜索条件" +// @Param data body request.SysOperationRecordSearch true "页码, 每页大小, 搜索条件" // @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}" // @Router /sysOperationRecord/getSysOperationRecordList [get] func (s *OperationRecordApi) GetSysOperationRecordList(c *gin.Context) { diff --git a/server/api/v1/system/sys_user.go b/server/api/v1/system/sys_user.go index cf192174..e9bea128 100644 --- a/server/api/v1/system/sys_user.go +++ b/server/api/v1/system/sys_user.go @@ -143,7 +143,7 @@ func (b *BaseApi) Register(c *gin.Context) { // @Produce application/json // @Param data body systemReq.ChangePasswordStruct true "用户名, 原密码, 新密码" // @Success 200 {string} string "{"success":true,"data":{},"msg":"修改成功"}" -// @Router /user/changePassword [post] +// @Router /user/changePassword [put] func (b *BaseApi) ChangePassword(c *gin.Context) { var user systemReq.ChangePasswordStruct _ = c.ShouldBindJSON(&user) diff --git a/server/config.yaml b/server/config.yaml index e0181e97..86235572 100644 --- a/server/config.yaml +++ b/server/config.yaml @@ -132,4 +132,3 @@ Timer: { tableName: "sys_operation_records" , compareField: "created_at", interval: "2160h" }, #{ tableName: "log2" , compareField: "created_at", interval: "2160h" } ] - diff --git a/server/config/oss.go b/server/config/oss.go index da657586..37957ddf 100644 --- a/server/config/oss.go +++ b/server/config/oss.go @@ -20,7 +20,7 @@ type AliyunOSS struct { AccessKeySecret string `mapstructure:"access-key-secret" json:"accessKeySecret" yaml:"access-key-secret"` BucketName string `mapstructure:"bucket-name" json:"bucketName" yaml:"bucket-name"` BucketUrl string `mapstructure:"bucket-url" json:"bucketUrl" yaml:"bucket-url"` - BasePath string `mapstructure:"base-path" json:"basePath" yaml:"base-path"` + BasePath string `mapstructure:"base-path" json:"basePath" yaml:"base-path"` } type TencentCOS struct { Bucket string `mapstructure:"bucket" json:"bucket" yaml:"bucket"` diff --git a/server/docs/docs.go b/server/docs/docs.go index 28c80d96..c68decca 100644 --- a/server/docs/docs.go +++ b/server/docs/docs.go @@ -1013,28 +1013,13 @@ var doc = `{ "summary": "用id查询AutoCodeExample", "parameters": [ { - "type": "string", - "description": "展示值", - "name": "autoCodeExampleField", - "in": "query" - }, - { - "type": "string", - "description": "创建时间", - "name": "createdAt", - "in": "query" - }, - { - "type": "integer", - "description": "主键ID", - "name": "id", - "in": "query" - }, - { - "type": "string", - "description": "更新时间", - "name": "updatedAt", - "in": "query" + "description": "用id查询AutoCodeExample", + "name": "data", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/autocode.AutoCodeExample" + } } ], "responses": { @@ -1066,40 +1051,13 @@ var doc = `{ "summary": "分页获取AutoCodeExample列表", "parameters": [ { - "type": "string", - "description": "展示值", - "name": "autoCodeExampleField", - "in": "query" - }, - { - "type": "string", - "description": "创建时间", - "name": "createdAt", - "in": "query" - }, - { - "type": "integer", - "description": "主键ID", - "name": "id", - "in": "query" - }, - { - "type": "integer", - "description": "页码", - "name": "page", - "in": "query" - }, - { - "type": "integer", - "description": "每页大小", - "name": "pageSize", - "in": "query" - }, - { - "type": "string", - "description": "更新时间", - "name": "updatedAt", - "in": "query" + "description": "页码, 每页大小, 搜索条件", + "name": "data", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/request.AutoCodeExampleSearch" + } } ], "responses": { @@ -1302,46 +1260,13 @@ var doc = `{ "summary": "获取单一客户信息", "parameters": [ { - "type": "string", - "description": "创建时间", - "name": "createdAt", - "in": "query" - }, - { - "type": "string", - "description": "客户名", - "name": "customerName", - "in": "query" - }, - { - "type": "string", - "description": "客户手机号", - "name": "customerPhoneData", - "in": "query" - }, - { - "type": "integer", - "description": "主键ID", - "name": "id", - "in": "query" - }, - { - "type": "string", - "description": "管理角色ID", - "name": "sysUserAuthorityID", - "in": "query" - }, - { - "type": "integer", - "description": "管理ID", - "name": "sysUserId", - "in": "query" - }, - { - "type": "string", - "description": "更新时间", - "name": "updatedAt", - "in": "query" + "description": "客户ID", + "name": "data", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/example.ExaCustomer" + } } ], "responses": { @@ -1481,16 +1406,13 @@ var doc = `{ "summary": "分页获取权限客户列表", "parameters": [ { - "type": "integer", - "description": "页码", - "name": "page", - "in": "query" - }, - { - "type": "integer", - "description": "每页大小", - "name": "pageSize", - "in": "query" + "description": "页码, 每页大小", + "name": "data", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/request.PageInfo" + } } ], "responses": { @@ -1948,6 +1870,44 @@ var doc = `{ } } }, + "/menu/GetMenuAuthority": { + "post": { + "security": [ + { + "ApiKeyAuth": [] + } + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "tags": [ + "AuthorityMenu" + ], + "summary": "获取指定角色menu", + "parameters": [ + { + "description": "角色ID", + "name": "data", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/request.GetAuthorityId" + } + } + ], + "responses": { + "200": { + "description": "{\"success\":true,\"data\":{},\"msg\":\"获取成功\"}", + "schema": { + "type": "string" + } + } + } + } + }, "/menu/addBaseMenu": { "post": { "security": [ @@ -2170,44 +2130,6 @@ var doc = `{ } } }, - "/menu/getMenuAuthority": { - "post": { - "security": [ - { - "ApiKeyAuth": [] - } - ], - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "tags": [ - "AuthorityMenu" - ], - "summary": "获取指定角色menu", - "parameters": [ - { - "description": "角色ID", - "name": "data", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/request.GetAuthorityId" - } - } - ], - "responses": { - "200": { - "description": "{\"success\":true,\"data\":{},\"msg\":\"获取成功\"}", - "schema": { - "type": "string" - } - } - } - } - }, "/menu/getMenuList": { "post": { "security": [ @@ -2379,46 +2301,13 @@ var doc = `{ "summary": "用id查询SysDictionary", "parameters": [ { - "type": "string", - "description": "创建时间", - "name": "createdAt", - "in": "query" - }, - { - "type": "string", - "description": "描述", - "name": "desc", - "in": "query" - }, - { - "type": "integer", - "description": "主键ID", - "name": "id", - "in": "query" - }, - { - "type": "string", - "description": "字典名（中）", - "name": "name", - "in": "query" - }, - { - "type": "boolean", - "description": "状态", - "name": "status", - "in": "query" - }, - { - "type": "string", - "description": "字典名（英）", - "name": "type", - "in": "query" - }, - { - "type": "string", - "description": "更新时间", - "name": "updatedAt", - "in": "query" + "description": "ID或字典英名", + "name": "data", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/system.SysDictionary" + } } ], "responses": { @@ -2450,58 +2339,13 @@ var doc = `{ "summary": "分页获取SysDictionary列表", "parameters": [ { - "type": "string", - "description": "创建时间", - "name": "createdAt", - "in": "query" - }, - { - "type": "string", - "description": "描述", - "name": "desc", - "in": "query" - }, - { - "type": "integer", - "description": "主键ID", - "name": "id", - "in": "query" - }, - { - "type": "string", - "description": "字典名（中）", - "name": "name", - "in": "query" - }, - { - "type": "integer", - "description": "页码", - "name": "page", - "in": "query" - }, - { - "type": "integer", - "description": "每页大小", - "name": "pageSize", - "in": "query" - }, - { - "type": "boolean", - "description": "状态", - "name": "status", - "in": "query" - }, - { - "type": "string", - "description": "字典名（英）", - "name": "type", - "in": "query" - }, - { - "type": "string", - "description": "更新时间", - "name": "updatedAt", - "in": "query" + "description": "页码, 每页大小, 搜索条件", + "name": "data", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/request.SysDictionarySearch" + } } ], "responses": { @@ -2647,52 +2491,13 @@ var doc = `{ "summary": "用id查询SysDictionaryDetail", "parameters": [ { - "type": "string", - "description": "创建时间", - "name": "createdAt", - "in": "query" - }, - { - "type": "integer", - "description": "主键ID", - "name": "id", - "in": "query" - }, - { - "type": "string", - "description": "展示值", - "name": "label", - "in": "query" - }, - { - "type": "integer", - "description": "排序标记", - "name": "sort", - "in": "query" - }, - { - "type": "boolean", - "description": "启用状态", - "name": "status", - "in": "query" - }, - { - "type": "integer", - "description": "关联标记", - "name": "sysDictionaryID", - "in": "query" - }, - { - "type": "string", - "description": "更新时间", - "name": "updatedAt", - "in": "query" - }, - { - "type": "integer", - "description": "字典值", - "name": "value", - "in": "query" + "description": "用id查询SysDictionaryDetail", + "name": "data", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/system.SysDictionaryDetail" + } } ], "responses": { @@ -2724,64 +2529,13 @@ var doc = `{ "summary": "分页获取SysDictionaryDetail列表", "parameters": [ { - "type": "string", - "description": "创建时间", - "name": "createdAt", - "in": "query" - }, - { - "type": "integer", - "description": "主键ID", - "name": "id", - "in": "query" - }, - { - "type": "string", - "description": "展示值", - "name": "label", - "in": "query" - }, - { - "type": "integer", - "description": "页码", - "name": "page", - "in": "query" - }, - { - "type": "integer", - "description": "每页大小", - "name": "pageSize", - "in": "query" - }, - { - "type": "integer", - "description": "排序标记", - "name": "sort", - "in": "query" - }, - { - "type": "boolean", - "description": "启用状态", - "name": "status", - "in": "query" - }, - { - "type": "integer", - "description": "关联标记", - "name": "sysDictionaryID", - "in": "query" - }, - { - "type": "string", - "description": "更新时间", - "name": "updatedAt", - "in": "query" - }, - { - "type": "integer", - "description": "字典值", - "name": "value", - "in": "query" + "description": "页码, 每页大小, 搜索条件", + "name": "data", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/request.SysDictionaryDetailSearch" + } } ], "responses": { @@ -2965,82 +2719,13 @@ var doc = `{ "summary": "用id查询SysOperationRecord", "parameters": [ { - "type": "string", - "description": "代理", - "name": "agent", - "in": "query" - }, - { - "type": "string", - "description": "请求Body", - "name": "body", - "in": "query" - }, - { - "type": "string", - "description": "创建时间", - "name": "createdAt", - "in": "query" - }, - { - "type": "string", - "description": "错误信息", - "name": "error_message", - "in": "query" - }, - { - "type": "integer", - "description": "主键ID", - "name": "id", - "in": "query" - }, - { - "type": "string", - "description": "请求ip", - "name": "ip", - "in": "query" - }, - { - "type": "string", - "description": "延迟", - "name": "latency", - "in": "query" - }, - { - "type": "string", - "description": "请求方法", - "name": "method", - "in": "query" - }, - { - "type": "string", - "description": "请求路径", - "name": "path", - "in": "query" - }, - { - "type": "string", - "description": "响应Body", - "name": "resp", - "in": "query" - }, - { - "type": "integer", - "description": "请求状态", - "name": "status", - "in": "query" - }, - { - "type": "string", - "description": "更新时间", - "name": "updatedAt", - "in": "query" - }, - { - "type": "integer", - "description": "用户id", - "name": "user_id", - "in": "query" + "description": "Id", + "name": "data", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/system.SysOperationRecord" + } } ], "responses": { @@ -3072,94 +2757,13 @@ var doc = `{ "summary": "分页获取SysOperationRecord列表", "parameters": [ { - "type": "string", - "description": "代理", - "name": "agent", - "in": "query" - }, - { - "type": "string", - "description": "请求Body", - "name": "body", - "in": "query" - }, - { - "type": "string", - "description": "创建时间", - "name": "createdAt", - "in": "query" - }, - { - "type": "string", - "description": "错误信息", - "name": "error_message", - "in": "query" - }, - { - "type": "integer", - "description": "主键ID", - "name": "id", - "in": "query" - }, - { - "type": "string", - "description": "请求ip", - "name": "ip", - "in": "query" - }, - { - "type": "string", - "description": "延迟", - "name": "latency", - "in": "query" - }, - { - "type": "string", - "description": "请求方法", - "name": "method", - "in": "query" - }, - { - "type": "integer", - "description": "页码", - "name": "page", - "in": "query" - }, - { - "type": "integer", - "description": "每页大小", - "name": "pageSize", - "in": "query" - }, - { - "type": "string", - "description": "请求路径", - "name": "path", - "in": "query" - }, - { - "type": "string", - "description": "响应Body", - "name": "resp", - "in": "query" - }, - { - "type": "integer", - "description": "请求状态", - "name": "status", - "in": "query" - }, - { - "type": "string", - "description": "更新时间", - "name": "updatedAt", - "in": "query" - }, - { - "type": "integer", - "description": "用户id", - "name": "user_id", - "in": "query" + "description": "页码, 每页大小, 搜索条件", + "name": "data", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/request.SysOperationRecordSearch" + } } ], "responses": { @@ -3280,7 +2884,7 @@ var doc = `{ } }, "/user/changePassword": { - "post": { + "put": { "security": [ { "ApiKeyAuth": [] @@ -3352,33 +2956,6 @@ var doc = `{ } } }, - "/user/getUserInfo": { - "get": { - "security": [ - { - "ApiKeyAuth": [] - } - ], - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "tags": [ - "SysUser" - ], - "summary": "获取用户信息", - "responses": { - "200": { - "description": "{\"success\":true,\"data\":{},\"msg\":\"获取成功\"}", - "schema": { - "type": "string" - } - } - } - } - }, "/user/getUserList": { "post": { "security": [ @@ -3447,44 +3024,6 @@ var doc = `{ } } }, - "/user/setUserAuthorities": { - "post": { - "security": [ - { - "ApiKeyAuth": [] - } - ], - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "tags": [ - "SysUser" - ], - "summary": "设置用户权限", - "parameters": [ - { - "description": "用户UUID, 角色ID", - "name": "data", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/request.SetUserAuthorities" - } - } - ], - "responses": { - "200": { - "description": "{\"success\":true,\"data\":{},\"msg\":\"修改成功\"}", - "schema": { - "type": "string" - } - } - } - } - }, "/user/setUserAuthority": { "post": { "security": [ @@ -3501,7 +3040,7 @@ var doc = `{ "tags": [ "SysUser" ], - "summary": "更改用户权限", + "summary": "设置用户权限", "parameters": [ { "description": "用户UUID, 角色ID", @@ -4116,6 +3655,35 @@ var doc = `{ } } }, + "request.AutoCodeExampleSearch": { + "type": "object", + "properties": { + "autoCodeExampleField": { + "description": "展示值", + "type": "string" + }, + "createdAt": { + "description": "创建时间", + "type": "string" + }, + "id": { + "description": "主键ID", + "type": "integer" + }, + "page": { + "description": "页码", + "type": "integer" + }, + "pageSize": { + "description": "每页大小", + "type": "integer" + }, + "updatedAt": { + "description": "更新时间", + "type": "string" + } + } + }, "request.AutoHistoryByID": { "type": "object", "properties": { @@ -4270,12 +3838,6 @@ var doc = `{ "authorityId": { "type": "string" }, - "authorityIds": { - "type": "array", - "items": { - "type": "string" - } - }, "headerImg": { "type": "string" }, @@ -4345,21 +3907,10 @@ var doc = `{ "authorityId": { "description": "角色ID", "type": "string" - } - } - }, - "request.SetUserAuthorities": { - "type": "object", - "properties": { - "authorityIds": { - "description": "角色ID", - "type": "array", - "items": { - "type": "string" - } }, - "id": { - "type": "integer" + "uuid": { + "description": "用户UUID", + "type": "string" } } }, @@ -4376,6 +3927,166 @@ var doc = `{ } } }, + "request.SysDictionaryDetailSearch": { + "type": "object", + "properties": { + "createdAt": { + "description": "创建时间", + "type": "string" + }, + "id": { + "description": "主键ID", + "type": "integer" + }, + "label": { + "description": "展示值", + "type": "string" + }, + "page": { + "description": "页码", + "type": "integer" + }, + "pageSize": { + "description": "每页大小", + "type": "integer" + }, + "sort": { + "description": "排序标记", + "type": "integer" + }, + "status": { + "description": "启用状态", + "type": "boolean" + }, + "sysDictionaryID": { + "description": "关联标记", + "type": "integer" + }, + "updatedAt": { + "description": "更新时间", + "type": "string" + }, + "value": { + "description": "字典值", + "type": "integer" + } + } + }, + "request.SysDictionarySearch": { + "type": "object", + "properties": { + "createdAt": { + "description": "创建时间", + "type": "string" + }, + "desc": { + "description": "描述", + "type": "string" + }, + "id": { + "description": "主键ID", + "type": "integer" + }, + "name": { + "description": "字典名（中）", + "type": "string" + }, + "page": { + "description": "页码", + "type": "integer" + }, + "pageSize": { + "description": "每页大小", + "type": "integer" + }, + "status": { + "description": "状态", + "type": "boolean" + }, + "sysDictionaryDetails": { + "type": "array", + "items": { + "$ref": "#/definitions/system.SysDictionaryDetail" + } + }, + "type": { + "description": "字典名（英）", + "type": "string" + }, + "updatedAt": { + "description": "更新时间", + "type": "string" + } + } + }, + "request.SysOperationRecordSearch": { + "type": "object", + "properties": { + "agent": { + "description": "代理", + "type": "string" + }, + "body": { + "description": "请求Body", + "type": "string" + }, + "createdAt": { + "description": "创建时间", + "type": "string" + }, + "error_message": { + "description": "错误信息", + "type": "string" + }, + "id": { + "description": "主键ID", + "type": "integer" + }, + "ip": { + "description": "请求ip", + "type": "string" + }, + "latency": { + "description": "延迟", + "type": "string" + }, + "method": { + "description": "请求方法", + "type": "string" + }, + "page": { + "description": "页码", + "type": "integer" + }, + "pageSize": { + "description": "每页大小", + "type": "integer" + }, + "path": { + "description": "请求路径", + "type": "string" + }, + "resp": { + "description": "响应Body", + "type": "string" + }, + "status": { + "description": "请求状态", + "type": "integer" + }, + "updatedAt": { + "description": "更新时间", + "type": "string" + }, + "user": { + "$ref": "#/definitions/system.SysUser" + }, + "user_id": { + "description": "用户id", + "type": "integer" + } + } + }, "response.SysAuthorityCopyResponse": { "type": "object", "properties": { @@ -4813,12 +4524,6 @@ var doc = `{ "description": "活跃颜色", "type": "string" }, - "authorities": { - "type": "array", - "items": { - "$ref": "#/definitions/system.SysAuthority" - } - }, "authority": { "$ref": "#/definitions/system.SysAuthority" }, diff --git a/server/docs/swagger.json b/server/docs/swagger.json index ed0e1e2b..9fc6f9ab 100644 --- a/server/docs/swagger.json +++ b/server/docs/swagger.json @@ -997,28 +997,13 @@ "summary": "用id查询AutoCodeExample", "parameters": [ { - "type": "string", - "description": "展示值", - "name": "autoCodeExampleField", - "in": "query" - }, - { - "type": "string", - "description": "创建时间", - "name": "createdAt", - "in": "query" - }, - { - "type": "integer", - "description": "主键ID", - "name": "id", - "in": "query" - }, - { - "type": "string", - "description": "更新时间", - "name": "updatedAt", - "in": "query" + "description": "用id查询AutoCodeExample", + "name": "data", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/autocode.AutoCodeExample" + } } ], "responses": { @@ -1050,40 +1035,13 @@ "summary": "分页获取AutoCodeExample列表", "parameters": [ { - "type": "string", - "description": "展示值", - "name": "autoCodeExampleField", - "in": "query" - }, - { - "type": "string", - "description": "创建时间", - "name": "createdAt", - "in": "query" - }, - { - "type": "integer", - "description": "主键ID", - "name": "id", - "in": "query" - }, - { - "type": "integer", - "description": "页码", - "name": "page", - "in": "query" - }, - { - "type": "integer", - "description": "每页大小", - "name": "pageSize", - "in": "query" - }, - { - "type": "string", - "description": "更新时间", - "name": "updatedAt", - "in": "query" + "description": "页码, 每页大小, 搜索条件", + "name": "data", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/request.AutoCodeExampleSearch" + } } ], "responses": { @@ -1286,46 +1244,13 @@ "summary": "获取单一客户信息", "parameters": [ { - "type": "string", - "description": "创建时间", - "name": "createdAt", - "in": "query" - }, - { - "type": "string", - "description": "客户名", - "name": "customerName", - "in": "query" - }, - { - "type": "string", - "description": "客户手机号", - "name": "customerPhoneData", - "in": "query" - }, - { - "type": "integer", - "description": "主键ID", - "name": "id", - "in": "query" - }, - { - "type": "string", - "description": "管理角色ID", - "name": "sysUserAuthorityID", - "in": "query" - }, - { - "type": "integer", - "description": "管理ID", - "name": "sysUserId", - "in": "query" - }, - { - "type": "string", - "description": "更新时间", - "name": "updatedAt", - "in": "query" + "description": "客户ID", + "name": "data", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/example.ExaCustomer" + } } ], "responses": { @@ -1465,16 +1390,13 @@ "summary": "分页获取权限客户列表", "parameters": [ { - "type": "integer", - "description": "页码", - "name": "page", - "in": "query" - }, - { - "type": "integer", - "description": "每页大小", - "name": "pageSize", - "in": "query" + "description": "页码, 每页大小", + "name": "data", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/request.PageInfo" + } } ], "responses": { @@ -1932,6 +1854,44 @@ } } }, + "/menu/GetMenuAuthority": { + "post": { + "security": [ + { + "ApiKeyAuth": [] + } + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "tags": [ + "AuthorityMenu" + ], + "summary": "获取指定角色menu", + "parameters": [ + { + "description": "角色ID", + "name": "data", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/request.GetAuthorityId" + } + } + ], + "responses": { + "200": { + "description": "{\"success\":true,\"data\":{},\"msg\":\"获取成功\"}", + "schema": { + "type": "string" + } + } + } + } + }, "/menu/addBaseMenu": { "post": { "security": [ @@ -2154,44 +2114,6 @@ } } }, - "/menu/getMenuAuthority": { - "post": { - "security": [ - { - "ApiKeyAuth": [] - } - ], - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "tags": [ - "AuthorityMenu" - ], - "summary": "获取指定角色menu", - "parameters": [ - { - "description": "角色ID", - "name": "data", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/request.GetAuthorityId" - } - } - ], - "responses": { - "200": { - "description": "{\"success\":true,\"data\":{},\"msg\":\"获取成功\"}", - "schema": { - "type": "string" - } - } - } - } - }, "/menu/getMenuList": { "post": { "security": [ @@ -2363,46 +2285,13 @@ "summary": "用id查询SysDictionary", "parameters": [ { - "type": "string", - "description": "创建时间", - "name": "createdAt", - "in": "query" - }, - { - "type": "string", - "description": "描述", - "name": "desc", - "in": "query" - }, - { - "type": "integer", - "description": "主键ID", - "name": "id", - "in": "query" - }, - { - "type": "string", - "description": "字典名（中）", - "name": "name", - "in": "query" - }, - { - "type": "boolean", - "description": "状态", - "name": "status", - "in": "query" - }, - { - "type": "string", - "description": "字典名（英）", - "name": "type", - "in": "query" - }, - { - "type": "string", - "description": "更新时间", - "name": "updatedAt", - "in": "query" + "description": "ID或字典英名", + "name": "data", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/system.SysDictionary" + } } ], "responses": { @@ -2434,58 +2323,13 @@ "summary": "分页获取SysDictionary列表", "parameters": [ { - "type": "string", - "description": "创建时间", - "name": "createdAt", - "in": "query" - }, - { - "type": "string", - "description": "描述", - "name": "desc", - "in": "query" - }, - { - "type": "integer", - "description": "主键ID", - "name": "id", - "in": "query" - }, - { - "type": "string", - "description": "字典名（中）", - "name": "name", - "in": "query" - }, - { - "type": "integer", - "description": "页码", - "name": "page", - "in": "query" - }, - { - "type": "integer", - "description": "每页大小", - "name": "pageSize", - "in": "query" - }, - { - "type": "boolean", - "description": "状态", - "name": "status", - "in": "query" - }, - { - "type": "string", - "description": "字典名（英）", - "name": "type", - "in": "query" - }, - { - "type": "string", - "description": "更新时间", - "name": "updatedAt", - "in": "query" + "description": "页码, 每页大小, 搜索条件", + "name": "data", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/request.SysDictionarySearch" + } } ], "responses": { @@ -2631,52 +2475,13 @@ "summary": "用id查询SysDictionaryDetail", "parameters": [ { - "type": "string", - "description": "创建时间", - "name": "createdAt", - "in": "query" - }, - { - "type": "integer", - "description": "主键ID", - "name": "id", - "in": "query" - }, - { - "type": "string", - "description": "展示值", - "name": "label", - "in": "query" - }, - { - "type": "integer", - "description": "排序标记", - "name": "sort", - "in": "query" - }, - { - "type": "boolean", - "description": "启用状态", - "name": "status", - "in": "query" - }, - { - "type": "integer", - "description": "关联标记", - "name": "sysDictionaryID", - "in": "query" - }, - { - "type": "string", - "description": "更新时间", - "name": "updatedAt", - "in": "query" - }, - { - "type": "integer", - "description": "字典值", - "name": "value", - "in": "query" + "description": "用id查询SysDictionaryDetail", + "name": "data", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/system.SysDictionaryDetail" + } } ], "responses": { @@ -2708,64 +2513,13 @@ "summary": "分页获取SysDictionaryDetail列表", "parameters": [ { - "type": "string", - "description": "创建时间", - "name": "createdAt", - "in": "query" - }, - { - "type": "integer", - "description": "主键ID", - "name": "id", - "in": "query" - }, - { - "type": "string", - "description": "展示值", - "name": "label", - "in": "query" - }, - { - "type": "integer", - "description": "页码", - "name": "page", - "in": "query" - }, - { - "type": "integer", - "description": "每页大小", - "name": "pageSize", - "in": "query" - }, - { - "type": "integer", - "description": "排序标记", - "name": "sort", - "in": "query" - }, - { - "type": "boolean", - "description": "启用状态", - "name": "status", - "in": "query" - }, - { - "type": "integer", - "description": "关联标记", - "name": "sysDictionaryID", - "in": "query" - }, - { - "type": "string", - "description": "更新时间", - "name": "updatedAt", - "in": "query" - }, - { - "type": "integer", - "description": "字典值", - "name": "value", - "in": "query" + "description": "页码, 每页大小, 搜索条件", + "name": "data", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/request.SysDictionaryDetailSearch" + } } ], "responses": { @@ -2949,82 +2703,13 @@ "summary": "用id查询SysOperationRecord", "parameters": [ { - "type": "string", - "description": "代理", - "name": "agent", - "in": "query" - }, - { - "type": "string", - "description": "请求Body", - "name": "body", - "in": "query" - }, - { - "type": "string", - "description": "创建时间", - "name": "createdAt", - "in": "query" - }, - { - "type": "string", - "description": "错误信息", - "name": "error_message", - "in": "query" - }, - { - "type": "integer", - "description": "主键ID", - "name": "id", - "in": "query" - }, - { - "type": "string", - "description": "请求ip", - "name": "ip", - "in": "query" - }, - { - "type": "string", - "description": "延迟", - "name": "latency", - "in": "query" - }, - { - "type": "string", - "description": "请求方法", - "name": "method", - "in": "query" - }, - { - "type": "string", - "description": "请求路径", - "name": "path", - "in": "query" - }, - { - "type": "string", - "description": "响应Body", - "name": "resp", - "in": "query" - }, - { - "type": "integer", - "description": "请求状态", - "name": "status", - "in": "query" - }, - { - "type": "string", - "description": "更新时间", - "name": "updatedAt", - "in": "query" - }, - { - "type": "integer", - "description": "用户id", - "name": "user_id", - "in": "query" + "description": "Id", + "name": "data", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/system.SysOperationRecord" + } } ], "responses": { @@ -3056,94 +2741,13 @@ "summary": "分页获取SysOperationRecord列表", "parameters": [ { - "type": "string", - "description": "代理", - "name": "agent", - "in": "query" - }, - { - "type": "string", - "description": "请求Body", - "name": "body", - "in": "query" - }, - { - "type": "string", - "description": "创建时间", - "name": "createdAt", - "in": "query" - }, - { - "type": "string", - "description": "错误信息", - "name": "error_message", - "in": "query" - }, - { - "type": "integer", - "description": "主键ID", - "name": "id", - "in": "query" - }, - { - "type": "string", - "description": "请求ip", - "name": "ip", - "in": "query" - }, - { - "type": "string", - "description": "延迟", - "name": "latency", - "in": "query" - }, - { - "type": "string", - "description": "请求方法", - "name": "method", - "in": "query" - }, - { - "type": "integer", - "description": "页码", - "name": "page", - "in": "query" - }, - { - "type": "integer", - "description": "每页大小", - "name": "pageSize", - "in": "query" - }, - { - "type": "string", - "description": "请求路径", - "name": "path", - "in": "query" - }, - { - "type": "string", - "description": "响应Body", - "name": "resp", - "in": "query" - }, - { - "type": "integer", - "description": "请求状态", - "name": "status", - "in": "query" - }, - { - "type": "string", - "description": "更新时间", - "name": "updatedAt", - "in": "query" - }, - { - "type": "integer", - "description": "用户id", - "name": "user_id", - "in": "query" + "description": "页码, 每页大小, 搜索条件", + "name": "data", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/request.SysOperationRecordSearch" + } } ], "responses": { @@ -3264,7 +2868,7 @@ } }, "/user/changePassword": { - "post": { + "put": { "security": [ { "ApiKeyAuth": [] @@ -3336,33 +2940,6 @@ } } }, - "/user/getUserInfo": { - "get": { - "security": [ - { - "ApiKeyAuth": [] - } - ], - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "tags": [ - "SysUser" - ], - "summary": "获取用户信息", - "responses": { - "200": { - "description": "{\"success\":true,\"data\":{},\"msg\":\"获取成功\"}", - "schema": { - "type": "string" - } - } - } - } - }, "/user/getUserList": { "post": { "security": [ @@ -3431,44 +3008,6 @@ } } }, - "/user/setUserAuthorities": { - "post": { - "security": [ - { - "ApiKeyAuth": [] - } - ], - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "tags": [ - "SysUser" - ], - "summary": "设置用户权限", - "parameters": [ - { - "description": "用户UUID, 角色ID", - "name": "data", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/request.SetUserAuthorities" - } - } - ], - "responses": { - "200": { - "description": "{\"success\":true,\"data\":{},\"msg\":\"修改成功\"}", - "schema": { - "type": "string" - } - } - } - } - }, "/user/setUserAuthority": { "post": { "security": [ @@ -3485,7 +3024,7 @@ "tags": [ "SysUser" ], - "summary": "更改用户权限", + "summary": "设置用户权限", "parameters": [ { "description": "用户UUID, 角色ID", @@ -4100,6 +3639,35 @@ } } }, + "request.AutoCodeExampleSearch": { + "type": "object", + "properties": { + "autoCodeExampleField": { + "description": "展示值", + "type": "string" + }, + "createdAt": { + "description": "创建时间", + "type": "string" + }, + "id": { + "description": "主键ID", + "type": "integer" + }, + "page": { + "description": "页码", + "type": "integer" + }, + "pageSize": { + "description": "每页大小", + "type": "integer" + }, + "updatedAt": { + "description": "更新时间", + "type": "string" + } + } + }, "request.AutoHistoryByID": { "type": "object", "properties": { @@ -4254,12 +3822,6 @@ "authorityId": { "type": "string" }, - "authorityIds": { - "type": "array", - "items": { - "type": "string" - } - }, "headerImg": { "type": "string" }, @@ -4329,21 +3891,10 @@ "authorityId": { "description": "角色ID", "type": "string" - } - } - }, - "request.SetUserAuthorities": { - "type": "object", - "properties": { - "authorityIds": { - "description": "角色ID", - "type": "array", - "items": { - "type": "string" - } }, - "id": { - "type": "integer" + "uuid": { + "description": "用户UUID", + "type": "string" } } }, @@ -4360,6 +3911,166 @@ } } }, + "request.SysDictionaryDetailSearch": { + "type": "object", + "properties": { + "createdAt": { + "description": "创建时间", + "type": "string" + }, + "id": { + "description": "主键ID", + "type": "integer" + }, + "label": { + "description": "展示值", + "type": "string" + }, + "page": { + "description": "页码", + "type": "integer" + }, + "pageSize": { + "description": "每页大小", + "type": "integer" + }, + "sort": { + "description": "排序标记", + "type": "integer" + }, + "status": { + "description": "启用状态", + "type": "boolean" + }, + "sysDictionaryID": { + "description": "关联标记", + "type": "integer" + }, + "updatedAt": { + "description": "更新时间", + "type": "string" + }, + "value": { + "description": "字典值", + "type": "integer" + } + } + }, + "request.SysDictionarySearch": { + "type": "object", + "properties": { + "createdAt": { + "description": "创建时间", + "type": "string" + }, + "desc": { + "description": "描述", + "type": "string" + }, + "id": { + "description": "主键ID", + "type": "integer" + }, + "name": { + "description": "字典名（中）", + "type": "string" + }, + "page": { + "description": "页码", + "type": "integer" + }, + "pageSize": { + "description": "每页大小", + "type": "integer" + }, + "status": { + "description": "状态", + "type": "boolean" + }, + "sysDictionaryDetails": { + "type": "array", + "items": { + "$ref": "#/definitions/system.SysDictionaryDetail" + } + }, + "type": { + "description": "字典名（英）", + "type": "string" + }, + "updatedAt": { + "description": "更新时间", + "type": "string" + } + } + }, + "request.SysOperationRecordSearch": { + "type": "object", + "properties": { + "agent": { + "description": "代理", + "type": "string" + }, + "body": { + "description": "请求Body", + "type": "string" + }, + "createdAt": { + "description": "创建时间", + "type": "string" + }, + "error_message": { + "description": "错误信息", + "type": "string" + }, + "id": { + "description": "主键ID", + "type": "integer" + }, + "ip": { + "description": "请求ip", + "type": "string" + }, + "latency": { + "description": "延迟", + "type": "string" + }, + "method": { + "description": "请求方法", + "type": "string" + }, + "page": { + "description": "页码", + "type": "integer" + }, + "pageSize": { + "description": "每页大小", + "type": "integer" + }, + "path": { + "description": "请求路径", + "type": "string" + }, + "resp": { + "description": "响应Body", + "type": "string" + }, + "status": { + "description": "请求状态", + "type": "integer" + }, + "updatedAt": { + "description": "更新时间", + "type": "string" + }, + "user": { + "$ref": "#/definitions/system.SysUser" + }, + "user_id": { + "description": "用户id", + "type": "integer" + } + } + }, "response.SysAuthorityCopyResponse": { "type": "object", "properties": { @@ -4797,12 +4508,6 @@ "description": "活跃颜色", "type": "string" }, - "authorities": { - "type": "array", - "items": { - "$ref": "#/definitions/system.SysAuthority" - } - }, "authority": { "$ref": "#/definitions/system.SysAuthority" }, diff --git a/server/docs/swagger.yaml b/server/docs/swagger.yaml index acdd8708..429aa6f5 100644 --- a/server/docs/swagger.yaml +++ b/server/docs/swagger.yaml @@ -387,6 +387,27 @@ definitions: $ref: '#/definitions/system.SysBaseMenu' type: array type: object + request.AutoCodeExampleSearch: + properties: + autoCodeExampleField: + description: 展示值 + type: string + createdAt: + description: 创建时间 + type: string + id: + description: 主键ID + type: integer + page: + description: 页码 + type: integer + pageSize: + description: 每页大小 + type: integer + updatedAt: + description: 更新时间 + type: string + type: object request.AutoHistoryByID: properties: id: @@ -493,10 +514,6 @@ definitions: properties: authorityId: type: string - authorityIds: - items: - type: string - type: array headerImg: type: string nickName: @@ -547,16 +564,9 @@ definitions: authorityId: description: 角色ID type: string - type: object - request.SetUserAuthorities: - properties: - authorityIds: - description: 角色ID - items: - type: string - type: array - id: - type: integer + uuid: + description: 用户UUID + type: string type: object request.SysAutoHistory: properties: @@ -567,6 +577,123 @@ definitions: description: 每页大小 type: integer type: object + request.SysDictionaryDetailSearch: + properties: + createdAt: + description: 创建时间 + type: string + id: + description: 主键ID + type: integer + label: + description: 展示值 + type: string + page: + description: 页码 + type: integer + pageSize: + description: 每页大小 + type: integer + sort: + description: 排序标记 + type: integer + status: + description: 启用状态 + type: boolean + sysDictionaryID: + description: 关联标记 + type: integer + updatedAt: + description: 更新时间 + type: string + value: + description: 字典值 + type: integer + type: object + request.SysDictionarySearch: + properties: + createdAt: + description: 创建时间 + type: string + desc: + description: 描述 + type: string + id: + description: 主键ID + type: integer + name: + description: 字典名（中） + type: string + page: + description: 页码 + type: integer + pageSize: + description: 每页大小 + type: integer + status: + description: 状态 + type: boolean + sysDictionaryDetails: + items: + $ref: '#/definitions/system.SysDictionaryDetail' + type: array + type: + description: 字典名（英） + type: string + updatedAt: + description: 更新时间 + type: string + type: object + request.SysOperationRecordSearch: + properties: + agent: + description: 代理 + type: string + body: + description: 请求Body + type: string + createdAt: + description: 创建时间 + type: string + error_message: + description: 错误信息 + type: string + id: + description: 主键ID + type: integer + ip: + description: 请求ip + type: string + latency: + description: 延迟 + type: string + method: + description: 请求方法 + type: string + page: + description: 页码 + type: integer + pageSize: + description: 每页大小 + type: integer + path: + description: 请求路径 + type: string + resp: + description: 响应Body + type: string + status: + description: 请求状态 + type: integer + updatedAt: + description: 更新时间 + type: string + user: + $ref: '#/definitions/system.SysUser' + user_id: + description: 用户id + type: integer + type: object response.SysAuthorityCopyResponse: properties: authority: @@ -882,10 +1009,6 @@ definitions: activeColor: description: 活跃颜色 type: string - authorities: - items: - $ref: '#/definitions/system.SysAuthority' - type: array authority: $ref: '#/definitions/system.SysAuthority' authorityId: @@ -1521,22 +1644,12 @@ paths: consumes: - application/json parameters: - - description: 展示值 - in: query - name: autoCodeExampleField - type: string - - description: 创建时间 - in: query - name: createdAt - type: string - - description: 主键ID - in: query - name: id - type: integer - - description: 更新时间 - in: query - name: updatedAt - type: string + - description: 用id查询AutoCodeExample + in: body + name: data + required: true + schema: + $ref: '#/definitions/autocode.AutoCodeExample' produces: - application/json responses: @@ -1554,30 +1667,12 @@ paths: consumes: - application/json parameters: - - description: 展示值 - in: query - name: autoCodeExampleField - type: string - - description: 创建时间 - in: query - name: createdAt - type: string - - description: 主键ID - in: query - name: id - type: integer - - description: 页码 - in: query - name: page - type: integer - - description: 每页大小 - in: query - name: pageSize - type: integer - - description: 更新时间 - in: query - name: updatedAt - type: string + - description: 页码, 每页大小, 搜索条件 + in: body + name: data + required: true + schema: + $ref: '#/definitions/request.AutoCodeExampleSearch' produces: - application/json responses: @@ -1721,34 +1816,12 @@ paths: consumes: - application/json parameters: - - description: 创建时间 - in: query - name: createdAt - type: string - - description: 客户名 - in: query - name: customerName - type: string - - description: 客户手机号 - in: query - name: customerPhoneData - type: string - - description: 主键ID - in: query - name: id - type: integer - - description: 管理角色ID - in: query - name: sysUserAuthorityID - type: string - - description: 管理ID - in: query - name: sysUserId - type: integer - - description: 更新时间 - in: query - name: updatedAt - type: string + - description: 客户ID + in: body + name: data + required: true + schema: + $ref: '#/definitions/example.ExaCustomer' produces: - application/json responses: @@ -1810,14 +1883,12 @@ paths: consumes: - application/json parameters: - - description: 页码 - in: query - name: page - type: integer - - description: 每页大小 - in: query - name: pageSize - type: integer + - description: 页码, 每页大小 + in: body + name: data + required: true + schema: + $ref: '#/definitions/request.PageInfo' produces: - application/json responses: @@ -2100,6 +2171,29 @@ paths: summary: jwt加入黑名单 tags: - Jwt + /menu/GetMenuAuthority: + post: + consumes: + - application/json + parameters: + - description: 角色ID + in: body + name: data + required: true + schema: + $ref: '#/definitions/request.GetAuthorityId' + produces: + - application/json + responses: + "200": + description: '{"success":true,"data":{},"msg":"获取成功"}' + schema: + type: string + security: + - ApiKeyAuth: [] + summary: 获取指定角色menu + tags: + - AuthorityMenu /menu/addBaseMenu: post: consumes: @@ -2234,29 +2328,6 @@ paths: summary: 获取用户动态路由 tags: - AuthorityMenu - /menu/getMenuAuthority: - post: - consumes: - - application/json - parameters: - - description: 角色ID - in: body - name: data - required: true - schema: - $ref: '#/definitions/request.GetAuthorityId' - produces: - - application/json - responses: - "200": - description: '{"success":true,"data":{},"msg":"获取成功"}' - schema: - type: string - security: - - ApiKeyAuth: [] - summary: 获取指定角色menu - tags: - - AuthorityMenu /menu/getMenuList: post: consumes: @@ -2354,34 +2425,12 @@ paths: consumes: - application/json parameters: - - description: 创建时间 - in: query - name: createdAt - type: string - - description: 描述 - in: query - name: desc - type: string - - description: 主键ID - in: query - name: id - type: integer - - description: 字典名（中） - in: query - name: name - type: string - - description: 状态 - in: query - name: status - type: boolean - - description: 字典名（英） - in: query - name: type - type: string - - description: 更新时间 - in: query - name: updatedAt - type: string + - description: ID或字典英名 + in: body + name: data + required: true + schema: + $ref: '#/definitions/system.SysDictionary' produces: - application/json responses: @@ -2399,42 +2448,12 @@ paths: consumes: - application/json parameters: - - description: 创建时间 - in: query - name: createdAt - type: string - - description: 描述 - in: query - name: desc - type: string - - description: 主键ID - in: query - name: id - type: integer - - description: 字典名（中） - in: query - name: name - type: string - - description: 页码 - in: query - name: page - type: integer - - description: 每页大小 - in: query - name: pageSize - type: integer - - description: 状态 - in: query - name: status - type: boolean - - description: 字典名（英） - in: query - name: type - type: string - - description: 更新时间 - in: query - name: updatedAt - type: string + - description: 页码, 每页大小, 搜索条件 + in: body + name: data + required: true + schema: + $ref: '#/definitions/request.SysDictionarySearch' produces: - application/json responses: @@ -2521,38 +2540,12 @@ paths: consumes: - application/json parameters: - - description: 创建时间 - in: query - name: createdAt - type: string - - description: 主键ID - in: query - name: id - type: integer - - description: 展示值 - in: query - name: label - type: string - - description: 排序标记 - in: query - name: sort - type: integer - - description: 启用状态 - in: query - name: status - type: boolean - - description: 关联标记 - in: query - name: sysDictionaryID - type: integer - - description: 更新时间 - in: query - name: updatedAt - type: string - - description: 字典值 - in: query - name: value - type: integer + - description: 用id查询SysDictionaryDetail + in: body + name: data + required: true + schema: + $ref: '#/definitions/system.SysDictionaryDetail' produces: - application/json responses: @@ -2570,46 +2563,12 @@ paths: consumes: - application/json parameters: - - description: 创建时间 - in: query - name: createdAt - type: string - - description: 主键ID - in: query - name: id - type: integer - - description: 展示值 - in: query - name: label - type: string - - description: 页码 - in: query - name: page - type: integer - - description: 每页大小 - in: query - name: pageSize - type: integer - - description: 排序标记 - in: query - name: sort - type: integer - - description: 启用状态 - in: query - name: status - type: boolean - - description: 关联标记 - in: query - name: sysDictionaryID - type: integer - - description: 更新时间 - in: query - name: updatedAt - type: string - - description: 字典值 - in: query - name: value - type: integer + - description: 页码, 每页大小, 搜索条件 + in: body + name: data + required: true + schema: + $ref: '#/definitions/request.SysDictionaryDetailSearch' produces: - application/json responses: @@ -2719,58 +2678,12 @@ paths: consumes: - application/json parameters: - - description: 代理 - in: query - name: agent - type: string - - description: 请求Body - in: query - name: body - type: string - - description: 创建时间 - in: query - name: createdAt - type: string - - description: 错误信息 - in: query - name: error_message - type: string - - description: 主键ID - in: query - name: id - type: integer - - description: 请求ip - in: query - name: ip - type: string - - description: 延迟 - in: query - name: latency - type: string - - description: 请求方法 - in: query - name: method - type: string - - description: 请求路径 - in: query - name: path - type: string - - description: 响应Body - in: query - name: resp - type: string - - description: 请求状态 - in: query - name: status - type: integer - - description: 更新时间 - in: query - name: updatedAt - type: string - - description: 用户id - in: query - name: user_id - type: integer + - description: Id + in: body + name: data + required: true + schema: + $ref: '#/definitions/system.SysOperationRecord' produces: - application/json responses: @@ -2788,66 +2701,12 @@ paths: consumes: - application/json parameters: - - description: 代理 - in: query - name: agent - type: string - - description: 请求Body - in: query - name: body - type: string - - description: 创建时间 - in: query - name: createdAt - type: string - - description: 错误信息 - in: query - name: error_message - type: string - - description: 主键ID - in: query - name: id - type: integer - - description: 请求ip - in: query - name: ip - type: string - - description: 延迟 - in: query - name: latency - type: string - - description: 请求方法 - in: query - name: method - type: string - - description: 页码 - in: query - name: page - type: integer - - description: 每页大小 - in: query - name: pageSize - type: integer - - description: 请求路径 - in: query - name: path - type: string - - description: 响应Body - in: query - name: resp - type: string - - description: 请求状态 - in: query - name: status - type: integer - - description: 更新时间 - in: query - name: updatedAt - type: string - - description: 用户id - in: query - name: user_id - type: integer + - description: 页码, 每页大小, 搜索条件 + in: body + name: data + required: true + schema: + $ref: '#/definitions/request.SysOperationRecordSearch' produces: - application/json responses: @@ -2924,7 +2783,7 @@ paths: tags: - System /user/changePassword: - post: + put: parameters: - description: 用户名, 原密码, 新密码 in: body @@ -2967,22 +2826,6 @@ paths: summary: 删除用户 tags: - SysUser - /user/getUserInfo: - get: - consumes: - - application/json - produces: - - application/json - responses: - "200": - description: '{"success":true,"data":{},"msg":"获取成功"}' - schema: - type: string - security: - - ApiKeyAuth: [] - summary: 获取用户信息 - tags: - - SysUser /user/getUserList: post: consumes: @@ -3025,29 +2868,6 @@ paths: summary: 用户注册账号 tags: - SysUser - /user/setUserAuthorities: - post: - consumes: - - application/json - parameters: - - description: 用户UUID, 角色ID - in: body - name: data - required: true - schema: - $ref: '#/definitions/request.SetUserAuthorities' - produces: - - application/json - responses: - "200": - description: '{"success":true,"data":{},"msg":"修改成功"}' - schema: - type: string - security: - - ApiKeyAuth: [] - summary: 设置用户权限 - tags: - - SysUser /user/setUserAuthority: post: consumes: @@ -3068,7 +2888,7 @@ paths: type: string security: - ApiKeyAuth: [] - summary: 更改用户权限 + summary: 设置用户权限 tags: - SysUser /user/setUserInfo: diff --git a/server/go.mod b/server/go.mod index da94c5d1..fe010bb5 100644 --- a/server/go.mod +++ b/server/go.mod @@ -3,6 +3,7 @@ module github.com/flipped-aurora/gin-vue-admin go 1.15 require ( + github.com/360EntSecGroup-Skylar/excelize/v2 v2.3.2 github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 github.com/aliyun/aliyun-oss-go-sdk v2.1.6+incompatible @@ -47,8 +48,9 @@ require ( github.com/tebeka/strftime v0.1.3 // indirect github.com/tencentyun/cos-go-sdk-v5 v0.7.19 github.com/unrolled/secure v1.0.7 - github.com/xuri/excelize/v2 v2.4.1 go.uber.org/zap v1.10.0 + golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 // indirect + golang.org/x/net v0.0.0-20210716203947-853a461950ff // indirect golang.org/x/sync v0.0.0-20210220032951-036812b2e83c golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c // indirect golang.org/x/tools v0.1.5 // indirect diff --git a/server/model/common/request/common.go b/server/model/common/request/common.go index 129c6d7e..5dbfcb45 100644 --- a/server/model/common/request/common.go +++ b/server/model/common/request/common.go @@ -17,7 +17,7 @@ type IdsReq struct { // Get role by id structure type GetAuthorityId struct { - AuthorityId string `json:"authorityId" form:"authorityId"` // 角色ID + AuthorityId string // 角色ID } type Empty struct{} diff --git a/server/model/system/request/sys_menu.go b/server/model/system/request/sys_menu.go index 554b1229..addb87d3 100644 --- a/server/model/system/request/sys_menu.go +++ b/server/model/system/request/sys_menu.go @@ -7,8 +7,8 @@ import ( // Add menu authority info structure type AddMenuAuthorityInfo struct { - Menus []system.SysBaseMenu `json:"menus"` - AuthorityId string `json:"authorityId"` // 角色ID + Menus []system.SysBaseMenu + AuthorityId string // 角色ID } func DefaultMenu() []system.SysBaseMenu { diff --git a/server/model/system/sys_system.go b/server/model/system/sys_system.go index 198b3560..d526578c 100644 --- a/server/model/system/sys_system.go +++ b/server/model/system/sys_system.go @@ -6,5 +6,5 @@ import ( // 配置文件结构体 type System struct { - Config config.Server `json:"config"` + Config config.Server } diff --git a/server/resource/template/server/api.go.tpl b/server/resource/template/server/api.go.tpl index 8cbb8521..0d440062 100644 --- a/server/resource/template/server/api.go.tpl +++ b/server/resource/template/server/api.go.tpl @@ -103,7 +103,7 @@ func ({{.Abbreviation}}Api *{{.StructName}}Api) Update{{.StructName}}(c *gin.Con // @Security ApiKeyAuth // @accept application/json // @Produce application/json -// @Param data query autocode.{{.StructName}} true "用id查询{{.StructName}}" +// @Param data body autocode.{{.StructName}} true "用id查询{{.StructName}}" // @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}" // @Router /{{.Abbreviation}}/find{{.StructName}} [get] func ({{.Abbreviation}}Api *{{.StructName}}Api) Find{{.StructName}}(c *gin.Context) { @@ -123,7 +123,7 @@ func ({{.Abbreviation}}Api *{{.StructName}}Api) Find{{.StructName}}(c *gin.Conte // @Security ApiKeyAuth // @accept application/json // @Produce application/json -// @Param data query autocodeReq.{{.StructName}}Search true "分页获取{{.StructName}}列表" +// @Param data body autocodeReq.{{.StructName}}Search true "分页获取{{.StructName}}列表" // @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}" // @Router /{{.Abbreviation}}/get{{.StructName}}List [get] func ({{.Abbreviation}}Api *{{.StructName}}Api) Get{{.StructName}}List(c *gin.Context) { diff --git a/server/resource/template/web/api.js.tpl b/server/resource/template/web/api.js.tpl index a8b77cf4..58ab2e00 100644 --- a/server/resource/template/web/api.js.tpl +++ b/server/resource/template/web/api.js.tpl @@ -69,7 +69,7 @@ export const update{{.StructName}} = (data) => { // @Security ApiKeyAuth // @accept application/json // @Produce application/json -// @Param data query model.{{.StructName}} true "用id查询{{.StructName}}" +// @Param data body model.{{.StructName}} true "用id查询{{.StructName}}" // @Success 200 {string} string "{"success":true,"data":{},"msg":"查询成功"}" // @Router /{{.Abbreviation}}/find{{.StructName}} [get] export const find{{.StructName}} = (params) => { @@ -85,7 +85,7 @@ export const find{{.StructName}} = (params) => { // @Security ApiKeyAuth // @accept application/json // @Produce application/json -// @Param data query request.PageInfo true "分页获取{{.StructName}}列表" +// @Param data body request.PageInfo true "分页获取{{.StructName}}列表" // @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}" // @Router /{{.Abbreviation}}/get{{.StructName}}List [get] export const get{{.StructName}}List = (params) => { @@ -94,4 +94,4 @@ export const get{{.StructName}}List = (params) => { method: 'get', params }) -} +} \ No newline at end of file diff --git a/server/resource/template/web/form.vue.tpl b/server/resource/template/web/form.vue.tpl index 5fb3508b..5a83bdd8 100644 --- a/server/resource/template/web/form.vue.tpl +++ b/server/resource/template/web/form.vue.tpl @@ -3,35 +3,35 @@ {{- range .Fields}} - {{- if eq .FieldType "bool" }} - - {{- end }} - {{- if eq .FieldType "string" }} - - {{- end }} - {{- if eq .FieldType "int" }} - {{- if .DictType }} - - - - {{- else }} - - {{- end }} - {{- end }} - {{- if eq .FieldType "time.Time" }} - - {{- end }} - {{- if eq .FieldType "float64" }} - - {{- end }} + {{ if eq .FieldType "bool" -}} + + {{ end -}} + {{ if eq .FieldType "string" -}} + + {{ end -}} + {{ if eq .FieldType "int" -}} + {{ if .DictType -}} + + + + {{ else -}} + + {{ end -}} + {{ end -}} + {{ if eq .FieldType "time.Time" }} + + {{ end -}} + {{ if eq .FieldType "float64" }} + + {{ end -}} - {{- end }} + {{ end -}} 保存 返回 - + + \ No newline at end of file diff --git a/server/resource/template/web/table.vue.tpl b/server/resource/template/web/table.vue.tpl index a8c6f8e4..52d68967 100644 --- a/server/resource/template/web/table.vue.tpl +++ b/server/resource/template/web/table.vue.tpl @@ -19,8 +19,8 @@ {{- else }} - - {{ end }}{{ end }}{{ end }} + + {{ end }} {{ end }} {{ end }} 查询 新增 @@ -52,16 +52,15 @@ {{- if .DictType}} {{- else if eq .FieldType "bool" }} {{- else }} - - {{- end }} - {{- end }} + {{ end -}} + {{ end -}}