From 2ae368128606f8bf3aa290c029bdc71296ad152e Mon Sep 17 00:00:00 2001 From: zlyx <1242874891@qq.com> Date: Wed, 18 Jan 2023 20:23:11 +0800 Subject: [PATCH] =?UTF-8?q?add=20common=20=E4=BE=9D=E8=B5=96=20spring-boot?= =?UTF-8?q?-properties-migrator=20;=20add=20=E6=96=B0=E5=A2=9E=20modules?= =?UTF-8?q?=20=E6=A8=A1=E5=9D=97,=20=E5=8C=85=E5=90=AB=20demo,=20generator?= =?UTF-8?q?,=20job,=20system=20=E6=A8=A1=E5=9D=97=20;=20update=20=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=A8=A1=E5=9D=97=E5=8C=85=E5=90=8D=20rateLimiter=20?= =?UTF-8?q?=3D>=20ratelimiter=20;=20refactor=20=E9=87=8D=E6=9E=84=20rateli?= =?UTF-8?q?miter=20=E6=A8=A1=E5=9D=97,=20=E5=8F=82=E8=80=83=E5=B9=82?= =?UTF-8?q?=E7=AD=89=E6=A8=A1=E5=9D=97=E5=8A=A0=E5=85=A5=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E8=A3=85=E9=85=8D=E7=9B=B8=E5=85=B3=E9=85=8D=E7=BD=AE=20;=20fi?= =?UTF-8?q?x=20=E4=BF=AE=E6=AD=A3=20AsyncConfig=20=E5=AE=9E=E7=8E=B0?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20;=20fix=20=E4=BF=AE=E6=AD=A3=20SwaggerConf?= =?UTF-8?q?ig=20=E6=B3=A8=E8=A7=A3=E5=86=99=E6=B3=95=20;=20fix=20=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=20ruoyi-common-doc=20pom=20=E6=8F=8F=E8=BF=B0=20;=20d?= =?UTF-8?q?elete=20LogAspect=20=E5=8E=BB=E6=8E=89=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E6=B3=A8=E8=A7=A3=20;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 62 +----------------- ruoyi-common/pom.xml | 2 +- ruoyi-common/ruoyi-common-bom/pom.xml | 2 +- ruoyi-common/ruoyi-common-core/pom.xml | 6 ++ .../ruoyi/common/core/config/AsyncConfig.java | 4 +- .../common/core/utils/BeanCopyUtils.java | 2 +- ruoyi-common/ruoyi-common-doc/pom.xml | 2 +- .../common/doc/config/SwaggerConfig.java | 6 +- .../ruoyi/common/log/aspect/LogAspect.java | 2 - .../pom.xml | 4 +- .../ratelimiter}/annotation/RateLimiter.java | 4 +- .../aspectj/RateLimiterAspect.java | 8 +-- .../ratelimiter/config/RateLimiterConfig.java | 20 ++++++ .../common/ratelimiter}/enums/LimitType.java | 2 +- ...ot.autoconfigure.AutoConfiguration.imports | 1 + ruoyi-modules/pom.xml | 27 ++++++++ .../ruoyi-demo}/pom.xml | 5 +- .../ruoyi/demo/controller/MailController.java | 0 .../demo/controller/RedisCacheController.java | 0 .../demo/controller/RedisLockController.java | 0 .../controller/RedisPubSubController.java | 0 .../RedisRateLimiterController.java | 4 +- .../ruoyi/demo/controller/SmsController.java | 0 .../controller/Swagger3DemoController.java | 0 .../demo/controller/TestBatchController.java | 0 .../demo/controller/TestDemoController.java | 0 .../demo/controller/TestExcelController.java | 0 .../demo/controller/TestI18nController.java | 0 .../controller/TestSensitiveController.java | 0 .../demo/controller/TestTreeController.java | 0 .../ruoyi/demo/controller/package-info.java | 0 .../queue/BoundedQueueController.java | 0 .../queue/DelayedQueueController.java | 0 .../demo/controller/queue/PriorityDemo.java | 0 .../queue/PriorityQueueController.java | 0 .../java/com/ruoyi/demo/domain/TestDemo.java | 0 .../java/com/ruoyi/demo/domain/TestTree.java | 0 .../com/ruoyi/demo/domain/bo/TestDemoBo.java | 0 .../demo/domain/bo/TestDemoImportVo.java | 0 .../com/ruoyi/demo/domain/bo/TestTreeBo.java | 0 .../com/ruoyi/demo/domain/package-info.java | 0 .../com/ruoyi/demo/domain/vo/TestDemoVo.java | 0 .../com/ruoyi/demo/domain/vo/TestTreeVo.java | 0 .../com/ruoyi/demo/mapper/TestDemoMapper.java | 0 .../com/ruoyi/demo/mapper/TestTreeMapper.java | 0 .../com/ruoyi/demo/mapper/package-info.java | 0 .../ruoyi/demo/service/ITestDemoService.java | 0 .../ruoyi/demo/service/ITestTreeService.java | 0 .../service/impl/TestDemoServiceImpl.java | 0 .../service/impl/TestTreeServiceImpl.java | 0 .../ruoyi/demo/service/impl/package-info.java | 0 .../com/ruoyi/demo/service/package-info.java | 0 .../src/main/resources/excel/单列表.xlsx | Bin .../src/main/resources/excel/多列表.xlsx | Bin .../resources/mapper/demo/TestDemoMapper.xml | 0 .../resources/mapper/demo/TestTreeMapper.xml | 0 .../src/main/resources/mapper/package-info.md | 0 .../ruoyi-generator}/pom.xml | 4 +- .../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/GenTableServiceImpl.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 | 18 ++--- .../mapper/generator/GenTableColumnMapper.xml | 0 .../mapper/generator/GenTableMapper.xml | 0 .../src/main/resources/mapper/package-info.md | 0 .../src/main/resources/vm/java/bo.java.vm | 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 .../src/main/resources/vm/java/vo.java.vm | 0 .../src/main/resources/vm/js/api.js.vm | 0 .../src/main/resources/vm/sql/oracle/sql.vm | 0 .../src/main/resources/vm/sql/postgres/sql.vm | 0 .../src/main/resources/vm/sql/sql.vm | 0 .../main/resources/vm/sql/sqlserver/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/vue/v3/readme.txt | 0 .../src/main/resources/vm/xml/mapper.xml.vm | 0 .../ruoyi-job}/pom.xml | 2 +- .../com/ruoyi/job/config/XxlJobConfig.java | 0 .../config/properties/XxlJobProperties.java | 0 .../com/ruoyi/job/service/SampleService.java | 0 .../ruoyi-system}/pom.xml | 2 +- .../controller/monitor/CacheController.java | 0 .../monitor/SysLogininforController.java | 0 .../monitor/SysOperlogController.java | 0 .../monitor/SysUserOnlineController.java | 0 .../system/SysConfigController.java | 0 .../controller/system/SysDeptController.java | 0 .../system/SysDictDataController.java | 0 .../system/SysDictTypeController.java | 0 .../controller/system/SysMenuController.java | 0 .../system/SysNoticeController.java | 0 .../system/SysOssConfigController.java | 0 .../controller/system/SysOssController.java | 0 .../controller/system/SysPostController.java | 0 .../system/SysProfileController.java | 0 .../controller/system/SysRoleController.java | 0 .../controller/system/SysUserController.java | 0 .../com/ruoyi/system/domain/SysCache.java | 0 .../com/ruoyi/system/domain/SysConfig.java | 0 .../java/com/ruoyi/system/domain/SysDept.java | 0 .../com/ruoyi/system/domain/SysDictData.java | 0 .../com/ruoyi/system/domain/SysDictType.java | 0 .../ruoyi/system/domain/SysLogininfor.java | 0 .../java/com/ruoyi/system/domain/SysMenu.java | 0 .../com/ruoyi/system/domain/SysNotice.java | 0 .../com/ruoyi/system/domain/SysOperLog.java | 0 .../java/com/ruoyi/system/domain/SysOss.java | 0 .../com/ruoyi/system/domain/SysOssConfig.java | 0 .../java/com/ruoyi/system/domain/SysPost.java | 0 .../java/com/ruoyi/system/domain/SysRole.java | 0 .../com/ruoyi/system/domain/SysRoleDept.java | 0 .../com/ruoyi/system/domain/SysRoleMenu.java | 0 .../java/com/ruoyi/system/domain/SysUser.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/bo/SysOssBo.java | 0 .../system/domain/bo/SysOssConfigBo.java | 0 .../com/ruoyi/system/domain/vo/MetaVo.java | 0 .../com/ruoyi/system/domain/vo/RouterVo.java | 0 .../system/domain/vo/SysOssConfigVo.java | 0 .../com/ruoyi/system/domain/vo/SysOssVo.java | 0 .../system/domain/vo/SysUserExportVo.java | 0 .../system/domain/vo/SysUserImportVo.java | 0 .../listener/SysUserImportListener.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 .../system/mapper/SysOssConfigMapper.java | 0 .../com/ruoyi/system/mapper/SysOssMapper.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 .../runner/SystemApplicationRunner.java | 0 .../system/service/ISysConfigService.java | 0 .../system/service/ISysDataScopeService.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 .../system/service/ISysOssConfigService.java | 0 .../ruoyi/system/service/ISysOssService.java | 0 .../ruoyi/system/service/ISysPostService.java | 0 .../ruoyi/system/service/ISysRoleService.java | 0 .../ruoyi/system/service/ISysUserService.java | 0 .../ruoyi/system/service/SysLoginService.java | 0 .../system/service/SysPermissionService.java | 0 .../system/service/SysRegisterService.java | 0 .../service/impl/SysConfigServiceImpl.java | 0 .../service/impl/SysDataScopeServiceImpl.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/SysOssConfigServiceImpl.java | 0 .../service/impl/SysOssServiceImpl.java | 0 .../service/impl/SysPostServiceImpl.java | 0 .../service/impl/SysRoleServiceImpl.java | 0 .../service/impl/SysSensitiveServiceImpl.java | 0 .../service/impl/SysUserServiceImpl.java | 0 .../src/main/resources/mapper/package-info.md | 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 .../mapper/system/SysOssConfigMapper.xml | 0 .../resources/mapper/system/SysOssMapper.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 208 files changed, 89 insertions(+), 100 deletions(-) rename ruoyi-common/{ruoyi-common-rateLimiter => ruoyi-common-ratelimiter}/pom.xml (89%) rename ruoyi-common/{ruoyi-common-rateLimiter/src/main/java/com/ruoyi/common/rateLimiter => ruoyi-common-ratelimiter/src/main/java/com/ruoyi/common/ratelimiter}/annotation/RateLimiter.java (84%) rename ruoyi-common/{ruoyi-common-rateLimiter/src/main/java/com/ruoyi/common/rateLimiter => ruoyi-common-ratelimiter/src/main/java/com/ruoyi/common/ratelimiter}/aspectj/RateLimiterAspect.java (91%) create mode 100644 ruoyi-common/ruoyi-common-ratelimiter/src/main/java/com/ruoyi/common/ratelimiter/config/RateLimiterConfig.java rename ruoyi-common/{ruoyi-common-rateLimiter/src/main/java/com/ruoyi/common/rateLimiter => ruoyi-common-ratelimiter/src/main/java/com/ruoyi/common/ratelimiter}/enums/LimitType.java (85%) create mode 100644 ruoyi-common/ruoyi-common-ratelimiter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports create mode 100644 ruoyi-modules/pom.xml rename {ruoyi-demo => ruoyi-modules/ruoyi-demo}/pom.xml (95%) rename {ruoyi-demo => ruoyi-modules/ruoyi-demo}/src/main/java/com/ruoyi/demo/controller/MailController.java (100%) rename {ruoyi-demo => ruoyi-modules/ruoyi-demo}/src/main/java/com/ruoyi/demo/controller/RedisCacheController.java (100%) rename {ruoyi-demo => ruoyi-modules/ruoyi-demo}/src/main/java/com/ruoyi/demo/controller/RedisLockController.java (100%) rename {ruoyi-demo => ruoyi-modules/ruoyi-demo}/src/main/java/com/ruoyi/demo/controller/RedisPubSubController.java (100%) rename {ruoyi-demo => ruoyi-modules/ruoyi-demo}/src/main/java/com/ruoyi/demo/controller/RedisRateLimiterController.java (91%) rename {ruoyi-demo => ruoyi-modules/ruoyi-demo}/src/main/java/com/ruoyi/demo/controller/SmsController.java (100%) rename {ruoyi-demo => ruoyi-modules/ruoyi-demo}/src/main/java/com/ruoyi/demo/controller/Swagger3DemoController.java (100%) rename {ruoyi-demo => ruoyi-modules/ruoyi-demo}/src/main/java/com/ruoyi/demo/controller/TestBatchController.java (100%) rename {ruoyi-demo => ruoyi-modules/ruoyi-demo}/src/main/java/com/ruoyi/demo/controller/TestDemoController.java (100%) rename {ruoyi-demo => ruoyi-modules/ruoyi-demo}/src/main/java/com/ruoyi/demo/controller/TestExcelController.java (100%) rename {ruoyi-demo => ruoyi-modules/ruoyi-demo}/src/main/java/com/ruoyi/demo/controller/TestI18nController.java (100%) rename {ruoyi-demo => ruoyi-modules/ruoyi-demo}/src/main/java/com/ruoyi/demo/controller/TestSensitiveController.java (100%) rename {ruoyi-demo => ruoyi-modules/ruoyi-demo}/src/main/java/com/ruoyi/demo/controller/TestTreeController.java (100%) rename {ruoyi-demo => ruoyi-modules/ruoyi-demo}/src/main/java/com/ruoyi/demo/controller/package-info.java (100%) rename {ruoyi-demo => ruoyi-modules/ruoyi-demo}/src/main/java/com/ruoyi/demo/controller/queue/BoundedQueueController.java (100%) rename {ruoyi-demo => ruoyi-modules/ruoyi-demo}/src/main/java/com/ruoyi/demo/controller/queue/DelayedQueueController.java (100%) rename {ruoyi-demo => ruoyi-modules/ruoyi-demo}/src/main/java/com/ruoyi/demo/controller/queue/PriorityDemo.java (100%) rename {ruoyi-demo => ruoyi-modules/ruoyi-demo}/src/main/java/com/ruoyi/demo/controller/queue/PriorityQueueController.java (100%) rename {ruoyi-demo => ruoyi-modules/ruoyi-demo}/src/main/java/com/ruoyi/demo/domain/TestDemo.java (100%) rename {ruoyi-demo => ruoyi-modules/ruoyi-demo}/src/main/java/com/ruoyi/demo/domain/TestTree.java (100%) rename {ruoyi-demo => ruoyi-modules/ruoyi-demo}/src/main/java/com/ruoyi/demo/domain/bo/TestDemoBo.java (100%) rename {ruoyi-demo => ruoyi-modules/ruoyi-demo}/src/main/java/com/ruoyi/demo/domain/bo/TestDemoImportVo.java (100%) rename {ruoyi-demo => ruoyi-modules/ruoyi-demo}/src/main/java/com/ruoyi/demo/domain/bo/TestTreeBo.java (100%) rename {ruoyi-demo => ruoyi-modules/ruoyi-demo}/src/main/java/com/ruoyi/demo/domain/package-info.java (100%) rename {ruoyi-demo => ruoyi-modules/ruoyi-demo}/src/main/java/com/ruoyi/demo/domain/vo/TestDemoVo.java (100%) rename {ruoyi-demo => ruoyi-modules/ruoyi-demo}/src/main/java/com/ruoyi/demo/domain/vo/TestTreeVo.java (100%) rename {ruoyi-demo => ruoyi-modules/ruoyi-demo}/src/main/java/com/ruoyi/demo/mapper/TestDemoMapper.java (100%) rename {ruoyi-demo => ruoyi-modules/ruoyi-demo}/src/main/java/com/ruoyi/demo/mapper/TestTreeMapper.java (100%) rename {ruoyi-demo => ruoyi-modules/ruoyi-demo}/src/main/java/com/ruoyi/demo/mapper/package-info.java (100%) rename {ruoyi-demo => ruoyi-modules/ruoyi-demo}/src/main/java/com/ruoyi/demo/service/ITestDemoService.java (100%) rename {ruoyi-demo => ruoyi-modules/ruoyi-demo}/src/main/java/com/ruoyi/demo/service/ITestTreeService.java (100%) rename {ruoyi-demo => ruoyi-modules/ruoyi-demo}/src/main/java/com/ruoyi/demo/service/impl/TestDemoServiceImpl.java (100%) rename {ruoyi-demo => ruoyi-modules/ruoyi-demo}/src/main/java/com/ruoyi/demo/service/impl/TestTreeServiceImpl.java (100%) rename {ruoyi-demo => ruoyi-modules/ruoyi-demo}/src/main/java/com/ruoyi/demo/service/impl/package-info.java (100%) rename {ruoyi-demo => ruoyi-modules/ruoyi-demo}/src/main/java/com/ruoyi/demo/service/package-info.java (100%) rename {ruoyi-demo => ruoyi-modules/ruoyi-demo}/src/main/resources/excel/单列表.xlsx (100%) rename {ruoyi-demo => ruoyi-modules/ruoyi-demo}/src/main/resources/excel/多列表.xlsx (100%) rename {ruoyi-demo => ruoyi-modules/ruoyi-demo}/src/main/resources/mapper/demo/TestDemoMapper.xml (100%) rename {ruoyi-demo => ruoyi-modules/ruoyi-demo}/src/main/resources/mapper/demo/TestTreeMapper.xml (100%) rename {ruoyi-demo => ruoyi-modules/ruoyi-demo}/src/main/resources/mapper/package-info.md (100%) rename {ruoyi-generator => ruoyi-modules/ruoyi-generator}/pom.xml (94%) 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/GenTableServiceImpl.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 (97%) 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/mapper/package-info.md (100%) rename {ruoyi-generator => ruoyi-modules/ruoyi-generator}/src/main/resources/vm/java/bo.java.vm (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/vo.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/oracle/sql.vm (100%) rename {ruoyi-generator => ruoyi-modules/ruoyi-generator}/src/main/resources/vm/sql/postgres/sql.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/sql/sqlserver/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/vue/v3/readme.txt (100%) rename {ruoyi-generator => ruoyi-modules/ruoyi-generator}/src/main/resources/vm/xml/mapper.xml.vm (100%) rename {ruoyi-job => ruoyi-modules/ruoyi-job}/pom.xml (95%) rename {ruoyi-job => ruoyi-modules/ruoyi-job}/src/main/java/com/ruoyi/job/config/XxlJobConfig.java (100%) rename {ruoyi-job => ruoyi-modules/ruoyi-job}/src/main/java/com/ruoyi/job/config/properties/XxlJobProperties.java (100%) rename {ruoyi-job => ruoyi-modules/ruoyi-job}/src/main/java/com/ruoyi/job/service/SampleService.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/pom.xml (97%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/controller/monitor/CacheController.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/controller/monitor/SysLogininforController.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/controller/monitor/SysOperlogController.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/controller/monitor/SysUserOnlineController.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/controller/system/SysConfigController.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/controller/system/SysDeptController.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/controller/system/SysDictDataController.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/controller/system/SysDictTypeController.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/controller/system/SysMenuController.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/controller/system/SysNoticeController.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/controller/system/SysOssConfigController.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/controller/system/SysOssController.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/controller/system/SysPostController.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/controller/system/SysProfileController.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/controller/system/SysRoleController.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/controller/system/SysUserController.java (100%) 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/SysDept.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/domain/SysDictData.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/domain/SysDictType.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/SysMenu.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/SysOss.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/domain/SysOssConfig.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/SysRole.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/SysUser.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/bo/SysOssBo.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.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/domain/vo/SysOssConfigVo.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/domain/vo/SysUserExportVo.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/domain/vo/SysUserImportVo.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/listener/SysUserImportListener.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/SysOssConfigMapper.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/mapper/SysOssMapper.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/runner/SystemApplicationRunner.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/ISysDataScopeService.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/ISysOssConfigService.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/service/ISysOssService.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/ISysUserService.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/service/SysLoginService.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/service/SysPermissionService.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/service/SysRegisterService.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/SysDataScopeServiceImpl.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/SysOssConfigServiceImpl.java (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.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/SysSensitiveServiceImpl.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/package-info.md (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/SysOssConfigMapper.xml (100%) rename {ruoyi-system => ruoyi-modules/ruoyi-system}/src/main/resources/mapper/system/SysOssMapper.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/pom.xml b/pom.xml index 54deb2362..0c0c775e8 100644 --- a/pom.xml +++ b/pom.xml @@ -285,74 +285,14 @@ snakeyaml ${snakeyaml.version} - - - - com.ruoyi - ruoyi-job - ${revision} - - - - - com.ruoyi - ruoyi-generator - ${revision} - - - - - com.ruoyi - ruoyi-framework - ${revision} - - - - - com.ruoyi - ruoyi-system - ${revision} - - - - - com.ruoyi - ruoyi-common - ${revision} - - - - - com.ruoyi - ruoyi-oss - ${revision} - - - - - com.ruoyi - ruoyi-sms - ${revision} - - - - - com.ruoyi - ruoyi-demo - ${revision} - - ruoyi-admin - ruoyi-system - ruoyi-job - ruoyi-generator ruoyi-common - ruoyi-demo ruoyi-extend + ruoyi-modules pom diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index 776e02156..1bb05e20e 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -21,7 +21,7 @@ ruoyi-common-mail ruoyi-common-mybatis ruoyi-common-oss - ruoyi-common-rateLimiter + ruoyi-common-ratelimiter ruoyi-common-redis ruoyi-common-satoken ruoyi-common-security diff --git a/ruoyi-common/ruoyi-common-bom/pom.xml b/ruoyi-common/ruoyi-common-bom/pom.xml index ac3e65d69..ef0016920 100644 --- a/ruoyi-common/ruoyi-common-bom/pom.xml +++ b/ruoyi-common/ruoyi-common-bom/pom.xml @@ -85,7 +85,7 @@ com.ruoyi - ruoyi-common-rateLimiter + ruoyi-common-ratelimiter ${revision} diff --git a/ruoyi-common/ruoyi-common-core/pom.xml b/ruoyi-common/ruoyi-common-core/pom.xml index 23c741696..8311af03c 100644 --- a/ruoyi-common/ruoyi-common-core/pom.xml +++ b/ruoyi-common/ruoyi-common-core/pom.xml @@ -104,6 +104,12 @@ spring-boot-configuration-processor + + org.springframework.boot + spring-boot-properties-migrator + runtime + + diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/AsyncConfig.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/AsyncConfig.java index dc17475ea..5ed58f498 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/AsyncConfig.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/config/AsyncConfig.java @@ -6,7 +6,7 @@ import org.springframework.aop.interceptor.AsyncUncaughtExceptionHandler; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.autoconfigure.AutoConfiguration; -import org.springframework.scheduling.annotation.AsyncConfigurerSupport; +import org.springframework.scheduling.annotation.AsyncConfigurer; import org.springframework.scheduling.annotation.EnableAsync; import java.util.Arrays; @@ -20,7 +20,7 @@ import java.util.concurrent.ScheduledExecutorService; */ @EnableAsync(proxyTargetClass = true) @AutoConfiguration -public class AsyncConfig extends AsyncConfigurerSupport { +public class AsyncConfig implements AsyncConfigurer { @Autowired @Qualifier("scheduledExecutorService") diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/BeanCopyUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/BeanCopyUtils.java index 0be4c1cda..0661d9e38 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/BeanCopyUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/BeanCopyUtils.java @@ -194,7 +194,7 @@ public class BeanCopyUtils { private String genKey(Class srcClass, Class targetClass, Converter converter) { final StringBuilder key = StrUtil.builder() .append(srcClass.getName()).append('#').append(targetClass.getName()); - if(null != converter){ + if (null != converter) { key.append('#').append(converter.getClass().getName()); } return key.toString(); diff --git a/ruoyi-common/ruoyi-common-doc/pom.xml b/ruoyi-common/ruoyi-common-doc/pom.xml index 5a8a17b4a..45c5fed3b 100644 --- a/ruoyi-common/ruoyi-common-doc/pom.xml +++ b/ruoyi-common/ruoyi-common-doc/pom.xml @@ -13,7 +13,7 @@ ruoyi-common-doc - ruoyi-common-swagger 系统接口 + ruoyi-common-doc 系统接口 diff --git a/ruoyi-common/ruoyi-common-doc/src/main/java/com/ruoyi/common/doc/config/SwaggerConfig.java b/ruoyi-common/ruoyi-common-doc/src/main/java/com/ruoyi/common/doc/config/SwaggerConfig.java index b783a87f4..ec3f77616 100644 --- a/ruoyi-common/ruoyi-common-doc/src/main/java/com/ruoyi/common/doc/config/SwaggerConfig.java +++ b/ruoyi-common/ruoyi-common-doc/src/main/java/com/ruoyi/common/doc/config/SwaggerConfig.java @@ -17,7 +17,7 @@ import org.springdoc.core.providers.JavadocProvider; import org.springdoc.core.service.OpenAPIService; import org.springdoc.core.service.SecurityService; import org.springdoc.core.utils.PropertyResolverUtils; -import org.springframework.boot.autoconfigure.AutoConfigureBefore; +import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.web.ServerProperties; @@ -34,7 +34,7 @@ import java.util.Set; * @author Lion Li */ @RequiredArgsConstructor -@AutoConfigureBefore(SpringDocConfiguration.class) +@AutoConfiguration(before = SpringDocConfiguration.class) @ConditionalOnProperty(name = "swagger.enabled", havingValue = "true", matchIfMissing = true) public class SwaggerConfig { @@ -105,7 +105,7 @@ public class SwaggerConfig { return; } PlusPaths newPaths = new PlusPaths(); - oldPaths.forEach((k,v) -> newPaths.addPathItem(finalContextPath + k, v)); + oldPaths.forEach((k, v) -> newPaths.addPathItem(finalContextPath + k, v)); openApi.setPaths(newPaths); }; } diff --git a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java index 393954da4..62f4b3680 100644 --- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java +++ b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java @@ -18,7 +18,6 @@ import org.aspectj.lang.annotation.AfterThrowing; import org.aspectj.lang.annotation.Aspect; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.http.HttpMethod; -import org.springframework.stereotype.Component; import org.springframework.validation.BindingResult; import org.springframework.web.multipart.MultipartFile; @@ -34,7 +33,6 @@ import java.util.Map; */ @Slf4j @Aspect -@Component @AutoConfiguration public class LogAspect { diff --git a/ruoyi-common/ruoyi-common-rateLimiter/pom.xml b/ruoyi-common/ruoyi-common-ratelimiter/pom.xml similarity index 89% rename from ruoyi-common/ruoyi-common-rateLimiter/pom.xml rename to ruoyi-common/ruoyi-common-ratelimiter/pom.xml index c7e47bcfc..d4aa9661e 100644 --- a/ruoyi-common/ruoyi-common-rateLimiter/pom.xml +++ b/ruoyi-common/ruoyi-common-ratelimiter/pom.xml @@ -10,10 +10,10 @@ 4.0.0 - ruoyi-common-rateLimiter + ruoyi-common-ratelimiter - ruoyi-common-rateLimiter 限流功能 + ruoyi-common-ratelimiter 限流功能 diff --git a/ruoyi-common/ruoyi-common-rateLimiter/src/main/java/com/ruoyi/common/rateLimiter/annotation/RateLimiter.java b/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/com/ruoyi/common/ratelimiter/annotation/RateLimiter.java similarity index 84% rename from ruoyi-common/ruoyi-common-rateLimiter/src/main/java/com/ruoyi/common/rateLimiter/annotation/RateLimiter.java rename to ruoyi-common/ruoyi-common-ratelimiter/src/main/java/com/ruoyi/common/ratelimiter/annotation/RateLimiter.java index b949f44ce..b5bd284f1 100644 --- a/ruoyi-common/ruoyi-common-rateLimiter/src/main/java/com/ruoyi/common/rateLimiter/annotation/RateLimiter.java +++ b/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/com/ruoyi/common/ratelimiter/annotation/RateLimiter.java @@ -1,7 +1,7 @@ -package com.ruoyi.common.rateLimiter.annotation; +package com.ruoyi.common.ratelimiter.annotation; import com.ruoyi.common.core.constant.CacheConstants; -import com.ruoyi.common.rateLimiter.enums.LimitType; +import com.ruoyi.common.ratelimiter.enums.LimitType; import java.lang.annotation.*; diff --git a/ruoyi-common/ruoyi-common-rateLimiter/src/main/java/com/ruoyi/common/rateLimiter/aspectj/RateLimiterAspect.java b/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/com/ruoyi/common/ratelimiter/aspectj/RateLimiterAspect.java similarity index 91% rename from ruoyi-common/ruoyi-common-rateLimiter/src/main/java/com/ruoyi/common/rateLimiter/aspectj/RateLimiterAspect.java rename to ruoyi-common/ruoyi-common-ratelimiter/src/main/java/com/ruoyi/common/ratelimiter/aspectj/RateLimiterAspect.java index 30bdd3786..b313aaae3 100644 --- a/ruoyi-common/ruoyi-common-rateLimiter/src/main/java/com/ruoyi/common/rateLimiter/aspectj/RateLimiterAspect.java +++ b/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/com/ruoyi/common/ratelimiter/aspectj/RateLimiterAspect.java @@ -1,10 +1,10 @@ -package com.ruoyi.common.rateLimiter.aspectj; +package com.ruoyi.common.ratelimiter.aspectj; import com.ruoyi.common.core.exception.ServiceException; import com.ruoyi.common.core.utils.MessageUtils; import com.ruoyi.common.core.utils.ServletUtils; -import com.ruoyi.common.rateLimiter.annotation.RateLimiter; -import com.ruoyi.common.rateLimiter.enums.LimitType; +import com.ruoyi.common.ratelimiter.annotation.RateLimiter; +import com.ruoyi.common.ratelimiter.enums.LimitType; import com.ruoyi.common.redis.utils.RedisUtils; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; @@ -12,7 +12,6 @@ import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; import org.aspectj.lang.reflect.MethodSignature; import org.redisson.api.RateType; -import org.springframework.stereotype.Component; import java.lang.reflect.Method; @@ -23,7 +22,6 @@ import java.lang.reflect.Method; */ @Slf4j @Aspect -@Component public class RateLimiterAspect { @Before("@annotation(rateLimiter)") diff --git a/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/com/ruoyi/common/ratelimiter/config/RateLimiterConfig.java b/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/com/ruoyi/common/ratelimiter/config/RateLimiterConfig.java new file mode 100644 index 000000000..f55a1f74d --- /dev/null +++ b/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/com/ruoyi/common/ratelimiter/config/RateLimiterConfig.java @@ -0,0 +1,20 @@ +package com.ruoyi.common.ratelimiter.config; + +import com.ruoyi.common.ratelimiter.aspectj.RateLimiterAspect; +import org.springframework.boot.autoconfigure.AutoConfiguration; +import org.springframework.context.annotation.Bean; +import org.springframework.data.redis.connection.RedisConfiguration; + +/** + * @author guangxin + * @date 2023/1/18 + */ +@AutoConfiguration(after = RedisConfiguration.class) +public class RateLimiterConfig { + + @Bean + public RateLimiterAspect rateLimiterAspect() { + return new RateLimiterAspect(); + } + +} diff --git a/ruoyi-common/ruoyi-common-rateLimiter/src/main/java/com/ruoyi/common/rateLimiter/enums/LimitType.java b/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/com/ruoyi/common/ratelimiter/enums/LimitType.java similarity index 85% rename from ruoyi-common/ruoyi-common-rateLimiter/src/main/java/com/ruoyi/common/rateLimiter/enums/LimitType.java rename to ruoyi-common/ruoyi-common-ratelimiter/src/main/java/com/ruoyi/common/ratelimiter/enums/LimitType.java index 417213bce..1ff05d191 100644 --- a/ruoyi-common/ruoyi-common-rateLimiter/src/main/java/com/ruoyi/common/rateLimiter/enums/LimitType.java +++ b/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/com/ruoyi/common/ratelimiter/enums/LimitType.java @@ -1,4 +1,4 @@ -package com.ruoyi.common.rateLimiter.enums; +package com.ruoyi.common.ratelimiter.enums; /** * 限流类型 diff --git a/ruoyi-common/ruoyi-common-ratelimiter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-ratelimiter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 000000000..68afe5577 --- /dev/null +++ b/ruoyi-common/ruoyi-common-ratelimiter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.ruoyi.common.ratelimiter.config.RateLimiterConfig diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml new file mode 100644 index 000000000..44deef0c5 --- /dev/null +++ b/ruoyi-modules/pom.xml @@ -0,0 +1,27 @@ + + + + ruoyi-vue-plus + com.ruoyi + ${revision} + ../pom.xml + + 4.0.0 + + + ruoyi-demo + ruoyi-generator + ruoyi-job + ruoyi-system + + + ruoyi-modules + pom + + + ruoyi-modules 业务模块 + + + diff --git a/ruoyi-demo/pom.xml b/ruoyi-modules/ruoyi-demo/pom.xml similarity index 95% rename from ruoyi-demo/pom.xml rename to ruoyi-modules/ruoyi-demo/pom.xml index 9f1d9c407..d0b43017e 100644 --- a/ruoyi-demo/pom.xml +++ b/ruoyi-modules/ruoyi-demo/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-vue-plus com.ruoyi + ruoyi-modules ${revision} ../pom.xml @@ -17,7 +17,6 @@ - com.ruoyi @@ -57,7 +56,7 @@ com.ruoyi - ruoyi-common-rateLimiter + ruoyi-common-ratelimiter diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/MailController.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/MailController.java similarity index 100% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/controller/MailController.java rename to ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/MailController.java diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisCacheController.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisCacheController.java similarity index 100% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisCacheController.java rename to ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisCacheController.java diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisLockController.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisLockController.java similarity index 100% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisLockController.java rename to ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisLockController.java diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisPubSubController.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisPubSubController.java similarity index 100% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisPubSubController.java rename to ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisPubSubController.java diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisRateLimiterController.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisRateLimiterController.java similarity index 91% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisRateLimiterController.java rename to ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisRateLimiterController.java index c11915169..0fa861f23 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisRateLimiterController.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/RedisRateLimiterController.java @@ -1,8 +1,8 @@ package com.ruoyi.demo.controller; import com.ruoyi.common.core.domain.R; -import com.ruoyi.common.rateLimiter.annotation.RateLimiter; -import com.ruoyi.common.rateLimiter.enums.LimitType; +import com.ruoyi.common.ratelimiter.annotation.RateLimiter; +import com.ruoyi.common.ratelimiter.enums.LimitType; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/SmsController.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/SmsController.java similarity index 100% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/controller/SmsController.java rename to ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/SmsController.java diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/Swagger3DemoController.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/Swagger3DemoController.java similarity index 100% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/controller/Swagger3DemoController.java rename to ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/Swagger3DemoController.java diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestBatchController.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestBatchController.java similarity index 100% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestBatchController.java rename to ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestBatchController.java diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java similarity index 100% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java rename to ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestDemoController.java diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestExcelController.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestExcelController.java similarity index 100% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestExcelController.java rename to ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestExcelController.java diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestI18nController.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestI18nController.java similarity index 100% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestI18nController.java rename to ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestI18nController.java diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestSensitiveController.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestSensitiveController.java similarity index 100% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestSensitiveController.java rename to ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestSensitiveController.java diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java similarity index 100% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java rename to ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestTreeController.java diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/package-info.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/package-info.java similarity index 100% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/controller/package-info.java rename to ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/package-info.java diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/BoundedQueueController.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/BoundedQueueController.java similarity index 100% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/BoundedQueueController.java rename to ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/BoundedQueueController.java diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/DelayedQueueController.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/DelayedQueueController.java similarity index 100% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/DelayedQueueController.java rename to ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/DelayedQueueController.java diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityDemo.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityDemo.java similarity index 100% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityDemo.java rename to ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityDemo.java diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityQueueController.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityQueueController.java similarity index 100% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityQueueController.java rename to ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/queue/PriorityQueueController.java diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java similarity index 100% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java rename to ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestDemo.java diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java similarity index 100% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java rename to ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoBo.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoBo.java similarity index 100% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoBo.java rename to ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoBo.java diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoImportVo.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoImportVo.java similarity index 100% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoImportVo.java rename to ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestDemoImportVo.java diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestTreeBo.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestTreeBo.java similarity index 100% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestTreeBo.java rename to ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestTreeBo.java diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/package-info.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/package-info.java similarity index 100% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/domain/package-info.java rename to ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/package-info.java diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestDemoVo.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestDemoVo.java similarity index 100% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestDemoVo.java rename to ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestDemoVo.java diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestTreeVo.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestTreeVo.java similarity index 100% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestTreeVo.java rename to ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/vo/TestTreeVo.java diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestDemoMapper.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestDemoMapper.java similarity index 100% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestDemoMapper.java rename to ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestDemoMapper.java diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestTreeMapper.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestTreeMapper.java similarity index 100% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestTreeMapper.java rename to ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/TestTreeMapper.java diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/package-info.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/package-info.java similarity index 100% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/package-info.java rename to ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/mapper/package-info.java diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestDemoService.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestDemoService.java similarity index 100% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestDemoService.java rename to ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestDemoService.java diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestTreeService.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestTreeService.java similarity index 100% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestTreeService.java rename to ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/service/ITestTreeService.java diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestDemoServiceImpl.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestDemoServiceImpl.java similarity index 100% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestDemoServiceImpl.java rename to ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestDemoServiceImpl.java diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestTreeServiceImpl.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestTreeServiceImpl.java similarity index 100% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestTreeServiceImpl.java rename to ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/TestTreeServiceImpl.java diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/package-info.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/package-info.java similarity index 100% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/package-info.java rename to ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/package-info.java diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/service/package-info.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/service/package-info.java similarity index 100% rename from ruoyi-demo/src/main/java/com/ruoyi/demo/service/package-info.java rename to ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/service/package-info.java diff --git a/ruoyi-demo/src/main/resources/excel/单列表.xlsx b/ruoyi-modules/ruoyi-demo/src/main/resources/excel/单列表.xlsx similarity index 100% rename from ruoyi-demo/src/main/resources/excel/单列表.xlsx rename to ruoyi-modules/ruoyi-demo/src/main/resources/excel/单列表.xlsx diff --git a/ruoyi-demo/src/main/resources/excel/多列表.xlsx b/ruoyi-modules/ruoyi-demo/src/main/resources/excel/多列表.xlsx similarity index 100% rename from ruoyi-demo/src/main/resources/excel/多列表.xlsx rename to ruoyi-modules/ruoyi-demo/src/main/resources/excel/多列表.xlsx diff --git a/ruoyi-demo/src/main/resources/mapper/demo/TestDemoMapper.xml b/ruoyi-modules/ruoyi-demo/src/main/resources/mapper/demo/TestDemoMapper.xml similarity index 100% rename from ruoyi-demo/src/main/resources/mapper/demo/TestDemoMapper.xml rename to ruoyi-modules/ruoyi-demo/src/main/resources/mapper/demo/TestDemoMapper.xml diff --git a/ruoyi-demo/src/main/resources/mapper/demo/TestTreeMapper.xml b/ruoyi-modules/ruoyi-demo/src/main/resources/mapper/demo/TestTreeMapper.xml similarity index 100% rename from ruoyi-demo/src/main/resources/mapper/demo/TestTreeMapper.xml rename to ruoyi-modules/ruoyi-demo/src/main/resources/mapper/demo/TestTreeMapper.xml diff --git a/ruoyi-demo/src/main/resources/mapper/package-info.md b/ruoyi-modules/ruoyi-demo/src/main/resources/mapper/package-info.md similarity index 100% rename from ruoyi-demo/src/main/resources/mapper/package-info.md rename to ruoyi-modules/ruoyi-demo/src/main/resources/mapper/package-info.md diff --git a/ruoyi-generator/pom.xml b/ruoyi-modules/ruoyi-generator/pom.xml similarity index 94% rename from ruoyi-generator/pom.xml rename to ruoyi-modules/ruoyi-generator/pom.xml index 6d1bdad54..e4001ec62 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-vue-plus com.ruoyi + ruoyi-modules ${revision} ../pom.xml @@ -13,7 +13,7 @@ ruoyi-generator - generator代码生成 + generator 代码生成 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/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/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 97% rename from ruoyi-generator/src/main/resources/generator.yml rename to ruoyi-modules/ruoyi-generator/src/main/resources/generator.yml index 4544c8c24..5bd3dd67b 100644 --- a/ruoyi-generator/src/main/resources/generator.yml +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/generator.yml @@ -1,10 +1,10 @@ -# 代码生成 -gen: - # 作者 - author: ruoyi - # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool - packageName: com.ruoyi.system - # 自动去除表前缀，默认是false - autoRemovePre: false - # 表前缀（生成类名不会包含表前缀，多个用逗号分隔） +# 代码生成 +gen: + # 作者 + author: ruoyi + # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool + packageName: com.ruoyi.system + # 自动去除表前缀，默认是false + autoRemovePre: false + # 表前缀（生成类名不会包含表前缀，多个用逗号分隔） tablePrefix: sys_ \ No newline at end of file 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/mapper/package-info.md b/ruoyi-modules/ruoyi-generator/src/main/resources/mapper/package-info.md similarity index 100% rename from ruoyi-generator/src/main/resources/mapper/package-info.md rename to ruoyi-modules/ruoyi-generator/src/main/resources/mapper/package-info.md diff --git a/ruoyi-generator/src/main/resources/vm/java/bo.java.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/java/bo.java.vm rename to ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/bo.java.vm 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/vo.java.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/vo.java.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/java/vo.java.vm rename to ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/vo.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/oracle/sql.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/oracle/sql.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/sql/oracle/sql.vm rename to ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/oracle/sql.vm diff --git a/ruoyi-generator/src/main/resources/vm/sql/postgres/sql.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/postgres/sql.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/sql/postgres/sql.vm rename to ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/postgres/sql.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/sql/sqlserver/sql.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/sqlserver/sql.vm similarity index 100% rename from ruoyi-generator/src/main/resources/vm/sql/sqlserver/sql.vm rename to ruoyi-modules/ruoyi-generator/src/main/resources/vm/sql/sqlserver/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/vue/v3/readme.txt b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/v3/readme.txt similarity index 100% rename from ruoyi-generator/src/main/resources/vm/vue/v3/readme.txt rename to ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/v3/readme.txt 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-job/pom.xml b/ruoyi-modules/ruoyi-job/pom.xml similarity index 95% rename from ruoyi-job/pom.xml rename to ruoyi-modules/ruoyi-job/pom.xml index 596a997ed..e886a293a 100644 --- a/ruoyi-job/pom.xml +++ b/ruoyi-modules/ruoyi-job/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-vue-plus com.ruoyi + ruoyi-modules ${revision} ../pom.xml diff --git a/ruoyi-job/src/main/java/com/ruoyi/job/config/XxlJobConfig.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/config/XxlJobConfig.java similarity index 100% rename from ruoyi-job/src/main/java/com/ruoyi/job/config/XxlJobConfig.java rename to ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/config/XxlJobConfig.java diff --git a/ruoyi-job/src/main/java/com/ruoyi/job/config/properties/XxlJobProperties.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/config/properties/XxlJobProperties.java similarity index 100% rename from ruoyi-job/src/main/java/com/ruoyi/job/config/properties/XxlJobProperties.java rename to ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/config/properties/XxlJobProperties.java diff --git a/ruoyi-job/src/main/java/com/ruoyi/job/service/SampleService.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SampleService.java similarity index 100% rename from ruoyi-job/src/main/java/com/ruoyi/job/service/SampleService.java rename to ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SampleService.java diff --git a/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml similarity index 97% rename from ruoyi-system/pom.xml rename to ruoyi-modules/ruoyi-system/pom.xml index 33dbb35fc..690d7934e 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-vue-plus com.ruoyi + ruoyi-modules ${revision} ../pom.xml diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/monitor/CacheController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/monitor/CacheController.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/controller/monitor/CacheController.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/monitor/CacheController.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/monitor/SysLogininforController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/monitor/SysLogininforController.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/controller/monitor/SysLogininforController.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/monitor/SysLogininforController.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/monitor/SysOperlogController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/monitor/SysOperlogController.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/controller/monitor/SysOperlogController.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/monitor/SysOperlogController.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/monitor/SysUserOnlineController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/monitor/SysUserOnlineController.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/controller/monitor/SysUserOnlineController.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/monitor/SysUserOnlineController.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysConfigController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysConfigController.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysConfigController.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysConfigController.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysDeptController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysDeptController.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysDeptController.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysDeptController.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysDictDataController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysDictDataController.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysDictDataController.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysDictDataController.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysDictTypeController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysDictTypeController.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysDictTypeController.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysDictTypeController.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysMenuController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysMenuController.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysMenuController.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysMenuController.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysNoticeController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysNoticeController.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysNoticeController.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysNoticeController.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysOssConfigController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysOssConfigController.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysOssConfigController.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysOssConfigController.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysOssController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysOssController.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysOssController.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysOssController.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysPostController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysPostController.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysPostController.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysPostController.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysProfileController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysProfileController.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysProfileController.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysProfileController.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysRoleController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysRoleController.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysRoleController.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysRoleController.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysUserController.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysUserController.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysUserController.java 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/SysDept.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDept.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDept.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDept.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDictData.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDictData.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDictData.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDictData.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDictType.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDictType.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDictType.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDictType.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/SysMenu.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.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/SysOss.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOss.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOss.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOss.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOssConfig.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOssConfig.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOssConfig.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOssConfig.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/SysRole.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRole.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRole.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysRole.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/SysUser.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUser.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/bo/SysOssBo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssBo.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssBo.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssBo.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.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/domain/vo/SysOssConfigVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssConfigVo.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssConfigVo.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssConfigVo.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserExportVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserExportVo.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserExportVo.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserExportVo.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserImportVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserImportVo.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserImportVo.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserImportVo.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/listener/SysUserImportListener.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/listener/SysUserImportListener.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/listener/SysUserImportListener.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/listener/SysUserImportListener.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/SysOssConfigMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOssConfigMapper.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOssConfigMapper.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOssConfigMapper.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOssMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOssMapper.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOssMapper.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOssMapper.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/runner/SystemApplicationRunner.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/runner/SystemApplicationRunner.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/runner/SystemApplicationRunner.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/runner/SystemApplicationRunner.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/ISysDataScopeService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDataScopeService.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDataScopeService.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDataScopeService.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/ISysOssConfigService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOssConfigService.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOssConfigService.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOssConfigService.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOssService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOssService.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOssService.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOssService.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/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/SysLoginService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/SysPermissionService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/SysPermissionService.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/SysPermissionService.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/SysPermissionService.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/SysRegisterService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/SysRegisterService.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/SysRegisterService.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/SysRegisterService.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/SysDataScopeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDataScopeServiceImpl.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDataScopeServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDataScopeServiceImpl.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/SysOssConfigServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssConfigServiceImpl.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssConfigServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssConfigServiceImpl.java diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.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/SysSensitiveServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSensitiveServiceImpl.java similarity index 100% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSensitiveServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSensitiveServiceImpl.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/package-info.md b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/package-info.md similarity index 100% rename from ruoyi-system/src/main/resources/mapper/package-info.md rename to ruoyi-modules/ruoyi-system/src/main/resources/mapper/package-info.md 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/SysOssConfigMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssConfigMapper.xml similarity index 100% rename from ruoyi-system/src/main/resources/mapper/system/SysOssConfigMapper.xml rename to ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssConfigMapper.xml diff --git a/ruoyi-system/src/main/resources/mapper/system/SysOssMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssMapper.xml similarity index 100% rename from ruoyi-system/src/main/resources/mapper/system/SysOssMapper.xml rename to ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssMapper.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