refactor: 将orm包中数据相关类 挪到domain包中

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

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

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

@@ -11,7 +11,7 @@ import com.agileboot.infrastructure.user.web.SystemLoginUser;
 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 com.agileboot.domain.system.log.db.SysOperationLogEntity;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
 import org.springframework.validation.BindingResult;

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

@@ -6,10 +6,10 @@ import cn.hutool.extra.spring.SpringUtil;
 import com.agileboot.common.utils.ServletHolderUtil;
 import com.agileboot.common.utils.ip.IpRegionUtil;
 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;
-import com.agileboot.orm.system.service.ISysOperationLogService;
+import com.agileboot.domain.system.log.db.SysLoginInfoEntity;
+import com.agileboot.domain.system.log.db.SysOperationLogEntity;
+import com.agileboot.domain.system.log.db.SysLoginInfoService;
+import com.agileboot.domain.system.log.db.SysOperationLogService;
 import eu.bitwalker.useragentutils.UserAgent;
 import lombok.extern.slf4j.Slf4j;
 
@@ -57,7 +57,7 @@ public class AsyncTaskFactory {
             loginInfo.setLoginTime(DateUtil.date());
             loginInfo.setStatus(loginStatusEnum.getValue());
             // 插入数据
-            SpringUtil.getBean(ISysLoginInfoService.class).save(loginInfo);
+            SpringUtil.getBean(SysLoginInfoService.class).save(loginInfo);
         };
     }
 
@@ -71,7 +71,7 @@ public class AsyncTaskFactory {
         return () -> {
             // 远程查询操作地点
             operationLog.setOperatorLocation(IpRegionUtil.getBriefLocationByIp(operationLog.getOperatorIp()));
-            SpringUtil.getBean(ISysOperationLogService.class).save(operationLog);
+            SpringUtil.getBean(SysOperationLogService.class).save(operationLog);
         };
     }
 

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

@@ -28,7 +28,7 @@ import com.agileboot.admin.customize.service.login.command.LoginCommand;
 import com.agileboot.infrastructure.user.web.SystemLoginUser;
 import com.agileboot.common.enums.common.ConfigKeyEnum;
 import com.agileboot.common.enums.common.LoginStatusEnum;
-import com.agileboot.orm.system.entity.SysUserEntity;
+import com.agileboot.domain.system.user.db.SysUserEntity;
 import com.google.code.kaptcha.Producer;
 import java.awt.image.BufferedImage;
 import javax.annotation.Resource;

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

@@ -9,12 +9,12 @@ import com.agileboot.infrastructure.user.web.RoleInfo;
 import com.agileboot.infrastructure.user.web.DataScopeEnum;
 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;
-import com.agileboot.orm.system.service.ISysMenuService;
-import com.agileboot.orm.system.service.ISysRoleService;
-import com.agileboot.orm.system.service.ISysUserService;
+import com.agileboot.domain.system.menu.db.SysMenuEntity;
+import com.agileboot.domain.system.role.db.SysRoleEntity;
+import com.agileboot.domain.system.user.db.SysUserEntity;
+import com.agileboot.domain.system.menu.db.SysMenuService;
+import com.agileboot.domain.system.role.db.SysRoleService;
+import com.agileboot.domain.system.user.db.SysUserService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import java.util.List;
@@ -45,13 +45,13 @@ import org.springframework.stereotype.Service;
 public class UserDetailsServiceImpl implements UserDetailsService {
 
     @NonNull
-    private ISysUserService userService;
+    private SysUserService userService;
 
     @NonNull
-    private ISysMenuService menuService;
+    private SysMenuService menuService;
 
     @NonNull
-    private ISysRoleService roleService;
+    private SysRoleService roleService;
 
     @NonNull
     private TokenService tokenService;

agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/DataPermissionCheckerFactory.java

@@ -10,7 +10,7 @@ import com.agileboot.admin.customize.service.permission.model.checker.DeptTreeDa
 import com.agileboot.admin.customize.service.permission.model.checker.OnlySelfDataPermissionChecker;
 import com.agileboot.admin.customize.service.permission.model.checker.SingleDeptDataPermissionChecker;
 import com.agileboot.infrastructure.user.web.DataScopeEnum;
-import com.agileboot.orm.system.service.ISysDeptService;
+import com.agileboot.domain.system.dept.db.SysDeptService;
 import javax.annotation.PostConstruct;
 import org.springframework.stereotype.Component;
 
@@ -30,7 +30,7 @@ public class DataPermissionCheckerFactory {
 
     @PostConstruct
     public void initAllChecker() {
-        ISysDeptService deptService = SpringUtil.getBean(ISysDeptService.class);
+        SysDeptService deptService = SpringUtil.getBean(SysDeptService.class);
 
         allChecker = new AllDataPermissionChecker();
         customChecker = new CustomDataPermissionChecker(deptService);

agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/DataPermissionService.java

@@ -5,8 +5,8 @@ import com.agileboot.admin.customize.service.permission.model.AbstractDataPermis
 import com.agileboot.admin.customize.service.permission.model.DataCondition;
 import com.agileboot.infrastructure.user.AuthenticationUtils;
 import com.agileboot.infrastructure.user.web.SystemLoginUser;
-import com.agileboot.orm.system.entity.SysUserEntity;
-import com.agileboot.orm.system.service.ISysUserService;
+import com.agileboot.domain.system.user.db.SysUserEntity;
+import com.agileboot.domain.system.user.db.SysUserService;
 import java.util.List;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
@@ -21,7 +21,7 @@ import org.springframework.stereotype.Service;
 public class DataPermissionService {
 
     @NonNull
-    private ISysUserService userService;
+    private SysUserService userService;
 
     /**
      * 通过userId 校验当前用户 对 目标用户是否有操作权限

agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/model/AbstractDataPermissionChecker.java

@@ -1,7 +1,7 @@
 package com.agileboot.admin.customize.service.permission.model;
 
 import com.agileboot.infrastructure.user.web.SystemLoginUser;
-import com.agileboot.orm.system.service.ISysDeptService;
+import com.agileboot.domain.system.dept.db.SysDeptService;
 import lombok.Data;
 
 /**
@@ -11,7 +11,7 @@ import lombok.Data;
 @Data
 public abstract class AbstractDataPermissionChecker {
 
-    private ISysDeptService deptService;
+    private SysDeptService deptService;
 
     /**
      * 检测当前用户对于 给定条件的数据 是否有权限

agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/model/checker/AllDataPermissionChecker.java

@@ -3,7 +3,7 @@ package com.agileboot.admin.customize.service.permission.model.checker;
 import com.agileboot.infrastructure.user.web.SystemLoginUser;
 import com.agileboot.admin.customize.service.permission.model.AbstractDataPermissionChecker;
 import com.agileboot.admin.customize.service.permission.model.DataCondition;
-import com.agileboot.orm.system.service.ISysDeptService;
+import com.agileboot.domain.system.dept.db.SysDeptService;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -15,7 +15,7 @@ import lombok.EqualsAndHashCode;
 @Data
 public class AllDataPermissionChecker extends AbstractDataPermissionChecker {
 
-    private ISysDeptService deptService;
+    private SysDeptService deptService;
 
 
     @Override

agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/model/checker/CustomDataPermissionChecker.java

@@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import com.agileboot.infrastructure.user.web.SystemLoginUser;
 import com.agileboot.admin.customize.service.permission.model.AbstractDataPermissionChecker;
 import com.agileboot.admin.customize.service.permission.model.DataCondition;
-import com.agileboot.orm.system.service.ISysDeptService;
+import com.agileboot.domain.system.dept.db.SysDeptService;
 import java.util.Set;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -21,7 +21,7 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 public class CustomDataPermissionChecker extends AbstractDataPermissionChecker {
 
-    private ISysDeptService deptService;
+    private SysDeptService deptService;
 
 
     @Override

agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/model/checker/DefaultDataPermissionChecker.java

@@ -3,7 +3,7 @@ package com.agileboot.admin.customize.service.permission.model.checker;
 import com.agileboot.infrastructure.user.web.SystemLoginUser;
 import com.agileboot.admin.customize.service.permission.model.AbstractDataPermissionChecker;
 import com.agileboot.admin.customize.service.permission.model.DataCondition;
-import com.agileboot.orm.system.service.ISysDeptService;
+import com.agileboot.domain.system.dept.db.SysDeptService;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -15,7 +15,7 @@ import lombok.EqualsAndHashCode;
 @Data
 public class DefaultDataPermissionChecker extends AbstractDataPermissionChecker {
 
-    private ISysDeptService deptService;
+    private SysDeptService deptService;
 
     @Override
     public boolean check(SystemLoginUser loginUser, DataCondition condition) {

agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/model/checker/DeptTreeDataPermissionChecker.java

@@ -3,7 +3,7 @@ package com.agileboot.admin.customize.service.permission.model.checker;
 import com.agileboot.infrastructure.user.web.SystemLoginUser;
 import com.agileboot.admin.customize.service.permission.model.AbstractDataPermissionChecker;
 import com.agileboot.admin.customize.service.permission.model.DataCondition;
-import com.agileboot.orm.system.service.ISysDeptService;
+import com.agileboot.domain.system.dept.db.SysDeptService;
 import java.util.Objects;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -20,7 +20,7 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 public class DeptTreeDataPermissionChecker extends AbstractDataPermissionChecker {
 
-    private ISysDeptService deptService;
+    private SysDeptService deptService;
 
     @Override
     public boolean check(SystemLoginUser loginUser, DataCondition condition) {

agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/model/checker/OnlySelfDataPermissionChecker.java

@@ -3,7 +3,7 @@ package com.agileboot.admin.customize.service.permission.model.checker;
 import com.agileboot.infrastructure.user.web.SystemLoginUser;
 import com.agileboot.admin.customize.service.permission.model.AbstractDataPermissionChecker;
 import com.agileboot.admin.customize.service.permission.model.DataCondition;
-import com.agileboot.orm.system.service.ISysDeptService;
+import com.agileboot.domain.system.dept.db.SysDeptService;
 import java.util.Objects;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -20,7 +20,7 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 public class OnlySelfDataPermissionChecker extends AbstractDataPermissionChecker {
 
-    private ISysDeptService deptService;
+    private SysDeptService deptService;
 
     @Override
     public boolean check(SystemLoginUser loginUser, DataCondition condition) {

agileboot-admin/src/main/java/com/agileboot/admin/customize/service/permission/model/checker/SingleDeptDataPermissionChecker.java

@@ -3,7 +3,7 @@ package com.agileboot.admin.customize.service.permission.model.checker;
 import com.agileboot.infrastructure.user.web.SystemLoginUser;
 import com.agileboot.admin.customize.service.permission.model.AbstractDataPermissionChecker;
 import com.agileboot.admin.customize.service.permission.model.DataCondition;
-import com.agileboot.orm.system.service.ISysDeptService;
+import com.agileboot.domain.system.dept.db.SysDeptService;
 import java.util.Objects;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -20,7 +20,7 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 public class SingleDeptDataPermissionChecker extends AbstractDataPermissionChecker {
 
-    private ISysDeptService deptService;
+    private SysDeptService deptService;
 
     @Override
     public boolean check(SystemLoginUser loginUser, DataCondition condition) {

agileboot-admin/src/test/java/com/agileboot/admin/customize/service/permission/CustomDataPermissionCheckerTest.java

@@ -9,14 +9,14 @@ import com.agileboot.admin.customize.service.permission.model.checker.CustomData
 import com.agileboot.infrastructure.user.web.SystemLoginUser;
 import com.agileboot.infrastructure.user.web.RoleInfo;
 import com.agileboot.admin.customize.service.permission.model.DataCondition;
-import com.agileboot.orm.system.service.ISysDeptService;
+import com.agileboot.domain.system.dept.db.SysDeptService;
 import org.apache.commons.collections4.SetUtils;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 class CustomDataPermissionCheckerTest {
 
-    private final ISysDeptService deptService = mock(ISysDeptService.class);
+    private final SysDeptService deptService = mock(SysDeptService.class);
     public SystemLoginUser loginUser = mock(SystemLoginUser.class);
 
     @BeforeEach

agileboot-admin/src/test/java/com/agileboot/admin/customize/service/permission/DeptTreeDataPermissionCheckerTest.java

@@ -10,13 +10,13 @@ import com.agileboot.admin.customize.service.permission.model.checker.DeptTreeDa
 import com.agileboot.infrastructure.user.web.SystemLoginUser;
 import com.agileboot.infrastructure.user.web.RoleInfo;
 import com.agileboot.admin.customize.service.permission.model.DataCondition;
-import com.agileboot.orm.system.service.ISysDeptService;
+import com.agileboot.domain.system.dept.db.SysDeptService;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 class DeptTreeDataPermissionCheckerTest {
 
-    private final ISysDeptService deptService = mock(ISysDeptService.class);
+    private final SysDeptService deptService = mock(SysDeptService.class);
 
     public SystemLoginUser loginUser = mock(SystemLoginUser.class);
 

agileboot-admin/src/test/java/com/agileboot/admin/customize/service/permission/OnlySelfDataPermissionCheckerTest.java

@@ -7,12 +7,12 @@ import static org.mockito.Mockito.mock;
 import com.agileboot.admin.customize.service.permission.model.checker.OnlySelfDataPermissionChecker;
 import com.agileboot.infrastructure.user.web.SystemLoginUser;
 import com.agileboot.admin.customize.service.permission.model.DataCondition;
-import com.agileboot.orm.system.service.ISysDeptService;
+import com.agileboot.domain.system.dept.db.SysDeptService;
 import org.junit.jupiter.api.Test;
 
 class OnlySelfDataPermissionCheckerTest {
 
-    private final ISysDeptService deptService = mock(ISysDeptService.class);
+    private final SysDeptService deptService = mock(SysDeptService.class);
 
     @Test
     void testCheckWhenParameterNull() {

agileboot-admin/src/test/java/com/agileboot/admin/customize/service/permission/SingleDeptDataPermissionCheckerTest.java

@@ -9,13 +9,13 @@ import com.agileboot.admin.customize.service.permission.model.checker.SingleDept
 import com.agileboot.infrastructure.user.web.SystemLoginUser;
 import com.agileboot.infrastructure.user.web.RoleInfo;
 import com.agileboot.admin.customize.service.permission.model.DataCondition;
-import com.agileboot.orm.system.service.ISysDeptService;
+import com.agileboot.domain.system.dept.db.SysDeptService;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 class SingleDeptDataPermissionCheckerTest {
 
-    private final ISysDeptService deptService = mock(ISysDeptService.class);
+    private final SysDeptService deptService = mock(SysDeptService.class);
 
     public SystemLoginUser loginUser = mock(SystemLoginUser.class);
 

agileboot-domain/src/main/java/com/agileboot/domain/common/cache/CacheCenter.java

@@ -4,10 +4,10 @@ import cn.hutool.extra.spring.SpringUtil;
 import com.agileboot.infrastructure.cache.guava.AbstractGuavaCacheTemplate;
 import com.agileboot.infrastructure.cache.redis.RedisCacheTemplate;
 import com.agileboot.infrastructure.user.web.SystemLoginUser;
-import com.agileboot.orm.system.entity.SysDeptEntity;
-import com.agileboot.orm.system.entity.SysPostEntity;
-import com.agileboot.orm.system.entity.SysRoleEntity;
-import com.agileboot.orm.system.entity.SysUserEntity;
+import com.agileboot.domain.system.dept.db.SysDeptEntity;
+import com.agileboot.domain.system.post.db.SysPostEntity;
+import com.agileboot.domain.system.role.db.SysRoleEntity;
+import com.agileboot.domain.system.user.db.SysUserEntity;
 import javax.annotation.PostConstruct;
 import org.springframework.stereotype.Component;
 

agileboot-domain/src/main/java/com/agileboot/domain/common/cache/GuavaCacheService.java

@@ -2,9 +2,9 @@ package com.agileboot.domain.common.cache;
 
 
 import com.agileboot.infrastructure.cache.guava.AbstractGuavaCacheTemplate;
-import com.agileboot.orm.system.entity.SysDeptEntity;
-import com.agileboot.orm.system.service.ISysConfigService;
-import com.agileboot.orm.system.service.ISysDeptService;
+import com.agileboot.domain.system.dept.db.SysDeptEntity;
+import com.agileboot.domain.system.config.db.SysConfigService;
+import com.agileboot.domain.system.dept.db.SysDeptService;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -19,10 +19,10 @@ import org.springframework.stereotype.Component;
 public class GuavaCacheService {
 
     @NonNull
-    private ISysConfigService configService;
+    private SysConfigService configService;
 
     @NonNull
-    private ISysDeptService deptService;
+    private SysDeptService deptService;
 
     public final AbstractGuavaCacheTemplate<String> configCache = new AbstractGuavaCacheTemplate<String>() {
         @Override

agileboot-domain/src/main/java/com/agileboot/domain/common/cache/RedisCacheService.java

@@ -5,12 +5,12 @@ import com.agileboot.infrastructure.cache.RedisUtil;
 import com.agileboot.infrastructure.cache.redis.CacheKeyEnum;
 import com.agileboot.infrastructure.cache.redis.RedisCacheTemplate;
 import com.agileboot.infrastructure.user.web.SystemLoginUser;
-import com.agileboot.orm.system.entity.SysPostEntity;
-import com.agileboot.orm.system.entity.SysRoleEntity;
-import com.agileboot.orm.system.entity.SysUserEntity;
-import com.agileboot.orm.system.service.ISysPostService;
-import com.agileboot.orm.system.service.ISysRoleService;
-import com.agileboot.orm.system.service.ISysUserService;
+import com.agileboot.domain.system.post.db.SysPostEntity;
+import com.agileboot.domain.system.role.db.SysRoleEntity;
+import com.agileboot.domain.system.user.db.SysUserEntity;
+import com.agileboot.domain.system.post.db.SysPostService;
+import com.agileboot.domain.system.role.db.SysRoleService;
+import com.agileboot.domain.system.user.db.SysUserService;
 import java.io.Serializable;
 import javax.annotation.PostConstruct;
 import lombok.NonNull;
@@ -46,7 +46,7 @@ public class RedisCacheService {
         userCache = new RedisCacheTemplate<SysUserEntity>(redisUtil, CacheKeyEnum.USER_ENTITY_KEY) {
             @Override
             public SysUserEntity getObjectFromDb(Object id) {
-                ISysUserService userService = SpringUtil.getBean(ISysUserService.class);
+                SysUserService userService = SpringUtil.getBean(SysUserService.class);
                 return userService.getById((Serializable) id);
             }
         };
@@ -54,7 +54,7 @@ public class RedisCacheService {
         roleCache = new RedisCacheTemplate<SysRoleEntity>(redisUtil, CacheKeyEnum.ROLE_ENTITY_KEY) {
             @Override
             public SysRoleEntity getObjectFromDb(Object id) {
-                ISysRoleService roleService = SpringUtil.getBean(ISysRoleService.class);
+                SysRoleService roleService = SpringUtil.getBean(SysRoleService.class);
                 return roleService.getById((Serializable) id);
             }
         };
@@ -71,7 +71,7 @@ public class RedisCacheService {
         postCache = new RedisCacheTemplate<SysPostEntity>(redisUtil, CacheKeyEnum.POST_ENTITY_KEY) {
             @Override
             public SysPostEntity getObjectFromDb(Object id) {
-                ISysPostService postService = SpringUtil.getBean(ISysPostService.class);
+                SysPostService postService = SpringUtil.getBean(SysPostService.class);
                 return postService.getById((Serializable) id);
             }
 

agileboot-domain/src/main/java/com/agileboot/domain/system/config/ConfigApplicationService.java

@@ -7,8 +7,8 @@ import com.agileboot.domain.system.config.dto.ConfigDTO;
 import com.agileboot.domain.system.config.model.ConfigModel;
 import com.agileboot.domain.system.config.model.ConfigModelFactory;
 import com.agileboot.domain.system.config.query.ConfigQuery;
-import com.agileboot.orm.system.entity.SysConfigEntity;
-import com.agileboot.orm.system.service.ISysConfigService;
+import com.agileboot.domain.system.config.db.SysConfigEntity;
+import com.agileboot.domain.system.config.db.SysConfigService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -27,7 +27,7 @@ public class  ConfigApplicationService {
     private ConfigModelFactory configModelFactory;
 
     @NonNull
-    private ISysConfigService configService;
+    private SysConfigService configService;
 
     public PageDTO<ConfigDTO> getConfigList(ConfigQuery query) {
         Page<SysConfigEntity> page = configService.page(query.toPage(), query.toQueryWrapper());

agileboot-domain/src/main/java/com/agileboot/domain/system/config/db/SysConfigEntity.java

@@ -1,4 +1,4 @@
-package com.agileboot.orm.system.entity;
+package com.agileboot.domain.system.config.db;
 
 import com.agileboot.common.core.base.BaseEntity;
 import com.baomidou.mybatisplus.annotation.IdType;

agileboot-domain/src/main/java/com/agileboot/domain/system/config/db/SysConfigMapper.java

@@ -1,6 +1,5 @@
-package com.agileboot.orm.system.mapper;
+package com.agileboot.domain.system.config.db;
 
-import com.agileboot.orm.system.entity.SysConfigEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

agileboot-domain/src/main/java/com/agileboot/domain/system/config/db/SysConfigService.java

@@ -1,6 +1,5 @@
-package com.agileboot.orm.system.service;
+package com.agileboot.domain.system.config.db;
 
-import com.agileboot.orm.system.entity.SysConfigEntity;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -11,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author valarchie
  * @since 2022-06-09
  */
-public interface ISysConfigService extends IService<SysConfigEntity> {
+public interface SysConfigService extends IService<SysConfigEntity> {
 
     /**
      * 通过key获取配置

agileboot-domain/src/main/java/com/agileboot/domain/system/config/db/SysConfigServiceImpl.java

@@ -1,9 +1,6 @@
-package com.agileboot.orm.system.service.impl;
+package com.agileboot.domain.system.config.db;
 
 import cn.hutool.core.util.StrUtil;
-import com.agileboot.orm.system.entity.SysConfigEntity;
-import com.agileboot.orm.system.mapper.SysConfigMapper;
-import com.agileboot.orm.system.service.ISysConfigService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
@@ -18,7 +15,7 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfigEntity> implements
-    ISysConfigService {
+    SysConfigService {
 
     @Override
     public String getConfigValueByKey(String key) {

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

@@ -5,7 +5,7 @@ import cn.hutool.core.convert.Convert;
 import cn.hutool.json.JSONUtil;
 import com.agileboot.common.enums.common.YesOrNoEnum;
 import com.agileboot.common.enums.BasicEnumUtil;
-import com.agileboot.orm.system.entity.SysConfigEntity;
+import com.agileboot.domain.system.config.db.SysConfigEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.Date;
 import java.util.List;

agileboot-domain/src/main/java/com/agileboot/domain/system/config/model/ConfigModel.java

@@ -7,8 +7,8 @@ import cn.hutool.json.JSONUtil;
 import com.agileboot.common.exception.ApiException;
 import com.agileboot.common.exception.error.ErrorCode;
 import com.agileboot.domain.system.config.command.ConfigUpdateCommand;
-import com.agileboot.orm.system.entity.SysConfigEntity;
-import com.agileboot.orm.system.service.ISysConfigService;
+import com.agileboot.domain.system.config.db.SysConfigEntity;
+import com.agileboot.domain.system.config.db.SysConfigService;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -22,15 +22,15 @@ import lombok.EqualsAndHashCode;
 @Data
 public class ConfigModel extends SysConfigEntity {
 
-    private ISysConfigService configService;
+    private SysConfigService configService;
 
     private Set<String> configOptionSet;
 
-    public ConfigModel(ISysConfigService configService) {
+    public ConfigModel(SysConfigService configService) {
         this.configService = configService;
     }
 
-    public ConfigModel(SysConfigEntity entity, ISysConfigService configService) {
+    public ConfigModel(SysConfigEntity entity, SysConfigService configService) {
         BeanUtil.copyProperties(entity, this);
 
         List<String> options =

agileboot-domain/src/main/java/com/agileboot/domain/system/config/model/ConfigModelFactory.java

@@ -2,8 +2,8 @@ package com.agileboot.domain.system.config.model;
 
 import com.agileboot.common.exception.ApiException;
 import com.agileboot.common.exception.error.ErrorCode;
-import com.agileboot.orm.system.entity.SysConfigEntity;
-import com.agileboot.orm.system.service.ISysConfigService;
+import com.agileboot.domain.system.config.db.SysConfigEntity;
+import com.agileboot.domain.system.config.db.SysConfigService;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
@@ -17,7 +17,7 @@ import org.springframework.stereotype.Component;
 public class ConfigModelFactory {
 
     @NonNull
-    private ISysConfigService configService;
+    private SysConfigService configService;
 
     public ConfigModel loadById(Long configId) {
         SysConfigEntity byId = configService.getById(configId);

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

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

agileboot-domain/src/main/java/com/agileboot/domain/system/dept/DeptApplicationService.java

@@ -8,9 +8,9 @@ import com.agileboot.domain.system.dept.dto.DeptDTO;
 import com.agileboot.domain.system.dept.model.DeptModel;
 import com.agileboot.domain.system.dept.model.DeptModelFactory;
 import com.agileboot.domain.system.dept.query.DeptQuery;
-import com.agileboot.orm.system.entity.SysDeptEntity;
-import com.agileboot.orm.system.service.ISysDeptService;
-import com.agileboot.orm.system.service.ISysRoleService;
+import com.agileboot.domain.system.dept.db.SysDeptEntity;
+import com.agileboot.domain.system.dept.db.SysDeptService;
+import com.agileboot.domain.system.role.db.SysRoleService;
 import java.util.List;
 import java.util.stream.Collectors;
 import lombok.NonNull;
@@ -26,10 +26,10 @@ import org.springframework.stereotype.Service;
 public class DeptApplicationService {
 
     @NonNull
-    private ISysDeptService deptService;
+    private SysDeptService deptService;
 
     @NonNull
-    private ISysRoleService roleService;
+    private SysRoleService roleService;
 
     @NonNull
     private DeptModelFactory deptModelFactory;

agileboot-domain/src/main/java/com/agileboot/domain/system/dept/db/SysDeptEntity.java

@@ -1,4 +1,4 @@
-package com.agileboot.orm.system.entity;
+package com.agileboot.domain.system.dept.db;
 
 import com.agileboot.common.core.base.BaseEntity;
 import com.baomidou.mybatisplus.annotation.IdType;

agileboot-domain/src/main/java/com/agileboot/domain/system/dept/db/SysDeptMapper.java

@@ -1,6 +1,5 @@
-package com.agileboot.orm.system.mapper;
+package com.agileboot.domain.system.dept.db;
 
-import com.agileboot.orm.system.entity.SysDeptEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

agileboot-domain/src/main/java/com/agileboot/domain/system/dept/db/SysDeptService.java

@@ -1,6 +1,5 @@
-package com.agileboot.orm.system.service;
+package com.agileboot.domain.system.dept.db;
 
-import com.agileboot.orm.system.entity.SysDeptEntity;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -11,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author valarchie
  * @since 2022-06-16
  */
-public interface ISysDeptService extends IService<SysDeptEntity> {
+public interface SysDeptService extends IService<SysDeptEntity> {
 
 
     /**

agileboot-domain/src/main/java/com/agileboot/domain/system/dept/db/SysDeptServiceImpl.java

@@ -1,10 +1,7 @@
-package com.agileboot.orm.system.service.impl;
+package com.agileboot.domain.system.dept.db;
 
-import com.agileboot.orm.system.entity.SysDeptEntity;
-import com.agileboot.orm.system.entity.SysUserEntity;
-import com.agileboot.orm.system.mapper.SysDeptMapper;
-import com.agileboot.orm.system.mapper.SysUserMapper;
-import com.agileboot.orm.system.service.ISysDeptService;
+import com.agileboot.domain.system.user.db.SysUserEntity;
+import com.agileboot.domain.system.user.db.SysUserMapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.NonNull;
@@ -21,7 +18,7 @@ import org.springframework.stereotype.Service;
  */
 @Service
 @RequiredArgsConstructor
-public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDeptEntity> implements ISysDeptService {
+public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDeptEntity> implements SysDeptService {
 
     @NonNull
     private SysUserMapper userMapper;

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

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

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

@@ -8,8 +8,8 @@ import com.agileboot.domain.system.dept.command.AddDeptCommand;
 import com.agileboot.domain.system.dept.command.UpdateDeptCommand;
 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 com.agileboot.domain.system.dept.db.SysDeptEntity;
+import com.agileboot.domain.system.dept.db.SysDeptService;
 import java.util.Objects;
 
 /**
@@ -17,13 +17,13 @@ import java.util.Objects;
  */
 public class DeptModel extends SysDeptEntity {
 
-    private final ISysDeptService deptService;
+    private final SysDeptService deptService;
 
-    public DeptModel(ISysDeptService deptService) {
+    public DeptModel(SysDeptService deptService) {
         this.deptService = deptService;
     }
 
-    public DeptModel(SysDeptEntity entity, ISysDeptService deptService) {
+    public DeptModel(SysDeptEntity entity, SysDeptService deptService) {
         if (entity != null) {
             // 如果大数据量的话  可以用MapStruct优化
             BeanUtil.copyProperties(entity, this);

agileboot-domain/src/main/java/com/agileboot/domain/system/dept/model/DeptModelFactory.java

@@ -3,8 +3,8 @@ package com.agileboot.domain.system.dept.model;
 import com.agileboot.common.exception.ApiException;
 import com.agileboot.common.exception.error.ErrorCode;
 import com.agileboot.domain.system.dept.command.AddDeptCommand;
-import com.agileboot.orm.system.entity.SysDeptEntity;
-import com.agileboot.orm.system.service.ISysDeptService;
+import com.agileboot.domain.system.dept.db.SysDeptEntity;
+import com.agileboot.domain.system.dept.db.SysDeptService;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
@@ -18,7 +18,7 @@ import org.springframework.stereotype.Component;
 public class DeptModelFactory {
 
     @NonNull
-    private ISysDeptService deptService;
+    private SysDeptService deptService;
 
     public DeptModel loadById(Long deptId) {
         SysDeptEntity byId = deptService.getById(deptId);

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

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

agileboot-domain/src/main/java/com/agileboot/domain/system/log/LogApplicationService.java

@@ -6,10 +6,10 @@ import com.agileboot.domain.system.log.dto.LoginLogDTO;
 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.orm.system.entity.SysLoginInfoEntity;
-import com.agileboot.orm.system.entity.SysOperationLogEntity;
-import com.agileboot.orm.system.service.ISysLoginInfoService;
-import com.agileboot.orm.system.service.ISysOperationLogService;
+import com.agileboot.domain.system.log.db.SysLoginInfoEntity;
+import com.agileboot.domain.system.log.db.SysOperationLogEntity;
+import com.agileboot.domain.system.log.db.SysLoginInfoService;
+import com.agileboot.domain.system.log.db.SysOperationLogService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import java.util.List;
@@ -27,10 +27,10 @@ public class LogApplicationService {
 
     // TODO 命名到时候统一改成叫LoginLog
     @NonNull
-    private ISysLoginInfoService loginInfoService;
+    private SysLoginInfoService loginInfoService;
 
     @NonNull
-    private ISysOperationLogService operationLogService;
+    private SysOperationLogService operationLogService;
 
     public PageDTO<LoginLogDTO> getLoginInfoList(LoginLogQuery query) {
         Page<SysLoginInfoEntity> page = loginInfoService.page(query.toPage(), query.toQueryWrapper());

agileboot-domain/src/main/java/com/agileboot/domain/system/log/db/SysLoginInfoEntity.java

@@ -1,4 +1,4 @@
-package com.agileboot.orm.system.entity;
+package com.agileboot.domain.system.log.db;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

agileboot-domain/src/main/java/com/agileboot/domain/system/log/db/SysLoginInfoMapper.java

@@ -1,6 +1,5 @@
-package com.agileboot.orm.system.mapper;
+package com.agileboot.domain.system.log.db;
 
-import com.agileboot.orm.system.entity.SysLoginInfoEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

agileboot-domain/src/main/java/com/agileboot/domain/system/log/db/SysLoginInfoService.java

@@ -0,0 +1,15 @@
+package com.agileboot.domain.system.log.db;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 系统访问记录 服务类
+ * </p>
+ *
+ * @author valarchie
+ * @since 2022-06-06
+ */
+public interface SysLoginInfoService extends IService<SysLoginInfoEntity> {
+
+}

agileboot-domain/src/main/java/com/agileboot/domain/system/log/db/SysLoginInfoServiceImpl.java

@@ -1,8 +1,5 @@
-package com.agileboot.orm.system.service.impl;
+package com.agileboot.domain.system.log.db;
 
-import com.agileboot.orm.system.entity.SysLoginInfoEntity;
-import com.agileboot.orm.system.mapper.SysLoginInfoMapper;
-import com.agileboot.orm.system.service.ISysLoginInfoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
@@ -16,6 +13,6 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class SysLoginInfoServiceImpl extends ServiceImpl<SysLoginInfoMapper, SysLoginInfoEntity> implements
-    ISysLoginInfoService {
+    SysLoginInfoService {
 
 }

agileboot-domain/src/main/java/com/agileboot/domain/system/log/db/SysOperationLogEntity.java

@@ -1,4 +1,4 @@
-package com.agileboot.orm.system.entity;
+package com.agileboot.domain.system.log.db;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

agileboot-domain/src/main/java/com/agileboot/domain/system/log/db/SysOperationLogMapper.java

@@ -1,6 +1,5 @@
-package com.agileboot.orm.system.mapper;
+package com.agileboot.domain.system.log.db;
 
-import com.agileboot.orm.system.entity.SysOperationLogEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

agileboot-domain/src/main/java/com/agileboot/domain/system/log/db/SysOperationLogService.java

@@ -0,0 +1,15 @@
+package com.agileboot.domain.system.log.db;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 操作日志记录 服务类
+ * </p>
+ *
+ * @author valarchie
+ * @since 2022-06-08
+ */
+public interface SysOperationLogService extends IService<SysOperationLogEntity> {
+
+}

agileboot-domain/src/main/java/com/agileboot/domain/system/log/db/SysOperationLogServiceImpl.java

@@ -1,8 +1,5 @@
-package com.agileboot.orm.system.service.impl;
+package com.agileboot.domain.system.log.db;
 
-import com.agileboot.orm.system.entity.SysOperationLogEntity;
-import com.agileboot.orm.system.mapper.SysOperationLogMapper;
-import com.agileboot.orm.system.service.ISysOperationLogService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
@@ -16,6 +13,6 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class SysOperationLogServiceImpl extends ServiceImpl<SysOperationLogMapper, SysOperationLogEntity> implements
-    ISysOperationLogService {
+    SysOperationLogService {
 
 }

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

@@ -4,7 +4,7 @@ import com.agileboot.common.annotation.ExcelColumn;
 import com.agileboot.common.annotation.ExcelSheet;
 import com.agileboot.common.enums.common.LoginStatusEnum;
 import com.agileboot.common.enums.BasicEnumUtil;
-import com.agileboot.orm.system.entity.SysLoginInfoEntity;
+import com.agileboot.domain.system.log.db.SysLoginInfoEntity;
 import java.util.Date;
 import lombok.Data;
 

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

@@ -8,7 +8,7 @@ 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 com.agileboot.domain.system.log.db.SysOperationLogEntity;
 import java.util.Date;
 import lombok.Data;
 

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

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

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

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

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

@@ -14,8 +14,8 @@ 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.common.enums.common.StatusEnum;
-import com.agileboot.orm.system.entity.SysMenuEntity;
-import com.agileboot.orm.system.service.ISysMenuService;
+import com.agileboot.domain.system.menu.db.SysMenuEntity;
+import com.agileboot.domain.system.menu.db.SysMenuService;
 import java.util.Comparator;
 import java.util.LinkedList;
 import java.util.List;
@@ -33,7 +33,7 @@ import org.springframework.stereotype.Service;
 public class MenuApplicationService {
 
     @NonNull
-    private ISysMenuService menuService;
+    private SysMenuService menuService;
 
     @NonNull
     private MenuModelFactory menuModelFactory;

agileboot-domain/src/main/java/com/agileboot/domain/system/menu/db/SysMenuEntity.java

@@ -1,4 +1,4 @@
-package com.agileboot.orm.system.entity;
+package com.agileboot.domain.system.menu.db;
 
 import com.agileboot.common.core.base.BaseEntity;
 import com.baomidou.mybatisplus.annotation.IdType;

agileboot-domain/src/main/java/com/agileboot/domain/system/menu/db/SysMenuMapper.java

@@ -1,6 +1,5 @@
-package com.agileboot.orm.system.mapper;
+package com.agileboot.domain.system.menu.db;
 
-import com.agileboot.orm.system.entity.SysMenuEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;

agileboot-domain/src/main/java/com/agileboot/domain/system/menu/db/SysMenuService.java

@@ -1,6 +1,5 @@
-package com.agileboot.orm.system.service;
+package com.agileboot.domain.system.menu.db;
 
-import com.agileboot.orm.system.entity.SysMenuEntity;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
@@ -13,7 +12,7 @@ import java.util.List;
  * @author valarchie
  * @since 2022-06-16
  */
-public interface ISysMenuService extends IService<SysMenuEntity> {
+public interface SysMenuService extends IService<SysMenuEntity> {
 
     /**
      * 根据用户查询系统菜单列表

agileboot-domain/src/main/java/com/agileboot/domain/system/menu/db/SysMenuServiceImpl.java

@@ -1,10 +1,7 @@
-package com.agileboot.orm.system.service.impl;
+package com.agileboot.domain.system.menu.db;
 
-import com.agileboot.orm.system.entity.SysMenuEntity;
-import com.agileboot.orm.system.entity.SysRoleMenuEntity;
-import com.agileboot.orm.system.mapper.SysMenuMapper;
-import com.agileboot.orm.system.mapper.SysRoleMenuMapper;
-import com.agileboot.orm.system.service.ISysMenuService;
+import com.agileboot.domain.system.role.db.SysRoleMenuEntity;
+import com.agileboot.domain.system.role.db.SysRoleMenuMapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import java.util.List;
@@ -22,7 +19,7 @@ import org.springframework.stereotype.Service;
  */
 @Service
 @RequiredArgsConstructor
-public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenuEntity> implements ISysMenuService {
+public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenuEntity> implements SysMenuService {
 
     @NonNull
     private SysRoleMenuMapper roleMenuMapper;

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

@@ -5,7 +5,7 @@ import com.agileboot.common.utils.jackson.JacksonUtil;
 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 com.agileboot.domain.system.menu.db.SysMenuEntity;
 import java.util.Date;
 import lombok.Data;
 import lombok.NoArgsConstructor;

agileboot-domain/src/main/java/com/agileboot/domain/system/menu/dto/MenuDetailDTO.java

@@ -2,7 +2,7 @@ package com.agileboot.domain.system.menu.dto;
 
 import cn.hutool.core.util.StrUtil;
 import com.agileboot.common.utils.jackson.JacksonUtil;
-import com.agileboot.orm.system.entity.SysMenuEntity;
+import com.agileboot.domain.system.menu.db.SysMenuEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 

agileboot-domain/src/main/java/com/agileboot/domain/system/menu/dto/RouterDTO.java

@@ -1,7 +1,7 @@
 package com.agileboot.domain.system.menu.dto;
 
 import com.agileboot.common.utils.jackson.JacksonUtil;
-import com.agileboot.orm.system.entity.SysMenuEntity;
+import com.agileboot.domain.system.menu.db.SysMenuEntity;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.google.common.collect.Lists;

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

@@ -8,8 +8,8 @@ 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.common.enums.common.MenuTypeEnum;
-import com.agileboot.orm.system.entity.SysMenuEntity;
-import com.agileboot.orm.system.service.ISysMenuService;
+import com.agileboot.domain.system.menu.db.SysMenuEntity;
+import com.agileboot.domain.system.menu.db.SysMenuService;
 import java.util.Objects;
 import lombok.NoArgsConstructor;
 
@@ -19,13 +19,13 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 public class MenuModel extends SysMenuEntity {
 
-    private ISysMenuService menuService;
+    private SysMenuService menuService;
 
-    public MenuModel(ISysMenuService menuService) {
+    public MenuModel(SysMenuService menuService) {
         this.menuService = menuService;
     }
 
-    public MenuModel(SysMenuEntity entity, ISysMenuService menuService) {
+    public MenuModel(SysMenuEntity entity, SysMenuService menuService) {
         if (entity != null) {
             BeanUtil.copyProperties(entity, this);
         }

agileboot-domain/src/main/java/com/agileboot/domain/system/menu/model/MenuModelFactory.java

@@ -2,8 +2,8 @@ package com.agileboot.domain.system.menu.model;
 
 import com.agileboot.common.exception.ApiException;
 import com.agileboot.common.exception.error.ErrorCode;
-import com.agileboot.orm.system.entity.SysMenuEntity;
-import com.agileboot.orm.system.service.ISysMenuService;
+import com.agileboot.domain.system.menu.db.SysMenuEntity;
+import com.agileboot.domain.system.menu.db.SysMenuService;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
@@ -17,7 +17,7 @@ import org.springframework.stereotype.Component;
 public class MenuModelFactory {
 
     @NonNull
-    private ISysMenuService menuService;
+    private SysMenuService menuService;
 
     public MenuModel loadById(Long menuId) {
         SysMenuEntity byId = menuService.getById(menuId);

agileboot-domain/src/main/java/com/agileboot/domain/system/menu/model/RouterModel.java

@@ -1,6 +1,6 @@
 package com.agileboot.domain.system.menu.model;
 
-import com.agileboot.orm.system.entity.SysMenuEntity;
+import com.agileboot.domain.system.menu.db.SysMenuEntity;
 
 /**
  * @author valarchie

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

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

agileboot-domain/src/main/java/com/agileboot/domain/system/monitor/dto/OnlineUserDTO.java

@@ -2,7 +2,7 @@ package com.agileboot.domain.system.monitor.dto;
 
 import com.agileboot.domain.common.cache.CacheCenter;
 import com.agileboot.infrastructure.user.web.SystemLoginUser;
-import com.agileboot.orm.system.entity.SysDeptEntity;
+import com.agileboot.domain.system.dept.db.SysDeptEntity;
 import lombok.Data;
 
 /**

agileboot-domain/src/main/java/com/agileboot/domain/system/notice/NoticeApplicationService.java

@@ -1,8 +1,6 @@
 package com.agileboot.domain.system.notice;
 
 import com.agileboot.common.core.page.PageDTO;
-import com.agileboot.common.exception.ApiException;
-import com.agileboot.common.exception.error.ErrorCode.Client;
 import com.agileboot.domain.common.command.BulkOperationCommand;
 import com.agileboot.domain.system.notice.command.NoticeAddCommand;
 import com.agileboot.domain.system.notice.command.NoticeUpdateCommand;
@@ -10,8 +8,8 @@ import com.agileboot.domain.system.notice.dto.NoticeDTO;
 import com.agileboot.domain.system.notice.model.NoticeModel;
 import com.agileboot.domain.system.notice.model.NoticeModelFactory;
 import com.agileboot.domain.system.notice.query.NoticeQuery;
-import com.agileboot.orm.system.entity.SysNoticeEntity;
-import com.agileboot.orm.system.service.ISysNoticeService;
+import com.agileboot.domain.system.notice.db.SysNoticeEntity;
+import com.agileboot.domain.system.notice.db.SysNoticeService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -27,7 +25,7 @@ import org.springframework.stereotype.Service;
 public class NoticeApplicationService {
 
     @NonNull
-    private ISysNoticeService noticeService;
+    private SysNoticeService noticeService;
 
     @NonNull
     private NoticeModelFactory noticeModelFactory;

agileboot-domain/src/main/java/com/agileboot/domain/system/notice/db/SysNoticeEntity.java

@@ -1,4 +1,4 @@
-package com.agileboot.orm.system.entity;
+package com.agileboot.domain.system.notice.db;
 
 import com.agileboot.common.core.base.BaseEntity;
 import com.baomidou.mybatisplus.annotation.IdType;

agileboot-domain/src/main/java/com/agileboot/domain/system/notice/db/SysNoticeMapper.java

@@ -1,6 +1,5 @@
-package com.agileboot.orm.system.mapper;
+package com.agileboot.domain.system.notice.db;
 
-import com.agileboot.orm.system.entity.SysNoticeEntity;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;

agileboot-domain/src/main/java/com/agileboot/domain/system/notice/db/SysNoticeService.java

@@ -1,6 +1,5 @@
-package com.agileboot.orm.system.service;
+package com.agileboot.domain.system.notice.db;
 
-import com.agileboot.orm.system.entity.SysNoticeEntity;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -15,7 +14,7 @@ import org.apache.ibatis.annotations.Param;
  * @author valarchie
  * @since 2022-06-16
  */
-public interface ISysNoticeService extends IService<SysNoticeEntity> {
+public interface SysNoticeService extends IService<SysNoticeEntity> {
 
     /**
      * 获取公告列表

agileboot-domain/src/main/java/com/agileboot/domain/system/notice/db/SysNoticeServiceImpl.java

@@ -1,8 +1,5 @@
-package com.agileboot.orm.system.service.impl;
+package com.agileboot.domain.system.notice.db;
 
-import com.agileboot.orm.system.entity.SysNoticeEntity;
-import com.agileboot.orm.system.mapper.SysNoticeMapper;
-import com.agileboot.orm.system.service.ISysNoticeService;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -17,7 +14,7 @@ import org.springframework.stereotype.Service;
  * @since 2022-06-16
  */
 @Service
-public class SysNoticeServiceImpl extends ServiceImpl<SysNoticeMapper, SysNoticeEntity> implements ISysNoticeService {
+public class SysNoticeServiceImpl extends ServiceImpl<SysNoticeMapper, SysNoticeEntity> implements SysNoticeService {
 
     @Override
     public Page<SysNoticeEntity> getNoticeList(Page<SysNoticeEntity> page, Wrapper<SysNoticeEntity> queryWrapper) {

agileboot-domain/src/main/java/com/agileboot/domain/system/notice/dto/NoticeDTO.java

@@ -1,8 +1,8 @@
 package com.agileboot.domain.system.notice.dto;
 
 import com.agileboot.domain.common.cache.CacheCenter;
-import com.agileboot.orm.system.entity.SysNoticeEntity;
-import com.agileboot.orm.system.entity.SysUserEntity;
+import com.agileboot.domain.system.notice.db.SysNoticeEntity;
+import com.agileboot.domain.system.user.db.SysUserEntity;
 import java.util.Date;
 import lombok.Data;
 

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

@@ -6,7 +6,7 @@ import com.agileboot.domain.system.notice.command.NoticeUpdateCommand;
 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 com.agileboot.domain.system.notice.db.SysNoticeEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;

agileboot-domain/src/main/java/com/agileboot/domain/system/notice/model/NoticeModelFactory.java

@@ -2,8 +2,8 @@ package com.agileboot.domain.system.notice.model;
 
 import com.agileboot.common.exception.ApiException;
 import com.agileboot.common.exception.error.ErrorCode;
-import com.agileboot.orm.system.entity.SysNoticeEntity;
-import com.agileboot.orm.system.service.ISysNoticeService;
+import com.agileboot.domain.system.notice.db.SysNoticeEntity;
+import com.agileboot.domain.system.notice.db.SysNoticeService;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
@@ -17,7 +17,7 @@ import org.springframework.stereotype.Component;
 public class NoticeModelFactory {
 
     @NonNull
-    private ISysNoticeService noticeService;
+    private SysNoticeService noticeService;
 
     public NoticeModel loadById(Long noticeId) {
         SysNoticeEntity byId = noticeService.getById(noticeId);

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

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

agileboot-domain/src/main/java/com/agileboot/domain/system/post/PostApplicationService.java

@@ -8,8 +8,8 @@ import com.agileboot.domain.system.post.dto.PostDTO;
 import com.agileboot.domain.system.post.model.PostModel;
 import com.agileboot.domain.system.post.model.PostModelFactory;
 import com.agileboot.domain.system.post.query.PostQuery;
-import com.agileboot.orm.system.entity.SysPostEntity;
-import com.agileboot.orm.system.service.ISysPostService;
+import com.agileboot.domain.system.post.db.SysPostEntity;
+import com.agileboot.domain.system.post.db.SysPostService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -28,7 +28,7 @@ public class PostApplicationService {
     private PostModelFactory postModelFactory;
 
     @NonNull
-    private ISysPostService postService;
+    private SysPostService postService;
 
     public PageDTO<PostDTO> getPostList(PostQuery query) {
         Page<SysPostEntity> page = postService.page(query.toPage(), query.toQueryWrapper());

agileboot-domain/src/main/java/com/agileboot/domain/system/post/db/SysPostEntity.java

@@ -1,4 +1,4 @@
-package com.agileboot.orm.system.entity;
+package com.agileboot.domain.system.post.db;
 
 import com.agileboot.common.core.base.BaseEntity;
 import com.baomidou.mybatisplus.annotation.IdType;

agileboot-domain/src/main/java/com/agileboot/domain/system/post/db/SysPostMapper.java

@@ -1,6 +1,5 @@
-package com.agileboot.orm.system.mapper;
+package com.agileboot.domain.system.post.db;
 
-import com.agileboot.orm.system.entity.SysPostEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

agileboot-domain/src/main/java/com/agileboot/domain/system/post/db/SysPostService.java

@@ -1,6 +1,5 @@
-package com.agileboot.orm.system.service;
+package com.agileboot.domain.system.post.db;
 
-import com.agileboot.orm.system.entity.SysPostEntity;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
@@ -11,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @author valarchie
  * @since 2022-06-16
  */
-public interface ISysPostService extends IService<SysPostEntity> {
+public interface SysPostService extends IService<SysPostEntity> {
 
     /**
      * 校验岗位名称

agileboot-domain/src/main/java/com/agileboot/domain/system/post/db/SysPostServiceImpl.java

@@ -1,10 +1,7 @@
-package com.agileboot.orm.system.service.impl;
+package com.agileboot.domain.system.post.db;
 
-import com.agileboot.orm.system.entity.SysPostEntity;
-import com.agileboot.orm.system.entity.SysUserEntity;
-import com.agileboot.orm.system.mapper.SysPostMapper;
-import com.agileboot.orm.system.mapper.SysUserMapper;
-import com.agileboot.orm.system.service.ISysPostService;
+import com.agileboot.domain.system.user.db.SysUserEntity;
+import com.agileboot.domain.system.user.db.SysUserMapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.NonNull;
@@ -21,7 +18,7 @@ import org.springframework.stereotype.Service;
  */
 @Service
 @RequiredArgsConstructor
-public class SysPostServiceImpl extends ServiceImpl<SysPostMapper, SysPostEntity> implements ISysPostService {
+public class SysPostServiceImpl extends ServiceImpl<SysPostMapper, SysPostEntity> implements SysPostService {
 
     @NonNull
     private SysUserMapper userMapper;

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

@@ -4,7 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.agileboot.common.annotation.ExcelColumn;
 import com.agileboot.common.enums.common.StatusEnum;
 import com.agileboot.common.enums.BasicEnumUtil;
-import com.agileboot.orm.system.entity.SysPostEntity;
+import com.agileboot.domain.system.post.db.SysPostEntity;
 import java.util.Date;
 import lombok.AllArgsConstructor;
 import lombok.Data;

agileboot-domain/src/main/java/com/agileboot/domain/system/post/model/PostModel.java

@@ -5,8 +5,8 @@ import com.agileboot.common.exception.ApiException;
 import com.agileboot.common.exception.error.ErrorCode;
 import com.agileboot.domain.system.post.command.AddPostCommand;
 import com.agileboot.domain.system.post.command.UpdatePostCommand;
-import com.agileboot.orm.system.entity.SysPostEntity;
-import com.agileboot.orm.system.service.ISysPostService;
+import com.agileboot.domain.system.post.db.SysPostEntity;
+import com.agileboot.domain.system.post.db.SysPostService;
 import lombok.NoArgsConstructor;
 
 /**
@@ -15,13 +15,13 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 public class PostModel extends SysPostEntity {
 
-    private ISysPostService postService;
+    private SysPostService postService;
 
-    public PostModel(ISysPostService postService) {
+    public PostModel(SysPostService postService) {
         this.postService = postService;
     }
 
-    public PostModel(SysPostEntity entity, ISysPostService postService) {
+    public PostModel(SysPostEntity entity, SysPostService postService) {
         if (entity != null) {
             BeanUtil.copyProperties(entity, this);
         }

agileboot-domain/src/main/java/com/agileboot/domain/system/post/model/PostModelFactory.java

@@ -2,8 +2,8 @@ package com.agileboot.domain.system.post.model;
 
 import com.agileboot.common.exception.ApiException;
 import com.agileboot.common.exception.error.ErrorCode.Business;
-import com.agileboot.orm.system.entity.SysPostEntity;
-import com.agileboot.orm.system.service.ISysPostService;
+import com.agileboot.domain.system.post.db.SysPostEntity;
+import com.agileboot.domain.system.post.db.SysPostService;
 import lombok.NonNull;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
@@ -16,7 +16,7 @@ import org.springframework.stereotype.Component;
 public class PostModelFactory {
 
     @NonNull
-    private ISysPostService postService;
+    private SysPostService postService;
 
     public PostModel loadById(Long postId) {
         SysPostEntity byId = postService.getById(postId);

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

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

agileboot-domain/src/main/java/com/agileboot/domain/system/role/RoleApplicationService.java

@@ -17,11 +17,11 @@ import com.agileboot.domain.system.role.query.UnallocatedRoleQuery;
 import com.agileboot.domain.system.user.dto.UserDTO;
 import com.agileboot.domain.system.user.model.UserModel;
 import com.agileboot.domain.system.user.model.UserModelFactory;
-import com.agileboot.orm.system.entity.SysRoleEntity;
-import com.agileboot.orm.system.entity.SysUserEntity;
-import com.agileboot.orm.system.service.ISysMenuService;
-import com.agileboot.orm.system.service.ISysRoleService;
-import com.agileboot.orm.system.service.ISysUserService;
+import com.agileboot.domain.system.role.db.SysRoleEntity;
+import com.agileboot.domain.system.user.db.SysUserEntity;
+import com.agileboot.domain.system.menu.db.SysMenuService;
+import com.agileboot.domain.system.role.db.SysRoleService;
+import com.agileboot.domain.system.user.db.SysUserService;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import java.util.List;
@@ -44,13 +44,13 @@ public class RoleApplicationService {
     private UserModelFactory userModelFactory;
 
     @NonNull
-    private ISysRoleService roleService;
+    private SysRoleService roleService;
 
     @NonNull
-    private ISysUserService userService;
+    private SysUserService userService;
 
     @NonNull
-    private ISysMenuService menuService;
+    private SysMenuService menuService;
 
 
     public PageDTO<RoleDTO> getRoleList(RoleQuery query) {

agileboot-domain/src/main/java/com/agileboot/domain/system/role/db/SysRoleEntity.java

@@ -1,4 +1,4 @@
-package com.agileboot.orm.system.entity;
+package com.agileboot.domain.system.role.db;
 
 import com.agileboot.common.core.base.BaseEntity;
 import com.baomidou.mybatisplus.annotation.IdType;

agileboot-domain/src/main/java/com/agileboot/domain/system/role/db/SysRoleMapper.java

@@ -1,7 +1,6 @@
-package com.agileboot.orm.system.mapper;
+package com.agileboot.domain.system.role.db;
 
-import com.agileboot.orm.system.entity.SysMenuEntity;
-import com.agileboot.orm.system.entity.SysRoleEntity;
+import com.agileboot.domain.system.menu.db.SysMenuEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import java.util.List;
 import org.apache.ibatis.annotations.Select;

agileboot-domain/src/main/java/com/agileboot/domain/system/role/db/SysRoleMenuEntity.java

@@ -1,4 +1,4 @@
-package com.agileboot.orm.system.entity;
+package com.agileboot.domain.system.role.db;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

agileboot-domain/src/main/java/com/agileboot/domain/system/role/db/SysRoleMenuMapper.java

@@ -1,6 +1,5 @@
-package com.agileboot.orm.system.mapper;
+package com.agileboot.domain.system.role.db;
 
-import com.agileboot.orm.system.entity.SysRoleMenuEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

agileboot-domain/src/main/java/com/agileboot/domain/system/role/db/SysRoleMenuService.java

@@ -0,0 +1,15 @@
+package com.agileboot.domain.system.role.db;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 角色和菜单关联表 服务类
+ * </p>
+ *
+ * @author valarchie
+ * @since 2022-06-16
+ */
+public interface SysRoleMenuService extends IService<SysRoleMenuEntity> {
+
+}

agileboot-domain/src/main/java/com/agileboot/domain/system/role/db/SysRoleMenuServiceImpl.java

@@ -1,8 +1,5 @@
-package com.agileboot.orm.system.service.impl;
+package com.agileboot.domain.system.role.db;
 
-import com.agileboot.orm.system.entity.SysRoleMenuEntity;
-import com.agileboot.orm.system.mapper.SysRoleMenuMapper;
-import com.agileboot.orm.system.service.ISysRoleMenuService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
@@ -16,6 +13,6 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class SysRoleMenuServiceImpl extends ServiceImpl<SysRoleMenuMapper, SysRoleMenuEntity> implements
-    ISysRoleMenuService {
+    SysRoleMenuService {
 
 }

agileboot-domain/src/main/java/com/agileboot/domain/system/role/db/SysRoleService.java

@@ -1,7 +1,6 @@
-package com.agileboot.orm.system.service;
+package com.agileboot.domain.system.role.db;
 
-import com.agileboot.orm.system.entity.SysMenuEntity;
-import com.agileboot.orm.system.entity.SysRoleEntity;
+import com.agileboot.domain.system.menu.db.SysMenuEntity;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
@@ -14,7 +13,7 @@ import java.util.List;
  * @author valarchie
  * @since 2022-06-16
  */
-public interface ISysRoleService extends IService<SysRoleEntity> {
+public interface SysRoleService extends IService<SysRoleEntity> {
 
 
     /**

agileboot-domain/src/main/java/com/agileboot/domain/system/role/db/SysRoleServiceImpl.java

@@ -1,11 +1,8 @@
-package com.agileboot.orm.system.service.impl;
+package com.agileboot.domain.system.role.db;
 
-import com.agileboot.orm.system.entity.SysMenuEntity;
-import com.agileboot.orm.system.entity.SysRoleEntity;
-import com.agileboot.orm.system.entity.SysUserEntity;
-import com.agileboot.orm.system.mapper.SysRoleMapper;
-import com.agileboot.orm.system.mapper.SysUserMapper;
-import com.agileboot.orm.system.service.ISysRoleService;
+import com.agileboot.domain.system.menu.db.SysMenuEntity;
+import com.agileboot.domain.system.user.db.SysUserEntity;
+import com.agileboot.domain.system.user.db.SysUserMapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import java.util.List;
@@ -23,7 +20,7 @@ import org.springframework.stereotype.Service;
  */
 @Service
 @RequiredArgsConstructor
-public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRoleEntity> implements ISysRoleService {
+public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRoleEntity> implements SysRoleService {
 
     @NonNull
     private SysUserMapper userMapper;

agileboot-domain/src/main/java/com/agileboot/domain/system/role/dto/RoleDTO.java

@@ -2,7 +2,7 @@ package com.agileboot.domain.system.role.dto;
 
 import com.agileboot.common.annotation.ExcelColumn;
 import com.agileboot.common.annotation.ExcelSheet;
-import com.agileboot.orm.system.entity.SysRoleEntity;
+import com.agileboot.domain.system.role.db.SysRoleEntity;
 import java.util.Date;
 import java.util.List;
 import lombok.Data;

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

@@ -8,10 +8,10 @@ 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.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;
-import com.agileboot.orm.system.service.ISysRoleService;
+import com.agileboot.domain.system.role.db.SysRoleEntity;
+import com.agileboot.domain.system.role.db.SysRoleMenuEntity;
+import com.agileboot.domain.system.role.db.SysRoleMenuService;
+import com.agileboot.domain.system.role.db.SysRoleService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -32,15 +32,15 @@ public class RoleModel extends SysRoleEntity {
 
     private List<Long> deptIds;
 
-    private ISysRoleService roleService;
-    private ISysRoleMenuService roleMenuService;
+    private SysRoleService roleService;
+    private SysRoleMenuService roleMenuService;
 
-    public RoleModel(ISysRoleService roleService, ISysRoleMenuService roleMenuService) {
+    public RoleModel(SysRoleService roleService, SysRoleMenuService roleMenuService) {
         this.roleService = roleService;
         this.roleMenuService = roleMenuService;
     }
 
-    public RoleModel(SysRoleEntity entity, ISysRoleService roleService, ISysRoleMenuService roleMenuService) {
+    public RoleModel(SysRoleEntity entity, SysRoleService roleService, SysRoleMenuService roleMenuService) {
         if (entity != null) {
             BeanUtil.copyProperties(entity, this);
         }

agileboot-domain/src/main/java/com/agileboot/domain/system/role/model/RoleModelFactory.java

@@ -4,10 +4,10 @@ import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.StrUtil;
 import com.agileboot.common.exception.ApiException;
 import com.agileboot.common.exception.error.ErrorCode;
-import com.agileboot.orm.system.entity.SysRoleEntity;
-import com.agileboot.orm.system.entity.SysRoleMenuEntity;
-import com.agileboot.orm.system.service.ISysRoleMenuService;
-import com.agileboot.orm.system.service.ISysRoleService;
+import com.agileboot.domain.system.role.db.SysRoleEntity;
+import com.agileboot.domain.system.role.db.SysRoleMenuEntity;
+import com.agileboot.domain.system.role.db.SysRoleMenuService;
+import com.agileboot.domain.system.role.db.SysRoleService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -24,10 +24,10 @@ import org.springframework.stereotype.Component;
 public class RoleModelFactory {
 
     @NonNull
-    private ISysRoleService roleService;
+    private SysRoleService roleService;
 
     @NonNull
-    private ISysRoleMenuService roleMenuService;
+    private SysRoleMenuService roleMenuService;
 
     public RoleModel loadById(Long roleId) {
         SysRoleEntity byId = roleService.getById(roleId);

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

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

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

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

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

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

agileboot-domain/src/main/java/com/agileboot/domain/system/user/UserApplicationService.java

@@ -14,6 +14,7 @@ import com.agileboot.domain.system.user.command.UpdateProfileCommand;
 import com.agileboot.domain.system.user.command.UpdateUserAvatarCommand;
 import com.agileboot.domain.system.user.command.UpdateUserCommand;
 import com.agileboot.domain.system.user.command.UpdateUserPasswordCommand;
+import com.agileboot.domain.system.user.db.SearchUserDO;
 import com.agileboot.domain.system.user.dto.UserDTO;
 import com.agileboot.domain.system.user.dto.UserDetailDTO;
 import com.agileboot.domain.system.user.dto.UserProfileDTO;
@@ -21,13 +22,12 @@ import com.agileboot.domain.system.user.model.UserModel;
 import com.agileboot.domain.system.user.model.UserModelFactory;
 import com.agileboot.domain.system.user.query.SearchUserQuery;
 import com.agileboot.infrastructure.user.web.SystemLoginUser;
-import com.agileboot.orm.system.entity.SysPostEntity;
-import com.agileboot.orm.system.entity.SysRoleEntity;
-import com.agileboot.orm.system.entity.SysUserEntity;
-import com.agileboot.orm.system.result.SearchUserDO;
-import com.agileboot.orm.system.service.ISysPostService;
-import com.agileboot.orm.system.service.ISysRoleService;
-import com.agileboot.orm.system.service.ISysUserService;
+import com.agileboot.domain.system.post.db.SysPostEntity;
+import com.agileboot.domain.system.role.db.SysRoleEntity;
+import com.agileboot.domain.system.user.db.SysUserEntity;
+import com.agileboot.domain.system.post.db.SysPostService;
+import com.agileboot.domain.system.role.db.SysRoleService;
+import com.agileboot.domain.system.user.db.SysUserService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import java.util.List;
@@ -44,13 +44,13 @@ import org.springframework.stereotype.Service;
 public class UserApplicationService {
 
     @NonNull
-    private ISysUserService userService;
+    private SysUserService userService;
 
     @NonNull
-    private ISysRoleService roleService;
+    private SysRoleService roleService;
 
     @NonNull
-    private ISysPostService postService;
+    private SysPostService postService;
 
     @NonNull
     private UserModelFactory userModelFactory;

agileboot-domain/src/main/java/com/agileboot/domain/system/user/db/SearchUserDO.java

@@ -1,6 +1,5 @@
-package com.agileboot.orm.system.result;
+package com.agileboot.domain.system.user.db;
 
-import com.agileboot.orm.system.entity.SysUserEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;