From c23cf8594b2a83d1f3fa3d8e71c6c13096e9154b Mon Sep 17 00:00:00 2001 From: wangxiang <1827945911@qq.com> Date: Wed, 4 May 2022 06:58:22 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=93=80=20=E9=87=8D=E6=9E=84=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E6=A1=86=E6=9E=B6=E8=BF=9B=E8=A1=8C=E9=80=82=E9=85=8D?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=A1=86=E6=9E=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/constant/ServiceNameConstants.java | 10 ++++++ .../monitor/api/feign/RemoteLogService.java | 2 +- .../monitor/controller/TokenController.java | 12 +------ .../platform/monitor/controller/operLog.ts | 34 ++++++++++++++++++ .../api/platform/monitor/entity/operLog.ts | 36 +++++++++++++++++++ 5 files changed, 82 insertions(+), 12 deletions(-) create mode 100644 kicc-ui/src/api/platform/monitor/controller/operLog.ts create mode 100644 kicc-ui/src/api/platform/monitor/entity/operLog.ts diff --git a/kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/constant/ServiceNameConstants.java b/kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/constant/ServiceNameConstants.java index 043fcd2c..22155695 100644 --- a/kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/constant/ServiceNameConstants.java +++ b/kicc-common/kicc-common-core/src/main/java/com/cloud/kicc/common/core/constant/ServiceNameConstants.java @@ -20,6 +20,16 @@ public interface ServiceNameConstants { */ String SYSTEM_SERVICE = "kicc-system-biz"; + /** + * MONITOR模块 + */ + String MONITOR_SERVICE = "kicc-monitor-biz"; + + /** + * COMMON模块 + */ + String COMMON_SERVICE = "kicc-common-biz"; + /** * seata分布式事务演示-订单模块 */ diff --git a/kicc-platform/kicc-platform-api/kicc-monitor-api/src/main/java/com/cloud/kicc/monitor/api/feign/RemoteLogService.java b/kicc-platform/kicc-platform-api/kicc-monitor-api/src/main/java/com/cloud/kicc/monitor/api/feign/RemoteLogService.java index 370de396..6bb0e4a4 100644 --- a/kicc-platform/kicc-platform-api/kicc-monitor-api/src/main/java/com/cloud/kicc/monitor/api/feign/RemoteLogService.java +++ b/kicc-platform/kicc-platform-api/kicc-monitor-api/src/main/java/com/cloud/kicc/monitor/api/feign/RemoteLogService.java @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RequestHeader; * @Author: entfrm开发团队-王翔 * @Date: 2022/2/17 */ -@FeignClient(contextId = "remoteLogService", value = ServiceNameConstants.SYSTEM_SERVICE) +@FeignClient(contextId = "remoteLogService", value = ServiceNameConstants.MONITOR_SERVICE) public interface RemoteLogService { /** diff --git a/kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/java/com/cloud/kicc/monitor/controller/TokenController.java b/kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/java/com/cloud/kicc/monitor/controller/TokenController.java index d45eb7e1..44a99365 100644 --- a/kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/java/com/cloud/kicc/monitor/controller/TokenController.java +++ b/kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/java/com/cloud/kicc/monitor/controller/TokenController.java @@ -3,7 +3,7 @@ package com.cloud.kicc.monitor.controller; import com.cloud.kicc.common.core.api.R; import com.cloud.kicc.common.core.constant.AppConstants; import com.cloud.kicc.common.core.constant.SecurityConstants; -import com.cloud.kicc.system.api.feign.RemoteTokenService; +import com.cloud.kicc.monitor.api.feign.RemoteTokenService; import io.swagger.annotations.Api; import lombok.RequiredArgsConstructor; import org.springframework.security.access.prepost.PreAuthorize; @@ -27,21 +27,11 @@ public class TokenController { private final RemoteTokenService remoteTokenService; - /** - * 分页token 信息 - * @param params 参数集 - * @return token集合 - */ @GetMapping("/list") public R token(@RequestParam Map params) { return remoteTokenService.getTokenPage(params, SecurityConstants.FROM_IN); } - /** - * 删除 - * @param id ID - * @return success/false - */ @DeleteMapping("/{id}") @PreAuthorize("@pms.hasPermission('sys_token_del')") public R delete(@PathVariable String id) { diff --git a/kicc-ui/src/api/platform/monitor/controller/operLog.ts b/kicc-ui/src/api/platform/monitor/controller/operLog.ts new file mode 100644 index 00000000..a8322b87 --- /dev/null +++ b/kicc-ui/src/api/platform/monitor/controller/operLog.ts @@ -0,0 +1,34 @@ +/** + * 提供api模板规范代码参考,请尽量保证编写代码风格跟模板规范代码一致 + * Copyright © 2020-2022 entfrm All rights reserved. + * author entfrm开发团队-王翔 + */ +import type { OperLogParams, OperLog, OperLogResult } from '/@/api/platform/monitor/entity/operLog'; +import { defHttp } from '/@/utils/http/axios'; + +enum Api { + list = '/system_proxy/system/dict/list', + add = '/system_proxy/system/dict/save', + get = '/system_proxy/system/dict', + edit = '/system_proxy/system/dict/update', + del = '/system_proxy/system/dict/remove', + changeStatus='/system_proxy/system/dict/changeStatus' +} + +/** 查询配置列表 */ +export const listDict = (params?: Partial) => defHttp.get({ url: Api.list, params }, { isReturnResultResponse: true }); + +/** 新增配置 */ +export const addDict = (params: Partial) => defHttp.post({ url: Api.add, data: params }); + +/** 修改配置 */ +export const editDict = (params: Partial) => defHttp.put({ url: Api.edit, data: params }); + +/** 查询配置详细 */ +export const getDict = (id: string) => defHttp.get({ url: `${Api.get}/${id}` }); + +/** 删除配置 */ +export const delDict = (ids: string) => defHttp.delete({ url: `${Api.del}/${ids}` }); + +/** 修改字典状态 */ +export const changeStatus = (id: string, status: string) => defHttp.put({ url: Api.changeStatus, data: { id: id, status: status } }); diff --git a/kicc-ui/src/api/platform/monitor/entity/operLog.ts b/kicc-ui/src/api/platform/monitor/entity/operLog.ts new file mode 100644 index 00000000..35339535 --- /dev/null +++ b/kicc-ui/src/api/platform/monitor/entity/operLog.ts @@ -0,0 +1,36 @@ +/** + * @program: kicc-ui + * @description: 操作日志实体类 + * 类型定义 + * @author: entfrm开发团队-王翔 + * @create: 2022/4/8 + */ +import { R } from '/#/axios'; +import { CommonEntity, Page } from '/@/api/common/data/entity'; + +/** 操作日志查询参数 */ +export type OperLogParams = Page & OperLog; + +/** 操作日志对象 */ +export interface OperLog extends CommonEntity { + id: string; + title: string; + type: string; + method: string; + userAgent: string; + operName: string; + clientId: string; + operUrl: string; + operIp: string; + operAddr: string; + operParam: string; + status: string; + errorMsg: string; + executeTime: string; + operTime: string; + serviceId: string; + [key: string]: any; +} + +/** 操作日志响应对象 */ +export type OperLogResult = R;