refactor: 调整包结构以便二次开发
This commit is contained in:
valarchie
@@ -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;
|
||||
@@ -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
|
||||
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.agileboot.domain.monitor.dto;
|
||||
package com.agileboot.domain.system.monitor.dto;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
@@ -1,4 +1,4 @@
|
||||
package com.agileboot.domain.monitor.dto;
|
||||
package com.agileboot.domain.system.monitor.dto;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user