Browse Source

调整 dal 结构,将 dataobject 抽出来,层级更平铺

YunaiV 4 years ago
parent
commit
9dd2bc95fb
100 changed files with 150 additions and 157 deletions
  1. 1 1
      src/main/java/cn/iocoder/dashboard/framework/apollo/internals/ConfigFrameworkDAO.java
  2. 2 2
      src/main/java/cn/iocoder/dashboard/framework/apollo/internals/DBConfigRepository.java
  3. 1 1
      src/main/java/cn/iocoder/dashboard/framework/apollo/package-info.java
  4. 1 1
      src/main/java/cn/iocoder/dashboard/framework/dict/core/service/DictDataFrameworkService.java
  5. 1 1
      src/main/java/cn/iocoder/dashboard/framework/dict/core/util/DictUtils.java
  6. 1 1
      src/main/java/cn/iocoder/dashboard/framework/excel/core/convert/DictConvert.java
  7. 1 1
      src/main/java/cn/iocoder/dashboard/framework/mybatis/core/type/JsonLongSetTypeHandler.java
  8. 1 1
      src/main/java/cn/iocoder/dashboard/framework/security/core/service/SecurityPermissionFrameworkService.java
  9. 1 1
      src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/InfConfigController.java
  10. 1 1
      src/main/java/cn/iocoder/dashboard/modules/infra/convert/config/InfConfigConvert.java
  11. 1 1
      src/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/config/InfConfigDO.java
  12. 1 0
      src/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/package-info.java
  13. 2 2
      src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/config/InfConfigDAOImpl.java
  14. 2 2
      src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/config/InfConfigMapper.java
  15. 0 1
      src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/dao/package-info.java
  16. 0 1
      src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/dataobject/package-info.java
  17. 1 0
      src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/package-info.java
  18. 1 1
      src/main/java/cn/iocoder/dashboard/modules/infra/service/config/InfConfigService.java
  19. 2 2
      src/main/java/cn/iocoder/dashboard/modules/infra/service/config/impl/InfConfigServiceImpl.java
  20. 3 3
      src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/SysAuthController.java
  21. 3 3
      src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/SysUserSessionController.java
  22. 1 1
      src/main/java/cn/iocoder/dashboard/modules/system/controller/common/SysFileController.java
  23. 1 1
      src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/SysDeptController.java
  24. 1 1
      src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/SysPostController.java
  25. 1 1
      src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/SysDictDataController.java
  26. 1 1
      src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/SysDictTypeController.java
  27. 1 1
      src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/SysLoginLogController.java
  28. 2 2
      src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/SysOperateLogController.java
  29. 1 1
      src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysMenuController.java
  30. 1 1
      src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysRoleController.java
  31. 1 1
      src/main/java/cn/iocoder/dashboard/modules/system/controller/test/SysTestDemoController.java
  32. 2 2
      src/main/java/cn/iocoder/dashboard/modules/system/controller/user/SysUserController.java
  33. 3 3
      src/main/java/cn/iocoder/dashboard/modules/system/convert/auth/SysAuthConvert.java
  34. 1 2
      src/main/java/cn/iocoder/dashboard/modules/system/convert/auth/SysUserSessionConvert.java
  35. 1 1
      src/main/java/cn/iocoder/dashboard/modules/system/convert/dept/SysDeptConvert.java
  36. 1 1
      src/main/java/cn/iocoder/dashboard/modules/system/convert/dept/SysPostConvert.java
  37. 1 1
      src/main/java/cn/iocoder/dashboard/modules/system/convert/dict/SysDictDataConvert.java
  38. 1 1
      src/main/java/cn/iocoder/dashboard/modules/system/convert/dict/SysDictTypeConvert.java
  39. 1 1
      src/main/java/cn/iocoder/dashboard/modules/system/convert/logger/SysLoginLogConvert.java
  40. 2 2
      src/main/java/cn/iocoder/dashboard/modules/system/convert/logger/SysOperateLogConvert.java
  41. 1 1
      src/main/java/cn/iocoder/dashboard/modules/system/convert/notice/SysNoticeConvert.java
  42. 1 1
      src/main/java/cn/iocoder/dashboard/modules/system/convert/permission/SysMenuConvert.java
  43. 1 1
      src/main/java/cn/iocoder/dashboard/modules/system/convert/permission/SysRoleConvert.java
  44. 2 2
      src/main/java/cn/iocoder/dashboard/modules/system/convert/user/SysUserConvert.java
  45. 2 2
      src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/auth/SysUserSessionDO.java
  46. 1 1
      src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/common/SysFileDO.java
  47. 1 1
      src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/dept/SysDeptDO.java
  48. 1 1
      src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/dept/SysPostDO.java
  49. 1 1
      src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/dict/SysDictDataDO.java
  50. 1 1
      src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/dict/SysDictTypeDO.java
  51. 1 1
      src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/logger/SysLoginLogDO.java
  52. 2 2
      src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/logger/SysOperateLogDO.java
  53. 1 1
      src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/notice/SysNoticeDO.java
  54. 1 1
      src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/permission/SysMenuDO.java
  55. 1 1
      src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/permission/SysRoleDO.java
  56. 1 1
      src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/permission/SysRoleMenuDO.java
  57. 1 1
      src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/permission/SysUserRoleDO.java
  58. 1 1
      src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/test/SysTestDemoDO.java
  59. 1 1
      src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/user/SysUserDO.java
  60. 2 2
      src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/auth/SysUserSessionMapper.java
  61. 2 2
      src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/common/SysFileMapper.java
  62. 2 2
      src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dept/SysDeptMapper.java
  63. 2 2
      src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dept/SysPostMapper.java
  64. 2 2
      src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dict/SysDictDataMapper.java
  65. 2 2
      src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dict/SysDictTypeMapper.java
  66. 2 2
      src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/logger/SysLoginLogMapper.java
  67. 2 2
      src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/logger/SysOperateLogMapper.java
  68. 2 2
      src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/notice/SysNoticeMapper.java
  69. 2 2
      src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/permission/SysMenuMapper.java
  70. 2 2
      src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/permission/SysRoleMapper.java
  71. 2 2
      src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/permission/SysRoleMenuMapper.java
  72. 2 2
      src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/permission/SysUserRoleMapper.java
  73. 2 2
      src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/test/SysTestDemoMapper.java
  74. 2 2
      src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/user/SysUserMapper.java
  75. 1 1
      src/main/java/cn/iocoder/dashboard/modules/system/service/auth/SysUserSessionService.java
  76. 1 1
      src/main/java/cn/iocoder/dashboard/modules/system/service/auth/impl/SysAuthServiceImpl.java
  77. 3 3
      src/main/java/cn/iocoder/dashboard/modules/system/service/auth/impl/SysUserSessionServiceImpl.java
  78. 1 1
      src/main/java/cn/iocoder/dashboard/modules/system/service/common/SysFileService.java
  79. 2 2
      src/main/java/cn/iocoder/dashboard/modules/system/service/common/impl/SysFileServiceImpl.java
  80. 1 1
      src/main/java/cn/iocoder/dashboard/modules/system/service/dept/SysDeptService.java
  81. 1 1
      src/main/java/cn/iocoder/dashboard/modules/system/service/dept/SysPostService.java
  82. 2 2
      src/main/java/cn/iocoder/dashboard/modules/system/service/dept/impl/SysDeptServiceImpl.java
  83. 2 2
      src/main/java/cn/iocoder/dashboard/modules/system/service/dept/impl/SysPostServiceImpl.java
  84. 1 1
      src/main/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictDataService.java
  85. 1 1
      src/main/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictTypeService.java
  86. 3 3
      src/main/java/cn/iocoder/dashboard/modules/system/service/dict/impl/SysDictDataServiceImpl.java
  87. 2 2
      src/main/java/cn/iocoder/dashboard/modules/system/service/dict/impl/SysDictTypeServiceImpl.java
  88. 1 1
      src/main/java/cn/iocoder/dashboard/modules/system/service/logger/SysLoginLogService.java
  89. 1 1
      src/main/java/cn/iocoder/dashboard/modules/system/service/logger/SysOperateLogService.java
  90. 2 8
      src/main/java/cn/iocoder/dashboard/modules/system/service/logger/impl/SysLoginLogServiceImpl.java
  91. 5 5
      src/main/java/cn/iocoder/dashboard/modules/system/service/logger/impl/SysOperateLogServiceImpl.java
  92. 1 1
      src/main/java/cn/iocoder/dashboard/modules/system/service/notice/SysNoticeService.java
  93. 2 2
      src/main/java/cn/iocoder/dashboard/modules/system/service/notice/impl/SysNoticeServiceImpl.java
  94. 1 1
      src/main/java/cn/iocoder/dashboard/modules/system/service/permission/SysMenuService.java
  95. 1 1
      src/main/java/cn/iocoder/dashboard/modules/system/service/permission/SysPermissionService.java
  96. 1 1
      src/main/java/cn/iocoder/dashboard/modules/system/service/permission/SysRoleService.java
  97. 2 2
      src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysMenuServiceImpl.java
  98. 6 6
      src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysPermissionServiceImpl.java
  99. 2 2
      src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysRoleServiceImpl.java
  100. 1 1
      src/main/java/cn/iocoder/dashboard/modules/system/service/test/SysTestDemoService.java

+ 1 - 1
src/main/java/cn/iocoder/dashboard/framework/apollo/internals/ConfigFrameworkDAO.java

@@ -1,6 +1,6 @@
 package cn.iocoder.dashboard.framework.apollo.internals;
 
-import cn.iocoder.dashboard.modules.infra.dal.mysql.dataobject.config.InfConfigDO;
+import cn.iocoder.dashboard.modules.infra.dal.dataobject.config.InfConfigDO;
 
 import java.util.Date;
 import java.util.List;

+ 2 - 2
src/main/java/cn/iocoder/dashboard/framework/apollo/internals/DBConfigRepository.java

@@ -3,8 +3,8 @@ package cn.iocoder.dashboard.framework.apollo.internals;
 import cn.hutool.core.collection.CollUtil;
 import cn.iocoder.dashboard.framework.apollo.core.ConfigConsts;
 import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO;
-import cn.iocoder.dashboard.modules.infra.dal.mysql.dao.config.InfConfigDAOImpl;
-import cn.iocoder.dashboard.modules.infra.dal.mysql.dataobject.config.InfConfigDO;
+import cn.iocoder.dashboard.modules.infra.dal.mysql.config.InfConfigDAOImpl;
+import cn.iocoder.dashboard.modules.infra.dal.dataobject.config.InfConfigDO;
 import com.ctrip.framework.apollo.Apollo;
 import com.ctrip.framework.apollo.build.ApolloInjector;
 import com.ctrip.framework.apollo.core.utils.ApolloThreadFactory;

+ 1 - 1
src/main/java/cn/iocoder/dashboard/framework/apollo/package-info.java

@@ -1,7 +1,7 @@
 /**
  * 配置中心客户端,基于 Apollo Client 进行简化
  *
- * 差别在于,我们使用 {@link cn.iocoder.dashboard.modules.infra.dal.mysql.dataobject.config.InfConfigDO} 表作为配置源。
+ * 差别在于,我们使用 {@link cn.iocoder.dashboard.modules.infra.dal.dataobject.config.InfConfigDO} 表作为配置源。
  * 当然,功能肯定也会相对少些,满足最小化诉求。
  *
  * 1. 项目初始化时,可以使用 SysConfigDO 表的配置

+ 1 - 1
src/main/java/cn/iocoder/dashboard/framework/dict/core/service/DictDataFrameworkService.java

@@ -1,6 +1,6 @@
 package cn.iocoder.dashboard.framework.dict.core.service;
 
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dict.SysDictDataDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictDataDO;
 
 import java.util.List;
 

+ 1 - 1
src/main/java/cn/iocoder/dashboard/framework/dict/core/util/DictUtils.java

@@ -1,7 +1,7 @@
 package cn.iocoder.dashboard.framework.dict.core.util;
 
 import cn.iocoder.dashboard.framework.dict.core.service.DictDataFrameworkService;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dict.SysDictDataDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictDataDO;
 import lombok.extern.slf4j.Slf4j;
 
 /**

+ 1 - 1
src/main/java/cn/iocoder/dashboard/framework/excel/core/convert/DictConvert.java

@@ -4,7 +4,7 @@ package cn.iocoder.dashboard.framework.excel.core.convert;
 import cn.hutool.core.convert.Convert;
 import cn.iocoder.dashboard.framework.dict.core.util.DictUtils;
 import cn.iocoder.dashboard.framework.excel.core.annotations.DictFormat;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dict.SysDictDataDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictDataDO;
 import cn.iocoder.dashboard.modules.system.enums.dict.SysDictTypeEnum;
 import com.alibaba.excel.converters.Converter;
 import com.alibaba.excel.enums.CellDataTypeEnum;

+ 1 - 1
src/main/java/cn/iocoder/dashboard/framework/mybatis/core/type/JsonLongSetTypeHandler.java

@@ -1,6 +1,6 @@
 package cn.iocoder.dashboard.framework.mybatis.core.type;
 
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.user.SysUserDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO;
 import cn.iocoder.dashboard.util.json.JsonUtils;
 import com.baomidou.mybatisplus.extension.handlers.AbstractJsonTypeHandler;
 import com.fasterxml.jackson.core.type.TypeReference;

+ 1 - 1
src/main/java/cn/iocoder/dashboard/framework/security/core/service/SecurityPermissionFrameworkService.java

@@ -1,6 +1,6 @@
 package cn.iocoder.dashboard.framework.security.core.service;
 
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission.SysRoleDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysRoleDO;
 
 /**
  * Security 框架 Permission Service 接口,定义 security 组件需要的功能

+ 1 - 1
src/main/java/cn/iocoder/dashboard/modules/infra/controller/config/InfConfigController.java

@@ -6,7 +6,7 @@ import cn.iocoder.dashboard.common.pojo.PageResult;
 import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.dashboard.modules.infra.controller.config.vo.*;
 import cn.iocoder.dashboard.modules.infra.convert.config.InfConfigConvert;
-import cn.iocoder.dashboard.modules.infra.dal.mysql.dataobject.config.InfConfigDO;
+import cn.iocoder.dashboard.modules.infra.dal.dataobject.config.InfConfigDO;
 import cn.iocoder.dashboard.modules.infra.service.config.InfConfigService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

+ 1 - 1
src/main/java/cn/iocoder/dashboard/modules/infra/convert/config/InfConfigConvert.java

@@ -5,7 +5,7 @@ import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigCreateRe
 import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigExcelVO;
 import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigRespVO;
 import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigUpdateReqVO;
-import cn.iocoder.dashboard.modules.infra.dal.mysql.dataobject.config.InfConfigDO;
+import cn.iocoder.dashboard.modules.infra.dal.dataobject.config.InfConfigDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 

+ 1 - 1
src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/dataobject/config/InfConfigDO.java → src/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/config/InfConfigDO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.dashboard.modules.infra.dal.mysql.dataobject.config;
+package cn.iocoder.dashboard.modules.infra.dal.dataobject.config;
 
 import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO;
 import cn.iocoder.dashboard.modules.infra.enums.config.InfConfigTypeEnum;

+ 1 - 0
src/main/java/cn/iocoder/dashboard/modules/infra/dal/dataobject/package-info.java

@@ -0,0 +1 @@
+package cn.iocoder.dashboard.modules.infra.dal.dataobject;

+ 2 - 2
src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/dao/config/InfConfigDAOImpl.java → src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/config/InfConfigDAOImpl.java

@@ -1,7 +1,7 @@
-package cn.iocoder.dashboard.modules.infra.dal.mysql.dao.config;
+package cn.iocoder.dashboard.modules.infra.dal.mysql.config;
 
 import cn.iocoder.dashboard.framework.apollo.internals.ConfigFrameworkDAO;
-import cn.iocoder.dashboard.modules.infra.dal.mysql.dataobject.config.InfConfigDO;
+import cn.iocoder.dashboard.modules.infra.dal.dataobject.config.InfConfigDO;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.datasource.DriverManagerDataSource;

+ 2 - 2
src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/dao/config/InfConfigMapper.java → src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/config/InfConfigMapper.java

@@ -1,11 +1,11 @@
-package cn.iocoder.dashboard.modules.infra.dal.mysql.dao.config;
+package cn.iocoder.dashboard.modules.infra.dal.mysql.config;
 
 import cn.iocoder.dashboard.common.pojo.PageResult;
 import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX;
 import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigExportReqVO;
 import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigPageReqVO;
-import cn.iocoder.dashboard.modules.infra.dal.mysql.dataobject.config.InfConfigDO;
+import cn.iocoder.dashboard.modules.infra.dal.dataobject.config.InfConfigDO;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.apache.ibatis.annotations.Mapper;
 

+ 0 - 1
src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/dao/package-info.java

@@ -1 +0,0 @@
-package cn.iocoder.dashboard.modules.infra.dal.mysql.dao;

+ 0 - 1
src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/dataobject/package-info.java

@@ -1 +0,0 @@
-package cn.iocoder.dashboard.modules.infra.dal.mysql.dataobject;

+ 1 - 0
src/main/java/cn/iocoder/dashboard/modules/infra/dal/mysql/package-info.java

@@ -0,0 +1 @@
+package cn.iocoder.dashboard.modules.infra.dal.mysql;

+ 1 - 1
src/main/java/cn/iocoder/dashboard/modules/infra/service/config/InfConfigService.java

@@ -5,7 +5,7 @@ import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigCreateRe
 import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigExportReqVO;
 import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigPageReqVO;
 import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigUpdateReqVO;
-import cn.iocoder.dashboard.modules.infra.dal.mysql.dataobject.config.InfConfigDO;
+import cn.iocoder.dashboard.modules.infra.dal.dataobject.config.InfConfigDO;
 
 import java.util.List;
 

+ 2 - 2
src/main/java/cn/iocoder/dashboard/modules/infra/service/config/impl/InfConfigServiceImpl.java

@@ -7,8 +7,8 @@ import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigExportRe
 import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigPageReqVO;
 import cn.iocoder.dashboard.modules.infra.controller.config.vo.InfConfigUpdateReqVO;
 import cn.iocoder.dashboard.modules.infra.convert.config.InfConfigConvert;
-import cn.iocoder.dashboard.modules.infra.dal.mysql.dao.config.InfConfigMapper;
-import cn.iocoder.dashboard.modules.infra.dal.mysql.dataobject.config.InfConfigDO;
+import cn.iocoder.dashboard.modules.infra.dal.mysql.config.InfConfigMapper;
+import cn.iocoder.dashboard.modules.infra.dal.dataobject.config.InfConfigDO;
 import cn.iocoder.dashboard.modules.infra.enums.config.InfConfigTypeEnum;
 import cn.iocoder.dashboard.modules.infra.mq.producer.config.InfConfigProducer;
 import cn.iocoder.dashboard.modules.infra.service.config.InfConfigService;

+ 3 - 3
src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/SysAuthController.java

@@ -8,9 +8,9 @@ import cn.iocoder.dashboard.modules.system.controller.auth.vo.auth.SysAuthLoginR
 import cn.iocoder.dashboard.modules.system.controller.auth.vo.auth.SysAuthMenuRespVO;
 import cn.iocoder.dashboard.modules.system.controller.auth.vo.auth.SysAuthPermissionInfoRespVO;
 import cn.iocoder.dashboard.modules.system.convert.auth.SysAuthConvert;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission.SysMenuDO;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission.SysRoleDO;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.user.SysUserDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysMenuDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysRoleDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO;
 import cn.iocoder.dashboard.modules.system.enums.permission.MenuTypeEnum;
 import cn.iocoder.dashboard.modules.system.service.auth.SysAuthService;
 import cn.iocoder.dashboard.modules.system.service.permission.SysPermissionService;

+ 3 - 3
src/main/java/cn/iocoder/dashboard/modules/system/controller/auth/SysUserSessionController.java

@@ -5,9 +5,9 @@ import cn.iocoder.dashboard.common.pojo.PageResult;
 import cn.iocoder.dashboard.modules.system.controller.auth.vo.session.SysUserSessionPageItemRespVO;
 import cn.iocoder.dashboard.modules.system.controller.auth.vo.session.SysUserSessionPageReqVO;
 import cn.iocoder.dashboard.modules.system.convert.auth.SysUserSessionConvert;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.auth.SysUserSessionDO;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dept.SysDeptDO;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.user.SysUserDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.auth.SysUserSessionDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.dept.SysDeptDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO;
 import cn.iocoder.dashboard.modules.system.service.auth.SysUserSessionService;
 import cn.iocoder.dashboard.modules.system.service.dept.SysDeptService;
 import cn.iocoder.dashboard.modules.system.service.user.SysUserService;

+ 1 - 1
src/main/java/cn/iocoder/dashboard/modules/system/controller/common/SysFileController.java

@@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.system.controller.common;
 
 import cn.hutool.core.io.IoUtil;
 import cn.iocoder.dashboard.common.pojo.CommonResult;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.common.SysFileDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.common.SysFileDO;
 import cn.iocoder.dashboard.modules.system.service.common.SysFileService;
 import cn.iocoder.dashboard.util.servlet.ServletUtils;
 import io.swagger.annotations.Api;

+ 1 - 1
src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/SysDeptController.java

@@ -4,7 +4,7 @@ import cn.iocoder.dashboard.common.enums.CommonStatusEnum;
 import cn.iocoder.dashboard.common.pojo.CommonResult;
 import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.*;
 import cn.iocoder.dashboard.modules.system.convert.dept.SysDeptConvert;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dept.SysDeptDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.dept.SysDeptDO;
 import cn.iocoder.dashboard.modules.system.service.dept.SysDeptService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

+ 1 - 1
src/main/java/cn/iocoder/dashboard/modules/system/controller/dept/SysPostController.java

@@ -6,7 +6,7 @@ import cn.iocoder.dashboard.common.pojo.PageResult;
 import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.*;
 import cn.iocoder.dashboard.modules.system.convert.dept.SysPostConvert;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dept.SysPostDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.dept.SysPostDO;
 import cn.iocoder.dashboard.modules.system.service.dept.SysPostService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

+ 1 - 1
src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/SysDictDataController.java

@@ -5,7 +5,7 @@ import cn.iocoder.dashboard.common.pojo.PageResult;
 import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.*;
 import cn.iocoder.dashboard.modules.system.convert.dict.SysDictDataConvert;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dict.SysDictDataDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictDataDO;
 import cn.iocoder.dashboard.modules.system.service.dict.SysDictDataService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

+ 1 - 1
src/main/java/cn/iocoder/dashboard/modules/system/controller/dict/SysDictTypeController.java

@@ -5,7 +5,7 @@ import cn.iocoder.dashboard.common.pojo.PageResult;
 import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.*;
 import cn.iocoder.dashboard.modules.system.convert.dict.SysDictTypeConvert;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dict.SysDictTypeDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictTypeDO;
 import cn.iocoder.dashboard.modules.system.service.dict.SysDictTypeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

+ 1 - 1
src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/SysLoginLogController.java

@@ -8,7 +8,7 @@ import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLogi
 import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogPageReqVO;
 import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogRespVO;
 import cn.iocoder.dashboard.modules.system.convert.logger.SysLoginLogConvert;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.logger.SysLoginLogDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.logger.SysLoginLogDO;
 import cn.iocoder.dashboard.modules.system.service.logger.SysLoginLogService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

+ 2 - 2
src/main/java/cn/iocoder/dashboard/modules/system/controller/logger/SysOperateLogController.java

@@ -11,8 +11,8 @@ import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOp
 import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogPageReqVO;
 import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogRespVO;
 import cn.iocoder.dashboard.modules.system.convert.logger.SysOperateLogConvert;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.logger.SysOperateLogDO;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.user.SysUserDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.logger.SysOperateLogDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO;
 import cn.iocoder.dashboard.modules.system.service.logger.SysOperateLogService;
 import cn.iocoder.dashboard.modules.system.service.user.SysUserService;
 import cn.iocoder.dashboard.util.collection.CollectionUtils;

+ 1 - 1
src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysMenuController.java

@@ -4,7 +4,7 @@ import cn.iocoder.dashboard.common.enums.CommonStatusEnum;
 import cn.iocoder.dashboard.common.pojo.CommonResult;
 import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.*;
 import cn.iocoder.dashboard.modules.system.convert.permission.SysMenuConvert;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission.SysMenuDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysMenuDO;
 import cn.iocoder.dashboard.modules.system.service.permission.SysMenuService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

+ 1 - 1
src/main/java/cn/iocoder/dashboard/modules/system/controller/permission/SysRoleController.java

@@ -6,7 +6,7 @@ import cn.iocoder.dashboard.common.pojo.PageResult;
 import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.*;
 import cn.iocoder.dashboard.modules.system.convert.permission.SysRoleConvert;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission.SysRoleDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysRoleDO;
 import cn.iocoder.dashboard.modules.system.service.permission.SysRoleService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

+ 1 - 1
src/main/java/cn/iocoder/dashboard/modules/system/controller/test/SysTestDemoController.java

@@ -7,7 +7,7 @@ import cn.iocoder.dashboard.modules.system.controller.test.vo.SysTestDemoPageReq
 import cn.iocoder.dashboard.modules.system.controller.test.vo.SysTestDemoRespVO;
 import cn.iocoder.dashboard.modules.system.controller.test.vo.SysTestDemoUpdateReqVO;
 import cn.iocoder.dashboard.modules.system.convert.test.SysTestDemoConvert;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.test.SysTestDemoDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.test.SysTestDemoDO;
 import cn.iocoder.dashboard.modules.system.service.test.SysTestDemoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

+ 2 - 2
src/main/java/cn/iocoder/dashboard/modules/system/controller/user/SysUserController.java

@@ -7,8 +7,8 @@ import cn.iocoder.dashboard.common.pojo.PageResult;
 import cn.iocoder.dashboard.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.dashboard.modules.system.controller.user.vo.user.*;
 import cn.iocoder.dashboard.modules.system.convert.user.SysUserConvert;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dept.SysDeptDO;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.user.SysUserDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.dept.SysDeptDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO;
 import cn.iocoder.dashboard.modules.system.enums.common.SysSexEnum;
 import cn.iocoder.dashboard.modules.system.service.dept.SysDeptService;
 import cn.iocoder.dashboard.modules.system.service.user.SysUserService;

+ 3 - 3
src/main/java/cn/iocoder/dashboard/modules/system/convert/auth/SysAuthConvert.java

@@ -3,9 +3,9 @@ package cn.iocoder.dashboard.modules.system.convert.auth;
 import cn.iocoder.dashboard.framework.security.core.LoginUser;
 import cn.iocoder.dashboard.modules.system.controller.auth.vo.auth.SysAuthMenuRespVO;
 import cn.iocoder.dashboard.modules.system.controller.auth.vo.auth.SysAuthPermissionInfoRespVO;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission.SysMenuDO;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission.SysRoleDO;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.user.SysUserDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysMenuDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysRoleDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO;
 import cn.iocoder.dashboard.modules.system.enums.permission.MenuIdEnum;
 import cn.iocoder.dashboard.util.collection.CollectionUtils;
 import org.mapstruct.Mapper;

+ 1 - 2
src/main/java/cn/iocoder/dashboard/modules/system/convert/auth/SysUserSessionConvert.java

@@ -1,8 +1,7 @@
 package cn.iocoder.dashboard.modules.system.convert.auth;
 
 import cn.iocoder.dashboard.modules.system.controller.auth.vo.session.SysUserSessionPageItemRespVO;
-import cn.iocoder.dashboard.modules.system.controller.user.vo.user.SysUserPageItemRespVO;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.auth.SysUserSessionDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.auth.SysUserSessionDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 

+ 1 - 1
src/main/java/cn/iocoder/dashboard/modules/system/convert/dept/SysDeptConvert.java

@@ -4,7 +4,7 @@ import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.SysDeptCreate
 import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.SysDeptRespVO;
 import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.SysDeptSimpleRespVO;
 import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.SysDeptUpdateReqVO;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dept.SysDeptDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.dept.SysDeptDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 

+ 1 - 1
src/main/java/cn/iocoder/dashboard/modules/system/convert/dept/SysPostConvert.java

@@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.system.convert.dept;
 
 import cn.iocoder.dashboard.common.pojo.PageResult;
 import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.*;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dept.SysPostDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.dept.SysPostDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 

+ 1 - 1
src/main/java/cn/iocoder/dashboard/modules/system/convert/dict/SysDictDataConvert.java

@@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.system.convert.dict;
 
 import cn.iocoder.dashboard.common.pojo.PageResult;
 import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.*;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dict.SysDictDataDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictDataDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 

+ 1 - 1
src/main/java/cn/iocoder/dashboard/modules/system/convert/dict/SysDictTypeConvert.java

@@ -2,7 +2,7 @@ package cn.iocoder.dashboard.modules.system.convert.dict;
 
 import cn.iocoder.dashboard.common.pojo.PageResult;
 import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.*;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dict.SysDictTypeDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictTypeDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 

+ 1 - 1
src/main/java/cn/iocoder/dashboard/modules/system/convert/logger/SysLoginLogConvert.java

@@ -4,7 +4,7 @@ import cn.iocoder.dashboard.common.pojo.PageResult;
 import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogCreateReqVO;
 import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogExcelVO;
 import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogRespVO;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.logger.SysLoginLogDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.logger.SysLoginLogDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 

+ 2 - 2
src/main/java/cn/iocoder/dashboard/modules/system/convert/logger/SysOperateLogConvert.java

@@ -4,8 +4,8 @@ import cn.iocoder.dashboard.common.pojo.PageResult;
 import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogCreateReqVO;
 import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogExcelVO;
 import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogRespVO;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.logger.SysOperateLogDO;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.user.SysUserDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.logger.SysOperateLogDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO;
 import cn.iocoder.dashboard.util.collection.MapUtils;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;

+ 1 - 1
src/main/java/cn/iocoder/dashboard/modules/system/convert/notice/SysNoticeConvert.java

@@ -4,7 +4,7 @@ import cn.iocoder.dashboard.common.pojo.PageResult;
 import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticeCreateReqVO;
 import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticeRespVO;
 import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticeUpdateReqVO;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.notice.SysNoticeDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.notice.SysNoticeDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 

+ 1 - 1
src/main/java/cn/iocoder/dashboard/modules/system/convert/permission/SysMenuConvert.java

@@ -4,7 +4,7 @@ import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenu
 import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuRespVO;
 import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuSimpleRespVO;
 import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuUpdateReqVO;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission.SysMenuDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysMenuDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 

+ 1 - 1
src/main/java/cn/iocoder/dashboard/modules/system/convert/permission/SysRoleConvert.java

@@ -1,7 +1,7 @@
 package cn.iocoder.dashboard.modules.system.convert.permission;
 
 import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.*;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission.SysRoleDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysRoleDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 

+ 2 - 2
src/main/java/cn/iocoder/dashboard/modules/system/convert/user/SysUserConvert.java

@@ -1,8 +1,8 @@
 package cn.iocoder.dashboard.modules.system.convert.user;
 
 import cn.iocoder.dashboard.modules.system.controller.user.vo.user.*;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dept.SysDeptDO;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.user.SysUserDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.dept.SysDeptDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 

+ 2 - 2
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dataobject/auth/SysUserSessionDO.java → src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/auth/SysUserSessionDO.java

@@ -1,8 +1,8 @@
-package cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.auth;
+package cn.iocoder.dashboard.modules.system.dal.dataobject.auth;
 
 import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO;
 import cn.iocoder.dashboard.framework.security.core.LoginUser;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.user.SysUserDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

+ 1 - 1
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dataobject/common/SysFileDO.java → src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/common/SysFileDO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.common;
+package cn.iocoder.dashboard.modules.system.dal.dataobject.common;
 
 import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO;
 import com.baomidou.mybatisplus.annotation.IdType;

+ 1 - 1
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dataobject/dept/SysDeptDO.java → src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/dept/SysDeptDO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dept;
+package cn.iocoder.dashboard.modules.system.dal.dataobject.dept;
 
 import cn.iocoder.dashboard.common.enums.CommonStatusEnum;
 import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO;

+ 1 - 1
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dataobject/dept/SysPostDO.java → src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/dept/SysPostDO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dept;
+package cn.iocoder.dashboard.modules.system.dal.dataobject.dept;
 
 import cn.iocoder.dashboard.common.enums.CommonStatusEnum;
 import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO;

+ 1 - 1
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dataobject/dict/SysDictDataDO.java → src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/dict/SysDictDataDO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dict;
+package cn.iocoder.dashboard.modules.system.dal.dataobject.dict;
 
 import cn.iocoder.dashboard.common.enums.CommonStatusEnum;
 import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO;

+ 1 - 1
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dataobject/dict/SysDictTypeDO.java → src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/dict/SysDictTypeDO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dict;
+package cn.iocoder.dashboard.modules.system.dal.dataobject.dict;
 
 import cn.iocoder.dashboard.common.enums.CommonStatusEnum;
 import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO;

+ 1 - 1
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dataobject/logger/SysLoginLogDO.java → src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/logger/SysLoginLogDO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.logger;
+package cn.iocoder.dashboard.modules.system.dal.dataobject.logger;
 
 import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO;
 import cn.iocoder.dashboard.modules.system.enums.logger.SysLoginLogTypeEnum;

+ 2 - 2
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dataobject/logger/SysOperateLogDO.java → src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/logger/SysOperateLogDO.java

@@ -1,9 +1,9 @@
-package cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.logger;
+package cn.iocoder.dashboard.modules.system.dal.dataobject.logger;
 
 import cn.iocoder.dashboard.common.pojo.CommonResult;
 import cn.iocoder.dashboard.framework.logger.operatelog.core.enums.OperateTypeEnum;
 import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.user.SysUserDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;

+ 1 - 1
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dataobject/notice/SysNoticeDO.java → src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/notice/SysNoticeDO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.notice;
+package cn.iocoder.dashboard.modules.system.dal.dataobject.notice;
 
 import cn.iocoder.dashboard.common.enums.CommonStatusEnum;
 import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO;

+ 1 - 1
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dataobject/permission/SysMenuDO.java → src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/permission/SysMenuDO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission;
+package cn.iocoder.dashboard.modules.system.dal.dataobject.permission;
 
 import cn.iocoder.dashboard.common.enums.CommonStatusEnum;
 import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO;

+ 1 - 1
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dataobject/permission/SysRoleDO.java → src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/permission/SysRoleDO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission;
+package cn.iocoder.dashboard.modules.system.dal.dataobject.permission;
 
 import cn.iocoder.dashboard.common.enums.CommonStatusEnum;
 import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO;

+ 1 - 1
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dataobject/permission/SysRoleMenuDO.java → src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/permission/SysRoleMenuDO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission;
+package cn.iocoder.dashboard.modules.system.dal.dataobject.permission;
 
 import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO;
 import com.baomidou.mybatisplus.annotation.TableId;

+ 1 - 1
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dataobject/permission/SysUserRoleDO.java → src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/permission/SysUserRoleDO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission;
+package cn.iocoder.dashboard.modules.system.dal.dataobject.permission;
 
 import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO;
 import com.baomidou.mybatisplus.annotation.TableId;

+ 1 - 1
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dataobject/test/SysTestDemoDO.java → src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/test/SysTestDemoDO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.test;
+package cn.iocoder.dashboard.modules.system.dal.dataobject.test;
 
 import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO;
 import com.baomidou.mybatisplus.annotation.TableId;

+ 1 - 1
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dataobject/user/SysUserDO.java → src/main/java/cn/iocoder/dashboard/modules/system/dal/dataobject/user/SysUserDO.java

@@ -1,4 +1,4 @@
-package cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.user;
+package cn.iocoder.dashboard.modules.system.dal.dataobject.user;
 
 import cn.iocoder.dashboard.common.enums.CommonStatusEnum;
 import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO;

+ 2 - 2
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dao/auth/SysUserSessionMapper.java → src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/auth/SysUserSessionMapper.java

@@ -1,10 +1,10 @@
-package cn.iocoder.dashboard.modules.system.dal.mysql.dao.auth;
+package cn.iocoder.dashboard.modules.system.dal.mysql.auth;
 
 import cn.iocoder.dashboard.common.pojo.PageResult;
 import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX;
 import cn.iocoder.dashboard.modules.system.controller.auth.vo.session.SysUserSessionPageReqVO;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.auth.SysUserSessionDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.auth.SysUserSessionDO;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.Collection;

+ 2 - 2
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dao/common/SysFileMapper.java → src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/common/SysFileMapper.java

@@ -1,6 +1,6 @@
-package cn.iocoder.dashboard.modules.system.dal.mysql.dao.common;
+package cn.iocoder.dashboard.modules.system.dal.mysql.common;
 
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.common.SysFileDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.common.SysFileDO;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;

+ 2 - 2
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dao/dept/SysDeptMapper.java → src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dept/SysDeptMapper.java

@@ -1,9 +1,9 @@
-package cn.iocoder.dashboard.modules.system.dal.mysql.dao.dept;
+package cn.iocoder.dashboard.modules.system.dal.mysql.dept;
 
 import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX;
 import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.SysDeptListReqVO;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dept.SysDeptDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.dept.SysDeptDO;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.apache.ibatis.annotations.Mapper;
 

+ 2 - 2
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dao/dept/SysPostMapper.java → src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dept/SysPostMapper.java

@@ -1,11 +1,11 @@
-package cn.iocoder.dashboard.modules.system.dal.mysql.dao.dept;
+package cn.iocoder.dashboard.modules.system.dal.mysql.dept;
 
 import cn.iocoder.dashboard.common.pojo.PageResult;
 import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX;
 import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.SysPostExportReqVO;
 import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.SysPostPageReqVO;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dept.SysPostDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.dept.SysPostDO;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.apache.ibatis.annotations.Mapper;
 

+ 2 - 2
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dao/dict/SysDictDataMapper.java → src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dict/SysDictDataMapper.java

@@ -1,11 +1,11 @@
-package cn.iocoder.dashboard.modules.system.dal.mysql.dao.dict;
+package cn.iocoder.dashboard.modules.system.dal.mysql.dict;
 
 import cn.iocoder.dashboard.common.pojo.PageResult;
 import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX;
 import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.SysDictDataExportReqVO;
 import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.SysDictDataPageReqVO;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dict.SysDictDataDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictDataDO;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.apache.ibatis.annotations.Mapper;
 

+ 2 - 2
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dao/dict/SysDictTypeMapper.java → src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dict/SysDictTypeMapper.java

@@ -1,11 +1,11 @@
-package cn.iocoder.dashboard.modules.system.dal.mysql.dao.dict;
+package cn.iocoder.dashboard.modules.system.dal.mysql.dict;
 
 import cn.iocoder.dashboard.common.pojo.PageResult;
 import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX;
 import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.SysDictTypeExportReqVO;
 import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.SysDictTypePageReqVO;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dict.SysDictTypeDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictTypeDO;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

+ 2 - 2
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dao/logger/SysLoginLogMapper.java → src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/logger/SysLoginLogMapper.java

@@ -1,11 +1,11 @@
-package cn.iocoder.dashboard.modules.system.dal.mysql.dao.logger;
+package cn.iocoder.dashboard.modules.system.dal.mysql.logger;
 
 import cn.iocoder.dashboard.common.pojo.PageResult;
 import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX;
 import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogExportReqVO;
 import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogPageReqVO;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.logger.SysLoginLogDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.logger.SysLoginLogDO;
 import cn.iocoder.dashboard.modules.system.enums.logger.SysLoginResultEnum;
 import org.apache.ibatis.annotations.Mapper;
 

+ 2 - 2
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dao/logger/SysOperateLogMapper.java → src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/logger/SysOperateLogMapper.java

@@ -1,4 +1,4 @@
-package cn.iocoder.dashboard.modules.system.dal.mysql.dao.logger;
+package cn.iocoder.dashboard.modules.system.dal.mysql.logger;
 
 import cn.iocoder.dashboard.common.exception.enums.GlobalErrorCodeConstants;
 import cn.iocoder.dashboard.common.pojo.PageResult;
@@ -6,7 +6,7 @@ import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX;
 import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogExportReqVO;
 import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogPageReqVO;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.logger.SysOperateLogDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.logger.SysOperateLogDO;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.Collection;

+ 2 - 2
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dao/notice/SysNoticeMapper.java → src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/notice/SysNoticeMapper.java

@@ -1,10 +1,10 @@
-package cn.iocoder.dashboard.modules.system.dal.mysql.dao.notice;
+package cn.iocoder.dashboard.modules.system.dal.mysql.notice;
 
 import cn.iocoder.dashboard.common.pojo.PageResult;
 import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX;
 import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticePageReqVO;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.notice.SysNoticeDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.notice.SysNoticeDO;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper

+ 2 - 2
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dao/permission/SysMenuMapper.java → src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/permission/SysMenuMapper.java

@@ -1,9 +1,9 @@
-package cn.iocoder.dashboard.modules.system.dal.mysql.dao.permission;
+package cn.iocoder.dashboard.modules.system.dal.mysql.permission;
 
 import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX;
 import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuListReqVO;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission.SysMenuDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysMenuDO;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.apache.ibatis.annotations.Mapper;
 

+ 2 - 2
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dao/permission/SysRoleMapper.java → src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/permission/SysRoleMapper.java

@@ -1,11 +1,11 @@
-package cn.iocoder.dashboard.modules.system.dal.mysql.dao.permission;
+package cn.iocoder.dashboard.modules.system.dal.mysql.permission;
 
 import cn.iocoder.dashboard.common.pojo.PageResult;
 import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX;
 import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.SysRoleExportReqVO;
 import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.SysRolePageReqVO;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission.SysRoleDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysRoleDO;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.lang.Nullable;

+ 2 - 2
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dao/permission/SysRoleMenuMapper.java → src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/permission/SysRoleMenuMapper.java

@@ -1,7 +1,7 @@
-package cn.iocoder.dashboard.modules.system.dal.mysql.dao.permission;
+package cn.iocoder.dashboard.modules.system.dal.mysql.permission;
 
 import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission.SysRoleMenuDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysRoleMenuDO;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.apache.ibatis.annotations.Mapper;
 

+ 2 - 2
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dao/permission/SysUserRoleMapper.java → src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/permission/SysUserRoleMapper.java

@@ -1,6 +1,6 @@
-package cn.iocoder.dashboard.modules.system.dal.mysql.dao.permission;
+package cn.iocoder.dashboard.modules.system.dal.mysql.permission;
 
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission.SysUserRoleDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysUserRoleDO;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;

+ 2 - 2
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dao/test/SysTestDemoMapper.java → src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/test/SysTestDemoMapper.java

@@ -1,9 +1,9 @@
-package cn.iocoder.dashboard.modules.system.dal.mysql.dao.test;
+package cn.iocoder.dashboard.modules.system.dal.mysql.test;
 
 import cn.iocoder.dashboard.common.pojo.PageResult;
 import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX;
 import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.test.SysTestDemoDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.test.SysTestDemoDO;
 import org.apache.ibatis.annotations.Mapper;
 import cn.iocoder.dashboard.modules.system.controller.test.vo.SysTestDemoPageReqVO;
 

+ 2 - 2
src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/dao/user/SysUserMapper.java → src/main/java/cn/iocoder/dashboard/modules/system/dal/mysql/user/SysUserMapper.java

@@ -1,11 +1,11 @@
-package cn.iocoder.dashboard.modules.system.dal.mysql.dao.user;
+package cn.iocoder.dashboard.modules.system.dal.mysql.user;
 
 import cn.iocoder.dashboard.common.pojo.PageResult;
 import cn.iocoder.dashboard.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.dashboard.framework.mybatis.core.query.QueryWrapperX;
 import cn.iocoder.dashboard.modules.system.controller.user.vo.user.SysUserExportReqVO;
 import cn.iocoder.dashboard.modules.system.controller.user.vo.user.SysUserPageReqVO;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.user.SysUserDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.apache.ibatis.annotations.Mapper;
 

+ 1 - 1
src/main/java/cn/iocoder/dashboard/modules/system/service/auth/SysUserSessionService.java

@@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.system.service.auth;
 import cn.iocoder.dashboard.common.pojo.PageResult;
 import cn.iocoder.dashboard.framework.security.core.LoginUser;
 import cn.iocoder.dashboard.modules.system.controller.auth.vo.session.SysUserSessionPageReqVO;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.auth.SysUserSessionDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.auth.SysUserSessionDO;
 
 /**
  * 在线用户 Session Service 接口

+ 1 - 1
src/main/java/cn/iocoder/dashboard/modules/system/service/auth/impl/SysAuthServiceImpl.java

@@ -7,7 +7,7 @@ import cn.iocoder.dashboard.framework.tracer.core.util.TracerUtils;
 import cn.iocoder.dashboard.modules.system.controller.auth.vo.auth.SysAuthLoginReqVO;
 import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogCreateReqVO;
 import cn.iocoder.dashboard.modules.system.convert.auth.SysAuthConvert;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.user.SysUserDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO;
 import cn.iocoder.dashboard.modules.system.enums.logger.SysLoginLogTypeEnum;
 import cn.iocoder.dashboard.modules.system.enums.logger.SysLoginResultEnum;
 import cn.iocoder.dashboard.modules.system.service.auth.SysAuthService;

+ 3 - 3
src/main/java/cn/iocoder/dashboard/modules/system/service/auth/impl/SysUserSessionServiceImpl.java

@@ -7,9 +7,9 @@ import cn.iocoder.dashboard.common.pojo.PageResult;
 import cn.iocoder.dashboard.framework.security.config.SecurityProperties;
 import cn.iocoder.dashboard.framework.security.core.LoginUser;
 import cn.iocoder.dashboard.modules.system.controller.auth.vo.session.SysUserSessionPageReqVO;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dao.auth.SysUserSessionMapper;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.auth.SysUserSessionDO;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.user.SysUserDO;
+import cn.iocoder.dashboard.modules.system.dal.mysql.auth.SysUserSessionMapper;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.auth.SysUserSessionDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO;
 import cn.iocoder.dashboard.modules.system.dal.redis.dao.auth.SysLoginUserRedisDAO;
 import cn.iocoder.dashboard.modules.system.service.auth.SysUserSessionService;
 import cn.iocoder.dashboard.modules.system.service.user.SysUserService;

+ 1 - 1
src/main/java/cn/iocoder/dashboard/modules/system/service/common/SysFileService.java

@@ -1,6 +1,6 @@
 package cn.iocoder.dashboard.modules.system.service.common;
 
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.common.SysFileDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.common.SysFileDO;
 
 /**
  * 文件 Service 接口

+ 2 - 2
src/main/java/cn/iocoder/dashboard/modules/system/service/common/impl/SysFileServiceImpl.java

@@ -2,8 +2,8 @@ package cn.iocoder.dashboard.modules.system.service.common.impl;
 
 import cn.iocoder.dashboard.common.exception.util.ServiceExceptionUtil;
 import cn.iocoder.dashboard.framework.file.config.FileProperties;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dao.common.SysFileMapper;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.common.SysFileDO;
+import cn.iocoder.dashboard.modules.system.dal.mysql.common.SysFileMapper;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.common.SysFileDO;
 import cn.iocoder.dashboard.modules.system.service.common.SysFileService;
 import org.springframework.stereotype.Service;
 

+ 1 - 1
src/main/java/cn/iocoder/dashboard/modules/system/service/dept/SysDeptService.java

@@ -4,7 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.SysDeptCreateReqVO;
 import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.SysDeptListReqVO;
 import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.SysDeptUpdateReqVO;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dept.SysDeptDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.dept.SysDeptDO;
 import cn.iocoder.dashboard.util.collection.CollectionUtils;
 
 import java.util.Collection;

+ 1 - 1
src/main/java/cn/iocoder/dashboard/modules/system/service/dept/SysPostService.java

@@ -5,7 +5,7 @@ import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.SysPostCreate
 import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.SysPostExportReqVO;
 import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.SysPostPageReqVO;
 import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.SysPostUpdateReqVO;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dept.SysPostDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.dept.SysPostDO;
 import org.springframework.lang.Nullable;
 
 import java.util.Collection;

+ 2 - 2
src/main/java/cn/iocoder/dashboard/modules/system/service/dept/impl/SysDeptServiceImpl.java

@@ -8,8 +8,8 @@ import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.SysDeptCreate
 import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.SysDeptListReqVO;
 import cn.iocoder.dashboard.modules.system.controller.dept.vo.dept.SysDeptUpdateReqVO;
 import cn.iocoder.dashboard.modules.system.convert.dept.SysDeptConvert;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dao.dept.SysDeptMapper;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dept.SysDeptDO;
+import cn.iocoder.dashboard.modules.system.dal.mysql.dept.SysDeptMapper;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.dept.SysDeptDO;
 import cn.iocoder.dashboard.modules.system.enums.dept.DeptIdEnum;
 import cn.iocoder.dashboard.modules.system.mq.producer.dept.SysDeptProducer;
 import cn.iocoder.dashboard.modules.system.service.dept.SysDeptService;

+ 2 - 2
src/main/java/cn/iocoder/dashboard/modules/system/service/dept/impl/SysPostServiceImpl.java

@@ -7,8 +7,8 @@ import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.SysPostExport
 import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.SysPostPageReqVO;
 import cn.iocoder.dashboard.modules.system.controller.dept.vo.post.SysPostUpdateReqVO;
 import cn.iocoder.dashboard.modules.system.convert.dept.SysPostConvert;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dao.dept.SysPostMapper;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dept.SysPostDO;
+import cn.iocoder.dashboard.modules.system.dal.mysql.dept.SysPostMapper;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.dept.SysPostDO;
 import cn.iocoder.dashboard.modules.system.service.dept.SysPostService;
 import org.springframework.stereotype.Service;
 

+ 1 - 1
src/main/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictDataService.java

@@ -6,7 +6,7 @@ import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.SysDictDataCr
 import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.SysDictDataExportReqVO;
 import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.SysDictDataPageReqVO;
 import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.SysDictDataUpdateReqVO;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dict.SysDictDataDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictDataDO;
 
 import java.util.List;
 

+ 1 - 1
src/main/java/cn/iocoder/dashboard/modules/system/service/dict/SysDictTypeService.java

@@ -5,7 +5,7 @@ import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.SysDictTypeCr
 import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.SysDictTypeExportReqVO;
 import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.SysDictTypePageReqVO;
 import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.SysDictTypeUpdateReqVO;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dict.SysDictTypeDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictTypeDO;
 
 import java.util.List;
 

+ 3 - 3
src/main/java/cn/iocoder/dashboard/modules/system/service/dict/impl/SysDictDataServiceImpl.java

@@ -10,9 +10,9 @@ import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.SysDictDataEx
 import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.SysDictDataPageReqVO;
 import cn.iocoder.dashboard.modules.system.controller.dict.vo.data.SysDictDataUpdateReqVO;
 import cn.iocoder.dashboard.modules.system.convert.dict.SysDictDataConvert;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dao.dict.SysDictDataMapper;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dict.SysDictDataDO;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dict.SysDictTypeDO;
+import cn.iocoder.dashboard.modules.system.dal.mysql.dict.SysDictDataMapper;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictDataDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictTypeDO;
 import cn.iocoder.dashboard.modules.system.mq.producer.dict.SysDictDataProducer;
 import cn.iocoder.dashboard.modules.system.service.dict.SysDictDataService;
 import cn.iocoder.dashboard.modules.system.service.dict.SysDictTypeService;

+ 2 - 2
src/main/java/cn/iocoder/dashboard/modules/system/service/dict/impl/SysDictTypeServiceImpl.java

@@ -7,8 +7,8 @@ import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.SysDictTypeEx
 import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.SysDictTypePageReqVO;
 import cn.iocoder.dashboard.modules.system.controller.dict.vo.type.SysDictTypeUpdateReqVO;
 import cn.iocoder.dashboard.modules.system.convert.dict.SysDictTypeConvert;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dao.dict.SysDictTypeMapper;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.dict.SysDictTypeDO;
+import cn.iocoder.dashboard.modules.system.dal.mysql.dict.SysDictTypeMapper;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.dict.SysDictTypeDO;
 import cn.iocoder.dashboard.modules.system.service.dict.SysDictDataService;
 import cn.iocoder.dashboard.modules.system.service.dict.SysDictTypeService;
 import org.springframework.stereotype.Service;

+ 1 - 1
src/main/java/cn/iocoder/dashboard/modules/system/service/logger/SysLoginLogService.java

@@ -4,7 +4,7 @@ import cn.iocoder.dashboard.common.pojo.PageResult;
 import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogCreateReqVO;
 import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogExportReqVO;
 import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogPageReqVO;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.logger.SysLoginLogDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.logger.SysLoginLogDO;
 
 import java.util.List;
 

+ 1 - 1
src/main/java/cn/iocoder/dashboard/modules/system/service/logger/SysOperateLogService.java

@@ -4,7 +4,7 @@ import cn.iocoder.dashboard.common.pojo.PageResult;
 import cn.iocoder.dashboard.framework.logger.operatelog.core.service.OperateLogFrameworkService;
 import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogExportReqVO;
 import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogPageReqVO;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.logger.SysOperateLogDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.logger.SysOperateLogDO;
 
 import java.util.List;
 

+ 2 - 8
src/main/java/cn/iocoder/dashboard/modules/system/service/logger/impl/SysLoginLogServiceImpl.java

@@ -1,25 +1,19 @@
 package cn.iocoder.dashboard.modules.system.service.logger.impl;
 
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.StrUtil;
 import cn.iocoder.dashboard.common.pojo.PageResult;
 import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogCreateReqVO;
 import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogExportReqVO;
 import cn.iocoder.dashboard.modules.system.controller.logger.vo.loginlog.SysLoginLogPageReqVO;
 import cn.iocoder.dashboard.modules.system.convert.logger.SysLoginLogConvert;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dao.logger.SysLoginLogMapper;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.logger.SysLoginLogDO;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.user.SysUserDO;
+import cn.iocoder.dashboard.modules.system.dal.mysql.logger.SysLoginLogMapper;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.logger.SysLoginLogDO;
 import cn.iocoder.dashboard.modules.system.service.logger.SysLoginLogService;
 import cn.iocoder.dashboard.modules.system.service.user.SysUserService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.Collection;
 import java.util.List;
 
-import static cn.iocoder.dashboard.util.collection.CollectionUtils.convertSet;
-
 /**
  * 登陆日志 Service 实现
  */

+ 5 - 5
src/main/java/cn/iocoder/dashboard/modules/system/service/logger/impl/SysOperateLogServiceImpl.java

@@ -7,9 +7,9 @@ import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOp
 import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogExportReqVO;
 import cn.iocoder.dashboard.modules.system.controller.logger.vo.operatelog.SysOperateLogPageReqVO;
 import cn.iocoder.dashboard.modules.system.convert.logger.SysOperateLogConvert;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dao.logger.SysOperateLogMapper;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.logger.SysOperateLogDO;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.user.SysUserDO;
+import cn.iocoder.dashboard.modules.system.dal.mysql.logger.SysOperateLogMapper;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.logger.SysOperateLogDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.user.SysUserDO;
 import cn.iocoder.dashboard.modules.system.service.logger.SysOperateLogService;
 import cn.iocoder.dashboard.modules.system.service.user.SysUserService;
 import cn.iocoder.dashboard.util.string.StrUtils;
@@ -22,8 +22,8 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
-import static cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.logger.SysOperateLogDO.JAVA_METHOD_ARGS_MAX_LENGTH;
-import static cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.logger.SysOperateLogDO.RESULT_MAX_LENGTH;
+import static cn.iocoder.dashboard.modules.system.dal.dataobject.logger.SysOperateLogDO.JAVA_METHOD_ARGS_MAX_LENGTH;
+import static cn.iocoder.dashboard.modules.system.dal.dataobject.logger.SysOperateLogDO.RESULT_MAX_LENGTH;
 import static cn.iocoder.dashboard.util.collection.CollectionUtils.convertSet;
 
 @Service

+ 1 - 1
src/main/java/cn/iocoder/dashboard/modules/system/service/notice/SysNoticeService.java

@@ -4,7 +4,7 @@ import cn.iocoder.dashboard.common.pojo.PageResult;
 import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticeCreateReqVO;
 import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticePageReqVO;
 import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticeUpdateReqVO;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.notice.SysNoticeDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.notice.SysNoticeDO;
 
 /**
  * 通知公告 Service 接口

+ 2 - 2
src/main/java/cn/iocoder/dashboard/modules/system/service/notice/impl/SysNoticeServiceImpl.java

@@ -6,8 +6,8 @@ import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticeCreateR
 import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticePageReqVO;
 import cn.iocoder.dashboard.modules.system.controller.notice.vo.SysNoticeUpdateReqVO;
 import cn.iocoder.dashboard.modules.system.convert.notice.SysNoticeConvert;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dao.notice.SysNoticeMapper;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.notice.SysNoticeDO;
+import cn.iocoder.dashboard.modules.system.dal.mysql.notice.SysNoticeMapper;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.notice.SysNoticeDO;
 import cn.iocoder.dashboard.modules.system.service.notice.SysNoticeService;
 import org.springframework.stereotype.Service;
 

+ 1 - 1
src/main/java/cn/iocoder/dashboard/modules/system/service/permission/SysMenuService.java

@@ -3,7 +3,7 @@ package cn.iocoder.dashboard.modules.system.service.permission;
 import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuCreateReqVO;
 import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuListReqVO;
 import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuUpdateReqVO;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission.SysMenuDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysMenuDO;
 
 import java.util.Collection;
 import java.util.List;

+ 1 - 1
src/main/java/cn/iocoder/dashboard/modules/system/service/permission/SysPermissionService.java

@@ -1,7 +1,7 @@
 package cn.iocoder.dashboard.modules.system.service.permission;
 
 import cn.iocoder.dashboard.framework.security.core.service.SecurityPermissionFrameworkService;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission.SysMenuDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysMenuDO;
 import org.springframework.lang.Nullable;
 
 import java.util.Collection;

+ 1 - 1
src/main/java/cn/iocoder/dashboard/modules/system/service/permission/SysRoleService.java

@@ -5,7 +5,7 @@ import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.SysRole
 import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.SysRoleExportReqVO;
 import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.SysRolePageReqVO;
 import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.SysRoleUpdateReqVO;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission.SysRoleDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysRoleDO;
 import org.springframework.lang.Nullable;
 
 import java.util.Collection;

+ 2 - 2
src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysMenuServiceImpl.java

@@ -7,8 +7,8 @@ import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenu
 import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuListReqVO;
 import cn.iocoder.dashboard.modules.system.controller.permission.vo.menu.SysMenuUpdateReqVO;
 import cn.iocoder.dashboard.modules.system.convert.permission.SysMenuConvert;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dao.permission.SysMenuMapper;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission.SysMenuDO;
+import cn.iocoder.dashboard.modules.system.dal.mysql.permission.SysMenuMapper;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysMenuDO;
 import cn.iocoder.dashboard.modules.system.enums.permission.MenuIdEnum;
 import cn.iocoder.dashboard.modules.system.enums.permission.MenuTypeEnum;
 import cn.iocoder.dashboard.modules.system.mq.producer.permission.SysMenuProducer;

+ 6 - 6
src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysPermissionServiceImpl.java

@@ -5,12 +5,12 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ArrayUtil;
 import cn.iocoder.dashboard.framework.mybatis.core.dataobject.BaseDO;
 import cn.iocoder.dashboard.framework.security.core.util.SecurityUtils;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dao.permission.SysRoleMenuMapper;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dao.permission.SysUserRoleMapper;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission.SysMenuDO;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission.SysRoleDO;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission.SysRoleMenuDO;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission.SysUserRoleDO;
+import cn.iocoder.dashboard.modules.system.dal.mysql.permission.SysRoleMenuMapper;
+import cn.iocoder.dashboard.modules.system.dal.mysql.permission.SysUserRoleMapper;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysMenuDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysRoleDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysRoleMenuDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysUserRoleDO;
 import cn.iocoder.dashboard.modules.system.mq.producer.permission.SysPermissionProducer;
 import cn.iocoder.dashboard.modules.system.service.permission.SysMenuService;
 import cn.iocoder.dashboard.modules.system.service.permission.SysPermissionService;

+ 2 - 2
src/main/java/cn/iocoder/dashboard/modules/system/service/permission/impl/SysRoleServiceImpl.java

@@ -11,8 +11,8 @@ import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.SysRole
 import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.SysRolePageReqVO;
 import cn.iocoder.dashboard.modules.system.controller.permission.vo.role.SysRoleUpdateReqVO;
 import cn.iocoder.dashboard.modules.system.convert.permission.SysRoleConvert;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dao.permission.SysRoleMapper;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.permission.SysRoleDO;
+import cn.iocoder.dashboard.modules.system.dal.mysql.permission.SysRoleMapper;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.permission.SysRoleDO;
 import cn.iocoder.dashboard.modules.system.enums.permission.RoleCodeEnum;
 import cn.iocoder.dashboard.modules.system.enums.permission.SysRoleTypeEnum;
 import cn.iocoder.dashboard.modules.system.mq.producer.permission.SysRoleProducer;

+ 1 - 1
src/main/java/cn/iocoder/dashboard/modules/system/service/test/SysTestDemoService.java

@@ -4,7 +4,7 @@ import cn.iocoder.dashboard.common.pojo.PageResult;
 import cn.iocoder.dashboard.modules.system.controller.test.vo.SysTestDemoCreateReqVO;
 import cn.iocoder.dashboard.modules.system.controller.test.vo.SysTestDemoPageReqVO;
 import cn.iocoder.dashboard.modules.system.controller.test.vo.SysTestDemoUpdateReqVO;
-import cn.iocoder.dashboard.modules.system.dal.mysql.dataobject.test.SysTestDemoDO;
+import cn.iocoder.dashboard.modules.system.dal.dataobject.test.SysTestDemoDO;
 
 import javax.validation.Valid;
 import java.util.Collection;

Some files were not shown because too many files changed in this diff