From 5414612242abc5170c4861f577ec15be654c13a6 Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Mon, 8 May 2023 15:56:23 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=907.6.0=E3=80=91=E3=80=90=E6=A1=86?= =?UTF-8?q?=E6=9E=B6=E6=94=B9=E9=80=A0=E3=80=91=E5=90=88=E5=B9=B6=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel-s-system/pom.xml | 13 +-- kernel-s-system/system-business-app/README.md | 1 - kernel-s-system/system-business-app/pom.xml | 59 ------------ kernel-s-system/system-business-hr/README.md | 1 + .../pom.xml | 61 +++++++------ .../controller/HrOrgApproverController.java | 0 .../controller/HrOrganizationController.java | 0 .../controller/HrPositionController.java | 0 .../organization/entity/HrOrgApprover.java | 0 .../organization/entity/HrOrganization.java | 0 .../organization/entity/HrPosition.java | 0 .../enums/HrOrgApproverExceptionEnum.java | 0 .../factory/OrganizationFactory.java | 0 .../mapper/HrOrgApproverMapper.java | 0 .../mapper/HrOrganizationMapper.java | 0 .../organization/mapper/HrPositionMapper.java | 0 .../mapper/mapping/HrOrgApproverMapper.xml | 0 .../mapper/mapping/HrOrganizationMapper.xml | 0 .../mapper/mapping/HrPositionMapper.xml | 0 .../pojo/request/HrOrgApproverRequest.java | 0 .../service/DataScopeService.java | 0 .../service/HrOrgApproverService.java | 0 .../service/HrOrganizationService.java | 0 .../service/HrPositionService.java | 0 .../impl/HrOrgApproverServiceImpl.java | 0 .../impl/HrOrganizationServiceImpl.java | 0 .../service/impl/HrPositionServiceImpl.java | 0 .../wrapper/OrgExpandWrapper.java | 1 - .../user/cache/SysUserMemoryCache.java | 0 .../modular/user/cache/SysUserRedisCache.java | 0 .../user/cache/UserOrgMemoryCache.java | 0 .../modular/user/cache/UserOrgRedisCache.java | 0 .../user/cache/UserRoleMemoryCache.java | 0 .../user/cache/UserRoleRedisCache.java | 0 .../user/controller/KaptchaController.java | 0 .../user/controller/LoginController.java | 0 .../user/controller/OnlineUserController.java | 0 .../controller/PersonalInfoController.java | 0 .../controller/SysUserAdminController.java | 0 .../user/controller/SysUserController.java | 0 .../controller/SysUserGroupController.java | 2 +- .../user/controller/SysUserOrgController.java | 2 +- .../system/modular/user/entity/SysUser.java | 0 .../modular/user/entity/SysUserDataScope.java | 0 .../modular/user/entity/SysUserGroup.java | 0 .../user/entity/SysUserGroupDetail.java | 0 .../modular/user/entity/SysUserOrg.java | 0 .../modular/user/entity/SysUserRole.java | 0 .../SysUserGroupDetailExceptionEnum.java | 0 .../user/enums/SysUserGroupExceptionEnum.java | 0 .../user/enums/SysUserOrgExceptionEnum.java | 0 .../user/factory/OnlineUserCreateFactory.java | 0 .../user/factory/SysUserCreateFactory.java | 0 .../user/factory/UserGroupFactory.java | 2 +- .../user/factory/UserLoginInfoFactory.java | 0 .../user/mapper/SysUserDataScopeMapper.java | 2 +- .../user/mapper/SysUserGroupDetailMapper.java | 0 .../user/mapper/SysUserGroupMapper.java | 0 .../modular/user/mapper/SysUserMapper.java | 2 +- .../modular/user/mapper/SysUserOrgMapper.java | 0 .../user/mapper/SysUserRoleMapper.java | 0 .../mapper/mapping/SysUserDataScopeMapper.xml | 0 .../mapping/SysUserGroupDetailMapper.xml | 0 .../mapper/mapping/SysUserGroupMapper.xml | 0 .../user/mapper/mapping/SysUserMapper.xml | 0 .../user/mapper/mapping/SysUserOrgMapper.xml | 0 .../user/mapper/mapping/SysUserRoleMapper.xml | 0 .../user/provider/LoginUserProvider.java | 0 .../request/SysUserGroupDetailRequest.java | 2 +- .../user}/request/SysUserGroupRequest.java | 2 +- .../user}/request/SysUserOrgRequest.java | 2 +- .../user/service/IndexUserInfoService.java | 0 .../user/service/SysUserAdminService.java | 0 .../user/service/SysUserDataScopeService.java | 2 +- .../service/SysUserGroupDetailService.java | 2 +- .../user/service/SysUserGroupService.java | 2 +- .../user/service/SysUserOrgService.java | 0 .../user/service/SysUserRoleService.java | 0 .../modular/user/service/SysUserService.java | 0 .../user/service/TenantPrefixService.java | 0 .../impl/IndexUserInfoServiceImpl.java | 0 .../service/impl/SysUserAdminServiceImpl.java | 0 .../impl/SysUserDataScopeServiceImpl.java | 6 +- .../impl/SysUserGroupDetailServiceImpl.java | 2 +- .../service/impl/SysUserGroupServiceImpl.java | 2 +- .../impl/SysUserOrgServiceServiceImpl.java | 0 .../service/impl/SysUserRoleServiceImpl.java | 0 .../user/service/impl/SysUserServiceImpl.java | 0 .../user/wrapper/UserExpandWrapper.java | 0 .../system-business-menu/README.md | 1 - kernel-s-system/system-business-menu/pom.xml | 74 --------------- .../system-business-notice/pom.xml | 81 ----------------- .../system-business-organization/README.md | 1 - .../system-business-organization/pom.xml | 66 -------------- .../system-business-permission/README.md | 1 + .../pom.xml | 55 +++++++++--- .../app/controller/SysAppController.java | 0 .../system/modular/app/entity/SysApp.java | 0 .../modular/app/mapper/SysAppMapper.java | 0 .../app/mapper/mapping/SysAppMapper.xml | 0 .../modular/app/service/SysAppService.java | 0 .../app/service/impl/SysAppServiceImpl.java | 0 .../home/aop/InterfaceStatisticsAop.java | 0 .../cache/InterfaceStatisticsMemoryCache.java | 0 .../cache/InterfaceStatisticsRedisCache.java | 0 .../home/context/StatisticsUrlContext.java | 0 .../home/controller/HomePageController.java | 0 .../controller/SysStatisticsController.java | 0 .../home/entity/SysStatisticsCount.java | 0 .../modular/home/entity/SysStatisticsUrl.java | 0 .../SysStatisticsCountExceptionEnum.java | 0 .../enums/SysStatisticsUrlExceptionEnum.java | 0 .../home/mapper/SysStatisticsCountMapper.java | 0 .../home/mapper/SysStatisticsUrlMapper.java | 0 .../mapping/SysStatisticsCountMapper.xml | 0 .../mapper/mapping/SysStatisticsUrlMapper.xml | 0 .../modular/home/pojo/OnlineUserStat.java | 0 .../request/SysStatisticsCountRequest.java | 0 .../pojo/request/SysStatisticsUrlRequest.java | 0 .../modular/home/service/HomePageService.java | 0 .../service/SysStatisticsCountService.java | 0 .../home/service/SysStatisticsUrlService.java | 0 .../service/impl/HomePageServiceImpl.java | 0 .../impl/SysStatisticsCountServiceImpl.java | 0 .../impl/SysStatisticsUrlServiceImpl.java | 0 .../home/timer/InterfaceStatisticsTimer.java | 0 .../menu/constants/MenuButtonConstant.java | 0 .../controller/SysMenuButtonController.java | 0 .../menu/controller/SysMenuController.java | 0 .../controller/SysMenuResourceController.java | 0 .../system/modular/menu/entity/SysMenu.java | 0 .../modular/menu/entity/SysMenuButton.java | 0 .../modular/menu/entity/SysMenuResource.java | 0 .../menu/factory/AntdMenusFactory.java | 0 .../menu/factory/Antdv3MenusFactory.java | 0 .../menu/factory/LayuiMenusFactory.java | 0 .../menu/factory/MenuButtonFactory.java | 0 .../modular/menu/factory/MenuTypeFactory.java | 0 .../listener/MenuResourceUpdateListener.java | 0 .../menu/mapper/SysMenuButtonMapper.java | 0 .../modular/menu/mapper/SysMenuMapper.java | 0 .../menu/mapper/SysMenuResourceMapper.java | 0 .../mapper/mapping/SysMenuButtonMapper.xml | 0 .../menu/mapper/mapping/SysMenuMapper.xml | 0 .../mapper/mapping/SysMenuResourceMapper.xml | 0 .../menu/service/SysMenuButtonService.java | 2 +- .../menu/service/SysMenuResourceService.java | 0 .../modular/menu/service/SysMenuService.java | 0 .../impl/SysMenuButtonServiceImpl.java | 0 .../impl/SysMenuResourceServiceImpl.java | 0 .../menu/service/impl/SysMenuServiceImpl.java | 0 .../resource/cache/MemoryResourceCache.java | 0 .../resource/cache/RedisResourceCache.java | 0 .../controller/ResourceController.java | 0 .../controller/ResourceReportController.java | 0 .../modular/resource/entity/SysResource.java | 0 .../resource/factory/ResourceFactory.java | 0 .../resource/mapper/SysResourceMapper.java | 0 .../mapper/mapping/SysResourceMapper.xml | 0 .../resource/pojo/ResourceTreeNode.java | 0 .../resource/service/SysResourceService.java | 0 .../service/impl/SysResourceServiceImpl.java | 0 .../role/cache/RoleDataScopeMemoryCache.java | 0 .../role/cache/RoleDataScopeRedisCache.java | 0 .../modular/role/cache/RoleMemoryCache.java | 0 .../modular/role/cache/RoleRedisCache.java | 0 .../role/cache/RoleResourceMemoryCache.java | 0 .../role/cache/RoleResourceRedisCache.java | 0 .../controller/SysRoleAuthController.java | 0 .../role/controller/SysRoleController.java | 0 .../system/modular/role/entity/SysRole.java | 0 .../modular/role/entity/SysRoleDataScope.java | 0 .../modular/role/entity/SysRoleMenu.java | 0 .../role/entity/SysRoleMenuButton.java | 0 .../modular/role/entity/SysRoleResource.java | 0 .../listener/RoleResourceUpdateListener.java | 0 .../role/mapper/SysRoleDataScopeMapper.java | 0 .../modular/role/mapper/SysRoleMapper.java | 0 .../role/mapper/SysRoleMenuButtonMapper.java | 0 .../role/mapper/SysRoleMenuMapper.java | 0 .../role/mapper/SysRoleResourceMapper.java | 0 .../mapper/mapping/SysRoleDataScopeMapper.xml | 0 .../role/mapper/mapping/SysRoleMapper.xml | 0 .../mapping/SysRoleMenuButtonMapper.xml | 0 .../role/mapper/mapping/SysRoleMenuMapper.xml | 0 .../mapper/mapping/SysRoleResourceMapper.xml | 0 .../role/service/SysRoleDataScopeService.java | 0 .../service/SysRoleMenuButtonService.java | 0 .../role/service/SysRoleMenuService.java | 0 .../role/service/SysRoleResourceService.java | 0 .../modular/role/service/SysRoleService.java | 0 .../impl/SysRoleDataScopeServiceImpl.java | 4 +- .../impl/SysRoleMenuButtonServiceImpl.java | 0 .../service/impl/SysRoleMenuServiceImpl.java | 0 .../impl/SysRoleResourceServiceImpl.java | 0 .../role/service/impl/SysRoleServiceImpl.java | 0 .../README.md | 0 .../pom.xml | 31 ++++++- .../controller/SysNoticeController.java | 0 .../modular/notice/entity/SysNotice.java | 0 .../notice/mapper/SysNoticeMapper.java | 0 .../notice/mapper/mapping/SysNoticeMapper.xml | 0 .../notice/service/SysNoticeService.java | 2 +- .../service/impl/SysNoticeServiceImpl.java | 0 .../modular/theme/cache/ThemeMemoryCache.java | 0 .../modular/theme/cache/ThemeRedisCache.java | 0 .../theme/clean/ThemeConfigRefresh.java | 0 .../controller/SysThemeApiController.java | 0 .../theme/controller/SysThemeController.java | 0 .../SysThemeTemplateController.java | 0 .../SysThemeTemplateFieldController.java | 0 .../SysThemeTemplateRelController.java | 0 .../system/modular/theme/entity/SysTheme.java | 0 .../theme/entity/SysThemeTemplate.java | 0 .../theme/entity/SysThemeTemplateField.java | 0 .../theme/entity/SysThemeTemplateRel.java | 0 .../theme/enums/ThemeFieldTypeEnum.java | 0 .../theme/factory/DefaultThemeFactory.java | 0 .../modular/theme/mapper/SysThemeMapper.java | 0 .../mapper/SysThemeTemplateFieldMapper.java | 0 .../theme/mapper/SysThemeTemplateMapper.java | 0 .../mapper/SysThemeTemplateRelMapper.java | 0 .../theme/mapper/mapping/SysThemeMapper.xml | 0 .../mapping/SysThemeTemplateFieldMapper.xml | 0 .../mapper/mapping/SysThemeTemplateMapper.xml | 0 .../mapping/SysThemeTemplateRelMapper.xml | 0 .../modular/theme/pojo/DefaultTheme.java | 0 .../theme/service/SysThemeService.java | 0 .../service/SysThemeTemplateFieldService.java | 0 .../service/SysThemeTemplateRelService.java | 0 .../service/SysThemeTemplateService.java | 0 .../service/impl/SysThemeServiceImpl.java | 0 .../SysThemeTemplateFieldServiceImpl.java | 0 .../impl/SysThemeTemplateRelServiceImpl.java | 0 .../impl/SysThemeTemplateServiceImpl.java | 0 .../system-business-resource/README.md | 1 - .../system-business-resource/pom.xml | 89 ------------------- .../system-business-role/README.md | 3 - kernel-s-system/system-business-role/pom.xml | 79 ---------------- .../system-business-user/README.md | 1 - .../system-integration-rest/README.md | 1 - .../system-integration-rest/pom.xml | 29 ------ .../main/resources/META-INF/spring.factories | 2 - .../system-spring-boot-starter/pom.xml | 6 +- .../system/starter}/ErrorStaticJsonView.java | 2 +- .../RestErrorViewAutoConfiguration.java | 4 +- .../main/resources/META-INF/spring.factories | 3 +- 247 files changed, 132 insertions(+), 574 deletions(-) delete mode 100644 kernel-s-system/system-business-app/README.md delete mode 100644 kernel-s-system/system-business-app/pom.xml create mode 100644 kernel-s-system/system-business-hr/README.md rename kernel-s-system/{system-business-user => system-business-hr}/pom.xml (92%) rename kernel-s-system/{system-business-organization => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrOrgApproverController.java (100%) rename kernel-s-system/{system-business-organization => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrOrganizationController.java (100%) rename kernel-s-system/{system-business-organization => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrPositionController.java (100%) rename kernel-s-system/{system-business-organization => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrOrgApprover.java (100%) rename kernel-s-system/{system-business-organization => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrOrganization.java (100%) rename kernel-s-system/{system-business-organization => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrPosition.java (100%) rename kernel-s-system/{system-business-organization => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/enums/HrOrgApproverExceptionEnum.java (100%) rename kernel-s-system/{system-business-organization => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/factory/OrganizationFactory.java (100%) rename kernel-s-system/{system-business-organization => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/mapper/HrOrgApproverMapper.java (100%) rename kernel-s-system/{system-business-organization => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/mapper/HrOrganizationMapper.java (100%) rename kernel-s-system/{system-business-organization => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/mapper/HrPositionMapper.java (100%) rename kernel-s-system/{system-business-organization => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/mapper/mapping/HrOrgApproverMapper.xml (100%) rename kernel-s-system/{system-business-organization => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/mapper/mapping/HrOrganizationMapper.xml (100%) rename kernel-s-system/{system-business-organization => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/mapper/mapping/HrPositionMapper.xml (100%) rename kernel-s-system/{system-business-organization => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/pojo/request/HrOrgApproverRequest.java (100%) rename kernel-s-system/{system-business-organization => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/DataScopeService.java (100%) rename kernel-s-system/{system-business-organization => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/HrOrgApproverService.java (100%) rename kernel-s-system/{system-business-organization => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/HrOrganizationService.java (100%) rename kernel-s-system/{system-business-organization => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/HrPositionService.java (100%) rename kernel-s-system/{system-business-organization => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrgApproverServiceImpl.java (100%) rename kernel-s-system/{system-business-organization => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrganizationServiceImpl.java (100%) rename kernel-s-system/{system-business-organization => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrPositionServiceImpl.java (100%) rename kernel-s-system/{system-business-organization => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/wrapper/OrgExpandWrapper.java (99%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/cache/SysUserMemoryCache.java (100%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/cache/SysUserRedisCache.java (100%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/cache/UserOrgMemoryCache.java (100%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/cache/UserOrgRedisCache.java (100%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/cache/UserRoleMemoryCache.java (100%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/cache/UserRoleRedisCache.java (100%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/KaptchaController.java (100%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/LoginController.java (100%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/OnlineUserController.java (100%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/PersonalInfoController.java (100%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/SysUserAdminController.java (100%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/SysUserController.java (100%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/SysUserGroupController.java (96%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/SysUserOrgController.java (98%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUser.java (100%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUserDataScope.java (100%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUserGroup.java (100%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUserGroupDetail.java (100%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUserOrg.java (100%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUserRole.java (100%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/enums/SysUserGroupDetailExceptionEnum.java (100%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/enums/SysUserGroupExceptionEnum.java (100%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/enums/SysUserOrgExceptionEnum.java (100%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/factory/OnlineUserCreateFactory.java (100%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/factory/SysUserCreateFactory.java (100%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/factory/UserGroupFactory.java (98%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/factory/UserLoginInfoFactory.java (100%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserDataScopeMapper.java (100%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserGroupDetailMapper.java (100%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserGroupMapper.java (100%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserMapper.java (100%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserOrgMapper.java (100%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserRoleMapper.java (100%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserDataScopeMapper.xml (100%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserGroupDetailMapper.xml (100%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserGroupMapper.xml (100%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserMapper.xml (100%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserOrgMapper.xml (100%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserRoleMapper.xml (100%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/provider/LoginUserProvider.java (100%) rename kernel-s-system/{system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/pojo => system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user}/request/SysUserGroupDetailRequest.java (96%) rename kernel-s-system/{system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/pojo => system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user}/request/SysUserGroupRequest.java (96%) rename kernel-s-system/{system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/pojo => system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user}/request/SysUserOrgRequest.java (90%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/IndexUserInfoService.java (100%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserAdminService.java (100%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserDataScopeService.java (100%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserGroupDetailService.java (95%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserGroupService.java (95%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserOrgService.java (100%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserRoleService.java (100%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserService.java (100%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/TenantPrefixService.java (100%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/IndexUserInfoServiceImpl.java (100%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserAdminServiceImpl.java (100%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserDataScopeServiceImpl.java (97%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserGroupDetailServiceImpl.java (98%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserGroupServiceImpl.java (98%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserOrgServiceServiceImpl.java (100%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserRoleServiceImpl.java (100%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java (100%) rename kernel-s-system/{system-business-user => system-business-hr}/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/wrapper/UserExpandWrapper.java (100%) delete mode 100644 kernel-s-system/system-business-menu/README.md delete mode 100644 kernel-s-system/system-business-menu/pom.xml delete mode 100644 kernel-s-system/system-business-notice/pom.xml delete mode 100644 kernel-s-system/system-business-organization/README.md delete mode 100644 kernel-s-system/system-business-organization/pom.xml create mode 100644 kernel-s-system/system-business-permission/README.md rename kernel-s-system/{system-business-home => system-business-permission}/pom.xml (78%) rename kernel-s-system/{system-business-app => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/controller/SysAppController.java (100%) rename kernel-s-system/{system-business-app => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/entity/SysApp.java (100%) rename kernel-s-system/{system-business-app => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/mapper/SysAppMapper.java (100%) rename kernel-s-system/{system-business-app => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/mapper/mapping/SysAppMapper.xml (100%) rename kernel-s-system/{system-business-app => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/service/SysAppService.java (100%) rename kernel-s-system/{system-business-app => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/service/impl/SysAppServiceImpl.java (100%) rename kernel-s-system/{system-business-home => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/aop/InterfaceStatisticsAop.java (100%) rename kernel-s-system/{system-business-home => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/cache/InterfaceStatisticsMemoryCache.java (100%) rename kernel-s-system/{system-business-home => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/cache/InterfaceStatisticsRedisCache.java (100%) rename kernel-s-system/{system-business-home => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/context/StatisticsUrlContext.java (100%) rename kernel-s-system/{system-business-home => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/controller/HomePageController.java (100%) rename kernel-s-system/{system-business-home => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/controller/SysStatisticsController.java (100%) rename kernel-s-system/{system-business-home => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/entity/SysStatisticsCount.java (100%) rename kernel-s-system/{system-business-home => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/entity/SysStatisticsUrl.java (100%) rename kernel-s-system/{system-business-home => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/enums/SysStatisticsCountExceptionEnum.java (100%) rename kernel-s-system/{system-business-home => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/enums/SysStatisticsUrlExceptionEnum.java (100%) rename kernel-s-system/{system-business-home => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/mapper/SysStatisticsCountMapper.java (100%) rename kernel-s-system/{system-business-home => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/mapper/SysStatisticsUrlMapper.java (100%) rename kernel-s-system/{system-business-home => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/mapper/mapping/SysStatisticsCountMapper.xml (100%) rename kernel-s-system/{system-business-home => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/mapper/mapping/SysStatisticsUrlMapper.xml (100%) rename kernel-s-system/{system-business-home => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/pojo/OnlineUserStat.java (100%) rename kernel-s-system/{system-business-home => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/pojo/request/SysStatisticsCountRequest.java (100%) rename kernel-s-system/{system-business-home => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/pojo/request/SysStatisticsUrlRequest.java (100%) rename kernel-s-system/{system-business-home => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/HomePageService.java (100%) rename kernel-s-system/{system-business-home => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/SysStatisticsCountService.java (100%) rename kernel-s-system/{system-business-home => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/SysStatisticsUrlService.java (100%) rename kernel-s-system/{system-business-home => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/impl/HomePageServiceImpl.java (100%) rename kernel-s-system/{system-business-home => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/impl/SysStatisticsCountServiceImpl.java (100%) rename kernel-s-system/{system-business-home => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/impl/SysStatisticsUrlServiceImpl.java (100%) rename kernel-s-system/{system-business-home => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/timer/InterfaceStatisticsTimer.java (100%) rename kernel-s-system/{system-business-menu => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/constants/MenuButtonConstant.java (100%) rename kernel-s-system/{system-business-menu => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/controller/SysMenuButtonController.java (100%) rename kernel-s-system/{system-business-menu => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/controller/SysMenuController.java (100%) rename kernel-s-system/{system-business-menu => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/controller/SysMenuResourceController.java (100%) rename kernel-s-system/{system-business-menu => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/entity/SysMenu.java (100%) rename kernel-s-system/{system-business-menu => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/entity/SysMenuButton.java (100%) rename kernel-s-system/{system-business-menu => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/entity/SysMenuResource.java (100%) rename kernel-s-system/{system-business-menu => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/AntdMenusFactory.java (100%) rename kernel-s-system/{system-business-menu => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/Antdv3MenusFactory.java (100%) rename kernel-s-system/{system-business-menu => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/LayuiMenusFactory.java (100%) rename kernel-s-system/{system-business-menu => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/MenuButtonFactory.java (100%) rename kernel-s-system/{system-business-menu => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/MenuTypeFactory.java (100%) rename kernel-s-system/{system-business-menu => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/listener/MenuResourceUpdateListener.java (100%) rename kernel-s-system/{system-business-menu => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/SysMenuButtonMapper.java (100%) rename kernel-s-system/{system-business-menu => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/SysMenuMapper.java (100%) rename kernel-s-system/{system-business-menu => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/SysMenuResourceMapper.java (100%) rename kernel-s-system/{system-business-menu => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/mapping/SysMenuButtonMapper.xml (100%) rename kernel-s-system/{system-business-menu => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/mapping/SysMenuMapper.xml (100%) rename kernel-s-system/{system-business-menu => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/mapping/SysMenuResourceMapper.xml (100%) rename kernel-s-system/{system-business-menu => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/SysMenuButtonService.java (100%) rename kernel-s-system/{system-business-menu => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/SysMenuResourceService.java (100%) rename kernel-s-system/{system-business-menu => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/SysMenuService.java (100%) rename kernel-s-system/{system-business-menu => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/impl/SysMenuButtonServiceImpl.java (100%) rename kernel-s-system/{system-business-menu => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/impl/SysMenuResourceServiceImpl.java (100%) rename kernel-s-system/{system-business-menu => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/impl/SysMenuServiceImpl.java (100%) rename kernel-s-system/{system-business-resource => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/cache/MemoryResourceCache.java (100%) rename kernel-s-system/{system-business-resource => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/cache/RedisResourceCache.java (100%) rename kernel-s-system/{system-business-resource => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/controller/ResourceController.java (100%) rename kernel-s-system/{system-business-resource => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/controller/ResourceReportController.java (100%) rename kernel-s-system/{system-business-resource => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/entity/SysResource.java (100%) rename kernel-s-system/{system-business-resource => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/factory/ResourceFactory.java (100%) rename kernel-s-system/{system-business-resource => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/mapper/SysResourceMapper.java (100%) rename kernel-s-system/{system-business-resource => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/mapper/mapping/SysResourceMapper.xml (100%) rename kernel-s-system/{system-business-resource => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/pojo/ResourceTreeNode.java (100%) rename kernel-s-system/{system-business-resource => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/SysResourceService.java (100%) rename kernel-s-system/{system-business-resource => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/impl/SysResourceServiceImpl.java (100%) rename kernel-s-system/{system-business-role => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/cache/RoleDataScopeMemoryCache.java (100%) rename kernel-s-system/{system-business-role => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/cache/RoleDataScopeRedisCache.java (100%) rename kernel-s-system/{system-business-role => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/cache/RoleMemoryCache.java (100%) rename kernel-s-system/{system-business-role => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/cache/RoleRedisCache.java (100%) rename kernel-s-system/{system-business-role => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/cache/RoleResourceMemoryCache.java (100%) rename kernel-s-system/{system-business-role => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/cache/RoleResourceRedisCache.java (100%) rename kernel-s-system/{system-business-role => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/controller/SysRoleAuthController.java (100%) rename kernel-s-system/{system-business-role => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/controller/SysRoleController.java (100%) rename kernel-s-system/{system-business-role => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/entity/SysRole.java (100%) rename kernel-s-system/{system-business-role => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/entity/SysRoleDataScope.java (100%) rename kernel-s-system/{system-business-role => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/entity/SysRoleMenu.java (100%) rename kernel-s-system/{system-business-role => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/entity/SysRoleMenuButton.java (100%) rename kernel-s-system/{system-business-role => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/entity/SysRoleResource.java (100%) rename kernel-s-system/{system-business-role => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/listener/RoleResourceUpdateListener.java (100%) rename kernel-s-system/{system-business-role => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/SysRoleDataScopeMapper.java (100%) rename kernel-s-system/{system-business-role => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/SysRoleMapper.java (100%) rename kernel-s-system/{system-business-role => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/SysRoleMenuButtonMapper.java (100%) rename kernel-s-system/{system-business-role => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/SysRoleMenuMapper.java (100%) rename kernel-s-system/{system-business-role => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/SysRoleResourceMapper.java (100%) rename kernel-s-system/{system-business-role => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/mapping/SysRoleDataScopeMapper.xml (100%) rename kernel-s-system/{system-business-role => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/mapping/SysRoleMapper.xml (100%) rename kernel-s-system/{system-business-role => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/mapping/SysRoleMenuButtonMapper.xml (100%) rename kernel-s-system/{system-business-role => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/mapping/SysRoleMenuMapper.xml (100%) rename kernel-s-system/{system-business-role => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/mapping/SysRoleResourceMapper.xml (100%) rename kernel-s-system/{system-business-role => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/SysRoleDataScopeService.java (100%) rename kernel-s-system/{system-business-role => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/SysRoleMenuButtonService.java (100%) rename kernel-s-system/{system-business-role => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/SysRoleMenuService.java (100%) rename kernel-s-system/{system-business-role => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/SysRoleResourceService.java (100%) rename kernel-s-system/{system-business-role => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/SysRoleService.java (100%) rename kernel-s-system/{system-business-role => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleDataScopeServiceImpl.java (100%) rename kernel-s-system/{system-business-role => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleMenuButtonServiceImpl.java (100%) rename kernel-s-system/{system-business-role => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleMenuServiceImpl.java (100%) rename kernel-s-system/{system-business-role => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleResourceServiceImpl.java (100%) rename kernel-s-system/{system-business-role => system-business-permission}/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleServiceImpl.java (100%) rename kernel-s-system/{system-business-notice => system-business-portal}/README.md (100%) rename kernel-s-system/{system-business-theme => system-business-portal}/pom.xml (74%) rename kernel-s-system/{system-business-notice => system-business-portal}/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/controller/SysNoticeController.java (100%) rename kernel-s-system/{system-business-notice => system-business-portal}/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/entity/SysNotice.java (100%) rename kernel-s-system/{system-business-notice => system-business-portal}/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/mapper/SysNoticeMapper.java (100%) rename kernel-s-system/{system-business-notice => system-business-portal}/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/mapper/mapping/SysNoticeMapper.xml (100%) rename kernel-s-system/{system-business-notice => system-business-portal}/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/service/SysNoticeService.java (100%) rename kernel-s-system/{system-business-notice => system-business-portal}/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/service/impl/SysNoticeServiceImpl.java (100%) rename kernel-s-system/{system-business-theme => system-business-portal}/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/cache/ThemeMemoryCache.java (100%) rename kernel-s-system/{system-business-theme => system-business-portal}/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/cache/ThemeRedisCache.java (100%) rename kernel-s-system/{system-business-theme => system-business-portal}/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/clean/ThemeConfigRefresh.java (100%) rename kernel-s-system/{system-business-theme => system-business-portal}/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/controller/SysThemeApiController.java (100%) rename kernel-s-system/{system-business-theme => system-business-portal}/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/controller/SysThemeController.java (100%) rename kernel-s-system/{system-business-theme => system-business-portal}/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/controller/SysThemeTemplateController.java (100%) rename kernel-s-system/{system-business-theme => system-business-portal}/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/controller/SysThemeTemplateFieldController.java (100%) rename kernel-s-system/{system-business-theme => system-business-portal}/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/controller/SysThemeTemplateRelController.java (100%) rename kernel-s-system/{system-business-theme => system-business-portal}/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/entity/SysTheme.java (100%) rename kernel-s-system/{system-business-theme => system-business-portal}/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/entity/SysThemeTemplate.java (100%) rename kernel-s-system/{system-business-theme => system-business-portal}/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/entity/SysThemeTemplateField.java (100%) rename kernel-s-system/{system-business-theme => system-business-portal}/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/entity/SysThemeTemplateRel.java (100%) rename kernel-s-system/{system-business-theme => system-business-portal}/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/enums/ThemeFieldTypeEnum.java (100%) rename kernel-s-system/{system-business-theme => system-business-portal}/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/factory/DefaultThemeFactory.java (100%) rename kernel-s-system/{system-business-theme => system-business-portal}/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/mapper/SysThemeMapper.java (100%) rename kernel-s-system/{system-business-theme => system-business-portal}/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/mapper/SysThemeTemplateFieldMapper.java (100%) rename kernel-s-system/{system-business-theme => system-business-portal}/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/mapper/SysThemeTemplateMapper.java (100%) rename kernel-s-system/{system-business-theme => system-business-portal}/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/mapper/SysThemeTemplateRelMapper.java (100%) rename kernel-s-system/{system-business-theme => system-business-portal}/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/mapper/mapping/SysThemeMapper.xml (100%) rename kernel-s-system/{system-business-theme => system-business-portal}/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/mapper/mapping/SysThemeTemplateFieldMapper.xml (100%) rename kernel-s-system/{system-business-theme => system-business-portal}/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/mapper/mapping/SysThemeTemplateMapper.xml (100%) rename kernel-s-system/{system-business-theme => system-business-portal}/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/mapper/mapping/SysThemeTemplateRelMapper.xml (100%) rename kernel-s-system/{system-business-theme => system-business-portal}/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/pojo/DefaultTheme.java (100%) rename kernel-s-system/{system-business-theme => system-business-portal}/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/SysThemeService.java (100%) rename kernel-s-system/{system-business-theme => system-business-portal}/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/SysThemeTemplateFieldService.java (100%) rename kernel-s-system/{system-business-theme => system-business-portal}/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/SysThemeTemplateRelService.java (100%) rename kernel-s-system/{system-business-theme => system-business-portal}/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/SysThemeTemplateService.java (100%) rename kernel-s-system/{system-business-theme => system-business-portal}/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/impl/SysThemeServiceImpl.java (100%) rename kernel-s-system/{system-business-theme => system-business-portal}/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/impl/SysThemeTemplateFieldServiceImpl.java (100%) rename kernel-s-system/{system-business-theme => system-business-portal}/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/impl/SysThemeTemplateRelServiceImpl.java (100%) rename kernel-s-system/{system-business-theme => system-business-portal}/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/impl/SysThemeTemplateServiceImpl.java (100%) delete mode 100644 kernel-s-system/system-business-resource/README.md delete mode 100644 kernel-s-system/system-business-resource/pom.xml delete mode 100644 kernel-s-system/system-business-role/README.md delete mode 100644 kernel-s-system/system-business-role/pom.xml delete mode 100644 kernel-s-system/system-business-user/README.md delete mode 100644 kernel-s-system/system-integration-rest/README.md delete mode 100644 kernel-s-system/system-integration-rest/pom.xml delete mode 100644 kernel-s-system/system-integration-rest/src/main/resources/META-INF/spring.factories rename kernel-s-system/{system-integration-rest/src/main/java/cn/stylefeng/roses/kernel/system/integration => system-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/system/starter}/ErrorStaticJsonView.java (95%) rename kernel-s-system/{system-integration-rest/src/main/java/cn/stylefeng/roses/kernel/system/integration => system-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/system/starter}/config/RestErrorViewAutoConfiguration.java (86%) diff --git a/kernel-s-system/pom.xml b/kernel-s-system/pom.xml index 906b57d78..3b2a0d6a3 100644 --- a/kernel-s-system/pom.xml +++ b/kernel-s-system/pom.xml @@ -17,17 +17,10 @@ system-api - system-business-app - system-business-organization - system-business-resource - system-business-user - system-business-role - system-business-menu - system-business-notice - system-integration-rest + system-business-hr + system-business-permission + system-business-portal system-spring-boot-starter - system-business-theme - system-business-home diff --git a/kernel-s-system/system-business-app/README.md b/kernel-s-system/system-business-app/README.md deleted file mode 100644 index 59ef61362..000000000 --- a/kernel-s-system/system-business-app/README.md +++ /dev/null @@ -1 +0,0 @@ -应用管理相关业务 \ No newline at end of file diff --git a/kernel-s-system/system-business-app/pom.xml b/kernel-s-system/system-business-app/pom.xml deleted file mode 100644 index 8abbd492a..000000000 --- a/kernel-s-system/system-business-app/pom.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - 4.0.0 - - - cn.stylefeng.roses - kernel-s-system - 7.6.0 - ../pom.xml - - - system-business-app - - jar - - - - - - cn.stylefeng.roses - system-api - ${roses.version} - - - - - - cn.stylefeng.roses - scanner-api - ${roses.version} - - - - - - cn.stylefeng.roses - validator-api - ${roses.version} - - - - - - cn.stylefeng.roses - db-sdk-mp - ${roses.version} - - - - - org.springframework.boot - spring-boot-starter-web - - - - - diff --git a/kernel-s-system/system-business-hr/README.md b/kernel-s-system/system-business-hr/README.md new file mode 100644 index 000000000..2f0af40ca --- /dev/null +++ b/kernel-s-system/system-business-hr/README.md @@ -0,0 +1 @@ +# 人力资源管理，包含组织机构，职务，人员的数据 \ No newline at end of file diff --git a/kernel-s-system/system-business-user/pom.xml b/kernel-s-system/system-business-hr/pom.xml similarity index 92% rename from kernel-s-system/system-business-user/pom.xml rename to kernel-s-system/system-business-hr/pom.xml index 9824637b0..1b9cec5dc 100644 --- a/kernel-s-system/system-business-user/pom.xml +++ b/kernel-s-system/system-business-hr/pom.xml @@ -11,16 +11,17 @@ ../pom.xml - system-business-user + system-business-hr jar - + + cn.stylefeng.roses - demo-api + wrapper-api ${roses.version} @@ -31,28 +32,6 @@ ${roses.version} - - - cn.stylefeng.roses - config-api - ${roses.version} - - - - - cn.stylefeng.roses - office-api - ${roses.version} - - - - - - cn.stylefeng.roses - file-api - ${roses.version} - - @@ -69,19 +48,39 @@ ${roses.version} - - + + cn.stylefeng.roses - security-api + db-sdk-mp ${roses.version} - - + + + org.springframework.boot + spring-boot-starter-web + + + cn.stylefeng.roses - wrapper-api + demo-api + ${roses.version} + + + + + cn.stylefeng.roses + office-api + ${roses.version} + + + + + + cn.stylefeng.roses + file-api ${roses.version} diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrOrgApproverController.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrOrgApproverController.java similarity index 100% rename from kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrOrgApproverController.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrOrgApproverController.java diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrOrganizationController.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrOrganizationController.java similarity index 100% rename from kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrOrganizationController.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrOrganizationController.java diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrPositionController.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrPositionController.java similarity index 100% rename from kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrPositionController.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrPositionController.java diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrOrgApprover.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrOrgApprover.java similarity index 100% rename from kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrOrgApprover.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrOrgApprover.java diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrOrganization.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrOrganization.java similarity index 100% rename from kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrOrganization.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrOrganization.java diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrPosition.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrPosition.java similarity index 100% rename from kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrPosition.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/entity/HrPosition.java diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/enums/HrOrgApproverExceptionEnum.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/enums/HrOrgApproverExceptionEnum.java similarity index 100% rename from kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/enums/HrOrgApproverExceptionEnum.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/enums/HrOrgApproverExceptionEnum.java diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/factory/OrganizationFactory.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/factory/OrganizationFactory.java similarity index 100% rename from kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/factory/OrganizationFactory.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/factory/OrganizationFactory.java diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/mapper/HrOrgApproverMapper.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/mapper/HrOrgApproverMapper.java similarity index 100% rename from kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/mapper/HrOrgApproverMapper.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/mapper/HrOrgApproverMapper.java diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/mapper/HrOrganizationMapper.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/mapper/HrOrganizationMapper.java similarity index 100% rename from kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/mapper/HrOrganizationMapper.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/mapper/HrOrganizationMapper.java diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/mapper/HrPositionMapper.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/mapper/HrPositionMapper.java similarity index 100% rename from kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/mapper/HrPositionMapper.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/mapper/HrPositionMapper.java diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/mapper/mapping/HrOrgApproverMapper.xml b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/mapper/mapping/HrOrgApproverMapper.xml similarity index 100% rename from kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/mapper/mapping/HrOrgApproverMapper.xml rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/mapper/mapping/HrOrgApproverMapper.xml diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/mapper/mapping/HrOrganizationMapper.xml b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/mapper/mapping/HrOrganizationMapper.xml similarity index 100% rename from kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/mapper/mapping/HrOrganizationMapper.xml rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/mapper/mapping/HrOrganizationMapper.xml diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/mapper/mapping/HrPositionMapper.xml b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/mapper/mapping/HrPositionMapper.xml similarity index 100% rename from kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/mapper/mapping/HrPositionMapper.xml rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/mapper/mapping/HrPositionMapper.xml diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/pojo/request/HrOrgApproverRequest.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/pojo/request/HrOrgApproverRequest.java similarity index 100% rename from kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/pojo/request/HrOrgApproverRequest.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/pojo/request/HrOrgApproverRequest.java diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/DataScopeService.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/DataScopeService.java similarity index 100% rename from kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/DataScopeService.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/DataScopeService.java diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/HrOrgApproverService.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/HrOrgApproverService.java similarity index 100% rename from kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/HrOrgApproverService.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/HrOrgApproverService.java diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/HrOrganizationService.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/HrOrganizationService.java similarity index 100% rename from kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/HrOrganizationService.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/HrOrganizationService.java diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/HrPositionService.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/HrPositionService.java similarity index 100% rename from kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/HrPositionService.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/HrPositionService.java diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrgApproverServiceImpl.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrgApproverServiceImpl.java similarity index 100% rename from kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrgApproverServiceImpl.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrgApproverServiceImpl.java diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrganizationServiceImpl.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrganizationServiceImpl.java similarity index 100% rename from kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrganizationServiceImpl.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrganizationServiceImpl.java diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrPositionServiceImpl.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrPositionServiceImpl.java similarity index 100% rename from kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrPositionServiceImpl.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrPositionServiceImpl.java diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/wrapper/OrgExpandWrapper.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/wrapper/OrgExpandWrapper.java similarity index 99% rename from kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/wrapper/OrgExpandWrapper.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/wrapper/OrgExpandWrapper.java index 838e75102..89988d6eb 100644 --- a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/wrapper/OrgExpandWrapper.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/wrapper/OrgExpandWrapper.java @@ -29,7 +29,6 @@ import cn.stylefeng.roses.kernel.expand.modular.api.ExpandApi; import cn.stylefeng.roses.kernel.system.modular.organization.entity.HrOrganization; import cn.stylefeng.roses.kernel.wrapper.api.BaseWrapper; - import java.util.Map; /** diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/cache/SysUserMemoryCache.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/cache/SysUserMemoryCache.java similarity index 100% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/cache/SysUserMemoryCache.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/cache/SysUserMemoryCache.java diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/cache/SysUserRedisCache.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/cache/SysUserRedisCache.java similarity index 100% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/cache/SysUserRedisCache.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/cache/SysUserRedisCache.java diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/cache/UserOrgMemoryCache.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/cache/UserOrgMemoryCache.java similarity index 100% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/cache/UserOrgMemoryCache.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/cache/UserOrgMemoryCache.java diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/cache/UserOrgRedisCache.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/cache/UserOrgRedisCache.java similarity index 100% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/cache/UserOrgRedisCache.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/cache/UserOrgRedisCache.java diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/cache/UserRoleMemoryCache.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/cache/UserRoleMemoryCache.java similarity index 100% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/cache/UserRoleMemoryCache.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/cache/UserRoleMemoryCache.java diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/cache/UserRoleRedisCache.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/cache/UserRoleRedisCache.java similarity index 100% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/cache/UserRoleRedisCache.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/cache/UserRoleRedisCache.java diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/KaptchaController.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/KaptchaController.java similarity index 100% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/KaptchaController.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/KaptchaController.java diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/LoginController.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/LoginController.java similarity index 100% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/LoginController.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/LoginController.java diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/OnlineUserController.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/OnlineUserController.java similarity index 100% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/OnlineUserController.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/OnlineUserController.java diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/PersonalInfoController.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/PersonalInfoController.java similarity index 100% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/PersonalInfoController.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/PersonalInfoController.java diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/SysUserAdminController.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/SysUserAdminController.java similarity index 100% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/SysUserAdminController.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/SysUserAdminController.java diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/SysUserController.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/SysUserController.java similarity index 100% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/SysUserController.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/SysUserController.java diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/SysUserGroupController.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/SysUserGroupController.java similarity index 96% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/SysUserGroupController.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/SysUserGroupController.java index 432978e76..2a3a499c6 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/SysUserGroupController.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/SysUserGroupController.java @@ -8,7 +8,7 @@ import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource; import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource; import cn.stylefeng.roses.kernel.scanner.api.annotation.PostResource; import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUserGroup; -import cn.stylefeng.roses.kernel.system.modular.user.pojo.request.SysUserGroupRequest; +import cn.stylefeng.roses.kernel.system.modular.user.request.SysUserGroupRequest; import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserGroupService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestBody; diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/SysUserOrgController.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/SysUserOrgController.java similarity index 98% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/SysUserOrgController.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/SysUserOrgController.java index c6dc4b343..d7a45fe23 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/SysUserOrgController.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/SysUserOrgController.java @@ -37,7 +37,7 @@ import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource; import cn.stylefeng.roses.kernel.scanner.api.annotation.PostResource; import cn.stylefeng.roses.kernel.system.api.pojo.organization.HrOrganizationDTO; import cn.stylefeng.roses.kernel.system.modular.user.enums.SysUserOrgExceptionEnum; -import cn.stylefeng.roses.kernel.system.modular.user.pojo.request.SysUserOrgRequest; +import cn.stylefeng.roses.kernel.system.modular.user.request.SysUserOrgRequest; import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserOrgService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestBody; diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUser.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUser.java similarity index 100% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUser.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUser.java diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUserDataScope.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUserDataScope.java similarity index 100% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUserDataScope.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUserDataScope.java diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUserGroup.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUserGroup.java similarity index 100% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUserGroup.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUserGroup.java diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUserGroupDetail.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUserGroupDetail.java similarity index 100% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUserGroupDetail.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUserGroupDetail.java diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUserOrg.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUserOrg.java similarity index 100% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUserOrg.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUserOrg.java diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUserRole.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUserRole.java similarity index 100% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUserRole.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUserRole.java diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/enums/SysUserGroupDetailExceptionEnum.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/enums/SysUserGroupDetailExceptionEnum.java similarity index 100% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/enums/SysUserGroupDetailExceptionEnum.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/enums/SysUserGroupDetailExceptionEnum.java diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/enums/SysUserGroupExceptionEnum.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/enums/SysUserGroupExceptionEnum.java similarity index 100% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/enums/SysUserGroupExceptionEnum.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/enums/SysUserGroupExceptionEnum.java diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/enums/SysUserOrgExceptionEnum.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/enums/SysUserOrgExceptionEnum.java similarity index 100% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/enums/SysUserOrgExceptionEnum.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/enums/SysUserOrgExceptionEnum.java diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/factory/OnlineUserCreateFactory.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/factory/OnlineUserCreateFactory.java similarity index 100% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/factory/OnlineUserCreateFactory.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/factory/OnlineUserCreateFactory.java diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/factory/SysUserCreateFactory.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/factory/SysUserCreateFactory.java similarity index 100% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/factory/SysUserCreateFactory.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/factory/SysUserCreateFactory.java diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/factory/UserGroupFactory.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/factory/UserGroupFactory.java similarity index 98% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/factory/UserGroupFactory.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/factory/UserGroupFactory.java index 288745f2c..710190475 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/factory/UserGroupFactory.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/factory/UserGroupFactory.java @@ -5,7 +5,7 @@ import cn.stylefeng.roses.kernel.system.api.enums.UserGroupSelectTypeEnum; import cn.stylefeng.roses.kernel.system.api.pojo.usergroup.SelectItem; import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUserGroup; import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUserGroupDetail; -import cn.stylefeng.roses.kernel.system.modular.user.pojo.request.SysUserGroupRequest; +import cn.stylefeng.roses.kernel.system.modular.user.request.SysUserGroupRequest; import java.util.ArrayList; import java.util.List; diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/factory/UserLoginInfoFactory.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/factory/UserLoginInfoFactory.java similarity index 100% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/factory/UserLoginInfoFactory.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/factory/UserLoginInfoFactory.java diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserDataScopeMapper.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserDataScopeMapper.java similarity index 100% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserDataScopeMapper.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserDataScopeMapper.java index 3f6094072..c7febe0e9 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserDataScopeMapper.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserDataScopeMapper.java @@ -24,8 +24,8 @@ */ package cn.stylefeng.roses.kernel.system.modular.user.mapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUserDataScope; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * 系统用户数据范围mapper接口 diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserGroupDetailMapper.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserGroupDetailMapper.java similarity index 100% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserGroupDetailMapper.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserGroupDetailMapper.java diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserGroupMapper.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserGroupMapper.java similarity index 100% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserGroupMapper.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserGroupMapper.java diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserMapper.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserMapper.java similarity index 100% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserMapper.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserMapper.java index 07ccc60af..f7fbc5ebc 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserMapper.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserMapper.java @@ -24,9 +24,9 @@ */ package cn.stylefeng.roses.kernel.system.modular.user.mapper; -import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUser; import cn.stylefeng.roses.kernel.system.api.pojo.user.SysUserDTO; import cn.stylefeng.roses.kernel.system.api.pojo.user.request.SysUserRequest; +import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUser; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserOrgMapper.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserOrgMapper.java similarity index 100% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserOrgMapper.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserOrgMapper.java diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserRoleMapper.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserRoleMapper.java similarity index 100% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserRoleMapper.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserRoleMapper.java diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserDataScopeMapper.xml b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserDataScopeMapper.xml similarity index 100% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserDataScopeMapper.xml rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserDataScopeMapper.xml diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserGroupDetailMapper.xml b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserGroupDetailMapper.xml similarity index 100% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserGroupDetailMapper.xml rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserGroupDetailMapper.xml diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserGroupMapper.xml b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserGroupMapper.xml similarity index 100% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserGroupMapper.xml rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserGroupMapper.xml diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserMapper.xml b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserMapper.xml similarity index 100% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserMapper.xml rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserMapper.xml diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserOrgMapper.xml b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserOrgMapper.xml similarity index 100% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserOrgMapper.xml rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserOrgMapper.xml diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserRoleMapper.xml b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserRoleMapper.xml similarity index 100% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserRoleMapper.xml rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserRoleMapper.xml diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/provider/LoginUserProvider.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/provider/LoginUserProvider.java similarity index 100% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/provider/LoginUserProvider.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/provider/LoginUserProvider.java diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/pojo/request/SysUserGroupDetailRequest.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/request/SysUserGroupDetailRequest.java similarity index 96% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/pojo/request/SysUserGroupDetailRequest.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/request/SysUserGroupDetailRequest.java index 082252e43..7b376abc1 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/pojo/request/SysUserGroupDetailRequest.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/request/SysUserGroupDetailRequest.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.modular.user.pojo.request; +package cn.stylefeng.roses.kernel.system.modular.user.request; import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/pojo/request/SysUserGroupRequest.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/request/SysUserGroupRequest.java similarity index 96% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/pojo/request/SysUserGroupRequest.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/request/SysUserGroupRequest.java index d081044a2..f55e4fa00 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/pojo/request/SysUserGroupRequest.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/request/SysUserGroupRequest.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.modular.user.pojo.request; +package cn.stylefeng.roses.kernel.system.modular.user.request; import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/pojo/request/SysUserOrgRequest.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/request/SysUserOrgRequest.java similarity index 90% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/pojo/request/SysUserOrgRequest.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/request/SysUserOrgRequest.java index b61ff7e95..2eda49d8e 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/pojo/request/SysUserOrgRequest.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/request/SysUserOrgRequest.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.modular.user.pojo.request; +package cn.stylefeng.roses.kernel.system.modular.user.request; import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest; diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/IndexUserInfoService.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/IndexUserInfoService.java similarity index 100% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/IndexUserInfoService.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/IndexUserInfoService.java diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserAdminService.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserAdminService.java similarity index 100% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserAdminService.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserAdminService.java diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserDataScopeService.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserDataScopeService.java similarity index 100% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserDataScopeService.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserDataScopeService.java index 7d659f318..1ed6c206f 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserDataScopeService.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserDataScopeService.java @@ -24,9 +24,9 @@ */ package cn.stylefeng.roses.kernel.system.modular.user.service; -import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUserDataScope; import cn.stylefeng.roses.kernel.system.api.pojo.user.request.SysUserRequest; import cn.stylefeng.roses.kernel.system.api.pojo.user.request.UserDataScopeRequest; +import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUserDataScope; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserGroupDetailService.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserGroupDetailService.java similarity index 95% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserGroupDetailService.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserGroupDetailService.java index e77386ee6..fd2e50926 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserGroupDetailService.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserGroupDetailService.java @@ -2,7 +2,7 @@ package cn.stylefeng.roses.kernel.system.modular.user.service; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUserGroupDetail; -import cn.stylefeng.roses.kernel.system.modular.user.pojo.request.SysUserGroupDetailRequest; +import cn.stylefeng.roses.kernel.system.modular.user.request.SysUserGroupDetailRequest; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserGroupService.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserGroupService.java similarity index 95% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserGroupService.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserGroupService.java index df5788154..0808a574b 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserGroupService.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserGroupService.java @@ -3,7 +3,7 @@ package cn.stylefeng.roses.kernel.system.modular.user.service; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; import cn.stylefeng.roses.kernel.rule.pojo.dict.SimpleDict; import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUserGroup; -import cn.stylefeng.roses.kernel.system.modular.user.pojo.request.SysUserGroupRequest; +import cn.stylefeng.roses.kernel.system.modular.user.request.SysUserGroupRequest; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserOrgService.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserOrgService.java similarity index 100% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserOrgService.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserOrgService.java diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserRoleService.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserRoleService.java similarity index 100% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserRoleService.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserRoleService.java diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserService.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserService.java similarity index 100% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserService.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserService.java diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/TenantPrefixService.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/TenantPrefixService.java similarity index 100% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/TenantPrefixService.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/TenantPrefixService.java diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/IndexUserInfoServiceImpl.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/IndexUserInfoServiceImpl.java similarity index 100% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/IndexUserInfoServiceImpl.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/IndexUserInfoServiceImpl.java diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserAdminServiceImpl.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserAdminServiceImpl.java similarity index 100% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserAdminServiceImpl.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserAdminServiceImpl.java diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserDataScopeServiceImpl.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserDataScopeServiceImpl.java similarity index 97% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserDataScopeServiceImpl.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserDataScopeServiceImpl.java index b494eaf4f..fd47b27e8 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserDataScopeServiceImpl.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserDataScopeServiceImpl.java @@ -29,14 +29,12 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import cn.stylefeng.roses.kernel.system.api.exception.SystemModularException; import cn.stylefeng.roses.kernel.system.api.exception.enums.user.SysUserDataScopeExceptionEnum; -import cn.stylefeng.roses.kernel.system.api.exception.enums.user.SysUserOrgExceptionEnum; +import cn.stylefeng.roses.kernel.system.api.pojo.user.request.SysUserRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.user.request.UserDataScopeRequest; import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUserDataScope; import cn.stylefeng.roses.kernel.system.modular.user.mapper.SysUserDataScopeMapper; import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserDataScopeService; -import cn.stylefeng.roses.kernel.system.api.pojo.user.request.SysUserRequest; -import cn.stylefeng.roses.kernel.system.api.pojo.user.request.UserDataScopeRequest; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserGroupDetailServiceImpl.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserGroupDetailServiceImpl.java similarity index 98% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserGroupDetailServiceImpl.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserGroupDetailServiceImpl.java index 83cac77ba..bc36fdb71 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserGroupDetailServiceImpl.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserGroupDetailServiceImpl.java @@ -9,7 +9,7 @@ import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUserGroupDetail; import cn.stylefeng.roses.kernel.system.modular.user.enums.SysUserGroupDetailExceptionEnum; import cn.stylefeng.roses.kernel.system.modular.user.mapper.SysUserGroupDetailMapper; -import cn.stylefeng.roses.kernel.system.modular.user.pojo.request.SysUserGroupDetailRequest; +import cn.stylefeng.roses.kernel.system.modular.user.request.SysUserGroupDetailRequest; import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserGroupDetailService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserGroupServiceImpl.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserGroupServiceImpl.java similarity index 98% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserGroupServiceImpl.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserGroupServiceImpl.java index 083ab71ac..e480538da 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserGroupServiceImpl.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserGroupServiceImpl.java @@ -14,7 +14,7 @@ import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUserGroupDetail; import cn.stylefeng.roses.kernel.system.modular.user.enums.SysUserGroupExceptionEnum; import cn.stylefeng.roses.kernel.system.modular.user.factory.UserGroupFactory; import cn.stylefeng.roses.kernel.system.modular.user.mapper.SysUserGroupMapper; -import cn.stylefeng.roses.kernel.system.modular.user.pojo.request.SysUserGroupRequest; +import cn.stylefeng.roses.kernel.system.modular.user.request.SysUserGroupRequest; import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserGroupDetailService; import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserGroupService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserOrgServiceServiceImpl.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserOrgServiceServiceImpl.java similarity index 100% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserOrgServiceServiceImpl.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserOrgServiceServiceImpl.java diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserRoleServiceImpl.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserRoleServiceImpl.java similarity index 100% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserRoleServiceImpl.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserRoleServiceImpl.java diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java similarity index 100% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/wrapper/UserExpandWrapper.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/wrapper/UserExpandWrapper.java similarity index 100% rename from kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/wrapper/UserExpandWrapper.java rename to kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/wrapper/UserExpandWrapper.java diff --git a/kernel-s-system/system-business-menu/README.md b/kernel-s-system/system-business-menu/README.md deleted file mode 100644 index a1f0387f3..000000000 --- a/kernel-s-system/system-business-menu/README.md +++ /dev/null @@ -1 +0,0 @@ -菜单管理相关的业务 \ No newline at end of file diff --git a/kernel-s-system/system-business-menu/pom.xml b/kernel-s-system/system-business-menu/pom.xml deleted file mode 100644 index f7772aff6..000000000 --- a/kernel-s-system/system-business-menu/pom.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - 4.0.0 - - - cn.stylefeng.roses - kernel-s-system - 7.6.0 - ../pom.xml - - - system-business-menu - - jar - - - - - - cn.stylefeng.roses - system-api - ${roses.version} - - - - - - cn.stylefeng.roses - i18n-api - ${roses.version} - - - - - - cn.stylefeng.roses - scanner-api - ${roses.version} - - - - - - cn.stylefeng.roses - validator-api - ${roses.version} - - - - - - cn.stylefeng.roses - db-sdk-mp - ${roses.version} - - - - - cn.stylefeng.roses - system-business-resource - ${roses.version} - - - - - org.springframework.boot - spring-boot-starter-web - - - - - diff --git a/kernel-s-system/system-business-notice/pom.xml b/kernel-s-system/system-business-notice/pom.xml deleted file mode 100644 index 02d495a49..000000000 --- a/kernel-s-system/system-business-notice/pom.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - 4.0.0 - - - cn.stylefeng.roses - kernel-s-system - 7.6.0 - ../pom.xml - - - system-business-notice - - jar - - - - - - cn.stylefeng.roses - system-api - ${roses.version} - - - - - - cn.stylefeng.roses - scanner-api - ${roses.version} - - - - - - cn.stylefeng.roses - wrapper-api - ${roses.version} - - - - - - cn.stylefeng.roses - validator-api - ${roses.version} - - - - - - cn.stylefeng.roses - db-sdk-mp - ${roses.version} - - - - - org.springframework.boot - spring-boot-starter-web - - - - - cn.stylefeng.roses - message-spring-boot-starter - ${roses.version} - - - - - cn.stylefeng.roses - dict-api - ${roses.version} - - - - - diff --git a/kernel-s-system/system-business-organization/README.md b/kernel-s-system/system-business-organization/README.md deleted file mode 100644 index cf59f8940..000000000 --- a/kernel-s-system/system-business-organization/README.md +++ /dev/null @@ -1 +0,0 @@ -组织架构的维护 \ No newline at end of file diff --git a/kernel-s-system/system-business-organization/pom.xml b/kernel-s-system/system-business-organization/pom.xml deleted file mode 100644 index 72946bcc2..000000000 --- a/kernel-s-system/system-business-organization/pom.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - 4.0.0 - - - cn.stylefeng.roses - kernel-s-system - 7.6.0 - ../pom.xml - - - system-business-organization - - jar - - - - - - cn.stylefeng.roses - system-api - ${roses.version} - - - - - - cn.stylefeng.roses - scanner-api - ${roses.version} - - - - - - cn.stylefeng.roses - validator-api - ${roses.version} - - - - - - cn.stylefeng.roses - db-sdk-mp - ${roses.version} - - - - - org.springframework.boot - spring-boot-starter-web - - - - - - cn.stylefeng.roses - wrapper-api - ${roses.version} - - - - diff --git a/kernel-s-system/system-business-permission/README.md b/kernel-s-system/system-business-permission/README.md new file mode 100644 index 000000000..2f0af40ca --- /dev/null +++ b/kernel-s-system/system-business-permission/README.md @@ -0,0 +1 @@ +# 人力资源管理，包含组织机构，职务，人员的数据 \ No newline at end of file diff --git a/kernel-s-system/system-business-home/pom.xml b/kernel-s-system/system-business-permission/pom.xml similarity index 78% rename from kernel-s-system/system-business-home/pom.xml rename to kernel-s-system/system-business-permission/pom.xml index 6249891d2..f1f9cbd3f 100644 --- a/kernel-s-system/system-business-home/pom.xml +++ b/kernel-s-system/system-business-permission/pom.xml @@ -11,32 +11,27 @@ ../pom.xml - system-business-home + system-business-permission + + jar - + + cn.stylefeng.roses system-api ${roses.version} - - + + cn.stylefeng.roses scanner-api ${roses.version} - - - - cn.stylefeng.roses - wrapper-api - ${roses.version} - - @@ -45,6 +40,14 @@ ${roses.version} + + + + cn.stylefeng.roses + wrapper-api + ${roses.version} + + @@ -81,6 +84,11 @@ + + cn.stylefeng.roses + cache-api + ${roses.version} + cn.stylefeng.roses cache-sdk-memory @@ -121,6 +129,29 @@ spring-boot-starter-aop + + + + cn.stylefeng.roses + i18n-api + ${roses.version} + + + + + cn.stylefeng.roses + system-business-resource + ${roses.version} + + + + + cn.stylefeng.roses + jwt-sdk + ${roses.version} + + + diff --git a/kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/controller/SysAppController.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/controller/SysAppController.java similarity index 100% rename from kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/controller/SysAppController.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/controller/SysAppController.java diff --git a/kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/entity/SysApp.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/entity/SysApp.java similarity index 100% rename from kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/entity/SysApp.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/entity/SysApp.java diff --git a/kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/mapper/SysAppMapper.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/mapper/SysAppMapper.java similarity index 100% rename from kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/mapper/SysAppMapper.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/mapper/SysAppMapper.java diff --git a/kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/mapper/mapping/SysAppMapper.xml b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/mapper/mapping/SysAppMapper.xml similarity index 100% rename from kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/mapper/mapping/SysAppMapper.xml rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/mapper/mapping/SysAppMapper.xml diff --git a/kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/service/SysAppService.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/service/SysAppService.java similarity index 100% rename from kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/service/SysAppService.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/service/SysAppService.java diff --git a/kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/service/impl/SysAppServiceImpl.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/service/impl/SysAppServiceImpl.java similarity index 100% rename from kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/service/impl/SysAppServiceImpl.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/app/service/impl/SysAppServiceImpl.java diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/aop/InterfaceStatisticsAop.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/aop/InterfaceStatisticsAop.java similarity index 100% rename from kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/aop/InterfaceStatisticsAop.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/aop/InterfaceStatisticsAop.java diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/cache/InterfaceStatisticsMemoryCache.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/cache/InterfaceStatisticsMemoryCache.java similarity index 100% rename from kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/cache/InterfaceStatisticsMemoryCache.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/cache/InterfaceStatisticsMemoryCache.java diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/cache/InterfaceStatisticsRedisCache.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/cache/InterfaceStatisticsRedisCache.java similarity index 100% rename from kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/cache/InterfaceStatisticsRedisCache.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/cache/InterfaceStatisticsRedisCache.java diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/context/StatisticsUrlContext.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/context/StatisticsUrlContext.java similarity index 100% rename from kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/context/StatisticsUrlContext.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/context/StatisticsUrlContext.java diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/controller/HomePageController.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/controller/HomePageController.java similarity index 100% rename from kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/controller/HomePageController.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/controller/HomePageController.java diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/controller/SysStatisticsController.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/controller/SysStatisticsController.java similarity index 100% rename from kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/controller/SysStatisticsController.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/controller/SysStatisticsController.java diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/entity/SysStatisticsCount.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/entity/SysStatisticsCount.java similarity index 100% rename from kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/entity/SysStatisticsCount.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/entity/SysStatisticsCount.java diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/entity/SysStatisticsUrl.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/entity/SysStatisticsUrl.java similarity index 100% rename from kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/entity/SysStatisticsUrl.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/entity/SysStatisticsUrl.java diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/enums/SysStatisticsCountExceptionEnum.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/enums/SysStatisticsCountExceptionEnum.java similarity index 100% rename from kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/enums/SysStatisticsCountExceptionEnum.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/enums/SysStatisticsCountExceptionEnum.java diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/enums/SysStatisticsUrlExceptionEnum.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/enums/SysStatisticsUrlExceptionEnum.java similarity index 100% rename from kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/enums/SysStatisticsUrlExceptionEnum.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/enums/SysStatisticsUrlExceptionEnum.java diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/mapper/SysStatisticsCountMapper.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/mapper/SysStatisticsCountMapper.java similarity index 100% rename from kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/mapper/SysStatisticsCountMapper.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/mapper/SysStatisticsCountMapper.java diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/mapper/SysStatisticsUrlMapper.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/mapper/SysStatisticsUrlMapper.java similarity index 100% rename from kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/mapper/SysStatisticsUrlMapper.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/mapper/SysStatisticsUrlMapper.java diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/mapper/mapping/SysStatisticsCountMapper.xml b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/mapper/mapping/SysStatisticsCountMapper.xml similarity index 100% rename from kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/mapper/mapping/SysStatisticsCountMapper.xml rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/mapper/mapping/SysStatisticsCountMapper.xml diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/mapper/mapping/SysStatisticsUrlMapper.xml b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/mapper/mapping/SysStatisticsUrlMapper.xml similarity index 100% rename from kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/mapper/mapping/SysStatisticsUrlMapper.xml rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/mapper/mapping/SysStatisticsUrlMapper.xml diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/pojo/OnlineUserStat.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/pojo/OnlineUserStat.java similarity index 100% rename from kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/pojo/OnlineUserStat.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/pojo/OnlineUserStat.java diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/pojo/request/SysStatisticsCountRequest.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/pojo/request/SysStatisticsCountRequest.java similarity index 100% rename from kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/pojo/request/SysStatisticsCountRequest.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/pojo/request/SysStatisticsCountRequest.java diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/pojo/request/SysStatisticsUrlRequest.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/pojo/request/SysStatisticsUrlRequest.java similarity index 100% rename from kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/pojo/request/SysStatisticsUrlRequest.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/pojo/request/SysStatisticsUrlRequest.java diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/HomePageService.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/HomePageService.java similarity index 100% rename from kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/HomePageService.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/HomePageService.java diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/SysStatisticsCountService.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/SysStatisticsCountService.java similarity index 100% rename from kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/SysStatisticsCountService.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/SysStatisticsCountService.java diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/SysStatisticsUrlService.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/SysStatisticsUrlService.java similarity index 100% rename from kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/SysStatisticsUrlService.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/SysStatisticsUrlService.java diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/impl/HomePageServiceImpl.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/impl/HomePageServiceImpl.java similarity index 100% rename from kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/impl/HomePageServiceImpl.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/impl/HomePageServiceImpl.java diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/impl/SysStatisticsCountServiceImpl.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/impl/SysStatisticsCountServiceImpl.java similarity index 100% rename from kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/impl/SysStatisticsCountServiceImpl.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/impl/SysStatisticsCountServiceImpl.java diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/impl/SysStatisticsUrlServiceImpl.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/impl/SysStatisticsUrlServiceImpl.java similarity index 100% rename from kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/impl/SysStatisticsUrlServiceImpl.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/service/impl/SysStatisticsUrlServiceImpl.java diff --git a/kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/timer/InterfaceStatisticsTimer.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/timer/InterfaceStatisticsTimer.java similarity index 100% rename from kernel-s-system/system-business-home/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/timer/InterfaceStatisticsTimer.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/home/timer/InterfaceStatisticsTimer.java diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/constants/MenuButtonConstant.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/constants/MenuButtonConstant.java similarity index 100% rename from kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/constants/MenuButtonConstant.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/constants/MenuButtonConstant.java diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/controller/SysMenuButtonController.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/controller/SysMenuButtonController.java similarity index 100% rename from kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/controller/SysMenuButtonController.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/controller/SysMenuButtonController.java diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/controller/SysMenuController.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/controller/SysMenuController.java similarity index 100% rename from kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/controller/SysMenuController.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/controller/SysMenuController.java diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/controller/SysMenuResourceController.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/controller/SysMenuResourceController.java similarity index 100% rename from kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/controller/SysMenuResourceController.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/controller/SysMenuResourceController.java diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/entity/SysMenu.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/entity/SysMenu.java similarity index 100% rename from kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/entity/SysMenu.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/entity/SysMenu.java diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/entity/SysMenuButton.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/entity/SysMenuButton.java similarity index 100% rename from kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/entity/SysMenuButton.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/entity/SysMenuButton.java diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/entity/SysMenuResource.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/entity/SysMenuResource.java similarity index 100% rename from kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/entity/SysMenuResource.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/entity/SysMenuResource.java diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/AntdMenusFactory.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/AntdMenusFactory.java similarity index 100% rename from kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/AntdMenusFactory.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/AntdMenusFactory.java diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/Antdv3MenusFactory.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/Antdv3MenusFactory.java similarity index 100% rename from kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/Antdv3MenusFactory.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/Antdv3MenusFactory.java diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/LayuiMenusFactory.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/LayuiMenusFactory.java similarity index 100% rename from kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/LayuiMenusFactory.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/LayuiMenusFactory.java diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/MenuButtonFactory.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/MenuButtonFactory.java similarity index 100% rename from kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/MenuButtonFactory.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/MenuButtonFactory.java diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/MenuTypeFactory.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/MenuTypeFactory.java similarity index 100% rename from kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/MenuTypeFactory.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/factory/MenuTypeFactory.java diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/listener/MenuResourceUpdateListener.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/listener/MenuResourceUpdateListener.java similarity index 100% rename from kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/listener/MenuResourceUpdateListener.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/listener/MenuResourceUpdateListener.java diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/SysMenuButtonMapper.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/SysMenuButtonMapper.java similarity index 100% rename from kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/SysMenuButtonMapper.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/SysMenuButtonMapper.java diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/SysMenuMapper.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/SysMenuMapper.java similarity index 100% rename from kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/SysMenuMapper.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/SysMenuMapper.java diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/SysMenuResourceMapper.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/SysMenuResourceMapper.java similarity index 100% rename from kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/SysMenuResourceMapper.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/SysMenuResourceMapper.java diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/mapping/SysMenuButtonMapper.xml b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/mapping/SysMenuButtonMapper.xml similarity index 100% rename from kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/mapping/SysMenuButtonMapper.xml rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/mapping/SysMenuButtonMapper.xml diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/mapping/SysMenuMapper.xml b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/mapping/SysMenuMapper.xml similarity index 100% rename from kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/mapping/SysMenuMapper.xml rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/mapping/SysMenuMapper.xml diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/mapping/SysMenuResourceMapper.xml b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/mapping/SysMenuResourceMapper.xml similarity index 100% rename from kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/mapping/SysMenuResourceMapper.xml rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/mapper/mapping/SysMenuResourceMapper.xml diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/SysMenuButtonService.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/SysMenuButtonService.java similarity index 100% rename from kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/SysMenuButtonService.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/SysMenuButtonService.java index ab28f4792..e344d5745 100644 --- a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/SysMenuButtonService.java +++ b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/SysMenuButtonService.java @@ -25,8 +25,8 @@ package cn.stylefeng.roses.kernel.system.modular.menu.service; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; -import cn.stylefeng.roses.kernel.system.modular.menu.entity.SysMenuButton; import cn.stylefeng.roses.kernel.system.api.pojo.menu.SysMenuButtonRequest; +import cn.stylefeng.roses.kernel.system.modular.menu.entity.SysMenuButton; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/SysMenuResourceService.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/SysMenuResourceService.java similarity index 100% rename from kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/SysMenuResourceService.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/SysMenuResourceService.java diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/SysMenuService.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/SysMenuService.java similarity index 100% rename from kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/SysMenuService.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/SysMenuService.java diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/impl/SysMenuButtonServiceImpl.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/impl/SysMenuButtonServiceImpl.java similarity index 100% rename from kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/impl/SysMenuButtonServiceImpl.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/impl/SysMenuButtonServiceImpl.java diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/impl/SysMenuResourceServiceImpl.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/impl/SysMenuResourceServiceImpl.java similarity index 100% rename from kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/impl/SysMenuResourceServiceImpl.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/impl/SysMenuResourceServiceImpl.java diff --git a/kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/impl/SysMenuServiceImpl.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/impl/SysMenuServiceImpl.java similarity index 100% rename from kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/impl/SysMenuServiceImpl.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/menu/service/impl/SysMenuServiceImpl.java diff --git a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/cache/MemoryResourceCache.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/cache/MemoryResourceCache.java similarity index 100% rename from kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/cache/MemoryResourceCache.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/cache/MemoryResourceCache.java diff --git a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/cache/RedisResourceCache.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/cache/RedisResourceCache.java similarity index 100% rename from kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/cache/RedisResourceCache.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/cache/RedisResourceCache.java diff --git a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/controller/ResourceController.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/controller/ResourceController.java similarity index 100% rename from kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/controller/ResourceController.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/controller/ResourceController.java diff --git a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/controller/ResourceReportController.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/controller/ResourceReportController.java similarity index 100% rename from kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/controller/ResourceReportController.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/controller/ResourceReportController.java diff --git a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/entity/SysResource.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/entity/SysResource.java similarity index 100% rename from kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/entity/SysResource.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/entity/SysResource.java diff --git a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/factory/ResourceFactory.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/factory/ResourceFactory.java similarity index 100% rename from kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/factory/ResourceFactory.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/factory/ResourceFactory.java diff --git a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/mapper/SysResourceMapper.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/mapper/SysResourceMapper.java similarity index 100% rename from kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/mapper/SysResourceMapper.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/mapper/SysResourceMapper.java diff --git a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/mapper/mapping/SysResourceMapper.xml b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/mapper/mapping/SysResourceMapper.xml similarity index 100% rename from kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/mapper/mapping/SysResourceMapper.xml rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/mapper/mapping/SysResourceMapper.xml diff --git a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/pojo/ResourceTreeNode.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/pojo/ResourceTreeNode.java similarity index 100% rename from kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/pojo/ResourceTreeNode.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/pojo/ResourceTreeNode.java diff --git a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/SysResourceService.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/SysResourceService.java similarity index 100% rename from kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/SysResourceService.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/SysResourceService.java diff --git a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/impl/SysResourceServiceImpl.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/impl/SysResourceServiceImpl.java similarity index 100% rename from kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/impl/SysResourceServiceImpl.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/resource/service/impl/SysResourceServiceImpl.java diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/cache/RoleDataScopeMemoryCache.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/cache/RoleDataScopeMemoryCache.java similarity index 100% rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/cache/RoleDataScopeMemoryCache.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/cache/RoleDataScopeMemoryCache.java diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/cache/RoleDataScopeRedisCache.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/cache/RoleDataScopeRedisCache.java similarity index 100% rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/cache/RoleDataScopeRedisCache.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/cache/RoleDataScopeRedisCache.java diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/cache/RoleMemoryCache.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/cache/RoleMemoryCache.java similarity index 100% rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/cache/RoleMemoryCache.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/cache/RoleMemoryCache.java diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/cache/RoleRedisCache.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/cache/RoleRedisCache.java similarity index 100% rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/cache/RoleRedisCache.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/cache/RoleRedisCache.java diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/cache/RoleResourceMemoryCache.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/cache/RoleResourceMemoryCache.java similarity index 100% rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/cache/RoleResourceMemoryCache.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/cache/RoleResourceMemoryCache.java diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/cache/RoleResourceRedisCache.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/cache/RoleResourceRedisCache.java similarity index 100% rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/cache/RoleResourceRedisCache.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/cache/RoleResourceRedisCache.java diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/controller/SysRoleAuthController.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/controller/SysRoleAuthController.java similarity index 100% rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/controller/SysRoleAuthController.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/controller/SysRoleAuthController.java diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/controller/SysRoleController.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/controller/SysRoleController.java similarity index 100% rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/controller/SysRoleController.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/controller/SysRoleController.java diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/entity/SysRole.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/entity/SysRole.java similarity index 100% rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/entity/SysRole.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/entity/SysRole.java diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/entity/SysRoleDataScope.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/entity/SysRoleDataScope.java similarity index 100% rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/entity/SysRoleDataScope.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/entity/SysRoleDataScope.java diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/entity/SysRoleMenu.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/entity/SysRoleMenu.java similarity index 100% rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/entity/SysRoleMenu.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/entity/SysRoleMenu.java diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/entity/SysRoleMenuButton.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/entity/SysRoleMenuButton.java similarity index 100% rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/entity/SysRoleMenuButton.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/entity/SysRoleMenuButton.java diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/entity/SysRoleResource.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/entity/SysRoleResource.java similarity index 100% rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/entity/SysRoleResource.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/entity/SysRoleResource.java diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/listener/RoleResourceUpdateListener.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/listener/RoleResourceUpdateListener.java similarity index 100% rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/listener/RoleResourceUpdateListener.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/listener/RoleResourceUpdateListener.java diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/SysRoleDataScopeMapper.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/SysRoleDataScopeMapper.java similarity index 100% rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/SysRoleDataScopeMapper.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/SysRoleDataScopeMapper.java diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/SysRoleMapper.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/SysRoleMapper.java similarity index 100% rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/SysRoleMapper.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/SysRoleMapper.java diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/SysRoleMenuButtonMapper.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/SysRoleMenuButtonMapper.java similarity index 100% rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/SysRoleMenuButtonMapper.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/SysRoleMenuButtonMapper.java diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/SysRoleMenuMapper.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/SysRoleMenuMapper.java similarity index 100% rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/SysRoleMenuMapper.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/SysRoleMenuMapper.java diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/SysRoleResourceMapper.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/SysRoleResourceMapper.java similarity index 100% rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/SysRoleResourceMapper.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/SysRoleResourceMapper.java diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/mapping/SysRoleDataScopeMapper.xml b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/mapping/SysRoleDataScopeMapper.xml similarity index 100% rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/mapping/SysRoleDataScopeMapper.xml rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/mapping/SysRoleDataScopeMapper.xml diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/mapping/SysRoleMapper.xml b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/mapping/SysRoleMapper.xml similarity index 100% rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/mapping/SysRoleMapper.xml rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/mapping/SysRoleMapper.xml diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/mapping/SysRoleMenuButtonMapper.xml b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/mapping/SysRoleMenuButtonMapper.xml similarity index 100% rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/mapping/SysRoleMenuButtonMapper.xml rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/mapping/SysRoleMenuButtonMapper.xml diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/mapping/SysRoleMenuMapper.xml b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/mapping/SysRoleMenuMapper.xml similarity index 100% rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/mapping/SysRoleMenuMapper.xml rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/mapping/SysRoleMenuMapper.xml diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/mapping/SysRoleResourceMapper.xml b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/mapping/SysRoleResourceMapper.xml similarity index 100% rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/mapping/SysRoleResourceMapper.xml rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/mapper/mapping/SysRoleResourceMapper.xml diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/SysRoleDataScopeService.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/SysRoleDataScopeService.java similarity index 100% rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/SysRoleDataScopeService.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/SysRoleDataScopeService.java diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/SysRoleMenuButtonService.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/SysRoleMenuButtonService.java similarity index 100% rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/SysRoleMenuButtonService.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/SysRoleMenuButtonService.java diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/SysRoleMenuService.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/SysRoleMenuService.java similarity index 100% rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/SysRoleMenuService.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/SysRoleMenuService.java diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/SysRoleResourceService.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/SysRoleResourceService.java similarity index 100% rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/SysRoleResourceService.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/SysRoleResourceService.java diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/SysRoleService.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/SysRoleService.java similarity index 100% rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/SysRoleService.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/SysRoleService.java diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleDataScopeServiceImpl.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleDataScopeServiceImpl.java similarity index 100% rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleDataScopeServiceImpl.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleDataScopeServiceImpl.java index 1a7921619..93c5a8b2e 100644 --- a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleDataScopeServiceImpl.java +++ b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleDataScopeServiceImpl.java @@ -28,11 +28,11 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import cn.stylefeng.roses.kernel.system.api.RoleDataScopeServiceApi; +import cn.stylefeng.roses.kernel.system.api.pojo.role.request.SysRoleDataScopeRequest; +import cn.stylefeng.roses.kernel.system.api.pojo.role.request.SysRoleRequest; import cn.stylefeng.roses.kernel.system.modular.role.entity.SysRoleDataScope; import cn.stylefeng.roses.kernel.system.modular.role.mapper.SysRoleDataScopeMapper; import cn.stylefeng.roses.kernel.system.modular.role.service.SysRoleDataScopeService; -import cn.stylefeng.roses.kernel.system.api.pojo.role.request.SysRoleDataScopeRequest; -import cn.stylefeng.roses.kernel.system.api.pojo.role.request.SysRoleRequest; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleMenuButtonServiceImpl.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleMenuButtonServiceImpl.java similarity index 100% rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleMenuButtonServiceImpl.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleMenuButtonServiceImpl.java diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleMenuServiceImpl.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleMenuServiceImpl.java similarity index 100% rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleMenuServiceImpl.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleMenuServiceImpl.java diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleResourceServiceImpl.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleResourceServiceImpl.java similarity index 100% rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleResourceServiceImpl.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleResourceServiceImpl.java diff --git a/kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleServiceImpl.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleServiceImpl.java similarity index 100% rename from kernel-s-system/system-business-role/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleServiceImpl.java rename to kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/system/modular/role/service/impl/SysRoleServiceImpl.java diff --git a/kernel-s-system/system-business-notice/README.md b/kernel-s-system/system-business-portal/README.md similarity index 100% rename from kernel-s-system/system-business-notice/README.md rename to kernel-s-system/system-business-portal/README.md diff --git a/kernel-s-system/system-business-theme/pom.xml b/kernel-s-system/system-business-portal/pom.xml similarity index 74% rename from kernel-s-system/system-business-theme/pom.xml rename to kernel-s-system/system-business-portal/pom.xml index 3d398305a..c6e1d7331 100644 --- a/kernel-s-system/system-business-theme/pom.xml +++ b/kernel-s-system/system-business-portal/pom.xml @@ -11,27 +11,35 @@ ../pom.xml - system-business-theme + system-business-portal jar - + cn.stylefeng.roses system-api ${roses.version} - - + + cn.stylefeng.roses scanner-api ${roses.version} + + + + cn.stylefeng.roses + wrapper-api + ${roses.version} + + @@ -54,6 +62,20 @@ spring-boot-starter-web + + + cn.stylefeng.roses + message-spring-boot-starter + ${roses.version} + + + + + cn.stylefeng.roses + dict-api + ${roses.version} + + cn.stylefeng.roses @@ -82,4 +104,5 @@ + diff --git a/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/controller/SysNoticeController.java b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/controller/SysNoticeController.java similarity index 100% rename from kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/controller/SysNoticeController.java rename to kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/controller/SysNoticeController.java diff --git a/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/entity/SysNotice.java b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/entity/SysNotice.java similarity index 100% rename from kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/entity/SysNotice.java rename to kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/entity/SysNotice.java diff --git a/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/mapper/SysNoticeMapper.java b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/mapper/SysNoticeMapper.java similarity index 100% rename from kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/mapper/SysNoticeMapper.java rename to kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/mapper/SysNoticeMapper.java diff --git a/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/mapper/mapping/SysNoticeMapper.xml b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/mapper/mapping/SysNoticeMapper.xml similarity index 100% rename from kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/mapper/mapping/SysNoticeMapper.xml rename to kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/mapper/mapping/SysNoticeMapper.xml diff --git a/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/service/SysNoticeService.java b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/service/SysNoticeService.java similarity index 100% rename from kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/service/SysNoticeService.java rename to kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/service/SysNoticeService.java index e101ee15d..2d292a611 100644 --- a/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/service/SysNoticeService.java +++ b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/service/SysNoticeService.java @@ -26,8 +26,8 @@ package cn.stylefeng.roses.kernel.system.modular.notice.service; import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult; import cn.stylefeng.roses.kernel.system.api.NoticeServiceApi; -import cn.stylefeng.roses.kernel.system.modular.notice.entity.SysNotice; import cn.stylefeng.roses.kernel.system.api.pojo.notice.SysNoticeRequest; +import cn.stylefeng.roses.kernel.system.modular.notice.entity.SysNotice; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/service/impl/SysNoticeServiceImpl.java b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/service/impl/SysNoticeServiceImpl.java similarity index 100% rename from kernel-s-system/system-business-notice/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/service/impl/SysNoticeServiceImpl.java rename to kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/notice/service/impl/SysNoticeServiceImpl.java diff --git a/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/cache/ThemeMemoryCache.java b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/cache/ThemeMemoryCache.java similarity index 100% rename from kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/cache/ThemeMemoryCache.java rename to kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/cache/ThemeMemoryCache.java diff --git a/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/cache/ThemeRedisCache.java b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/cache/ThemeRedisCache.java similarity index 100% rename from kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/cache/ThemeRedisCache.java rename to kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/cache/ThemeRedisCache.java diff --git a/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/clean/ThemeConfigRefresh.java b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/clean/ThemeConfigRefresh.java similarity index 100% rename from kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/clean/ThemeConfigRefresh.java rename to kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/clean/ThemeConfigRefresh.java diff --git a/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/controller/SysThemeApiController.java b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/controller/SysThemeApiController.java similarity index 100% rename from kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/controller/SysThemeApiController.java rename to kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/controller/SysThemeApiController.java diff --git a/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/controller/SysThemeController.java b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/controller/SysThemeController.java similarity index 100% rename from kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/controller/SysThemeController.java rename to kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/controller/SysThemeController.java diff --git a/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/controller/SysThemeTemplateController.java b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/controller/SysThemeTemplateController.java similarity index 100% rename from kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/controller/SysThemeTemplateController.java rename to kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/controller/SysThemeTemplateController.java diff --git a/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/controller/SysThemeTemplateFieldController.java b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/controller/SysThemeTemplateFieldController.java similarity index 100% rename from kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/controller/SysThemeTemplateFieldController.java rename to kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/controller/SysThemeTemplateFieldController.java diff --git a/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/controller/SysThemeTemplateRelController.java b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/controller/SysThemeTemplateRelController.java similarity index 100% rename from kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/controller/SysThemeTemplateRelController.java rename to kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/controller/SysThemeTemplateRelController.java diff --git a/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/entity/SysTheme.java b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/entity/SysTheme.java similarity index 100% rename from kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/entity/SysTheme.java rename to kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/entity/SysTheme.java diff --git a/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/entity/SysThemeTemplate.java b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/entity/SysThemeTemplate.java similarity index 100% rename from kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/entity/SysThemeTemplate.java rename to kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/entity/SysThemeTemplate.java diff --git a/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/entity/SysThemeTemplateField.java b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/entity/SysThemeTemplateField.java similarity index 100% rename from kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/entity/SysThemeTemplateField.java rename to kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/entity/SysThemeTemplateField.java diff --git a/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/entity/SysThemeTemplateRel.java b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/entity/SysThemeTemplateRel.java similarity index 100% rename from kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/entity/SysThemeTemplateRel.java rename to kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/entity/SysThemeTemplateRel.java diff --git a/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/enums/ThemeFieldTypeEnum.java b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/enums/ThemeFieldTypeEnum.java similarity index 100% rename from kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/enums/ThemeFieldTypeEnum.java rename to kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/enums/ThemeFieldTypeEnum.java diff --git a/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/factory/DefaultThemeFactory.java b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/factory/DefaultThemeFactory.java similarity index 100% rename from kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/factory/DefaultThemeFactory.java rename to kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/factory/DefaultThemeFactory.java diff --git a/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/mapper/SysThemeMapper.java b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/mapper/SysThemeMapper.java similarity index 100% rename from kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/mapper/SysThemeMapper.java rename to kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/mapper/SysThemeMapper.java diff --git a/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/mapper/SysThemeTemplateFieldMapper.java b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/mapper/SysThemeTemplateFieldMapper.java similarity index 100% rename from kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/mapper/SysThemeTemplateFieldMapper.java rename to kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/mapper/SysThemeTemplateFieldMapper.java diff --git a/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/mapper/SysThemeTemplateMapper.java b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/mapper/SysThemeTemplateMapper.java similarity index 100% rename from kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/mapper/SysThemeTemplateMapper.java rename to kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/mapper/SysThemeTemplateMapper.java diff --git a/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/mapper/SysThemeTemplateRelMapper.java b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/mapper/SysThemeTemplateRelMapper.java similarity index 100% rename from kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/mapper/SysThemeTemplateRelMapper.java rename to kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/mapper/SysThemeTemplateRelMapper.java diff --git a/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/mapper/mapping/SysThemeMapper.xml b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/mapper/mapping/SysThemeMapper.xml similarity index 100% rename from kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/mapper/mapping/SysThemeMapper.xml rename to kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/mapper/mapping/SysThemeMapper.xml diff --git a/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/mapper/mapping/SysThemeTemplateFieldMapper.xml b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/mapper/mapping/SysThemeTemplateFieldMapper.xml similarity index 100% rename from kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/mapper/mapping/SysThemeTemplateFieldMapper.xml rename to kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/mapper/mapping/SysThemeTemplateFieldMapper.xml diff --git a/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/mapper/mapping/SysThemeTemplateMapper.xml b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/mapper/mapping/SysThemeTemplateMapper.xml similarity index 100% rename from kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/mapper/mapping/SysThemeTemplateMapper.xml rename to kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/mapper/mapping/SysThemeTemplateMapper.xml diff --git a/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/mapper/mapping/SysThemeTemplateRelMapper.xml b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/mapper/mapping/SysThemeTemplateRelMapper.xml similarity index 100% rename from kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/mapper/mapping/SysThemeTemplateRelMapper.xml rename to kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/mapper/mapping/SysThemeTemplateRelMapper.xml diff --git a/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/pojo/DefaultTheme.java b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/pojo/DefaultTheme.java similarity index 100% rename from kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/pojo/DefaultTheme.java rename to kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/pojo/DefaultTheme.java diff --git a/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/SysThemeService.java b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/SysThemeService.java similarity index 100% rename from kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/SysThemeService.java rename to kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/SysThemeService.java diff --git a/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/SysThemeTemplateFieldService.java b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/SysThemeTemplateFieldService.java similarity index 100% rename from kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/SysThemeTemplateFieldService.java rename to kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/SysThemeTemplateFieldService.java diff --git a/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/SysThemeTemplateRelService.java b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/SysThemeTemplateRelService.java similarity index 100% rename from kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/SysThemeTemplateRelService.java rename to kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/SysThemeTemplateRelService.java diff --git a/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/SysThemeTemplateService.java b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/SysThemeTemplateService.java similarity index 100% rename from kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/SysThemeTemplateService.java rename to kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/SysThemeTemplateService.java diff --git a/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/impl/SysThemeServiceImpl.java b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/impl/SysThemeServiceImpl.java similarity index 100% rename from kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/impl/SysThemeServiceImpl.java rename to kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/impl/SysThemeServiceImpl.java diff --git a/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/impl/SysThemeTemplateFieldServiceImpl.java b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/impl/SysThemeTemplateFieldServiceImpl.java similarity index 100% rename from kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/impl/SysThemeTemplateFieldServiceImpl.java rename to kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/impl/SysThemeTemplateFieldServiceImpl.java diff --git a/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/impl/SysThemeTemplateRelServiceImpl.java b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/impl/SysThemeTemplateRelServiceImpl.java similarity index 100% rename from kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/impl/SysThemeTemplateRelServiceImpl.java rename to kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/impl/SysThemeTemplateRelServiceImpl.java diff --git a/kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/impl/SysThemeTemplateServiceImpl.java b/kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/impl/SysThemeTemplateServiceImpl.java similarity index 100% rename from kernel-s-system/system-business-theme/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/impl/SysThemeTemplateServiceImpl.java rename to kernel-s-system/system-business-portal/src/main/java/cn/stylefeng/roses/kernel/system/modular/theme/service/impl/SysThemeTemplateServiceImpl.java diff --git a/kernel-s-system/system-business-resource/README.md b/kernel-s-system/system-business-resource/README.md deleted file mode 100644 index df9b8ae27..000000000 --- a/kernel-s-system/system-business-resource/README.md +++ /dev/null @@ -1 +0,0 @@ -资源模块的业务模块，提供对资源的在线管理，搜集，持久化等操作 \ No newline at end of file diff --git a/kernel-s-system/system-business-resource/pom.xml b/kernel-s-system/system-business-resource/pom.xml deleted file mode 100644 index 736409f28..000000000 --- a/kernel-s-system/system-business-resource/pom.xml +++ /dev/null @@ -1,89 +0,0 @@ - - - 4.0.0 - - - cn.stylefeng.roses - kernel-s-system - 7.6.0 - ../pom.xml - - - system-business-resource - - jar - - - - - - cn.stylefeng.roses - jwt-sdk - ${roses.version} - - - - - cn.stylefeng.roses - system-api - ${roses.version} - - - - - - cn.stylefeng.roses - scanner-api - ${roses.version} - - - - - - cn.stylefeng.roses - cache-sdk-memory - ${roses.version} - true - - - cn.stylefeng.roses - cache-sdk-redis - ${roses.version} - true - - - - - - cn.stylefeng.roses - validator-api - ${roses.version} - - - - - - cn.stylefeng.roses - db-sdk-mp - ${roses.version} - - - - - - cn.stylefeng.roses - cache-api - ${roses.version} - - - - - org.springframework.boot - spring-boot-starter-web - - - - - diff --git a/kernel-s-system/system-business-role/README.md b/kernel-s-system/system-business-role/README.md deleted file mode 100644 index 8155b7427..000000000 --- a/kernel-s-system/system-business-role/README.md +++ /dev/null @@ -1,3 +0,0 @@ -包含角色管理业务 - -角色可以关联资源和资源组 \ No newline at end of file diff --git a/kernel-s-system/system-business-role/pom.xml b/kernel-s-system/system-business-role/pom.xml deleted file mode 100644 index 5ccd993da..000000000 --- a/kernel-s-system/system-business-role/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - 4.0.0 - - - cn.stylefeng.roses - kernel-s-system - 7.6.0 - ../pom.xml - - - system-business-role - - jar - - - - - - cn.stylefeng.roses - system-api - ${roses.version} - - - - - - cn.stylefeng.roses - scanner-api - ${roses.version} - - - - - - cn.stylefeng.roses - validator-api - ${roses.version} - - - - - - cn.stylefeng.roses - db-sdk-mp - ${roses.version} - - - - - org.springframework.boot - spring-boot-starter-web - - - - - - cn.stylefeng.roses - cache-api - ${roses.version} - - - cn.stylefeng.roses - cache-sdk-memory - ${roses.version} - true - - - cn.stylefeng.roses - cache-sdk-redis - ${roses.version} - true - - - - - diff --git a/kernel-s-system/system-business-user/README.md b/kernel-s-system/system-business-user/README.md deleted file mode 100644 index dc6cbbf10..000000000 --- a/kernel-s-system/system-business-user/README.md +++ /dev/null @@ -1 +0,0 @@ -包含用户信息的维护 \ No newline at end of file diff --git a/kernel-s-system/system-integration-rest/README.md b/kernel-s-system/system-integration-rest/README.md deleted file mode 100644 index e41ab5038..000000000 --- a/kernel-s-system/system-integration-rest/README.md +++ /dev/null @@ -1 +0,0 @@ -针对前后端分离版本项目，前端使用vue渲染的集成 \ No newline at end of file diff --git a/kernel-s-system/system-integration-rest/pom.xml b/kernel-s-system/system-integration-rest/pom.xml deleted file mode 100644 index 197b223d6..000000000 --- a/kernel-s-system/system-integration-rest/pom.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - 4.0.0 - - - cn.stylefeng.roses - kernel-s-system - 7.6.0 - ../pom.xml - - - system-integration-rest - - jar - - - - - - cn.stylefeng.roses - system-spring-boot-starter - ${roses.version} - - - - - diff --git a/kernel-s-system/system-integration-rest/src/main/resources/META-INF/spring.factories b/kernel-s-system/system-integration-rest/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 50ea01f2b..000000000 --- a/kernel-s-system/system-integration-rest/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,2 +0,0 @@ -org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - cn.stylefeng.roses.kernel.system.integration.config.RestErrorViewAutoConfiguration diff --git a/kernel-s-system/system-spring-boot-starter/pom.xml b/kernel-s-system/system-spring-boot-starter/pom.xml index 974642be7..31324ea94 100644 --- a/kernel-s-system/system-spring-boot-starter/pom.xml +++ b/kernel-s-system/system-spring-boot-starter/pom.xml @@ -17,10 +17,10 @@ - + cn.stylefeng.roses - system-business-app + system-business-permission ${roses.version} @@ -83,7 +83,7 @@ cn.stylefeng.roses - system-business-notice + system-business-portal ${roses.version} diff --git a/kernel-s-system/system-integration-rest/src/main/java/cn/stylefeng/roses/kernel/system/integration/ErrorStaticJsonView.java b/kernel-s-system/system-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/system/starter/ErrorStaticJsonView.java similarity index 95% rename from kernel-s-system/system-integration-rest/src/main/java/cn/stylefeng/roses/kernel/system/integration/ErrorStaticJsonView.java rename to kernel-s-system/system-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/system/starter/ErrorStaticJsonView.java index b3c685704..86789f8e0 100644 --- a/kernel-s-system/system-integration-rest/src/main/java/cn/stylefeng/roses/kernel/system/integration/ErrorStaticJsonView.java +++ b/kernel-s-system/system-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/system/starter/ErrorStaticJsonView.java @@ -1,4 +1,4 @@ -package cn.stylefeng.roses.kernel.system.integration; +package cn.stylefeng.roses.kernel.system.starter; import cn.stylefeng.roses.kernel.rule.pojo.response.ErrorResponseData; import cn.stylefeng.roses.kernel.rule.util.ResponseRenderUtil; diff --git a/kernel-s-system/system-integration-rest/src/main/java/cn/stylefeng/roses/kernel/system/integration/config/RestErrorViewAutoConfiguration.java b/kernel-s-system/system-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/system/starter/config/RestErrorViewAutoConfiguration.java similarity index 86% rename from kernel-s-system/system-integration-rest/src/main/java/cn/stylefeng/roses/kernel/system/integration/config/RestErrorViewAutoConfiguration.java rename to kernel-s-system/system-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/system/starter/config/RestErrorViewAutoConfiguration.java index 08db08352..0a9e6cac0 100644 --- a/kernel-s-system/system-integration-rest/src/main/java/cn/stylefeng/roses/kernel/system/integration/config/RestErrorViewAutoConfiguration.java +++ b/kernel-s-system/system-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/system/starter/config/RestErrorViewAutoConfiguration.java @@ -1,6 +1,6 @@ -package cn.stylefeng.roses.kernel.system.integration.config; +package cn.stylefeng.roses.kernel.system.starter.config; -import cn.stylefeng.roses.kernel.system.integration.ErrorStaticJsonView; +import cn.stylefeng.roses.kernel.system.starter.ErrorStaticJsonView; import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.web.servlet.error.ErrorMvcAutoConfiguration; diff --git a/kernel-s-system/system-spring-boot-starter/src/main/resources/META-INF/spring.factories b/kernel-s-system/system-spring-boot-starter/src/main/resources/META-INF/spring.factories index 2ea9e5a28..24603c7a5 100644 --- a/kernel-s-system/system-spring-boot-starter/src/main/resources/META-INF/spring.factories +++ b/kernel-s-system/system-spring-boot-starter/src/main/resources/META-INF/spring.factories @@ -3,7 +3,8 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ cn.stylefeng.roses.kernel.system.starter.cache.GunsSystemRedisCacheAutoConfiguration,\ cn.stylefeng.roses.kernel.system.starter.cache.GunsResourceMemoryCacheAutoConfiguration,\ cn.stylefeng.roses.kernel.system.starter.cache.GunsResourceRedisCacheAutoConfiguration,\ - cn.stylefeng.roses.kernel.system.starter.GunsSystemHomeStatisticsAutoConfiguration + cn.stylefeng.roses.kernel.system.starter.GunsSystemHomeStatisticsAutoConfiguration,\ + cn.stylefeng.roses.kernel.system.starter.config.RestErrorViewAutoConfiguration org.springframework.context.ApplicationListener=\ cn.stylefeng.roses.kernel.system.modular.menu.listener.MenuResourceUpdateListener,\ cn.stylefeng.roses.kernel.system.modular.role.listener.RoleResourceUpdateListener \ No newline at end of file