From aa0e1f91c587dbe84b77c51840001c8c8dc62581 Mon Sep 17 00:00:00 2001 From: valarchie <343928303@qq.com> Date: Sat, 5 Aug 2023 14:33:08 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E8=B0=83=E6=95=B4=E5=8C=85?= =?UTF-8?q?=E7=BB=93=E6=9E=84=E4=BB=A5=E4=BE=BF=E4=BA=8C=E6=AC=A1=E5=BC=80?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{monitor => system}/MonitorController.java | 10 +++++----- agileboot-admin/src/main/resources/application.yml | 9 +++------ .../com/agileboot/domain/system/menu/dto/MenuDTO.java | 6 +++++- .../monitor/MonitorApplicationService.java | 10 +++++----- .../domain/{ => system}/monitor/dto/CpuInfo.java | 2 +- .../domain/{ => system}/monitor/dto/DiskInfo.java | 2 +- .../domain/{ => system}/monitor/dto/JvmInfo.java | 2 +- .../domain/{ => system}/monitor/dto/MemoryInfo.java | 2 +- .../domain/{ => system}/monitor/dto/OnlineUserDTO.java | 2 +- .../{ => system}/monitor/dto/RedisCacheInfoDTO.java | 2 +- .../domain/{ => system}/monitor/dto/ServerInfo.java | 2 +- .../domain/{ => system}/monitor/dto/SystemInfo.java | 2 +- .../domain/system/monitor/dto/ServerInfoTest.java | 1 - sql/agileboot-pure-20230722.sql | 8 ++++---- 14 files changed, 30 insertions(+), 30 deletions(-) rename agileboot-admin/src/main/java/com/agileboot/admin/controller/{monitor => system}/MonitorController.java (90%) rename agileboot-domain/src/main/java/com/agileboot/domain/{ => system}/monitor/MonitorApplicationService.java (90%) rename agileboot-domain/src/main/java/com/agileboot/domain/{ => system}/monitor/dto/CpuInfo.java (95%) rename agileboot-domain/src/main/java/com/agileboot/domain/{ => system}/monitor/dto/DiskInfo.java (92%) rename agileboot-domain/src/main/java/com/agileboot/domain/{ => system}/monitor/dto/JvmInfo.java (97%) rename agileboot-domain/src/main/java/com/agileboot/domain/{ => system}/monitor/dto/MemoryInfo.java (93%) rename agileboot-domain/src/main/java/com/agileboot/domain/{ => system}/monitor/dto/OnlineUserDTO.java (96%) rename agileboot-domain/src/main/java/com/agileboot/domain/{ => system}/monitor/dto/RedisCacheInfoDTO.java (88%) rename agileboot-domain/src/main/java/com/agileboot/domain/{ => system}/monitor/dto/ServerInfo.java (99%) rename agileboot-domain/src/main/java/com/agileboot/domain/{ => system}/monitor/dto/SystemInfo.java (89%) diff --git a/agileboot-admin/src/main/java/com/agileboot/admin/controller/monitor/MonitorController.java b/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/MonitorController.java similarity index 90% rename from agileboot-admin/src/main/java/com/agileboot/admin/controller/monitor/MonitorController.java rename to agileboot-admin/src/main/java/com/agileboot/admin/controller/system/MonitorController.java index d3f19ce..af40b98 100644 --- a/agileboot-admin/src/main/java/com/agileboot/admin/controller/monitor/MonitorController.java +++ b/agileboot-admin/src/main/java/com/agileboot/admin/controller/system/MonitorController.java @@ -1,13 +1,13 @@ -package com.agileboot.admin.controller.monitor; +package com.agileboot.admin.controller.system; import com.agileboot.common.core.base.BaseController; import com.agileboot.common.core.dto.ResponseDTO; import com.agileboot.common.core.page.PageDTO; import com.agileboot.domain.common.cache.CacheCenter; -import com.agileboot.domain.monitor.MonitorApplicationService; -import com.agileboot.domain.monitor.dto.OnlineUserDTO; -import com.agileboot.domain.monitor.dto.RedisCacheInfoDTO; -import com.agileboot.domain.monitor.dto.ServerInfo; +import com.agileboot.domain.system.monitor.MonitorApplicationService; +import com.agileboot.domain.system.monitor.dto.OnlineUserDTO; +import com.agileboot.domain.system.monitor.dto.RedisCacheInfoDTO; +import com.agileboot.domain.system.monitor.dto.ServerInfo; import com.agileboot.infrastructure.annotations.accessLog.AccessLog; import com.agileboot.orm.common.enums.BusinessTypeEnum; import io.swagger.v3.oas.annotations.Operation; diff --git a/agileboot-admin/src/main/resources/application.yml b/agileboot-admin/src/main/resources/application.yml index 4442fa9..d767094 100644 --- a/agileboot-admin/src/main/resources/application.yml +++ b/agileboot-admin/src/main/resources/application.yml @@ -38,12 +38,9 @@ springdoc: groups: enabled: true group-configs: - - group: '公共管理API' + - group: '公共API' packages-to-scan: com.agileboot.admin.controller.common - - group: '监控管理API' - packages-to-scan: com.agileboot.admin.controller.monitor - - group: '系统管理API' + - group: '内置系统API' packages-to-scan: com.agileboot.admin.controller.system - - group: '工具管理API' - packages-to-scan: com.agileboot.admin.controller.tool + diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/dto/MenuDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/dto/MenuDTO.java index e20b89b..cab461d 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/dto/MenuDTO.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/dto/MenuDTO.java @@ -36,7 +36,9 @@ public class MenuDTO { } if (StrUtil.isNotEmpty(entity.getMetaInfo()) && JacksonUtil.isJson(entity.getMetaInfo())) { - this.rank = JacksonUtil.from(entity.getMetaInfo(), MetaDTO.class).getRank(); + MetaDTO meta = JacksonUtil.from(entity.getMetaInfo(), MetaDTO.class); + this.rank = meta.getRank(); + this.icon = meta.getIcon(); } this.createTime = entity.getCreateTime(); } @@ -67,6 +69,8 @@ public class MenuDTO { private Date createTime; + private String icon; + } diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/monitor/MonitorApplicationService.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/monitor/MonitorApplicationService.java similarity index 90% rename from agileboot-domain/src/main/java/com/agileboot/domain/monitor/MonitorApplicationService.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/monitor/MonitorApplicationService.java index ab72205..56f0e0c 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/monitor/MonitorApplicationService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/monitor/MonitorApplicationService.java @@ -1,13 +1,13 @@ -package com.agileboot.domain.monitor; +package com.agileboot.domain.system.monitor; import cn.hutool.core.util.StrUtil; import com.agileboot.common.exception.ApiException; import com.agileboot.common.exception.error.ErrorCode.Internal; import com.agileboot.domain.common.cache.CacheCenter; -import com.agileboot.domain.monitor.dto.OnlineUserDTO; -import com.agileboot.domain.monitor.dto.RedisCacheInfoDTO; -import com.agileboot.domain.monitor.dto.RedisCacheInfoDTO.CommandStatusDTO; -import com.agileboot.domain.monitor.dto.ServerInfo; +import com.agileboot.domain.system.monitor.dto.OnlineUserDTO; +import com.agileboot.domain.system.monitor.dto.RedisCacheInfoDTO; +import com.agileboot.domain.system.monitor.dto.RedisCacheInfoDTO.CommandStatusDTO; +import com.agileboot.domain.system.monitor.dto.ServerInfo; import com.agileboot.infrastructure.cache.redis.CacheKeyEnum; import java.util.ArrayList; import java.util.Collection; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/monitor/dto/CpuInfo.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/monitor/dto/CpuInfo.java similarity index 95% rename from agileboot-domain/src/main/java/com/agileboot/domain/monitor/dto/CpuInfo.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/monitor/dto/CpuInfo.java index d2e20d4..eda6f6d 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/monitor/dto/CpuInfo.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/monitor/dto/CpuInfo.java @@ -1,4 +1,4 @@ -package com.agileboot.domain.monitor.dto; +package com.agileboot.domain.system.monitor.dto; import cn.hutool.core.util.NumberUtil; import lombok.Data; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/monitor/dto/DiskInfo.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/monitor/dto/DiskInfo.java similarity index 92% rename from agileboot-domain/src/main/java/com/agileboot/domain/monitor/dto/DiskInfo.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/monitor/dto/DiskInfo.java index f04ca4c..bd988a7 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/monitor/dto/DiskInfo.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/monitor/dto/DiskInfo.java @@ -1,4 +1,4 @@ -package com.agileboot.domain.monitor.dto; +package com.agileboot.domain.system.monitor.dto; import lombok.Data; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/monitor/dto/JvmInfo.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/monitor/dto/JvmInfo.java similarity index 97% rename from agileboot-domain/src/main/java/com/agileboot/domain/monitor/dto/JvmInfo.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/monitor/dto/JvmInfo.java index 85dba11..78baff3 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/monitor/dto/JvmInfo.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/monitor/dto/JvmInfo.java @@ -1,4 +1,4 @@ -package com.agileboot.domain.monitor.dto; +package com.agileboot.domain.system.monitor.dto; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/monitor/dto/MemoryInfo.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/monitor/dto/MemoryInfo.java similarity index 93% rename from agileboot-domain/src/main/java/com/agileboot/domain/monitor/dto/MemoryInfo.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/monitor/dto/MemoryInfo.java index dd8d97c..baa62b6 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/monitor/dto/MemoryInfo.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/monitor/dto/MemoryInfo.java @@ -1,4 +1,4 @@ -package com.agileboot.domain.monitor.dto; +package com.agileboot.domain.system.monitor.dto; import cn.hutool.core.util.NumberUtil; import com.agileboot.common.constant.Constants; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/monitor/dto/OnlineUserDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/monitor/dto/OnlineUserDTO.java similarity index 96% rename from agileboot-domain/src/main/java/com/agileboot/domain/monitor/dto/OnlineUserDTO.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/monitor/dto/OnlineUserDTO.java index cf29f5b..f6dece0 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/monitor/dto/OnlineUserDTO.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/monitor/dto/OnlineUserDTO.java @@ -1,4 +1,4 @@ -package com.agileboot.domain.monitor.dto; +package com.agileboot.domain.system.monitor.dto; import com.agileboot.domain.common.cache.CacheCenter; import com.agileboot.infrastructure.user.web.SystemLoginUser; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/monitor/dto/RedisCacheInfoDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/monitor/dto/RedisCacheInfoDTO.java similarity index 88% rename from agileboot-domain/src/main/java/com/agileboot/domain/monitor/dto/RedisCacheInfoDTO.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/monitor/dto/RedisCacheInfoDTO.java index a1f33e2..d5e7b51 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/monitor/dto/RedisCacheInfoDTO.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/monitor/dto/RedisCacheInfoDTO.java @@ -1,4 +1,4 @@ -package com.agileboot.domain.monitor.dto; +package com.agileboot.domain.system.monitor.dto; import java.util.List; import java.util.Properties; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/monitor/dto/ServerInfo.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/monitor/dto/ServerInfo.java similarity index 99% rename from agileboot-domain/src/main/java/com/agileboot/domain/monitor/dto/ServerInfo.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/monitor/dto/ServerInfo.java index 824c4cd..baf1678 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/monitor/dto/ServerInfo.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/monitor/dto/ServerInfo.java @@ -1,4 +1,4 @@ -package com.agileboot.domain.monitor.dto; +package com.agileboot.domain.system.monitor.dto; import cn.hutool.core.net.NetUtil; import cn.hutool.core.util.NumberUtil; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/monitor/dto/SystemInfo.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/monitor/dto/SystemInfo.java similarity index 89% rename from agileboot-domain/src/main/java/com/agileboot/domain/monitor/dto/SystemInfo.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/monitor/dto/SystemInfo.java index 8418a5d..61d3918 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/monitor/dto/SystemInfo.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/monitor/dto/SystemInfo.java @@ -1,4 +1,4 @@ -package com.agileboot.domain.monitor.dto; +package com.agileboot.domain.system.monitor.dto; import lombok.Data; diff --git a/agileboot-domain/src/test/java/com/agileboot/domain/system/monitor/dto/ServerInfoTest.java b/agileboot-domain/src/test/java/com/agileboot/domain/system/monitor/dto/ServerInfoTest.java index b481c4d..10386a5 100644 --- a/agileboot-domain/src/test/java/com/agileboot/domain/system/monitor/dto/ServerInfoTest.java +++ b/agileboot-domain/src/test/java/com/agileboot/domain/system/monitor/dto/ServerInfoTest.java @@ -1,6 +1,5 @@ package com.agileboot.domain.system.monitor.dto; -import com.agileboot.domain.monitor.dto.ServerInfo; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/sql/agileboot-pure-20230722.sql b/sql/agileboot-pure-20230722.sql index 327a1e4..b39669b 100644 --- a/sql/agileboot-pure-20230722.sql +++ b/sql/agileboot-pure-20230722.sql @@ -421,7 +421,7 @@ create table sys_user role_id bigint null comment '角色id', dept_id bigint null comment '部门ID', username varchar(64) not null comment '用户账号', - nick_name varchar(32) not null comment '用户昵称', + nickname varchar(32) not null comment '用户昵称', user_type smallint default 0 null comment '用户类型（00系统用户）', email varchar(128) default '' null comment '用户邮箱', phone_number varchar(18) default '' null comment '手机号码', @@ -441,7 +441,7 @@ create table sys_user ) comment '用户信息表'; -INSERT INTO sys_user (user_id, post_id, role_id, dept_id, username, nick_name, user_type, email, phone_number, sex, avatar, password, status, login_ip, login_date, is_admin, creator_id, create_time, updater_id, update_time, remark, deleted) VALUES (1, 1, 1, 4, 'admin', 'valarchie1', 0, 'agileboot@163.com', '15888888889', 0, '', '$2a$10$rb1wRoEIkLbIknREEN1LH.FGs4g0oOS5t6l5LQ793nRaFO.SPHDHy', 1, '127.0.0.1', '2023-07-22 15:38:53', 1, null, '2022-05-21 08:30:54', 1, '2023-07-22 15:38:53', '管理员', 0); -INSERT INTO sys_user (user_id, post_id, role_id, dept_id, username, nick_name, user_type, email, phone_number, sex, avatar, password, status, login_ip, login_date, is_admin, creator_id, create_time, updater_id, update_time, remark, deleted) VALUES (2, 2, 2, 5, 'ag1', 'valarchie2', 0, 'agileboot1@qq.com', '15666666666', 1, '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', 1, '127.0.0.1', '2022-05-21 08:30:54', 0, null, '2022-05-21 08:30:54', null, null, '测试员1', 0); -INSERT INTO sys_user (user_id, post_id, role_id, dept_id, username, nick_name, user_type, email, phone_number, sex, avatar, password, status, login_ip, login_date, is_admin, creator_id, create_time, updater_id, update_time, remark, deleted) VALUES (3, 2, 0, 5, 'ag2', 'valarchie3', 0, 'agileboot2@qq.com', '15666666667', 1, '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', 1, '127.0.0.1', '2022-05-21 08:30:54', 0, null, '2022-05-21 08:30:54', null, null, '测试员2', 0); +INSERT INTO sys_user (user_id, post_id, role_id, dept_id, username, nickname, user_type, email, phone_number, sex, avatar, password, status, login_ip, login_date, is_admin, creator_id, create_time, updater_id, update_time, remark, deleted) VALUES (1, 1, 1, 4, 'admin', 'valarchie1', 0, 'agileboot@163.com', '15888888889', 0, '', '$2a$10$rb1wRoEIkLbIknREEN1LH.FGs4g0oOS5t6l5LQ793nRaFO.SPHDHy', 1, '127.0.0.1', '2023-07-22 15:38:53', 1, null, '2022-05-21 08:30:54', 1, '2023-07-22 15:38:53', '管理员', 0); +INSERT INTO sys_user (user_id, post_id, role_id, dept_id, username, nickname, user_type, email, phone_number, sex, avatar, password, status, login_ip, login_date, is_admin, creator_id, create_time, updater_id, update_time, remark, deleted) VALUES (2, 2, 2, 5, 'ag1', 'valarchie2', 0, 'agileboot1@qq.com', '15666666666', 1, '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', 1, '127.0.0.1', '2022-05-21 08:30:54', 0, null, '2022-05-21 08:30:54', null, null, '测试员1', 0); +INSERT INTO sys_user (user_id, post_id, role_id, dept_id, username, nickname, user_type, email, phone_number, sex, avatar, password, status, login_ip, login_date, is_admin, creator_id, create_time, updater_id, update_time, remark, deleted) VALUES (3, 2, 0, 5, 'ag2', 'valarchie3', 0, 'agileboot2@qq.com', '15666666667', 1, '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', 1, '127.0.0.1', '2022-05-21 08:30:54', 0, null, '2022-05-21 08:30:54', null, null, '测试员2', 0);