wol/AgileBoot-Back-End
2
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor: 将orm包中的common类挪到common模块

Browse Source
This commit is contained in:
valarchie
2023-08-14 20:44:09 +08:00
parent 01afc4505f
commit 5f31b9c27e
67 changed files with 118 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
agileboot-admin/src/main/java/com/agileboot/admin/controller/system/MonitorController.java
View File

@@ -9,7 +9,7 @@ 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.admin.customize.aop.accessLog.AccessLog;
import com.agileboot.orm.common.enums.BusinessTypeEnum;
import com.agileboot.common.enums.common.BusinessTypeEnum;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import java.util.List;

2
agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysConfigController.java
View File

@@ -9,7 +9,7 @@ import com.agileboot.domain.system.config.command.ConfigUpdateCommand;
import com.agileboot.domain.system.config.dto.ConfigDTO;
import com.agileboot.domain.system.config.query.ConfigQuery;
import com.agileboot.admin.customize.aop.accessLog.AccessLog;
import com.agileboot.orm.common.enums.BusinessTypeEnum;
import com.agileboot.common.enums.common.BusinessTypeEnum;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import javax.validation.constraints.NotNull;

2
agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysDeptController.java
View File

@@ -9,7 +9,7 @@ import com.agileboot.domain.system.dept.command.UpdateDeptCommand;
import com.agileboot.domain.system.dept.dto.DeptDTO;
import com.agileboot.domain.system.dept.query.DeptQuery;
import com.agileboot.admin.customize.aop.accessLog.AccessLog;
import com.agileboot.orm.common.enums.BusinessTypeEnum;
import com.agileboot.common.enums.common.BusinessTypeEnum;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import java.util.List;

2
agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysLogsController.java
View File

@@ -12,7 +12,7 @@ import com.agileboot.domain.system.log.query.LoginLogQuery;
import com.agileboot.domain.system.log.dto.OperationLogDTO;
import com.agileboot.domain.system.log.dto.OperationLogQuery;
import com.agileboot.admin.customize.aop.accessLog.AccessLog;
import com.agileboot.orm.common.enums.BusinessTypeEnum;
import com.agileboot.common.enums.common.BusinessTypeEnum;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import java.util.List;

2
agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysMenuController.java
View File

@@ -12,7 +12,7 @@ import com.agileboot.domain.system.menu.query.MenuQuery;
import com.agileboot.admin.customize.aop.accessLog.AccessLog;
import com.agileboot.infrastructure.user.AuthenticationUtils;
import com.agileboot.infrastructure.user.web.SystemLoginUser;
import com.agileboot.orm.common.enums.BusinessTypeEnum;
import com.agileboot.common.enums.common.BusinessTypeEnum;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import java.util.List;

2
agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysNoticeController.java
View File

@@ -12,7 +12,7 @@ import com.agileboot.domain.system.notice.query.NoticeQuery;
import com.agileboot.admin.customize.aop.accessLog.AccessLog;
import com.agileboot.infrastructure.annotations.unrepeatable.Unrepeatable;
import com.agileboot.infrastructure.annotations.unrepeatable.Unrepeatable.CheckType;
import com.agileboot.orm.common.enums.BusinessTypeEnum;
import com.agileboot.common.enums.common.BusinessTypeEnum;
import com.baomidou.dynamic.datasource.annotation.DS;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;

2
agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysPostController.java
View File

@@ -11,7 +11,7 @@ import com.agileboot.domain.system.post.command.UpdatePostCommand;
import com.agileboot.domain.system.post.dto.PostDTO;
import com.agileboot.domain.system.post.query.PostQuery;
import com.agileboot.admin.customize.aop.accessLog.AccessLog;
import com.agileboot.orm.common.enums.BusinessTypeEnum;
import com.agileboot.common.enums.common.BusinessTypeEnum;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import java.util.List;

2
agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysProfileController.java
View File

@@ -15,7 +15,7 @@ import com.agileboot.domain.system.user.dto.UserProfileDTO;
import com.agileboot.admin.customize.aop.accessLog.AccessLog;
import com.agileboot.infrastructure.user.AuthenticationUtils;
import com.agileboot.infrastructure.user.web.SystemLoginUser;
import com.agileboot.orm.common.enums.BusinessTypeEnum;
import com.agileboot.common.enums.common.BusinessTypeEnum;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.NonNull;

2
agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysRoleController.java
View File

@@ -15,7 +15,7 @@ import com.agileboot.domain.system.role.query.RoleQuery;
import com.agileboot.domain.system.role.query.UnallocatedRoleQuery;
import com.agileboot.domain.system.user.dto.UserDTO;
import com.agileboot.admin.customize.aop.accessLog.AccessLog;
import com.agileboot.orm.common.enums.BusinessTypeEnum;
import com.agileboot.common.enums.common.BusinessTypeEnum;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import java.util.List;

2
agileboot-admin/src/main/java/com/agileboot/admin/controller/system/SysUserController.java
View File

@@ -17,7 +17,7 @@ import com.agileboot.domain.system.user.query.SearchUserQuery;
import com.agileboot.admin.customize.aop.accessLog.AccessLog;
import com.agileboot.infrastructure.user.AuthenticationUtils;
import com.agileboot.infrastructure.user.web.SystemLoginUser;
import com.agileboot.orm.common.enums.BusinessTypeEnum;
import com.agileboot.common.enums.common.BusinessTypeEnum;
import com.agileboot.orm.system.result.SearchUserDO;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;

4
agileboot-admin/src/main/java/com/agileboot/admin/customize/aop/accessLog/AccessLog.java
View File

@@ -1,7 +1,7 @@
package com.agileboot.admin.customize.aop.accessLog;
import com.agileboot.orm.common.enums.BusinessTypeEnum;
import com.agileboot.orm.common.enums.OperatorTypeEnum;
import com.agileboot.common.enums.common.BusinessTypeEnum;
import com.agileboot.common.enums.common.OperatorTypeEnum;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;

6
agileboot-admin/src/main/java/com/agileboot/admin/customize/aop/accessLog/OperationLogModel.java
View File

@@ -8,9 +8,9 @@ import cn.hutool.json.JSONUtil;
import com.agileboot.common.utils.ServletHolderUtil;
import com.agileboot.infrastructure.user.AuthenticationUtils;
import com.agileboot.infrastructure.user.web.SystemLoginUser;
import com.agileboot.orm.common.enums.OperationStatusEnum;
import com.agileboot.orm.common.enums.RequestMethodEnum;
import com.agileboot.orm.common.enums.util.BasicEnumUtil;
import com.agileboot.common.enums.common.OperationStatusEnum;
import com.agileboot.common.enums.common.RequestMethodEnum;
import com.agileboot.common.enums.BasicEnumUtil;
import com.agileboot.orm.system.entity.SysOperationLogEntity;
import lombok.extern.slf4j.Slf4j;
import org.aspectj.lang.JoinPoint;

2
agileboot-admin/src/main/java/com/agileboot/admin/customize/async/AsyncTaskFactory.java
View File

@@ -5,7 +5,7 @@ import cn.hutool.extra.servlet.ServletUtil;
import cn.hutool.extra.spring.SpringUtil;
import com.agileboot.common.utils.ServletHolderUtil;
import com.agileboot.common.utils.ip.IpRegionUtil;
import com.agileboot.orm.common.enums.LoginStatusEnum;
import com.agileboot.common.enums.common.LoginStatusEnum;
import com.agileboot.orm.system.entity.SysLoginInfoEntity;
import com.agileboot.orm.system.entity.SysOperationLogEntity;
import com.agileboot.orm.system.service.ISysLoginInfoService;

2
agileboot-admin/src/main/java/com/agileboot/admin/customize/config/SecurityConfig.java
View File

@@ -11,7 +11,7 @@ import com.agileboot.admin.customize.async.AsyncTaskFactory;
import com.agileboot.infrastructure.thread.ThreadPoolManager;
import com.agileboot.infrastructure.user.web.SystemLoginUser;
import com.agileboot.admin.customize.service.login.TokenService;
import com.agileboot.orm.common.enums.LoginStatusEnum;
import com.agileboot.common.enums.common.LoginStatusEnum;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Bean;

4
agileboot-admin/src/main/java/com/agileboot/admin/customize/service/login/LoginService.java
View File

@@ -26,8 +26,8 @@ import com.agileboot.admin.customize.service.login.dto.CaptchaDTO;
import com.agileboot.admin.customize.service.login.dto.ConfigDTO;
import com.agileboot.admin.customize.service.login.command.LoginCommand;
import com.agileboot.infrastructure.user.web.SystemLoginUser;
import com.agileboot.orm.common.enums.ConfigKeyEnum;
import com.agileboot.orm.common.enums.LoginStatusEnum;
import com.agileboot.common.enums.common.ConfigKeyEnum;
import com.agileboot.common.enums.common.LoginStatusEnum;
import com.agileboot.orm.system.entity.SysUserEntity;
import com.google.code.kaptcha.Producer;
import java.awt.image.BufferedImage;

4
agileboot-admin/src/main/java/com/agileboot/admin/customize/service/login/UserDetailsServiceImpl.java
View File

@@ -7,8 +7,8 @@ import com.agileboot.common.exception.error.ErrorCode;
import com.agileboot.infrastructure.user.web.SystemLoginUser;
import com.agileboot.infrastructure.user.web.RoleInfo;
import com.agileboot.infrastructure.user.web.DataScopeEnum;
import com.agileboot.orm.common.enums.UserStatusEnum;
import com.agileboot.orm.common.enums.util.BasicEnumUtil;
import com.agileboot.common.enums.common.UserStatusEnum;
import com.agileboot.common.enums.BasicEnumUtil;
import com.agileboot.orm.system.entity.SysMenuEntity;
import com.agileboot.orm.system.entity.SysRoleEntity;
import com.agileboot.orm.system.entity.SysUserEntity;

2
agileboot-admin/src/main/java/com/agileboot/admin/customize/service/login/dto/ConfigDTO.java
View File

@@ -1,6 +1,6 @@
package com.agileboot.admin.customize.service.login.dto;
import com.agileboot.orm.common.dto.DictionaryData;
import com.agileboot.common.enums.dictionary.DictionaryData;
import java.util.List;
import java.util.Map;
import lombok.Data;

2
agileboot-orm/src/main/java/com/agileboot/orm/common/query/AbstractPageQuery.java → agileboot-common/src/main/java/com/agileboot/common/core/page/AbstractPageQuery.java
View File

@@ -1,4 +1,4 @@
package com.agileboot.orm.common.query;
package com.agileboot.common.core.page;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.Data;

2
agileboot-orm/src/main/java/com/agileboot/orm/common/query/AbstractQuery.java → agileboot-common/src/main/java/com/agileboot/common/core/page/AbstractQuery.java
View File

@@ -1,4 +1,4 @@
package com.agileboot.orm.common.query;
package com.agileboot.common.core.page;
import cn.hutool.core.util.StrUtil;
import com.agileboot.common.utils.time.DatePickUtil;

2
agileboot-orm/src/main/java/com/agileboot/orm/common/enums/util/BasicEnumUtil.java → agileboot-common/src/main/java/com/agileboot/common/enums/BasicEnumUtil.java
View File

@@ -1,4 +1,4 @@
package com.agileboot.orm.common.enums.util;
package com.agileboot.common.enums;
import cn.hutool.core.convert.Convert;
import com.agileboot.common.exception.ApiException;

6
agileboot-orm/src/main/java/com/agileboot/orm/common/enums/BusinessTypeEnum.java → agileboot-common/src/main/java/com/agileboot/common/enums/common/BusinessTypeEnum.java
View File

@@ -1,7 +1,7 @@
package com.agileboot.orm.common.enums;
package com.agileboot.common.enums.common;
import com.agileboot.orm.common.CssTag;
import com.agileboot.orm.common.annotations.Dictionary;
import com.agileboot.common.enums.dictionary.CssTag;
import com.agileboot.common.enums.dictionary.Dictionary;
import com.agileboot.common.enums.DictionaryEnum;
/**

2
agileboot-orm/src/main/java/com/agileboot/orm/common/enums/ConfigKeyEnum.java → agileboot-common/src/main/java/com/agileboot/common/enums/common/ConfigKeyEnum.java
View File

@@ -1,4 +1,4 @@
package com.agileboot.orm.common.enums;
package com.agileboot.common.enums.common;
import com.agileboot.common.enums.BasicEnum;

6
agileboot-orm/src/main/java/com/agileboot/orm/common/enums/GenderEnum.java → agileboot-common/src/main/java/com/agileboot/common/enums/common/GenderEnum.java
View File

@@ -1,7 +1,7 @@
package com.agileboot.orm.common.enums;
package com.agileboot.common.enums.common;
import com.agileboot.orm.common.CssTag;
import com.agileboot.orm.common.annotations.Dictionary;
import com.agileboot.common.enums.dictionary.CssTag;
import com.agileboot.common.enums.dictionary.Dictionary;
import com.agileboot.common.enums.DictionaryEnum;
/**

6
agileboot-orm/src/main/java/com/agileboot/orm/common/enums/LoginStatusEnum.java → agileboot-common/src/main/java/com/agileboot/common/enums/common/LoginStatusEnum.java
View File

@@ -1,7 +1,7 @@
package com.agileboot.orm.common.enums;
package com.agileboot.common.enums.common;
import com.agileboot.orm.common.CssTag;
import com.agileboot.orm.common.annotations.Dictionary;
import com.agileboot.common.enums.dictionary.CssTag;
import com.agileboot.common.enums.dictionary.Dictionary;
import com.agileboot.common.enums.DictionaryEnum;
/**

2
agileboot-orm/src/main/java/com/agileboot/orm/common/enums/MenuComponentEnum.java → agileboot-common/src/main/java/com/agileboot/common/enums/common/MenuComponentEnum.java
View File

@@ -1,4 +1,4 @@
package com.agileboot.orm.common.enums;
package com.agileboot.common.enums.common;
import com.agileboot.common.enums.BasicEnum;

2
agileboot-orm/src/main/java/com/agileboot/orm/common/enums/MenuTypeEnum.java → agileboot-common/src/main/java/com/agileboot/common/enums/common/MenuTypeEnum.java
View File

@@ -1,4 +1,4 @@
package com.agileboot.orm.common.enums;
package com.agileboot.common.enums.common;
import com.agileboot.common.enums.BasicEnum;

6
agileboot-orm/src/main/java/com/agileboot/orm/common/enums/NoticeStatusEnum.java → agileboot-common/src/main/java/com/agileboot/common/enums/common/NoticeStatusEnum.java
View File

@@ -1,7 +1,7 @@
package com.agileboot.orm.common.enums;
package com.agileboot.common.enums.common;
import com.agileboot.orm.common.CssTag;
import com.agileboot.orm.common.annotations.Dictionary;
import com.agileboot.common.enums.dictionary.CssTag;
import com.agileboot.common.enums.dictionary.Dictionary;
import com.agileboot.common.enums.DictionaryEnum;
/**

6
agileboot-orm/src/main/java/com/agileboot/orm/common/enums/NoticeTypeEnum.java → agileboot-common/src/main/java/com/agileboot/common/enums/common/NoticeTypeEnum.java
View File

@@ -1,7 +1,7 @@
package com.agileboot.orm.common.enums;
package com.agileboot.common.enums.common;
import com.agileboot.orm.common.CssTag;
import com.agileboot.orm.common.annotations.Dictionary;
import com.agileboot.common.enums.dictionary.CssTag;
import com.agileboot.common.enums.dictionary.Dictionary;
import com.agileboot.common.enums.DictionaryEnum;
/**

6
agileboot-orm/src/main/java/com/agileboot/orm/common/enums/OperationStatusEnum.java → agileboot-common/src/main/java/com/agileboot/common/enums/common/OperationStatusEnum.java
View File

@@ -1,7 +1,7 @@
package com.agileboot.orm.common.enums;
package com.agileboot.common.enums.common;
import com.agileboot.orm.common.CssTag;
import com.agileboot.orm.common.annotations.Dictionary;
import com.agileboot.common.enums.dictionary.CssTag;
import com.agileboot.common.enums.dictionary.Dictionary;
import com.agileboot.common.enums.DictionaryEnum;
/**

4
agileboot-orm/src/main/java/com/agileboot/orm/common/enums/OperatorTypeEnum.java → agileboot-common/src/main/java/com/agileboot/common/enums/common/OperatorTypeEnum.java
View File

@@ -1,6 +1,6 @@
package com.agileboot.orm.common.enums;
package com.agileboot.common.enums.common;
import com.agileboot.orm.common.annotations.Dictionary;
import com.agileboot.common.enums.dictionary.Dictionary;
import com.agileboot.common.enums.BasicEnum;
/**

2
agileboot-orm/src/main/java/com/agileboot/orm/common/enums/RequestMethodEnum.java → agileboot-common/src/main/java/com/agileboot/common/enums/common/RequestMethodEnum.java
View File

@@ -1,4 +1,4 @@
package com.agileboot.orm.common.enums;
package com.agileboot.common.enums.common;
import com.agileboot.common.enums.BasicEnum;

6
agileboot-orm/src/main/java/com/agileboot/orm/common/enums/StatusEnum.java → agileboot-common/src/main/java/com/agileboot/common/enums/common/StatusEnum.java
View File

@@ -1,7 +1,7 @@
package com.agileboot.orm.common.enums;
package com.agileboot.common.enums.common;
import com.agileboot.orm.common.CssTag;
import com.agileboot.orm.common.annotations.Dictionary;
import com.agileboot.common.enums.dictionary.CssTag;
import com.agileboot.common.enums.dictionary.Dictionary;
import com.agileboot.common.enums.DictionaryEnum;
/**

6
agileboot-orm/src/main/java/com/agileboot/orm/common/enums/UserStatusEnum.java → agileboot-common/src/main/java/com/agileboot/common/enums/common/UserStatusEnum.java
View File

@@ -1,7 +1,7 @@
package com.agileboot.orm.common.enums;
package com.agileboot.common.enums.common;
import com.agileboot.orm.common.CssTag;
import com.agileboot.orm.common.annotations.Dictionary;
import com.agileboot.common.enums.dictionary.CssTag;
import com.agileboot.common.enums.dictionary.Dictionary;
import com.agileboot.common.enums.DictionaryEnum;
/**

6
agileboot-orm/src/main/java/com/agileboot/orm/common/enums/VisibleStatusEnum.java → agileboot-common/src/main/java/com/agileboot/common/enums/common/VisibleStatusEnum.java
View File

@@ -1,7 +1,7 @@
package com.agileboot.orm.common.enums;
package com.agileboot.common.enums.common;
import com.agileboot.orm.common.CssTag;
import com.agileboot.orm.common.annotations.Dictionary;
import com.agileboot.common.enums.dictionary.CssTag;
import com.agileboot.common.enums.dictionary.Dictionary;
import com.agileboot.common.enums.DictionaryEnum;
/**

6
agileboot-orm/src/main/java/com/agileboot/orm/common/enums/YesOrNoEnum.java → agileboot-common/src/main/java/com/agileboot/common/enums/common/YesOrNoEnum.java
View File

@@ -1,8 +1,8 @@
package com.agileboot.orm.common.enums;
package com.agileboot.common.enums.common;
import com.agileboot.orm.common.CssTag;
import com.agileboot.orm.common.annotations.Dictionary;
import com.agileboot.common.enums.DictionaryEnum;
import com.agileboot.common.enums.dictionary.CssTag;
import com.agileboot.common.enums.dictionary.Dictionary;
/**
* 系统内代表是与否的枚举

2
agileboot-orm/src/main/java/com/agileboot/orm/common/CssTag.java → agileboot-common/src/main/java/com/agileboot/common/enums/dictionary/CssTag.java
View File

@@ -1,4 +1,4 @@
package com.agileboot.orm.common;
package com.agileboot.common.enums.dictionary;
/**
* Css 样式

2
agileboot-orm/src/main/java/com/agileboot/orm/common/annotations/Dictionary.java → agileboot-common/src/main/java/com/agileboot/common/enums/dictionary/Dictionary.java
View File

@@ -1,4 +1,4 @@
package com.agileboot.orm.common.annotations;
package com.agileboot.common.enums.dictionary;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;

2
agileboot-orm/src/main/java/com/agileboot/orm/common/dto/DictionaryData.java → agileboot-common/src/main/java/com/agileboot/common/enums/dictionary/DictionaryData.java
View File

@@ -1,4 +1,4 @@
package com.agileboot.orm.common.dto;
package com.agileboot.common.enums.dictionary;
import com.agileboot.common.enums.DictionaryEnum;
import lombok.Data;

5
agileboot-infrastructure/src/test/java/com/agileboot/orm/enums/interfaces/BasicEnumUtilTest.java → agileboot-common/src/test/java/com/agileboot/common/enums/BasicEnumUtilTest.java
View File

@@ -1,8 +1,7 @@
package com.agileboot.orm.enums.interfaces;
package com.agileboot.common.enums;
import com.agileboot.orm.common.enums.YesOrNoEnum;
import com.agileboot.orm.common.enums.util.BasicEnumUtil;
import com.agileboot.common.enums.common.YesOrNoEnum;
import org.junit.Assert;
import org.junit.Test;

4
agileboot-infrastructure/src/test/java/com/agileboot/orm/query/AbstractQueryTest.java → agileboot-common/src/test/java/com/agileboot/common/query/AbstractQueryTest.java
View File

@@ -1,7 +1,7 @@
package com.agileboot.orm.query;
package com.agileboot.common.query;
import com.agileboot.orm.common.query.AbstractQuery;
import com.agileboot.common.core.page.AbstractQuery;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import java.util.Date;
import org.junit.jupiter.api.Assertions;

15
agileboot-domain/src/main/java/com/agileboot/domain/common/cache/MapCache.java vendored
View File

@@ -3,10 +3,19 @@ package com.agileboot.domain.common.cache;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.ArrayUtil;
import com.agileboot.orm.common.annotations.Dictionary;
import com.agileboot.orm.common.enums.*;
import com.agileboot.common.enums.common.BusinessTypeEnum;
import com.agileboot.common.enums.common.GenderEnum;
import com.agileboot.common.enums.common.LoginStatusEnum;
import com.agileboot.common.enums.common.NoticeStatusEnum;
import com.agileboot.common.enums.common.NoticeTypeEnum;
import com.agileboot.common.enums.common.OperationStatusEnum;
import com.agileboot.common.enums.common.StatusEnum;
import com.agileboot.common.enums.common.UserStatusEnum;
import com.agileboot.common.enums.common.VisibleStatusEnum;
import com.agileboot.common.enums.common.YesOrNoEnum;
import com.agileboot.common.enums.dictionary.Dictionary;
import com.agileboot.common.enums.DictionaryEnum;
import com.agileboot.orm.common.dto.DictionaryData;
import com.agileboot.common.enums.dictionary.DictionaryData;
import java.util.Arrays;
import java.util.List;

4
agileboot-domain/src/main/java/com/agileboot/domain/system/config/dto/ConfigDTO.java
View File

@@ -3,8 +3,8 @@ package com.agileboot.domain.system.config.dto;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.json.JSONUtil;
import com.agileboot.orm.common.enums.YesOrNoEnum;
import com.agileboot.orm.common.enums.util.BasicEnumUtil;
import com.agileboot.common.enums.common.YesOrNoEnum;
import com.agileboot.common.enums.BasicEnumUtil;
import com.agileboot.orm.system.entity.SysConfigEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import java.util.Date;

2
agileboot-domain/src/main/java/com/agileboot/domain/system/config/query/ConfigQuery.java
View File

@@ -1,7 +1,7 @@
package com.agileboot.domain.system.config.query;
import cn.hutool.core.util.StrUtil;
import com.agileboot.orm.common.query.AbstractPageQuery;
import com.agileboot.common.core.page.AbstractPageQuery;
import com.agileboot.orm.system.entity.SysConfigEntity;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import io.swagger.v3.oas.annotations.media.Schema;

4
agileboot-domain/src/main/java/com/agileboot/domain/system/dept/dto/DeptDTO.java
View File

@@ -1,7 +1,7 @@
package com.agileboot.domain.system.dept.dto;
import com.agileboot.orm.common.enums.StatusEnum;
import com.agileboot.orm.common.enums.util.BasicEnumUtil;
import com.agileboot.common.enums.common.StatusEnum;
import com.agileboot.common.enums.BasicEnumUtil;
import com.agileboot.orm.system.entity.SysDeptEntity;
import java.util.Date;
import lombok.Data;

4
agileboot-domain/src/main/java/com/agileboot/domain/system/dept/model/DeptModel.java
View File

@@ -6,8 +6,8 @@ import com.agileboot.common.exception.ApiException;
import com.agileboot.common.exception.error.ErrorCode;
import com.agileboot.domain.system.dept.command.AddDeptCommand;
import com.agileboot.domain.system.dept.command.UpdateDeptCommand;
import com.agileboot.orm.common.enums.StatusEnum;
import com.agileboot.orm.common.enums.util.BasicEnumUtil;
import com.agileboot.common.enums.common.StatusEnum;
import com.agileboot.common.enums.BasicEnumUtil;
import com.agileboot.orm.system.entity.SysDeptEntity;
import com.agileboot.orm.system.service.ISysDeptService;
import java.util.Objects;

3
agileboot-domain/src/main/java/com/agileboot/domain/system/dept/query/DeptQuery.java
View File

@@ -1,7 +1,6 @@
package com.agileboot.domain.system.dept.query;
import cn.hutool.core.util.StrUtil;
import com.agileboot.orm.common.query.AbstractQuery;
import com.agileboot.common.core.page.AbstractQuery;
import com.agileboot.orm.system.entity.SysDeptEntity;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.Data;

4
agileboot-domain/src/main/java/com/agileboot/domain/system/log/dto/LoginLogDTO.java
View File

@@ -2,8 +2,8 @@ package com.agileboot.domain.system.log.dto;
import com.agileboot.common.annotation.ExcelColumn;
import com.agileboot.common.annotation.ExcelSheet;
import com.agileboot.orm.common.enums.LoginStatusEnum;
import com.agileboot.orm.common.enums.util.BasicEnumUtil;
import com.agileboot.common.enums.common.LoginStatusEnum;
import com.agileboot.common.enums.BasicEnumUtil;
import com.agileboot.orm.system.entity.SysLoginInfoEntity;
import java.util.Date;
import lombok.Data;

10
agileboot-domain/src/main/java/com/agileboot/domain/system/log/dto/OperationLogDTO.java
View File

@@ -3,11 +3,11 @@ package com.agileboot.domain.system.log.dto;
import cn.hutool.core.bean.BeanUtil;
import com.agileboot.common.annotation.ExcelColumn;
import com.agileboot.common.annotation.ExcelSheet;
import com.agileboot.orm.common.enums.BusinessTypeEnum;
import com.agileboot.orm.common.enums.OperationStatusEnum;
import com.agileboot.orm.common.enums.OperatorTypeEnum;
import com.agileboot.orm.common.enums.RequestMethodEnum;
import com.agileboot.orm.common.enums.util.BasicEnumUtil;
import com.agileboot.common.enums.common.BusinessTypeEnum;
import com.agileboot.common.enums.common.OperationStatusEnum;
import com.agileboot.common.enums.common.OperatorTypeEnum;
import com.agileboot.common.enums.common.RequestMethodEnum;
import com.agileboot.common.enums.BasicEnumUtil;
import com.agileboot.orm.system.entity.SysOperationLogEntity;
import java.util.Date;
import lombok.Data;

2
agileboot-domain/src/main/java/com/agileboot/domain/system/log/dto/OperationLogQuery.java
View File

@@ -1,7 +1,7 @@
package com.agileboot.domain.system.log.dto;
import cn.hutool.core.util.StrUtil;
import com.agileboot.orm.common.query.AbstractPageQuery;
import com.agileboot.common.core.page.AbstractPageQuery;
import com.agileboot.orm.system.entity.SysOperationLogEntity;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.Data;

2
agileboot-domain/src/main/java/com/agileboot/domain/system/log/query/LoginLogQuery.java
View File

@@ -1,7 +1,7 @@
package com.agileboot.domain.system.log.query;
import cn.hutool.core.util.StrUtil;
import com.agileboot.orm.common.query.AbstractPageQuery;
import com.agileboot.common.core.page.AbstractPageQuery;
import com.agileboot.orm.system.entity.SysLoginInfoEntity;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.Data;

2
agileboot-domain/src/main/java/com/agileboot/domain/system/menu/MenuApplicationService.java
View File

@@ -13,7 +13,7 @@ import com.agileboot.domain.system.menu.model.MenuModel;
import com.agileboot.domain.system.menu.model.MenuModelFactory;
import com.agileboot.domain.system.menu.query.MenuQuery;
import com.agileboot.infrastructure.user.web.SystemLoginUser;
import com.agileboot.orm.common.enums.StatusEnum;
import com.agileboot.common.enums.common.StatusEnum;
import com.agileboot.orm.system.entity.SysMenuEntity;
import com.agileboot.orm.system.service.ISysMenuService;
import java.util.Comparator;

6
agileboot-domain/src/main/java/com/agileboot/domain/system/menu/dto/MenuDTO.java
View File

@@ -2,9 +2,9 @@ package com.agileboot.domain.system.menu.dto;
import cn.hutool.core.util.StrUtil;
import com.agileboot.common.utils.jackson.JacksonUtil;
import com.agileboot.orm.common.enums.MenuTypeEnum;
import com.agileboot.orm.common.enums.StatusEnum;
import com.agileboot.orm.common.enums.util.BasicEnumUtil;
import com.agileboot.common.enums.common.MenuTypeEnum;
import com.agileboot.common.enums.common.StatusEnum;
import com.agileboot.common.enums.BasicEnumUtil;
import com.agileboot.orm.system.entity.SysMenuEntity;
import java.util.Date;
import lombok.Data;

2
agileboot-domain/src/main/java/com/agileboot/domain/system/menu/model/MenuModel.java
View File

@@ -7,7 +7,7 @@ import com.agileboot.common.exception.error.ErrorCode.Business;
import com.agileboot.common.utils.jackson.JacksonUtil;
import com.agileboot.domain.system.menu.command.AddMenuCommand;
import com.agileboot.domain.system.menu.command.UpdateMenuCommand;
import com.agileboot.orm.common.enums.MenuTypeEnum;
import com.agileboot.common.enums.common.MenuTypeEnum;
import com.agileboot.orm.system.entity.SysMenuEntity;
import com.agileboot.orm.system.service.ISysMenuService;
import java.util.Objects;

2
agileboot-domain/src/main/java/com/agileboot/domain/system/menu/query/MenuQuery.java
View File

@@ -1,6 +1,6 @@
package com.agileboot.domain.system.menu.query;
import com.agileboot.orm.common.query.AbstractQuery;
import com.agileboot.common.core.page.AbstractQuery;
import com.agileboot.orm.system.entity.SysMenuEntity;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.Data;

6
agileboot-domain/src/main/java/com/agileboot/domain/system/notice/model/NoticeModel.java
View File

@@ -3,9 +3,9 @@ package com.agileboot.domain.system.notice.model;
import cn.hutool.core.bean.BeanUtil;
import com.agileboot.domain.system.notice.command.NoticeAddCommand;
import com.agileboot.domain.system.notice.command.NoticeUpdateCommand;
import com.agileboot.orm.common.enums.NoticeTypeEnum;
import com.agileboot.orm.common.enums.StatusEnum;
import com.agileboot.orm.common.enums.util.BasicEnumUtil;
import com.agileboot.common.enums.common.NoticeTypeEnum;
import com.agileboot.common.enums.common.StatusEnum;
import com.agileboot.common.enums.BasicEnumUtil;
import com.agileboot.orm.system.entity.SysNoticeEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;

2
agileboot-domain/src/main/java/com/agileboot/domain/system/notice/query/NoticeQuery.java
View File

@@ -1,7 +1,7 @@
package com.agileboot.domain.system.notice.query;
import cn.hutool.core.util.StrUtil;
import com.agileboot.orm.common.query.AbstractPageQuery;
import com.agileboot.common.core.page.AbstractPageQuery;
import com.agileboot.orm.system.entity.SysNoticeEntity;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.Data;

4
agileboot-domain/src/main/java/com/agileboot/domain/system/post/dto/PostDTO.java
View File

@@ -2,8 +2,8 @@ package com.agileboot.domain.system.post.dto;
import cn.hutool.core.bean.BeanUtil;
import com.agileboot.common.annotation.ExcelColumn;
import com.agileboot.orm.common.enums.StatusEnum;
import com.agileboot.orm.common.enums.util.BasicEnumUtil;
import com.agileboot.common.enums.common.StatusEnum;
import com.agileboot.common.enums.BasicEnumUtil;
import com.agileboot.orm.system.entity.SysPostEntity;
import java.util.Date;
import lombok.AllArgsConstructor;

2
agileboot-domain/src/main/java/com/agileboot/domain/system/post/query/PostQuery.java
View File

@@ -1,7 +1,7 @@
package com.agileboot.domain.system.post.query;
import cn.hutool.core.util.StrUtil;
import com.agileboot.orm.common.query.AbstractPageQuery;
import com.agileboot.common.core.page.AbstractPageQuery;
import com.agileboot.orm.system.entity.SysPostEntity;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.Data;

2
agileboot-domain/src/main/java/com/agileboot/domain/system/role/model/RoleModel.java
View File

@@ -7,7 +7,7 @@ import com.agileboot.common.exception.error.ErrorCode;
import com.agileboot.common.exception.error.ErrorCode.Business;
import com.agileboot.domain.system.role.command.AddRoleCommand;
import com.agileboot.domain.system.role.command.UpdateRoleCommand;
import com.agileboot.orm.common.enums.StatusEnum;
import com.agileboot.common.enums.common.StatusEnum;
import com.agileboot.orm.system.entity.SysRoleEntity;
import com.agileboot.orm.system.entity.SysRoleMenuEntity;
import com.agileboot.orm.system.service.ISysRoleMenuService;

2
agileboot-domain/src/main/java/com/agileboot/domain/system/role/query/AllocatedRoleQuery.java
View File

@@ -1,7 +1,7 @@
package com.agileboot.domain.system.role.query;
import cn.hutool.core.util.StrUtil;
import com.agileboot.orm.common.query.AbstractPageQuery;
import com.agileboot.common.core.page.AbstractPageQuery;
import com.agileboot.orm.system.entity.SysUserEntity;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.Data;

2
agileboot-domain/src/main/java/com/agileboot/domain/system/role/query/RoleQuery.java
View File

@@ -1,7 +1,7 @@
package com.agileboot.domain.system.role.query;
import cn.hutool.core.util.StrUtil;
import com.agileboot.orm.common.query.AbstractPageQuery;
import com.agileboot.common.core.page.AbstractPageQuery;
import com.agileboot.orm.system.entity.SysRoleEntity;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.Data;

2
agileboot-domain/src/main/java/com/agileboot/domain/system/role/query/UnallocatedRoleQuery.java
View File

@@ -1,7 +1,7 @@
package com.agileboot.domain.system.role.query;
import cn.hutool.core.util.StrUtil;
import com.agileboot.orm.common.query.AbstractPageQuery;
import com.agileboot.common.core.page.AbstractPageQuery;
import com.agileboot.orm.system.entity.SysUserEntity;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.Data;

2
agileboot-domain/src/main/java/com/agileboot/domain/system/user/query/SearchUserQuery.java
View File

@@ -1,7 +1,7 @@
package com.agileboot.domain.system.user.query;
import cn.hutool.core.util.StrUtil;
import com.agileboot.orm.common.query.AbstractPageQuery;
import com.agileboot.common.core.page.AbstractPageQuery;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.Data;
import lombok.EqualsAndHashCode;

2
agileboot-domain/src/test/java/com/agileboot/integrationTest/db/SysConfigServiceImplTest.java
View File

@@ -1,7 +1,7 @@
package com.agileboot.integrationTest.db;
import com.agileboot.integrationTest.IntegrationTestApplication;
import com.agileboot.orm.common.enums.ConfigKeyEnum;
import com.agileboot.common.enums.common.ConfigKeyEnum;
import com.agileboot.orm.system.service.ISysConfigService;
import javax.annotation.Resource;
import org.junit.jupiter.api.Assertions;

5
agileboot-infrastructure/pom.xml
View File

@@ -54,11 +54,6 @@
<artifactId>oshi-core</artifactId>
</dependency>
<!-- 系统模块-->
<dependency>
<groupId>com.agileboot</groupId>
<artifactId>agileboot-orm</artifactId>
</dependency>
<!-- 通用模块-->
<dependency>

2
agileboot-orm/src/main/java/com/agileboot/orm/system/service/ISysUserService.java
View File

@@ -1,6 +1,6 @@
package com.agileboot.orm.system.service;
import com.agileboot.orm.common.query.AbstractPageQuery;
import com.agileboot.common.core.page.AbstractPageQuery;
import com.agileboot.orm.system.entity.SysPostEntity;
import com.agileboot.orm.system.entity.SysRoleEntity;
import com.agileboot.orm.system.entity.SysUserEntity;

2
agileboot-orm/src/main/java/com/agileboot/orm/system/service/impl/SysUserServiceImpl.java
View File

@@ -1,6 +1,6 @@
package com.agileboot.orm.system.service.impl;
import com.agileboot.orm.common.query.AbstractPageQuery;
import com.agileboot.common.core.page.AbstractPageQuery;
import com.agileboot.orm.system.entity.SysPostEntity;
import com.agileboot.orm.system.entity.SysRoleEntity;
import com.agileboot.orm.system.entity.SysUserEntity;