From 9905a939c3ad82e72cf9c1a22e045fc8359f850a Mon Sep 17 00:00:00 2001 From: pixel <303176530@qq.com> Date: Thu, 20 Aug 2020 12:01:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=AD=E9=97=B4=E4=BB=B6?= =?UTF-8?q?=E8=B7=A8=E5=9F=9F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/docs/docs.go | 171 +++++++++++++++++++++++++++++++++++++- server/docs/swagger.json | 169 +++++++++++++++++++++++++++++++++++++ server/docs/swagger.yaml | 105 +++++++++++++++++++++++ server/middleware/cors.go | 4 +- 4 files changed, 446 insertions(+), 3 deletions(-) diff --git a/server/docs/docs.go b/server/docs/docs.go index 9027645e..8551198e 100644 --- a/server/docs/docs.go +++ b/server/docs/docs.go @@ -1,6 +1,6 @@ // GENERATED BY THE COMMAND ABOVE; DO NOT EDIT // This file was generated by swaggo/swag at -// 2020-07-07 10:12:31.2264113 +0800 CST m=+0.088765101 +// 2020-08-20 11:59:55.622609 +0800 CST m=+0.106561201 package docs @@ -1534,6 +1534,99 @@ var doc = `{ } } }, + "/simpleUploader/checkFileMd5": { + "get": { + "produces": [ + "application/json" + ], + "parameters": [ + { + "type": "string", + "description": "测试文件是否已经存在和判断已经上传过的切片", + "name": "md5", + "in": "query", + "required": true + } + ], + "responses": { + "200": { + "description": "{\"success\":true,\"data\":{},\"msg\":\"查询成功\"}", + "schema": { + "type": "string" + } + } + } + } + }, + "/simpleUploader/mergeFileMd5": { + "get": { + "security": [ + { + "ApiKeyAuth": [] + } + ], + "produces": [ + "application/json" + ], + "tags": [ + "SimpleUploader" + ], + "summary": "合并文件", + "parameters": [ + { + "type": "string", + "description": "合并文件", + "name": "md5", + "in": "query", + "required": true + } + ], + "responses": { + "200": { + "description": "{\"success\":true,\"data\":{},\"msg\":\"合并成功\"}", + "schema": { + "type": "string" + } + } + } + } + }, + "/simpleUploader/upload": { + "post": { + "security": [ + { + "ApiKeyAuth": [] + } + ], + "consumes": [ + "multipart/form-data" + ], + "produces": [ + "application/json" + ], + "tags": [ + "SimpleUploader" + ], + "summary": "断点续传插件版示例", + "parameters": [ + { + "type": "file", + "description": "断点续传插件版示例", + "name": "file", + "in": "formData", + "required": true + } + ], + "responses": { + "200": { + "description": "{\"success\":true,\"data\":{},\"msg\":\"上传成功\"}", + "schema": { + "type": "string" + } + } + } + } + }, "/sysDictionary/createSysDictionary": { "post": { "security": [ @@ -2002,6 +2095,45 @@ var doc = `{ } } }, + "/sysOperationRecord/deleteSysOperationRecordByIds": { + "delete": { + "security": [ + { + "ApiKeyAuth": [] + } + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "tags": [ + "SysOperationRecord" + ], + "summary": "批量删除SysOperationRecord", + "parameters": [ + { + "description": "批量删除SysOperationRecord", + "name": "data", + "in": "body", + "required": true, + "schema": { + "type": "object", + "$ref": "#/definitions/request.IdsReq" + } + } + ], + "responses": { + "200": { + "description": "{\"success\":true,\"data\":{},\"msg\":\"删除成功\"}", + "schema": { + "type": "string" + } + } + } + } + }, "/sysOperationRecord/findSysOperationRecord": { "get": { "security": [ @@ -2711,6 +2843,9 @@ var doc = `{ "dataTypeLong": { "type": "string" }, + "dictType": { + "type": "string" + }, "fieldDesc": { "type": "string" }, @@ -2819,6 +2954,12 @@ var doc = `{ "name": { "type": "string" }, + "parameters": { + "type": "array", + "items": { + "$ref": "#/definitions/model.SysBaseMenuParameter" + } + }, "parentId": { "type": "string" }, @@ -2833,6 +2974,23 @@ var doc = `{ } } }, + "model.SysBaseMenuParameter": { + "type": "object", + "properties": { + "key": { + "type": "string" + }, + "sysBaseMenuId": { + "type": "integer" + }, + "type": { + "type": "string" + }, + "value": { + "type": "string" + } + } + }, "model.SysDictionary": { "type": "object", "properties": { @@ -3070,6 +3228,17 @@ var doc = `{ } } }, + "request.IdsReq": { + "type": "object", + "properties": { + "ids": { + "type": "array", + "items": { + "type": "integer" + } + } + } + }, "request.PageInfo": { "type": "object", "properties": { diff --git a/server/docs/swagger.json b/server/docs/swagger.json index c55e3931..31660b45 100644 --- a/server/docs/swagger.json +++ b/server/docs/swagger.json @@ -1517,6 +1517,99 @@ } } }, + "/simpleUploader/checkFileMd5": { + "get": { + "produces": [ + "application/json" + ], + "parameters": [ + { + "type": "string", + "description": "测试文件是否已经存在和判断已经上传过的切片", + "name": "md5", + "in": "query", + "required": true + } + ], + "responses": { + "200": { + "description": "{\"success\":true,\"data\":{},\"msg\":\"查询成功\"}", + "schema": { + "type": "string" + } + } + } + } + }, + "/simpleUploader/mergeFileMd5": { + "get": { + "security": [ + { + "ApiKeyAuth": [] + } + ], + "produces": [ + "application/json" + ], + "tags": [ + "SimpleUploader" + ], + "summary": "合并文件", + "parameters": [ + { + "type": "string", + "description": "合并文件", + "name": "md5", + "in": "query", + "required": true + } + ], + "responses": { + "200": { + "description": "{\"success\":true,\"data\":{},\"msg\":\"合并成功\"}", + "schema": { + "type": "string" + } + } + } + } + }, + "/simpleUploader/upload": { + "post": { + "security": [ + { + "ApiKeyAuth": [] + } + ], + "consumes": [ + "multipart/form-data" + ], + "produces": [ + "application/json" + ], + "tags": [ + "SimpleUploader" + ], + "summary": "断点续传插件版示例", + "parameters": [ + { + "type": "file", + "description": "断点续传插件版示例", + "name": "file", + "in": "formData", + "required": true + } + ], + "responses": { + "200": { + "description": "{\"success\":true,\"data\":{},\"msg\":\"上传成功\"}", + "schema": { + "type": "string" + } + } + } + } + }, "/sysDictionary/createSysDictionary": { "post": { "security": [ @@ -1985,6 +2078,45 @@ } } }, + "/sysOperationRecord/deleteSysOperationRecordByIds": { + "delete": { + "security": [ + { + "ApiKeyAuth": [] + } + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "tags": [ + "SysOperationRecord" + ], + "summary": "批量删除SysOperationRecord", + "parameters": [ + { + "description": "批量删除SysOperationRecord", + "name": "data", + "in": "body", + "required": true, + "schema": { + "type": "object", + "$ref": "#/definitions/request.IdsReq" + } + } + ], + "responses": { + "200": { + "description": "{\"success\":true,\"data\":{},\"msg\":\"删除成功\"}", + "schema": { + "type": "string" + } + } + } + } + }, "/sysOperationRecord/findSysOperationRecord": { "get": { "security": [ @@ -2694,6 +2826,9 @@ "dataTypeLong": { "type": "string" }, + "dictType": { + "type": "string" + }, "fieldDesc": { "type": "string" }, @@ -2802,6 +2937,12 @@ "name": { "type": "string" }, + "parameters": { + "type": "array", + "items": { + "$ref": "#/definitions/model.SysBaseMenuParameter" + } + }, "parentId": { "type": "string" }, @@ -2816,6 +2957,23 @@ } } }, + "model.SysBaseMenuParameter": { + "type": "object", + "properties": { + "key": { + "type": "string" + }, + "sysBaseMenuId": { + "type": "integer" + }, + "type": { + "type": "string" + }, + "value": { + "type": "string" + } + } + }, "model.SysDictionary": { "type": "object", "properties": { @@ -3053,6 +3211,17 @@ } } }, + "request.IdsReq": { + "type": "object", + "properties": { + "ids": { + "type": "array", + "items": { + "type": "integer" + } + } + } + }, "request.PageInfo": { "type": "object", "properties": { diff --git a/server/docs/swagger.yaml b/server/docs/swagger.yaml index 8797df03..ff8ef348 100644 --- a/server/docs/swagger.yaml +++ b/server/docs/swagger.yaml @@ -177,6 +177,8 @@ definitions: type: string dataTypeLong: type: string + dictType: + type: string fieldDesc: type: string fieldJson: @@ -248,6 +250,10 @@ definitions: type: boolean name: type: string + parameters: + items: + $ref: '#/definitions/model.SysBaseMenuParameter' + type: array parentId: type: string path: @@ -257,6 +263,17 @@ definitions: title: type: string type: object + model.SysBaseMenuParameter: + properties: + key: + type: string + sysBaseMenuId: + type: integer + type: + type: string + value: + type: string + type: object model.SysDictionary: properties: desc: @@ -415,6 +432,13 @@ definitions: id: type: number type: object + request.IdsReq: + properties: + ids: + items: + type: integer + type: array + type: object request.PageInfo: properties: page: @@ -1467,6 +1491,63 @@ paths: summary: 更新菜单 tags: - menu + /simpleUploader/checkFileMd5: + get: + parameters: + - description: 测试文件是否已经存在和判断已经上传过的切片 + in: query + name: md5 + required: true + type: string + produces: + - application/json + responses: + "200": + description: '{"success":true,"data":{},"msg":"查询成功"}' + schema: + type: string + /simpleUploader/mergeFileMd5: + get: + parameters: + - description: 合并文件 + in: query + name: md5 + required: true + type: string + produces: + - application/json + responses: + "200": + description: '{"success":true,"data":{},"msg":"合并成功"}' + schema: + type: string + security: + - ApiKeyAuth: [] + summary: 合并文件 + tags: + - SimpleUploader + /simpleUploader/upload: + post: + consumes: + - multipart/form-data + parameters: + - description: 断点续传插件版示例 + in: formData + name: file + required: true + type: file + produces: + - application/json + responses: + "200": + description: '{"success":true,"data":{},"msg":"上传成功"}' + schema: + type: string + security: + - ApiKeyAuth: [] + summary: 断点续传插件版示例 + tags: + - SimpleUploader /sysDictionary/createSysDictionary: post: consumes: @@ -1755,6 +1836,30 @@ paths: summary: 删除SysOperationRecord tags: - SysOperationRecord + /sysOperationRecord/deleteSysOperationRecordByIds: + delete: + consumes: + - application/json + parameters: + - description: 批量删除SysOperationRecord + in: body + name: data + required: true + schema: + $ref: '#/definitions/request.IdsReq' + type: object + produces: + - application/json + responses: + "200": + description: '{"success":true,"data":{},"msg":"删除成功"}' + schema: + type: string + security: + - ApiKeyAuth: [] + summary: 批量删除SysOperationRecord + tags: + - SysOperationRecord /sysOperationRecord/findSysOperationRecord: get: consumes: diff --git a/server/middleware/cors.go b/server/middleware/cors.go index 7214399a..e1e66c44 100644 --- a/server/middleware/cors.go +++ b/server/middleware/cors.go @@ -10,8 +10,8 @@ func Cors() gin.HandlerFunc { return func(c *gin.Context) { method := c.Request.Method c.Header("Access-Control-Allow-Origin", "*") - c.Header("Access-Control-Allow-Headers", "Content-Type,AccessToken,X-CSRF-Token, Authorization, Token") - c.Header("Access-Control-Allow-Methods", "POST, GET, OPTIONS") + c.Header("Access-Control-Allow-Headers", "Content-Type,AccessToken,X-CSRF-Token, Authorization, Token,X-Token,X-User-Id\"") + c.Header("Access-Control-Allow-Methods", "POST, GET, OPTIONS,DELETE,PUT") c.Header("Access-Control-Expose-Headers", "Content-Length, Access-Control-Allow-Origin, Access-Control-Allow-Headers, Content-Type") c.Header("Access-Control-Allow-Credentials", "true") -- GitLab