diff --git a/docs/admin/admin_docs.go b/docs/admin/admin_docs.go index 4050cc5..9ce3ba7 100644 --- a/docs/admin/admin_docs.go +++ b/docs/admin/admin_docs.go @@ -958,7 +958,214 @@ const docTemplateadmin = `{ } } }, + "/admin/audit_conn/batchDelete": { + "post": { + "security": [ + { + "token": [] + } + ], + "description": "链接日志批量删除", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "tags": [ + "链接日志" + ], + "summary": "链接日志批量删除", + "parameters": [ + { + "description": "链接日志", + "name": "body", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/admin.AuditConnLogIds" + } + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/response.Response" + } + }, + "500": { + "description": "Internal Server Error", + "schema": { + "$ref": "#/definitions/response.Response" + } + } + } + } + }, "/admin/audit_conn/delete": { + "post": { + "security": [ + { + "token": [] + } + ], + "description": "链接日志删除", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "tags": [ + "链接日志" + ], + "summary": "链接日志删除", + "parameters": [ + { + "description": "链接日志信息", + "name": "body", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/model.AuditConn" + } + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/response.Response" + } + }, + "500": { + "description": "Internal Server Error", + "schema": { + "$ref": "#/definitions/response.Response" + } + } + } + } + }, + "/admin/audit_conn/list": { + "get": { + "security": [ + { + "token": [] + } + ], + "description": "链接日志列表", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "tags": [ + "链接日志" + ], + "summary": "链接日志列表", + "parameters": [ + { + "type": "integer", + "description": "页码", + "name": "page", + "in": "query" + }, + { + "type": "integer", + "description": "页大小", + "name": "page_size", + "in": "query" + }, + { + "type": "integer", + "description": "目标设备", + "name": "peer_id", + "in": "query" + }, + { + "type": "integer", + "description": "来源设备", + "name": "from_peer", + "in": "query" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "allOf": [ + { + "$ref": "#/definitions/response.Response" + }, + { + "type": "object", + "properties": { + "data": { + "$ref": "#/definitions/model.AuditConnList" + } + } + } + ] + } + }, + "500": { + "description": "Internal Server Error", + "schema": { + "$ref": "#/definitions/response.Response" + } + } + } + } + }, + "/admin/audit_file/batchDelete": { + "post": { + "security": [ + { + "token": [] + } + ], + "description": "文件日志批量删除", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "tags": [ + "文件日志" + ], + "summary": "文件日志批量删除", + "parameters": [ + { + "description": "文件日志", + "name": "body", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/admin.AuditFileLogIds" + } + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/response.Response" + } + }, + "500": { + "description": "Internal Server Error", + "schema": { + "$ref": "#/definitions/response.Response" + } + } + } + } + }, + "/admin/audit_file/delete": { "post": { "security": [ { @@ -1003,7 +1210,7 @@ const docTemplateadmin = `{ } } }, - "/admin/audit_conn/list": { + "/admin/audit_file/list": { "get": { "security": [ { @@ -1075,6 +1282,108 @@ const docTemplateadmin = `{ } } }, + "/admin/config/admin": { + "get": { + "security": [ + { + "token": [] + } + ], + "description": "ADMIN服务配置", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "tags": [ + "ADMIN" + ], + "summary": "ADMIN服务配置", + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/response.Response" + } + }, + "500": { + "description": "Internal Server Error", + "schema": { + "$ref": "#/definitions/response.Response" + } + } + } + } + }, + "/admin/config/app": { + "get": { + "security": [ + { + "token": [] + } + ], + "description": "APP服务配置", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "tags": [ + "ADMIN" + ], + "summary": "APP服务配置", + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/response.Response" + } + }, + "500": { + "description": "Internal Server Error", + "schema": { + "$ref": "#/definitions/response.Response" + } + } + } + } + }, + "/admin/config/server": { + "get": { + "security": [ + { + "token": [] + } + ], + "description": "服务配置,给webclient提供api-server", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "tags": [ + "ADMIN" + ], + "summary": "RUSTDESK服务配置", + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/response.Response" + } + }, + "500": { + "description": "Internal Server Error", + "schema": { + "$ref": "#/definitions/response.Response" + } + } + } + } + }, "/admin/file/oss_token": { "get": { "security": [ @@ -1522,7 +1831,7 @@ const docTemplateadmin = `{ "token": [] } ], - "description": "登录日志删除", + "description": "登录日志批量删除", "consumes": [ "application/json" ], @@ -1532,15 +1841,15 @@ const docTemplateadmin = `{ "tags": [ "登录日志" ], - "summary": "登录日志删除", + "summary": "登录日志批量删除", "parameters": [ { - "description": "登录日志信息", + "description": "登录日志", "name": "body", "in": "body", "required": true, "schema": { - "$ref": "#/definitions/model.LoginLog" + "$ref": "#/definitions/admin.LoginLogIds" } } ], @@ -3074,7 +3383,7 @@ const docTemplateadmin = `{ "token": [] } ], - "description": "设备列表", + "description": "我的设备列表", "consumes": [ "application/json" ], @@ -3084,7 +3393,7 @@ const docTemplateadmin = `{ "tags": [ "设备" ], - "summary": "设备列表", + "summary": "我的设备列表", "parameters": [ { "type": "integer", @@ -3452,6 +3761,34 @@ const docTemplateadmin = `{ } } }, + "admin.AuditConnLogIds": { + "type": "object", + "required": [ + "ids" + ], + "properties": { + "ids": { + "type": "array", + "items": { + "type": "integer" + } + } + } + }, + "admin.AuditFileLogIds": { + "type": "object", + "required": [ + "ids" + ], + "properties": { + "ids": { + "type": "array", + "items": { + "type": "integer" + } + } + } + }, "admin.ChangeCurPasswordForm": { "type": "object", "required": [ @@ -3488,6 +3825,20 @@ const docTemplateadmin = `{ } } }, + "admin.LoginLogIds": { + "type": "object", + "required": [ + "ids" + ], + "properties": { + "ids": { + "type": "array", + "items": { + "type": "integer" + } + } + } + }, "admin.LoginPayload": { "type": "object", "properties": { diff --git a/docs/admin/admin_swagger.json b/docs/admin/admin_swagger.json index 0a5ad74..b4b8d8c 100644 --- a/docs/admin/admin_swagger.json +++ b/docs/admin/admin_swagger.json @@ -951,7 +951,214 @@ } } }, + "/admin/audit_conn/batchDelete": { + "post": { + "security": [ + { + "token": [] + } + ], + "description": "链接日志批量删除", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "tags": [ + "链接日志" + ], + "summary": "链接日志批量删除", + "parameters": [ + { + "description": "链接日志", + "name": "body", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/admin.AuditConnLogIds" + } + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/response.Response" + } + }, + "500": { + "description": "Internal Server Error", + "schema": { + "$ref": "#/definitions/response.Response" + } + } + } + } + }, "/admin/audit_conn/delete": { + "post": { + "security": [ + { + "token": [] + } + ], + "description": "链接日志删除", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "tags": [ + "链接日志" + ], + "summary": "链接日志删除", + "parameters": [ + { + "description": "链接日志信息", + "name": "body", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/model.AuditConn" + } + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/response.Response" + } + }, + "500": { + "description": "Internal Server Error", + "schema": { + "$ref": "#/definitions/response.Response" + } + } + } + } + }, + "/admin/audit_conn/list": { + "get": { + "security": [ + { + "token": [] + } + ], + "description": "链接日志列表", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "tags": [ + "链接日志" + ], + "summary": "链接日志列表", + "parameters": [ + { + "type": "integer", + "description": "页码", + "name": "page", + "in": "query" + }, + { + "type": "integer", + "description": "页大小", + "name": "page_size", + "in": "query" + }, + { + "type": "integer", + "description": "目标设备", + "name": "peer_id", + "in": "query" + }, + { + "type": "integer", + "description": "来源设备", + "name": "from_peer", + "in": "query" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "allOf": [ + { + "$ref": "#/definitions/response.Response" + }, + { + "type": "object", + "properties": { + "data": { + "$ref": "#/definitions/model.AuditConnList" + } + } + } + ] + } + }, + "500": { + "description": "Internal Server Error", + "schema": { + "$ref": "#/definitions/response.Response" + } + } + } + } + }, + "/admin/audit_file/batchDelete": { + "post": { + "security": [ + { + "token": [] + } + ], + "description": "文件日志批量删除", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "tags": [ + "文件日志" + ], + "summary": "文件日志批量删除", + "parameters": [ + { + "description": "文件日志", + "name": "body", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/admin.AuditFileLogIds" + } + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/response.Response" + } + }, + "500": { + "description": "Internal Server Error", + "schema": { + "$ref": "#/definitions/response.Response" + } + } + } + } + }, + "/admin/audit_file/delete": { "post": { "security": [ { @@ -996,7 +1203,7 @@ } } }, - "/admin/audit_conn/list": { + "/admin/audit_file/list": { "get": { "security": [ { @@ -1068,6 +1275,108 @@ } } }, + "/admin/config/admin": { + "get": { + "security": [ + { + "token": [] + } + ], + "description": "ADMIN服务配置", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "tags": [ + "ADMIN" + ], + "summary": "ADMIN服务配置", + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/response.Response" + } + }, + "500": { + "description": "Internal Server Error", + "schema": { + "$ref": "#/definitions/response.Response" + } + } + } + } + }, + "/admin/config/app": { + "get": { + "security": [ + { + "token": [] + } + ], + "description": "APP服务配置", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "tags": [ + "ADMIN" + ], + "summary": "APP服务配置", + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/response.Response" + } + }, + "500": { + "description": "Internal Server Error", + "schema": { + "$ref": "#/definitions/response.Response" + } + } + } + } + }, + "/admin/config/server": { + "get": { + "security": [ + { + "token": [] + } + ], + "description": "服务配置,给webclient提供api-server", + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "tags": [ + "ADMIN" + ], + "summary": "RUSTDESK服务配置", + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/response.Response" + } + }, + "500": { + "description": "Internal Server Error", + "schema": { + "$ref": "#/definitions/response.Response" + } + } + } + } + }, "/admin/file/oss_token": { "get": { "security": [ @@ -1515,7 +1824,7 @@ "token": [] } ], - "description": "登录日志删除", + "description": "登录日志批量删除", "consumes": [ "application/json" ], @@ -1525,15 +1834,15 @@ "tags": [ "登录日志" ], - "summary": "登录日志删除", + "summary": "登录日志批量删除", "parameters": [ { - "description": "登录日志信息", + "description": "登录日志", "name": "body", "in": "body", "required": true, "schema": { - "$ref": "#/definitions/model.LoginLog" + "$ref": "#/definitions/admin.LoginLogIds" } } ], @@ -3067,7 +3376,7 @@ "token": [] } ], - "description": "设备列表", + "description": "我的设备列表", "consumes": [ "application/json" ], @@ -3077,7 +3386,7 @@ "tags": [ "设备" ], - "summary": "设备列表", + "summary": "我的设备列表", "parameters": [ { "type": "integer", @@ -3445,6 +3754,34 @@ } } }, + "admin.AuditConnLogIds": { + "type": "object", + "required": [ + "ids" + ], + "properties": { + "ids": { + "type": "array", + "items": { + "type": "integer" + } + } + } + }, + "admin.AuditFileLogIds": { + "type": "object", + "required": [ + "ids" + ], + "properties": { + "ids": { + "type": "array", + "items": { + "type": "integer" + } + } + } + }, "admin.ChangeCurPasswordForm": { "type": "object", "required": [ @@ -3481,6 +3818,20 @@ } } }, + "admin.LoginLogIds": { + "type": "object", + "required": [ + "ids" + ], + "properties": { + "ids": { + "type": "array", + "items": { + "type": "integer" + } + } + } + }, "admin.LoginPayload": { "type": "object", "properties": { diff --git a/docs/admin/admin_swagger.yaml b/docs/admin/admin_swagger.yaml index 8a45943..1480df4 100644 --- a/docs/admin/admin_swagger.yaml +++ b/docs/admin/admin_swagger.yaml @@ -57,6 +57,24 @@ definitions: required: - id type: object + admin.AuditConnLogIds: + properties: + ids: + items: + type: integer + type: array + required: + - ids + type: object + admin.AuditFileLogIds: + properties: + ids: + items: + type: integer + type: array + required: + - ids + type: object admin.ChangeCurPasswordForm: properties: new_password: @@ -82,6 +100,15 @@ definitions: required: - name type: object + admin.LoginLogIds: + properties: + ids: + items: + type: integer + type: array + required: + - ids + type: object admin.LoginPayload: properties: avatar: @@ -1281,7 +1308,134 @@ paths: summary: APP服务配置 tags: - ADMIN + /admin/audit_conn/batchDelete: + post: + consumes: + - application/json + description: 链接日志批量删除 + parameters: + - description: 链接日志 + in: body + name: body + required: true + schema: + $ref: '#/definitions/admin.AuditConnLogIds' + produces: + - application/json + responses: + "200": + description: OK + schema: + $ref: '#/definitions/response.Response' + "500": + description: Internal Server Error + schema: + $ref: '#/definitions/response.Response' + security: + - token: [] + summary: 链接日志批量删除 + tags: + - 链接日志 /admin/audit_conn/delete: + post: + consumes: + - application/json + description: 链接日志删除 + parameters: + - description: 链接日志信息 + in: body + name: body + required: true + schema: + $ref: '#/definitions/model.AuditConn' + produces: + - application/json + responses: + "200": + description: OK + schema: + $ref: '#/definitions/response.Response' + "500": + description: Internal Server Error + schema: + $ref: '#/definitions/response.Response' + security: + - token: [] + summary: 链接日志删除 + tags: + - 链接日志 + /admin/audit_conn/list: + get: + consumes: + - application/json + description: 链接日志列表 + parameters: + - description: 页码 + in: query + name: page + type: integer + - description: 页大小 + in: query + name: page_size + type: integer + - description: 目标设备 + in: query + name: peer_id + type: integer + - description: 来源设备 + in: query + name: from_peer + type: integer + produces: + - application/json + responses: + "200": + description: OK + schema: + allOf: + - $ref: '#/definitions/response.Response' + - properties: + data: + $ref: '#/definitions/model.AuditConnList' + type: object + "500": + description: Internal Server Error + schema: + $ref: '#/definitions/response.Response' + security: + - token: [] + summary: 链接日志列表 + tags: + - 链接日志 + /admin/audit_file/batchDelete: + post: + consumes: + - application/json + description: 文件日志批量删除 + parameters: + - description: 文件日志 + in: body + name: body + required: true + schema: + $ref: '#/definitions/admin.AuditFileLogIds' + produces: + - application/json + responses: + "200": + description: OK + schema: + $ref: '#/definitions/response.Response' + "500": + description: Internal Server Error + schema: + $ref: '#/definitions/response.Response' + security: + - token: [] + summary: 文件日志批量删除 + tags: + - 文件日志 + /admin/audit_file/delete: post: consumes: - application/json @@ -1309,7 +1463,7 @@ paths: summary: 文件日志删除 tags: - 文件日志 - /admin/audit_conn/list: + /admin/audit_file/list: get: consumes: - application/json @@ -1352,6 +1506,69 @@ paths: summary: 文件日志列表 tags: - 文件日志 + /admin/config/admin: + get: + consumes: + - application/json + description: ADMIN服务配置 + produces: + - application/json + responses: + "200": + description: OK + schema: + $ref: '#/definitions/response.Response' + "500": + description: Internal Server Error + schema: + $ref: '#/definitions/response.Response' + security: + - token: [] + summary: ADMIN服务配置 + tags: + - ADMIN + /admin/config/app: + get: + consumes: + - application/json + description: APP服务配置 + produces: + - application/json + responses: + "200": + description: OK + schema: + $ref: '#/definitions/response.Response' + "500": + description: Internal Server Error + schema: + $ref: '#/definitions/response.Response' + security: + - token: [] + summary: APP服务配置 + tags: + - ADMIN + /admin/config/server: + get: + consumes: + - application/json + description: 服务配置,给webclient提供api-server + produces: + - application/json + responses: + "200": + description: OK + schema: + $ref: '#/definitions/response.Response' + "500": + description: Internal Server Error + schema: + $ref: '#/definitions/response.Response' + security: + - token: [] + summary: RUSTDESK服务配置 + tags: + - ADMIN /admin/file/oss_token: get: consumes: @@ -1619,14 +1836,14 @@ paths: post: consumes: - application/json - description: 登录日志删除 + description: 登录日志批量删除 parameters: - - description: 登录日志信息 + - description: 登录日志 in: body name: body required: true schema: - $ref: '#/definitions/model.LoginLog' + $ref: '#/definitions/admin.LoginLogIds' produces: - application/json responses: @@ -1640,7 +1857,7 @@ paths: $ref: '#/definitions/response.Response' security: - token: [] - summary: 登录日志删除 + summary: 登录日志批量删除 tags: - 登录日志 /admin/login_log/detail/{id}: @@ -2542,7 +2759,7 @@ paths: get: consumes: - application/json - description: 设备列表 + description: 我的设备列表 parameters: - description: 页码 in: query @@ -2586,7 +2803,7 @@ paths: $ref: '#/definitions/response.Response' security: - token: [] - summary: 设备列表 + summary: 我的设备列表 tags: - 设备 /admin/user/update: diff --git a/http/controller/admin/audit.go b/http/controller/admin/audit.go index cb56ddb..c3d37e5 100644 --- a/http/controller/admin/audit.go +++ b/http/controller/admin/audit.go @@ -81,6 +81,37 @@ func (a *Audit) ConnDelete(c *gin.Context) { response.Fail(c, 101, response.TranslateMsg(c, "ItemNotFound")) } +// BatchConnDelete 删除 +// @Tags 链接日志 +// @Summary 链接日志批量删除 +// @Description 链接日志批量删除 +// @Accept json +// @Produce json +// @Param body body admin.AuditConnLogIds true "链接日志" +// @Success 200 {object} response.Response +// @Failure 500 {object} response.Response +// @Router /admin/audit_conn/batchDelete [post] +// @Security token +func (a *Audit) BatchConnDelete(c *gin.Context) { + f := &admin.AuditConnLogIds{} + if err := c.ShouldBindJSON(f); err != nil { + response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error()) + return + } + if len(f.Ids) == 0 { + response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")) + return + } + + err := service.AllService.AuditService.BatchDeleteAuditConn(f.Ids) + if err == nil { + response.Success(c, nil) + return + } + response.Fail(c, 101, err.Error()) + return +} + // FileList 列表 // @Tags 文件日志 // @Summary 文件日志列表 @@ -93,7 +124,7 @@ func (a *Audit) ConnDelete(c *gin.Context) { // @Param from_peer query int false "来源设备" // @Success 200 {object} response.Response{data=model.AuditFileList} // @Failure 500 {object} response.Response -// @Router /admin/audit_conn/list [get] +// @Router /admin/audit_file/list [get] // @Security token func (a *Audit) FileList(c *gin.Context) { query := &admin.AuditQuery{} @@ -122,7 +153,7 @@ func (a *Audit) FileList(c *gin.Context) { // @Param body body model.AuditFile true "文件日志信息" // @Success 200 {object} response.Response // @Failure 500 {object} response.Response -// @Router /admin/audit_conn/delete [post] +// @Router /admin/audit_file/delete [post] // @Security token func (a *Audit) FileDelete(c *gin.Context) { f := &model.AuditFile{} @@ -148,3 +179,34 @@ func (a *Audit) FileDelete(c *gin.Context) { } response.Fail(c, 101, response.TranslateMsg(c, "ItemNotFound")) } + +// BatchFileDelete 删除 +// @Tags 文件日志 +// @Summary 文件日志批量删除 +// @Description 文件日志批量删除 +// @Accept json +// @Produce json +// @Param body body admin.AuditFileLogIds true "文件日志" +// @Success 200 {object} response.Response +// @Failure 500 {object} response.Response +// @Router /admin/audit_file/batchDelete [post] +// @Security token +func (a *Audit) BatchFileDelete(c *gin.Context) { + f := &admin.AuditFileLogIds{} + if err := c.ShouldBindJSON(f); err != nil { + response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error()) + return + } + if len(f.Ids) == 0 { + response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")) + return + } + + err := service.AllService.AuditService.BatchDeleteAuditFile(f.Ids) + if err == nil { + response.Success(c, nil) + return + } + response.Fail(c, 101, err.Error()) + return +} diff --git a/http/controller/admin/loginLog.go b/http/controller/admin/loginLog.go index 914ea0f..90a57b0 100644 --- a/http/controller/admin/loginLog.go +++ b/http/controller/admin/loginLog.go @@ -109,3 +109,34 @@ func (ct *LoginLog) Delete(c *gin.Context) { } response.Fail(c, 101, response.TranslateMsg(c, "ItemNotFound")) } + +// BatchDelete 删除 +// @Tags 登录日志 +// @Summary 登录日志批量删除 +// @Description 登录日志批量删除 +// @Accept json +// @Produce json +// @Param body body admin.LoginLogIds true "登录日志" +// @Success 200 {object} response.Response +// @Failure 500 {object} response.Response +// @Router /admin/login_log/delete [post] +// @Security token +func (ct *LoginLog) BatchDelete(c *gin.Context) { + f := &admin.LoginLogIds{} + if err := c.ShouldBindJSON(f); err != nil { + response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")+err.Error()) + return + } + if len(f.Ids) == 0 { + response.Fail(c, 101, response.TranslateMsg(c, "ParamsError")) + return + } + + err := service.AllService.LoginLogService.BatchDelete(f.Ids) + if err == nil { + response.Success(c, nil) + return + } + response.Fail(c, 101, err.Error()) + return +} diff --git a/http/controller/admin/user.go b/http/controller/admin/user.go index 2ffabf9..f9c3d83 100644 --- a/http/controller/admin/user.go +++ b/http/controller/admin/user.go @@ -295,10 +295,10 @@ func (ct *User) MyOauth(c *gin.Context) { response.Success(c, res) } -// List 列表 +// MyPeer 列表 // @Tags 设备 -// @Summary 设备列表 -// @Description 设备列表 +// @Summary 我的设备列表 +// @Description 我的设备列表 // @Accept json // @Produce json // @Param page query int false "页码" diff --git a/http/request/admin/audit.go b/http/request/admin/audit.go index 964dfbb..982cb04 100644 --- a/http/request/admin/audit.go +++ b/http/request/admin/audit.go @@ -5,3 +5,10 @@ type AuditQuery struct { FromPeer string `form:"from_peer"` PageQuery } + +type AuditConnLogIds struct { + Ids []uint `json:"ids" validate:"required"` +} +type AuditFileLogIds struct { + Ids []uint `json:"ids" validate:"required"` +} diff --git a/http/request/admin/login.go b/http/request/admin/login.go index 6052ee0..243554f 100644 --- a/http/request/admin/login.go +++ b/http/request/admin/login.go @@ -15,3 +15,7 @@ type LoginTokenQuery struct { UserId int `form:"user_id"` PageQuery } + +type LoginLogIds struct { + Ids []uint `json:"ids" validate:"required"` +} diff --git a/http/router/admin.go b/http/router/admin.go index 9049159..be2eb23 100644 --- a/http/router/admin.go +++ b/http/router/admin.go @@ -154,15 +154,18 @@ func LoginLogBind(rg *gin.RouterGroup) { cont := &admin.LoginLog{} aR.GET("/list", cont.List) aR.POST("/delete", cont.Delete) + aR.POST("/batchDelete", cont.BatchDelete) } func AuditBind(rg *gin.RouterGroup) { cont := &admin.Audit{} aR := rg.Group("/audit_conn").Use(middleware.AdminPrivilege()) aR.GET("/list", cont.ConnList) aR.POST("/delete", cont.ConnDelete) + aR.POST("/batchDelete", cont.BatchConnDelete) afR := rg.Group("/audit_file").Use(middleware.AdminPrivilege()) afR.GET("/list", cont.FileList) afR.POST("/delete", cont.FileDelete) + afR.POST("/batchDelete", cont.BatchFileDelete) } func AddressBookCollectionBind(rg *gin.RouterGroup) { aR := rg.Group("/address_book_collection") diff --git a/service/audit.go b/service/audit.go index 2ad718b..a29059f 100644 --- a/service/audit.go +++ b/service/audit.go @@ -85,3 +85,11 @@ func (as *AuditService) DeleteAuditFile(u *model.AuditFile) error { func (as *AuditService) UpdateAuditFile(u *model.AuditFile) error { return global.DB.Model(u).Updates(u).Error } + +func (as *AuditService) BatchDeleteAuditConn(ids []uint) error { + return global.DB.Where("id in (?)", ids).Delete(&model.AuditConn{}).Error +} + +func (as *AuditService) BatchDeleteAuditFile(ids []uint) error { + return global.DB.Where("id in (?)", ids).Delete(&model.AuditFile{}).Error +} diff --git a/service/loginLog.go b/service/loginLog.go index 96ec23b..e484631 100644 --- a/service/loginLog.go +++ b/service/loginLog.go @@ -43,3 +43,7 @@ func (us *LoginLogService) Delete(u *model.LoginLog) error { func (us *LoginLogService) Update(u *model.LoginLog) error { return global.DB.Model(u).Updates(u).Error } + +func (us *LoginLogService) BatchDelete(ids []uint) error { + return global.DB.Where("id in (?)", ids).Delete(&model.LoginLog{}).Error +}