From c276e53a8e02e64f9e5d8270171e20424804382d Mon Sep 17 00:00:00 2001 From: Charles7c Date: Wed, 30 Oct 2024 23:01:54 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E6=A8=A1=E5=9D=97=E5=91=BD=E5=90=8D=EF=BC=88=E7=AE=80?= =?UTF-8?q?=E5=8C=96=E3=80=81=E5=88=86=E7=B1=BB=E3=80=81=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 2 +- README.md | 22 ++++++++-------- .../pom.xml | 2 +- .../exception/GlobalExceptionHandler.java | 0 .../GlobalSaTokenExceptionHandler.java | 0 .../config/mybatis/BCryptEncryptor.java | 0 .../config/mybatis/DataPermissionMapper.java | 0 ...aultDataPermissionUserContextProvider.java | 0 .../mybatis/MyBatisPlusMetaObjectHandler.java | 0 .../mybatis/MybatisPlusConfiguration.java | 0 .../config/properties/CaptchaProperties.java | 0 .../config/properties/RsaProperties.java | 0 .../websocket/WebSocketClientServiceImpl.java | 0 .../admin/common/constant/CacheConstants.java | 0 .../common/constant/ContainerConstants.java | 0 .../admin/common/constant/RegexConstants.java | 0 .../admin/common/constant/SysConstants.java | 0 .../admin/common/constant/UiConstants.java | 0 .../admin/common/context/RoleContext.java | 0 .../admin/common/context/UserContext.java | 0 .../common/context/UserContextHolder.java | 0 .../common/context/UserExtraContext.java | 0 .../admin/common/enums/DataScopeEnum.java | 0 .../common/enums/DisEnableStatusEnum.java | 0 .../admin/common/enums/GenderEnum.java | 0 .../enums/SuccessFailureStatusEnum.java | 0 .../admin/common/util/SecureUtils.java | 0 .../pom.xml | 6 ++--- .../scheduling/ScheduleServerApplication.java | 6 ++--- .../main/resources/config/application-dev.yml | 0 .../resources/config/application-prod.yml | 0 .../src/main/resources/config/application.yml | 0 .../db/changelog/db.changelog-master.yaml | 0 .../db/changelog/mysql/snail-job_data.sql | 0 .../db/changelog/mysql/snail-job_table.sql | 0 .../changelog/postgresql/snail-job_data.sql | 0 .../changelog/postgresql/snail-job_table.sql | 0 .../src/main/resources/logback-spring.xml | 0 .../pom.xml | 5 ++-- .../pom.xml | 4 +-- .../auth/model/query/OnlineUserQuery.java | 0 .../admin/auth/model/req/AccountLoginReq.java | 0 .../admin/auth/model/req/EmailLoginReq.java | 0 .../admin/auth/model/req/PhoneLoginReq.java | 0 .../admin/auth/model/resp/CaptchaResp.java | 0 .../admin/auth/model/resp/LoginResp.java | 0 .../admin/auth/model/resp/OnlineUserResp.java | 0 .../admin/auth/model/resp/RouteResp.java | 0 .../model/resp/SocialAuthAuthorizeResp.java | 0 .../admin/auth/model/resp/UserInfoResp.java | 0 .../admin/auth/service/LoginService.java | 0 .../admin/auth/service/OnlineUserService.java | 0 .../auth/service/impl/LoginServiceImpl.java | 0 .../service/impl/OnlineUserServiceImpl.java | 0 .../system/config/file/FileRecorderImpl.java | 0 .../config/file/FileStorageConfigLoader.java | 0 .../config/mail/MailConfigurerImpl.java | 0 .../admin/system/enums/FileTypeEnum.java | 0 .../admin/system/enums/ImportPolicyEnum.java | 0 .../admin/system/enums/LogStatusEnum.java | 0 .../admin/system/enums/MenuTypeEnum.java | 0 .../system/enums/MessageTemplateEnum.java | 0 .../admin/system/enums/MessageTypeEnum.java | 0 .../admin/system/enums/NoticeStatusEnum.java | 0 .../system/enums/PasswordPolicyEnum.java | 0 .../admin/system/enums/SocialSourceEnum.java | 0 .../admin/system/enums/StorageTypeEnum.java | 0 .../admin/system/mapper/DeptMapper.java | 0 .../admin/system/mapper/DictItemMapper.java | 0 .../admin/system/mapper/DictMapper.java | 0 .../admin/system/mapper/FileMapper.java | 0 .../admin/system/mapper/LogMapper.java | 0 .../admin/system/mapper/MenuMapper.java | 0 .../admin/system/mapper/MessageMapper.java | 0 .../system/mapper/MessageUserMapper.java | 0 .../admin/system/mapper/NoticeMapper.java | 0 .../admin/system/mapper/OptionMapper.java | 0 .../admin/system/mapper/RoleDeptMapper.java | 0 .../admin/system/mapper/RoleMapper.java | 0 .../admin/system/mapper/RoleMenuMapper.java | 0 .../admin/system/mapper/StorageMapper.java | 0 .../admin/system/mapper/UserMapper.java | 0 .../mapper/UserPasswordHistoryMapper.java | 0 .../admin/system/mapper/UserRoleMapper.java | 0 .../admin/system/mapper/UserSocialMapper.java | 0 .../admin/system/model/entity/DeptDO.java | 0 .../admin/system/model/entity/DictDO.java | 0 .../admin/system/model/entity/DictItemDO.java | 0 .../admin/system/model/entity/FileDO.java | 0 .../admin/system/model/entity/LogDO.java | 0 .../admin/system/model/entity/MenuDO.java | 0 .../admin/system/model/entity/MessageDO.java | 0 .../system/model/entity/MessageUserDO.java | 0 .../admin/system/model/entity/NoticeDO.java | 0 .../admin/system/model/entity/OptionDO.java | 0 .../admin/system/model/entity/RoleDO.java | 0 .../admin/system/model/entity/RoleDeptDO.java | 0 .../admin/system/model/entity/RoleMenuDO.java | 0 .../admin/system/model/entity/StorageDO.java | 0 .../admin/system/model/entity/UserDO.java | 0 .../model/entity/UserPasswordHistoryDO.java | 0 .../admin/system/model/entity/UserRoleDO.java | 0 .../system/model/entity/UserSocialDO.java | 0 .../admin/system/model/query/DeptQuery.java | 0 .../system/model/query/DictItemQuery.java | 0 .../admin/system/model/query/DictQuery.java | 0 .../admin/system/model/query/FileQuery.java | 0 .../admin/system/model/query/LogQuery.java | 0 .../admin/system/model/query/MenuQuery.java | 0 .../system/model/query/MessageQuery.java | 0 .../admin/system/model/query/NoticeQuery.java | 0 .../admin/system/model/query/OptionQuery.java | 0 .../admin/system/model/query/RoleQuery.java | 0 .../system/model/query/StorageQuery.java | 0 .../admin/system/model/query/UserQuery.java | 0 .../admin/system/model/req/DeptReq.java | 0 .../admin/system/model/req/DictItemReq.java | 0 .../admin/system/model/req/DictReq.java | 0 .../admin/system/model/req/FileReq.java | 0 .../admin/system/model/req/MenuReq.java | 0 .../admin/system/model/req/MessageReq.java | 0 .../admin/system/model/req/NoticeReq.java | 0 .../admin/system/model/req/OptionReq.java | 0 .../system/model/req/OptionResetValueReq.java | 0 .../admin/system/model/req/RoleReq.java | 0 .../admin/system/model/req/StorageReq.java | 0 .../req/user/UserBasicInfoUpdateReq.java | 0 .../req/user/UserEmailUpdateRequest.java | 0 .../system/model/req/user/UserImportReq.java | 0 .../model/req/user/UserImportRowReq.java | 0 .../model/req/user/UserPasswordResetReq.java | 0 .../model/req/user/UserPasswordUpdateReq.java | 0 .../model/req/user/UserPhoneUpdateReq.java | 0 .../admin/system/model/req/user/UserReq.java | 0 .../model/req/user/UserRoleUpdateReq.java | 0 .../admin/system/model/resp/AvatarResp.java | 0 .../admin/system/model/resp/DeptResp.java | 0 .../admin/system/model/resp/DictItemResp.java | 0 .../admin/system/model/resp/DictResp.java | 0 .../admin/system/model/resp/FileResp.java | 0 .../system/model/resp/FileStatisticsResp.java | 0 .../system/model/resp/FileUploadResp.java | 0 .../admin/system/model/resp/MenuResp.java | 0 .../admin/system/model/resp/MessageResp.java | 0 .../model/resp/MessageTypeUnreadResp.java | 0 .../system/model/resp/MessageUnreadResp.java | 0 .../system/model/resp/NoticeDetailResp.java | 0 .../admin/system/model/resp/NoticeResp.java | 0 .../admin/system/model/resp/OptionResp.java | 0 .../system/model/resp/RoleDetailResp.java | 0 .../admin/system/model/resp/RoleResp.java | 0 .../admin/system/model/resp/StorageResp.java | 0 .../dashboard/DashboardAccessTrendResp.java | 0 .../dashboard/DashboardChartCommonResp.java | 0 .../resp/dashboard/DashboardNoticeResp.java | 0 .../DashboardOverviewCommonResp.java | 0 .../resp/dashboard/DashboardTotalResp.java | 0 .../system/model/resp/log/LogDetailResp.java | 0 .../admin/system/model/resp/log/LogResp.java | 0 .../model/resp/log/LoginLogExportResp.java | 0 .../resp/log/OperationLogExportResp.java | 0 .../model/resp/user/UserDetailResp.java | 0 .../model/resp/user/UserImportParseResp.java | 0 .../model/resp/user/UserImportResp.java | 0 .../system/model/resp/user/UserResp.java | 0 .../model/resp/user/UserSocialBindResp.java | 0 .../system/service/DashboardService.java | 0 .../admin/system/service/DeptService.java | 0 .../admin/system/service/DictItemService.java | 0 .../admin/system/service/DictService.java | 0 .../admin/system/service/FileService.java | 0 .../admin/system/service/LogService.java | 0 .../admin/system/service/MenuService.java | 0 .../admin/system/service/MessageService.java | 0 .../system/service/MessageUserService.java | 0 .../admin/system/service/NoticeService.java | 0 .../admin/system/service/OptionService.java | 0 .../admin/system/service/RoleDeptService.java | 0 .../admin/system/service/RoleMenuService.java | 0 .../admin/system/service/RoleService.java | 0 .../admin/system/service/StorageService.java | 0 .../service/UserPasswordHistoryService.java | 0 .../admin/system/service/UserRoleService.java | 0 .../admin/system/service/UserService.java | 0 .../system/service/UserSocialService.java | 0 .../service/impl/DashboardServiceImpl.java | 0 .../system/service/impl/DeptServiceImpl.java | 0 .../service/impl/DictItemServiceImpl.java | 0 .../system/service/impl/DictServiceImpl.java | 0 .../system/service/impl/FileServiceImpl.java | 0 .../system/service/impl/LogServiceImpl.java | 0 .../system/service/impl/MenuServiceImpl.java | 0 .../service/impl/MessageServiceImpl.java | 0 .../service/impl/MessageUserServiceImpl.java | 0 .../service/impl/NoticeServiceImpl.java | 0 .../service/impl/OptionServiceImpl.java | 0 .../service/impl/RoleDeptServiceImpl.java | 0 .../service/impl/RoleMenuServiceImpl.java | 0 .../system/service/impl/RoleServiceImpl.java | 0 .../service/impl/StorageServiceImpl.java | 0 .../impl/UserPasswordHistoryServiceImpl.java | 0 .../service/impl/UserRoleServiceImpl.java | 0 .../system/service/impl/UserServiceImpl.java | 17 ++++++------- .../service/impl/UserSocialServiceImpl.java | 0 .../admin/system/util/ValidateGroup.java | 0 .../src/main/resources/mapper/DeptMapper.xml | 0 .../main/resources/mapper/DictItemMapper.xml | 0 .../src/main/resources/mapper/LogMapper.xml | 0 .../src/main/resources/mapper/MenuMapper.xml | 0 .../main/resources/mapper/MessageMapper.xml | 0 .../resources/mapper/MessageUserMapper.xml | 0 .../main/resources/mapper/NoticeMapper.xml | 0 .../src/main/resources/mapper/RoleMapper.xml | 0 .../main/resources/mapper/RoleMenuMapper.xml | 0 .../src/main/resources/mapper/UserMapper.xml | 0 .../mapper/UserPasswordHistoryMapper.xml | 0 .../resources/mapper/UserSocialMapper.xml | 0 .../continew-plugin-generator}/pom.xml | 4 +-- .../properties/GeneratorProperties.java | 0 .../admin/generator/enums/FormTypeEnum.java | 0 .../admin/generator/enums/QueryTypeEnum.java | 0 .../generator/mapper/FieldConfigMapper.java | 0 .../generator/mapper/GenConfigMapper.java | 0 .../generator/model/entity/FieldConfigDO.java | 0 .../generator/model/entity/GenConfigDO.java | 0 .../model/entity/InnerGenConfigDO.java | 0 .../generator/model/query/TableQuery.java | 0 .../generator/model/req/GenConfigReq.java | 0 .../model/resp/GeneratePreviewResp.java | 0 .../admin/generator/model/resp/TableResp.java | 0 .../generator/service/GeneratorService.java | 0 .../service/impl/GeneratorServiceImpl.java | 0 .../templates/backend/Controller.ftl | 0 .../templates/backend/DetailResp.ftl | 0 .../resources/templates/backend/Entity.ftl | 0 .../resources/templates/backend/Mapper.ftl | 0 .../resources/templates/backend/Query.ftl | 0 .../main/resources/templates/backend/Req.ftl | 0 .../main/resources/templates/backend/Resp.ftl | 0 .../resources/templates/backend/Service.ftl | 0 .../templates/backend/ServiceImpl.ftl | 0 .../resources/templates/frontend/AddModal.ftl | 0 .../templates/frontend/DetailDrawer.ftl | 0 .../main/resources/templates/frontend/api.ftl | 0 .../resources/templates/frontend/index.ftl | 0 .../continew-plugin-open}/pom.xml | 4 +-- .../handler/SaCheckPermissionHandler.java | 0 .../continew/admin/open/mapper/AppMapper.java | 0 .../admin/open/model/entity/AppDO.java | 0 .../admin/open/model/query/AppQuery.java | 0 .../continew/admin/open/model/req/AppReq.java | 0 .../admin/open/model/resp/AppDetailResp.java | 0 .../admin/open/model/resp/AppResp.java | 0 .../open/model/resp/AppSecretGetResp.java | 0 .../admin/open/service/AppService.java | 0 .../open/service/impl/AppServiceImpl.java | 0 .../admin/open/sign/OpenSignTemplate.java | 0 .../admin/open/util/ApiSignCheckUtils.java | 0 .../continew-plugin-schedule}/pom.xml | 4 +-- .../continew/admin/schedule}/api/JobApi.java | 10 ++++---- .../admin/schedule}/api/JobBatchApi.java | 10 ++++---- .../admin/schedule}/api/JobClient.java | 6 ++--- .../config/HttpExchangeConfiguration.java | 10 ++++---- .../config/SnailJobConfiguration.java | 2 +- .../schedule}/constant/JobConstants.java | 2 +- .../schedule}/enums/JobBlockStrategyEnum.java | 2 +- .../schedule}/enums/JobExecuteReasonEnum.java | 2 +- .../schedule}/enums/JobExecuteStatusEnum.java | 2 +- .../schedule}/enums/JobRouteStrategyEnum.java | 2 +- .../admin/schedule}/enums/JobStatusEnum.java | 2 +- .../schedule}/enums/JobTaskTypeEnum.java | 2 +- .../schedule}/enums/JobTriggerTypeEnum.java | 2 +- .../model/JobInstanceLogPageResult.java | 2 +- .../admin/schedule}/model/JobPageResult.java | 2 +- .../model/query/JobInstanceLogQuery.java | 2 +- .../model/query/JobInstanceQuery.java | 2 +- .../schedule}/model/query/JobLogQuery.java | 4 +-- .../admin/schedule}/model/query/JobQuery.java | 4 +-- .../admin/schedule}/model/req/JobReq.java | 4 +-- .../schedule}/model/req/JobStatusReq.java | 4 +-- .../schedule}/model/resp/JobInstanceResp.java | 2 +- .../schedule}/model/resp/JobLogResp.java | 6 ++--- .../admin/schedule}/model/resp/JobResp.java | 4 +-- .../schedule}/service/JobLogService.java | 14 +++++----- .../admin/schedule}/service/JobService.java | 10 ++++---- .../service/impl/JobLogServiceImpl.java | 20 +++++++-------- .../service/impl/JobServiceImpl.java | 16 ++++++------ .../pom.xml | 10 ++++---- .../pom.xml | 14 +++++----- .../admin/ContiNewAdminApplication.java | 0 .../admin/config/log/LogConfiguration.java | 0 .../admin/config/log/LogDaoLocalImpl.java | 0 .../satoken/LoginPasswordProperties.java | 0 .../satoken/SaExtensionInterceptor.java | 0 .../config/satoken/SaTokenConfiguration.java | 0 .../config/satoken/SaTokenPermissionImpl.java | 0 .../admin/controller/auth/AuthController.java | 0 .../controller/auth/SocialAuthController.java | 0 .../controller/common/CaptchaController.java | 0 .../controller/common/CommonController.java | 0 .../common/DashboardController.java | 0 .../monitor/OnlineUserController.java | 0 .../admin/controller/open/AppController.java | 0 .../schedule/DemoEnvironmentJob.java | 0 .../controller/schedule/JobController.java | 10 ++++---- .../controller/schedule/JobLogController.java | 14 +++++----- .../controller/system/DeptController.java | 0 .../controller/system/DictController.java | 0 .../controller/system/DictItemController.java | 0 .../controller/system/FileController.java | 0 .../controller/system/LogController.java | 0 .../controller/system/MenuController.java | 0 .../controller/system/MessageController.java | 0 .../controller/system/NoticeController.java | 0 .../controller/system/OptionController.java | 0 .../controller/system/RoleController.java | 0 .../controller/system/StorageController.java | 0 .../system/UserCenterController.java | 0 .../controller/system/UserController.java | 0 .../controller/tool/GeneratorController.java | 0 .../src/main/resources/banner.txt | 0 .../main/resources/config/application-dev.yml | 0 .../config/application-generator.yml | 0 .../resources/config/application-prod.yml | 0 .../src/main/resources/config/application.yml | 0 .../db/changelog/db.changelog-master.yaml | 12 ++++----- .../db/changelog/mysql/main_column.sql | 0 .../db/changelog/mysql/main_data.sql | 0 .../db/changelog/mysql/main_table.sql | 0 .../mysql/plugin}/plugin_generator.sql | 0 .../changelog/mysql/plugin}/plugin_open.sql | 0 .../mysql/plugin/plugin_schedule.sql | 0 .../db/changelog/postgresql/main_column.sql | 0 .../db/changelog/postgresql/main_data.sql | 0 .../db/changelog/postgresql/main_table.sql | 0 .../postgresql/plugin}/plugin_generator.sql | 0 .../postgresql/plugin}/plugin_open.sql | 0 .../postgresql/plugin/plugin_schedule.sql | 0 .../src/main/resources/favicon.ico | Bin .../src/main/resources/logback-spring.xml | 0 .../main/resources/templates/import/user.xlsx | Bin .../main/resources/templates/mail/captcha.ftl | 0 .../admin/ContiNewAdminApplicationTests.java | 0 docker/docker-compose.yml | 6 ++--- .../Dockerfile | 0 pom.xml | 24 +++++++++--------- 346 files changed, 157 insertions(+), 159 deletions(-) rename {continew-admin-common => continew-common}/pom.xml (99%) rename {continew-admin-common => continew-common}/src/main/java/top/continew/admin/common/config/exception/GlobalExceptionHandler.java (100%) rename {continew-admin-common => continew-common}/src/main/java/top/continew/admin/common/config/exception/GlobalSaTokenExceptionHandler.java (100%) rename {continew-admin-common => continew-common}/src/main/java/top/continew/admin/common/config/mybatis/BCryptEncryptor.java (100%) rename {continew-admin-common => continew-common}/src/main/java/top/continew/admin/common/config/mybatis/DataPermissionMapper.java (100%) rename {continew-admin-common => continew-common}/src/main/java/top/continew/admin/common/config/mybatis/DefaultDataPermissionUserContextProvider.java (100%) rename {continew-admin-common => continew-common}/src/main/java/top/continew/admin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java (100%) rename {continew-admin-common => continew-common}/src/main/java/top/continew/admin/common/config/mybatis/MybatisPlusConfiguration.java (100%) rename {continew-admin-common => continew-common}/src/main/java/top/continew/admin/common/config/properties/CaptchaProperties.java (100%) rename {continew-admin-common => continew-common}/src/main/java/top/continew/admin/common/config/properties/RsaProperties.java (100%) rename {continew-admin-common => continew-common}/src/main/java/top/continew/admin/common/config/websocket/WebSocketClientServiceImpl.java (100%) rename {continew-admin-common => continew-common}/src/main/java/top/continew/admin/common/constant/CacheConstants.java (100%) rename {continew-admin-common => continew-common}/src/main/java/top/continew/admin/common/constant/ContainerConstants.java (100%) rename {continew-admin-common => continew-common}/src/main/java/top/continew/admin/common/constant/RegexConstants.java (100%) rename {continew-admin-common => continew-common}/src/main/java/top/continew/admin/common/constant/SysConstants.java (100%) rename {continew-admin-common => continew-common}/src/main/java/top/continew/admin/common/constant/UiConstants.java (100%) rename {continew-admin-common => continew-common}/src/main/java/top/continew/admin/common/context/RoleContext.java (100%) rename {continew-admin-common => continew-common}/src/main/java/top/continew/admin/common/context/UserContext.java (100%) rename {continew-admin-common => continew-common}/src/main/java/top/continew/admin/common/context/UserContextHolder.java (100%) rename {continew-admin-common => continew-common}/src/main/java/top/continew/admin/common/context/UserExtraContext.java (100%) rename {continew-admin-common => continew-common}/src/main/java/top/continew/admin/common/enums/DataScopeEnum.java (100%) rename {continew-admin-common => continew-common}/src/main/java/top/continew/admin/common/enums/DisEnableStatusEnum.java (100%) rename {continew-admin-common => continew-common}/src/main/java/top/continew/admin/common/enums/GenderEnum.java (100%) rename {continew-admin-common => continew-common}/src/main/java/top/continew/admin/common/enums/SuccessFailureStatusEnum.java (100%) rename {continew-admin-common => continew-common}/src/main/java/top/continew/admin/common/util/SecureUtils.java (100%) rename {continew-admin-extension/continew-admin-job-server => continew-extension/continew-extension-schedule-server}/pom.xml (93%) rename continew-admin-extension/continew-admin-job-server/src/main/java/top/continew/admin/extension/job/JobServerApplication.java => continew-extension/continew-extension-schedule-server/src/main/java/top/continew/admin/extension/scheduling/ScheduleServerApplication.java (88%) rename {continew-admin-extension/continew-admin-job-server => continew-extension/continew-extension-schedule-server}/src/main/resources/config/application-dev.yml (100%) rename {continew-admin-extension/continew-admin-job-server => continew-extension/continew-extension-schedule-server}/src/main/resources/config/application-prod.yml (100%) rename {continew-admin-extension/continew-admin-job-server => continew-extension/continew-extension-schedule-server}/src/main/resources/config/application.yml (100%) rename {continew-admin-extension/continew-admin-job-server => continew-extension/continew-extension-schedule-server}/src/main/resources/db/changelog/db.changelog-master.yaml (100%) rename {continew-admin-extension/continew-admin-job-server => continew-extension/continew-extension-schedule-server}/src/main/resources/db/changelog/mysql/snail-job_data.sql (100%) rename {continew-admin-extension/continew-admin-job-server => continew-extension/continew-extension-schedule-server}/src/main/resources/db/changelog/mysql/snail-job_table.sql (100%) rename {continew-admin-extension/continew-admin-job-server => continew-extension/continew-extension-schedule-server}/src/main/resources/db/changelog/postgresql/snail-job_data.sql (100%) rename {continew-admin-extension/continew-admin-job-server => continew-extension/continew-extension-schedule-server}/src/main/resources/db/changelog/postgresql/snail-job_table.sql (100%) rename {continew-admin-extension/continew-admin-job-server => continew-extension/continew-extension-schedule-server}/src/main/resources/logback-spring.xml (100%) rename {continew-admin-extension => continew-extension}/pom.xml (83%) rename {continew-admin-system => continew-module-system}/pom.xml (88%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/auth/model/query/OnlineUserQuery.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/auth/model/req/AccountLoginReq.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/auth/model/req/EmailLoginReq.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/auth/model/req/PhoneLoginReq.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/auth/model/resp/CaptchaResp.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/auth/model/resp/LoginResp.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/auth/model/resp/OnlineUserResp.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/auth/model/resp/RouteResp.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/auth/model/resp/SocialAuthAuthorizeResp.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/auth/model/resp/UserInfoResp.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/auth/service/LoginService.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/auth/service/OnlineUserService.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/auth/service/impl/LoginServiceImpl.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/auth/service/impl/OnlineUserServiceImpl.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/config/file/FileRecorderImpl.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/config/file/FileStorageConfigLoader.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/config/mail/MailConfigurerImpl.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/enums/FileTypeEnum.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/enums/ImportPolicyEnum.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/enums/LogStatusEnum.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/enums/MenuTypeEnum.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/enums/MessageTemplateEnum.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/enums/MessageTypeEnum.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/enums/NoticeStatusEnum.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/enums/PasswordPolicyEnum.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/enums/SocialSourceEnum.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/enums/StorageTypeEnum.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/mapper/DeptMapper.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/mapper/DictItemMapper.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/mapper/DictMapper.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/mapper/FileMapper.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/mapper/LogMapper.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/mapper/MenuMapper.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/mapper/MessageMapper.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/mapper/MessageUserMapper.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/mapper/NoticeMapper.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/mapper/OptionMapper.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/mapper/RoleDeptMapper.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/mapper/RoleMapper.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/mapper/RoleMenuMapper.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/mapper/StorageMapper.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/mapper/UserMapper.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/mapper/UserPasswordHistoryMapper.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/mapper/UserRoleMapper.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/mapper/UserSocialMapper.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/entity/DeptDO.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/entity/DictDO.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/entity/DictItemDO.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/entity/FileDO.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/entity/LogDO.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/entity/MenuDO.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/entity/MessageDO.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/entity/MessageUserDO.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/entity/NoticeDO.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/entity/OptionDO.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/entity/RoleDO.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/entity/RoleDeptDO.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/entity/RoleMenuDO.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/entity/StorageDO.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/entity/UserDO.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/entity/UserPasswordHistoryDO.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/entity/UserRoleDO.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/entity/UserSocialDO.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/query/DeptQuery.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/query/DictItemQuery.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/query/DictQuery.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/query/FileQuery.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/query/LogQuery.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/query/MenuQuery.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/query/MessageQuery.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/query/NoticeQuery.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/query/OptionQuery.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/query/RoleQuery.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/query/StorageQuery.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/query/UserQuery.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/req/DeptReq.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/req/DictItemReq.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/req/DictReq.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/req/FileReq.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/req/MenuReq.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/req/MessageReq.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/req/NoticeReq.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/req/OptionReq.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/req/OptionResetValueReq.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/req/RoleReq.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/req/StorageReq.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/req/user/UserBasicInfoUpdateReq.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/req/user/UserEmailUpdateRequest.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/req/user/UserImportReq.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/req/user/UserImportRowReq.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/req/user/UserPasswordResetReq.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/req/user/UserPasswordUpdateReq.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/req/user/UserPhoneUpdateReq.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/req/user/UserReq.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/req/user/UserRoleUpdateReq.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/resp/AvatarResp.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/resp/DeptResp.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/resp/DictItemResp.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/resp/DictResp.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/resp/FileResp.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/resp/FileStatisticsResp.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/resp/FileUploadResp.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/resp/MenuResp.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/resp/MessageResp.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/resp/MessageTypeUnreadResp.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/resp/MessageUnreadResp.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/resp/NoticeDetailResp.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/resp/NoticeResp.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/resp/OptionResp.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/resp/RoleDetailResp.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/resp/RoleResp.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/resp/StorageResp.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/resp/dashboard/DashboardAccessTrendResp.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/resp/dashboard/DashboardChartCommonResp.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/resp/dashboard/DashboardNoticeResp.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/resp/dashboard/DashboardOverviewCommonResp.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/resp/dashboard/DashboardTotalResp.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/resp/log/LogDetailResp.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/resp/log/LogResp.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/resp/log/LoginLogExportResp.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/resp/log/OperationLogExportResp.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/resp/user/UserDetailResp.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/resp/user/UserImportParseResp.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/resp/user/UserImportResp.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/resp/user/UserResp.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/model/resp/user/UserSocialBindResp.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/service/DashboardService.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/service/DeptService.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/service/DictItemService.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/service/DictService.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/service/FileService.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/service/LogService.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/service/MenuService.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/service/MessageService.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/service/MessageUserService.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/service/NoticeService.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/service/OptionService.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/service/RoleDeptService.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/service/RoleMenuService.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/service/RoleService.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/service/StorageService.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/service/UserPasswordHistoryService.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/service/UserRoleService.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/service/UserService.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/service/UserSocialService.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/service/impl/DashboardServiceImpl.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/service/impl/DeptServiceImpl.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/service/impl/DictItemServiceImpl.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/service/impl/DictServiceImpl.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/service/impl/FileServiceImpl.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/service/impl/LogServiceImpl.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/service/impl/MenuServiceImpl.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/service/impl/MessageServiceImpl.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/service/impl/MessageUserServiceImpl.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/service/impl/NoticeServiceImpl.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/service/impl/OptionServiceImpl.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/service/impl/RoleDeptServiceImpl.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/service/impl/RoleMenuServiceImpl.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/service/impl/RoleServiceImpl.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/service/impl/StorageServiceImpl.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/service/impl/UserPasswordHistoryServiceImpl.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/service/impl/UserRoleServiceImpl.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java (98%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/service/impl/UserSocialServiceImpl.java (100%) rename {continew-admin-system => continew-module-system}/src/main/java/top/continew/admin/system/util/ValidateGroup.java (100%) rename {continew-admin-system => continew-module-system}/src/main/resources/mapper/DeptMapper.xml (100%) rename {continew-admin-system => continew-module-system}/src/main/resources/mapper/DictItemMapper.xml (100%) rename {continew-admin-system => continew-module-system}/src/main/resources/mapper/LogMapper.xml (100%) rename {continew-admin-system => continew-module-system}/src/main/resources/mapper/MenuMapper.xml (100%) rename {continew-admin-system => continew-module-system}/src/main/resources/mapper/MessageMapper.xml (100%) rename {continew-admin-system => continew-module-system}/src/main/resources/mapper/MessageUserMapper.xml (100%) rename {continew-admin-system => continew-module-system}/src/main/resources/mapper/NoticeMapper.xml (100%) rename {continew-admin-system => continew-module-system}/src/main/resources/mapper/RoleMapper.xml (100%) rename {continew-admin-system => continew-module-system}/src/main/resources/mapper/RoleMenuMapper.xml (100%) rename {continew-admin-system => continew-module-system}/src/main/resources/mapper/UserMapper.xml (100%) rename {continew-admin-system => continew-module-system}/src/main/resources/mapper/UserPasswordHistoryMapper.xml (100%) rename {continew-admin-system => continew-module-system}/src/main/resources/mapper/UserSocialMapper.xml (100%) rename {continew-admin-plugins/continew-admin-generator => continew-plugin/continew-plugin-generator}/pom.xml (81%) rename {continew-admin-plugins/continew-admin-generator => continew-plugin/continew-plugin-generator}/src/main/java/top/continew/admin/generator/config/properties/GeneratorProperties.java (100%) rename {continew-admin-plugins/continew-admin-generator => continew-plugin/continew-plugin-generator}/src/main/java/top/continew/admin/generator/enums/FormTypeEnum.java (100%) rename {continew-admin-plugins/continew-admin-generator => continew-plugin/continew-plugin-generator}/src/main/java/top/continew/admin/generator/enums/QueryTypeEnum.java (100%) rename {continew-admin-plugins/continew-admin-generator => continew-plugin/continew-plugin-generator}/src/main/java/top/continew/admin/generator/mapper/FieldConfigMapper.java (100%) rename {continew-admin-plugins/continew-admin-generator => continew-plugin/continew-plugin-generator}/src/main/java/top/continew/admin/generator/mapper/GenConfigMapper.java (100%) rename {continew-admin-plugins/continew-admin-generator => continew-plugin/continew-plugin-generator}/src/main/java/top/continew/admin/generator/model/entity/FieldConfigDO.java (100%) rename {continew-admin-plugins/continew-admin-generator => continew-plugin/continew-plugin-generator}/src/main/java/top/continew/admin/generator/model/entity/GenConfigDO.java (100%) rename {continew-admin-plugins/continew-admin-generator => continew-plugin/continew-plugin-generator}/src/main/java/top/continew/admin/generator/model/entity/InnerGenConfigDO.java (100%) rename {continew-admin-plugins/continew-admin-generator => continew-plugin/continew-plugin-generator}/src/main/java/top/continew/admin/generator/model/query/TableQuery.java (100%) rename {continew-admin-plugins/continew-admin-generator => continew-plugin/continew-plugin-generator}/src/main/java/top/continew/admin/generator/model/req/GenConfigReq.java (100%) rename {continew-admin-plugins/continew-admin-generator => continew-plugin/continew-plugin-generator}/src/main/java/top/continew/admin/generator/model/resp/GeneratePreviewResp.java (100%) rename {continew-admin-plugins/continew-admin-generator => continew-plugin/continew-plugin-generator}/src/main/java/top/continew/admin/generator/model/resp/TableResp.java (100%) rename {continew-admin-plugins/continew-admin-generator => continew-plugin/continew-plugin-generator}/src/main/java/top/continew/admin/generator/service/GeneratorService.java (100%) rename {continew-admin-plugins/continew-admin-generator => continew-plugin/continew-plugin-generator}/src/main/java/top/continew/admin/generator/service/impl/GeneratorServiceImpl.java (100%) rename {continew-admin-plugins/continew-admin-generator => continew-plugin/continew-plugin-generator}/src/main/resources/templates/backend/Controller.ftl (100%) rename {continew-admin-plugins/continew-admin-generator => continew-plugin/continew-plugin-generator}/src/main/resources/templates/backend/DetailResp.ftl (100%) rename {continew-admin-plugins/continew-admin-generator => continew-plugin/continew-plugin-generator}/src/main/resources/templates/backend/Entity.ftl (100%) rename {continew-admin-plugins/continew-admin-generator => continew-plugin/continew-plugin-generator}/src/main/resources/templates/backend/Mapper.ftl (100%) rename {continew-admin-plugins/continew-admin-generator => continew-plugin/continew-plugin-generator}/src/main/resources/templates/backend/Query.ftl (100%) rename {continew-admin-plugins/continew-admin-generator => continew-plugin/continew-plugin-generator}/src/main/resources/templates/backend/Req.ftl (100%) rename {continew-admin-plugins/continew-admin-generator => continew-plugin/continew-plugin-generator}/src/main/resources/templates/backend/Resp.ftl (100%) rename {continew-admin-plugins/continew-admin-generator => continew-plugin/continew-plugin-generator}/src/main/resources/templates/backend/Service.ftl (100%) rename {continew-admin-plugins/continew-admin-generator => continew-plugin/continew-plugin-generator}/src/main/resources/templates/backend/ServiceImpl.ftl (100%) rename {continew-admin-plugins/continew-admin-generator => continew-plugin/continew-plugin-generator}/src/main/resources/templates/frontend/AddModal.ftl (100%) rename {continew-admin-plugins/continew-admin-generator => continew-plugin/continew-plugin-generator}/src/main/resources/templates/frontend/DetailDrawer.ftl (100%) rename {continew-admin-plugins/continew-admin-generator => continew-plugin/continew-plugin-generator}/src/main/resources/templates/frontend/api.ftl (100%) rename {continew-admin-plugins/continew-admin-generator => continew-plugin/continew-plugin-generator}/src/main/resources/templates/frontend/index.ftl (100%) rename {continew-admin-plugins/continew-admin-open => continew-plugin/continew-plugin-open}/pom.xml (83%) rename {continew-admin-plugins/continew-admin-open => continew-plugin/continew-plugin-open}/src/main/java/top/continew/admin/open/handler/SaCheckPermissionHandler.java (100%) rename {continew-admin-plugins/continew-admin-open => continew-plugin/continew-plugin-open}/src/main/java/top/continew/admin/open/mapper/AppMapper.java (100%) rename {continew-admin-plugins/continew-admin-open => continew-plugin/continew-plugin-open}/src/main/java/top/continew/admin/open/model/entity/AppDO.java (100%) rename {continew-admin-plugins/continew-admin-open => continew-plugin/continew-plugin-open}/src/main/java/top/continew/admin/open/model/query/AppQuery.java (100%) rename {continew-admin-plugins/continew-admin-open => continew-plugin/continew-plugin-open}/src/main/java/top/continew/admin/open/model/req/AppReq.java (100%) rename {continew-admin-plugins/continew-admin-open => continew-plugin/continew-plugin-open}/src/main/java/top/continew/admin/open/model/resp/AppDetailResp.java (100%) rename {continew-admin-plugins/continew-admin-open => continew-plugin/continew-plugin-open}/src/main/java/top/continew/admin/open/model/resp/AppResp.java (100%) rename {continew-admin-plugins/continew-admin-open => continew-plugin/continew-plugin-open}/src/main/java/top/continew/admin/open/model/resp/AppSecretGetResp.java (100%) rename {continew-admin-plugins/continew-admin-open => continew-plugin/continew-plugin-open}/src/main/java/top/continew/admin/open/service/AppService.java (100%) rename {continew-admin-plugins/continew-admin-open => continew-plugin/continew-plugin-open}/src/main/java/top/continew/admin/open/service/impl/AppServiceImpl.java (100%) rename {continew-admin-plugins/continew-admin-open => continew-plugin/continew-plugin-open}/src/main/java/top/continew/admin/open/sign/OpenSignTemplate.java (100%) rename {continew-admin-plugins/continew-admin-open => continew-plugin/continew-plugin-open}/src/main/java/top/continew/admin/open/util/ApiSignCheckUtils.java (100%) rename {continew-admin-plugins/continew-admin-job => continew-plugin/continew-plugin-schedule}/pom.xml (93%) rename {continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job => continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule}/api/JobApi.java (92%) rename {continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job => continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule}/api/JobBatchApi.java (94%) rename {continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job => continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule}/api/JobClient.java (97%) rename {continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job => continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule}/config/HttpExchangeConfiguration.java (95%) rename {continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job => continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule}/config/SnailJobConfiguration.java (97%) rename {continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job => continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule}/constant/JobConstants.java (95%) rename {continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job => continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule}/enums/JobBlockStrategyEnum.java (96%) rename {continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job => continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule}/enums/JobExecuteReasonEnum.java (98%) rename {continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job => continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule}/enums/JobExecuteStatusEnum.java (97%) rename {continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job => continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule}/enums/JobRouteStrategyEnum.java (96%) rename {continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job => continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule}/enums/JobStatusEnum.java (96%) rename {continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job => continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule}/enums/JobTaskTypeEnum.java (96%) rename {continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job => continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule}/enums/JobTriggerTypeEnum.java (96%) rename {continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job => continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule}/model/JobInstanceLogPageResult.java (97%) rename {continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job => continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule}/model/JobPageResult.java (96%) rename {continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job => continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule}/model/query/JobInstanceLogQuery.java (97%) rename {continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job => continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule}/model/query/JobInstanceQuery.java (96%) rename {continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job => continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule}/model/query/JobLogQuery.java (95%) rename {continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job => continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule}/model/query/JobQuery.java (94%) rename {continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job => continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule}/model/req/JobReq.java (97%) rename {continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job => continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule}/model/req/JobStatusReq.java (92%) rename {continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job => continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule}/model/resp/JobInstanceResp.java (97%) rename {continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job => continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule}/model/resp/JobLogResp.java (93%) rename {continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job => continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule}/model/resp/JobResp.java (97%) rename {continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job => continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule}/service/JobLogService.java (79%) rename {continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job => continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule}/service/JobService.java (87%) rename {continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job => continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule}/service/impl/JobLogServiceImpl.java (81%) rename {continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job => continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule}/service/impl/JobServiceImpl.java (84%) rename {continew-admin-plugins => continew-plugin}/pom.xml (76%) rename {continew-admin-webapi => continew-webapi}/pom.xml (94%) rename {continew-admin-webapi => continew-webapi}/src/main/java/top/continew/admin/ContiNewAdminApplication.java (100%) rename {continew-admin-webapi => continew-webapi}/src/main/java/top/continew/admin/config/log/LogConfiguration.java (100%) rename {continew-admin-webapi => continew-webapi}/src/main/java/top/continew/admin/config/log/LogDaoLocalImpl.java (100%) rename {continew-admin-webapi => continew-webapi}/src/main/java/top/continew/admin/config/satoken/LoginPasswordProperties.java (100%) rename {continew-admin-webapi => continew-webapi}/src/main/java/top/continew/admin/config/satoken/SaExtensionInterceptor.java (100%) rename {continew-admin-webapi => continew-webapi}/src/main/java/top/continew/admin/config/satoken/SaTokenConfiguration.java (100%) rename {continew-admin-webapi => continew-webapi}/src/main/java/top/continew/admin/config/satoken/SaTokenPermissionImpl.java (100%) rename {continew-admin-webapi => continew-webapi}/src/main/java/top/continew/admin/controller/auth/AuthController.java (100%) rename {continew-admin-webapi => continew-webapi}/src/main/java/top/continew/admin/controller/auth/SocialAuthController.java (100%) rename {continew-admin-webapi => continew-webapi}/src/main/java/top/continew/admin/controller/common/CaptchaController.java (100%) rename {continew-admin-webapi => continew-webapi}/src/main/java/top/continew/admin/controller/common/CommonController.java (100%) rename {continew-admin-webapi => continew-webapi}/src/main/java/top/continew/admin/controller/common/DashboardController.java (100%) rename {continew-admin-webapi => continew-webapi}/src/main/java/top/continew/admin/controller/monitor/OnlineUserController.java (100%) rename {continew-admin-webapi => continew-webapi}/src/main/java/top/continew/admin/controller/open/AppController.java (100%) rename {continew-admin-webapi => continew-webapi}/src/main/java/top/continew/admin/controller/schedule/DemoEnvironmentJob.java (100%) rename {continew-admin-webapi => continew-webapi}/src/main/java/top/continew/admin/controller/schedule/JobController.java (92%) rename {continew-admin-webapi => continew-webapi}/src/main/java/top/continew/admin/controller/schedule/JobLogController.java (87%) rename {continew-admin-webapi => continew-webapi}/src/main/java/top/continew/admin/controller/system/DeptController.java (100%) rename {continew-admin-webapi => continew-webapi}/src/main/java/top/continew/admin/controller/system/DictController.java (100%) rename {continew-admin-webapi => continew-webapi}/src/main/java/top/continew/admin/controller/system/DictItemController.java (100%) rename {continew-admin-webapi => continew-webapi}/src/main/java/top/continew/admin/controller/system/FileController.java (100%) rename {continew-admin-webapi => continew-webapi}/src/main/java/top/continew/admin/controller/system/LogController.java (100%) rename {continew-admin-webapi => continew-webapi}/src/main/java/top/continew/admin/controller/system/MenuController.java (100%) rename {continew-admin-webapi => continew-webapi}/src/main/java/top/continew/admin/controller/system/MessageController.java (100%) rename {continew-admin-webapi => continew-webapi}/src/main/java/top/continew/admin/controller/system/NoticeController.java (100%) rename {continew-admin-webapi => continew-webapi}/src/main/java/top/continew/admin/controller/system/OptionController.java (100%) rename {continew-admin-webapi => continew-webapi}/src/main/java/top/continew/admin/controller/system/RoleController.java (100%) rename {continew-admin-webapi => continew-webapi}/src/main/java/top/continew/admin/controller/system/StorageController.java (100%) rename {continew-admin-webapi => continew-webapi}/src/main/java/top/continew/admin/controller/system/UserCenterController.java (100%) rename {continew-admin-webapi => continew-webapi}/src/main/java/top/continew/admin/controller/system/UserController.java (100%) rename {continew-admin-webapi => continew-webapi}/src/main/java/top/continew/admin/controller/tool/GeneratorController.java (100%) rename {continew-admin-webapi => continew-webapi}/src/main/resources/banner.txt (100%) rename {continew-admin-webapi => continew-webapi}/src/main/resources/config/application-dev.yml (100%) rename {continew-admin-webapi => continew-webapi}/src/main/resources/config/application-generator.yml (100%) rename {continew-admin-webapi => continew-webapi}/src/main/resources/config/application-prod.yml (100%) rename {continew-admin-webapi => continew-webapi}/src/main/resources/config/application.yml (100%) rename {continew-admin-webapi => continew-webapi}/src/main/resources/db/changelog/db.changelog-master.yaml (57%) rename {continew-admin-webapi => continew-webapi}/src/main/resources/db/changelog/mysql/main_column.sql (100%) rename {continew-admin-webapi => continew-webapi}/src/main/resources/db/changelog/mysql/main_data.sql (100%) rename {continew-admin-webapi => continew-webapi}/src/main/resources/db/changelog/mysql/main_table.sql (100%) rename {continew-admin-webapi/src/main/resources/db/changelog/mysql/plugins => continew-webapi/src/main/resources/db/changelog/mysql/plugin}/plugin_generator.sql (100%) rename {continew-admin-webapi/src/main/resources/db/changelog/mysql/plugins => continew-webapi/src/main/resources/db/changelog/mysql/plugin}/plugin_open.sql (100%) rename continew-admin-webapi/src/main/resources/db/changelog/mysql/plugins/plugin_job.sql => continew-webapi/src/main/resources/db/changelog/mysql/plugin/plugin_schedule.sql (100%) rename {continew-admin-webapi => continew-webapi}/src/main/resources/db/changelog/postgresql/main_column.sql (100%) rename {continew-admin-webapi => continew-webapi}/src/main/resources/db/changelog/postgresql/main_data.sql (100%) rename {continew-admin-webapi => continew-webapi}/src/main/resources/db/changelog/postgresql/main_table.sql (100%) rename {continew-admin-webapi/src/main/resources/db/changelog/postgresql/plugins => continew-webapi/src/main/resources/db/changelog/postgresql/plugin}/plugin_generator.sql (100%) rename {continew-admin-webapi/src/main/resources/db/changelog/postgresql/plugins => continew-webapi/src/main/resources/db/changelog/postgresql/plugin}/plugin_open.sql (100%) rename continew-admin-webapi/src/main/resources/db/changelog/postgresql/plugins/plugin_job.sql => continew-webapi/src/main/resources/db/changelog/postgresql/plugin/plugin_schedule.sql (100%) rename {continew-admin-webapi => continew-webapi}/src/main/resources/favicon.ico (100%) rename {continew-admin-webapi => continew-webapi}/src/main/resources/logback-spring.xml (100%) rename {continew-admin-webapi => continew-webapi}/src/main/resources/templates/import/user.xlsx (100%) rename {continew-admin-webapi => continew-webapi}/src/main/resources/templates/mail/captcha.ftl (100%) rename {continew-admin-webapi => continew-webapi}/src/test/java/top/continew/admin/ContiNewAdminApplicationTests.java (100%) rename docker/{job-server => schedule-server}/Dockerfile (100%) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index a2e2a72b5..5dcad615d 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -35,7 +35,7 @@ jobs: port: ${{ secrets.SERVER_PORT }} username: ${{ secrets.SERVER_USERNAME }} password: ${{ secrets.SERVER_PASSWORD }} - source: ./continew-admin-webapi/target/app/* + source: ./continew-webapi/target/app/* target: /docker/continew-admin strip_components: 3 # 5、启动 diff --git a/README.md b/README.md index ecf4028c9..4aeace5b8 100644 --- a/README.md +++ b/README.md @@ -279,7 +279,7 @@ git clone https://github.com/continew-org/continew-admin.git ``` continew-admin -├─ continew-admin-webapi（API 及打包部署模块） +├─ continew-webapi（API 及打包部署模块） │ ├─ src │ │ ├─ main │ │ │ ├─ java/top/continew/admin @@ -305,7 +305,7 @@ continew-admin │ │ │ └─ logback-spring.xml（日志配置文件） │ │ └─ test（测试相关代码目录） │ └─ pom.xml（包含打包相关配置） -├─ continew-admin-system（系统管理模块，存放系统管理相关业务功能，例如：部门管理、角色管理、用户管理等） +├─ continew-module-system（系统管理模块，存放系统管理相关业务功能，例如：部门管理、角色管理、用户管理等） │ ├─ src │ │ ├─ main │ │ │ ├─ java/top/continew/admin @@ -329,10 +329,10 @@ continew-admin │ │ │ └─ mapper（系统管理相关 Mapper XML 文件目录） │ │ └─ test（测试相关代码目录） │ └─ pom.xml -├─ continew-admin-plugins（插件模块，存放代码生成、任务调度等扩展模块，后续会进行插件化改造） -│ ├─ continew-admin-job（任务调度插件模块） +├─ continew-plugin（插件模块，存放代码生成、任务调度等扩展模块，后续会进行插件化改造） +│ ├─ continew-plugin-schedule（任务调度插件模块） │ │ ├─ src -│ │ │ ├─ main/java/top/continew/admin/job +│ │ │ ├─ main/java/top/continew/admin/schedule │ │ │ │ ├─ api（任务调度中心相关 API） │ │ │ │ ├─ config（任务调度相关配置） │ │ │ │ ├─ constant（任务调度相关常量） @@ -344,7 +344,7 @@ continew-admin │ │ │ │ └─ service（代码生成器相关业务接口及实现类） │ │ │ └─ test（测试相关代码目录） │ │ └─ pom.xml -│ ├─ continew-admin-generator（代码生成器插件模块） +│ ├─ continew-plugin-generator（代码生成器插件模块） │ │ ├─ src │ │ │ ├─ main │ │ │ │ ├─ java/top/continew/admin/generator @@ -364,7 +364,7 @@ continew-admin │ │ │ └─ test（测试相关代码目录） │ │ └─ pom.xml │ └─ pom.xml -├─ continew-admin-common（公共模块，存放公共工具类，公共配置等） +├─ continew-common（公共模块，存放公共工具类，公共配置等） │ ├─ src │ │ ├─ main/java/top/continew/admin/common │ │ │ ├─ config（公共配置） @@ -377,12 +377,12 @@ continew-admin │ │ │ └─ util（公共工具类） │ │ └─ test（测试相关代码目录） │ └─ pom.xml -├─ continew-admin-extension（扩展模块） -│ ├─ continew-admin-job-server（任务调度服务模块，实际开发时如果是公司统一提供环境，可直接删除本模块） +├─ continew-extension（扩展模块） +│ ├─ continew-extension-schedule-server（任务调度服务端模块，实际开发时如果是公司统一提供环境，可直接删除本模块） │ │ ├─ src │ │ │ ├─ main -│ │ │ │ ├─ java/top/continew/admin/extension/job -│ │ │ │ │ └─ JobServerApplication.java（任务调度服务启动程序） +│ │ │ │ ├─ java/top/continew/admin/extension/schedule +│ │ │ │ │ └─ ScheduleServerApplication.java（任务调度服务端启动程序） │ │ │ │ └─ resources │ │ │ │ ├─ config（核心配置目录） │ │ │ │ │ ├─ application-dev.yml（开发环境配置文件） diff --git a/continew-admin-common/pom.xml b/continew-common/pom.xml similarity index 99% rename from continew-admin-common/pom.xml rename to continew-common/pom.xml index 410982066..bcf7dd48a 100644 --- a/continew-admin-common/pom.xml +++ b/continew-common/pom.xml @@ -9,7 +9,7 @@ ${revision} - continew-admin-common + continew-common 公共模块（存放公共工具类，公共配置等） diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/config/exception/GlobalExceptionHandler.java b/continew-common/src/main/java/top/continew/admin/common/config/exception/GlobalExceptionHandler.java similarity index 100% rename from continew-admin-common/src/main/java/top/continew/admin/common/config/exception/GlobalExceptionHandler.java rename to continew-common/src/main/java/top/continew/admin/common/config/exception/GlobalExceptionHandler.java diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/config/exception/GlobalSaTokenExceptionHandler.java b/continew-common/src/main/java/top/continew/admin/common/config/exception/GlobalSaTokenExceptionHandler.java similarity index 100% rename from continew-admin-common/src/main/java/top/continew/admin/common/config/exception/GlobalSaTokenExceptionHandler.java rename to continew-common/src/main/java/top/continew/admin/common/config/exception/GlobalSaTokenExceptionHandler.java diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/config/mybatis/BCryptEncryptor.java b/continew-common/src/main/java/top/continew/admin/common/config/mybatis/BCryptEncryptor.java similarity index 100% rename from continew-admin-common/src/main/java/top/continew/admin/common/config/mybatis/BCryptEncryptor.java rename to continew-common/src/main/java/top/continew/admin/common/config/mybatis/BCryptEncryptor.java diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/config/mybatis/DataPermissionMapper.java b/continew-common/src/main/java/top/continew/admin/common/config/mybatis/DataPermissionMapper.java similarity index 100% rename from continew-admin-common/src/main/java/top/continew/admin/common/config/mybatis/DataPermissionMapper.java rename to continew-common/src/main/java/top/continew/admin/common/config/mybatis/DataPermissionMapper.java diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/config/mybatis/DefaultDataPermissionUserContextProvider.java b/continew-common/src/main/java/top/continew/admin/common/config/mybatis/DefaultDataPermissionUserContextProvider.java similarity index 100% rename from continew-admin-common/src/main/java/top/continew/admin/common/config/mybatis/DefaultDataPermissionUserContextProvider.java rename to continew-common/src/main/java/top/continew/admin/common/config/mybatis/DefaultDataPermissionUserContextProvider.java diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java b/continew-common/src/main/java/top/continew/admin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java similarity index 100% rename from continew-admin-common/src/main/java/top/continew/admin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java rename to continew-common/src/main/java/top/continew/admin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/config/mybatis/MybatisPlusConfiguration.java b/continew-common/src/main/java/top/continew/admin/common/config/mybatis/MybatisPlusConfiguration.java similarity index 100% rename from continew-admin-common/src/main/java/top/continew/admin/common/config/mybatis/MybatisPlusConfiguration.java rename to continew-common/src/main/java/top/continew/admin/common/config/mybatis/MybatisPlusConfiguration.java diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/config/properties/CaptchaProperties.java b/continew-common/src/main/java/top/continew/admin/common/config/properties/CaptchaProperties.java similarity index 100% rename from continew-admin-common/src/main/java/top/continew/admin/common/config/properties/CaptchaProperties.java rename to continew-common/src/main/java/top/continew/admin/common/config/properties/CaptchaProperties.java diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/config/properties/RsaProperties.java b/continew-common/src/main/java/top/continew/admin/common/config/properties/RsaProperties.java similarity index 100% rename from continew-admin-common/src/main/java/top/continew/admin/common/config/properties/RsaProperties.java rename to continew-common/src/main/java/top/continew/admin/common/config/properties/RsaProperties.java diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/config/websocket/WebSocketClientServiceImpl.java b/continew-common/src/main/java/top/continew/admin/common/config/websocket/WebSocketClientServiceImpl.java similarity index 100% rename from continew-admin-common/src/main/java/top/continew/admin/common/config/websocket/WebSocketClientServiceImpl.java rename to continew-common/src/main/java/top/continew/admin/common/config/websocket/WebSocketClientServiceImpl.java diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/constant/CacheConstants.java b/continew-common/src/main/java/top/continew/admin/common/constant/CacheConstants.java similarity index 100% rename from continew-admin-common/src/main/java/top/continew/admin/common/constant/CacheConstants.java rename to continew-common/src/main/java/top/continew/admin/common/constant/CacheConstants.java diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/constant/ContainerConstants.java b/continew-common/src/main/java/top/continew/admin/common/constant/ContainerConstants.java similarity index 100% rename from continew-admin-common/src/main/java/top/continew/admin/common/constant/ContainerConstants.java rename to continew-common/src/main/java/top/continew/admin/common/constant/ContainerConstants.java diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/constant/RegexConstants.java b/continew-common/src/main/java/top/continew/admin/common/constant/RegexConstants.java similarity index 100% rename from continew-admin-common/src/main/java/top/continew/admin/common/constant/RegexConstants.java rename to continew-common/src/main/java/top/continew/admin/common/constant/RegexConstants.java diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/constant/SysConstants.java b/continew-common/src/main/java/top/continew/admin/common/constant/SysConstants.java similarity index 100% rename from continew-admin-common/src/main/java/top/continew/admin/common/constant/SysConstants.java rename to continew-common/src/main/java/top/continew/admin/common/constant/SysConstants.java diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/constant/UiConstants.java b/continew-common/src/main/java/top/continew/admin/common/constant/UiConstants.java similarity index 100% rename from continew-admin-common/src/main/java/top/continew/admin/common/constant/UiConstants.java rename to continew-common/src/main/java/top/continew/admin/common/constant/UiConstants.java diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/context/RoleContext.java b/continew-common/src/main/java/top/continew/admin/common/context/RoleContext.java similarity index 100% rename from continew-admin-common/src/main/java/top/continew/admin/common/context/RoleContext.java rename to continew-common/src/main/java/top/continew/admin/common/context/RoleContext.java diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/context/UserContext.java b/continew-common/src/main/java/top/continew/admin/common/context/UserContext.java similarity index 100% rename from continew-admin-common/src/main/java/top/continew/admin/common/context/UserContext.java rename to continew-common/src/main/java/top/continew/admin/common/context/UserContext.java diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/context/UserContextHolder.java b/continew-common/src/main/java/top/continew/admin/common/context/UserContextHolder.java similarity index 100% rename from continew-admin-common/src/main/java/top/continew/admin/common/context/UserContextHolder.java rename to continew-common/src/main/java/top/continew/admin/common/context/UserContextHolder.java diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/context/UserExtraContext.java b/continew-common/src/main/java/top/continew/admin/common/context/UserExtraContext.java similarity index 100% rename from continew-admin-common/src/main/java/top/continew/admin/common/context/UserExtraContext.java rename to continew-common/src/main/java/top/continew/admin/common/context/UserExtraContext.java diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/enums/DataScopeEnum.java b/continew-common/src/main/java/top/continew/admin/common/enums/DataScopeEnum.java similarity index 100% rename from continew-admin-common/src/main/java/top/continew/admin/common/enums/DataScopeEnum.java rename to continew-common/src/main/java/top/continew/admin/common/enums/DataScopeEnum.java diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/enums/DisEnableStatusEnum.java b/continew-common/src/main/java/top/continew/admin/common/enums/DisEnableStatusEnum.java similarity index 100% rename from continew-admin-common/src/main/java/top/continew/admin/common/enums/DisEnableStatusEnum.java rename to continew-common/src/main/java/top/continew/admin/common/enums/DisEnableStatusEnum.java diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/enums/GenderEnum.java b/continew-common/src/main/java/top/continew/admin/common/enums/GenderEnum.java similarity index 100% rename from continew-admin-common/src/main/java/top/continew/admin/common/enums/GenderEnum.java rename to continew-common/src/main/java/top/continew/admin/common/enums/GenderEnum.java diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/enums/SuccessFailureStatusEnum.java b/continew-common/src/main/java/top/continew/admin/common/enums/SuccessFailureStatusEnum.java similarity index 100% rename from continew-admin-common/src/main/java/top/continew/admin/common/enums/SuccessFailureStatusEnum.java rename to continew-common/src/main/java/top/continew/admin/common/enums/SuccessFailureStatusEnum.java diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/util/SecureUtils.java b/continew-common/src/main/java/top/continew/admin/common/util/SecureUtils.java similarity index 100% rename from continew-admin-common/src/main/java/top/continew/admin/common/util/SecureUtils.java rename to continew-common/src/main/java/top/continew/admin/common/util/SecureUtils.java diff --git a/continew-admin-extension/continew-admin-job-server/pom.xml b/continew-extension/continew-extension-schedule-server/pom.xml similarity index 93% rename from continew-admin-extension/continew-admin-job-server/pom.xml rename to continew-extension/continew-extension-schedule-server/pom.xml index 5bf90cb5c..12efc6b08 100644 --- a/continew-admin-extension/continew-admin-job-server/pom.xml +++ b/continew-extension/continew-extension-schedule-server/pom.xml @@ -5,12 +5,12 @@ 4.0.0 top.continew - continew-admin-extension + continew-extension ${revision} - continew-admin-job-server - 任务调度服务模块 + continew-extension-schedule-server + 任务调度服务端 diff --git a/continew-admin-extension/continew-admin-job-server/src/main/java/top/continew/admin/extension/job/JobServerApplication.java b/continew-extension/continew-extension-schedule-server/src/main/java/top/continew/admin/extension/scheduling/ScheduleServerApplication.java similarity index 88% rename from continew-admin-extension/continew-admin-job-server/src/main/java/top/continew/admin/extension/job/JobServerApplication.java rename to continew-extension/continew-extension-schedule-server/src/main/java/top/continew/admin/extension/scheduling/ScheduleServerApplication.java index 67cd53261..598cca660 100644 --- a/continew-admin-extension/continew-admin-job-server/src/main/java/top/continew/admin/extension/job/JobServerApplication.java +++ b/continew-extension/continew-extension-schedule-server/src/main/java/top/continew/admin/extension/scheduling/ScheduleServerApplication.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package top.continew.admin.extension.job; +package top.continew.admin.extension.scheduling; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; /** - * 任务调度服务启动程序 + * 任务调度服务端启动程序 * * @author KAI * @since 2024/6/25 22:24 */ @SpringBootApplication -public class JobServerApplication { +public class ScheduleServerApplication { public static void main(String[] args) { SpringApplication.run(com.aizuda.snailjob.server.SnailJobServerApplication.class, args); diff --git a/continew-admin-extension/continew-admin-job-server/src/main/resources/config/application-dev.yml b/continew-extension/continew-extension-schedule-server/src/main/resources/config/application-dev.yml similarity index 100% rename from continew-admin-extension/continew-admin-job-server/src/main/resources/config/application-dev.yml rename to continew-extension/continew-extension-schedule-server/src/main/resources/config/application-dev.yml diff --git a/continew-admin-extension/continew-admin-job-server/src/main/resources/config/application-prod.yml b/continew-extension/continew-extension-schedule-server/src/main/resources/config/application-prod.yml similarity index 100% rename from continew-admin-extension/continew-admin-job-server/src/main/resources/config/application-prod.yml rename to continew-extension/continew-extension-schedule-server/src/main/resources/config/application-prod.yml diff --git a/continew-admin-extension/continew-admin-job-server/src/main/resources/config/application.yml b/continew-extension/continew-extension-schedule-server/src/main/resources/config/application.yml similarity index 100% rename from continew-admin-extension/continew-admin-job-server/src/main/resources/config/application.yml rename to continew-extension/continew-extension-schedule-server/src/main/resources/config/application.yml diff --git a/continew-admin-extension/continew-admin-job-server/src/main/resources/db/changelog/db.changelog-master.yaml b/continew-extension/continew-extension-schedule-server/src/main/resources/db/changelog/db.changelog-master.yaml similarity index 100% rename from continew-admin-extension/continew-admin-job-server/src/main/resources/db/changelog/db.changelog-master.yaml rename to continew-extension/continew-extension-schedule-server/src/main/resources/db/changelog/db.changelog-master.yaml diff --git a/continew-admin-extension/continew-admin-job-server/src/main/resources/db/changelog/mysql/snail-job_data.sql b/continew-extension/continew-extension-schedule-server/src/main/resources/db/changelog/mysql/snail-job_data.sql similarity index 100% rename from continew-admin-extension/continew-admin-job-server/src/main/resources/db/changelog/mysql/snail-job_data.sql rename to continew-extension/continew-extension-schedule-server/src/main/resources/db/changelog/mysql/snail-job_data.sql diff --git a/continew-admin-extension/continew-admin-job-server/src/main/resources/db/changelog/mysql/snail-job_table.sql b/continew-extension/continew-extension-schedule-server/src/main/resources/db/changelog/mysql/snail-job_table.sql similarity index 100% rename from continew-admin-extension/continew-admin-job-server/src/main/resources/db/changelog/mysql/snail-job_table.sql rename to continew-extension/continew-extension-schedule-server/src/main/resources/db/changelog/mysql/snail-job_table.sql diff --git a/continew-admin-extension/continew-admin-job-server/src/main/resources/db/changelog/postgresql/snail-job_data.sql b/continew-extension/continew-extension-schedule-server/src/main/resources/db/changelog/postgresql/snail-job_data.sql similarity index 100% rename from continew-admin-extension/continew-admin-job-server/src/main/resources/db/changelog/postgresql/snail-job_data.sql rename to continew-extension/continew-extension-schedule-server/src/main/resources/db/changelog/postgresql/snail-job_data.sql diff --git a/continew-admin-extension/continew-admin-job-server/src/main/resources/db/changelog/postgresql/snail-job_table.sql b/continew-extension/continew-extension-schedule-server/src/main/resources/db/changelog/postgresql/snail-job_table.sql similarity index 100% rename from continew-admin-extension/continew-admin-job-server/src/main/resources/db/changelog/postgresql/snail-job_table.sql rename to continew-extension/continew-extension-schedule-server/src/main/resources/db/changelog/postgresql/snail-job_table.sql diff --git a/continew-admin-extension/continew-admin-job-server/src/main/resources/logback-spring.xml b/continew-extension/continew-extension-schedule-server/src/main/resources/logback-spring.xml similarity index 100% rename from continew-admin-extension/continew-admin-job-server/src/main/resources/logback-spring.xml rename to continew-extension/continew-extension-schedule-server/src/main/resources/logback-spring.xml diff --git a/continew-admin-extension/pom.xml b/continew-extension/pom.xml similarity index 83% rename from continew-admin-extension/pom.xml rename to continew-extension/pom.xml index 486ac5554..2761452ad 100644 --- a/continew-admin-extension/pom.xml +++ b/continew-extension/pom.xml @@ -7,12 +7,11 @@ ${revision} - continew-admin-extension + continew-extension pom 扩展模块（存放其他扩展模块） - - continew-admin-job-server + continew-extension-schedule-server diff --git a/continew-admin-system/pom.xml b/continew-module-system/pom.xml similarity index 88% rename from continew-admin-system/pom.xml rename to continew-module-system/pom.xml index 2175d7242..b2513e3f6 100644 --- a/continew-admin-system/pom.xml +++ b/continew-module-system/pom.xml @@ -9,14 +9,14 @@ ${revision} - continew-admin-system + continew-module-system 系统管理模块（存放系统管理相关业务功能，例如：部门管理、角色管理、用户管理等） top.continew - continew-admin-common + continew-common \ No newline at end of file diff --git a/continew-admin-system/src/main/java/top/continew/admin/auth/model/query/OnlineUserQuery.java b/continew-module-system/src/main/java/top/continew/admin/auth/model/query/OnlineUserQuery.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/auth/model/query/OnlineUserQuery.java rename to continew-module-system/src/main/java/top/continew/admin/auth/model/query/OnlineUserQuery.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/auth/model/req/AccountLoginReq.java b/continew-module-system/src/main/java/top/continew/admin/auth/model/req/AccountLoginReq.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/auth/model/req/AccountLoginReq.java rename to continew-module-system/src/main/java/top/continew/admin/auth/model/req/AccountLoginReq.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/auth/model/req/EmailLoginReq.java b/continew-module-system/src/main/java/top/continew/admin/auth/model/req/EmailLoginReq.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/auth/model/req/EmailLoginReq.java rename to continew-module-system/src/main/java/top/continew/admin/auth/model/req/EmailLoginReq.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/auth/model/req/PhoneLoginReq.java b/continew-module-system/src/main/java/top/continew/admin/auth/model/req/PhoneLoginReq.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/auth/model/req/PhoneLoginReq.java rename to continew-module-system/src/main/java/top/continew/admin/auth/model/req/PhoneLoginReq.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/auth/model/resp/CaptchaResp.java b/continew-module-system/src/main/java/top/continew/admin/auth/model/resp/CaptchaResp.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/auth/model/resp/CaptchaResp.java rename to continew-module-system/src/main/java/top/continew/admin/auth/model/resp/CaptchaResp.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/auth/model/resp/LoginResp.java b/continew-module-system/src/main/java/top/continew/admin/auth/model/resp/LoginResp.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/auth/model/resp/LoginResp.java rename to continew-module-system/src/main/java/top/continew/admin/auth/model/resp/LoginResp.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/auth/model/resp/OnlineUserResp.java b/continew-module-system/src/main/java/top/continew/admin/auth/model/resp/OnlineUserResp.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/auth/model/resp/OnlineUserResp.java rename to continew-module-system/src/main/java/top/continew/admin/auth/model/resp/OnlineUserResp.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/auth/model/resp/RouteResp.java b/continew-module-system/src/main/java/top/continew/admin/auth/model/resp/RouteResp.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/auth/model/resp/RouteResp.java rename to continew-module-system/src/main/java/top/continew/admin/auth/model/resp/RouteResp.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/auth/model/resp/SocialAuthAuthorizeResp.java b/continew-module-system/src/main/java/top/continew/admin/auth/model/resp/SocialAuthAuthorizeResp.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/auth/model/resp/SocialAuthAuthorizeResp.java rename to continew-module-system/src/main/java/top/continew/admin/auth/model/resp/SocialAuthAuthorizeResp.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/auth/model/resp/UserInfoResp.java b/continew-module-system/src/main/java/top/continew/admin/auth/model/resp/UserInfoResp.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/auth/model/resp/UserInfoResp.java rename to continew-module-system/src/main/java/top/continew/admin/auth/model/resp/UserInfoResp.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/auth/service/LoginService.java b/continew-module-system/src/main/java/top/continew/admin/auth/service/LoginService.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/auth/service/LoginService.java rename to continew-module-system/src/main/java/top/continew/admin/auth/service/LoginService.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/auth/service/OnlineUserService.java b/continew-module-system/src/main/java/top/continew/admin/auth/service/OnlineUserService.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/auth/service/OnlineUserService.java rename to continew-module-system/src/main/java/top/continew/admin/auth/service/OnlineUserService.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/auth/service/impl/LoginServiceImpl.java b/continew-module-system/src/main/java/top/continew/admin/auth/service/impl/LoginServiceImpl.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/auth/service/impl/LoginServiceImpl.java rename to continew-module-system/src/main/java/top/continew/admin/auth/service/impl/LoginServiceImpl.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/auth/service/impl/OnlineUserServiceImpl.java b/continew-module-system/src/main/java/top/continew/admin/auth/service/impl/OnlineUserServiceImpl.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/auth/service/impl/OnlineUserServiceImpl.java rename to continew-module-system/src/main/java/top/continew/admin/auth/service/impl/OnlineUserServiceImpl.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/config/file/FileRecorderImpl.java b/continew-module-system/src/main/java/top/continew/admin/system/config/file/FileRecorderImpl.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/config/file/FileRecorderImpl.java rename to continew-module-system/src/main/java/top/continew/admin/system/config/file/FileRecorderImpl.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/config/file/FileStorageConfigLoader.java b/continew-module-system/src/main/java/top/continew/admin/system/config/file/FileStorageConfigLoader.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/config/file/FileStorageConfigLoader.java rename to continew-module-system/src/main/java/top/continew/admin/system/config/file/FileStorageConfigLoader.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/config/mail/MailConfigurerImpl.java b/continew-module-system/src/main/java/top/continew/admin/system/config/mail/MailConfigurerImpl.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/config/mail/MailConfigurerImpl.java rename to continew-module-system/src/main/java/top/continew/admin/system/config/mail/MailConfigurerImpl.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/enums/FileTypeEnum.java b/continew-module-system/src/main/java/top/continew/admin/system/enums/FileTypeEnum.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/enums/FileTypeEnum.java rename to continew-module-system/src/main/java/top/continew/admin/system/enums/FileTypeEnum.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/enums/ImportPolicyEnum.java b/continew-module-system/src/main/java/top/continew/admin/system/enums/ImportPolicyEnum.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/enums/ImportPolicyEnum.java rename to continew-module-system/src/main/java/top/continew/admin/system/enums/ImportPolicyEnum.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/enums/LogStatusEnum.java b/continew-module-system/src/main/java/top/continew/admin/system/enums/LogStatusEnum.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/enums/LogStatusEnum.java rename to continew-module-system/src/main/java/top/continew/admin/system/enums/LogStatusEnum.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/enums/MenuTypeEnum.java b/continew-module-system/src/main/java/top/continew/admin/system/enums/MenuTypeEnum.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/enums/MenuTypeEnum.java rename to continew-module-system/src/main/java/top/continew/admin/system/enums/MenuTypeEnum.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/enums/MessageTemplateEnum.java b/continew-module-system/src/main/java/top/continew/admin/system/enums/MessageTemplateEnum.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/enums/MessageTemplateEnum.java rename to continew-module-system/src/main/java/top/continew/admin/system/enums/MessageTemplateEnum.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/enums/MessageTypeEnum.java b/continew-module-system/src/main/java/top/continew/admin/system/enums/MessageTypeEnum.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/enums/MessageTypeEnum.java rename to continew-module-system/src/main/java/top/continew/admin/system/enums/MessageTypeEnum.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/enums/NoticeStatusEnum.java b/continew-module-system/src/main/java/top/continew/admin/system/enums/NoticeStatusEnum.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/enums/NoticeStatusEnum.java rename to continew-module-system/src/main/java/top/continew/admin/system/enums/NoticeStatusEnum.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/enums/PasswordPolicyEnum.java b/continew-module-system/src/main/java/top/continew/admin/system/enums/PasswordPolicyEnum.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/enums/PasswordPolicyEnum.java rename to continew-module-system/src/main/java/top/continew/admin/system/enums/PasswordPolicyEnum.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/enums/SocialSourceEnum.java b/continew-module-system/src/main/java/top/continew/admin/system/enums/SocialSourceEnum.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/enums/SocialSourceEnum.java rename to continew-module-system/src/main/java/top/continew/admin/system/enums/SocialSourceEnum.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/enums/StorageTypeEnum.java b/continew-module-system/src/main/java/top/continew/admin/system/enums/StorageTypeEnum.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/enums/StorageTypeEnum.java rename to continew-module-system/src/main/java/top/continew/admin/system/enums/StorageTypeEnum.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/DeptMapper.java b/continew-module-system/src/main/java/top/continew/admin/system/mapper/DeptMapper.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/mapper/DeptMapper.java rename to continew-module-system/src/main/java/top/continew/admin/system/mapper/DeptMapper.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/DictItemMapper.java b/continew-module-system/src/main/java/top/continew/admin/system/mapper/DictItemMapper.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/mapper/DictItemMapper.java rename to continew-module-system/src/main/java/top/continew/admin/system/mapper/DictItemMapper.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/DictMapper.java b/continew-module-system/src/main/java/top/continew/admin/system/mapper/DictMapper.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/mapper/DictMapper.java rename to continew-module-system/src/main/java/top/continew/admin/system/mapper/DictMapper.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/FileMapper.java b/continew-module-system/src/main/java/top/continew/admin/system/mapper/FileMapper.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/mapper/FileMapper.java rename to continew-module-system/src/main/java/top/continew/admin/system/mapper/FileMapper.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/LogMapper.java b/continew-module-system/src/main/java/top/continew/admin/system/mapper/LogMapper.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/mapper/LogMapper.java rename to continew-module-system/src/main/java/top/continew/admin/system/mapper/LogMapper.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/MenuMapper.java b/continew-module-system/src/main/java/top/continew/admin/system/mapper/MenuMapper.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/mapper/MenuMapper.java rename to continew-module-system/src/main/java/top/continew/admin/system/mapper/MenuMapper.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/MessageMapper.java b/continew-module-system/src/main/java/top/continew/admin/system/mapper/MessageMapper.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/mapper/MessageMapper.java rename to continew-module-system/src/main/java/top/continew/admin/system/mapper/MessageMapper.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/MessageUserMapper.java b/continew-module-system/src/main/java/top/continew/admin/system/mapper/MessageUserMapper.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/mapper/MessageUserMapper.java rename to continew-module-system/src/main/java/top/continew/admin/system/mapper/MessageUserMapper.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/NoticeMapper.java b/continew-module-system/src/main/java/top/continew/admin/system/mapper/NoticeMapper.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/mapper/NoticeMapper.java rename to continew-module-system/src/main/java/top/continew/admin/system/mapper/NoticeMapper.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/OptionMapper.java b/continew-module-system/src/main/java/top/continew/admin/system/mapper/OptionMapper.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/mapper/OptionMapper.java rename to continew-module-system/src/main/java/top/continew/admin/system/mapper/OptionMapper.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/RoleDeptMapper.java b/continew-module-system/src/main/java/top/continew/admin/system/mapper/RoleDeptMapper.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/mapper/RoleDeptMapper.java rename to continew-module-system/src/main/java/top/continew/admin/system/mapper/RoleDeptMapper.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/RoleMapper.java b/continew-module-system/src/main/java/top/continew/admin/system/mapper/RoleMapper.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/mapper/RoleMapper.java rename to continew-module-system/src/main/java/top/continew/admin/system/mapper/RoleMapper.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/RoleMenuMapper.java b/continew-module-system/src/main/java/top/continew/admin/system/mapper/RoleMenuMapper.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/mapper/RoleMenuMapper.java rename to continew-module-system/src/main/java/top/continew/admin/system/mapper/RoleMenuMapper.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/StorageMapper.java b/continew-module-system/src/main/java/top/continew/admin/system/mapper/StorageMapper.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/mapper/StorageMapper.java rename to continew-module-system/src/main/java/top/continew/admin/system/mapper/StorageMapper.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/UserMapper.java b/continew-module-system/src/main/java/top/continew/admin/system/mapper/UserMapper.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/mapper/UserMapper.java rename to continew-module-system/src/main/java/top/continew/admin/system/mapper/UserMapper.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/UserPasswordHistoryMapper.java b/continew-module-system/src/main/java/top/continew/admin/system/mapper/UserPasswordHistoryMapper.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/mapper/UserPasswordHistoryMapper.java rename to continew-module-system/src/main/java/top/continew/admin/system/mapper/UserPasswordHistoryMapper.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/UserRoleMapper.java b/continew-module-system/src/main/java/top/continew/admin/system/mapper/UserRoleMapper.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/mapper/UserRoleMapper.java rename to continew-module-system/src/main/java/top/continew/admin/system/mapper/UserRoleMapper.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/UserSocialMapper.java b/continew-module-system/src/main/java/top/continew/admin/system/mapper/UserSocialMapper.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/mapper/UserSocialMapper.java rename to continew-module-system/src/main/java/top/continew/admin/system/mapper/UserSocialMapper.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/DeptDO.java b/continew-module-system/src/main/java/top/continew/admin/system/model/entity/DeptDO.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/entity/DeptDO.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/entity/DeptDO.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/DictDO.java b/continew-module-system/src/main/java/top/continew/admin/system/model/entity/DictDO.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/entity/DictDO.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/entity/DictDO.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/DictItemDO.java b/continew-module-system/src/main/java/top/continew/admin/system/model/entity/DictItemDO.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/entity/DictItemDO.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/entity/DictItemDO.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/FileDO.java b/continew-module-system/src/main/java/top/continew/admin/system/model/entity/FileDO.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/entity/FileDO.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/entity/FileDO.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/LogDO.java b/continew-module-system/src/main/java/top/continew/admin/system/model/entity/LogDO.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/entity/LogDO.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/entity/LogDO.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/MenuDO.java b/continew-module-system/src/main/java/top/continew/admin/system/model/entity/MenuDO.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/entity/MenuDO.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/entity/MenuDO.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/MessageDO.java b/continew-module-system/src/main/java/top/continew/admin/system/model/entity/MessageDO.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/entity/MessageDO.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/entity/MessageDO.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/MessageUserDO.java b/continew-module-system/src/main/java/top/continew/admin/system/model/entity/MessageUserDO.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/entity/MessageUserDO.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/entity/MessageUserDO.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/NoticeDO.java b/continew-module-system/src/main/java/top/continew/admin/system/model/entity/NoticeDO.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/entity/NoticeDO.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/entity/NoticeDO.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/OptionDO.java b/continew-module-system/src/main/java/top/continew/admin/system/model/entity/OptionDO.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/entity/OptionDO.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/entity/OptionDO.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/RoleDO.java b/continew-module-system/src/main/java/top/continew/admin/system/model/entity/RoleDO.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/entity/RoleDO.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/entity/RoleDO.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/RoleDeptDO.java b/continew-module-system/src/main/java/top/continew/admin/system/model/entity/RoleDeptDO.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/entity/RoleDeptDO.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/entity/RoleDeptDO.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/RoleMenuDO.java b/continew-module-system/src/main/java/top/continew/admin/system/model/entity/RoleMenuDO.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/entity/RoleMenuDO.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/entity/RoleMenuDO.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/StorageDO.java b/continew-module-system/src/main/java/top/continew/admin/system/model/entity/StorageDO.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/entity/StorageDO.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/entity/StorageDO.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/UserDO.java b/continew-module-system/src/main/java/top/continew/admin/system/model/entity/UserDO.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/entity/UserDO.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/entity/UserDO.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/UserPasswordHistoryDO.java b/continew-module-system/src/main/java/top/continew/admin/system/model/entity/UserPasswordHistoryDO.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/entity/UserPasswordHistoryDO.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/entity/UserPasswordHistoryDO.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/UserRoleDO.java b/continew-module-system/src/main/java/top/continew/admin/system/model/entity/UserRoleDO.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/entity/UserRoleDO.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/entity/UserRoleDO.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/entity/UserSocialDO.java b/continew-module-system/src/main/java/top/continew/admin/system/model/entity/UserSocialDO.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/entity/UserSocialDO.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/entity/UserSocialDO.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/query/DeptQuery.java b/continew-module-system/src/main/java/top/continew/admin/system/model/query/DeptQuery.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/query/DeptQuery.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/query/DeptQuery.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/query/DictItemQuery.java b/continew-module-system/src/main/java/top/continew/admin/system/model/query/DictItemQuery.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/query/DictItemQuery.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/query/DictItemQuery.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/query/DictQuery.java b/continew-module-system/src/main/java/top/continew/admin/system/model/query/DictQuery.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/query/DictQuery.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/query/DictQuery.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/query/FileQuery.java b/continew-module-system/src/main/java/top/continew/admin/system/model/query/FileQuery.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/query/FileQuery.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/query/FileQuery.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/query/LogQuery.java b/continew-module-system/src/main/java/top/continew/admin/system/model/query/LogQuery.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/query/LogQuery.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/query/LogQuery.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/query/MenuQuery.java b/continew-module-system/src/main/java/top/continew/admin/system/model/query/MenuQuery.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/query/MenuQuery.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/query/MenuQuery.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/query/MessageQuery.java b/continew-module-system/src/main/java/top/continew/admin/system/model/query/MessageQuery.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/query/MessageQuery.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/query/MessageQuery.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/query/NoticeQuery.java b/continew-module-system/src/main/java/top/continew/admin/system/model/query/NoticeQuery.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/query/NoticeQuery.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/query/NoticeQuery.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/query/OptionQuery.java b/continew-module-system/src/main/java/top/continew/admin/system/model/query/OptionQuery.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/query/OptionQuery.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/query/OptionQuery.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/query/RoleQuery.java b/continew-module-system/src/main/java/top/continew/admin/system/model/query/RoleQuery.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/query/RoleQuery.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/query/RoleQuery.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/query/StorageQuery.java b/continew-module-system/src/main/java/top/continew/admin/system/model/query/StorageQuery.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/query/StorageQuery.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/query/StorageQuery.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/query/UserQuery.java b/continew-module-system/src/main/java/top/continew/admin/system/model/query/UserQuery.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/query/UserQuery.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/query/UserQuery.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/DeptReq.java b/continew-module-system/src/main/java/top/continew/admin/system/model/req/DeptReq.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/req/DeptReq.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/req/DeptReq.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/DictItemReq.java b/continew-module-system/src/main/java/top/continew/admin/system/model/req/DictItemReq.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/req/DictItemReq.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/req/DictItemReq.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/DictReq.java b/continew-module-system/src/main/java/top/continew/admin/system/model/req/DictReq.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/req/DictReq.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/req/DictReq.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/FileReq.java b/continew-module-system/src/main/java/top/continew/admin/system/model/req/FileReq.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/req/FileReq.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/req/FileReq.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/MenuReq.java b/continew-module-system/src/main/java/top/continew/admin/system/model/req/MenuReq.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/req/MenuReq.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/req/MenuReq.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/MessageReq.java b/continew-module-system/src/main/java/top/continew/admin/system/model/req/MessageReq.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/req/MessageReq.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/req/MessageReq.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/NoticeReq.java b/continew-module-system/src/main/java/top/continew/admin/system/model/req/NoticeReq.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/req/NoticeReq.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/req/NoticeReq.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/OptionReq.java b/continew-module-system/src/main/java/top/continew/admin/system/model/req/OptionReq.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/req/OptionReq.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/req/OptionReq.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/OptionResetValueReq.java b/continew-module-system/src/main/java/top/continew/admin/system/model/req/OptionResetValueReq.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/req/OptionResetValueReq.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/req/OptionResetValueReq.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/RoleReq.java b/continew-module-system/src/main/java/top/continew/admin/system/model/req/RoleReq.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/req/RoleReq.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/req/RoleReq.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/StorageReq.java b/continew-module-system/src/main/java/top/continew/admin/system/model/req/StorageReq.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/req/StorageReq.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/req/StorageReq.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/user/UserBasicInfoUpdateReq.java b/continew-module-system/src/main/java/top/continew/admin/system/model/req/user/UserBasicInfoUpdateReq.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/req/user/UserBasicInfoUpdateReq.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/req/user/UserBasicInfoUpdateReq.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/user/UserEmailUpdateRequest.java b/continew-module-system/src/main/java/top/continew/admin/system/model/req/user/UserEmailUpdateRequest.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/req/user/UserEmailUpdateRequest.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/req/user/UserEmailUpdateRequest.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/user/UserImportReq.java b/continew-module-system/src/main/java/top/continew/admin/system/model/req/user/UserImportReq.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/req/user/UserImportReq.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/req/user/UserImportReq.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/user/UserImportRowReq.java b/continew-module-system/src/main/java/top/continew/admin/system/model/req/user/UserImportRowReq.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/req/user/UserImportRowReq.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/req/user/UserImportRowReq.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/user/UserPasswordResetReq.java b/continew-module-system/src/main/java/top/continew/admin/system/model/req/user/UserPasswordResetReq.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/req/user/UserPasswordResetReq.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/req/user/UserPasswordResetReq.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/user/UserPasswordUpdateReq.java b/continew-module-system/src/main/java/top/continew/admin/system/model/req/user/UserPasswordUpdateReq.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/req/user/UserPasswordUpdateReq.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/req/user/UserPasswordUpdateReq.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/user/UserPhoneUpdateReq.java b/continew-module-system/src/main/java/top/continew/admin/system/model/req/user/UserPhoneUpdateReq.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/req/user/UserPhoneUpdateReq.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/req/user/UserPhoneUpdateReq.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/user/UserReq.java b/continew-module-system/src/main/java/top/continew/admin/system/model/req/user/UserReq.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/req/user/UserReq.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/req/user/UserReq.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/req/user/UserRoleUpdateReq.java b/continew-module-system/src/main/java/top/continew/admin/system/model/req/user/UserRoleUpdateReq.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/req/user/UserRoleUpdateReq.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/req/user/UserRoleUpdateReq.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/AvatarResp.java b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/AvatarResp.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/AvatarResp.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/resp/AvatarResp.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DeptResp.java b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/DeptResp.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DeptResp.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/resp/DeptResp.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DictItemResp.java b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/DictItemResp.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DictItemResp.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/resp/DictItemResp.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DictResp.java b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/DictResp.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/DictResp.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/resp/DictResp.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/FileResp.java b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/FileResp.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/FileResp.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/resp/FileResp.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/FileStatisticsResp.java b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/FileStatisticsResp.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/FileStatisticsResp.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/resp/FileStatisticsResp.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/FileUploadResp.java b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/FileUploadResp.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/FileUploadResp.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/resp/FileUploadResp.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/MenuResp.java b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/MenuResp.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/MenuResp.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/resp/MenuResp.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/MessageResp.java b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/MessageResp.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/MessageResp.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/resp/MessageResp.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/MessageTypeUnreadResp.java b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/MessageTypeUnreadResp.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/MessageTypeUnreadResp.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/resp/MessageTypeUnreadResp.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/MessageUnreadResp.java b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/MessageUnreadResp.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/MessageUnreadResp.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/resp/MessageUnreadResp.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/NoticeDetailResp.java b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/NoticeDetailResp.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/NoticeDetailResp.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/resp/NoticeDetailResp.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/NoticeResp.java b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/NoticeResp.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/NoticeResp.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/resp/NoticeResp.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/OptionResp.java b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/OptionResp.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/OptionResp.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/resp/OptionResp.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/RoleDetailResp.java b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/RoleDetailResp.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/RoleDetailResp.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/resp/RoleDetailResp.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/RoleResp.java b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/RoleResp.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/RoleResp.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/resp/RoleResp.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/StorageResp.java b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/StorageResp.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/StorageResp.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/resp/StorageResp.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/dashboard/DashboardAccessTrendResp.java b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/dashboard/DashboardAccessTrendResp.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/dashboard/DashboardAccessTrendResp.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/resp/dashboard/DashboardAccessTrendResp.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/dashboard/DashboardChartCommonResp.java b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/dashboard/DashboardChartCommonResp.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/dashboard/DashboardChartCommonResp.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/resp/dashboard/DashboardChartCommonResp.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/dashboard/DashboardNoticeResp.java b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/dashboard/DashboardNoticeResp.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/dashboard/DashboardNoticeResp.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/resp/dashboard/DashboardNoticeResp.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/dashboard/DashboardOverviewCommonResp.java b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/dashboard/DashboardOverviewCommonResp.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/dashboard/DashboardOverviewCommonResp.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/resp/dashboard/DashboardOverviewCommonResp.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/dashboard/DashboardTotalResp.java b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/dashboard/DashboardTotalResp.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/dashboard/DashboardTotalResp.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/resp/dashboard/DashboardTotalResp.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/log/LogDetailResp.java b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/log/LogDetailResp.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/log/LogDetailResp.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/resp/log/LogDetailResp.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/log/LogResp.java b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/log/LogResp.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/log/LogResp.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/resp/log/LogResp.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/log/LoginLogExportResp.java b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/log/LoginLogExportResp.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/log/LoginLogExportResp.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/resp/log/LoginLogExportResp.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/log/OperationLogExportResp.java b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/log/OperationLogExportResp.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/log/OperationLogExportResp.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/resp/log/OperationLogExportResp.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/user/UserDetailResp.java b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/user/UserDetailResp.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/user/UserDetailResp.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/resp/user/UserDetailResp.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/user/UserImportParseResp.java b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/user/UserImportParseResp.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/user/UserImportParseResp.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/resp/user/UserImportParseResp.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/user/UserImportResp.java b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/user/UserImportResp.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/user/UserImportResp.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/resp/user/UserImportResp.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/user/UserResp.java b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/user/UserResp.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/user/UserResp.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/resp/user/UserResp.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/model/resp/user/UserSocialBindResp.java b/continew-module-system/src/main/java/top/continew/admin/system/model/resp/user/UserSocialBindResp.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/model/resp/user/UserSocialBindResp.java rename to continew-module-system/src/main/java/top/continew/admin/system/model/resp/user/UserSocialBindResp.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/DashboardService.java b/continew-module-system/src/main/java/top/continew/admin/system/service/DashboardService.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/DashboardService.java rename to continew-module-system/src/main/java/top/continew/admin/system/service/DashboardService.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/DeptService.java b/continew-module-system/src/main/java/top/continew/admin/system/service/DeptService.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/DeptService.java rename to continew-module-system/src/main/java/top/continew/admin/system/service/DeptService.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/DictItemService.java b/continew-module-system/src/main/java/top/continew/admin/system/service/DictItemService.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/DictItemService.java rename to continew-module-system/src/main/java/top/continew/admin/system/service/DictItemService.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/DictService.java b/continew-module-system/src/main/java/top/continew/admin/system/service/DictService.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/DictService.java rename to continew-module-system/src/main/java/top/continew/admin/system/service/DictService.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/FileService.java b/continew-module-system/src/main/java/top/continew/admin/system/service/FileService.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/FileService.java rename to continew-module-system/src/main/java/top/continew/admin/system/service/FileService.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/LogService.java b/continew-module-system/src/main/java/top/continew/admin/system/service/LogService.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/LogService.java rename to continew-module-system/src/main/java/top/continew/admin/system/service/LogService.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/MenuService.java b/continew-module-system/src/main/java/top/continew/admin/system/service/MenuService.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/MenuService.java rename to continew-module-system/src/main/java/top/continew/admin/system/service/MenuService.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/MessageService.java b/continew-module-system/src/main/java/top/continew/admin/system/service/MessageService.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/MessageService.java rename to continew-module-system/src/main/java/top/continew/admin/system/service/MessageService.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/MessageUserService.java b/continew-module-system/src/main/java/top/continew/admin/system/service/MessageUserService.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/MessageUserService.java rename to continew-module-system/src/main/java/top/continew/admin/system/service/MessageUserService.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/NoticeService.java b/continew-module-system/src/main/java/top/continew/admin/system/service/NoticeService.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/NoticeService.java rename to continew-module-system/src/main/java/top/continew/admin/system/service/NoticeService.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/OptionService.java b/continew-module-system/src/main/java/top/continew/admin/system/service/OptionService.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/OptionService.java rename to continew-module-system/src/main/java/top/continew/admin/system/service/OptionService.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/RoleDeptService.java b/continew-module-system/src/main/java/top/continew/admin/system/service/RoleDeptService.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/RoleDeptService.java rename to continew-module-system/src/main/java/top/continew/admin/system/service/RoleDeptService.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/RoleMenuService.java b/continew-module-system/src/main/java/top/continew/admin/system/service/RoleMenuService.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/RoleMenuService.java rename to continew-module-system/src/main/java/top/continew/admin/system/service/RoleMenuService.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/RoleService.java b/continew-module-system/src/main/java/top/continew/admin/system/service/RoleService.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/RoleService.java rename to continew-module-system/src/main/java/top/continew/admin/system/service/RoleService.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/StorageService.java b/continew-module-system/src/main/java/top/continew/admin/system/service/StorageService.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/StorageService.java rename to continew-module-system/src/main/java/top/continew/admin/system/service/StorageService.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/UserPasswordHistoryService.java b/continew-module-system/src/main/java/top/continew/admin/system/service/UserPasswordHistoryService.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/UserPasswordHistoryService.java rename to continew-module-system/src/main/java/top/continew/admin/system/service/UserPasswordHistoryService.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/UserRoleService.java b/continew-module-system/src/main/java/top/continew/admin/system/service/UserRoleService.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/UserRoleService.java rename to continew-module-system/src/main/java/top/continew/admin/system/service/UserRoleService.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/UserService.java b/continew-module-system/src/main/java/top/continew/admin/system/service/UserService.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/UserService.java rename to continew-module-system/src/main/java/top/continew/admin/system/service/UserService.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/UserSocialService.java b/continew-module-system/src/main/java/top/continew/admin/system/service/UserSocialService.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/UserSocialService.java rename to continew-module-system/src/main/java/top/continew/admin/system/service/UserSocialService.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/DashboardServiceImpl.java b/continew-module-system/src/main/java/top/continew/admin/system/service/impl/DashboardServiceImpl.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/impl/DashboardServiceImpl.java rename to continew-module-system/src/main/java/top/continew/admin/system/service/impl/DashboardServiceImpl.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/DeptServiceImpl.java b/continew-module-system/src/main/java/top/continew/admin/system/service/impl/DeptServiceImpl.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/impl/DeptServiceImpl.java rename to continew-module-system/src/main/java/top/continew/admin/system/service/impl/DeptServiceImpl.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/DictItemServiceImpl.java b/continew-module-system/src/main/java/top/continew/admin/system/service/impl/DictItemServiceImpl.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/impl/DictItemServiceImpl.java rename to continew-module-system/src/main/java/top/continew/admin/system/service/impl/DictItemServiceImpl.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/DictServiceImpl.java b/continew-module-system/src/main/java/top/continew/admin/system/service/impl/DictServiceImpl.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/impl/DictServiceImpl.java rename to continew-module-system/src/main/java/top/continew/admin/system/service/impl/DictServiceImpl.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/FileServiceImpl.java b/continew-module-system/src/main/java/top/continew/admin/system/service/impl/FileServiceImpl.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/impl/FileServiceImpl.java rename to continew-module-system/src/main/java/top/continew/admin/system/service/impl/FileServiceImpl.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/LogServiceImpl.java b/continew-module-system/src/main/java/top/continew/admin/system/service/impl/LogServiceImpl.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/impl/LogServiceImpl.java rename to continew-module-system/src/main/java/top/continew/admin/system/service/impl/LogServiceImpl.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/MenuServiceImpl.java b/continew-module-system/src/main/java/top/continew/admin/system/service/impl/MenuServiceImpl.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/impl/MenuServiceImpl.java rename to continew-module-system/src/main/java/top/continew/admin/system/service/impl/MenuServiceImpl.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/MessageServiceImpl.java b/continew-module-system/src/main/java/top/continew/admin/system/service/impl/MessageServiceImpl.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/impl/MessageServiceImpl.java rename to continew-module-system/src/main/java/top/continew/admin/system/service/impl/MessageServiceImpl.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/MessageUserServiceImpl.java b/continew-module-system/src/main/java/top/continew/admin/system/service/impl/MessageUserServiceImpl.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/impl/MessageUserServiceImpl.java rename to continew-module-system/src/main/java/top/continew/admin/system/service/impl/MessageUserServiceImpl.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/NoticeServiceImpl.java b/continew-module-system/src/main/java/top/continew/admin/system/service/impl/NoticeServiceImpl.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/impl/NoticeServiceImpl.java rename to continew-module-system/src/main/java/top/continew/admin/system/service/impl/NoticeServiceImpl.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/OptionServiceImpl.java b/continew-module-system/src/main/java/top/continew/admin/system/service/impl/OptionServiceImpl.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/impl/OptionServiceImpl.java rename to continew-module-system/src/main/java/top/continew/admin/system/service/impl/OptionServiceImpl.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/RoleDeptServiceImpl.java b/continew-module-system/src/main/java/top/continew/admin/system/service/impl/RoleDeptServiceImpl.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/impl/RoleDeptServiceImpl.java rename to continew-module-system/src/main/java/top/continew/admin/system/service/impl/RoleDeptServiceImpl.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/RoleMenuServiceImpl.java b/continew-module-system/src/main/java/top/continew/admin/system/service/impl/RoleMenuServiceImpl.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/impl/RoleMenuServiceImpl.java rename to continew-module-system/src/main/java/top/continew/admin/system/service/impl/RoleMenuServiceImpl.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/RoleServiceImpl.java b/continew-module-system/src/main/java/top/continew/admin/system/service/impl/RoleServiceImpl.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/impl/RoleServiceImpl.java rename to continew-module-system/src/main/java/top/continew/admin/system/service/impl/RoleServiceImpl.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/StorageServiceImpl.java b/continew-module-system/src/main/java/top/continew/admin/system/service/impl/StorageServiceImpl.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/impl/StorageServiceImpl.java rename to continew-module-system/src/main/java/top/continew/admin/system/service/impl/StorageServiceImpl.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/UserPasswordHistoryServiceImpl.java b/continew-module-system/src/main/java/top/continew/admin/system/service/impl/UserPasswordHistoryServiceImpl.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/impl/UserPasswordHistoryServiceImpl.java rename to continew-module-system/src/main/java/top/continew/admin/system/service/impl/UserPasswordHistoryServiceImpl.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/UserRoleServiceImpl.java b/continew-module-system/src/main/java/top/continew/admin/system/service/impl/UserRoleServiceImpl.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/impl/UserRoleServiceImpl.java rename to continew-module-system/src/main/java/top/continew/admin/system/service/impl/UserRoleServiceImpl.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java b/continew-module-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java similarity index 98% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java rename to continew-module-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java index 2fb431e8e..4d3693ee6 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java +++ b/continew-module-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java @@ -167,13 +167,13 @@ public void update(UserReq req, Long id) { CheckUtils.throwIf(StrUtil.isNotBlank(phone) && this.isPhoneExists(phone, id), errorMsgTemplate, phone); DisEnableStatusEnum newStatus = req.getStatus(); CheckUtils.throwIf(DisEnableStatusEnum.DISABLE.equals(newStatus) && ObjectUtil.equal(id, UserContextHolder - .getUserId()), "不允许禁用当前用户"); + .getUserId()), "不允许禁用当前用户"); UserDO oldUser = super.getById(id); if (Boolean.TRUE.equals(oldUser.getIsSystem())) { CheckUtils.throwIfEqual(DisEnableStatusEnum.DISABLE, newStatus, "[{}] 是系统内置用户，不允许禁用", oldUser - .getNickname()); + .getNickname()); Collection disjunctionRoleIds = CollUtil.disjunction(req.getRoleIds(), userRoleService - .listRoleIdByUserId(id)); + .listRoleIdByUserId(id)); CheckUtils.throwIfNotEmpty(disjunctionRoleIds, "[{}] 是系统内置用户，不允许变更角色", oldUser.getNickname()); } // 更新信息 @@ -204,12 +204,12 @@ public void update(UserReq req, Long id) { public void delete(List ids) { CheckUtils.throwIf(CollUtil.contains(ids, UserContextHolder.getUserId()), "不允许删除当前用户"); List list = baseMapper.lambdaQuery() - .select(UserDO::getNickname, UserDO::getIsSystem) - .in(UserDO::getId, ids) - .list(); + .select(UserDO::getNickname, UserDO::getIsSystem) + .in(UserDO::getId, ids) + .list(); Optional isSystemData = list.stream().filter(UserDO::getIsSystem).findFirst(); CheckUtils.throwIf(isSystemData::isPresent, "所选用户 [{}] 是系统内置用户，不允许删除", isSystemData.orElseGet(UserDO::new) - .getNickname()); + .getNickname()); // 删除用户和角色关联 userRoleService.deleteByUserIds(ids); // 删除历史密码 @@ -228,8 +228,7 @@ public Long add(UserDO user) { @Override public void downloadImportTemplate(HttpServletResponse response) throws IOException { try { - FileUploadUtils.download(response, ResourceUtil - .getStream("templates/import/user.xlsx"), "用户导入模板.xlsx"); + FileUploadUtils.download(response, ResourceUtil.getStream("templates/import/user.xlsx"), "用户导入模板.xlsx"); } catch (Exception e) { log.error("下载用户导入模板失败：{}", e.getMessage(), e); response.setCharacterEncoding(CharsetUtil.UTF_8); diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/UserSocialServiceImpl.java b/continew-module-system/src/main/java/top/continew/admin/system/service/impl/UserSocialServiceImpl.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/service/impl/UserSocialServiceImpl.java rename to continew-module-system/src/main/java/top/continew/admin/system/service/impl/UserSocialServiceImpl.java diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/util/ValidateGroup.java b/continew-module-system/src/main/java/top/continew/admin/system/util/ValidateGroup.java similarity index 100% rename from continew-admin-system/src/main/java/top/continew/admin/system/util/ValidateGroup.java rename to continew-module-system/src/main/java/top/continew/admin/system/util/ValidateGroup.java diff --git a/continew-admin-system/src/main/resources/mapper/DeptMapper.xml b/continew-module-system/src/main/resources/mapper/DeptMapper.xml similarity index 100% rename from continew-admin-system/src/main/resources/mapper/DeptMapper.xml rename to continew-module-system/src/main/resources/mapper/DeptMapper.xml diff --git a/continew-admin-system/src/main/resources/mapper/DictItemMapper.xml b/continew-module-system/src/main/resources/mapper/DictItemMapper.xml similarity index 100% rename from continew-admin-system/src/main/resources/mapper/DictItemMapper.xml rename to continew-module-system/src/main/resources/mapper/DictItemMapper.xml diff --git a/continew-admin-system/src/main/resources/mapper/LogMapper.xml b/continew-module-system/src/main/resources/mapper/LogMapper.xml similarity index 100% rename from continew-admin-system/src/main/resources/mapper/LogMapper.xml rename to continew-module-system/src/main/resources/mapper/LogMapper.xml diff --git a/continew-admin-system/src/main/resources/mapper/MenuMapper.xml b/continew-module-system/src/main/resources/mapper/MenuMapper.xml similarity index 100% rename from continew-admin-system/src/main/resources/mapper/MenuMapper.xml rename to continew-module-system/src/main/resources/mapper/MenuMapper.xml diff --git a/continew-admin-system/src/main/resources/mapper/MessageMapper.xml b/continew-module-system/src/main/resources/mapper/MessageMapper.xml similarity index 100% rename from continew-admin-system/src/main/resources/mapper/MessageMapper.xml rename to continew-module-system/src/main/resources/mapper/MessageMapper.xml diff --git a/continew-admin-system/src/main/resources/mapper/MessageUserMapper.xml b/continew-module-system/src/main/resources/mapper/MessageUserMapper.xml similarity index 100% rename from continew-admin-system/src/main/resources/mapper/MessageUserMapper.xml rename to continew-module-system/src/main/resources/mapper/MessageUserMapper.xml diff --git a/continew-admin-system/src/main/resources/mapper/NoticeMapper.xml b/continew-module-system/src/main/resources/mapper/NoticeMapper.xml similarity index 100% rename from continew-admin-system/src/main/resources/mapper/NoticeMapper.xml rename to continew-module-system/src/main/resources/mapper/NoticeMapper.xml diff --git a/continew-admin-system/src/main/resources/mapper/RoleMapper.xml b/continew-module-system/src/main/resources/mapper/RoleMapper.xml similarity index 100% rename from continew-admin-system/src/main/resources/mapper/RoleMapper.xml rename to continew-module-system/src/main/resources/mapper/RoleMapper.xml diff --git a/continew-admin-system/src/main/resources/mapper/RoleMenuMapper.xml b/continew-module-system/src/main/resources/mapper/RoleMenuMapper.xml similarity index 100% rename from continew-admin-system/src/main/resources/mapper/RoleMenuMapper.xml rename to continew-module-system/src/main/resources/mapper/RoleMenuMapper.xml diff --git a/continew-admin-system/src/main/resources/mapper/UserMapper.xml b/continew-module-system/src/main/resources/mapper/UserMapper.xml similarity index 100% rename from continew-admin-system/src/main/resources/mapper/UserMapper.xml rename to continew-module-system/src/main/resources/mapper/UserMapper.xml diff --git a/continew-admin-system/src/main/resources/mapper/UserPasswordHistoryMapper.xml b/continew-module-system/src/main/resources/mapper/UserPasswordHistoryMapper.xml similarity index 100% rename from continew-admin-system/src/main/resources/mapper/UserPasswordHistoryMapper.xml rename to continew-module-system/src/main/resources/mapper/UserPasswordHistoryMapper.xml diff --git a/continew-admin-system/src/main/resources/mapper/UserSocialMapper.xml b/continew-module-system/src/main/resources/mapper/UserSocialMapper.xml similarity index 100% rename from continew-admin-system/src/main/resources/mapper/UserSocialMapper.xml rename to continew-module-system/src/main/resources/mapper/UserSocialMapper.xml diff --git a/continew-admin-plugins/continew-admin-generator/pom.xml b/continew-plugin/continew-plugin-generator/pom.xml similarity index 81% rename from continew-admin-plugins/continew-admin-generator/pom.xml rename to continew-plugin/continew-plugin-generator/pom.xml index 5d2b48896..73e94fdf5 100644 --- a/continew-admin-plugins/continew-admin-generator/pom.xml +++ b/continew-plugin/continew-plugin-generator/pom.xml @@ -5,10 +5,10 @@ 4.0.0 top.continew - continew-admin-plugins + continew-plugin ${revision} - continew-admin-generator + continew-plugin-generator 代码生成器插件 \ No newline at end of file diff --git a/continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/config/properties/GeneratorProperties.java b/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/config/properties/GeneratorProperties.java similarity index 100% rename from continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/config/properties/GeneratorProperties.java rename to continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/config/properties/GeneratorProperties.java diff --git a/continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/enums/FormTypeEnum.java b/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/enums/FormTypeEnum.java similarity index 100% rename from continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/enums/FormTypeEnum.java rename to continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/enums/FormTypeEnum.java diff --git a/continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/enums/QueryTypeEnum.java b/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/enums/QueryTypeEnum.java similarity index 100% rename from continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/enums/QueryTypeEnum.java rename to continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/enums/QueryTypeEnum.java diff --git a/continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/mapper/FieldConfigMapper.java b/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/mapper/FieldConfigMapper.java similarity index 100% rename from continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/mapper/FieldConfigMapper.java rename to continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/mapper/FieldConfigMapper.java diff --git a/continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/mapper/GenConfigMapper.java b/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/mapper/GenConfigMapper.java similarity index 100% rename from continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/mapper/GenConfigMapper.java rename to continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/mapper/GenConfigMapper.java diff --git a/continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/model/entity/FieldConfigDO.java b/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/model/entity/FieldConfigDO.java similarity index 100% rename from continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/model/entity/FieldConfigDO.java rename to continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/model/entity/FieldConfigDO.java diff --git a/continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/model/entity/GenConfigDO.java b/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/model/entity/GenConfigDO.java similarity index 100% rename from continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/model/entity/GenConfigDO.java rename to continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/model/entity/GenConfigDO.java diff --git a/continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/model/entity/InnerGenConfigDO.java b/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/model/entity/InnerGenConfigDO.java similarity index 100% rename from continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/model/entity/InnerGenConfigDO.java rename to continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/model/entity/InnerGenConfigDO.java diff --git a/continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/model/query/TableQuery.java b/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/model/query/TableQuery.java similarity index 100% rename from continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/model/query/TableQuery.java rename to continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/model/query/TableQuery.java diff --git a/continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/model/req/GenConfigReq.java b/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/model/req/GenConfigReq.java similarity index 100% rename from continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/model/req/GenConfigReq.java rename to continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/model/req/GenConfigReq.java diff --git a/continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/model/resp/GeneratePreviewResp.java b/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/model/resp/GeneratePreviewResp.java similarity index 100% rename from continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/model/resp/GeneratePreviewResp.java rename to continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/model/resp/GeneratePreviewResp.java diff --git a/continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/model/resp/TableResp.java b/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/model/resp/TableResp.java similarity index 100% rename from continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/model/resp/TableResp.java rename to continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/model/resp/TableResp.java diff --git a/continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/service/GeneratorService.java b/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/service/GeneratorService.java similarity index 100% rename from continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/service/GeneratorService.java rename to continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/service/GeneratorService.java diff --git a/continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/service/impl/GeneratorServiceImpl.java b/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/service/impl/GeneratorServiceImpl.java similarity index 100% rename from continew-admin-plugins/continew-admin-generator/src/main/java/top/continew/admin/generator/service/impl/GeneratorServiceImpl.java rename to continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/service/impl/GeneratorServiceImpl.java diff --git a/continew-admin-plugins/continew-admin-generator/src/main/resources/templates/backend/Controller.ftl b/continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/Controller.ftl similarity index 100% rename from continew-admin-plugins/continew-admin-generator/src/main/resources/templates/backend/Controller.ftl rename to continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/Controller.ftl diff --git a/continew-admin-plugins/continew-admin-generator/src/main/resources/templates/backend/DetailResp.ftl b/continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/DetailResp.ftl similarity index 100% rename from continew-admin-plugins/continew-admin-generator/src/main/resources/templates/backend/DetailResp.ftl rename to continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/DetailResp.ftl diff --git a/continew-admin-plugins/continew-admin-generator/src/main/resources/templates/backend/Entity.ftl b/continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/Entity.ftl similarity index 100% rename from continew-admin-plugins/continew-admin-generator/src/main/resources/templates/backend/Entity.ftl rename to continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/Entity.ftl diff --git a/continew-admin-plugins/continew-admin-generator/src/main/resources/templates/backend/Mapper.ftl b/continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/Mapper.ftl similarity index 100% rename from continew-admin-plugins/continew-admin-generator/src/main/resources/templates/backend/Mapper.ftl rename to continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/Mapper.ftl diff --git a/continew-admin-plugins/continew-admin-generator/src/main/resources/templates/backend/Query.ftl b/continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/Query.ftl similarity index 100% rename from continew-admin-plugins/continew-admin-generator/src/main/resources/templates/backend/Query.ftl rename to continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/Query.ftl diff --git a/continew-admin-plugins/continew-admin-generator/src/main/resources/templates/backend/Req.ftl b/continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/Req.ftl similarity index 100% rename from continew-admin-plugins/continew-admin-generator/src/main/resources/templates/backend/Req.ftl rename to continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/Req.ftl diff --git a/continew-admin-plugins/continew-admin-generator/src/main/resources/templates/backend/Resp.ftl b/continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/Resp.ftl similarity index 100% rename from continew-admin-plugins/continew-admin-generator/src/main/resources/templates/backend/Resp.ftl rename to continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/Resp.ftl diff --git a/continew-admin-plugins/continew-admin-generator/src/main/resources/templates/backend/Service.ftl b/continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/Service.ftl similarity index 100% rename from continew-admin-plugins/continew-admin-generator/src/main/resources/templates/backend/Service.ftl rename to continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/Service.ftl diff --git a/continew-admin-plugins/continew-admin-generator/src/main/resources/templates/backend/ServiceImpl.ftl b/continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/ServiceImpl.ftl similarity index 100% rename from continew-admin-plugins/continew-admin-generator/src/main/resources/templates/backend/ServiceImpl.ftl rename to continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/ServiceImpl.ftl diff --git a/continew-admin-plugins/continew-admin-generator/src/main/resources/templates/frontend/AddModal.ftl b/continew-plugin/continew-plugin-generator/src/main/resources/templates/frontend/AddModal.ftl similarity index 100% rename from continew-admin-plugins/continew-admin-generator/src/main/resources/templates/frontend/AddModal.ftl rename to continew-plugin/continew-plugin-generator/src/main/resources/templates/frontend/AddModal.ftl diff --git a/continew-admin-plugins/continew-admin-generator/src/main/resources/templates/frontend/DetailDrawer.ftl b/continew-plugin/continew-plugin-generator/src/main/resources/templates/frontend/DetailDrawer.ftl similarity index 100% rename from continew-admin-plugins/continew-admin-generator/src/main/resources/templates/frontend/DetailDrawer.ftl rename to continew-plugin/continew-plugin-generator/src/main/resources/templates/frontend/DetailDrawer.ftl diff --git a/continew-admin-plugins/continew-admin-generator/src/main/resources/templates/frontend/api.ftl b/continew-plugin/continew-plugin-generator/src/main/resources/templates/frontend/api.ftl similarity index 100% rename from continew-admin-plugins/continew-admin-generator/src/main/resources/templates/frontend/api.ftl rename to continew-plugin/continew-plugin-generator/src/main/resources/templates/frontend/api.ftl diff --git a/continew-admin-plugins/continew-admin-generator/src/main/resources/templates/frontend/index.ftl b/continew-plugin/continew-plugin-generator/src/main/resources/templates/frontend/index.ftl similarity index 100% rename from continew-admin-plugins/continew-admin-generator/src/main/resources/templates/frontend/index.ftl rename to continew-plugin/continew-plugin-generator/src/main/resources/templates/frontend/index.ftl diff --git a/continew-admin-plugins/continew-admin-open/pom.xml b/continew-plugin/continew-plugin-open/pom.xml similarity index 83% rename from continew-admin-plugins/continew-admin-open/pom.xml rename to continew-plugin/continew-plugin-open/pom.xml index 4d03a9765..7a66db939 100644 --- a/continew-admin-plugins/continew-admin-open/pom.xml +++ b/continew-plugin/continew-plugin-open/pom.xml @@ -5,10 +5,10 @@ 4.0.0 top.continew - continew-admin-plugins + continew-plugin ${revision} - continew-admin-open + continew-plugin-open 能力开放插件（包括应用管理、API开放授权、API开发等） \ No newline at end of file diff --git a/continew-admin-plugins/continew-admin-open/src/main/java/top/continew/admin/open/handler/SaCheckPermissionHandler.java b/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/handler/SaCheckPermissionHandler.java similarity index 100% rename from continew-admin-plugins/continew-admin-open/src/main/java/top/continew/admin/open/handler/SaCheckPermissionHandler.java rename to continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/handler/SaCheckPermissionHandler.java diff --git a/continew-admin-plugins/continew-admin-open/src/main/java/top/continew/admin/open/mapper/AppMapper.java b/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/mapper/AppMapper.java similarity index 100% rename from continew-admin-plugins/continew-admin-open/src/main/java/top/continew/admin/open/mapper/AppMapper.java rename to continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/mapper/AppMapper.java diff --git a/continew-admin-plugins/continew-admin-open/src/main/java/top/continew/admin/open/model/entity/AppDO.java b/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/model/entity/AppDO.java similarity index 100% rename from continew-admin-plugins/continew-admin-open/src/main/java/top/continew/admin/open/model/entity/AppDO.java rename to continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/model/entity/AppDO.java diff --git a/continew-admin-plugins/continew-admin-open/src/main/java/top/continew/admin/open/model/query/AppQuery.java b/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/model/query/AppQuery.java similarity index 100% rename from continew-admin-plugins/continew-admin-open/src/main/java/top/continew/admin/open/model/query/AppQuery.java rename to continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/model/query/AppQuery.java diff --git a/continew-admin-plugins/continew-admin-open/src/main/java/top/continew/admin/open/model/req/AppReq.java b/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/model/req/AppReq.java similarity index 100% rename from continew-admin-plugins/continew-admin-open/src/main/java/top/continew/admin/open/model/req/AppReq.java rename to continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/model/req/AppReq.java diff --git a/continew-admin-plugins/continew-admin-open/src/main/java/top/continew/admin/open/model/resp/AppDetailResp.java b/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/model/resp/AppDetailResp.java similarity index 100% rename from continew-admin-plugins/continew-admin-open/src/main/java/top/continew/admin/open/model/resp/AppDetailResp.java rename to continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/model/resp/AppDetailResp.java diff --git a/continew-admin-plugins/continew-admin-open/src/main/java/top/continew/admin/open/model/resp/AppResp.java b/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/model/resp/AppResp.java similarity index 100% rename from continew-admin-plugins/continew-admin-open/src/main/java/top/continew/admin/open/model/resp/AppResp.java rename to continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/model/resp/AppResp.java diff --git a/continew-admin-plugins/continew-admin-open/src/main/java/top/continew/admin/open/model/resp/AppSecretGetResp.java b/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/model/resp/AppSecretGetResp.java similarity index 100% rename from continew-admin-plugins/continew-admin-open/src/main/java/top/continew/admin/open/model/resp/AppSecretGetResp.java rename to continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/model/resp/AppSecretGetResp.java diff --git a/continew-admin-plugins/continew-admin-open/src/main/java/top/continew/admin/open/service/AppService.java b/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/service/AppService.java similarity index 100% rename from continew-admin-plugins/continew-admin-open/src/main/java/top/continew/admin/open/service/AppService.java rename to continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/service/AppService.java diff --git a/continew-admin-plugins/continew-admin-open/src/main/java/top/continew/admin/open/service/impl/AppServiceImpl.java b/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/service/impl/AppServiceImpl.java similarity index 100% rename from continew-admin-plugins/continew-admin-open/src/main/java/top/continew/admin/open/service/impl/AppServiceImpl.java rename to continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/service/impl/AppServiceImpl.java diff --git a/continew-admin-plugins/continew-admin-open/src/main/java/top/continew/admin/open/sign/OpenSignTemplate.java b/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/sign/OpenSignTemplate.java similarity index 100% rename from continew-admin-plugins/continew-admin-open/src/main/java/top/continew/admin/open/sign/OpenSignTemplate.java rename to continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/sign/OpenSignTemplate.java diff --git a/continew-admin-plugins/continew-admin-open/src/main/java/top/continew/admin/open/util/ApiSignCheckUtils.java b/continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/util/ApiSignCheckUtils.java similarity index 100% rename from continew-admin-plugins/continew-admin-open/src/main/java/top/continew/admin/open/util/ApiSignCheckUtils.java rename to continew-plugin/continew-plugin-open/src/main/java/top/continew/admin/open/util/ApiSignCheckUtils.java diff --git a/continew-admin-plugins/continew-admin-job/pom.xml b/continew-plugin/continew-plugin-schedule/pom.xml similarity index 93% rename from continew-admin-plugins/continew-admin-job/pom.xml rename to continew-plugin/continew-plugin-schedule/pom.xml index cc5f8923b..b46fd66f8 100644 --- a/continew-admin-plugins/continew-admin-job/pom.xml +++ b/continew-plugin/continew-plugin-schedule/pom.xml @@ -3,11 +3,11 @@ 4.0.0 top.continew - continew-admin-plugins + continew-plugin ${revision} - continew-admin-job + continew-plugin-schedule 任务调度插件 diff --git a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/api/JobApi.java b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/api/JobApi.java similarity index 92% rename from continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/api/JobApi.java rename to continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/api/JobApi.java index 6498c2a17..86bb143ed 100644 --- a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/api/JobApi.java +++ b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/api/JobApi.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.job.api; +package top.continew.admin.schedule.api; import com.aizuda.snailjob.common.core.model.Result; import org.springframework.http.MediaType; @@ -23,10 +23,10 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.service.annotation.*; -import top.continew.admin.job.model.JobPageResult; -import top.continew.admin.job.model.req.JobReq; -import top.continew.admin.job.model.req.JobStatusReq; -import top.continew.admin.job.model.resp.JobResp; +import top.continew.admin.schedule.model.JobPageResult; +import top.continew.admin.schedule.model.req.JobReq; +import top.continew.admin.schedule.model.req.JobStatusReq; +import top.continew.admin.schedule.model.resp.JobResp; import java.util.List; import java.util.Set; diff --git a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/api/JobBatchApi.java b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/api/JobBatchApi.java similarity index 94% rename from continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/api/JobBatchApi.java rename to continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/api/JobBatchApi.java index 4f8ca6bcf..3d3f58f2b 100644 --- a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/api/JobBatchApi.java +++ b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/api/JobBatchApi.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.job.api; +package top.continew.admin.schedule.api; import com.aizuda.snailjob.common.core.model.Result; import org.springframework.http.MediaType; @@ -24,10 +24,10 @@ import org.springframework.web.service.annotation.GetExchange; import org.springframework.web.service.annotation.HttpExchange; import org.springframework.web.service.annotation.PostExchange; -import top.continew.admin.job.model.JobInstanceLogPageResult; -import top.continew.admin.job.model.JobPageResult; -import top.continew.admin.job.model.resp.JobInstanceResp; -import top.continew.admin.job.model.resp.JobLogResp; +import top.continew.admin.schedule.model.JobInstanceLogPageResult; +import top.continew.admin.schedule.model.JobPageResult; +import top.continew.admin.schedule.model.resp.JobInstanceResp; +import top.continew.admin.schedule.model.resp.JobLogResp; import java.util.List; diff --git a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/api/JobClient.java b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/api/JobClient.java similarity index 97% rename from continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/api/JobClient.java rename to continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/api/JobClient.java index 8a4511049..9592ac576 100644 --- a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/api/JobClient.java +++ b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/api/JobClient.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.job.api; +package top.continew.admin.schedule.api; import cn.hutool.core.convert.Convert; import cn.hutool.core.date.DateUtil; @@ -32,8 +32,8 @@ import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.springframework.http.ResponseEntity; -import top.continew.admin.job.constant.JobConstants; -import top.continew.admin.job.model.JobPageResult; +import top.continew.admin.schedule.constant.JobConstants; +import top.continew.admin.schedule.model.JobPageResult; import top.continew.starter.cache.redisson.util.RedisUtils; import top.continew.starter.extension.crud.model.resp.PageResp; diff --git a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/config/HttpExchangeConfiguration.java b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/config/HttpExchangeConfiguration.java similarity index 95% rename from continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/config/HttpExchangeConfiguration.java rename to continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/config/HttpExchangeConfiguration.java index dfb1ffcb4..1b8f1035c 100644 --- a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/config/HttpExchangeConfiguration.java +++ b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/config/HttpExchangeConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.job.config; +package top.continew.admin.schedule.config; import com.fasterxml.jackson.databind.ObjectMapper; import io.netty.channel.ChannelOption; @@ -36,10 +36,10 @@ import org.springframework.web.service.invoker.HttpServiceProxyFactory; import reactor.core.publisher.Mono; import reactor.netty.http.client.HttpClient; -import top.continew.admin.job.api.JobApi; -import top.continew.admin.job.api.JobBatchApi; -import top.continew.admin.job.api.JobClient; -import top.continew.admin.job.constant.JobConstants; +import top.continew.admin.schedule.api.JobApi; +import top.continew.admin.schedule.api.JobBatchApi; +import top.continew.admin.schedule.api.JobClient; +import top.continew.admin.schedule.constant.JobConstants; /** * HTTP Exchange 配置 diff --git a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/config/SnailJobConfiguration.java b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/config/SnailJobConfiguration.java similarity index 97% rename from continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/config/SnailJobConfiguration.java rename to continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/config/SnailJobConfiguration.java index d61020e3c..c9bc2083c 100644 --- a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/config/SnailJobConfiguration.java +++ b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/config/SnailJobConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.job.config; +package top.continew.admin.schedule.config; import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.LoggerContext; diff --git a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/constant/JobConstants.java b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/constant/JobConstants.java similarity index 95% rename from continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/constant/JobConstants.java rename to continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/constant/JobConstants.java index ec6443340..b00bc9b31 100644 --- a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/constant/JobConstants.java +++ b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/constant/JobConstants.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.job.constant; +package top.continew.admin.schedule.constant; /** * 任务调度常量 diff --git a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobBlockStrategyEnum.java b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/enums/JobBlockStrategyEnum.java similarity index 96% rename from continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobBlockStrategyEnum.java rename to continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/enums/JobBlockStrategyEnum.java index d9728581e..6ce956c9e 100644 --- a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobBlockStrategyEnum.java +++ b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/enums/JobBlockStrategyEnum.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.job.enums; +package top.continew.admin.schedule.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobExecuteReasonEnum.java b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/enums/JobExecuteReasonEnum.java similarity index 98% rename from continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobExecuteReasonEnum.java rename to continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/enums/JobExecuteReasonEnum.java index 52ab7c7df..fbf0ba356 100644 --- a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobExecuteReasonEnum.java +++ b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/enums/JobExecuteReasonEnum.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.job.enums; +package top.continew.admin.schedule.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobExecuteStatusEnum.java b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/enums/JobExecuteStatusEnum.java similarity index 97% rename from continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobExecuteStatusEnum.java rename to continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/enums/JobExecuteStatusEnum.java index c30d1b90d..0e2d5a2be 100644 --- a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobExecuteStatusEnum.java +++ b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/enums/JobExecuteStatusEnum.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.job.enums; +package top.continew.admin.schedule.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobRouteStrategyEnum.java b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/enums/JobRouteStrategyEnum.java similarity index 96% rename from continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobRouteStrategyEnum.java rename to continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/enums/JobRouteStrategyEnum.java index 5333cb363..b505b3ef7 100644 --- a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobRouteStrategyEnum.java +++ b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/enums/JobRouteStrategyEnum.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.job.enums; +package top.continew.admin.schedule.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobStatusEnum.java b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/enums/JobStatusEnum.java similarity index 96% rename from continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobStatusEnum.java rename to continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/enums/JobStatusEnum.java index f6cbfba88..2d9e71ad1 100644 --- a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobStatusEnum.java +++ b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/enums/JobStatusEnum.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.job.enums; +package top.continew.admin.schedule.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobTaskTypeEnum.java b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/enums/JobTaskTypeEnum.java similarity index 96% rename from continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobTaskTypeEnum.java rename to continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/enums/JobTaskTypeEnum.java index 3e3a9f948..66a1f9983 100644 --- a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobTaskTypeEnum.java +++ b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/enums/JobTaskTypeEnum.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.job.enums; +package top.continew.admin.schedule.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobTriggerTypeEnum.java b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/enums/JobTriggerTypeEnum.java similarity index 96% rename from continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobTriggerTypeEnum.java rename to continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/enums/JobTriggerTypeEnum.java index 375ced712..37ebd2fce 100644 --- a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/enums/JobTriggerTypeEnum.java +++ b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/enums/JobTriggerTypeEnum.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.job.enums; +package top.continew.admin.schedule.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/model/JobInstanceLogPageResult.java b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/model/JobInstanceLogPageResult.java similarity index 97% rename from continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/model/JobInstanceLogPageResult.java rename to continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/model/JobInstanceLogPageResult.java index 6a4983abd..c0ee56dbf 100644 --- a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/model/JobInstanceLogPageResult.java +++ b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/model/JobInstanceLogPageResult.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.job.model; +package top.continew.admin.schedule.model; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/model/JobPageResult.java b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/model/JobPageResult.java similarity index 96% rename from continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/model/JobPageResult.java rename to continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/model/JobPageResult.java index 4cd3b2ff0..6b8c83bd4 100644 --- a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/model/JobPageResult.java +++ b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/model/JobPageResult.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.job.model; +package top.continew.admin.schedule.model; import com.aizuda.snailjob.common.core.model.Result; import lombok.Data; diff --git a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/model/query/JobInstanceLogQuery.java b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/model/query/JobInstanceLogQuery.java similarity index 97% rename from continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/model/query/JobInstanceLogQuery.java rename to continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/model/query/JobInstanceLogQuery.java index eb4e4d6fb..41a6c726c 100644 --- a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/model/query/JobInstanceLogQuery.java +++ b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/model/query/JobInstanceLogQuery.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.job.model.query; +package top.continew.admin.schedule.model.query; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Min; diff --git a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/model/query/JobInstanceQuery.java b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/model/query/JobInstanceQuery.java similarity index 96% rename from continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/model/query/JobInstanceQuery.java rename to continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/model/query/JobInstanceQuery.java index 4529e1109..39768bf0e 100644 --- a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/model/query/JobInstanceQuery.java +++ b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/model/query/JobInstanceQuery.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.job.model.query; +package top.continew.admin.schedule.model.query; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/model/query/JobLogQuery.java b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/model/query/JobLogQuery.java similarity index 95% rename from continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/model/query/JobLogQuery.java rename to continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/model/query/JobLogQuery.java index 0771e234a..8fabe6d70 100644 --- a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/model/query/JobLogQuery.java +++ b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/model/query/JobLogQuery.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.job.model.query; +package top.continew.admin.schedule.model.query; import cn.hutool.core.date.DatePattern; import io.swagger.v3.oas.annotations.media.Schema; @@ -23,7 +23,7 @@ import lombok.Data; import org.hibernate.validator.constraints.Range; import org.springframework.format.annotation.DateTimeFormat; -import top.continew.admin.job.enums.JobExecuteStatusEnum; +import top.continew.admin.schedule.enums.JobExecuteStatusEnum; import java.io.Serial; import java.io.Serializable; diff --git a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/model/query/JobQuery.java b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/model/query/JobQuery.java similarity index 94% rename from continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/model/query/JobQuery.java rename to continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/model/query/JobQuery.java index eff1daa32..3fb1993ef 100644 --- a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/model/query/JobQuery.java +++ b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/model/query/JobQuery.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package top.continew.admin.job.model.query; +package top.continew.admin.schedule.model.query; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.Min; import lombok.Data; import org.hibernate.validator.constraints.Range; -import top.continew.admin.job.enums.JobStatusEnum; +import top.continew.admin.schedule.enums.JobStatusEnum; import java.io.Serial; import java.io.Serializable; diff --git a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/model/req/JobReq.java b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/model/req/JobReq.java similarity index 97% rename from continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/model/req/JobReq.java rename to continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/model/req/JobReq.java index 88f099cc0..0dad56e9b 100644 --- a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/model/req/JobReq.java +++ b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/model/req/JobReq.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package top.continew.admin.job.model.req; +package top.continew.admin.schedule.model.req; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Data; import org.hibernate.validator.constraints.Length; -import top.continew.admin.job.enums.*; +import top.continew.admin.schedule.enums.*; import java.io.Serial; import java.io.Serializable; diff --git a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/model/req/JobStatusReq.java b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/model/req/JobStatusReq.java similarity index 92% rename from continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/model/req/JobStatusReq.java rename to continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/model/req/JobStatusReq.java index b55491bfa..600190a0c 100644 --- a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/model/req/JobStatusReq.java +++ b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/model/req/JobStatusReq.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package top.continew.admin.job.model.req; +package top.continew.admin.schedule.model.req; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; import lombok.Data; -import top.continew.admin.job.enums.JobStatusEnum; +import top.continew.admin.schedule.enums.JobStatusEnum; import java.io.Serial; import java.io.Serializable; diff --git a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/model/resp/JobInstanceResp.java b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/model/resp/JobInstanceResp.java similarity index 97% rename from continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/model/resp/JobInstanceResp.java rename to continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/model/resp/JobInstanceResp.java index 07a606bd7..1e6eb3c71 100644 --- a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/model/resp/JobInstanceResp.java +++ b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/model/resp/JobInstanceResp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.continew.admin.job.model.resp; +package top.continew.admin.schedule.model.resp; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/model/resp/JobLogResp.java b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/model/resp/JobLogResp.java similarity index 93% rename from continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/model/resp/JobLogResp.java rename to continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/model/resp/JobLogResp.java index 3a578ad50..ab77ddc1b 100644 --- a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/model/resp/JobLogResp.java +++ b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/model/resp/JobLogResp.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package top.continew.admin.job.model.resp; +package top.continew.admin.schedule.model.resp; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.continew.admin.job.enums.JobExecuteReasonEnum; -import top.continew.admin.job.enums.JobExecuteStatusEnum; +import top.continew.admin.schedule.enums.JobExecuteReasonEnum; +import top.continew.admin.schedule.enums.JobExecuteStatusEnum; import java.io.Serial; import java.io.Serializable; diff --git a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/model/resp/JobResp.java b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/model/resp/JobResp.java similarity index 97% rename from continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/model/resp/JobResp.java rename to continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/model/resp/JobResp.java index 0d96f0f53..58c0765d5 100644 --- a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/model/resp/JobResp.java +++ b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/model/resp/JobResp.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package top.continew.admin.job.model.resp; +package top.continew.admin.schedule.model.resp; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import top.continew.admin.job.enums.*; +import top.continew.admin.schedule.enums.*; import java.io.Serial; import java.io.Serializable; diff --git a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/service/JobLogService.java b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/service/JobLogService.java similarity index 79% rename from continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/service/JobLogService.java rename to continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/service/JobLogService.java index 67a0b86c1..9a1b63e22 100644 --- a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/service/JobLogService.java +++ b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/service/JobLogService.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package top.continew.admin.job.service; +package top.continew.admin.schedule.service; -import top.continew.admin.job.model.JobInstanceLogPageResult; -import top.continew.admin.job.model.query.JobInstanceLogQuery; -import top.continew.admin.job.model.query.JobLogQuery; -import top.continew.admin.job.model.query.JobInstanceQuery; -import top.continew.admin.job.model.resp.JobLogResp; -import top.continew.admin.job.model.resp.JobInstanceResp; +import top.continew.admin.schedule.model.JobInstanceLogPageResult; +import top.continew.admin.schedule.model.query.JobInstanceLogQuery; +import top.continew.admin.schedule.model.query.JobLogQuery; +import top.continew.admin.schedule.model.query.JobInstanceQuery; +import top.continew.admin.schedule.model.resp.JobLogResp; +import top.continew.admin.schedule.model.resp.JobInstanceResp; import top.continew.starter.extension.crud.model.resp.PageResp; import java.util.List; diff --git a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/service/JobService.java b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/service/JobService.java similarity index 87% rename from continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/service/JobService.java rename to continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/service/JobService.java index af3e989ed..b485d331b 100644 --- a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/service/JobService.java +++ b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/service/JobService.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package top.continew.admin.job.service; +package top.continew.admin.schedule.service; -import top.continew.admin.job.model.query.JobQuery; -import top.continew.admin.job.model.req.JobReq; -import top.continew.admin.job.model.req.JobStatusReq; -import top.continew.admin.job.model.resp.JobResp; +import top.continew.admin.schedule.model.query.JobQuery; +import top.continew.admin.schedule.model.req.JobReq; +import top.continew.admin.schedule.model.req.JobStatusReq; +import top.continew.admin.schedule.model.resp.JobResp; import top.continew.starter.extension.crud.model.resp.PageResp; import java.util.List; diff --git a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/service/impl/JobLogServiceImpl.java b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/service/impl/JobLogServiceImpl.java similarity index 81% rename from continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/service/impl/JobLogServiceImpl.java rename to continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/service/impl/JobLogServiceImpl.java index 066c2d172..ab4c8939b 100644 --- a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/service/impl/JobLogServiceImpl.java +++ b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/service/impl/JobLogServiceImpl.java @@ -14,21 +14,21 @@ * limitations under the License. */ -package top.continew.admin.job.service.impl; +package top.continew.admin.schedule.service.impl; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import top.continew.admin.job.api.JobBatchApi; -import top.continew.admin.job.api.JobClient; -import top.continew.admin.job.model.JobInstanceLogPageResult; -import top.continew.admin.job.model.query.JobInstanceLogQuery; -import top.continew.admin.job.model.query.JobInstanceQuery; -import top.continew.admin.job.model.query.JobLogQuery; -import top.continew.admin.job.model.resp.JobInstanceResp; -import top.continew.admin.job.model.resp.JobLogResp; -import top.continew.admin.job.service.JobLogService; +import top.continew.admin.schedule.api.JobBatchApi; +import top.continew.admin.schedule.api.JobClient; +import top.continew.admin.schedule.model.JobInstanceLogPageResult; +import top.continew.admin.schedule.model.query.JobInstanceLogQuery; +import top.continew.admin.schedule.model.query.JobInstanceQuery; +import top.continew.admin.schedule.model.query.JobLogQuery; +import top.continew.admin.schedule.model.resp.JobInstanceResp; +import top.continew.admin.schedule.model.resp.JobLogResp; +import top.continew.admin.schedule.service.JobLogService; import top.continew.starter.extension.crud.model.resp.PageResp; import java.time.LocalDateTime; diff --git a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/service/impl/JobServiceImpl.java b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/service/impl/JobServiceImpl.java similarity index 84% rename from continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/service/impl/JobServiceImpl.java rename to continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/service/impl/JobServiceImpl.java index ffb429bcb..e8b77bc93 100644 --- a/continew-admin-plugins/continew-admin-job/src/main/java/top/continew/admin/job/service/impl/JobServiceImpl.java +++ b/continew-plugin/continew-plugin-schedule/src/main/java/top/continew/admin/schedule/service/impl/JobServiceImpl.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package top.continew.admin.job.service.impl; +package top.continew.admin.schedule.service.impl; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import top.continew.admin.job.api.JobApi; -import top.continew.admin.job.api.JobClient; -import top.continew.admin.job.model.query.JobQuery; -import top.continew.admin.job.model.req.JobReq; -import top.continew.admin.job.model.req.JobStatusReq; -import top.continew.admin.job.model.resp.JobResp; -import top.continew.admin.job.service.JobService; +import top.continew.admin.schedule.api.JobApi; +import top.continew.admin.schedule.api.JobClient; +import top.continew.admin.schedule.model.query.JobQuery; +import top.continew.admin.schedule.model.req.JobReq; +import top.continew.admin.schedule.model.req.JobStatusReq; +import top.continew.admin.schedule.model.resp.JobResp; +import top.continew.admin.schedule.service.JobService; import top.continew.starter.extension.crud.model.resp.PageResp; import java.util.Collections; diff --git a/continew-admin-plugins/pom.xml b/continew-plugin/pom.xml similarity index 76% rename from continew-admin-plugins/pom.xml rename to continew-plugin/pom.xml index f5f747589..836e1430b 100644 --- a/continew-admin-plugins/pom.xml +++ b/continew-plugin/pom.xml @@ -9,21 +9,21 @@ ${revision} - continew-admin-plugins + continew-plugin pom 插件模块（存放代码生成、任务调度等扩展模块） - continew-admin-job - continew-admin-open - continew-admin-generator + continew-plugin-schedule + continew-plugin-open + continew-plugin-generator top.continew - continew-admin-common + continew-common \ No newline at end of file diff --git a/continew-admin-webapi/pom.xml b/continew-webapi/pom.xml similarity index 94% rename from continew-admin-webapi/pom.xml rename to continew-webapi/pom.xml index 01b837dbb..1677302c8 100644 --- a/continew-admin-webapi/pom.xml +++ b/continew-webapi/pom.xml @@ -9,7 +9,7 @@ ${revision} - continew-admin-webapi + continew-webapi API 及打包部署模块 @@ -34,26 +34,26 @@ top.continew - continew-admin-system + continew-module-system top.continew - continew-admin-job + continew-plugin-schedule ${revision} - + top.continew - continew-admin-generator + continew-plugin-open - + top.continew - continew-admin-open + continew-plugin-generator diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/ContiNewAdminApplication.java b/continew-webapi/src/main/java/top/continew/admin/ContiNewAdminApplication.java similarity index 100% rename from continew-admin-webapi/src/main/java/top/continew/admin/ContiNewAdminApplication.java rename to continew-webapi/src/main/java/top/continew/admin/ContiNewAdminApplication.java diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/config/log/LogConfiguration.java b/continew-webapi/src/main/java/top/continew/admin/config/log/LogConfiguration.java similarity index 100% rename from continew-admin-webapi/src/main/java/top/continew/admin/config/log/LogConfiguration.java rename to continew-webapi/src/main/java/top/continew/admin/config/log/LogConfiguration.java diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/config/log/LogDaoLocalImpl.java b/continew-webapi/src/main/java/top/continew/admin/config/log/LogDaoLocalImpl.java similarity index 100% rename from continew-admin-webapi/src/main/java/top/continew/admin/config/log/LogDaoLocalImpl.java rename to continew-webapi/src/main/java/top/continew/admin/config/log/LogDaoLocalImpl.java diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/config/satoken/LoginPasswordProperties.java b/continew-webapi/src/main/java/top/continew/admin/config/satoken/LoginPasswordProperties.java similarity index 100% rename from continew-admin-webapi/src/main/java/top/continew/admin/config/satoken/LoginPasswordProperties.java rename to continew-webapi/src/main/java/top/continew/admin/config/satoken/LoginPasswordProperties.java diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/config/satoken/SaExtensionInterceptor.java b/continew-webapi/src/main/java/top/continew/admin/config/satoken/SaExtensionInterceptor.java similarity index 100% rename from continew-admin-webapi/src/main/java/top/continew/admin/config/satoken/SaExtensionInterceptor.java rename to continew-webapi/src/main/java/top/continew/admin/config/satoken/SaExtensionInterceptor.java diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/config/satoken/SaTokenConfiguration.java b/continew-webapi/src/main/java/top/continew/admin/config/satoken/SaTokenConfiguration.java similarity index 100% rename from continew-admin-webapi/src/main/java/top/continew/admin/config/satoken/SaTokenConfiguration.java rename to continew-webapi/src/main/java/top/continew/admin/config/satoken/SaTokenConfiguration.java diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/config/satoken/SaTokenPermissionImpl.java b/continew-webapi/src/main/java/top/continew/admin/config/satoken/SaTokenPermissionImpl.java similarity index 100% rename from continew-admin-webapi/src/main/java/top/continew/admin/config/satoken/SaTokenPermissionImpl.java rename to continew-webapi/src/main/java/top/continew/admin/config/satoken/SaTokenPermissionImpl.java diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/controller/auth/AuthController.java b/continew-webapi/src/main/java/top/continew/admin/controller/auth/AuthController.java similarity index 100% rename from continew-admin-webapi/src/main/java/top/continew/admin/controller/auth/AuthController.java rename to continew-webapi/src/main/java/top/continew/admin/controller/auth/AuthController.java diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/controller/auth/SocialAuthController.java b/continew-webapi/src/main/java/top/continew/admin/controller/auth/SocialAuthController.java similarity index 100% rename from continew-admin-webapi/src/main/java/top/continew/admin/controller/auth/SocialAuthController.java rename to continew-webapi/src/main/java/top/continew/admin/controller/auth/SocialAuthController.java diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/controller/common/CaptchaController.java b/continew-webapi/src/main/java/top/continew/admin/controller/common/CaptchaController.java similarity index 100% rename from continew-admin-webapi/src/main/java/top/continew/admin/controller/common/CaptchaController.java rename to continew-webapi/src/main/java/top/continew/admin/controller/common/CaptchaController.java diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/controller/common/CommonController.java b/continew-webapi/src/main/java/top/continew/admin/controller/common/CommonController.java similarity index 100% rename from continew-admin-webapi/src/main/java/top/continew/admin/controller/common/CommonController.java rename to continew-webapi/src/main/java/top/continew/admin/controller/common/CommonController.java diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/controller/common/DashboardController.java b/continew-webapi/src/main/java/top/continew/admin/controller/common/DashboardController.java similarity index 100% rename from continew-admin-webapi/src/main/java/top/continew/admin/controller/common/DashboardController.java rename to continew-webapi/src/main/java/top/continew/admin/controller/common/DashboardController.java diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/controller/monitor/OnlineUserController.java b/continew-webapi/src/main/java/top/continew/admin/controller/monitor/OnlineUserController.java similarity index 100% rename from continew-admin-webapi/src/main/java/top/continew/admin/controller/monitor/OnlineUserController.java rename to continew-webapi/src/main/java/top/continew/admin/controller/monitor/OnlineUserController.java diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/controller/open/AppController.java b/continew-webapi/src/main/java/top/continew/admin/controller/open/AppController.java similarity index 100% rename from continew-admin-webapi/src/main/java/top/continew/admin/controller/open/AppController.java rename to continew-webapi/src/main/java/top/continew/admin/controller/open/AppController.java diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/controller/schedule/DemoEnvironmentJob.java b/continew-webapi/src/main/java/top/continew/admin/controller/schedule/DemoEnvironmentJob.java similarity index 100% rename from continew-admin-webapi/src/main/java/top/continew/admin/controller/schedule/DemoEnvironmentJob.java rename to continew-webapi/src/main/java/top/continew/admin/controller/schedule/DemoEnvironmentJob.java diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/controller/schedule/JobController.java b/continew-webapi/src/main/java/top/continew/admin/controller/schedule/JobController.java similarity index 92% rename from continew-admin-webapi/src/main/java/top/continew/admin/controller/schedule/JobController.java rename to continew-webapi/src/main/java/top/continew/admin/controller/schedule/JobController.java index 4b9edec72..ee9b0a3af 100644 --- a/continew-admin-webapi/src/main/java/top/continew/admin/controller/schedule/JobController.java +++ b/continew-webapi/src/main/java/top/continew/admin/controller/schedule/JobController.java @@ -24,11 +24,11 @@ import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import top.continew.admin.job.model.query.JobQuery; -import top.continew.admin.job.model.req.JobReq; -import top.continew.admin.job.model.req.JobStatusReq; -import top.continew.admin.job.model.resp.JobResp; -import top.continew.admin.job.service.JobService; +import top.continew.admin.schedule.model.query.JobQuery; +import top.continew.admin.schedule.model.req.JobReq; +import top.continew.admin.schedule.model.req.JobStatusReq; +import top.continew.admin.schedule.model.resp.JobResp; +import top.continew.admin.schedule.service.JobService; import top.continew.starter.extension.crud.model.resp.PageResp; import top.continew.starter.extension.crud.util.ValidateGroup; import top.continew.starter.log.core.annotation.Log; diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/controller/schedule/JobLogController.java b/continew-webapi/src/main/java/top/continew/admin/controller/schedule/JobLogController.java similarity index 87% rename from continew-admin-webapi/src/main/java/top/continew/admin/controller/schedule/JobLogController.java rename to continew-webapi/src/main/java/top/continew/admin/controller/schedule/JobLogController.java index 0307e55cb..826f6fe4c 100644 --- a/continew-admin-webapi/src/main/java/top/continew/admin/controller/schedule/JobLogController.java +++ b/continew-webapi/src/main/java/top/continew/admin/controller/schedule/JobLogController.java @@ -24,13 +24,13 @@ import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import top.continew.admin.job.model.JobInstanceLogPageResult; -import top.continew.admin.job.model.query.JobInstanceLogQuery; -import top.continew.admin.job.model.query.JobLogQuery; -import top.continew.admin.job.model.query.JobInstanceQuery; -import top.continew.admin.job.model.resp.JobLogResp; -import top.continew.admin.job.model.resp.JobInstanceResp; -import top.continew.admin.job.service.JobLogService; +import top.continew.admin.schedule.model.JobInstanceLogPageResult; +import top.continew.admin.schedule.model.query.JobInstanceLogQuery; +import top.continew.admin.schedule.model.query.JobLogQuery; +import top.continew.admin.schedule.model.query.JobInstanceQuery; +import top.continew.admin.schedule.model.resp.JobLogResp; +import top.continew.admin.schedule.model.resp.JobInstanceResp; +import top.continew.admin.schedule.service.JobLogService; import top.continew.starter.extension.crud.model.resp.PageResp; import java.util.List; diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/controller/system/DeptController.java b/continew-webapi/src/main/java/top/continew/admin/controller/system/DeptController.java similarity index 100% rename from continew-admin-webapi/src/main/java/top/continew/admin/controller/system/DeptController.java rename to continew-webapi/src/main/java/top/continew/admin/controller/system/DeptController.java diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/controller/system/DictController.java b/continew-webapi/src/main/java/top/continew/admin/controller/system/DictController.java similarity index 100% rename from continew-admin-webapi/src/main/java/top/continew/admin/controller/system/DictController.java rename to continew-webapi/src/main/java/top/continew/admin/controller/system/DictController.java diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/controller/system/DictItemController.java b/continew-webapi/src/main/java/top/continew/admin/controller/system/DictItemController.java similarity index 100% rename from continew-admin-webapi/src/main/java/top/continew/admin/controller/system/DictItemController.java rename to continew-webapi/src/main/java/top/continew/admin/controller/system/DictItemController.java diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/controller/system/FileController.java b/continew-webapi/src/main/java/top/continew/admin/controller/system/FileController.java similarity index 100% rename from continew-admin-webapi/src/main/java/top/continew/admin/controller/system/FileController.java rename to continew-webapi/src/main/java/top/continew/admin/controller/system/FileController.java diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/controller/system/LogController.java b/continew-webapi/src/main/java/top/continew/admin/controller/system/LogController.java similarity index 100% rename from continew-admin-webapi/src/main/java/top/continew/admin/controller/system/LogController.java rename to continew-webapi/src/main/java/top/continew/admin/controller/system/LogController.java diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/controller/system/MenuController.java b/continew-webapi/src/main/java/top/continew/admin/controller/system/MenuController.java similarity index 100% rename from continew-admin-webapi/src/main/java/top/continew/admin/controller/system/MenuController.java rename to continew-webapi/src/main/java/top/continew/admin/controller/system/MenuController.java diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/controller/system/MessageController.java b/continew-webapi/src/main/java/top/continew/admin/controller/system/MessageController.java similarity index 100% rename from continew-admin-webapi/src/main/java/top/continew/admin/controller/system/MessageController.java rename to continew-webapi/src/main/java/top/continew/admin/controller/system/MessageController.java diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/controller/system/NoticeController.java b/continew-webapi/src/main/java/top/continew/admin/controller/system/NoticeController.java similarity index 100% rename from continew-admin-webapi/src/main/java/top/continew/admin/controller/system/NoticeController.java rename to continew-webapi/src/main/java/top/continew/admin/controller/system/NoticeController.java diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/controller/system/OptionController.java b/continew-webapi/src/main/java/top/continew/admin/controller/system/OptionController.java similarity index 100% rename from continew-admin-webapi/src/main/java/top/continew/admin/controller/system/OptionController.java rename to continew-webapi/src/main/java/top/continew/admin/controller/system/OptionController.java diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/controller/system/RoleController.java b/continew-webapi/src/main/java/top/continew/admin/controller/system/RoleController.java similarity index 100% rename from continew-admin-webapi/src/main/java/top/continew/admin/controller/system/RoleController.java rename to continew-webapi/src/main/java/top/continew/admin/controller/system/RoleController.java diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/controller/system/StorageController.java b/continew-webapi/src/main/java/top/continew/admin/controller/system/StorageController.java similarity index 100% rename from continew-admin-webapi/src/main/java/top/continew/admin/controller/system/StorageController.java rename to continew-webapi/src/main/java/top/continew/admin/controller/system/StorageController.java diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/controller/system/UserCenterController.java b/continew-webapi/src/main/java/top/continew/admin/controller/system/UserCenterController.java similarity index 100% rename from continew-admin-webapi/src/main/java/top/continew/admin/controller/system/UserCenterController.java rename to continew-webapi/src/main/java/top/continew/admin/controller/system/UserCenterController.java diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/controller/system/UserController.java b/continew-webapi/src/main/java/top/continew/admin/controller/system/UserController.java similarity index 100% rename from continew-admin-webapi/src/main/java/top/continew/admin/controller/system/UserController.java rename to continew-webapi/src/main/java/top/continew/admin/controller/system/UserController.java diff --git a/continew-admin-webapi/src/main/java/top/continew/admin/controller/tool/GeneratorController.java b/continew-webapi/src/main/java/top/continew/admin/controller/tool/GeneratorController.java similarity index 100% rename from continew-admin-webapi/src/main/java/top/continew/admin/controller/tool/GeneratorController.java rename to continew-webapi/src/main/java/top/continew/admin/controller/tool/GeneratorController.java diff --git a/continew-admin-webapi/src/main/resources/banner.txt b/continew-webapi/src/main/resources/banner.txt similarity index 100% rename from continew-admin-webapi/src/main/resources/banner.txt rename to continew-webapi/src/main/resources/banner.txt diff --git a/continew-admin-webapi/src/main/resources/config/application-dev.yml b/continew-webapi/src/main/resources/config/application-dev.yml similarity index 100% rename from continew-admin-webapi/src/main/resources/config/application-dev.yml rename to continew-webapi/src/main/resources/config/application-dev.yml diff --git a/continew-admin-webapi/src/main/resources/config/application-generator.yml b/continew-webapi/src/main/resources/config/application-generator.yml similarity index 100% rename from continew-admin-webapi/src/main/resources/config/application-generator.yml rename to continew-webapi/src/main/resources/config/application-generator.yml diff --git a/continew-admin-webapi/src/main/resources/config/application-prod.yml b/continew-webapi/src/main/resources/config/application-prod.yml similarity index 100% rename from continew-admin-webapi/src/main/resources/config/application-prod.yml rename to continew-webapi/src/main/resources/config/application-prod.yml diff --git a/continew-admin-webapi/src/main/resources/config/application.yml b/continew-webapi/src/main/resources/config/application.yml similarity index 100% rename from continew-admin-webapi/src/main/resources/config/application.yml rename to continew-webapi/src/main/resources/config/application.yml diff --git a/continew-admin-webapi/src/main/resources/db/changelog/db.changelog-master.yaml b/continew-webapi/src/main/resources/db/changelog/db.changelog-master.yaml similarity index 57% rename from continew-admin-webapi/src/main/resources/db/changelog/db.changelog-master.yaml rename to continew-webapi/src/main/resources/db/changelog/db.changelog-master.yaml index d22e41389..e435bc799 100644 --- a/continew-admin-webapi/src/main/resources/db/changelog/db.changelog-master.yaml +++ b/continew-webapi/src/main/resources/db/changelog/db.changelog-master.yaml @@ -6,11 +6,11 @@ databaseChangeLog: - include: file: db/changelog/mysql/main_data.sql - include: - file: db/changelog/mysql/plugins/plugin_job.sql + file: db/changelog/mysql/plugin/plugin_schedule.sql # - include: -# file: db/changelog/mysql/plugins/plugin_open.sql +# file: db/changelog/mysql/plugin/plugin_open.sql - include: - file: db/changelog/mysql/plugins/plugin_generator.sql + file: db/changelog/mysql/plugin/plugin_generator.sql # PostgreSQL # - include: # file: db/changelog/postgresql/main_table.sql @@ -19,8 +19,8 @@ databaseChangeLog: # - include: # file: db/changelog/postgresql/main_data.sql # - include: -# file: db/changelog/postgresql/plugins/plugin_job.sql +# file: db/changelog/postgresql/plugin/plugin_schedule.sql # - include: -# file: db/changelog/postgresql/plugins/plugin_open.sql +# file: db/changelog/postgresql/plugin/plugin_open.sql # - include: -# file: db/changelog/postgresql/plugins/plugin_generator.sql \ No newline at end of file +# file: db/changelog/postgresql/plugin/plugin_generator.sql \ No newline at end of file diff --git a/continew-admin-webapi/src/main/resources/db/changelog/mysql/main_column.sql b/continew-webapi/src/main/resources/db/changelog/mysql/main_column.sql similarity index 100% rename from continew-admin-webapi/src/main/resources/db/changelog/mysql/main_column.sql rename to continew-webapi/src/main/resources/db/changelog/mysql/main_column.sql diff --git a/continew-admin-webapi/src/main/resources/db/changelog/mysql/main_data.sql b/continew-webapi/src/main/resources/db/changelog/mysql/main_data.sql similarity index 100% rename from continew-admin-webapi/src/main/resources/db/changelog/mysql/main_data.sql rename to continew-webapi/src/main/resources/db/changelog/mysql/main_data.sql diff --git a/continew-admin-webapi/src/main/resources/db/changelog/mysql/main_table.sql b/continew-webapi/src/main/resources/db/changelog/mysql/main_table.sql similarity index 100% rename from continew-admin-webapi/src/main/resources/db/changelog/mysql/main_table.sql rename to continew-webapi/src/main/resources/db/changelog/mysql/main_table.sql diff --git a/continew-admin-webapi/src/main/resources/db/changelog/mysql/plugins/plugin_generator.sql b/continew-webapi/src/main/resources/db/changelog/mysql/plugin/plugin_generator.sql similarity index 100% rename from continew-admin-webapi/src/main/resources/db/changelog/mysql/plugins/plugin_generator.sql rename to continew-webapi/src/main/resources/db/changelog/mysql/plugin/plugin_generator.sql diff --git a/continew-admin-webapi/src/main/resources/db/changelog/mysql/plugins/plugin_open.sql b/continew-webapi/src/main/resources/db/changelog/mysql/plugin/plugin_open.sql similarity index 100% rename from continew-admin-webapi/src/main/resources/db/changelog/mysql/plugins/plugin_open.sql rename to continew-webapi/src/main/resources/db/changelog/mysql/plugin/plugin_open.sql diff --git a/continew-admin-webapi/src/main/resources/db/changelog/mysql/plugins/plugin_job.sql b/continew-webapi/src/main/resources/db/changelog/mysql/plugin/plugin_schedule.sql similarity index 100% rename from continew-admin-webapi/src/main/resources/db/changelog/mysql/plugins/plugin_job.sql rename to continew-webapi/src/main/resources/db/changelog/mysql/plugin/plugin_schedule.sql diff --git a/continew-admin-webapi/src/main/resources/db/changelog/postgresql/main_column.sql b/continew-webapi/src/main/resources/db/changelog/postgresql/main_column.sql similarity index 100% rename from continew-admin-webapi/src/main/resources/db/changelog/postgresql/main_column.sql rename to continew-webapi/src/main/resources/db/changelog/postgresql/main_column.sql diff --git a/continew-admin-webapi/src/main/resources/db/changelog/postgresql/main_data.sql b/continew-webapi/src/main/resources/db/changelog/postgresql/main_data.sql similarity index 100% rename from continew-admin-webapi/src/main/resources/db/changelog/postgresql/main_data.sql rename to continew-webapi/src/main/resources/db/changelog/postgresql/main_data.sql diff --git a/continew-admin-webapi/src/main/resources/db/changelog/postgresql/main_table.sql b/continew-webapi/src/main/resources/db/changelog/postgresql/main_table.sql similarity index 100% rename from continew-admin-webapi/src/main/resources/db/changelog/postgresql/main_table.sql rename to continew-webapi/src/main/resources/db/changelog/postgresql/main_table.sql diff --git a/continew-admin-webapi/src/main/resources/db/changelog/postgresql/plugins/plugin_generator.sql b/continew-webapi/src/main/resources/db/changelog/postgresql/plugin/plugin_generator.sql similarity index 100% rename from continew-admin-webapi/src/main/resources/db/changelog/postgresql/plugins/plugin_generator.sql rename to continew-webapi/src/main/resources/db/changelog/postgresql/plugin/plugin_generator.sql diff --git a/continew-admin-webapi/src/main/resources/db/changelog/postgresql/plugins/plugin_open.sql b/continew-webapi/src/main/resources/db/changelog/postgresql/plugin/plugin_open.sql similarity index 100% rename from continew-admin-webapi/src/main/resources/db/changelog/postgresql/plugins/plugin_open.sql rename to continew-webapi/src/main/resources/db/changelog/postgresql/plugin/plugin_open.sql diff --git a/continew-admin-webapi/src/main/resources/db/changelog/postgresql/plugins/plugin_job.sql b/continew-webapi/src/main/resources/db/changelog/postgresql/plugin/plugin_schedule.sql similarity index 100% rename from continew-admin-webapi/src/main/resources/db/changelog/postgresql/plugins/plugin_job.sql rename to continew-webapi/src/main/resources/db/changelog/postgresql/plugin/plugin_schedule.sql diff --git a/continew-admin-webapi/src/main/resources/favicon.ico b/continew-webapi/src/main/resources/favicon.ico similarity index 100% rename from continew-admin-webapi/src/main/resources/favicon.ico rename to continew-webapi/src/main/resources/favicon.ico diff --git a/continew-admin-webapi/src/main/resources/logback-spring.xml b/continew-webapi/src/main/resources/logback-spring.xml similarity index 100% rename from continew-admin-webapi/src/main/resources/logback-spring.xml rename to continew-webapi/src/main/resources/logback-spring.xml diff --git a/continew-admin-webapi/src/main/resources/templates/import/user.xlsx b/continew-webapi/src/main/resources/templates/import/user.xlsx similarity index 100% rename from continew-admin-webapi/src/main/resources/templates/import/user.xlsx rename to continew-webapi/src/main/resources/templates/import/user.xlsx diff --git a/continew-admin-webapi/src/main/resources/templates/mail/captcha.ftl b/continew-webapi/src/main/resources/templates/mail/captcha.ftl similarity index 100% rename from continew-admin-webapi/src/main/resources/templates/mail/captcha.ftl rename to continew-webapi/src/main/resources/templates/mail/captcha.ftl diff --git a/continew-admin-webapi/src/test/java/top/continew/admin/ContiNewAdminApplicationTests.java b/continew-webapi/src/test/java/top/continew/admin/ContiNewAdminApplicationTests.java similarity index 100% rename from continew-admin-webapi/src/test/java/top/continew/admin/ContiNewAdminApplicationTests.java rename to continew-webapi/src/test/java/top/continew/admin/ContiNewAdminApplicationTests.java diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index d9d6518f8..29880845c 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -73,10 +73,10 @@ services: depends_on: - redis - mysql - job-server: - build: ./job-server + schedule-server: + build: schedule-server restart: always - container_name: continew-admin-job-server + container_name: continew-admin-schedule-server ports: - '18001:18001' - '1788:1788' diff --git a/docker/job-server/Dockerfile b/docker/schedule-server/Dockerfile similarity index 100% rename from docker/job-server/Dockerfile rename to docker/schedule-server/Dockerfile diff --git a/pom.xml b/pom.xml index eb0d1d1ec..fad3bc2e7 100644 --- a/pom.xml +++ b/pom.xml @@ -24,11 +24,11 @@ https://github.com/continew-org/continew-admin - continew-admin-webapi - continew-admin-plugins - continew-admin-system - continew-admin-common - continew-admin-extension + continew-webapi + continew-module-system + continew-plugin + continew-common + continew-extension @@ -42,42 +42,42 @@ top.continew - continew-admin-webapi + continew-webapi ${revision} top.continew - continew-admin-system + continew-module-system ${revision} top.continew - continew-admin-common + continew-common ${revision} top.continew - continew-admin-job + continew-plugin-schedule ${revision} - + top.continew - continew-admin-open + continew-plugin-open ${revision} top.continew - continew-admin-generator + continew-plugin-generator ${revision}