From b86fe329d07317fed6a7d0b7015856de4b9e75d1 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Thu, 30 Nov 2023 21:27:06 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20:boom:=20=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=8C=85=E7=BB=93=E6=9E=84=20top.charles7c.cnadmin=20=3D>=20to?= =?UTF-8?q?p.charles7c.continew.admin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/annotation/DataPermission.java | 2 +- .../common/base/DataPermissionMapper.java | 4 +- .../config/SpringCacheConfiguration.java | 2 +- .../common/config/WebMvcConfiguration.java | 4 +- .../easyexcel/ExcelBaseEnumConverter.java | 2 +- .../config/jackson/BaseEnumDeserializer.java | 2 +- .../config/jackson/BaseEnumSerializer.java | 2 +- .../config/jackson/JacksonConfiguration.java | 2 +- .../jackson/SimpleDeserializersWrapper.java | 2 +- .../mybatis/DataPermissionHandlerImpl.java | 12 ++--- .../mybatis/MyBatisPlusMetaObjectHandler.java | 4 +- .../mybatis/MybatisPlusConfiguration.java | 2 +- .../config/properties/CaptchaProperties.java | 2 +- .../properties/LocalStorageProperties.java | 2 +- .../config/properties/RsaProperties.java | 2 +- .../common/constant/CacheConstants.java | 2 +- .../admin}/common/constant/FileConstants.java | 2 +- .../common/constant/RegexConstants.java | 2 +- .../admin}/common/constant/SysConstants.java | 2 +- .../admin}/common/constant/UIConstants.java | 2 +- .../admin}/common/enums/DataScopeEnum.java | 2 +- .../common/enums/DisEnableStatusEnum.java | 4 +- .../admin}/common/enums/GenderEnum.java | 2 +- .../admin}/common/enums/MenuTypeEnum.java | 2 +- .../admin}/common/enums/MessageTypeEnum.java | 4 +- .../admin}/common/enums/SocialSourceEnum.java | 2 +- .../enums/SuccessFailureStatusEnum.java | 4 +- .../handler/GlobalExceptionHandler.java | 6 +-- .../admin}/common/model/dto/LogContext.java | 2 +- .../admin}/common/model/dto/LoginUser.java | 4 +- .../admin}/common/model/dto/RoleDTO.java | 4 +- .../common/model/req/UpdateStatusReq.java | 4 +- .../admin}/common/model/resp/CaptchaResp.java | 2 +- .../common/model/resp/LabelValueResp.java | 2 +- .../admin}/common/util/FileUtils.java | 2 +- .../admin}/common/util/SecureUtils.java | 4 +- .../admin}/common/util/ServletUtils.java | 2 +- .../admin}/common/util/StreamUtils.java | 2 +- .../admin}/common/util/TemplateUtils.java | 2 +- .../admin}/common/util/URLUtils.java | 2 +- .../common/util/helper/LoginHelper.java | 12 ++--- .../common/util/holder/LogContextHolder.java | 4 +- .../admin}/monitor/annotation/Log.java | 2 +- .../config/WebMvcMonitorConfiguration.java | 4 +- .../config/properties/LogProperties.java | 2 +- .../admin}/monitor/enums/LogStatusEnum.java | 2 +- .../admin}/monitor/filter/LogFilter.java | 2 +- .../monitor/interceptor/LogInterceptor.java | 24 +++++----- .../admin}/monitor/mapper/LogMapper.java | 10 ++--- .../admin}/monitor/model/entity/LogDO.java | 4 +- .../monitor/model/query/LoginLogQuery.java | 2 +- .../model/query/OperationLogQuery.java | 2 +- .../monitor/model/query/SystemLogQuery.java | 2 +- .../model/resp/DashboardAccessTrendResp.java | 2 +- .../resp/DashboardGeoDistributionResp.java | 2 +- .../resp/DashboardPopularModuleResp.java | 2 +- .../model/resp/DashboardTotalResp.java | 2 +- .../admin}/monitor/model/resp/LogResp.java | 2 +- .../monitor/model/resp/LoginLogResp.java | 4 +- .../monitor/model/resp/OperationLogResp.java | 4 +- .../model/resp/SystemLogDetailResp.java | 2 +- .../monitor/model/resp/SystemLogResp.java | 2 +- .../monitor/service/DashboardService.java | 12 ++--- .../admin}/monitor/service/LogService.java | 10 ++--- .../service/impl/DashboardServiceImpl.java | 20 ++++----- .../monitor/service/impl/LogServiceImpl.java | 18 ++++---- .../src/main/resources/mapper/LogMapper.xml | 8 ++-- .../config/satoken/SaTokenPermissionImpl.java | 6 +-- .../auth/model/query/OnlineUserQuery.java | 2 +- .../auth/model/req/AccountLoginReq.java | 2 +- .../admin}/auth/model/req/EmailLoginReq.java | 4 +- .../admin}/auth/model/req/PhoneLoginReq.java | 4 +- .../admin}/auth/model/resp/LoginResp.java | 2 +- .../admin}/auth/model/resp/MetaResp.java | 2 +- .../auth/model/resp/OnlineUserResp.java | 2 +- .../admin}/auth/model/resp/RouteResp.java | 2 +- .../admin}/auth/model/resp/UserInfoResp.java | 4 +- .../admin}/auth/service/LoginService.java | 4 +- .../auth/service/OnlineUserService.java | 8 ++-- .../auth/service/PermissionService.java | 2 +- .../auth/service/impl/LoginServiceImpl.java | 44 +++++++++---------- .../service/impl/OnlineUserServiceImpl.java | 12 ++--- .../service/impl/PermissionServiceImpl.java | 10 ++--- .../system/enums/AnnouncementStatusEnum.java | 4 +- .../system/enums/MessageTemplateEnum.java | 2 +- .../system/mapper/AnnouncementMapper.java | 6 +-- .../admin}/system/mapper/DeptMapper.java | 4 +- .../admin}/system/mapper/DictItemMapper.java | 6 +-- .../admin}/system/mapper/DictMapper.java | 4 +- .../admin}/system/mapper/MenuMapper.java | 4 +- .../admin}/system/mapper/MessageMapper.java | 6 +-- .../system/mapper/MessageUserMapper.java | 4 +- .../admin}/system/mapper/OptionMapper.java | 4 +- .../admin}/system/mapper/RoleDeptMapper.java | 4 +- .../admin}/system/mapper/RoleMapper.java | 4 +- .../admin}/system/mapper/RoleMenuMapper.java | 4 +- .../admin}/system/mapper/UserMapper.java | 6 +-- .../admin}/system/mapper/UserRoleMapper.java | 4 +- .../system/mapper/UserSocialMapper.java | 4 +- .../system/model/entity/AnnouncementDO.java | 2 +- .../admin}/system/model/entity/DeptDO.java | 4 +- .../admin}/system/model/entity/DictDO.java | 2 +- .../system/model/entity/DictItemDO.java | 2 +- .../admin}/system/model/entity/MenuDO.java | 6 +-- .../admin}/system/model/entity/MessageDO.java | 4 +- .../system/model/entity/MessageUserDO.java | 2 +- .../admin}/system/model/entity/OptionDO.java | 2 +- .../admin}/system/model/entity/RoleDO.java | 6 +-- .../system/model/entity/RoleDeptDO.java | 2 +- .../system/model/entity/RoleMenuDO.java | 2 +- .../admin}/system/model/entity/UserDO.java | 6 +-- .../system/model/entity/UserRoleDO.java | 2 +- .../system/model/entity/UserSocialDO.java | 2 +- .../system/model/query/AnnouncementQuery.java | 2 +- .../admin}/system/model/query/DeptQuery.java | 2 +- .../system/model/query/DictItemQuery.java | 2 +- .../admin}/system/model/query/DictQuery.java | 2 +- .../admin}/system/model/query/MenuQuery.java | 2 +- .../system/model/query/MessageQuery.java | 2 +- .../system/model/query/OptionQuery.java | 2 +- .../admin}/system/model/query/RoleQuery.java | 2 +- .../admin}/system/model/query/UserQuery.java | 2 +- .../system/model/req/AnnouncementReq.java | 2 +- .../admin}/system/model/req/DeptReq.java | 6 +-- .../admin}/system/model/req/DictItemReq.java | 2 +- .../admin}/system/model/req/DictReq.java | 4 +- .../admin}/system/model/req/MenuReq.java | 6 +-- .../admin}/system/model/req/MessageReq.java | 4 +- .../admin}/system/model/req/OptionReq.java | 2 +- .../system/model/req/OptionResetValueReq.java | 2 +- .../admin}/system/model/req/RoleReq.java | 8 ++-- .../model/req/UserBasicInfoUpdateReq.java | 6 +-- .../model/req/UserEmailUpdateRequest.java | 4 +- .../model/req/UserPasswordUpdateReq.java | 2 +- .../system/model/req/UserPhoneUpdateReq.java | 4 +- .../admin}/system/model/req/UserReq.java | 8 ++-- .../system/model/req/UserRoleUpdateReq.java | 2 +- .../model/resp/AnnouncementDetailResp.java | 2 +- .../system/model/resp/AnnouncementResp.java | 4 +- .../admin}/system/model/resp/AvatarResp.java | 2 +- .../model/resp/DashboardAnnouncementResp.java | 2 +- .../system/model/resp/DeptDetailResp.java | 6 +-- .../admin}/system/model/resp/DeptResp.java | 4 +- .../system/model/resp/DictDetailResp.java | 2 +- .../system/model/resp/DictItemDetailResp.java | 2 +- .../system/model/resp/DictItemResp.java | 2 +- .../admin}/system/model/resp/DictResp.java | 2 +- .../admin}/system/model/resp/MenuResp.java | 8 ++-- .../admin}/system/model/resp/MessageResp.java | 4 +- .../model/resp/MessageTypeUnreadResp.java | 4 +- .../system/model/resp/MessageUnreadResp.java | 2 +- .../admin}/system/model/resp/OptionResp.java | 2 +- .../system/model/resp/RoleDetailResp.java | 8 ++-- .../admin}/system/model/resp/RoleResp.java | 6 +-- .../system/model/resp/UserDetailResp.java | 10 ++--- .../admin}/system/model/resp/UserResp.java | 8 ++-- .../system/model/resp/UserSocialBindResp.java | 2 +- .../system/service/AnnouncementService.java | 12 ++--- .../admin}/system/service/DeptService.java | 10 ++--- .../system/service/DictItemService.java | 12 ++--- .../admin}/system/service/DictService.java | 10 ++--- .../admin}/system/service/MenuService.java | 8 ++-- .../admin}/system/service/MessageService.java | 8 ++-- .../system/service/MessageUserService.java | 4 +- .../admin}/system/service/OptionService.java | 10 ++--- .../system/service/RoleDeptService.java | 2 +- .../system/service/RoleMenuService.java | 2 +- .../admin}/system/service/RoleService.java | 16 +++---- .../system/service/UserRoleService.java | 2 +- .../admin}/system/service/UserService.java | 16 +++---- .../system/service/UserSocialService.java | 4 +- .../service/impl/AnnouncementServiceImpl.java | 18 ++++---- .../system/service/impl/DeptServiceImpl.java | 24 +++++----- .../service/impl/DictItemServiceImpl.java | 20 ++++----- .../system/service/impl/DictServiceImpl.java | 18 ++++---- .../system/service/impl/MenuServiceImpl.java | 18 ++++---- .../service/impl/MessageServiceImpl.java | 16 +++---- .../service/impl/MessageUserServiceImpl.java | 14 +++--- .../service/impl/OptionServiceImpl.java | 18 ++++---- .../service/impl/RoleDeptServiceImpl.java | 8 ++-- .../service/impl/RoleMenuServiceImpl.java | 8 ++-- .../system/service/impl/RoleServiceImpl.java | 32 +++++++------- .../service/impl/UserRoleServiceImpl.java | 8 ++-- .../system/service/impl/UserServiceImpl.java | 42 +++++++++--------- .../service/impl/UserSocialServiceImpl.java | 10 ++--- .../resources/mapper/AnnouncementMapper.xml | 4 +- .../src/main/resources/mapper/DeptMapper.xml | 2 +- .../main/resources/mapper/DictItemMapper.xml | 4 +- .../src/main/resources/mapper/MenuMapper.xml | 4 +- .../main/resources/mapper/MessageMapper.xml | 4 +- .../resources/mapper/MessageUserMapper.xml | 2 +- .../src/main/resources/mapper/RoleMapper.xml | 2 +- .../main/resources/mapper/RoleMenuMapper.xml | 2 +- .../src/main/resources/mapper/UserMapper.xml | 2 +- .../resources/mapper/UserSocialMapper.xml | 4 +- .../properties/GeneratorProperties.java | 2 +- .../admin}/tool/enums/FormTypeEnum.java | 2 +- .../admin}/tool/mapper/FieldConfigMapper.java | 4 +- .../admin}/tool/mapper/GenConfigMapper.java | 4 +- .../tool/model/entity/FieldConfigDO.java | 4 +- .../admin}/tool/model/entity/GenConfigDO.java | 6 +-- .../admin}/tool/model/query/TableQuery.java | 2 +- .../admin}/tool/model/req/GenConfigReq.java | 6 +-- .../admin}/tool/model/resp/TableResp.java | 2 +- .../admin}/tool/service/GeneratorService.java | 12 ++--- .../service/impl/GeneratorServiceImpl.java | 32 +++++++------- .../admin}/tool/util/MetaUtils.java | 2 +- .../admin}/tool/util/Table.java | 2 +- .../src/views/tool/generator/index.vue | 2 +- continew-admin-webapi/pom.xml | 2 +- .../admin/ContiNewAdminApplication.java | 2 +- .../admin/webapi}/auth/AuthController.java | 30 ++++++------- .../webapi}/auth/SocialAuthController.java | 8 ++-- .../webapi}/common/CaptchaController.java | 12 ++--- .../webapi}/common/CommonController.java | 24 +++++----- .../webapi}/common/DashboardController.java | 16 +++---- .../admin/webapi}/monitor/LogController.java | 20 ++++----- .../webapi}/monitor/OnlineUserController.java | 8 ++-- .../system/AnnouncementController.java | 12 ++--- .../admin/webapi}/system/DeptController.java | 12 ++--- .../admin/webapi}/system/DictController.java | 12 ++--- .../webapi}/system/DictItemController.java | 12 ++--- .../admin/webapi}/system/MenuController.java | 12 ++--- .../webapi}/system/MessageController.java | 16 +++---- .../webapi}/system/OptionController.java | 12 ++--- .../admin/webapi}/system/RoleController.java | 12 ++--- .../webapi}/system/UserCenterController.java | 30 ++++++------- .../admin/webapi}/system/UserController.java | 16 +++---- .../webapi}/tool/GeneratorController.java | 14 +++--- .../src/main/resources/config/application.yml | 18 ++++---- 230 files changed, 723 insertions(+), 721 deletions(-) rename continew-admin-common/src/main/java/top/charles7c/{cnadmin => continew/admin}/common/annotation/DataPermission.java (94%) rename continew-admin-common/src/main/java/top/charles7c/{cnadmin => continew/admin}/common/base/DataPermissionMapper.java (91%) rename continew-admin-common/src/main/java/top/charles7c/{cnadmin => continew/admin}/common/config/SpringCacheConfiguration.java (98%) rename continew-admin-common/src/main/java/top/charles7c/{cnadmin => continew/admin}/common/config/WebMvcConfiguration.java (96%) rename continew-admin-common/src/main/java/top/charles7c/{cnadmin => continew/admin}/common/config/easyexcel/ExcelBaseEnumConverter.java (98%) rename continew-admin-common/src/main/java/top/charles7c/{cnadmin => continew/admin}/common/config/jackson/BaseEnumDeserializer.java (97%) rename continew-admin-common/src/main/java/top/charles7c/{cnadmin => continew/admin}/common/config/jackson/BaseEnumSerializer.java (96%) rename continew-admin-common/src/main/java/top/charles7c/{cnadmin => continew/admin}/common/config/jackson/JacksonConfiguration.java (96%) rename continew-admin-common/src/main/java/top/charles7c/{cnadmin => continew/admin}/common/config/jackson/SimpleDeserializersWrapper.java (97%) rename continew-admin-common/src/main/java/top/charles7c/{cnadmin => continew/admin}/common/config/mybatis/DataPermissionHandlerImpl.java (95%) rename continew-admin-common/src/main/java/top/charles7c/{cnadmin => continew/admin}/common/config/mybatis/MyBatisPlusMetaObjectHandler.java (97%) rename continew-admin-common/src/main/java/top/charles7c/{cnadmin => continew/admin}/common/config/mybatis/MybatisPlusConfiguration.java (95%) rename continew-admin-common/src/main/java/top/charles7c/{cnadmin => continew/admin}/common/config/properties/CaptchaProperties.java (97%) rename continew-admin-common/src/main/java/top/charles7c/{cnadmin => continew/admin}/common/config/properties/LocalStorageProperties.java (97%) rename continew-admin-common/src/main/java/top/charles7c/{cnadmin => continew/admin}/common/config/properties/RsaProperties.java (94%) rename continew-admin-common/src/main/java/top/charles7c/{cnadmin => continew/admin}/common/constant/CacheConstants.java (96%) rename continew-admin-common/src/main/java/top/charles7c/{cnadmin => continew/admin}/common/constant/FileConstants.java (94%) rename continew-admin-common/src/main/java/top/charles7c/{cnadmin => continew/admin}/common/constant/RegexConstants.java (97%) rename continew-admin-common/src/main/java/top/charles7c/{cnadmin => continew/admin}/common/constant/SysConstants.java (96%) rename continew-admin-common/src/main/java/top/charles7c/{cnadmin => continew/admin}/common/constant/UIConstants.java (96%) rename continew-admin-common/src/main/java/top/charles7c/{cnadmin => continew/admin}/common/enums/DataScopeEnum.java (96%) rename continew-admin-common/src/main/java/top/charles7c/{cnadmin => continew/admin}/common/enums/DisEnableStatusEnum.java (91%) rename continew-admin-common/src/main/java/top/charles7c/{cnadmin => continew/admin}/common/enums/GenderEnum.java (95%) rename continew-admin-common/src/main/java/top/charles7c/{cnadmin => continew/admin}/common/enums/MenuTypeEnum.java (95%) rename continew-admin-common/src/main/java/top/charles7c/{cnadmin => continew/admin}/common/enums/MessageTypeEnum.java (90%) rename continew-admin-common/src/main/java/top/charles7c/{cnadmin => continew/admin}/common/enums/SocialSourceEnum.java (95%) rename continew-admin-common/src/main/java/top/charles7c/{cnadmin => continew/admin}/common/enums/SuccessFailureStatusEnum.java (91%) rename continew-admin-common/src/main/java/top/charles7c/{cnadmin => continew/admin}/common/handler/GlobalExceptionHandler.java (97%) rename continew-admin-common/src/main/java/top/charles7c/{cnadmin => continew/admin}/common/model/dto/LogContext.java (95%) rename continew-admin-common/src/main/java/top/charles7c/{cnadmin => continew/admin}/common/model/dto/LoginUser.java (94%) rename continew-admin-common/src/main/java/top/charles7c/{cnadmin => continew/admin}/common/model/dto/RoleDTO.java (90%) rename continew-admin-common/src/main/java/top/charles7c/{cnadmin => continew/admin}/common/model/req/UpdateStatusReq.java (91%) rename continew-admin-common/src/main/java/top/charles7c/{cnadmin => continew/admin}/common/model/resp/CaptchaResp.java (96%) rename continew-admin-common/src/main/java/top/charles7c/{cnadmin => continew/admin}/common/model/resp/LabelValueResp.java (96%) rename continew-admin-common/src/main/java/top/charles7c/{cnadmin => continew/admin}/common/util/FileUtils.java (98%) rename continew-admin-common/src/main/java/top/charles7c/{cnadmin => continew/admin}/common/util/SecureUtils.java (95%) rename continew-admin-common/src/main/java/top/charles7c/{cnadmin => continew/admin}/common/util/ServletUtils.java (97%) rename continew-admin-common/src/main/java/top/charles7c/{cnadmin => continew/admin}/common/util/StreamUtils.java (97%) rename continew-admin-common/src/main/java/top/charles7c/{cnadmin => continew/admin}/common/util/TemplateUtils.java (97%) rename continew-admin-common/src/main/java/top/charles7c/{cnadmin => continew/admin}/common/util/URLUtils.java (96%) rename continew-admin-common/src/main/java/top/charles7c/{cnadmin => continew/admin}/common/util/helper/LoginHelper.java (92%) rename continew-admin-common/src/main/java/top/charles7c/{cnadmin => continew/admin}/common/util/holder/LogContextHolder.java (94%) rename continew-admin-monitor/src/main/java/top/charles7c/{cnadmin => continew/admin}/monitor/annotation/Log.java (96%) rename continew-admin-monitor/src/main/java/top/charles7c/{cnadmin => continew/admin}/monitor/config/WebMvcMonitorConfiguration.java (91%) rename continew-admin-monitor/src/main/java/top/charles7c/{cnadmin => continew/admin}/monitor/config/properties/LogProperties.java (95%) rename continew-admin-monitor/src/main/java/top/charles7c/{cnadmin => continew/admin}/monitor/enums/LogStatusEnum.java (95%) rename continew-admin-monitor/src/main/java/top/charles7c/{cnadmin => continew/admin}/monitor/filter/LogFilter.java (98%) rename continew-admin-monitor/src/main/java/top/charles7c/{cnadmin => continew/admin}/monitor/interceptor/LogInterceptor.java (94%) rename continew-admin-monitor/src/main/java/top/charles7c/{cnadmin => continew/admin}/monitor/mapper/LogMapper.java (82%) rename continew-admin-monitor/src/main/java/top/charles7c/{cnadmin => continew/admin}/monitor/model/entity/LogDO.java (94%) rename continew-admin-monitor/src/main/java/top/charles7c/{cnadmin => continew/admin}/monitor/model/query/LoginLogQuery.java (96%) rename continew-admin-monitor/src/main/java/top/charles7c/{cnadmin => continew/admin}/monitor/model/query/OperationLogQuery.java (97%) rename continew-admin-monitor/src/main/java/top/charles7c/{cnadmin => continew/admin}/monitor/model/query/SystemLogQuery.java (96%) rename continew-admin-monitor/src/main/java/top/charles7c/{cnadmin => continew/admin}/monitor/model/resp/DashboardAccessTrendResp.java (96%) rename continew-admin-monitor/src/main/java/top/charles7c/{cnadmin => continew/admin}/monitor/model/resp/DashboardGeoDistributionResp.java (96%) rename continew-admin-monitor/src/main/java/top/charles7c/{cnadmin => continew/admin}/monitor/model/resp/DashboardPopularModuleResp.java (96%) rename continew-admin-monitor/src/main/java/top/charles7c/{cnadmin => continew/admin}/monitor/model/resp/DashboardTotalResp.java (96%) rename continew-admin-monitor/src/main/java/top/charles7c/{cnadmin => continew/admin}/monitor/model/resp/LogResp.java (96%) rename continew-admin-monitor/src/main/java/top/charles7c/{cnadmin => continew/admin}/monitor/model/resp/LoginLogResp.java (93%) rename continew-admin-monitor/src/main/java/top/charles7c/{cnadmin => continew/admin}/monitor/model/resp/OperationLogResp.java (94%) rename continew-admin-monitor/src/main/java/top/charles7c/{cnadmin => continew/admin}/monitor/model/resp/SystemLogDetailResp.java (97%) rename continew-admin-monitor/src/main/java/top/charles7c/{cnadmin => continew/admin}/monitor/model/resp/SystemLogResp.java (97%) rename continew-admin-monitor/src/main/java/top/charles7c/{cnadmin => continew/admin}/monitor/service/DashboardService.java (77%) rename continew-admin-monitor/src/main/java/top/charles7c/{cnadmin => continew/admin}/monitor/service/LogService.java (89%) rename continew-admin-monitor/src/main/java/top/charles7c/{cnadmin => continew/admin}/monitor/service/impl/DashboardServiceImpl.java (83%) rename continew-admin-monitor/src/main/java/top/charles7c/{cnadmin => continew/admin}/monitor/service/impl/LogServiceImpl.java (91%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/auth/config/satoken/SaTokenPermissionImpl.java (88%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/auth/model/query/OnlineUserQuery.java (96%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/auth/model/req/AccountLoginReq.java (97%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/auth/model/req/EmailLoginReq.java (93%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/auth/model/req/PhoneLoginReq.java (93%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/auth/model/resp/LoginResp.java (96%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/auth/model/resp/MetaResp.java (97%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/auth/model/resp/OnlineUserResp.java (97%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/auth/model/resp/RouteResp.java (96%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/auth/model/resp/UserInfoResp.java (96%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/auth/service/LoginService.java (93%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/auth/service/OnlineUserService.java (85%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/auth/service/PermissionService.java (95%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/auth/service/impl/LoginServiceImpl.java (85%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/auth/service/impl/OnlineUserServiceImpl.java (91%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/auth/service/impl/PermissionServiceImpl.java (83%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/enums/AnnouncementStatusEnum.java (91%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/enums/MessageTemplateEnum.java (95%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/mapper/AnnouncementMapper.java (83%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/mapper/DeptMapper.java (87%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/mapper/DictItemMapper.java (85%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/mapper/DictMapper.java (87%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/mapper/MenuMapper.java (92%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/mapper/MessageMapper.java (88%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/mapper/MessageUserMapper.java (90%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/mapper/OptionMapper.java (87%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/mapper/RoleDeptMapper.java (91%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/mapper/RoleMapper.java (87%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/mapper/RoleMenuMapper.java (90%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/mapper/UserMapper.java (90%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/mapper/UserRoleMapper.java (91%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/mapper/UserSocialMapper.java (90%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/entity/AnnouncementDO.java (95%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/entity/DeptDO.java (92%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/entity/DictDO.java (95%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/entity/DictItemDO.java (95%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/entity/MenuDO.java (90%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/entity/MessageDO.java (92%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/entity/MessageUserDO.java (95%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/entity/OptionDO.java (96%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/entity/RoleDO.java (88%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/entity/RoleDeptDO.java (95%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/entity/RoleMenuDO.java (95%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/entity/UserDO.java (90%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/entity/UserRoleDO.java (95%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/entity/UserSocialDO.java (96%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/query/AnnouncementQuery.java (96%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/query/DeptQuery.java (96%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/query/DictItemQuery.java (95%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/query/DictQuery.java (95%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/query/MenuQuery.java (96%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/query/MessageQuery.java (96%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/query/OptionQuery.java (96%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/query/RoleQuery.java (96%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/query/UserQuery.java (97%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/req/AnnouncementReq.java (97%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/req/DeptReq.java (93%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/req/DictItemReq.java (97%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/req/DictReq.java (94%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/req/MenuReq.java (95%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/req/MessageReq.java (94%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/req/OptionReq.java (96%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/req/OptionResetValueReq.java (95%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/req/RoleReq.java (92%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/req/UserBasicInfoUpdateReq.java (90%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/req/UserEmailUpdateRequest.java (94%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/req/UserPasswordUpdateReq.java (96%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/req/UserPhoneUpdateReq.java (94%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/req/UserReq.java (93%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/req/UserRoleUpdateReq.java (95%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/resp/AnnouncementDetailResp.java (97%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/resp/AnnouncementResp.java (94%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/resp/AvatarResp.java (95%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/resp/DashboardAnnouncementResp.java (96%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/resp/DeptDetailResp.java (92%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/resp/DeptResp.java (94%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/resp/DictDetailResp.java (96%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/resp/DictItemDetailResp.java (97%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/resp/DictItemResp.java (96%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/resp/DictResp.java (96%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/resp/MenuResp.java (93%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/resp/MessageResp.java (94%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/resp/MessageTypeUnreadResp.java (91%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/resp/MessageUnreadResp.java (96%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/resp/OptionResp.java (96%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/resp/RoleDetailResp.java (92%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/resp/RoleResp.java (92%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/resp/UserDetailResp.java (92%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/resp/UserResp.java (91%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/model/resp/UserSocialBindResp.java (95%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/service/AnnouncementService.java (72%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/service/DeptService.java (73%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/service/DictItemService.java (78%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/service/DictService.java (73%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/service/MenuService.java (85%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/service/MessageService.java (85%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/service/MessageUserService.java (92%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/service/OptionService.java (78%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/service/RoleDeptService.java (96%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/service/RoleMenuService.java (96%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/service/RoleService.java (78%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/service/UserRoleService.java (96%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/service/UserService.java (86%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/service/UserSocialService.java (93%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/service/impl/AnnouncementServiceImpl.java (66%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/service/impl/DeptServiceImpl.java (91%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/service/impl/DictItemServiceImpl.java (83%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/service/impl/DictServiceImpl.java (87%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/service/impl/MenuServiceImpl.java (86%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/service/impl/MessageServiceImpl.java (86%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/service/impl/MessageUserServiceImpl.java (86%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/service/impl/OptionServiceImpl.java (75%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/service/impl/RoleDeptServiceImpl.java (90%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/service/impl/RoleMenuServiceImpl.java (90%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/service/impl/RoleServiceImpl.java (88%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/service/impl/UserRoleServiceImpl.java (90%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/service/impl/UserServiceImpl.java (89%) rename continew-admin-system/src/main/java/top/charles7c/{cnadmin => continew/admin}/system/service/impl/UserSocialServiceImpl.java (91%) rename continew-admin-tool/src/main/java/top/charles7c/{cnadmin => continew/admin}/tool/config/properties/GeneratorProperties.java (96%) rename continew-admin-tool/src/main/java/top/charles7c/{cnadmin => continew/admin}/tool/enums/FormTypeEnum.java (96%) rename continew-admin-tool/src/main/java/top/charles7c/{cnadmin => continew/admin}/tool/mapper/FieldConfigMapper.java (91%) rename continew-admin-tool/src/main/java/top/charles7c/{cnadmin => continew/admin}/tool/mapper/GenConfigMapper.java (87%) rename continew-admin-tool/src/main/java/top/charles7c/{cnadmin => continew/admin}/tool/model/entity/FieldConfigDO.java (97%) rename continew-admin-tool/src/main/java/top/charles7c/{cnadmin => continew/admin}/tool/model/entity/GenConfigDO.java (96%) rename continew-admin-tool/src/main/java/top/charles7c/{cnadmin => continew/admin}/tool/model/query/TableQuery.java (95%) rename continew-admin-tool/src/main/java/top/charles7c/{cnadmin => continew/admin}/tool/model/req/GenConfigReq.java (89%) rename continew-admin-tool/src/main/java/top/charles7c/{cnadmin => continew/admin}/tool/model/resp/TableResp.java (97%) rename continew-admin-tool/src/main/java/top/charles7c/{cnadmin => continew/admin}/tool/service/GeneratorService.java (85%) rename continew-admin-tool/src/main/java/top/charles7c/{cnadmin => continew/admin}/tool/service/impl/GeneratorServiceImpl.java (93%) rename continew-admin-tool/src/main/java/top/charles7c/{cnadmin => continew/admin}/tool/util/MetaUtils.java (98%) rename continew-admin-tool/src/main/java/top/charles7c/{cnadmin => continew/admin}/tool/util/Table.java (96%) rename continew-admin-webapi/src/main/java/top/charles7c/{cnadmin/webapi/controller => continew/admin/webapi}/auth/AuthController.java (85%) rename continew-admin-webapi/src/main/java/top/charles7c/{cnadmin/webapi/controller => continew/admin/webapi}/auth/SocialAuthController.java (93%) rename continew-admin-webapi/src/main/java/top/charles7c/{cnadmin/webapi/controller => continew/admin/webapi}/common/CaptchaController.java (94%) rename continew-admin-webapi/src/main/java/top/charles7c/{cnadmin/webapi/controller => continew/admin/webapi}/common/CommonController.java (89%) rename continew-admin-webapi/src/main/java/top/charles7c/{cnadmin/webapi/controller => continew/admin/webapi}/common/DashboardController.java (84%) rename continew-admin-webapi/src/main/java/top/charles7c/{cnadmin/webapi/controller => continew/admin/webapi}/monitor/LogController.java (82%) rename continew-admin-webapi/src/main/java/top/charles7c/{cnadmin/webapi/controller => continew/admin/webapi}/monitor/OnlineUserController.java (91%) rename continew-admin-webapi/src/main/java/top/charles7c/{cnadmin/webapi/controller => continew/admin/webapi}/system/AnnouncementController.java (86%) rename continew-admin-webapi/src/main/java/top/charles7c/{cnadmin/webapi/controller => continew/admin/webapi}/system/DeptController.java (77%) rename continew-admin-webapi/src/main/java/top/charles7c/{cnadmin/webapi/controller => continew/admin/webapi}/system/DictController.java (75%) rename continew-admin-webapi/src/main/java/top/charles7c/{cnadmin/webapi/controller => continew/admin/webapi}/system/DictItemController.java (77%) rename continew-admin-webapi/src/main/java/top/charles7c/{cnadmin/webapi/controller => continew/admin/webapi}/system/MenuController.java (88%) rename continew-admin-webapi/src/main/java/top/charles7c/{cnadmin/webapi/controller => continew/admin/webapi}/system/MessageController.java (85%) rename continew-admin-webapi/src/main/java/top/charles7c/{cnadmin/webapi/controller => continew/admin/webapi}/system/OptionController.java (84%) rename continew-admin-webapi/src/main/java/top/charles7c/{cnadmin/webapi/controller => continew/admin/webapi}/system/RoleController.java (75%) rename continew-admin-webapi/src/main/java/top/charles7c/{cnadmin/webapi/controller => continew/admin/webapi}/system/UserCenterController.java (88%) rename continew-admin-webapi/src/main/java/top/charles7c/{cnadmin/webapi/controller => continew/admin/webapi}/system/UserController.java (85%) rename continew-admin-webapi/src/main/java/top/charles7c/{cnadmin/webapi/controller => continew/admin/webapi}/tool/GeneratorController.java (90%) diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/annotation/DataPermission.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/annotation/DataPermission.java similarity index 94% rename from continew-admin-common/src/main/java/top/charles7c/cnadmin/common/annotation/DataPermission.java rename to continew-admin-common/src/main/java/top/charles7c/continew/admin/common/annotation/DataPermission.java index 34df4be8..2320bf95 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/annotation/DataPermission.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/annotation/DataPermission.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.common.annotation; +package top.charles7c.continew.admin.common.annotation; import java.lang.annotation.*; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/DataPermissionMapper.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/base/DataPermissionMapper.java similarity index 91% rename from continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/DataPermissionMapper.java rename to continew-admin-common/src/main/java/top/charles7c/continew/admin/common/base/DataPermissionMapper.java index 2aeecd83..2a5e82c4 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/DataPermissionMapper.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/base/DataPermissionMapper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.common.base; +package top.charles7c.continew.admin.common.base; import java.util.List; @@ -24,7 +24,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; -import top.charles7c.cnadmin.common.annotation.DataPermission; +import top.charles7c.continew.admin.common.annotation.DataPermission; import top.charles7c.continew.starter.extension.crud.base.BaseMapper; /** diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/SpringCacheConfiguration.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/SpringCacheConfiguration.java similarity index 98% rename from continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/SpringCacheConfiguration.java rename to continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/SpringCacheConfiguration.java index c3c9ab40..abcfe8d1 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/SpringCacheConfiguration.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/SpringCacheConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.common.config; +package top.charles7c.continew.admin.common.config; import java.util.Map; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/WebMvcConfiguration.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/WebMvcConfiguration.java similarity index 96% rename from continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/WebMvcConfiguration.java rename to continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/WebMvcConfiguration.java index 38bd9c35..7dc76b4d 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/WebMvcConfiguration.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/WebMvcConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.common.config; +package top.charles7c.continew.admin.common.config; import java.util.List; import java.util.Objects; @@ -29,7 +29,7 @@ import org.springframework.web.servlet.config.annotation.EnableWebMvc; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import top.charles7c.cnadmin.common.config.properties.LocalStorageProperties; +import top.charles7c.continew.admin.common.config.properties.LocalStorageProperties; import top.charles7c.continew.starter.core.constant.StringConstants; /** diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/easyexcel/ExcelBaseEnumConverter.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/easyexcel/ExcelBaseEnumConverter.java similarity index 98% rename from continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/easyexcel/ExcelBaseEnumConverter.java rename to continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/easyexcel/ExcelBaseEnumConverter.java index 4d2ea8b6..01f76607 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/easyexcel/ExcelBaseEnumConverter.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/easyexcel/ExcelBaseEnumConverter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.common.config.easyexcel; +package top.charles7c.continew.admin.common.config.easyexcel; import com.alibaba.excel.converters.Converter; import com.alibaba.excel.enums.CellDataTypeEnum; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/jackson/BaseEnumDeserializer.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/jackson/BaseEnumDeserializer.java similarity index 97% rename from continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/jackson/BaseEnumDeserializer.java rename to continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/jackson/BaseEnumDeserializer.java index 4896d22a..048fe641 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/jackson/BaseEnumDeserializer.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/jackson/BaseEnumDeserializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.common.config.jackson; +package top.charles7c.continew.admin.common.config.jackson; import java.io.IOException; import java.lang.reflect.Field; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/jackson/BaseEnumSerializer.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/jackson/BaseEnumSerializer.java similarity index 96% rename from continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/jackson/BaseEnumSerializer.java rename to continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/jackson/BaseEnumSerializer.java index 6624cd4e..17471857 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/jackson/BaseEnumSerializer.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/jackson/BaseEnumSerializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.common.config.jackson; +package top.charles7c.continew.admin.common.config.jackson; import java.io.IOException; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/jackson/JacksonConfiguration.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/jackson/JacksonConfiguration.java similarity index 96% rename from continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/jackson/JacksonConfiguration.java rename to continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/jackson/JacksonConfiguration.java index 937123a5..cf3e8278 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/jackson/JacksonConfiguration.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/jackson/JacksonConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.common.config.jackson; +package top.charles7c.continew.admin.common.config.jackson; import lombok.extern.slf4j.Slf4j; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/jackson/SimpleDeserializersWrapper.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/jackson/SimpleDeserializersWrapper.java similarity index 97% rename from continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/jackson/SimpleDeserializersWrapper.java rename to continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/jackson/SimpleDeserializersWrapper.java index 20d36174..224cfff7 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/jackson/SimpleDeserializersWrapper.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/jackson/SimpleDeserializersWrapper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.common.config.jackson; +package top.charles7c.continew.admin.common.config.jackson; import lombok.extern.slf4j.Slf4j; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/mybatis/DataPermissionHandlerImpl.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/DataPermissionHandlerImpl.java similarity index 95% rename from continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/mybatis/DataPermissionHandlerImpl.java rename to continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/DataPermissionHandlerImpl.java index a024c462..5230c44c 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/mybatis/DataPermissionHandlerImpl.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/DataPermissionHandlerImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.common.config.mybatis; +package top.charles7c.continew.admin.common.config.mybatis; import java.lang.reflect.Method; import java.util.Collections; @@ -24,11 +24,11 @@ import lombok.extern.slf4j.Slf4j; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.handler.DataPermissionHandler; -import top.charles7c.cnadmin.common.annotation.DataPermission; -import top.charles7c.cnadmin.common.enums.DataScopeEnum; -import top.charles7c.cnadmin.common.model.dto.LoginUser; -import top.charles7c.cnadmin.common.model.dto.RoleDTO; -import top.charles7c.cnadmin.common.util.helper.LoginHelper; +import top.charles7c.continew.admin.common.annotation.DataPermission; +import top.charles7c.continew.admin.common.enums.DataScopeEnum; +import top.charles7c.continew.admin.common.model.dto.LoginUser; +import top.charles7c.continew.admin.common.model.dto.RoleDTO; +import top.charles7c.continew.admin.common.util.helper.LoginHelper; import top.charles7c.continew.starter.core.constant.StringConstants; import net.sf.jsqlparser.expression.Expression; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java similarity index 97% rename from continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java rename to continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java index 166e3fb5..6075d32e 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.common.config.mybatis; +package top.charles7c.continew.admin.common.config.mybatis; import java.time.LocalDateTime; @@ -24,7 +24,7 @@ import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import cn.hutool.core.util.ObjectUtil; -import top.charles7c.cnadmin.common.util.helper.LoginHelper; +import top.charles7c.continew.admin.common.util.helper.LoginHelper; import top.charles7c.continew.starter.extension.crud.base.BaseDO; import top.charles7c.continew.starter.extension.crud.exception.BusinessException; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/mybatis/MybatisPlusConfiguration.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/MybatisPlusConfiguration.java similarity index 95% rename from continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/mybatis/MybatisPlusConfiguration.java rename to continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/MybatisPlusConfiguration.java index fa452dd6..ca1c4e7f 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/mybatis/MybatisPlusConfiguration.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/mybatis/MybatisPlusConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.common.config.mybatis; +package top.charles7c.continew.admin.common.config.mybatis; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/properties/CaptchaProperties.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/properties/CaptchaProperties.java similarity index 97% rename from continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/properties/CaptchaProperties.java rename to continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/properties/CaptchaProperties.java index 34a1834f..c5e82494 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/properties/CaptchaProperties.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/properties/CaptchaProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.common.config.properties; +package top.charles7c.continew.admin.common.config.properties; import java.awt.*; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/properties/LocalStorageProperties.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/properties/LocalStorageProperties.java similarity index 97% rename from continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/properties/LocalStorageProperties.java rename to continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/properties/LocalStorageProperties.java index 588f1e19..ebe33577 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/properties/LocalStorageProperties.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/properties/LocalStorageProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.common.config.properties; +package top.charles7c.continew.admin.common.config.properties; import lombok.Data; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/properties/RsaProperties.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/properties/RsaProperties.java similarity index 94% rename from continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/properties/RsaProperties.java rename to continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/properties/RsaProperties.java index 71c3b9aa..1748876b 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/properties/RsaProperties.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/config/properties/RsaProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.common.config.properties; +package top.charles7c.continew.admin.common.config.properties; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/CacheConstants.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/CacheConstants.java similarity index 96% rename from continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/CacheConstants.java rename to continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/CacheConstants.java index 03a79a96..77ed9bef 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/CacheConstants.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/CacheConstants.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.common.constant; +package top.charles7c.continew.admin.common.constant; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/FileConstants.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/FileConstants.java similarity index 94% rename from continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/FileConstants.java rename to continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/FileConstants.java index 969887c0..d5261068 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/FileConstants.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/FileConstants.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.common.constant; +package top.charles7c.continew.admin.common.constant; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/RegexConstants.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/RegexConstants.java similarity index 97% rename from continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/RegexConstants.java rename to continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/RegexConstants.java index 46946d41..fe7f473d 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/RegexConstants.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/RegexConstants.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.common.constant; +package top.charles7c.continew.admin.common.constant; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/SysConstants.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/SysConstants.java similarity index 96% rename from continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/SysConstants.java rename to continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/SysConstants.java index a4224410..3ca7f6fe 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/SysConstants.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/SysConstants.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.common.constant; +package top.charles7c.continew.admin.common.constant; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/UIConstants.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/UIConstants.java similarity index 96% rename from continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/UIConstants.java rename to continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/UIConstants.java index d684241d..ce790288 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/constant/UIConstants.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/constant/UIConstants.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.common.constant; +package top.charles7c.continew.admin.common.constant; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/DataScopeEnum.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/DataScopeEnum.java similarity index 96% rename from continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/DataScopeEnum.java rename to continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/DataScopeEnum.java index 177cb0fc..15d5a297 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/DataScopeEnum.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/DataScopeEnum.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.common.enums; +package top.charles7c.continew.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/DisEnableStatusEnum.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/DisEnableStatusEnum.java similarity index 91% rename from continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/DisEnableStatusEnum.java rename to continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/DisEnableStatusEnum.java index 6a6793a6..87ad7480 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/DisEnableStatusEnum.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/DisEnableStatusEnum.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package top.charles7c.cnadmin.common.enums; +package top.charles7c.continew.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; -import top.charles7c.cnadmin.common.constant.UIConstants; +import top.charles7c.continew.admin.common.constant.UIConstants; import top.charles7c.continew.starter.extension.crud.base.IBaseEnum; /** diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/GenderEnum.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/GenderEnum.java similarity index 95% rename from continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/GenderEnum.java rename to continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/GenderEnum.java index 2e2467df..db6068a4 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/GenderEnum.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/GenderEnum.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.common.enums; +package top.charles7c.continew.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/MenuTypeEnum.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/MenuTypeEnum.java similarity index 95% rename from continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/MenuTypeEnum.java rename to continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/MenuTypeEnum.java index 14eb0127..2d5fe3e3 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/MenuTypeEnum.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/MenuTypeEnum.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.common.enums; +package top.charles7c.continew.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/MessageTypeEnum.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/MessageTypeEnum.java similarity index 90% rename from continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/MessageTypeEnum.java rename to continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/MessageTypeEnum.java index 826c8727..ca21ba03 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/MessageTypeEnum.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/MessageTypeEnum.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package top.charles7c.cnadmin.common.enums; +package top.charles7c.continew.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; -import top.charles7c.cnadmin.common.constant.UIConstants; +import top.charles7c.continew.admin.common.constant.UIConstants; import top.charles7c.continew.starter.extension.crud.base.IBaseEnum; /** diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/SocialSourceEnum.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/SocialSourceEnum.java similarity index 95% rename from continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/SocialSourceEnum.java rename to continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/SocialSourceEnum.java index 7269fcd9..60764ffe 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/SocialSourceEnum.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/SocialSourceEnum.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.common.enums; +package top.charles7c.continew.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/SuccessFailureStatusEnum.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/SuccessFailureStatusEnum.java similarity index 91% rename from continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/SuccessFailureStatusEnum.java rename to continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/SuccessFailureStatusEnum.java index 73cfdfc7..6b2e0adb 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/enums/SuccessFailureStatusEnum.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/enums/SuccessFailureStatusEnum.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package top.charles7c.cnadmin.common.enums; +package top.charles7c.continew.admin.common.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; -import top.charles7c.cnadmin.common.constant.UIConstants; +import top.charles7c.continew.admin.common.constant.UIConstants; import top.charles7c.continew.starter.extension.crud.base.IBaseEnum; /** diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/handler/GlobalExceptionHandler.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/handler/GlobalExceptionHandler.java similarity index 97% rename from continew-admin-common/src/main/java/top/charles7c/cnadmin/common/handler/GlobalExceptionHandler.java rename to continew-admin-common/src/main/java/top/charles7c/continew/admin/common/handler/GlobalExceptionHandler.java index fdea2bfa..cc945eb0 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/handler/GlobalExceptionHandler.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/handler/GlobalExceptionHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.common.handler; +package top.charles7c.continew.admin.common.handler; import java.util.Objects; @@ -40,8 +40,8 @@ import cn.dev33.satoken.exception.NotRoleException; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.StrUtil; -import top.charles7c.cnadmin.common.util.StreamUtils; -import top.charles7c.cnadmin.common.util.holder.LogContextHolder; +import top.charles7c.continew.admin.common.util.StreamUtils; +import top.charles7c.continew.admin.common.util.holder.LogContextHolder; import top.charles7c.continew.starter.core.util.ExceptionUtils; import top.charles7c.continew.starter.extension.crud.exception.BadRequestException; import top.charles7c.continew.starter.extension.crud.exception.BusinessException; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/dto/LogContext.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/model/dto/LogContext.java similarity index 95% rename from continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/dto/LogContext.java rename to continew-admin-common/src/main/java/top/charles7c/continew/admin/common/model/dto/LogContext.java index da810c15..ec38c54d 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/dto/LogContext.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/model/dto/LogContext.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.common.model.dto; +package top.charles7c.continew.admin.common.model.dto; import java.io.Serial; import java.io.Serializable; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/dto/LoginUser.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/model/dto/LoginUser.java similarity index 94% rename from continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/dto/LoginUser.java rename to continew-admin-common/src/main/java/top/charles7c/continew/admin/common/model/dto/LoginUser.java index f9548ce5..47a407aa 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/dto/LoginUser.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/model/dto/LoginUser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.common.model.dto; +package top.charles7c.continew.admin.common.model.dto; import java.io.Serial; import java.io.Serializable; @@ -25,7 +25,7 @@ import lombok.Data; import cn.hutool.core.collection.CollUtil; -import top.charles7c.cnadmin.common.constant.SysConstants; +import top.charles7c.continew.admin.common.constant.SysConstants; /** * 登录用户信息 diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/dto/RoleDTO.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/model/dto/RoleDTO.java similarity index 90% rename from continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/dto/RoleDTO.java rename to continew-admin-common/src/main/java/top/charles7c/continew/admin/common/model/dto/RoleDTO.java index 89843ea3..439a831a 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/dto/RoleDTO.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/model/dto/RoleDTO.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package top.charles7c.cnadmin.common.model.dto; +package top.charles7c.continew.admin.common.model.dto; import java.io.Serial; import java.io.Serializable; import lombok.Data; -import top.charles7c.cnadmin.common.enums.DataScopeEnum; +import top.charles7c.continew.admin.common.enums.DataScopeEnum; /** * 角色信息 diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/req/UpdateStatusReq.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/model/req/UpdateStatusReq.java similarity index 91% rename from continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/req/UpdateStatusReq.java rename to continew-admin-common/src/main/java/top/charles7c/continew/admin/common/model/req/UpdateStatusReq.java index 8d307554..f6356403 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/req/UpdateStatusReq.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/model/req/UpdateStatusReq.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.common.model.req; +package top.charles7c.continew.admin.common.model.req; import java.io.Serial; import java.io.Serializable; @@ -25,7 +25,7 @@ import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import top.charles7c.cnadmin.common.enums.DisEnableStatusEnum; +import top.charles7c.continew.admin.common.enums.DisEnableStatusEnum; /** * 修改状态信息 diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/resp/CaptchaResp.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/model/resp/CaptchaResp.java similarity index 96% rename from continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/resp/CaptchaResp.java rename to continew-admin-common/src/main/java/top/charles7c/continew/admin/common/model/resp/CaptchaResp.java index 98f7c66a..04675ffe 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/resp/CaptchaResp.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/model/resp/CaptchaResp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.common.model.resp; +package top.charles7c.continew.admin.common.model.resp; import java.io.Serial; import java.io.Serializable; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/resp/LabelValueResp.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/model/resp/LabelValueResp.java similarity index 96% rename from continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/resp/LabelValueResp.java rename to continew-admin-common/src/main/java/top/charles7c/continew/admin/common/model/resp/LabelValueResp.java index 0113eae1..58b9adfd 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/resp/LabelValueResp.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/model/resp/LabelValueResp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.common.model.resp; +package top.charles7c.continew.admin.common.model.resp; import java.io.Serial; import java.io.Serializable; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/FileUtils.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/FileUtils.java similarity index 98% rename from continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/FileUtils.java rename to continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/FileUtils.java index 31d68302..a59e67c6 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/FileUtils.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/FileUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.common.util; +package top.charles7c.continew.admin.common.util; import java.io.File; import java.time.LocalDateTime; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/SecureUtils.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/SecureUtils.java similarity index 95% rename from continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/SecureUtils.java rename to continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/SecureUtils.java index 12dee7c1..4279b83a 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/SecureUtils.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/SecureUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.common.util; +package top.charles7c.continew.admin.common.util; import lombok.AccessLevel; import lombok.NoArgsConstructor; @@ -23,7 +23,7 @@ import cn.hutool.core.codec.Base64; import cn.hutool.crypto.SecureUtil; import cn.hutool.crypto.asymmetric.KeyType; -import top.charles7c.cnadmin.common.config.properties.RsaProperties; +import top.charles7c.continew.admin.common.config.properties.RsaProperties; import top.charles7c.continew.starter.extension.crud.util.validate.ValidationUtils; /** diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/ServletUtils.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/ServletUtils.java similarity index 97% rename from continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/ServletUtils.java rename to continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/ServletUtils.java index 2b129dbc..cd05afd4 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/ServletUtils.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/ServletUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.common.util; +package top.charles7c.continew.admin.common.util; import java.util.*; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/StreamUtils.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/StreamUtils.java similarity index 97% rename from continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/StreamUtils.java rename to continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/StreamUtils.java index 1ff99806..5f2b2959 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/StreamUtils.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/StreamUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.common.util; +package top.charles7c.continew.admin.common.util; import java.util.Collection; import java.util.Objects; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/TemplateUtils.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/TemplateUtils.java similarity index 97% rename from continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/TemplateUtils.java rename to continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/TemplateUtils.java index 5197fee9..3c1acafc 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/TemplateUtils.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/TemplateUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.common.util; +package top.charles7c.continew.admin.common.util; import java.util.Map; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/URLUtils.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/URLUtils.java similarity index 96% rename from continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/URLUtils.java rename to continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/URLUtils.java index 9a0e95d5..e319f958 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/URLUtils.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/URLUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.common.util; +package top.charles7c.continew.admin.common.util; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/LoginHelper.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/helper/LoginHelper.java similarity index 92% rename from continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/LoginHelper.java rename to continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/helper/LoginHelper.java index c1df5486..484dab9a 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/helper/LoginHelper.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/helper/LoginHelper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.common.util.helper; +package top.charles7c.continew.admin.common.util.helper; import java.time.LocalDateTime; @@ -29,11 +29,11 @@ import cn.dev33.satoken.stp.StpUtil; import cn.hutool.extra.servlet.JakartaServletUtil; import cn.hutool.extra.spring.SpringUtil; -import top.charles7c.cnadmin.common.constant.CacheConstants; -import top.charles7c.cnadmin.common.model.dto.LogContext; -import top.charles7c.cnadmin.common.model.dto.LoginUser; -import top.charles7c.cnadmin.common.util.ServletUtils; -import top.charles7c.cnadmin.common.util.holder.LogContextHolder; +import top.charles7c.continew.admin.common.constant.CacheConstants; +import top.charles7c.continew.admin.common.model.dto.LogContext; +import top.charles7c.continew.admin.common.model.dto.LoginUser; +import top.charles7c.continew.admin.common.util.ServletUtils; +import top.charles7c.continew.admin.common.util.holder.LogContextHolder; import top.charles7c.continew.starter.core.util.ExceptionUtils; import top.charles7c.continew.starter.core.util.IpUtils; import top.charles7c.continew.starter.extension.crud.base.CommonUserService; diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/holder/LogContextHolder.java b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/holder/LogContextHolder.java similarity index 94% rename from continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/holder/LogContextHolder.java rename to continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/holder/LogContextHolder.java index a12a4606..fd8a0453 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/holder/LogContextHolder.java +++ b/continew-admin-common/src/main/java/top/charles7c/continew/admin/common/util/holder/LogContextHolder.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package top.charles7c.cnadmin.common.util.holder; +package top.charles7c.continew.admin.common.util.holder; import lombok.AccessLevel; import lombok.NoArgsConstructor; -import top.charles7c.cnadmin.common.model.dto.LogContext; +import top.charles7c.continew.admin.common.model.dto.LogContext; /** * 系统日志上下文持有者 diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/annotation/Log.java b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/annotation/Log.java similarity index 96% rename from continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/annotation/Log.java rename to continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/annotation/Log.java index 30dcbfb5..be9f3d66 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/annotation/Log.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/annotation/Log.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.monitor.annotation; +package top.charles7c.continew.admin.monitor.annotation; import java.lang.annotation.*; diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/config/WebMvcMonitorConfiguration.java b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/config/WebMvcMonitorConfiguration.java similarity index 91% rename from continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/config/WebMvcMonitorConfiguration.java rename to continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/config/WebMvcMonitorConfiguration.java index 37e63680..0343cb80 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/config/WebMvcMonitorConfiguration.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/config/WebMvcMonitorConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.monitor.config; +package top.charles7c.continew.admin.monitor.config; import lombok.RequiredArgsConstructor; @@ -23,7 +23,7 @@ import org.springframework.web.servlet.config.annotation.EnableWebMvc; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import top.charles7c.cnadmin.monitor.interceptor.LogInterceptor; +import top.charles7c.continew.admin.monitor.interceptor.LogInterceptor; /** * 监控模块 Web MVC 配置 diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/config/properties/LogProperties.java b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/config/properties/LogProperties.java similarity index 95% rename from continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/config/properties/LogProperties.java rename to continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/config/properties/LogProperties.java index b5232b27..007b2101 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/config/properties/LogProperties.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/config/properties/LogProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.monitor.config.properties; +package top.charles7c.continew.admin.monitor.config.properties; import java.util.ArrayList; import java.util.List; diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/enums/LogStatusEnum.java b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/enums/LogStatusEnum.java similarity index 95% rename from continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/enums/LogStatusEnum.java rename to continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/enums/LogStatusEnum.java index e9e9df04..090d68ad 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/enums/LogStatusEnum.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/enums/LogStatusEnum.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.monitor.enums; +package top.charles7c.continew.admin.monitor.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/filter/LogFilter.java b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/filter/LogFilter.java similarity index 98% rename from continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/filter/LogFilter.java rename to continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/filter/LogFilter.java index 89554997..5746bce8 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/filter/LogFilter.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/filter/LogFilter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.monitor.filter; +package top.charles7c.continew.admin.monitor.filter; import java.io.IOException; import java.util.Objects; diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/interceptor/LogInterceptor.java b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/interceptor/LogInterceptor.java similarity index 94% rename from continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/interceptor/LogInterceptor.java rename to continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/interceptor/LogInterceptor.java index 70e1136f..bf5fb1e0 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/interceptor/LogInterceptor.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/interceptor/LogInterceptor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.monitor.interceptor; +package top.charles7c.continew.admin.monitor.interceptor; import java.time.LocalDateTime; import java.util.ArrayList; @@ -50,17 +50,17 @@ import cn.hutool.json.JSONArray; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; -import top.charles7c.cnadmin.auth.model.req.AccountLoginReq; -import top.charles7c.cnadmin.common.constant.SysConstants; -import top.charles7c.cnadmin.common.model.dto.LogContext; -import top.charles7c.cnadmin.common.util.ServletUtils; -import top.charles7c.cnadmin.common.util.helper.LoginHelper; -import top.charles7c.cnadmin.common.util.holder.LogContextHolder; -import top.charles7c.cnadmin.monitor.annotation.Log; -import top.charles7c.cnadmin.monitor.config.properties.LogProperties; -import top.charles7c.cnadmin.monitor.enums.LogStatusEnum; -import top.charles7c.cnadmin.monitor.model.entity.LogDO; -import top.charles7c.cnadmin.system.service.UserService; +import top.charles7c.continew.admin.auth.model.req.AccountLoginReq; +import top.charles7c.continew.admin.common.constant.SysConstants; +import top.charles7c.continew.admin.common.model.dto.LogContext; +import top.charles7c.continew.admin.common.util.ServletUtils; +import top.charles7c.continew.admin.common.util.helper.LoginHelper; +import top.charles7c.continew.admin.common.util.holder.LogContextHolder; +import top.charles7c.continew.admin.monitor.annotation.Log; +import top.charles7c.continew.admin.monitor.config.properties.LogProperties; +import top.charles7c.continew.admin.monitor.enums.LogStatusEnum; +import top.charles7c.continew.admin.monitor.model.entity.LogDO; +import top.charles7c.continew.admin.system.service.UserService; import top.charles7c.continew.starter.core.constant.StringConstants; import top.charles7c.continew.starter.core.util.ExceptionUtils; import top.charles7c.continew.starter.core.util.IpUtils; diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/mapper/LogMapper.java b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/mapper/LogMapper.java similarity index 82% rename from continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/mapper/LogMapper.java rename to continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/mapper/LogMapper.java index 8e2e6021..caebbcfe 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/mapper/LogMapper.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/mapper/LogMapper.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package top.charles7c.cnadmin.monitor.mapper; +package top.charles7c.continew.admin.monitor.mapper; import java.util.List; import java.util.Map; import org.apache.ibatis.annotations.Param; -import top.charles7c.cnadmin.monitor.model.entity.LogDO; -import top.charles7c.cnadmin.monitor.model.resp.DashboardAccessTrendResp; -import top.charles7c.cnadmin.monitor.model.resp.DashboardPopularModuleResp; -import top.charles7c.cnadmin.monitor.model.resp.DashboardTotalResp; +import top.charles7c.continew.admin.monitor.model.entity.LogDO; +import top.charles7c.continew.admin.monitor.model.resp.DashboardAccessTrendResp; +import top.charles7c.continew.admin.monitor.model.resp.DashboardPopularModuleResp; +import top.charles7c.continew.admin.monitor.model.resp.DashboardTotalResp; import top.charles7c.continew.starter.extension.crud.base.BaseMapper; /** diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/entity/LogDO.java b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/entity/LogDO.java similarity index 94% rename from continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/entity/LogDO.java rename to continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/entity/LogDO.java index 2461eb88..7c5bbd11 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/entity/LogDO.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/entity/LogDO.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.monitor.model.entity; +package top.charles7c.continew.admin.monitor.model.entity; import java.io.Serial; import java.io.Serializable; @@ -25,7 +25,7 @@ import lombok.Data; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import top.charles7c.cnadmin.monitor.enums.LogStatusEnum; +import top.charles7c.continew.admin.monitor.enums.LogStatusEnum; /** * 系统日志实体 diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/LoginLogQuery.java b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/query/LoginLogQuery.java similarity index 96% rename from continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/LoginLogQuery.java rename to continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/query/LoginLogQuery.java index 1c228706..62d0d100 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/LoginLogQuery.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/query/LoginLogQuery.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.monitor.model.query; +package top.charles7c.continew.admin.monitor.model.query; import java.io.Serial; import java.io.Serializable; diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/OperationLogQuery.java b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/query/OperationLogQuery.java similarity index 97% rename from continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/OperationLogQuery.java rename to continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/query/OperationLogQuery.java index fbd38fb1..53cb330f 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/OperationLogQuery.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/query/OperationLogQuery.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.monitor.model.query; +package top.charles7c.continew.admin.monitor.model.query; import java.io.Serial; import java.io.Serializable; diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/SystemLogQuery.java b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/query/SystemLogQuery.java similarity index 96% rename from continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/SystemLogQuery.java rename to continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/query/SystemLogQuery.java index 539ba01e..0240ca4e 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/query/SystemLogQuery.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/query/SystemLogQuery.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.monitor.model.query; +package top.charles7c.continew.admin.monitor.model.query; import java.io.Serial; import java.io.Serializable; diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/DashboardAccessTrendResp.java b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/resp/DashboardAccessTrendResp.java similarity index 96% rename from continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/DashboardAccessTrendResp.java rename to continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/resp/DashboardAccessTrendResp.java index 212182c4..7dc63af5 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/DashboardAccessTrendResp.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/resp/DashboardAccessTrendResp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.monitor.model.resp; +package top.charles7c.continew.admin.monitor.model.resp; import java.io.Serial; import java.io.Serializable; diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/DashboardGeoDistributionResp.java b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/resp/DashboardGeoDistributionResp.java similarity index 96% rename from continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/DashboardGeoDistributionResp.java rename to continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/resp/DashboardGeoDistributionResp.java index e1b2e63f..6edc4440 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/DashboardGeoDistributionResp.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/resp/DashboardGeoDistributionResp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.monitor.model.resp; +package top.charles7c.continew.admin.monitor.model.resp; import java.io.Serial; import java.io.Serializable; diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/DashboardPopularModuleResp.java b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/resp/DashboardPopularModuleResp.java similarity index 96% rename from continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/DashboardPopularModuleResp.java rename to continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/resp/DashboardPopularModuleResp.java index af98e12b..ad8413ce 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/DashboardPopularModuleResp.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/resp/DashboardPopularModuleResp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.monitor.model.resp; +package top.charles7c.continew.admin.monitor.model.resp; import java.io.Serial; import java.io.Serializable; diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/DashboardTotalResp.java b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/resp/DashboardTotalResp.java similarity index 96% rename from continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/DashboardTotalResp.java rename to continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/resp/DashboardTotalResp.java index 92ca1271..6d89aab2 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/DashboardTotalResp.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/resp/DashboardTotalResp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.monitor.model.resp; +package top.charles7c.continew.admin.monitor.model.resp; import java.io.Serial; import java.io.Serializable; diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/LogResp.java b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/resp/LogResp.java similarity index 96% rename from continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/LogResp.java rename to continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/resp/LogResp.java index 37494a82..9c31d379 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/LogResp.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/resp/LogResp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.monitor.model.resp; +package top.charles7c.continew.admin.monitor.model.resp; import java.io.Serial; import java.io.Serializable; diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/LoginLogResp.java b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/resp/LoginLogResp.java similarity index 93% rename from continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/LoginLogResp.java rename to continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/resp/LoginLogResp.java index 2db994c3..95ee0b9a 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/LoginLogResp.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/resp/LoginLogResp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.monitor.model.resp; +package top.charles7c.continew.admin.monitor.model.resp; import java.io.Serial; @@ -22,7 +22,7 @@ import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import top.charles7c.cnadmin.monitor.enums.LogStatusEnum; +import top.charles7c.continew.admin.monitor.enums.LogStatusEnum; /** * 登录日志信息 diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/OperationLogResp.java b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/resp/OperationLogResp.java similarity index 94% rename from continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/OperationLogResp.java rename to continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/resp/OperationLogResp.java index a5e3ffb1..42a9a13b 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/OperationLogResp.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/resp/OperationLogResp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.monitor.model.resp; +package top.charles7c.continew.admin.monitor.model.resp; import java.io.Serial; @@ -22,7 +22,7 @@ import lombok.Data; import io.swagger.v3.oas.annotations.media.Schema; -import top.charles7c.cnadmin.monitor.enums.LogStatusEnum; +import top.charles7c.continew.admin.monitor.enums.LogStatusEnum; /** * 操作日志信息 diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/SystemLogDetailResp.java b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/resp/SystemLogDetailResp.java similarity index 97% rename from continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/SystemLogDetailResp.java rename to continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/resp/SystemLogDetailResp.java index a9364606..ddf14d5c 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/SystemLogDetailResp.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/resp/SystemLogDetailResp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.monitor.model.resp; +package top.charles7c.continew.admin.monitor.model.resp; import java.io.Serial; diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/SystemLogResp.java b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/resp/SystemLogResp.java similarity index 97% rename from continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/SystemLogResp.java rename to continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/resp/SystemLogResp.java index e21bbdd5..ccf6ce46 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/model/resp/SystemLogResp.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/model/resp/SystemLogResp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.monitor.model.resp; +package top.charles7c.continew.admin.monitor.model.resp; import java.io.Serial; diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/DashboardService.java b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/service/DashboardService.java similarity index 77% rename from continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/DashboardService.java rename to continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/service/DashboardService.java index 05e48958..4decab1b 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/DashboardService.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/service/DashboardService.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package top.charles7c.cnadmin.monitor.service; +package top.charles7c.continew.admin.monitor.service; import java.util.List; -import top.charles7c.cnadmin.monitor.model.resp.DashboardAccessTrendResp; -import top.charles7c.cnadmin.monitor.model.resp.DashboardGeoDistributionResp; -import top.charles7c.cnadmin.monitor.model.resp.DashboardPopularModuleResp; -import top.charles7c.cnadmin.monitor.model.resp.DashboardTotalResp; -import top.charles7c.cnadmin.system.model.resp.DashboardAnnouncementResp; +import top.charles7c.continew.admin.monitor.model.resp.DashboardAccessTrendResp; +import top.charles7c.continew.admin.monitor.model.resp.DashboardGeoDistributionResp; +import top.charles7c.continew.admin.monitor.model.resp.DashboardPopularModuleResp; +import top.charles7c.continew.admin.monitor.model.resp.DashboardTotalResp; +import top.charles7c.continew.admin.system.model.resp.DashboardAnnouncementResp; /** * 仪表盘业务接口 diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/LogService.java b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/service/LogService.java similarity index 89% rename from continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/LogService.java rename to continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/service/LogService.java index 7526df8d..731e49a4 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/LogService.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/service/LogService.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package top.charles7c.cnadmin.monitor.service; +package top.charles7c.continew.admin.monitor.service; import java.util.List; import java.util.Map; -import top.charles7c.cnadmin.monitor.model.query.LoginLogQuery; -import top.charles7c.cnadmin.monitor.model.query.OperationLogQuery; -import top.charles7c.cnadmin.monitor.model.query.SystemLogQuery; -import top.charles7c.cnadmin.monitor.model.resp.*; +import top.charles7c.continew.admin.monitor.model.query.LoginLogQuery; +import top.charles7c.continew.admin.monitor.model.query.OperationLogQuery; +import top.charles7c.continew.admin.monitor.model.query.SystemLogQuery; +import top.charles7c.continew.admin.monitor.model.resp.*; import top.charles7c.continew.starter.extension.crud.model.query.PageQuery; import top.charles7c.continew.starter.extension.crud.model.resp.PageDataResp; diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/DashboardServiceImpl.java b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/service/impl/DashboardServiceImpl.java similarity index 83% rename from continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/DashboardServiceImpl.java rename to continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/service/impl/DashboardServiceImpl.java index 254e6609..38f546c5 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/DashboardServiceImpl.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/service/impl/DashboardServiceImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.monitor.service.impl; +package top.charles7c.continew.admin.monitor.service.impl; import java.math.BigDecimal; import java.util.List; @@ -29,15 +29,15 @@ import org.springframework.stereotype.Service; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.NumberUtil; -import top.charles7c.cnadmin.common.constant.CacheConstants; -import top.charles7c.cnadmin.monitor.model.resp.DashboardAccessTrendResp; -import top.charles7c.cnadmin.monitor.model.resp.DashboardGeoDistributionResp; -import top.charles7c.cnadmin.monitor.model.resp.DashboardPopularModuleResp; -import top.charles7c.cnadmin.monitor.model.resp.DashboardTotalResp; -import top.charles7c.cnadmin.monitor.service.DashboardService; -import top.charles7c.cnadmin.monitor.service.LogService; -import top.charles7c.cnadmin.system.model.resp.DashboardAnnouncementResp; -import top.charles7c.cnadmin.system.service.AnnouncementService; +import top.charles7c.continew.admin.common.constant.CacheConstants; +import top.charles7c.continew.admin.monitor.model.resp.DashboardAccessTrendResp; +import top.charles7c.continew.admin.monitor.model.resp.DashboardGeoDistributionResp; +import top.charles7c.continew.admin.monitor.model.resp.DashboardPopularModuleResp; +import top.charles7c.continew.admin.monitor.model.resp.DashboardTotalResp; +import top.charles7c.continew.admin.monitor.service.DashboardService; +import top.charles7c.continew.admin.monitor.service.LogService; +import top.charles7c.continew.admin.system.model.resp.DashboardAnnouncementResp; +import top.charles7c.continew.admin.system.service.AnnouncementService; /** * 仪表盘业务实现 diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/LogServiceImpl.java b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/service/impl/LogServiceImpl.java similarity index 91% rename from continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/LogServiceImpl.java rename to continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/service/impl/LogServiceImpl.java index 01a6e329..fe7cef22 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/LogServiceImpl.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/continew/admin/monitor/service/impl/LogServiceImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package top.charles7c.cnadmin.monitor.service.impl; +package top.charles7c.continew.admin.monitor.service.impl; import java.util.List; import java.util.Map; @@ -33,14 +33,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; -import top.charles7c.cnadmin.common.constant.SysConstants; -import top.charles7c.cnadmin.monitor.mapper.LogMapper; -import top.charles7c.cnadmin.monitor.model.entity.LogDO; -import top.charles7c.cnadmin.monitor.model.query.LoginLogQuery; -import top.charles7c.cnadmin.monitor.model.query.OperationLogQuery; -import top.charles7c.cnadmin.monitor.model.query.SystemLogQuery; -import top.charles7c.cnadmin.monitor.model.resp.*; -import top.charles7c.cnadmin.monitor.service.LogService; +import top.charles7c.continew.admin.common.constant.SysConstants; +import top.charles7c.continew.admin.monitor.mapper.LogMapper; +import top.charles7c.continew.admin.monitor.model.entity.LogDO; +import top.charles7c.continew.admin.monitor.model.query.LoginLogQuery; +import top.charles7c.continew.admin.monitor.model.query.OperationLogQuery; +import top.charles7c.continew.admin.monitor.model.query.SystemLogQuery; +import top.charles7c.continew.admin.monitor.model.resp.*; +import top.charles7c.continew.admin.monitor.service.LogService; import top.charles7c.continew.starter.core.util.ExceptionUtils; import top.charles7c.continew.starter.extension.crud.base.CommonUserService; import top.charles7c.continew.starter.extension.crud.model.query.PageQuery; diff --git a/continew-admin-monitor/src/main/resources/mapper/LogMapper.xml b/continew-admin-monitor/src/main/resources/mapper/LogMapper.xml index 3078ace4..2113df1d 100644 --- a/continew-admin-monitor/src/main/resources/mapper/LogMapper.xml +++ b/continew-admin-monitor/src/main/resources/mapper/LogMapper.xml @@ -1,7 +1,7 @@ - - SELECT (SELECT COUNT(*) FROM `sys_log`) AS pvCount, (SELECT COUNT(DISTINCT `client_ip`) FROM `sys_log`) AS ipCount, @@ -10,7 +10,7 @@ + resultType="top.charles7c.continew.admin.system.model.resp.DashboardAnnouncementResp"> SELECT `id`, `title`, `type` FROM `sys_announcement` diff --git a/continew-admin-system/src/main/resources/mapper/DeptMapper.xml b/continew-admin-system/src/main/resources/mapper/DeptMapper.xml index 85cdefad..45ba81ed 100644 --- a/continew-admin-system/src/main/resources/mapper/DeptMapper.xml +++ b/continew-admin-system/src/main/resources/mapper/DeptMapper.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/continew-admin-system/src/main/resources/mapper/DictItemMapper.xml b/continew-admin-system/src/main/resources/mapper/DictItemMapper.xml index 9ae2bd61..84e2355b 100644 --- a/continew-admin-system/src/main/resources/mapper/DictItemMapper.xml +++ b/continew-admin-system/src/main/resources/mapper/DictItemMapper.xml @@ -1,7 +1,7 @@ - - SELECT t1.`label`, t1.`value`, t1.`color` FROM `sys_dict_item` AS t1 LEFT JOIN `sys_dict` AS t2 ON t1.`dict_id` = t2.`id` diff --git a/continew-admin-system/src/main/resources/mapper/MenuMapper.xml b/continew-admin-system/src/main/resources/mapper/MenuMapper.xml index 43ec6107..24fa3c4f 100644 --- a/continew-admin-system/src/main/resources/mapper/MenuMapper.xml +++ b/continew-admin-system/src/main/resources/mapper/MenuMapper.xml @@ -1,6 +1,6 @@ - + - SELECT t1.* FROM `sys_menu` AS t1 LEFT JOIN `sys_role_menu` AS t2 ON t2.`menu_id` = t1.`id` diff --git a/continew-admin-system/src/main/resources/mapper/MessageMapper.xml b/continew-admin-system/src/main/resources/mapper/MessageMapper.xml index d33bf8bb..14046597 100644 --- a/continew-admin-system/src/main/resources/mapper/MessageMapper.xml +++ b/continew-admin-system/src/main/resources/mapper/MessageMapper.xml @@ -1,7 +1,7 @@ - - SELECT t1.*, t2.`user_id`, diff --git a/continew-admin-system/src/main/resources/mapper/MessageUserMapper.xml b/continew-admin-system/src/main/resources/mapper/MessageUserMapper.xml index 75c22de6..e8b6a909 100644 --- a/continew-admin-system/src/main/resources/mapper/MessageUserMapper.xml +++ b/continew-admin-system/src/main/resources/mapper/MessageUserMapper.xml @@ -1,6 +1,6 @@ - + SELECT `menu_id` FROM `sys_role_menu` diff --git a/continew-admin-system/src/main/resources/mapper/UserMapper.xml b/continew-admin-system/src/main/resources/mapper/UserMapper.xml index 1f557b7e..b50032d6 100644 --- a/continew-admin-system/src/main/resources/mapper/UserMapper.xml +++ b/continew-admin-system/src/main/resources/mapper/UserMapper.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/continew-admin-system/src/main/resources/mapper/UserSocialMapper.xml b/continew-admin-system/src/main/resources/mapper/UserSocialMapper.xml index 2468a21a..9ab3e216 100644 --- a/continew-admin-system/src/main/resources/mapper/UserSocialMapper.xml +++ b/continew-admin-system/src/main/resources/mapper/UserSocialMapper.xml @@ -1,8 +1,8 @@ - +