diff --git a/kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/java/com/cloud/kicc/monitor/controller/OperLogController.java b/kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/java/com/cloud/kicc/monitor/controller/OperLogController.java index d28d7c04..32cd2b7c 100644 --- a/kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/java/com/cloud/kicc/monitor/controller/OperLogController.java +++ b/kicc-platform/kicc-platform-biz/kicc-monitor-biz/src/main/java/com/cloud/kicc/monitor/controller/OperLogController.java @@ -39,7 +39,6 @@ public class OperLogController { .like(StrUtil.isNotBlank(operLog.getOperName()), OperLog::getOperName, operLog.getOperName()) .like(StrUtil.isNotBlank(operLog.getTitle()), OperLog::getTitle, operLog.getTitle()) .eq(ObjectUtil.isNotEmpty(operLog.getStatus()), OperLog::getStatus, operLog.getStatus()) - .eq(StrUtil.isNotBlank(operLog.getType()), OperLog::getType, operLog.getType()) .between(StrUtil.isNotBlank(operLog.getBeginTime()) && StrUtil.isNotBlank(operLog.getEndTime()), OperLog::getOperTime, operLog.getBeginTime(), operLog.getEndTime()) .orderByDesc(OperLog::getId); } @@ -58,7 +57,7 @@ public class OperLogController { } @SysLog("操作日志删除") - @DeleteMapping("/remove/{id:[\\w,]+}") + @DeleteMapping("/remove/{ids:[\\w,]+}") @PreAuthorize("@pms.hasPermission('operLog_del')") public R remove(@PathVariable String[] ids) { operLogService.removeByIds(Arrays.asList(ids)); diff --git a/kicc-ui/src/views/monitor/operLog/index.vue b/kicc-ui/src/views/monitor/operLog/index.vue new file mode 100644 index 00000000..67126a01 --- /dev/null +++ b/kicc-ui/src/views/monitor/operLog/index.vue @@ -0,0 +1,132 @@ + + + diff --git a/kicc-ui/src/views/monitor/operLog/operLog.data.ts b/kicc-ui/src/views/monitor/operLog/operLog.data.ts new file mode 100644 index 00000000..46332ed7 --- /dev/null +++ b/kicc-ui/src/views/monitor/operLog/operLog.data.ts @@ -0,0 +1,104 @@ +/** + * @program: kicc-ui + * @description: 操作日志模块动态渲染配置 + * @author: entfrm开发团队-王翔 + * @create: 2022/4/21 + */ + +import { BasicColumn } from '/@/components/Table'; +import { FormSchema } from '/@/components/Table'; +import { h } from 'vue'; +import { Tag } from 'ant-design-vue'; + +/** 表格列配置 */ +export const columns: BasicColumn[] = [ + { + title: '日志标题', + dataIndex: 'title' + }, + { + title: '请求方式', + dataIndex: 'method' + }, + { + title: '操作人员', + dataIndex: 'operName' + }, + { + title: 'IP地址', + dataIndex: 'operIp' + }, + { + title: '操作地点', + dataIndex: 'operAddr' + }, + { + title: '客户端', + dataIndex: 'clientId' + }, + { + title: '请求时间', + dataIndex: 'executeTime' + }, + { + title: '操作状态', + dataIndex: 'status', + width: 120, + customRender: ({record}) => { + const status = record.status; + const enable = ~~status === 0; + const color = enable ? 'green' : 'red'; + const text = enable ? '正常' : '异常'; + return h(Tag, { color: color }, () => text); + } + }, + { + title: '操作日期', + dataIndex: 'operTime' + } +]; + +/** 搜索表单配置 */ +export const searchFormSchema: FormSchema[] = [ + { + field: 'title', + label: '日志标题', + component: 'Input', + componentProps: { + placeholder: '请输入日志标题' + }, + colProps: { span: 6 } + }, + { + field: 'operName', + label: '操作人员', + component: 'Input', + componentProps: { + placeholder: '请输入操作人员' + }, + colProps: { span: 6 } + }, + { + field: 'status', + label: '操作状态', + component: 'Select', + componentProps: { + options: [ + { label: '正常', value: '0' }, + { label: '异常', value: '1' } + ] + }, + colProps: { span: 6 } + }, + { + field: 'dateRange', + label: '创建时间', + component: 'RangePicker', + componentProps: { + style: { width:'100%' }, + valueFormat: 'YYYY-MM-DD', + placeholder: ['开始日期','结束日期'] + }, + colProps: { span: 6 } + } +]; diff --git a/kicc-ui/src/views/monitor/token/ClientModal.vue b/kicc-ui/src/views/monitor/token/ClientModal.vue new file mode 100644 index 00000000..57a9b0de --- /dev/null +++ b/kicc-ui/src/views/monitor/token/ClientModal.vue @@ -0,0 +1,102 @@ + + diff --git a/kicc-ui/src/views/monitor/token/client.data.ts b/kicc-ui/src/views/monitor/token/client.data.ts new file mode 100644 index 00000000..3667fb86 --- /dev/null +++ b/kicc-ui/src/views/monitor/token/client.data.ts @@ -0,0 +1,164 @@ +/** + * @program: kicc-ui + * @description: 多租户模块动态渲染配置 + * @author: entfrm开发团队-王翔 + * @create: 2022/4/21 + */ + +import { BasicColumn } from '/@/components/Table'; +import { FormSchema } from '/@/components/Table'; + +/** 表格列配置 */ +export const columns: BasicColumn[] = [ + { + title: '客户端Id', + dataIndex: 'clientId', + width: 100 + }, + { + title: '客户端密钥', + dataIndex: 'clientSecret', + width: 100 + }, + { + title: '授权类型', + dataIndex: 'authorizedGrantTypes', + width: 130 + }, + { + title: '授权范围', + dataIndex: 'scope', + width: 90 + }, + { + title: '令牌过期秒数', + dataIndex: 'accessTokenValidity', + width: 130 + }, + { + title: '令牌过期秒数', + dataIndex: 'refreshTokenValidity', + width: 130 + }, + { + title: '创建时间', + dataIndex: 'createTime', + width: 100 + } +]; + +/** 搜索表单配置 */ +export const searchFormSchema: FormSchema[] = [ + { + field: 'clientId', + label: '客户端编码', + component: 'Input', + componentProps: { + placeholder: '请输入客户端编码', + }, + colProps: { span: 8 }, + }, + { + field: 'dateRange', + label: '创建时间', + component: 'RangePicker', + componentProps: { + style: { width:'100%' }, + valueFormat: 'YYYY-MM-DD', + placeholder: ['开始日期','结束日期'] + }, + colProps: { span: 8 } + } +]; + +/** 表单配置 */ +export const formSchema: FormSchema[] = [ + { + field: 'id', + label: 'ID', + component: 'Input', + show: false + }, + { + field: 'clientId', + label: '客户端Id', + component: 'Input', + required: true, + colProps: { + span: 12 + } + }, + { + field: 'clientSecret', + label: '客户端密钥', + component: 'Input', + required: true, + colProps: { + span: 12 + } + }, + { + field: 'authorizedGrantTypes', + label: '授权类型', + component: 'InputTextArea', + required:true, + componentProps: { + rows: 3 + }, + colProps: { + span: 24 + } + }, + { + field: 'scope', + label: '授权范围', + component: 'Input', + required:true, + colProps: { + span: 12 + } + }, + { + field: 'accessTokenValidity', + label: '过期秒数', + component: 'InputNumber', + componentProps: { + style: { width:'100%' }, + min: 0 + }, + colProps: { + span: 12 + } + }, + { + field: 'refreshTokenValidity', + label: '刷新秒数', + component: 'InputNumber', + componentProps: { + style: { width:'100%' }, + min: 0 + }, + colProps: { + span: 12 + } + }, + { + field: 'webServerRedirectUri', + label: '回调地址', + component: 'Input', + colProps: { + span: 12 + } + }, + { + field: 'additionalInformation', + label: '附加说明', + component: 'InputTextArea', + componentProps: { + rows: 6 + }, + colProps: { + span: 24 + } + } +]; diff --git a/kicc-ui/src/views/monitor/token/index.vue b/kicc-ui/src/views/monitor/token/index.vue new file mode 100644 index 00000000..520de351 --- /dev/null +++ b/kicc-ui/src/views/monitor/token/index.vue @@ -0,0 +1,140 @@ + + +