From 6a423c996a87a9592df8de0cf552b43059f1cc9d Mon Sep 17 00:00:00 2001 From: dataprince Date: Sat, 8 Jul 2023 16:36:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E8=80=83RuoYi-Cloud=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0ruoyi-modules=E6=A8=A1=E5=9D=97=EF=BC=8C=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E9=A1=B9=E7=9B=AE=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 ++--- pom.xml | 4 +-- .../src/main/resources/application.yml | 4 +-- ruoyi-common/pom.xml | 2 +- .../ruoyi/common/core/domain/TreeEntity.java | 6 +++++ ruoyi-modules/pom.xml | 26 +++++++++++++++++++ ruoyi-modules/ruoyi-demo/pom.xml | 23 ++++++++++++++++ .../ruoyi-generator}/pom.xml | 2 +- .../com/ruoyi/generator/config/GenConfig.java | 0 .../generator/controller/GenController.java | 0 .../com/ruoyi/generator/domain/GenTable.java | 0 .../generator/domain/GenTableColumn.java | 0 .../mapper/GenTableColumnMapper.java | 0 .../generator/mapper/GenTableMapper.java | 0 .../service/GenTableColumnServiceImpl.java | 0 .../service/GenTableServiceImpl.java | 0 .../service/IGenTableColumnService.java | 0 .../generator/service/IGenTableService.java | 0 .../com/ruoyi/generator/util/GenUtils.java | 0 .../generator/util/VelocityInitializer.java | 0 .../ruoyi/generator/util/VelocityUtils.java | 0 .../src/main/resources/generator.yml | 0 .../mapper/generator/GenTableColumnMapper.xml | 0 .../mapper/generator/GenTableMapper.xml | 0 .../main/resources/vm/java/controller.java.vm | 0 .../src/main/resources/vm/java/domain.java.vm | 0 .../src/main/resources/vm/java/mapper.java.vm | 0 .../main/resources/vm/java/service.java.vm | 0 .../resources/vm/java/serviceImpl.java.vm | 0 .../main/resources/vm/java/sub-domain.java.vm | 0 .../src/main/resources/vm/js/api.js.vm | 0 .../src/main/resources/vm/sql/sql.vm | 0 .../main/resources/vm/vue/index-tree.vue.vm | 0 .../src/main/resources/vm/vue/index.vue.vm | 0 .../resources/vm/vue/v3/index-tree.vue.vm | 0 .../src/main/resources/vm/vue/v3/index.vue.vm | 0 .../src/main/resources/vm/xml/mapper.xml.vm | 0 .../ruoyi-quartz}/pom.xml | 2 +- .../ruoyi/quartz/config/ScheduleConfig.java | 0 .../quartz/controller/SysJobController.java | 0 .../controller/SysJobLogController.java | 0 .../java/com/ruoyi/quartz/domain/SysJob.java | 0 .../com/ruoyi/quartz/domain/SysJobLog.java | 0 .../ruoyi/quartz/mapper/SysJobLogMapper.java | 0 .../com/ruoyi/quartz/mapper/SysJobMapper.java | 0 .../quartz/service/ISysJobLogService.java | 0 .../ruoyi/quartz/service/ISysJobService.java | 0 .../service/impl/SysJobLogServiceImpl.java | 0 .../service/impl/SysJobServiceImpl.java | 0 .../java/com/ruoyi/quartz/task/RyTask.java | 0 .../ruoyi/quartz/util/AbstractQuartzJob.java | 0 .../java/com/ruoyi/quartz/util/CronUtils.java | 0 .../com/ruoyi/quartz/util/JobInvokeUtil.java | 0 .../QuartzDisallowConcurrentExecution.java | 0 .../ruoyi/quartz/util/QuartzJobExecution.java | 0 .../com/ruoyi/quartz/util/ScheduleUtils.java | 0 .../mapper/quartz/SysJobLogMapper.xml | 0 .../resources/mapper/quartz/SysJobMapper.xml | 0 .../ruoyi-system}/pom.xml | 2 +- .../com/ruoyi/system/domain/SysCache.java | 0 .../com/ruoyi/system/domain/SysConfig.java | 0 .../ruoyi/system/domain/SysLogininfor.java | 0 .../com/ruoyi/system/domain/SysNotice.java | 0 .../com/ruoyi/system/domain/SysOperLog.java | 0 .../java/com/ruoyi/system/domain/SysPost.java | 0 .../com/ruoyi/system/domain/SysRoleDept.java | 0 .../com/ruoyi/system/domain/SysRoleMenu.java | 0 .../ruoyi/system/domain/SysUserOnline.java | 0 .../com/ruoyi/system/domain/SysUserPost.java | 0 .../com/ruoyi/system/domain/SysUserRole.java | 0 .../com/ruoyi/system/domain/vo/MetaVo.java | 0 .../com/ruoyi/system/domain/vo/RouterVo.java | 0 .../ruoyi/system/mapper/SysConfigMapper.java | 0 .../ruoyi/system/mapper/SysDeptMapper.java | 0 .../system/mapper/SysDictDataMapper.java | 0 .../system/mapper/SysDictTypeMapper.java | 0 .../system/mapper/SysLogininforMapper.java | 0 .../ruoyi/system/mapper/SysMenuMapper.java | 0 .../ruoyi/system/mapper/SysNoticeMapper.java | 0 .../ruoyi/system/mapper/SysOperLogMapper.java | 0 .../ruoyi/system/mapper/SysPostMapper.java | 0 .../system/mapper/SysRoleDeptMapper.java | 0 .../ruoyi/system/mapper/SysRoleMapper.java | 0 .../system/mapper/SysRoleMenuMapper.java | 0 .../ruoyi/system/mapper/SysUserMapper.java | 0 .../system/mapper/SysUserPostMapper.java | 0 .../system/mapper/SysUserRoleMapper.java | 0 .../system/service/ISysConfigService.java | 0 .../ruoyi/system/service/ISysDeptService.java | 0 .../system/service/ISysDictDataService.java | 0 .../system/service/ISysDictTypeService.java | 0 .../system/service/ISysLogininforService.java | 0 .../ruoyi/system/service/ISysMenuService.java | 0 .../system/service/ISysNoticeService.java | 0 .../system/service/ISysOperLogService.java | 0 .../ruoyi/system/service/ISysPostService.java | 0 .../ruoyi/system/service/ISysRoleService.java | 0 .../system/service/ISysUserOnlineService.java | 0 .../ruoyi/system/service/ISysUserService.java | 0 .../service/impl/SysConfigServiceImpl.java | 0 .../service/impl/SysDeptServiceImpl.java | 0 .../service/impl/SysDictDataServiceImpl.java | 0 .../service/impl/SysDictTypeServiceImpl.java | 0 .../impl/SysLogininforServiceImpl.java | 0 .../service/impl/SysMenuServiceImpl.java | 0 .../service/impl/SysNoticeServiceImpl.java | 0 .../service/impl/SysOperLogServiceImpl.java | 0 .../service/impl/SysPostServiceImpl.java | 0 .../service/impl/SysRoleServiceImpl.java | 0 .../impl/SysUserOnlineServiceImpl.java | 0 .../service/impl/SysUserServiceImpl.java | 0 .../mapper/system/SysConfigMapper.xml | 0 .../resources/mapper/system/SysDeptMapper.xml | 0 .../mapper/system/SysDictDataMapper.xml | 0 .../mapper/system/SysDictTypeMapper.xml | 0 .../mapper/system/SysLogininforMapper.xml | 0 .../resources/mapper/system/SysMenuMapper.xml | 0 .../mapper/system/SysNoticeMapper.xml | 0 .../mapper/system/SysOperLogMapper.xml | 0 .../resources/mapper/system/SysPostMapper.xml | 0 .../mapper/system/SysRoleDeptMapper.xml | 0 .../resources/mapper/system/SysRoleMapper.xml | 0 .../mapper/system/SysRoleMenuMapper.xml | 0 .../resources/mapper/system/SysUserMapper.xml | 0 .../mapper/system/SysUserPostMapper.xml | 0 .../mapper/system/SysUserRoleMapper.xml | 0 126 files changed, 64 insertions(+), 13 deletions(-) create mode 100644 ruoyi-modules/pom.xml create mode 100644 ruoyi-modules/ruoyi-demo/pom.xml rename {ruoyi-generator => ruoyi-modules/ruoyi-generator}/pom.xml (95%) rename {ruoyi-generator => ruoyi-modules/ruoyi-generator}/src/main/java/com/ruoyi/generator/config/GenConfig.java (100%) rename {ruoyi-generator => ruoyi-modules/ruoyi-generator}/src/main/java/com/ruoyi/generator/controller/GenController.java (100%) rename {ruoyi-generator => ruoyi-modules/ruoyi-generator}/src/main/java/com/ruoyi/generator/domain/GenTable.java (100%) rename {ruoyi-generator => ruoyi-modules/ruoyi-generator}/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java (100%) rename {ruoyi-generator => ruoyi-modules/ruoyi-generator}/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java (100%) rename {ruoyi-generator => ruoyi-modules/ruoyi-generator}/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java (100%) rename {ruoyi-generator => ruoyi-modules/ruoyi-generator}/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java (100%) rename {ruoyi-generator => ruoyi-modules/ruoyi-generator}/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java (100%) rename {ruoyi-generator => ruoyi-modules/ruoyi-generator}/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java (100%) rename {ruoyi-generator => ruoyi-modules/ruoyi-generator}/src/main/java/com/ruoyi/generator/service/IGenTableService.java (100%) rename {ruoyi-generator => ruoyi-modules/ruoyi-generator}/src/main/java/com/ruoyi/generator/util/GenUtils.java (100%) rename {ruoyi-generator => ruoyi-modules/ruoyi-generator}/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java (100%) rename {ruoyi-generator => ruoyi-modules/ruoyi-generator}/src/main/java/com/ruoyi/generator/util/VelocityUtils.java (100%) rename {ruoyi-generator => ruoyi-modules/ruoyi-generator}/src/main/resources/generator.yml (100%) rename {ruoyi-generator => ruoyi-modules/ruoyi-generator}/src/main/resources/mapper/generator/GenTableColumnMapper.xml (100%) rename {ruoyi-generator => ruoyi-modules/ruoyi-generator}/src/main/resources/mapper/generator/GenTableMapper.xml (100%) rename {ruoyi-generator => ruoyi-modules/ruoyi-generator}/src/main/resources/vm/java/controller.java.vm (100%) rename {ruoyi-generator => ruoyi-modules/ruoyi-generator}/src/main/resources/vm/java/domain.java.vm (100%) rename {ruoyi-generator => ruoyi-modules/ruoyi-generator}/src/main/resources/vm/java/mapper.java.vm (100%) rename {ruoyi-generator => ruoyi-modules/ruoyi-generator}/src/main/resources/vm/java/service.java.vm (100%) rename {ruoyi-generator => ruoyi-modules/ruoyi-generator}/src/main/resources/vm/java/serviceImpl.java.vm (100%) rename {ruoyi-generator => ruoyi-modules/ruoyi-generator}/src/main/resources/vm/java/sub-domain.java.vm (100%) rename {ruoyi-generator => ruoyi-modules/ruoyi-generator}/src/main/resources/vm/js/api.js.vm (100%) rename {ruoyi-generator => ruoyi-modules/ruoyi-generator}/src/main/resources/vm/sql/sql.vm (100%) rename {ruoyi-generator => ruoyi-modules/ruoyi-generator}/src/main/resources/vm/vue/index-tree.vue.vm (100%) rename {ruoyi-generator => ruoyi-modules/ruoyi-generator}/src/main/resources/vm/vue/index.vue.vm (100%) rename {ruoyi-generator => ruoyi-modules/ruoyi-generator}/src/main/resources/vm/vue/v3/index-tree.vue.vm (100%) rename {ruoyi-generator => ruoyi-modules/ruoyi-generator}/src/main/resources/vm/vue/v3/index.vue.vm (100%) rename {ruoyi-generator => ruoyi-modules/ruoyi-generator}/src/main/resources/vm/xml/mapper.xml.vm (100%) rename {ruoyi-quartz => ruoyi-modules/ruoyi-quartz}/pom.xml (95%) rename {ruoyi-quartz => ruoyi-modules/ruoyi-quartz}/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java (100%) rename {ruoyi-quartz => ruoyi-modules/ruoyi-quartz}/src/main/java/com/ruoyi/quartz/controller/SysJobController.java (100%) rename {ruoyi-quartz => ruoyi-modules/ruoyi-quartz}/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java (100%) rename {ruoyi-quartz => ruoyi-modules/ruoyi-quartz}/src/main/java/com/ruoyi/quartz/domain/SysJob.java (100%) rename {ruoyi-quartz => ruoyi-modules/ruoyi-quartz}/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java (100%) rename {ruoyi-quartz => ruoyi-modules/ruoyi-quartz}/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java (100%) rename {ruoyi-quartz => ruoyi-modules/ruoyi-quartz}/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java (100%) rename {ruoyi-quartz => ruoyi-modules/ruoyi-quartz}/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java (100%) rename {ruoyi-quartz => ruoyi-modules/ruoyi-quartz}/src/main/java/com/ruoyi/quartz/service/ISysJobService.java (100%) rename {ruoyi-quartz => ruoyi-modules/ruoyi-quartz}/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java (100%) rename {ruoyi-quartz => ruoyi-modules/ruoyi-quartz}/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java (100%) rename {ruoyi-quartz => ruoyi-modules/ruoyi-quartz}/src/main/java/com/ruoyi/quartz/task/RyTask.java (100%) rename {ruoyi-quartz => ruoyi-modules/ruoyi-quartz}/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java (100%) rename {ruoyi-quartz => ruoyi-modules/ruoyi-quartz}/src/main/java/com/ruoyi/quartz/util/CronUtils.java (100%) rename {ruoyi-quartz => ruoyi-modules/ruoyi-quartz}/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java (100%) rename {ruoyi-quartz => ruoyi-modules/ruoyi-quartz}/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java (100%) rename {ruoyi-quartz => ruoyi-modules/ruoyi-quartz}/src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java (100%) rename {ruoyi-quartz => ruoyi-modules/ruoyi-quartz}/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java (100%) rename {ruoyi-quartz => ruoyi-modules/ruoyi-quartz}/src/main/resources/mapper/quartz/SysJobLogMapper.xml (100%) rename {ruoyi-quartz => ruoyi-modules/ruoyi-quartz}/src/main/resources/mapper/quartz/SysJobMapper.xml (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/pom.xml (93%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/domain/SysCache.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/domain/SysConfig.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/domain/SysLogininfor.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/domain/SysNotice.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/domain/SysOperLog.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/domain/SysPost.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/domain/SysRoleDept.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/domain/SysUserOnline.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/domain/SysUserPost.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/domain/SysUserRole.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/service/ISysConfigService.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/service/ISysDeptService.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/service/ISysDictDataService.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/service/ISysLogininforService.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/service/ISysMenuService.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/service/ISysNoticeService.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/service/ISysOperLogService.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/service/ISysPostService.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/service/ISysRoleService.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/service/ISysUserService.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/resources/mapper/system/SysConfigMapper.xml (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/resources/mapper/system/SysDeptMapper.xml (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/resources/mapper/system/SysDictDataMapper.xml (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/resources/mapper/system/SysDictTypeMapper.xml (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/resources/mapper/system/SysLogininforMapper.xml (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/resources/mapper/system/SysMenuMapper.xml (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/resources/mapper/system/SysNoticeMapper.xml (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/resources/mapper/system/SysOperLogMapper.xml (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/resources/mapper/system/SysPostMapper.xml (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/resources/mapper/system/SysRoleDeptMapper.xml (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/resources/mapper/system/SysRoleMapper.xml (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/resources/mapper/system/SysRoleMenuMapper.xml (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/resources/mapper/system/SysUserMapper.xml (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/resources/mapper/system/SysUserPostMapper.xml (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/resources/mapper/system/SysUserRoleMapper.xml (100%) diff --git a/README.md b/README.md index 50ebaea..0d75604 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,16 @@

logo

-

Ruoyi-Flex V4.0.0

+

Ruoyi-Flex V4.1.0

Ruoyi-Flex是基于RuoYi-Vue V3.8.6 前后端分离的Java快速开发框架

## 平台简介 -Ruoyi-Flex是一套全部开源的快速开发平台，毫无保留给个人及企业免费使用。基于RuoYi-Vue V3.8.6，集成MyBatis-Flex、JDK17、lombok、Sa-Token、PowerJob、Hutool、OSS、ureport-keep、Flowable、vue3、TypeScript等优秀开源软件， +Ruoyi-Flex是一套全部开源的快速开发平台，毫无保留给个人及企业免费使用。基于RuoYi-Vue V3.8.6，集成MyBatis-Flex、JDK17、SpringBootV3、lombok、Sa-Token、PowerJob、Hutool、OSS、ureport-keep、Flowable、vue3、TypeScript等优秀开源软件， * 前端采用Vue、Element UI。 -* 后端采用Spring Boot、Spring Security、Redis & Jwt、MyBatis-Flex。 +* 后端采用Spring Boot V3、Spring Security、Redis & Jwt、MyBatis-Flex。 * 权限认证使用Jwt，支持多终端认证系统。 * 支持加载动态权限菜单，多方式轻松权限控制。 * 高效率开发，使用代码生成器可以一键生成前后端代码。 diff --git a/pom.xml b/pom.xml index b172615..578d763 100644 --- a/pom.xml +++ b/pom.xml @@ -182,10 +182,8 @@ ruoyi-admin ruoyi-framework - ruoyi-system - ruoyi-quartz - ruoyi-generator ruoyi-common + ruoyi-modules pom diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 349f735..da0491c 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -3,7 +3,7 @@ ruoyi: # 名称 name: RuoYi-Flex # 版本 - version: 4.0.0 + version: 4.1.0 # 版权年份 copyrightYear: 2023 # 实例演示开关 @@ -104,9 +104,7 @@ mybatis-flex: # 搜索指定包别名 typeAliasesPackage: com.ruoyi.**.domain # 配置mapper的扫描，找到所有的mapper.xml映射文件 - # mapperLocations: classpath*:mapper/**/*Mapper.xml mapper-locations: classpath*:mapper/**/*Mapper.xml - # configLocation: classpath:mybatis/mybatis-config.xml cacheEnabled: true useGeneratedKeys: true defaultExecutorType: SIMPLE diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index 16c5ed1..cb7988e 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -45,7 +45,7 @@ com.mybatis-flex mybatis-flex-spring-boot-starter - 1.4.6 + 1.4.7 diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java index a180a18..c4f0c79 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/TreeEntity.java @@ -1,5 +1,7 @@ package com.ruoyi.common.core.domain; +import com.mybatisflex.annotation.Column; + import java.util.ArrayList; import java.util.List; @@ -13,18 +15,22 @@ public class TreeEntity extends BaseEntity private static final long serialVersionUID = 1L; /** 父菜单名称 */ + @Column(ignore = true) private String parentName; /** 父菜单ID */ private Long parentId; /** 显示顺序 */ + @Column(ignore = true) private Integer orderNum; /** 祖级列表 */ + @Column(ignore = true) private String ancestors; /** 子部门 */ + @Column(ignore = true) private List children = new ArrayList<>(); public String getParentName() diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml new file mode 100644 index 0000000..a6302b0 --- /dev/null +++ b/ruoyi-modules/pom.xml @@ -0,0 +1,26 @@ + + + + com.ruoyi + ruoyi-flex + 4.1.0 + + 4.0.0 + + + ruoyi-demo + ruoyi-generator + ruoyi-quartz + ruoyi-system + + + ruoyi-modules + pom + + + ruoyi-modules 业务模块 + + + diff --git a/ruoyi-modules/ruoyi-demo/pom.xml b/ruoyi-modules/ruoyi-demo/pom.xml new file mode 100644 index 0000000..139c8c0 --- /dev/null +++ b/ruoyi-modules/ruoyi-demo/pom.xml @@ -0,0 +1,23 @@ + + + + com.ruoyi + ruoyi-modules + 4.1.0 + + 4.0.0 + + ruoyi-demo + + + demo模块 + + + + + + + + diff --git a/ruoyi-generator/pom.xml b/ruoyi-modules/ruoyi-generator/pom.xml similarity index 95% rename from ruoyi-generator/pom.xml rename to ruoyi-modules/ruoyi-generator/pom.xml index 45e96c9..2ee09c9 100644 --- a/ruoyi-generator/pom.xml +++ b/ruoyi-modules/ruoyi-generator/pom.xml @@ -3,8 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi-flex com.ruoyi + ruoyi-modules 4.1.0 4.0.0 diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java b/ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java similarity index 100% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java rename to ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/config/GenConfig.java diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java b/ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java similarity index 100% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java rename to ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/controller/GenController.java diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java b/ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java similarity index 100% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java rename to ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTable.java diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java b/ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java similarity index 100% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java rename to ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/domain/GenTableColumn.java diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java b/ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java similarity index 100% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java rename to ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java b/ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java similarity index 100% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java rename to ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableMapper.java diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java b/ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java similarity index 100% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java rename to ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableColumnServiceImpl.java diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java b/ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java similarity index 100% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java rename to ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/service/GenTableServiceImpl.java diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java b/ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java similarity index 100% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java rename to ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableColumnService.java diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java b/ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java similarity index 100% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java rename to ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/service/IGenTableService.java diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java b/ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java similarity index 100% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java rename to ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/util/GenUtils.java diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java b/ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java similarity index 100% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java rename to ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityInitializer.java diff --git a/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java b/ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java similarity index 100% rename from ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java rename to ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java diff --git a/ruoyi-generator/src/main/resources/generator.yml b/ruoyi-modules/ruoyi-generator/src/main/resources/generator.yml similarity index 100% rename from ruoyi-generator/src/main/resources/generator.yml rename to ruoyi-modules/ruoyi-generator/src/main/resources/generator.yml diff --git a/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml similarity index 100% rename from ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml rename to ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml diff --git a/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml b/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml similarity index 100% rename from ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml rename to ruoyi-modules/ruoyi-generator/src/main/resources/mapper/generator/GenTableMapper.xml diff --git a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/controller.java.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/java/controller.java.vm rename to ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/controller.java.vm diff --git a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/domain.java.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/java/domain.java.vm rename to ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/domain.java.vm diff --git a/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/java/mapper.java.vm rename to ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm diff --git a/ruoyi-generator/src/main/resources/vm/java/service.java.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/service.java.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/java/service.java.vm rename to ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/service.java.vm diff --git a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm rename to ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm diff --git a/ruoyi-generator/src/main/resources/vm/java/sub-domain.java.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/sub-domain.java.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/java/sub-domain.java.vm rename to ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/sub-domain.java.vm diff --git a/ruoyi-generator/src/main/resources/vm/js/api.js.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/js/api.js.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/js/api.js.vm rename to ruoyi-modules/ruoyi-generator/src/main/resources/vm/js/api.js.vm diff --git a/ruoyi-generator/src/main/resources/vm/sql/sql.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/sql.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/sql/sql.vm rename to ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/sql.vm diff --git a/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm rename to ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm diff --git a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/vue/index.vue.vm rename to ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm diff --git a/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm rename to ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm diff --git a/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm rename to ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm diff --git a/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm rename to ruoyi-modules/ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm diff --git a/ruoyi-quartz/pom.xml b/ruoyi-modules/ruoyi-quartz/pom.xml similarity index 95% rename from ruoyi-quartz/pom.xml rename to ruoyi-modules/ruoyi-quartz/pom.xml index d69eb3d..4cfd48e 100644 --- a/ruoyi-quartz/pom.xml +++ b/ruoyi-modules/ruoyi-quartz/pom.xml @@ -3,8 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi-flex com.ruoyi + ruoyi-modules 4.1.0 4.0.0 diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java b/ruoyi-modules/ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java similarity index 100% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java rename to ruoyi-modules/ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java b/ruoyi-modules/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java similarity index 100% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java rename to ruoyi-modules/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java b/ruoyi-modules/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java similarity index 100% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java rename to ruoyi-modules/ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobLogController.java diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java b/ruoyi-modules/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java similarity index 100% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java rename to ruoyi-modules/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java b/ruoyi-modules/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java similarity index 100% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java rename to ruoyi-modules/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java b/ruoyi-modules/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java similarity index 100% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java rename to ruoyi-modules/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobLogMapper.java diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java b/ruoyi-modules/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java similarity index 100% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java rename to ruoyi-modules/ruoyi-quartz/src/main/java/com/ruoyi/quartz/mapper/SysJobMapper.java diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java b/ruoyi-modules/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java similarity index 100% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java rename to ruoyi-modules/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobLogService.java diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java b/ruoyi-modules/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java similarity index 100% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java rename to ruoyi-modules/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/ISysJobService.java diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java b/ruoyi-modules/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java similarity index 100% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java rename to ruoyi-modules/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobLogServiceImpl.java diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java b/ruoyi-modules/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java similarity index 100% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java rename to ruoyi-modules/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/SysJobServiceImpl.java diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-modules/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java similarity index 100% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java rename to ruoyi-modules/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java b/ruoyi-modules/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java similarity index 100% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java rename to ruoyi-modules/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/AbstractQuartzJob.java diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java b/ruoyi-modules/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java similarity index 100% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java rename to ruoyi-modules/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/CronUtils.java diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java b/ruoyi-modules/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java similarity index 100% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java rename to ruoyi-modules/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/JobInvokeUtil.java diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java b/ruoyi-modules/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java similarity index 100% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java rename to ruoyi-modules/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzDisallowConcurrentExecution.java diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java b/ruoyi-modules/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java similarity index 100% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java rename to ruoyi-modules/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/QuartzJobExecution.java diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java b/ruoyi-modules/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java similarity index 100% rename from ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java rename to ruoyi-modules/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml b/ruoyi-modules/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml similarity index 100% rename from ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml rename to ruoyi-modules/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml b/ruoyi-modules/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml similarity index 100% rename from ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml rename to ruoyi-modules/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml diff --git a/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml similarity index 93% rename from ruoyi-system/pom.xml rename to ruoyi-modules/ruoyi-system/pom.xml index 5b226f9..a817439 100644 --- a/ruoyi-system/pom.xml +++ b/ruoyi-modules/ruoyi-system/pom.xml @@ -3,8 +3,8 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - ruoyi-flex com.ruoyi + ruoyi-modules 4.1.0 4.0.0 diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysCache.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysCache.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysCache.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysCache.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleDept.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRoleMenu.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserPost.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserRole.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/RouterVo.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysConfigMapper.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictDataMapper.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysLogininforMapper.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeMapper.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleDeptMapper.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMapper.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysRoleMenuMapper.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserPostMapper.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserRoleMapper.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysLogininforService.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserOnlineService.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeServiceImpl.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserOnlineServiceImpl.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java diff --git a/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml similarity index 100% rename from ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml rename to ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml similarity index 100% rename from ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml rename to ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml similarity index 100% rename from ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml rename to ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml similarity index 100% rename from ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml rename to ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml diff --git a/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml similarity index 100% rename from ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml rename to ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysLogininforMapper.xml diff --git a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml similarity index 100% rename from ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml rename to ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml diff --git a/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml similarity index 100% rename from ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml rename to ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeMapper.xml diff --git a/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml similarity index 100% rename from ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml rename to ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml diff --git a/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml similarity index 100% rename from ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml rename to ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml similarity index 100% rename from ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml rename to ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleDeptMapper.xml diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml similarity index 100% rename from ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml rename to ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml similarity index 100% rename from ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml rename to ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysRoleMenuMapper.xml diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml similarity index 100% rename from ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml rename to ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml similarity index 100% rename from ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml rename to ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserPostMapper.xml diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml similarity index 100% rename from ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml rename to ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml