From 1669aa5f7ae4563bb61d16290d43204baca57ec9 Mon Sep 17 00:00:00 2001
From: wangyu <727842003@qq.com>
Date: Thu, 4 Jul 2024 08:56:35 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8C=85=E5=90=8D=E8=A7=84=E8=8C=83?=
=?UTF-8?q?=EF=BC=8C=E5=87=86=E5=A4=87=E4=B8=8A=E4=B8=AD=E5=A4=AE=E4=BB=93?=
=?UTF-8?q?=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
flyfish-approval/pom.xml | 4 +--
.../repository/ApproveRecordRepository.java | 11 ------
.../approval/auditor/ApproveAuditor.java | 8 ++---
.../auditor/ApproveRecordAuditor.java | 6 ++--
.../controller/ApprovalController.java | 30 ++++++++--------
.../controller/ApproveRecordController.java | 8 ++---
.../approval/domain/ApprovalDomain.java | 8 ++---
.../approval/domain/ApprovalDomainQo.java | 14 ++++----
.../approval/domain/ApprovalDomainVo.java | 6 ++--
.../approval/domain/record/ApproveRecord.java | 6 ++--
.../domain/record/ApproveRecordListVo.java | 7 ++--
.../domain/record/ApproveRecordQo.java | 6 ++--
.../domain/submit/ApprovalSubmitDto.java | 2 +-
.../approval/domain/todo/ApprovalDto.java | 4 +--
.../approval/domain/todo/ApprovalListVo.java | 7 ++--
.../approval/enums/ApproveAction.java | 4 +--
.../approval/enums/ApproveStatus.java | 4 +--
.../repository/ApproveRecordRepository.java | 11 ++++++
.../service/ApproveRecordService.java | 6 ++--
.../service/ModuleDelegateService.java | 22 ++++++------
flyfish-backup/pom.xml | 4 +--
.../backup/repository/BackupRepository.java | 12 -------
.../backup/config/VersionConfig.java | 2 +-
.../backup/config/VersionProperties.java | 2 +-
.../backup/controller/BackupController.java | 12 +++----
.../backup/controller/VersionController.java | 2 +-
.../framework/backup/domain/Backup.java | 6 ++--
.../framework/backup/domain/Version.java | 4 +--
.../backup/repository/BackupRepository.java | 12 +++++++
.../backup/scheduler/BackupIndex.java | 2 +-
.../backup/scheduler/BackupScheduler.java | 14 ++++----
.../backup/service/BackupService.java | 6 ++--
.../backup/service/VersionService.java | 7 ++--
flyfish-common/pom.xml | 2 +-
.../flyfish/framework/bean/BaseResponse.java | 2 +-
.../flyfish/framework/bean/EnumValue.java | 2 +-
.../framework/bean/ListRestResponse.java | 2 +-
.../flyfish/framework/bean/ObjectMap.java | 2 +-
.../framework/bean/ObjectRestResponse.java | 2 +-
.../flyfish/framework/bean/PageBean.java | 4 +--
.../flyfish/framework/bean/PageResult.java | 2 +-
.../flyfish/framework/bean/Result.java | 4 +--
.../framework/bean/TableResultResponse.java | 2 +-
.../flyfish/framework/bean/TreeNode.java | 2 +-
.../bean/auth/TokenErrorResponse.java | 6 ++--
.../bean/auth/TokenForbiddenResponse.java | 6 ++--
.../compiler/DynamicJavaCompiler.java | 6 ++--
.../framework/compiler/core/ClassLoaders.java | 2 +-
.../compiler/core/DynamicClassLoader.java | 2 +-
.../compiler/core/JavaStringCompiler.java | 2 +-
.../compiler/core/MemoryClassLoader.java | 2 +-
.../compiler/core/MemoryJavaFileManager.java | 2 +-
.../compiler/core/VendorJavaCompiler.java | 2 +-
.../support/DelegateJavaCompiler.java | 6 ++--
.../compiler/support/JavaSource.java | 2 +-
.../compiler/support/SimpleJavaCompiler.java | 6 ++--
.../compiler/support/StringJavaObject.java | 2 +-
.../compiler/template/TemplateCompiler.java | 4 +--
.../config/FrameworkConfiguration.java | 2 +-
.../framework/constant/CommonConstants.java | 2 +-
.../framework/constant/Frameworks.java | 4 +--
.../framework/constant/ReactiveConstants.java | 2 +-
.../framework/constant/RestCodeConstants.java | 2 +-
.../framework/constant/UserConstant.java | 2 +-
.../framework/context/DateContext.java | 2 +-
.../framework/context/ReactiveContext.java | 2 +-
.../framework/context/SpringContext.java | 4 +--
.../flyfish/framework/enums/BlankEnum.java | 2 +-
.../framework/enums/CodeBasedEnum.java | 2 +-
.../flyfish/framework/enums/NamedEnum.java | 2 +-
.../flyfish/framework/enums/RoleType.java | 2 +-
.../flyfish/framework/enums/UserStatus.java | 2 +-
.../flyfish/framework/enums/UserType.java | 2 +-
.../framework/exception/BaseException.java | 2 +-
.../auth/ClientForbiddenException.java | 6 ++--
.../auth/ClientInvalidException.java | 6 ++--
.../exception/auth/ClientTokenException.java | 6 ++--
.../exception/auth/UserInvalidException.java | 6 ++--
.../exception/auth/UserTokenException.java | 6 ++--
.../exception/biz/DataLackException.java | 4 +--
.../biz/InvalidBusinessException.java | 4 +--
.../flyfish/framework/utils/Assert.java | 4 +--
.../flyfish/framework/utils/Builder.java | 2 +-
.../utils/ClassPathResourceScanner.java | 2 +-
.../flyfish/framework/utils/EntityUtils.java | 2 +-
.../flyfish/framework/utils/EnumUtils.java | 4 +--
.../flyfish/framework/utils/JacksonUtil.java | 2 +-
.../flyfish/framework/utils/LRUCache.java | 2 +-
.../flyfish/framework/utils/MapBuilder.java | 2 +-
.../framework/utils/ReflectionUtils.java | 2 +-
.../framework/utils/StringFormats.java | 2 +-
.../flyfish/framework/utils/StringHelper.java | 2 +-
.../flyfish/framework/utils/Supportable.java | 2 +-
.../flyfish/framework/utils/TreeUtil.java | 4 +--
.../flyfish/framework/utils/UUIDUtils.java | 2 +-
.../validation/annotations/ContainsBean.java | 4 +--
.../validation/annotations/IdCard.java | 7 ++--
.../validation/annotations/IsJSONString.java | 4 +--
.../validation/annotations/Money.java | 6 ++--
.../validation/annotations/Password.java | 7 ++--
.../validation/annotations/Phone.java | 6 ++--
.../validation/annotations/UniqueField.java | 6 ++--
.../framework/validation/enums/PhoneType.java | 2 +-
.../validation/groups/CodeValid.java | 2 +-
.../validation/groups/NameValid.java | 2 +-
.../validation/spi/ConditionalGroup.java | 2 +-
.../spi/ConditionalValidGroupProvider.java | 2 +-
.../validators/ContainsBeanValidator.java | 6 ++--
.../validators/IdCardValidator.java | 4 +--
.../validators/IsJSONStringValidator.java | 4 +--
.../validation/validators/MoneyValidator.java | 4 +--
.../validators/PasswordValidator.java | 6 ++--
.../validation/validators/PhoneValidator.java | 6 ++--
.../validators/UniqueFieldValidator.java | 4 +--
flyfish-data/flyfish-data-common/pom.xml | 6 ++--
.../annotations/EnableEnumEndpoint.java | 6 ++--
.../annotations/EnablePropertyEncrypt.java | 4 +--
.../framework/auditor/AuthorizeAuditor.java | 6 ++--
.../framework/auditor/BeanAuditor.java | 4 +--
.../flyfish/framework/auditor/BeanPoster.java | 4 +--
.../framework/auditor/CommonBeanAuditor.java | 8 ++---
.../framework/auditor/OperationAuditor.java | 8 ++---
.../auditor/ReactiveAuthorizeAuditor.java | 6 ++--
.../auditor/ReactiveBeanAuditor.java | 4 +--
.../framework/auditor/ReactiveBeanPoster.java | 4 +--
.../auditor/ReactiveCommonBeanAuditor.java | 8 ++---
.../auditor/ReactiveOperationAuditor.java | 6 ++--
.../auditor/callback/AuditorCallback.java | 10 +++---
.../callback/ReactiveAuditorCallback.java | 10 +++---
.../framework/config/CodeRuleConfig.java | 2 +-
.../framework/config/DecryptConfig.java | 4 +--
.../flyfish/framework/config/EnumConfig.java | 12 +++----
.../AESEncryptablePropertyResolver.java | 4 +--
.../context/ReactiveUserContext.java | 4 +--
.../framework/context/UserContext.java | 4 +--
.../authorized/AbstractAuthorizedQo.java | 10 +++---
.../domain/authorized/AuthorizedQo.java | 8 ++---
.../advanced/OwnedAuthorizedQo.java | 12 +++----
.../flyfish/framework/domain/base/BaseQo.java | 10 +++---
.../framework/domain/base/NameLikeQo.java | 6 ++--
.../framework/domain/base/SimpleQo.java | 4 +--
.../framework/domain/package-info.java | 2 +-
.../flyfish/framework/domain/tree/TreeQo.java | 8 ++---
.../framework/generation/code/CodeRules.java | 14 ++++----
.../strategy/TransactionCodeRuleStrategy.java | 6 ++--
.../code/strategy/UUIDCodeRuleStrategy.java | 8 ++---
.../generation/property/GenerateStrategy.java | 4 +--
.../generation/property/Generations.java | 10 +++---
.../framework/query/LambdaQueryChain.java | 11 +++---
.../framework/query/NamedQueryChain.java | 8 ++---
.../flyfish/framework/query/Queries.java | 10 +++---
.../flyfish/framework/query/Query.java | 4 +--
.../flyfish/framework/query/QueryChain.java | 12 +++----
.../framework/query/QueryCondition.java | 2 +-
.../framework/query/QueryDefinition.java | 10 +++---
.../framework/query/QueryFactories.java | 6 ++--
.../framework/query/QueryMutation.java | 6 ++--
.../flyfish/framework/query/README.md | 0
.../query/chain/DefaultLambdaQueryChain.java | 10 +++---
.../query/chain/DefaultNamedQueryChain.java | 6 ++--
.../query/chain/DefaultQueryChain.java | 14 ++++----
.../query/chain/DefaultQueryChainHolder.java | 8 ++---
.../query/chain/DefaultQueryCondition.java | 10 +++---
.../query/chain/DefaultQueryMutation.java | 9 ++---
.../query/holder/QueryChainHolder.java | 4 +--
.../framework/query/spi/QueryFactory.java | 10 +++---
.../query/spi/adaptor/CriteriaAdaptor.java | 4 +--
.../query/spi/converter/QueryConverter.java | 4 +--
.../query/support/DomainFunction.java | 4 +--
.../query/support/EntityNameUtils.java | 6 ++--
.../framework/query/support/SFunction.java | 2 +-
.../query/support/SerializedLambda.java | 2 +-
.../repository/DefaultReactiveRepository.java | 4 +--
.../repository/DefaultRepository.java | 7 ++--
.../repository/QueryModelExecutor.java | 4 +--
.../repository/ReactiveEntityOperations.java | 8 ++---
.../ReactiveQueryModelExecutor.java | 4 +--
.../repository/base/DomainRepository.java | 2 +-
.../flyfish/framework/utils/CopyUtils.java | 4 +--
.../flyfish/framework/utils/DataUtils.java | 4 +--
.../framework/utils/DateRangeUtil.java | 2 +-
.../flyfish/framework/utils/DepartUtils.java | 14 ++++----
.../flyfish/framework/utils/FieldUtils.java | 2 +-
.../flyfish/framework/utils/HexUtils.java | 2 +-
flyfish-data/flyfish-data-domain/pom.xml | 6 ++--
.../framework/annotations/CodeRule.java | 4 +--
.../framework/annotations/ComputedProps.java | 4 +--
.../framework/annotations/ConditionOn.java | 4 +--
.../framework/annotations/DBRefValue.java | 4 +--
.../framework/annotations/DateRange.java | 2 +-
.../framework/annotations/DictValue.java | 6 ++--
.../framework/annotations/EnumValue.java | 4 +--
.../framework/annotations/FormItem.java | 2 +-
.../framework/annotations/Generation.java | 2 +-
.../framework/annotations/MappedTo.java | 2 +-
.../framework/annotations/Operation.java | 2 +-
.../flyfish/framework/annotations/Order.java | 2 +-
.../framework/annotations/Properties.java | 2 +-
.../framework/annotations/Property.java | 2 +-
.../framework/annotations/PropertyGroup.java | 2 +-
.../framework/annotations/PropertyGroups.java | 2 +-
.../annotations/query/QueryField.java | 4 +--
.../framework/context/ViewModelContext.java | 4 +--
.../interceptor/ViewModelInterceptor.java | 2 +-
.../domain/authorized/AuthorizedDomain.java | 6 ++--
.../authorized/AuthorizedUserDetails.java | 2 +-
.../domain/authorized/AuthorizedVo.java | 4 +--
.../advanced/OwnedAuthorizedDomain.java | 11 +++---
.../framework/domain/base/AuditDomain.java | 4 +--
.../flyfish/framework/domain/base/Domain.java | 10 +++---
.../framework/domain/base/DomainService.java | 2 +-
.../flyfish/framework/domain/base/Dto.java | 2 +-
.../flyfish/framework/domain/base/IUser.java | 12 +++----
.../flyfish/framework/domain/base/Named.java | 2 +-
.../flyfish/framework/domain/base/Po.java | 2 +-
.../flyfish/framework/domain/base/Qo.java | 2 +-
.../flyfish/framework/domain/base/Vo.java | 4 +--
.../framework/domain/po/Department.java | 4 +--
.../framework/domain/po/ExcelMapping.java | 4 +--
.../framework/domain/po/Permission.java | 6 ++--
.../flyfish/framework/domain/po/Role.java | 10 +++---
.../flyfish/framework/domain/po/User.java | 14 ++++----
.../framework/domain/tree/RootTreeNode.java | 2 +-
.../framework/domain/tree/TreeDomain.java | 4 +--
.../generation/CodeRuleStrategy.java | 4 +--
flyfish-data/flyfish-data-mongodb/pom.xml | 4 +--
.../mongodb/builder/CriteriaBuilder.java | 8 ++---
.../mongodb/config/MongoDataConfig.java | 28 +++++++--------
.../config/annotations/EnableMongoRepo.java | 6 ++--
.../annotations/EnableReactiveMongoRepo.java | 6 ++--
.../callback/MongoAuditorMongoCallback.java | 6 ++--
.../MongoReactiveAuditorMongoCallback.java | 6 ++--
.../MongoReactiveEntityOperations.java | 8 ++---
.../mongodb/query/MongoQueryFactory.java | 14 ++++----
.../query/adaptor/MongoCriteriaAdaptor.java | 8 ++---
.../query/converter/MongoQueryConverter.java | 10 +++---
.../DefaultReactiveRepositoryFactory.java | 4 +--
.../DefaultReactiveRepositoryFactoryBean.java | 2 +-
.../factory/DefaultRepositoryFactory.java | 4 +--
.../factory/DefaultRepositoryFactoryBean.java | 2 +-
.../impl/DefaultReactiveRepositoryImpl.java | 8 ++---
.../impl/DefaultRepositoryImpl.java | 8 ++---
.../impl/ReactivePageableExecutionUtils.java | 2 +-
.../mongodb/utils/CriteriaUtils.java | 2 +-
.../main/resources/META-INF/spring.factories | 6 ++--
.../flyfish/test/mongo/repository/TestQO.java | 7 ----
.../test/mongo/MongoRepositoryTest.java | 14 ++++----
.../flyfish/test/mongo/repository/TestDO.java | 4 +--
.../flyfish/test/mongo/repository/TestQO.java | 7 ++++
.../test/mongo/repository/TestRepository.java | 4 +--
flyfish-data/flyfish-data-r2dbc/pom.xml | 6 ++--
.../r2dbc/config/R2dbcDataConfig.java | 26 +++++++-------
.../config/annotations/EnableR2dbcRepo.java | 6 ++--
.../config/callback/AssociationFetcher.java | 18 +++++-----
.../config/callback/AssociationWriter.java | 14 ++++----
.../callback/ReferenceR2dbcCallback.java | 18 +++++-----
.../config/callback/RepositoryProvider.java | 6 ++--
.../config/mapping/AdditionalConverters.java | 4 +--
.../mapping/FullMappingR2dbcConverter.java | 4 +--
.../FullReactiveDataAccessStrategy.java | 4 +--
.../r2dbc/metadata/R2dbcMetadataManager.java | 4 +--
.../r2dbc/metadata/R2dbcTableMetadata.java | 14 ++++----
.../impl/SimpleR2dbcMetadataManager.java | 12 +++----
.../metadata/reference/R2dbcAssociation.java | 6 ++--
.../metadata/reference/R2dbcCollection.java | 6 ++--
.../metadata/reference/R2dbcRelation.java | 8 ++---
.../reference/field/DefaultFieldAccessor.java | 4 +--
.../reference/field/FieldAccessor.java | 4 +--
.../metadata/visitor/MetadataHandler.java | 10 +++---
.../metadata/visitor/MetadataVisitor.java | 4 +--
.../visitor/R2dbcTableMetadataVisitor.java | 12 +++----
.../R2dbcReactiveEntityOperations.java | 8 ++---
.../r2dbc/query/R2dbcQueryFactory.java | 14 ++++----
.../r2dbc/query/adaptor/FunctionCriteria.java | 4 +--
.../query/adaptor/R2dbcCriteriaAdaptor.java | 6 ++--
.../query/converter/R2dbcQueryConverter.java | 12 +++----
.../DefaultReactiveRepositoryFactory.java | 4 +--
.../DefaultReactiveRepositoryFactoryBean.java | 2 +-
.../impl/QueryingR2dbcReactiveRepository.java | 8 ++---
.../impl/ReactivePageableExecutionUtils.java | 2 +-
.../data/r2dbc/query/FullUpdateMapper.java | 2 +-
.../main/resources/META-INF/spring.factories | 6 ++--
.../framework/r2dbc/domain/TestQO.java | 7 ----
.../r2dbc/repository/TestAssoRepository.java | 10 ------
.../r2dbc/repository/TestChildRepository.java | 10 ------
.../r2dbc/repository/TestOtherRepository.java | 10 ------
.../framework/r2dbc/R2DbcRepositoryTest.java | 16 ++++-----
.../framework/r2dbc/domain/TestDO.java | 12 +++----
.../framework/r2dbc/domain/TestQO.java | 7 ++++
.../r2dbc/domain/reference/TestAsso.java | 4 +--
.../r2dbc/domain/reference/TestChild.java | 6 ++--
.../r2dbc/domain/reference/TestOther.java | 6 ++--
.../r2dbc/repository/TestAssoRepository.java | 10 ++++++
.../r2dbc/repository/TestChildRepository.java | 10 ++++++
.../r2dbc/repository/TestOtherRepository.java | 10 ++++++
.../r2dbc/repository/TestRepository.java | 6 ++--
flyfish-data/flyfish-data-relational/pom.xml | 2 +-
.../framework/relational/package-info.java | 1 -
.../relational/mapping/Association.java | 2 +-
.../framework/relational/package-info.java | 1 +
flyfish-data/pom.xml | 2 +-
flyfish-dict/pom.xml | 8 ++---
.../controller/AutoCompleteController.java | 10 ------
.../dict/controller/DictionaryController.java | 17 ---------
.../repository/AutoCompleteRepository.java | 7 ----
.../dict/service/AutoCompleteService.java | 9 -----
.../dict/annotations/EnableDictProcess.java | 8 ++---
.../dict/config/DictionaryConfig.java | 4 +--
.../dict/config/DictionaryProcessor.java | 20 +++++------
.../controller/AutoCompleteController.java | 10 ++++++
.../dict/controller/DictionaryController.java | 17 +++++++++
.../framework/dict/domain/AutoComplete.java | 4 +--
.../framework/dict/domain/Dictionary.java | 4 +--
.../framework/dict/domain/DictionaryQo.java | 6 ++--
.../dict/domain/DictionaryValue.java | 2 +-
.../handler/DictAnnotationInterceptor.java | 12 +++----
.../repository/AutoCompleteRepository.java | 7 ++++
.../dict/repository/DictionaryRepository.java | 8 ++---
.../dict/service/AutoCompleteService.java | 9 +++++
.../dict/service/DictionaryService.java | 10 +++---
.../flyfish/framework/dict/package-info.java | 1 -
.../framework/dict/FlyfishDictTest.java | 18 +++++-----
.../flyfish/framework/dict/package-info.java | 1 +
flyfish-file/pom.xml | 4 +--
.../framework/file/domain/AttachmentQo.java | 7 ----
.../file/repository/AttachmentRepository.java | 8 -----
.../file/config/UploadConfiguration.java | 4 +--
.../file/controller/AttachmentController.java | 8 ++---
.../AttachmentUploadController.java | 14 ++++----
.../file/controller/MediaController.java | 12 +++----
.../framework/file/domain/Attachment.java | 6 ++--
.../framework/file/domain/AttachmentQo.java | 7 ++++
.../flyfish/framework/file/domain/Media.java | 4 +--
.../framework/file/enums/MediaType.java | 2 +-
.../framework/file/enums/MediaTypes.java | 2 +-
.../file/repository/AttachmentRepository.java | 8 +++++
.../file/service/AttachmentService.java | 8 ++---
.../framework/file/service/FileService.java | 6 ++--
.../framework/file/service/MediaService.java | 12 +++----
.../framework/file/utils/DownloadUtils.java | 4 +--
.../framework/file/utils/FileMD5Utils.java | 4 +--
.../framework/file/utils/FileSizeUtils.java | 2 +-
.../framework/file/utils/SystemUtils.java | 6 ++--
.../framework/file/utils/ZipUtils.java | 2 +-
flyfish-form/pom.xml | 8 ++---
.../form/repository/OnlineFormRepository.java | 10 ------
.../form/controller/OnlineFormController.java | 8 ++---
.../framework/form/domain/OnlineForm.java | 6 ++--
.../form/repository/OnlineFormRepository.java | 10 ++++++
.../form/service/OnlineFormService.java | 6 ++--
.../flyfish/framework/form/package-info.java | 1 -
.../framework/form/FlyfishFormTest.java | 16 ++++-----
.../flyfish/framework/form/package-info.java | 1 +
flyfish-logging/pom.xml | 4 +--
.../logging/controller/LogController.java | 16 ---------
.../logging/repository/LogRepository.java | 11 ------
.../framework/logging/advice/LogAdvice.java | 10 +++---
.../logging/annotation/EnableLogging.java | 4 +--
.../logging/config/LoggingConfig.java | 6 ++--
.../logging/config/LoggingTextModifier.java | 2 +-
.../logging/config/LoggingTextRegistry.java | 2 +-
.../logging/controller/LogController.java | 16 +++++++++
.../logging/domain/DomainDescriptions.java | 12 +++----
.../flyfish/framework/logging/domain/Log.java | 4 +--
.../framework/logging/domain/LogQo.java | 6 ++--
.../framework/logging/domain/LogType.java | 4 +--
.../logging/repository/LogRepository.java | 11 ++++++
.../framework/logging/service/LogContext.java | 14 ++++----
.../framework/logging/service/LogManager.java | 12 +++----
.../framework/logging/service/LogService.java | 6 ++--
.../service/SimpleAuthenticationLogger.java | 18 +++++-----
flyfish-user/pom.xml | 8 ++---
.../user/repository/DepartmentRepository.java | 12 -------
.../user/repository/PermissionRepository.java | 13 -------
.../user/repository/RoleRepository.java | 12 -------
.../framework/user/annotations/.gitkeep | 0
.../user/annotations/EnableAutoSecurity.java | 6 ++--
.../config/AuthenticationAuditorImpl.java | 16 ++++-----
.../framework/user/config/RSAKeys.java | 2 +-
.../user/config/WebSecurityConfig.java | 36 +++++++++----------
.../config/audit/ReactiveUserAuditor.java | 4 +--
.../user/config/audit/RoleBeanPoster.java | 10 +++---
.../user/config/audit/UserAuditor.java | 6 ++--
.../user/config/audit/UserBeanAuditor.java | 20 +++++------
.../config/captcha/AnjiCaptchaValidator.java | 6 ++--
.../user/config/captcha/CaptchaValidator.java | 2 +-
.../user/config/constants/UserCacheKeys.java | 2 +-
.../EncryptedAuthenticationConverter.java | 10 +++---
.../config/properties/SecurityProperties.java | 2 +-
.../user/controller/CaptchaController.java | 2 +-
.../user/controller/DepartmentController.java | 20 +++++------
.../user/controller/LoginController.java | 10 +++---
.../user/controller/PermissionController.java | 8 ++---
.../user/controller/RoleController.java | 8 ++---
.../user/controller/UserController.java | 30 ++++++++--------
.../user/domain/AdminUserDetails.java | 20 +++++------
.../framework/user/domain/DepartmentQo.java | 6 ++--
.../framework/user/domain/LoginDto.java | 2 +-
.../framework/user/domain/PermissionQo.java | 8 ++---
.../flyfish/framework/user/domain/RoleQo.java | 8 ++---
.../user/domain/UserPasswordDto.java | 4 +--
.../flyfish/framework/user/domain/UserQo.java | 8 ++---
.../user/initializer/UserInitializer.java | 2 +-
.../user/repository/DepartmentRepository.java | 12 +++++++
.../user/repository/PermissionRepository.java | 13 +++++++
.../user/repository/RoleRepository.java | 12 +++++++
.../user/repository/UserRepository.java | 6 ++--
.../user/service/DepartmentService.java | 6 ++--
.../FlyfishUserDetailsServiceImpl.java | 16 ++++-----
.../user/service/PermissionService.java | 6 ++--
.../framework/user/service/RoleService.java | 28 +++++++--------
.../user/service/UserDetailsConverter.java | 16 ++++-----
.../framework/user/service/UserService.java | 18 +++++-----
.../service/impl/DepartmentServiceHelper.java | 12 +++----
.../impl/MongoDepartmentServiceImpl.java | 13 ++++---
.../impl/R2dbcDepartmentServiceImpl.java | 15 ++++----
.../framework/user/utils/RSAUtils.java | 2 +-
.../framework/user/utils/StrengthUtils.java | 4 +--
.../framework/user/validation/.gitkeep | 0
.../flyfish/framework/web/package-info.java | 1 -
.../framework/web/FlyfishUserTest.java | 26 +++++++-------
.../flyfish/framework/web/package-info.java | 1 +
flyfish-web/pom.xml | 4 +--
.../repository/ExcelMappingRepository.java | 13 -------
.../excel/service/ExcelMappingService.java | 9 -----
.../flyfish/framework/bean/SyncVo.java | 4 +--
.../annotations/EnableRestBeanDetect.java | 8 ++---
.../beans/annotations/RestMapping.java | 2 +-
.../beans/enums/RestBeanCandidate.java | 4 +--
.../beans/enums/ValidationCandidate.java | 18 +++++-----
.../framework/beans/meta/BeanController.java | 14 ++++----
.../framework/beans/meta/BeanInfo.java | 2 +-
.../framework/beans/meta/BeanProperty.java | 29 +++++++--------
.../beans/meta/BeanPropertyGroup.java | 2 +-
.../beans/meta/BeanPropertyType.java | 4 +--
.../framework/beans/meta/BeanProps.java | 2 +-
.../framework/beans/meta/BeanValidation.java | 2 +-
.../framework/beans/meta/RestBean.java | 18 +++++-----
.../flyfish/framework/beans/meta/SubBean.java | 2 +-
.../beans/meta/builtin/BeanUris.java | 10 +++---
.../parser/BeanPropertyAnnotationParser.java | 2 +-
.../meta/parser/BeanPropertyAnnotations.java | 6 ++--
.../parser/SimpleBeanPropertyAnnotations.java | 14 ++++----
.../parser/chain/AnnotationChainSupport.java | 4 +--
.../BeanPropertyAnnotationBatchChain.java | 2 +-
.../chain/BeanPropertyAnnotationChain.java | 2 +-
.../impl/BasicAnnotationChainSupport.java | 6 ++--
.../chain/impl/EmptyAnnotationBatchChain.java | 6 ++--
.../chain/impl/EmptyAnnotationChain.java | 6 ++--
.../impl/SimpleAnnotationBatchChain.java | 6 ++--
.../chain/impl/SimpleAnnotationChain.java | 6 ++--
.../repository/CustomRepositoryBuilder.java | 2 +-
.../beans/repository/RepositoryRegistrar.java | 2 +-
.../RepositoryRegistrarComposite.java | 6 ++--
.../repository/SimpleRepositoryRegistrar.java | 2 +-
.../resolver/DynamicRestBeanResolver.java | 4 +--
.../framework/boot/FlyfishAppRunner.java | 5 ++-
.../flyfish/framework/config/BeanConfig.java | 4 +--
.../config/RestBeanAutoConfigure.java | 34 +++++++++---------
.../configuration/WebfluxConfig.java | 12 +++----
.../annotations/CurrentUser.java | 2 +-
.../configuration/annotations/PagedQuery.java | 2 +-
.../annotations/RequestContextBody.java | 2 +-
.../annotations/ValidRequestBody.java | 2 +-
.../framework/configuration/backup/.gitkeep | 0
.../boot/FlyfishApplication.java | 4 +--
.../configuration/jwt/JwtProperties.java | 2 +-
.../jwt/JwtSecurityContextRepository.java | 4 +--
.../configuration/jwt/TokenProvider.java | 6 ++--
.../framework/configuration/mail/.gitkeep | 0
.../redis/EnableReactiveRedis.java | 2 +-
.../configuration/redis/EnableRedis.java | 2 +-
.../redis/JacksonRedisSerializerFactory.java | 2 +-
.../redis/ReactiveRedisConfig.java | 4 +--
.../configuration/redis/RedisConfig.java | 4 +--
.../resolver/ModelAttributeFilter.java | 2 +-
.../resolver/PageParameterFilter.java | 2 +-
.../resolver/PageQueryArgumentResolver.java | 8 ++---
.../resolver/ParameterFilter.java | 2 +-
.../RequestContextBodyArgumentResolver.java | 9 +++--
.../resolver/SortParameterFilter.java | 2 +-
.../resolver/UserArgumentResolver.java | 8 ++---
...alidRequestBodyMethodArgumentResolver.java | 12 +++----
.../framework/controller/BaseController.java | 29 ++++++++-------
.../framework/controller/EnumController.java | 14 ++++----
.../framework/controller/SafeController.java | 2 +-
.../framework/controller/TreeController.java | 8 ++---
.../reactive/ReactiveBaseController.java | 20 +++++------
.../reactive/ReactiveTreeController.java | 12 +++----
.../controller/ExcelMappingController.java | 8 ++---
.../repository/ExcelMappingRepository.java | 13 +++++++
.../excel/service/ExcelMappingService.java | 9 +++++
.../handler/GlobalExceptionHandler.java | 16 ++++-----
.../JsonAuthenticationFailureHandler.java | 8 ++---
.../JsonAuthenticationSuccessHandler.java | 6 ++--
.../handler/JsonLogoutSuccessHandler.java | 8 ++---
.../service/AuthenticationAuditor.java | 6 ++--
.../service/AuthenticationLogger.java | 4 +--
.../service/BaseReactiveService.java | 11 +++---
.../framework/service/BaseService.java | 10 +++---
.../service/FlyfishUserDetailsService.java | 2 +-
.../framework/service/UserFindService.java | 6 ++--
.../service/impl/BaseReactiveServiceImpl.java | 22 ++++++------
.../service/impl/BaseServiceImpl.java | 20 +++++------
.../transform/DataBufferTransformer.java | 2 +-
.../transform/ResultDataTransformer.java | 6 ++--
.../transform/SharedDataBufferFactory.java | 2 +-
.../utils/AuthenticationMessages.java | 2 +-
.../flyfish/framework/utils/ClientUtil.java | 2 +-
.../utils/ReactiveRedisOperations.java | 2 +-
.../framework/utils/RedisOperations.java | 2 +-
.../flyfish/framework/utils/UserUtils.java | 6 ++--
.../templates/ReactiveViewController.tpl | 8 ++---
.../resources/templates/ViewController.tpl | 8 ++---
.../{com => dev}/flyfish/project/.gitkeep | 0
pom.xml | 8 ++---
516 files changed, 1695 insertions(+), 1717 deletions(-)
delete mode 100644 flyfish-approval/src/main/java/com/flyfish/framework/approval/repository/ApproveRecordRepository.java
rename flyfish-approval/src/main/java/{com => dev}/flyfish/framework/approval/auditor/ApproveAuditor.java (73%)
rename flyfish-approval/src/main/java/{com => dev}/flyfish/framework/approval/auditor/ApproveRecordAuditor.java (77%)
rename flyfish-approval/src/main/java/{com => dev}/flyfish/framework/approval/controller/ApprovalController.java (70%)
rename flyfish-approval/src/main/java/{com => dev}/flyfish/framework/approval/controller/ApproveRecordController.java (59%)
rename flyfish-approval/src/main/java/{com => dev}/flyfish/framework/approval/domain/ApprovalDomain.java (69%)
rename flyfish-approval/src/main/java/{com => dev}/flyfish/framework/approval/domain/ApprovalDomainQo.java (55%)
rename flyfish-approval/src/main/java/{com => dev}/flyfish/framework/approval/domain/ApprovalDomainVo.java (85%)
rename flyfish-approval/src/main/java/{com => dev}/flyfish/framework/approval/domain/record/ApproveRecord.java (82%)
rename flyfish-approval/src/main/java/{com => dev}/flyfish/framework/approval/domain/record/ApproveRecordListVo.java (83%)
rename flyfish-approval/src/main/java/{com => dev}/flyfish/framework/approval/domain/record/ApproveRecordQo.java (82%)
rename flyfish-approval/src/main/java/{com => dev}/flyfish/framework/approval/domain/submit/ApprovalSubmitDto.java (91%)
rename flyfish-approval/src/main/java/{com => dev}/flyfish/framework/approval/domain/todo/ApprovalDto.java (80%)
rename flyfish-approval/src/main/java/{com => dev}/flyfish/framework/approval/domain/todo/ApprovalListVo.java (81%)
rename flyfish-approval/src/main/java/{com => dev}/flyfish/framework/approval/enums/ApproveAction.java (72%)
rename flyfish-approval/src/main/java/{com => dev}/flyfish/framework/approval/enums/ApproveStatus.java (78%)
create mode 100644 flyfish-approval/src/main/java/dev/flyfish/framework/approval/repository/ApproveRecordRepository.java
rename flyfish-approval/src/main/java/{com => dev}/flyfish/framework/approval/service/ApproveRecordService.java (53%)
rename flyfish-approval/src/main/java/{com => dev}/flyfish/framework/approval/service/ModuleDelegateService.java (93%)
delete mode 100644 flyfish-backup/src/main/java/com/flyfish/framework/backup/repository/BackupRepository.java
rename flyfish-backup/src/main/java/{com => dev}/flyfish/framework/backup/config/VersionConfig.java (83%)
rename flyfish-backup/src/main/java/{com => dev}/flyfish/framework/backup/config/VersionProperties.java (92%)
rename flyfish-backup/src/main/java/{com => dev}/flyfish/framework/backup/controller/BackupController.java (70%)
rename flyfish-backup/src/main/java/{com => dev}/flyfish/framework/backup/controller/VersionController.java (83%)
rename flyfish-backup/src/main/java/{com => dev}/flyfish/framework/backup/domain/Backup.java (85%)
rename flyfish-backup/src/main/java/{com => dev}/flyfish/framework/backup/domain/Version.java (79%)
create mode 100644 flyfish-backup/src/main/java/dev/flyfish/framework/backup/repository/BackupRepository.java
rename flyfish-backup/src/main/java/{com => dev}/flyfish/framework/backup/scheduler/BackupIndex.java (94%)
rename flyfish-backup/src/main/java/{com => dev}/flyfish/framework/backup/scheduler/BackupScheduler.java (95%)
rename flyfish-backup/src/main/java/{com => dev}/flyfish/framework/backup/service/BackupService.java (69%)
rename flyfish-backup/src/main/java/{com => dev}/flyfish/framework/backup/service/VersionService.java (82%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/bean/BaseResponse.java (94%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/bean/EnumValue.java (87%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/bean/ListRestResponse.java (96%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/bean/ObjectMap.java (78%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/bean/ObjectRestResponse.java (94%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/bean/PageBean.java (96%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/bean/PageResult.java (96%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/bean/Result.java (98%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/bean/TableResultResponse.java (97%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/bean/TreeNode.java (95%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/bean/auth/TokenErrorResponse.java (59%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/bean/auth/TokenForbiddenResponse.java (60%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/compiler/DynamicJavaCompiler.java (85%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/compiler/core/ClassLoaders.java (83%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/compiler/core/DynamicClassLoader.java (93%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/compiler/core/JavaStringCompiler.java (98%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/compiler/core/MemoryClassLoader.java (98%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/compiler/core/MemoryJavaFileManager.java (98%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/compiler/core/VendorJavaCompiler.java (92%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/compiler/support/DelegateJavaCompiler.java (88%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/compiler/support/JavaSource.java (96%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/compiler/support/SimpleJavaCompiler.java (94%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/compiler/support/StringJavaObject.java (94%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/compiler/template/TemplateCompiler.java (96%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/config/FrameworkConfiguration.java (93%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/constant/CommonConstants.java (96%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/constant/Frameworks.java (81%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/constant/ReactiveConstants.java (76%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/constant/RestCodeConstants.java (82%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/constant/UserConstant.java (79%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/context/DateContext.java (98%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/context/ReactiveContext.java (91%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/context/SpringContext.java (94%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/enums/BlankEnum.java (82%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/enums/CodeBasedEnum.java (84%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/enums/NamedEnum.java (75%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/enums/RoleType.java (84%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/enums/UserStatus.java (90%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/enums/UserType.java (94%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/exception/BaseException.java (95%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/exception/auth/ClientForbiddenException.java (60%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/exception/auth/ClientInvalidException.java (59%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/exception/auth/ClientTokenException.java (59%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/exception/auth/UserInvalidException.java (59%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/exception/auth/UserTokenException.java (58%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/exception/biz/DataLackException.java (87%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/exception/biz/InvalidBusinessException.java (78%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/utils/Assert.java (99%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/utils/Builder.java (81%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/utils/ClassPathResourceScanner.java (98%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/utils/EntityUtils.java (97%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/utils/EnumUtils.java (90%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/utils/JacksonUtil.java (99%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/utils/LRUCache.java (97%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/utils/MapBuilder.java (95%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/utils/ReflectionUtils.java (99%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/utils/StringFormats.java (95%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/utils/StringHelper.java (96%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/utils/Supportable.java (83%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/utils/TreeUtil.java (95%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/utils/UUIDUtils.java (96%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/validation/annotations/ContainsBean.java (88%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/validation/annotations/IdCard.java (79%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/validation/annotations/IsJSONString.java (88%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/validation/annotations/Money.java (83%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/validation/annotations/Password.java (79%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/validation/annotations/Phone.java (84%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/validation/annotations/UniqueField.java (84%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/validation/enums/PhoneType.java (60%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/validation/groups/CodeValid.java (66%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/validation/groups/NameValid.java (66%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/validation/spi/ConditionalGroup.java (94%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/validation/spi/ConditionalValidGroupProvider.java (86%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/validation/validators/ContainsBeanValidator.java (78%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/validation/validators/IdCardValidator.java (90%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/validation/validators/IsJSONStringValidator.java (86%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/validation/validators/MoneyValidator.java (87%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/validation/validators/PasswordValidator.java (91%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/validation/validators/PhoneValidator.java (89%)
rename flyfish-common/src/main/java/{com => dev}/flyfish/framework/validation/validators/UniqueFieldValidator.java (94%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/annotations/EnableEnumEndpoint.java (71%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/annotations/EnablePropertyEncrypt.java (81%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/auditor/AuthorizeAuditor.java (77%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/auditor/BeanAuditor.java (76%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/auditor/BeanPoster.java (74%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/auditor/CommonBeanAuditor.java (78%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/auditor/OperationAuditor.java (83%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/auditor/ReactiveAuthorizeAuditor.java (87%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/auditor/ReactiveBeanAuditor.java (78%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/auditor/ReactiveBeanPoster.java (77%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/auditor/ReactiveCommonBeanAuditor.java (86%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/auditor/ReactiveOperationAuditor.java (89%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/auditor/callback/AuditorCallback.java (85%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/auditor/callback/ReactiveAuditorCallback.java (86%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/config/CodeRuleConfig.java (86%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/config/DecryptConfig.java (93%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/config/EnumConfig.java (84%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/config/encrypt/AESEncryptablePropertyResolver.java (94%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/context/ReactiveUserContext.java (84%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/context/UserContext.java (89%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/domain/authorized/AbstractAuthorizedQo.java (83%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/domain/authorized/AuthorizedQo.java (86%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/domain/authorized/advanced/OwnedAuthorizedQo.java (83%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/domain/base/BaseQo.java (95%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/domain/base/NameLikeQo.java (91%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/domain/base/SimpleQo.java (81%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/domain/package-info.java (50%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/domain/tree/TreeQo.java (79%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/generation/code/CodeRules.java (79%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/generation/code/strategy/TransactionCodeRuleStrategy.java (86%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/generation/code/strategy/UUIDCodeRuleStrategy.java (64%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/generation/property/GenerateStrategy.java (72%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/generation/property/Generations.java (84%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/query/LambdaQueryChain.java (88%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/query/NamedQueryChain.java (92%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/query/Queries.java (89%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/query/Query.java (94%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/query/QueryChain.java (91%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/query/QueryCondition.java (98%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/query/QueryDefinition.java (77%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/query/QueryFactories.java (85%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/query/QueryMutation.java (92%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/query/README.md (100%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/query/chain/DefaultLambdaQueryChain.java (77%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/query/chain/DefaultNamedQueryChain.java (82%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/query/chain/DefaultQueryChain.java (92%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/query/chain/DefaultQueryChainHolder.java (91%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/query/chain/DefaultQueryCondition.java (95%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/query/chain/DefaultQueryMutation.java (93%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/query/holder/QueryChainHolder.java (89%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/query/spi/QueryFactory.java (67%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/query/spi/adaptor/CriteriaAdaptor.java (97%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/query/spi/converter/QueryConverter.java (71%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/query/support/DomainFunction.java (79%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/query/support/EntityNameUtils.java (97%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/query/support/SFunction.java (85%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/query/support/SerializedLambda.java (99%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/repository/DefaultReactiveRepository.java (94%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/repository/DefaultRepository.java (85%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/repository/QueryModelExecutor.java (97%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/repository/ReactiveEntityOperations.java (90%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/repository/ReactiveQueryModelExecutor.java (97%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/repository/base/DomainRepository.java (86%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/utils/CopyUtils.java (97%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/utils/DataUtils.java (95%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/utils/DateRangeUtil.java (99%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/utils/DepartUtils.java (90%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/utils/FieldUtils.java (92%)
rename flyfish-data/flyfish-data-common/src/main/java/{com => dev}/flyfish/framework/utils/HexUtils.java (98%)
rename flyfish-data/flyfish-data-domain/src/main/java/{com => dev}/flyfish/framework/annotations/CodeRule.java (78%)
rename flyfish-data/flyfish-data-domain/src/main/java/{com => dev}/flyfish/framework/annotations/ComputedProps.java (87%)
rename flyfish-data/flyfish-data-domain/src/main/java/{com => dev}/flyfish/framework/annotations/ConditionOn.java (88%)
rename flyfish-data/flyfish-data-domain/src/main/java/{com => dev}/flyfish/framework/annotations/DBRefValue.java (79%)
rename flyfish-data/flyfish-data-domain/src/main/java/{com => dev}/flyfish/framework/annotations/DateRange.java (81%)
rename flyfish-data/flyfish-data-domain/src/main/java/{com => dev}/flyfish/framework/annotations/DictValue.java (74%)
rename flyfish-data/flyfish-data-domain/src/main/java/{com => dev}/flyfish/framework/annotations/EnumValue.java (79%)
rename flyfish-data/flyfish-data-domain/src/main/java/{com => dev}/flyfish/framework/annotations/FormItem.java (95%)
rename flyfish-data/flyfish-data-domain/src/main/java/{com => dev}/flyfish/framework/annotations/Generation.java (95%)
rename flyfish-data/flyfish-data-domain/src/main/java/{com => dev}/flyfish/framework/annotations/MappedTo.java (91%)
rename flyfish-data/flyfish-data-domain/src/main/java/{com => dev}/flyfish/framework/annotations/Operation.java (96%)
rename flyfish-data/flyfish-data-domain/src/main/java/{com => dev}/flyfish/framework/annotations/Order.java (82%)
rename flyfish-data/flyfish-data-domain/src/main/java/{com => dev}/flyfish/framework/annotations/Properties.java (88%)
rename flyfish-data/flyfish-data-domain/src/main/java/{com => dev}/flyfish/framework/annotations/Property.java (97%)
rename flyfish-data/flyfish-data-domain/src/main/java/{com => dev}/flyfish/framework/annotations/PropertyGroup.java (93%)
rename flyfish-data/flyfish-data-domain/src/main/java/{com => dev}/flyfish/framework/annotations/PropertyGroups.java (83%)
rename flyfish-data/flyfish-data-domain/src/main/java/{com => dev}/flyfish/framework/annotations/query/QueryField.java (95%)
rename flyfish-data/flyfish-data-domain/src/main/java/{com => dev}/flyfish/framework/context/ViewModelContext.java (92%)
rename flyfish-data/flyfish-data-domain/src/main/java/{com => dev}/flyfish/framework/context/interceptor/ViewModelInterceptor.java (89%)
rename flyfish-data/flyfish-data-domain/src/main/java/{com => dev}/flyfish/framework/domain/authorized/AuthorizedDomain.java (74%)
rename flyfish-data/flyfish-data-domain/src/main/java/{com => dev}/flyfish/framework/domain/authorized/AuthorizedUserDetails.java (87%)
rename flyfish-data/flyfish-data-domain/src/main/java/{com => dev}/flyfish/framework/domain/authorized/AuthorizedVo.java (72%)
rename flyfish-data/flyfish-data-domain/src/main/java/{com => dev}/flyfish/framework/domain/authorized/advanced/OwnedAuthorizedDomain.java (56%)
rename flyfish-data/flyfish-data-domain/src/main/java/{com => dev}/flyfish/framework/domain/base/AuditDomain.java (93%)
rename flyfish-data/flyfish-data-domain/src/main/java/{com => dev}/flyfish/framework/domain/base/Domain.java (87%)
rename flyfish-data/flyfish-data-domain/src/main/java/{com => dev}/flyfish/framework/domain/base/DomainService.java (86%)
rename flyfish-data/flyfish-data-domain/src/main/java/{com => dev}/flyfish/framework/domain/base/Dto.java (64%)
rename flyfish-data/flyfish-data-domain/src/main/java/{com => dev}/flyfish/framework/domain/base/IUser.java (80%)
rename flyfish-data/flyfish-data-domain/src/main/java/{com => dev}/flyfish/framework/domain/base/Named.java (69%)
rename flyfish-data/flyfish-data-domain/src/main/java/{com => dev}/flyfish/framework/domain/base/Po.java (63%)
rename flyfish-data/flyfish-data-domain/src/main/java/{com => dev}/flyfish/framework/domain/base/Qo.java (97%)
rename flyfish-data/flyfish-data-domain/src/main/java/{com => dev}/flyfish/framework/domain/base/Vo.java (88%)
rename flyfish-data/flyfish-data-domain/src/main/java/{com => dev}/flyfish/framework/domain/po/Department.java (91%)
rename flyfish-data/flyfish-data-domain/src/main/java/{com => dev}/flyfish/framework/domain/po/ExcelMapping.java (82%)
rename flyfish-data/flyfish-data-domain/src/main/java/{com => dev}/flyfish/framework/domain/po/Permission.java (86%)
rename flyfish-data/flyfish-data-domain/src/main/java/{com => dev}/flyfish/framework/domain/po/Role.java (84%)
rename flyfish-data/flyfish-data-domain/src/main/java/{com => dev}/flyfish/framework/domain/po/User.java (87%)
rename flyfish-data/flyfish-data-domain/src/main/java/{com => dev}/flyfish/framework/domain/tree/RootTreeNode.java (93%)
rename flyfish-data/flyfish-data-domain/src/main/java/{com => dev}/flyfish/framework/domain/tree/TreeDomain.java (87%)
rename flyfish-data/flyfish-data-domain/src/main/java/{com => dev}/flyfish/framework/generation/CodeRuleStrategy.java (83%)
rename flyfish-data/flyfish-data-mongodb/src/main/java/{com => dev}/flyfish/framework/mongodb/builder/CriteriaBuilder.java (97%)
rename flyfish-data/flyfish-data-mongodb/src/main/java/{com => dev}/flyfish/framework/mongodb/config/MongoDataConfig.java (77%)
rename flyfish-data/flyfish-data-mongodb/src/main/java/{com => dev}/flyfish/framework/mongodb/config/annotations/EnableMongoRepo.java (78%)
rename flyfish-data/flyfish-data-mongodb/src/main/java/{com => dev}/flyfish/framework/mongodb/config/annotations/EnableReactiveMongoRepo.java (79%)
rename flyfish-data/flyfish-data-mongodb/src/main/java/{com => dev}/flyfish/framework/mongodb/config/callback/MongoAuditorMongoCallback.java (84%)
rename flyfish-data/flyfish-data-mongodb/src/main/java/{com => dev}/flyfish/framework/mongodb/config/callback/MongoReactiveAuditorMongoCallback.java (85%)
rename flyfish-data/flyfish-data-mongodb/src/main/java/{com => dev}/flyfish/framework/mongodb/operations/MongoReactiveEntityOperations.java (89%)
rename flyfish-data/flyfish-data-mongodb/src/main/java/{com => dev}/flyfish/framework/mongodb/query/MongoQueryFactory.java (69%)
rename flyfish-data/flyfish-data-mongodb/src/main/java/{com => dev}/flyfish/framework/mongodb/query/adaptor/MongoCriteriaAdaptor.java (92%)
rename flyfish-data/flyfish-data-mongodb/src/main/java/{com => dev}/flyfish/framework/mongodb/query/converter/MongoQueryConverter.java (84%)
rename flyfish-data/flyfish-data-mongodb/src/main/java/{com => dev}/flyfish/framework/mongodb/repository/factory/DefaultReactiveRepositoryFactory.java (88%)
rename flyfish-data/flyfish-data-mongodb/src/main/java/{com => dev}/flyfish/framework/mongodb/repository/factory/DefaultReactiveRepositoryFactoryBean.java (94%)
rename flyfish-data/flyfish-data-mongodb/src/main/java/{com => dev}/flyfish/framework/mongodb/repository/factory/DefaultRepositoryFactory.java (87%)
rename flyfish-data/flyfish-data-mongodb/src/main/java/{com => dev}/flyfish/framework/mongodb/repository/factory/DefaultRepositoryFactoryBean.java (94%)
rename flyfish-data/flyfish-data-mongodb/src/main/java/{com => dev}/flyfish/framework/mongodb/repository/impl/DefaultReactiveRepositoryImpl.java (97%)
rename flyfish-data/flyfish-data-mongodb/src/main/java/{com => dev}/flyfish/framework/mongodb/repository/impl/DefaultRepositoryImpl.java (97%)
rename flyfish-data/flyfish-data-mongodb/src/main/java/{com => dev}/flyfish/framework/mongodb/repository/impl/ReactivePageableExecutionUtils.java (97%)
rename flyfish-data/flyfish-data-mongodb/src/main/java/{com => dev}/flyfish/framework/mongodb/utils/CriteriaUtils.java (93%)
delete mode 100644 flyfish-data/flyfish-data-mongodb/src/test/java/com/flyfish/test/mongo/repository/TestQO.java
rename flyfish-data/flyfish-data-mongodb/src/test/java/{com => dev}/flyfish/test/mongo/MongoRepositoryTest.java (72%)
rename flyfish-data/flyfish-data-mongodb/src/test/java/{com => dev}/flyfish/test/mongo/repository/TestDO.java (61%)
create mode 100644 flyfish-data/flyfish-data-mongodb/src/test/java/dev/flyfish/test/mongo/repository/TestQO.java
rename flyfish-data/flyfish-data-mongodb/src/test/java/{com => dev}/flyfish/test/mongo/repository/TestRepository.java (50%)
rename flyfish-data/flyfish-data-r2dbc/src/main/java/{com => dev}/flyfish/framework/r2dbc/config/R2dbcDataConfig.java (89%)
rename flyfish-data/flyfish-data-r2dbc/src/main/java/{com => dev}/flyfish/framework/r2dbc/config/annotations/EnableR2dbcRepo.java (80%)
rename flyfish-data/flyfish-data-r2dbc/src/main/java/{com => dev}/flyfish/framework/r2dbc/config/callback/AssociationFetcher.java (91%)
rename flyfish-data/flyfish-data-r2dbc/src/main/java/{com => dev}/flyfish/framework/r2dbc/config/callback/AssociationWriter.java (94%)
rename flyfish-data/flyfish-data-r2dbc/src/main/java/{com => dev}/flyfish/framework/r2dbc/config/callback/ReferenceR2dbcCallback.java (90%)
rename flyfish-data/flyfish-data-r2dbc/src/main/java/{com => dev}/flyfish/framework/r2dbc/config/callback/RepositoryProvider.java (56%)
rename flyfish-data/flyfish-data-r2dbc/src/main/java/{com => dev}/flyfish/framework/r2dbc/config/mapping/AdditionalConverters.java (96%)
rename flyfish-data/flyfish-data-r2dbc/src/main/java/{com => dev}/flyfish/framework/r2dbc/config/mapping/FullMappingR2dbcConverter.java (98%)
rename flyfish-data/flyfish-data-r2dbc/src/main/java/{com => dev}/flyfish/framework/r2dbc/config/mapping/FullReactiveDataAccessStrategy.java (98%)
rename flyfish-data/flyfish-data-r2dbc/src/main/java/{com => dev}/flyfish/framework/r2dbc/metadata/R2dbcMetadataManager.java (74%)
rename flyfish-data/flyfish-data-r2dbc/src/main/java/{com => dev}/flyfish/framework/r2dbc/metadata/R2dbcTableMetadata.java (80%)
rename flyfish-data/flyfish-data-r2dbc/src/main/java/{com => dev}/flyfish/framework/r2dbc/metadata/impl/SimpleR2dbcMetadataManager.java (95%)
rename flyfish-data/flyfish-data-r2dbc/src/main/java/{com => dev}/flyfish/framework/r2dbc/metadata/reference/R2dbcAssociation.java (82%)
rename flyfish-data/flyfish-data-r2dbc/src/main/java/{com => dev}/flyfish/framework/r2dbc/metadata/reference/R2dbcCollection.java (80%)
rename flyfish-data/flyfish-data-r2dbc/src/main/java/{com => dev}/flyfish/framework/r2dbc/metadata/reference/R2dbcRelation.java (79%)
rename flyfish-data/flyfish-data-r2dbc/src/main/java/{com => dev}/flyfish/framework/r2dbc/metadata/reference/field/DefaultFieldAccessor.java (94%)
rename flyfish-data/flyfish-data-r2dbc/src/main/java/{com => dev}/flyfish/framework/r2dbc/metadata/reference/field/FieldAccessor.java (91%)
rename flyfish-data/flyfish-data-r2dbc/src/main/java/{com => dev}/flyfish/framework/r2dbc/metadata/visitor/MetadataHandler.java (78%)
rename flyfish-data/flyfish-data-r2dbc/src/main/java/{com => dev}/flyfish/framework/r2dbc/metadata/visitor/MetadataVisitor.java (83%)
rename flyfish-data/flyfish-data-r2dbc/src/main/java/{com => dev}/flyfish/framework/r2dbc/metadata/visitor/R2dbcTableMetadataVisitor.java (89%)
rename flyfish-data/flyfish-data-r2dbc/src/main/java/{com => dev}/flyfish/framework/r2dbc/operations/R2dbcReactiveEntityOperations.java (90%)
rename flyfish-data/flyfish-data-r2dbc/src/main/java/{com => dev}/flyfish/framework/r2dbc/query/R2dbcQueryFactory.java (70%)
rename flyfish-data/flyfish-data-r2dbc/src/main/java/{com => dev}/flyfish/framework/r2dbc/query/adaptor/FunctionCriteria.java (97%)
rename flyfish-data/flyfish-data-r2dbc/src/main/java/{com => dev}/flyfish/framework/r2dbc/query/adaptor/R2dbcCriteriaAdaptor.java (95%)
rename flyfish-data/flyfish-data-r2dbc/src/main/java/{com => dev}/flyfish/framework/r2dbc/query/converter/R2dbcQueryConverter.java (88%)
rename flyfish-data/flyfish-data-r2dbc/src/main/java/{com => dev}/flyfish/framework/r2dbc/repository/factory/DefaultReactiveRepositoryFactory.java (88%)
rename flyfish-data/flyfish-data-r2dbc/src/main/java/{com => dev}/flyfish/framework/r2dbc/repository/factory/DefaultReactiveRepositoryFactoryBean.java (94%)
rename flyfish-data/flyfish-data-r2dbc/src/main/java/{com => dev}/flyfish/framework/r2dbc/repository/impl/QueryingR2dbcReactiveRepository.java (97%)
rename flyfish-data/flyfish-data-r2dbc/src/main/java/{com => dev}/flyfish/framework/r2dbc/repository/impl/ReactivePageableExecutionUtils.java (97%)
delete mode 100644 flyfish-data/flyfish-data-r2dbc/src/test/java/com/flyfish/framework/r2dbc/domain/TestQO.java
delete mode 100644 flyfish-data/flyfish-data-r2dbc/src/test/java/com/flyfish/framework/r2dbc/repository/TestAssoRepository.java
delete mode 100644 flyfish-data/flyfish-data-r2dbc/src/test/java/com/flyfish/framework/r2dbc/repository/TestChildRepository.java
delete mode 100644 flyfish-data/flyfish-data-r2dbc/src/test/java/com/flyfish/framework/r2dbc/repository/TestOtherRepository.java
rename flyfish-data/flyfish-data-r2dbc/src/test/java/{com => dev}/flyfish/framework/r2dbc/R2DbcRepositoryTest.java (80%)
rename flyfish-data/flyfish-data-r2dbc/src/test/java/{com => dev}/flyfish/framework/r2dbc/domain/TestDO.java (67%)
create mode 100644 flyfish-data/flyfish-data-r2dbc/src/test/java/dev/flyfish/framework/r2dbc/domain/TestQO.java
rename flyfish-data/flyfish-data-r2dbc/src/test/java/{com => dev}/flyfish/framework/r2dbc/domain/reference/TestAsso.java (59%)
rename flyfish-data/flyfish-data-r2dbc/src/test/java/{com => dev}/flyfish/framework/r2dbc/domain/reference/TestChild.java (69%)
rename flyfish-data/flyfish-data-r2dbc/src/test/java/{com => dev}/flyfish/framework/r2dbc/domain/reference/TestOther.java (69%)
create mode 100644 flyfish-data/flyfish-data-r2dbc/src/test/java/dev/flyfish/framework/r2dbc/repository/TestAssoRepository.java
create mode 100644 flyfish-data/flyfish-data-r2dbc/src/test/java/dev/flyfish/framework/r2dbc/repository/TestChildRepository.java
create mode 100644 flyfish-data/flyfish-data-r2dbc/src/test/java/dev/flyfish/framework/r2dbc/repository/TestOtherRepository.java
rename flyfish-data/flyfish-data-r2dbc/src/test/java/{com => dev}/flyfish/framework/r2dbc/repository/TestRepository.java (54%)
delete mode 100644 flyfish-data/flyfish-data-relational/src/main/java/com/flyfish/framework/relational/package-info.java
rename flyfish-data/flyfish-data-relational/src/main/java/{com => dev}/flyfish/framework/relational/mapping/Association.java (95%)
create mode 100644 flyfish-data/flyfish-data-relational/src/main/java/dev/flyfish/framework/relational/package-info.java
delete mode 100644 flyfish-dict/src/main/java/com/flyfish/framework/dict/controller/AutoCompleteController.java
delete mode 100644 flyfish-dict/src/main/java/com/flyfish/framework/dict/controller/DictionaryController.java
delete mode 100644 flyfish-dict/src/main/java/com/flyfish/framework/dict/repository/AutoCompleteRepository.java
delete mode 100644 flyfish-dict/src/main/java/com/flyfish/framework/dict/service/AutoCompleteService.java
rename flyfish-dict/src/main/java/{com => dev}/flyfish/framework/dict/annotations/EnableDictProcess.java (62%)
rename flyfish-dict/src/main/java/{com => dev}/flyfish/framework/dict/config/DictionaryConfig.java (91%)
rename flyfish-dict/src/main/java/{com => dev}/flyfish/framework/dict/config/DictionaryProcessor.java (86%)
create mode 100644 flyfish-dict/src/main/java/dev/flyfish/framework/dict/controller/AutoCompleteController.java
create mode 100644 flyfish-dict/src/main/java/dev/flyfish/framework/dict/controller/DictionaryController.java
rename flyfish-dict/src/main/java/{com => dev}/flyfish/framework/dict/domain/AutoComplete.java (85%)
rename flyfish-dict/src/main/java/{com => dev}/flyfish/framework/dict/domain/Dictionary.java (91%)
rename flyfish-dict/src/main/java/{com => dev}/flyfish/framework/dict/domain/DictionaryQo.java (82%)
rename flyfish-dict/src/main/java/{com => dev}/flyfish/framework/dict/domain/DictionaryValue.java (92%)
rename flyfish-dict/src/main/java/{com => dev}/flyfish/framework/dict/handler/DictAnnotationInterceptor.java (88%)
create mode 100644 flyfish-dict/src/main/java/dev/flyfish/framework/dict/repository/AutoCompleteRepository.java
rename flyfish-dict/src/main/java/{com => dev}/flyfish/framework/dict/repository/DictionaryRepository.java (62%)
create mode 100644 flyfish-dict/src/main/java/dev/flyfish/framework/dict/service/AutoCompleteService.java
rename flyfish-dict/src/main/java/{com => dev}/flyfish/framework/dict/service/DictionaryService.java (77%)
delete mode 100644 flyfish-dict/src/test/java/com/flyfish/framework/dict/package-info.java
rename flyfish-dict/src/test/java/{com => dev}/flyfish/framework/dict/FlyfishDictTest.java (70%)
create mode 100644 flyfish-dict/src/test/java/dev/flyfish/framework/dict/package-info.java
delete mode 100644 flyfish-file/src/main/java/com/flyfish/framework/file/domain/AttachmentQo.java
delete mode 100644 flyfish-file/src/main/java/com/flyfish/framework/file/repository/AttachmentRepository.java
rename flyfish-file/src/main/java/{com => dev}/flyfish/framework/file/config/UploadConfiguration.java (87%)
rename flyfish-file/src/main/java/{com => dev}/flyfish/framework/file/controller/AttachmentController.java (56%)
rename flyfish-file/src/main/java/{com => dev}/flyfish/framework/file/controller/AttachmentUploadController.java (84%)
rename flyfish-file/src/main/java/{com => dev}/flyfish/framework/file/controller/MediaController.java (86%)
rename flyfish-file/src/main/java/{com => dev}/flyfish/framework/file/domain/Attachment.java (78%)
create mode 100644 flyfish-file/src/main/java/dev/flyfish/framework/file/domain/AttachmentQo.java
rename flyfish-file/src/main/java/{com => dev}/flyfish/framework/file/domain/Media.java (82%)
rename flyfish-file/src/main/java/{com => dev}/flyfish/framework/file/enums/MediaType.java (95%)
rename flyfish-file/src/main/java/{com => dev}/flyfish/framework/file/enums/MediaTypes.java (96%)
create mode 100644 flyfish-file/src/main/java/dev/flyfish/framework/file/repository/AttachmentRepository.java
rename flyfish-file/src/main/java/{com => dev}/flyfish/framework/file/service/AttachmentService.java (85%)
rename flyfish-file/src/main/java/{com => dev}/flyfish/framework/file/service/FileService.java (90%)
rename flyfish-file/src/main/java/{com => dev}/flyfish/framework/file/service/MediaService.java (90%)
rename flyfish-file/src/main/java/{com => dev}/flyfish/framework/file/utils/DownloadUtils.java (91%)
rename flyfish-file/src/main/java/{com => dev}/flyfish/framework/file/utils/FileMD5Utils.java (97%)
rename flyfish-file/src/main/java/{com => dev}/flyfish/framework/file/utils/FileSizeUtils.java (97%)
rename flyfish-file/src/main/java/{com => dev}/flyfish/framework/file/utils/SystemUtils.java (94%)
rename flyfish-file/src/main/java/{com => dev}/flyfish/framework/file/utils/ZipUtils.java (98%)
delete mode 100644 flyfish-form/src/main/java/com/flyfish/framework/form/repository/OnlineFormRepository.java
rename flyfish-form/src/main/java/{com => dev}/flyfish/framework/form/controller/OnlineFormController.java (61%)
rename flyfish-form/src/main/java/{com => dev}/flyfish/framework/form/domain/OnlineForm.java (95%)
create mode 100644 flyfish-form/src/main/java/dev/flyfish/framework/form/repository/OnlineFormRepository.java
rename flyfish-form/src/main/java/{com => dev}/flyfish/framework/form/service/OnlineFormService.java (53%)
delete mode 100644 flyfish-form/src/test/java/com/flyfish/framework/form/package-info.java
rename flyfish-form/src/test/java/{com => dev}/flyfish/framework/form/FlyfishFormTest.java (72%)
create mode 100644 flyfish-form/src/test/java/dev/flyfish/framework/form/package-info.java
delete mode 100644 flyfish-logging/src/main/java/com/flyfish/framework/logging/controller/LogController.java
delete mode 100644 flyfish-logging/src/main/java/com/flyfish/framework/logging/repository/LogRepository.java
rename flyfish-logging/src/main/java/{com => dev}/flyfish/framework/logging/advice/LogAdvice.java (92%)
rename flyfish-logging/src/main/java/{com => dev}/flyfish/framework/logging/annotation/EnableLogging.java (71%)
rename flyfish-logging/src/main/java/{com => dev}/flyfish/framework/logging/config/LoggingConfig.java (84%)
rename flyfish-logging/src/main/java/{com => dev}/flyfish/framework/logging/config/LoggingTextModifier.java (81%)
rename flyfish-logging/src/main/java/{com => dev}/flyfish/framework/logging/config/LoggingTextRegistry.java (95%)
create mode 100644 flyfish-logging/src/main/java/dev/flyfish/framework/logging/controller/LogController.java
rename flyfish-logging/src/main/java/{com => dev}/flyfish/framework/logging/domain/DomainDescriptions.java (72%)
rename flyfish-logging/src/main/java/{com => dev}/flyfish/framework/logging/domain/Log.java (91%)
rename flyfish-logging/src/main/java/{com => dev}/flyfish/framework/logging/domain/LogQo.java (85%)
rename flyfish-logging/src/main/java/{com => dev}/flyfish/framework/logging/domain/LogType.java (70%)
create mode 100644 flyfish-logging/src/main/java/dev/flyfish/framework/logging/repository/LogRepository.java
rename flyfish-logging/src/main/java/{com => dev}/flyfish/framework/logging/service/LogContext.java (91%)
rename flyfish-logging/src/main/java/{com => dev}/flyfish/framework/logging/service/LogManager.java (88%)
rename flyfish-logging/src/main/java/{com => dev}/flyfish/framework/logging/service/LogService.java (51%)
rename flyfish-logging/src/main/java/{com => dev}/flyfish/framework/logging/service/SimpleAuthenticationLogger.java (86%)
delete mode 100644 flyfish-user/src/main/java/com/flyfish/framework/user/repository/DepartmentRepository.java
delete mode 100644 flyfish-user/src/main/java/com/flyfish/framework/user/repository/PermissionRepository.java
delete mode 100644 flyfish-user/src/main/java/com/flyfish/framework/user/repository/RoleRepository.java
rename flyfish-user/src/main/java/{com => dev}/flyfish/framework/user/annotations/.gitkeep (100%)
rename flyfish-user/src/main/java/{com => dev}/flyfish/framework/user/annotations/EnableAutoSecurity.java (65%)
rename flyfish-user/src/main/java/{com => dev}/flyfish/framework/user/config/AuthenticationAuditorImpl.java (87%)
rename flyfish-user/src/main/java/{com => dev}/flyfish/framework/user/config/RSAKeys.java (96%)
rename flyfish-user/src/main/java/{com => dev}/flyfish/framework/user/config/WebSecurityConfig.java (90%)
rename flyfish-user/src/main/java/{com => dev}/flyfish/framework/user/config/audit/ReactiveUserAuditor.java (87%)
rename flyfish-user/src/main/java/{com => dev}/flyfish/framework/user/config/audit/RoleBeanPoster.java (72%)
rename flyfish-user/src/main/java/{com => dev}/flyfish/framework/user/config/audit/UserAuditor.java (81%)
rename flyfish-user/src/main/java/{com => dev}/flyfish/framework/user/config/audit/UserBeanAuditor.java (77%)
rename flyfish-user/src/main/java/{com => dev}/flyfish/framework/user/config/captcha/AnjiCaptchaValidator.java (85%)
rename flyfish-user/src/main/java/{com => dev}/flyfish/framework/user/config/captcha/CaptchaValidator.java (81%)
rename flyfish-user/src/main/java/{com => dev}/flyfish/framework/user/config/constants/UserCacheKeys.java (80%)
rename flyfish-user/src/main/java/{com => dev}/flyfish/framework/user/config/converter/EncryptedAuthenticationConverter.java (90%)
rename flyfish-user/src/main/java/{com => dev}/flyfish/framework/user/config/properties/SecurityProperties.java (92%)
rename flyfish-user/src/main/java/{com => dev}/flyfish/framework/user/controller/CaptchaController.java (97%)
rename flyfish-user/src/main/java/{com => dev}/flyfish/framework/user/controller/DepartmentController.java (80%)
rename flyfish-user/src/main/java/{com => dev}/flyfish/framework/user/controller/LoginController.java (84%)
rename flyfish-user/src/main/java/{com => dev}/flyfish/framework/user/controller/PermissionController.java (60%)
rename flyfish-user/src/main/java/{com => dev}/flyfish/framework/user/controller/RoleController.java (59%)
rename flyfish-user/src/main/java/{com => dev}/flyfish/framework/user/controller/UserController.java (83%)
rename flyfish-user/src/main/java/{com => dev}/flyfish/framework/user/domain/AdminUserDetails.java (87%)
rename flyfish-user/src/main/java/{com => dev}/flyfish/framework/user/domain/DepartmentQo.java (76%)
rename flyfish-user/src/main/java/{com => dev}/flyfish/framework/user/domain/LoginDto.java (78%)
rename flyfish-user/src/main/java/{com => dev}/flyfish/framework/user/domain/PermissionQo.java (74%)
rename flyfish-user/src/main/java/{com => dev}/flyfish/framework/user/domain/RoleQo.java (81%)
rename flyfish-user/src/main/java/{com => dev}/flyfish/framework/user/domain/UserPasswordDto.java (78%)
rename flyfish-user/src/main/java/{com => dev}/flyfish/framework/user/domain/UserQo.java (79%)
rename flyfish-user/src/main/java/{com => dev}/flyfish/framework/user/initializer/UserInitializer.java (89%)
create mode 100644 flyfish-user/src/main/java/dev/flyfish/framework/user/repository/DepartmentRepository.java
create mode 100644 flyfish-user/src/main/java/dev/flyfish/framework/user/repository/PermissionRepository.java
create mode 100644 flyfish-user/src/main/java/dev/flyfish/framework/user/repository/RoleRepository.java
rename flyfish-user/src/main/java/{com => dev}/flyfish/framework/user/repository/UserRepository.java (77%)
rename flyfish-user/src/main/java/{com => dev}/flyfish/framework/user/service/DepartmentService.java (67%)
rename flyfish-user/src/main/java/{com => dev}/flyfish/framework/user/service/FlyfishUserDetailsServiceImpl.java (93%)
rename flyfish-user/src/main/java/{com => dev}/flyfish/framework/user/service/PermissionService.java (53%)
rename flyfish-user/src/main/java/{com => dev}/flyfish/framework/user/service/RoleService.java (81%)
rename flyfish-user/src/main/java/{com => dev}/flyfish/framework/user/service/UserDetailsConverter.java (90%)
rename flyfish-user/src/main/java/{com => dev}/flyfish/framework/user/service/UserService.java (77%)
rename flyfish-user/src/main/java/{com => dev}/flyfish/framework/user/service/impl/DepartmentServiceHelper.java (89%)
rename flyfish-user/src/main/java/{com => dev}/flyfish/framework/user/service/impl/MongoDepartmentServiceImpl.java (84%)
rename flyfish-user/src/main/java/{com => dev}/flyfish/framework/user/service/impl/R2dbcDepartmentServiceImpl.java (76%)
rename flyfish-user/src/main/java/{com => dev}/flyfish/framework/user/utils/RSAUtils.java (98%)
rename flyfish-user/src/main/java/{com => dev}/flyfish/framework/user/utils/StrengthUtils.java (77%)
rename flyfish-user/src/main/java/{com => dev}/flyfish/framework/user/validation/.gitkeep (100%)
delete mode 100644 flyfish-user/src/test/java/com/flyfish/framework/web/package-info.java
rename flyfish-user/src/test/java/{com => dev}/flyfish/framework/web/FlyfishUserTest.java (76%)
create mode 100644 flyfish-user/src/test/java/dev/flyfish/framework/web/package-info.java
delete mode 100644 flyfish-web/src/main/java/com/flyfish/framework/excel/repository/ExcelMappingRepository.java
delete mode 100644 flyfish-web/src/main/java/com/flyfish/framework/excel/service/ExcelMappingService.java
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/bean/SyncVo.java (81%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/beans/annotations/EnableRestBeanDetect.java (64%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/beans/annotations/RestMapping.java (96%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/beans/enums/RestBeanCandidate.java (81%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/beans/enums/ValidationCandidate.java (90%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/beans/meta/BeanController.java (92%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/beans/meta/BeanInfo.java (96%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/beans/meta/BeanProperty.java (96%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/beans/meta/BeanPropertyGroup.java (87%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/beans/meta/BeanPropertyType.java (95%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/beans/meta/BeanProps.java (93%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/beans/meta/BeanValidation.java (95%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/beans/meta/RestBean.java (80%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/beans/meta/SubBean.java (90%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/beans/meta/builtin/BeanUris.java (72%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/beans/meta/parser/BeanPropertyAnnotationParser.java (67%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/beans/meta/parser/BeanPropertyAnnotations.java (92%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/beans/meta/parser/SimpleBeanPropertyAnnotations.java (91%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/beans/meta/parser/chain/AnnotationChainSupport.java (80%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/beans/meta/parser/chain/BeanPropertyAnnotationBatchChain.java (96%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/beans/meta/parser/chain/BeanPropertyAnnotationChain.java (96%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/beans/meta/parser/chain/impl/BasicAnnotationChainSupport.java (80%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/beans/meta/parser/chain/impl/EmptyAnnotationBatchChain.java (92%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/beans/meta/parser/chain/impl/EmptyAnnotationChain.java (92%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/beans/meta/parser/chain/impl/SimpleAnnotationBatchChain.java (94%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/beans/meta/parser/chain/impl/SimpleAnnotationChain.java (93%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/beans/repository/CustomRepositoryBuilder.java (99%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/beans/repository/RepositoryRegistrar.java (96%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/beans/repository/RepositoryRegistrarComposite.java (94%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/beans/repository/SimpleRepositoryRegistrar.java (98%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/beans/resolver/DynamicRestBeanResolver.java (89%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/boot/FlyfishAppRunner.java (75%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/config/BeanConfig.java (92%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/config/RestBeanAutoConfigure.java (91%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/configuration/WebfluxConfig.java (89%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/configuration/annotations/CurrentUser.java (86%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/configuration/annotations/PagedQuery.java (84%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/configuration/annotations/RequestContextBody.java (86%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/configuration/annotations/ValidRequestBody.java (82%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/configuration/backup/.gitkeep (100%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/configuration/boot/FlyfishApplication.java (88%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/configuration/jwt/JwtProperties.java (95%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/configuration/jwt/JwtSecurityContextRepository.java (95%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/configuration/jwt/TokenProvider.java (98%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/configuration/mail/.gitkeep (100%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/configuration/redis/EnableReactiveRedis.java (85%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/configuration/redis/EnableRedis.java (84%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/configuration/redis/JacksonRedisSerializerFactory.java (93%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/configuration/redis/ReactiveRedisConfig.java (95%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/configuration/redis/RedisConfig.java (94%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/configuration/resolver/ModelAttributeFilter.java (99%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/configuration/resolver/PageParameterFilter.java (99%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/configuration/resolver/PageQueryArgumentResolver.java (92%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/configuration/resolver/ParameterFilter.java (92%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/configuration/resolver/RequestContextBodyArgumentResolver.java (88%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/configuration/resolver/SortParameterFilter.java (99%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/configuration/resolver/UserArgumentResolver.java (85%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/configuration/resolver/ValidRequestBodyMethodArgumentResolver.java (96%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/controller/BaseController.java (81%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/controller/EnumController.java (86%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/controller/SafeController.java (71%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/controller/TreeController.java (91%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/controller/reactive/ReactiveBaseController.java (87%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/controller/reactive/ReactiveTreeController.java (91%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/excel/controller/ExcelMappingController.java (61%)
create mode 100644 flyfish-web/src/main/java/dev/flyfish/framework/excel/repository/ExcelMappingRepository.java
create mode 100644 flyfish-web/src/main/java/dev/flyfish/framework/excel/service/ExcelMappingService.java
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/handler/GlobalExceptionHandler.java (88%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/handler/JsonAuthenticationFailureHandler.java (89%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/handler/JsonAuthenticationSuccessHandler.java (92%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/handler/JsonLogoutSuccessHandler.java (88%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/service/AuthenticationAuditor.java (85%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/service/AuthenticationLogger.java (88%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/service/BaseReactiveService.java (91%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/service/BaseService.java (92%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/service/FlyfishUserDetailsService.java (97%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/service/UserFindService.java (70%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/service/impl/BaseReactiveServiceImpl.java (93%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/service/impl/BaseServiceImpl.java (93%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/transform/DataBufferTransformer.java (89%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/transform/ResultDataTransformer.java (85%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/transform/SharedDataBufferFactory.java (91%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/utils/AuthenticationMessages.java (95%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/utils/ClientUtil.java (96%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/utils/ReactiveRedisOperations.java (99%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/utils/RedisOperations.java (99%)
rename flyfish-web/src/main/java/{com => dev}/flyfish/framework/utils/UserUtils.java (91%)
rename flyfish-web/src/test/java/{com => dev}/flyfish/project/.gitkeep (100%)
diff --git a/flyfish-approval/pom.xml b/flyfish-approval/pom.xml
index b46dcb1..74c63c7 100644
--- a/flyfish-approval/pom.xml
+++ b/flyfish-approval/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
flyfish-framework
- com.flyfish.framework
+ dev.flyfish.framework
${revision}
4.0.0
@@ -28,7 +28,7 @@
true
- com.flyfish.framework
+ dev.flyfish.framework
flyfish-web
${revision}
diff --git a/flyfish-approval/src/main/java/com/flyfish/framework/approval/repository/ApproveRecordRepository.java b/flyfish-approval/src/main/java/com/flyfish/framework/approval/repository/ApproveRecordRepository.java
deleted file mode 100644
index fc16cc5..0000000
--- a/flyfish-approval/src/main/java/com/flyfish/framework/approval/repository/ApproveRecordRepository.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.flyfish.framework.approval.repository;
-
-import com.flyfish.framework.approval.domain.record.ApproveRecord;
-import com.flyfish.framework.repository.DefaultReactiveRepository;
-
-/**
- * 审批记录仓库
- * @author wangyu
- */
-public interface ApproveRecordRepository extends DefaultReactiveRepository {
-}
diff --git a/flyfish-approval/src/main/java/com/flyfish/framework/approval/auditor/ApproveAuditor.java b/flyfish-approval/src/main/java/dev/flyfish/framework/approval/auditor/ApproveAuditor.java
similarity index 73%
rename from flyfish-approval/src/main/java/com/flyfish/framework/approval/auditor/ApproveAuditor.java
rename to flyfish-approval/src/main/java/dev/flyfish/framework/approval/auditor/ApproveAuditor.java
index 6a29f61..1c1df07 100644
--- a/flyfish-approval/src/main/java/com/flyfish/framework/approval/auditor/ApproveAuditor.java
+++ b/flyfish-approval/src/main/java/dev/flyfish/framework/approval/auditor/ApproveAuditor.java
@@ -1,8 +1,8 @@
-package com.flyfish.framework.approval.auditor;
+package dev.flyfish.framework.approval.auditor;
-import com.flyfish.framework.approval.domain.ApprovalDomain;
-import com.flyfish.framework.approval.enums.ApproveStatus;
-import com.flyfish.framework.auditor.ReactiveBeanAuditor;
+import dev.flyfish.framework.approval.domain.ApprovalDomain;
+import dev.flyfish.framework.approval.enums.ApproveStatus;
+import dev.flyfish.framework.auditor.ReactiveBeanAuditor;
import org.springframework.stereotype.Component;
import reactor.core.publisher.Mono;
diff --git a/flyfish-approval/src/main/java/com/flyfish/framework/approval/auditor/ApproveRecordAuditor.java b/flyfish-approval/src/main/java/dev/flyfish/framework/approval/auditor/ApproveRecordAuditor.java
similarity index 77%
rename from flyfish-approval/src/main/java/com/flyfish/framework/approval/auditor/ApproveRecordAuditor.java
rename to flyfish-approval/src/main/java/dev/flyfish/framework/approval/auditor/ApproveRecordAuditor.java
index 928bff3..0358967 100644
--- a/flyfish-approval/src/main/java/com/flyfish/framework/approval/auditor/ApproveRecordAuditor.java
+++ b/flyfish-approval/src/main/java/dev/flyfish/framework/approval/auditor/ApproveRecordAuditor.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.approval.auditor;
+package dev.flyfish.framework.approval.auditor;
-import com.flyfish.framework.approval.domain.record.ApproveRecord;
-import com.flyfish.framework.auditor.ReactiveBeanAuditor;
+import dev.flyfish.framework.approval.domain.record.ApproveRecord;
+import dev.flyfish.framework.auditor.ReactiveBeanAuditor;
import org.springframework.stereotype.Component;
import reactor.core.publisher.Mono;
diff --git a/flyfish-approval/src/main/java/com/flyfish/framework/approval/controller/ApprovalController.java b/flyfish-approval/src/main/java/dev/flyfish/framework/approval/controller/ApprovalController.java
similarity index 70%
rename from flyfish-approval/src/main/java/com/flyfish/framework/approval/controller/ApprovalController.java
rename to flyfish-approval/src/main/java/dev/flyfish/framework/approval/controller/ApprovalController.java
index 1d615e1..e63c733 100644
--- a/flyfish-approval/src/main/java/com/flyfish/framework/approval/controller/ApprovalController.java
+++ b/flyfish-approval/src/main/java/dev/flyfish/framework/approval/controller/ApprovalController.java
@@ -1,19 +1,19 @@
-package com.flyfish.framework.approval.controller;
+package dev.flyfish.framework.approval.controller;
-import com.flyfish.framework.approval.domain.ApprovalDomain;
-import com.flyfish.framework.approval.domain.record.ApproveRecord;
-import com.flyfish.framework.approval.domain.record.ApproveRecordListVo;
-import com.flyfish.framework.approval.domain.record.ApproveRecordQo;
-import com.flyfish.framework.approval.domain.submit.ApprovalSubmitDto;
-import com.flyfish.framework.approval.domain.todo.ApprovalDto;
-import com.flyfish.framework.approval.domain.todo.ApprovalListVo;
-import com.flyfish.framework.approval.service.ApproveRecordService;
-import com.flyfish.framework.approval.service.ModuleDelegateService;
-import com.flyfish.framework.bean.Result;
-import com.flyfish.framework.configuration.annotations.CurrentUser;
-import com.flyfish.framework.configuration.annotations.PagedQuery;
-import com.flyfish.framework.domain.base.Vo;
-import com.flyfish.framework.domain.po.User;
+import dev.flyfish.framework.approval.domain.ApprovalDomain;
+import dev.flyfish.framework.approval.domain.record.ApproveRecord;
+import dev.flyfish.framework.approval.domain.record.ApproveRecordListVo;
+import dev.flyfish.framework.approval.domain.record.ApproveRecordQo;
+import dev.flyfish.framework.approval.domain.submit.ApprovalSubmitDto;
+import dev.flyfish.framework.approval.domain.todo.ApprovalDto;
+import dev.flyfish.framework.approval.domain.todo.ApprovalListVo;
+import dev.flyfish.framework.approval.service.ApproveRecordService;
+import dev.flyfish.framework.approval.service.ModuleDelegateService;
+import dev.flyfish.framework.bean.Result;
+import dev.flyfish.framework.configuration.annotations.CurrentUser;
+import dev.flyfish.framework.configuration.annotations.PagedQuery;
+import dev.flyfish.framework.domain.base.Vo;
+import dev.flyfish.framework.domain.po.User;
import org.springframework.web.bind.annotation.*;
import reactor.core.publisher.Mono;
diff --git a/flyfish-approval/src/main/java/com/flyfish/framework/approval/controller/ApproveRecordController.java b/flyfish-approval/src/main/java/dev/flyfish/framework/approval/controller/ApproveRecordController.java
similarity index 59%
rename from flyfish-approval/src/main/java/com/flyfish/framework/approval/controller/ApproveRecordController.java
rename to flyfish-approval/src/main/java/dev/flyfish/framework/approval/controller/ApproveRecordController.java
index 17cc0d1..6b1136c 100644
--- a/flyfish-approval/src/main/java/com/flyfish/framework/approval/controller/ApproveRecordController.java
+++ b/flyfish-approval/src/main/java/dev/flyfish/framework/approval/controller/ApproveRecordController.java
@@ -1,8 +1,8 @@
-package com.flyfish.framework.approval.controller;
+package dev.flyfish.framework.approval.controller;
-import com.flyfish.framework.approval.domain.record.ApproveRecord;
-import com.flyfish.framework.approval.domain.record.ApproveRecordQo;
-import com.flyfish.framework.controller.reactive.ReactiveBaseController;
+import dev.flyfish.framework.approval.domain.record.ApproveRecord;
+import dev.flyfish.framework.approval.domain.record.ApproveRecordQo;
+import dev.flyfish.framework.controller.reactive.ReactiveBaseController;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
diff --git a/flyfish-approval/src/main/java/com/flyfish/framework/approval/domain/ApprovalDomain.java b/flyfish-approval/src/main/java/dev/flyfish/framework/approval/domain/ApprovalDomain.java
similarity index 69%
rename from flyfish-approval/src/main/java/com/flyfish/framework/approval/domain/ApprovalDomain.java
rename to flyfish-approval/src/main/java/dev/flyfish/framework/approval/domain/ApprovalDomain.java
index f822f68..33c5a7e 100644
--- a/flyfish-approval/src/main/java/com/flyfish/framework/approval/domain/ApprovalDomain.java
+++ b/flyfish-approval/src/main/java/dev/flyfish/framework/approval/domain/ApprovalDomain.java
@@ -1,8 +1,8 @@
-package com.flyfish.framework.approval.domain;
+package dev.flyfish.framework.approval.domain;
-import com.flyfish.framework.annotations.Property;
-import com.flyfish.framework.approval.enums.ApproveStatus;
-import com.flyfish.framework.domain.authorized.AuthorizedDomain;
+import dev.flyfish.framework.annotations.Property;
+import dev.flyfish.framework.approval.enums.ApproveStatus;
+import dev.flyfish.framework.domain.authorized.AuthorizedDomain;
import lombok.Getter;
import lombok.Setter;
diff --git a/flyfish-approval/src/main/java/com/flyfish/framework/approval/domain/ApprovalDomainQo.java b/flyfish-approval/src/main/java/dev/flyfish/framework/approval/domain/ApprovalDomainQo.java
similarity index 55%
rename from flyfish-approval/src/main/java/com/flyfish/framework/approval/domain/ApprovalDomainQo.java
rename to flyfish-approval/src/main/java/dev/flyfish/framework/approval/domain/ApprovalDomainQo.java
index 9f8b121..60d4176 100644
--- a/flyfish-approval/src/main/java/com/flyfish/framework/approval/domain/ApprovalDomainQo.java
+++ b/flyfish-approval/src/main/java/dev/flyfish/framework/approval/domain/ApprovalDomainQo.java
@@ -1,11 +1,11 @@
-package com.flyfish.framework.approval.domain;
+package dev.flyfish.framework.approval.domain;
-import com.flyfish.framework.annotations.EnumValue;
-import com.flyfish.framework.annotations.Order;
-import com.flyfish.framework.annotations.Property;
-import com.flyfish.framework.approval.enums.ApproveStatus;
-import com.flyfish.framework.domain.authorized.AuthorizedQo;
-import com.flyfish.framework.query.QueryDefinition;
+import dev.flyfish.framework.annotations.EnumValue;
+import dev.flyfish.framework.annotations.Order;
+import dev.flyfish.framework.annotations.Property;
+import dev.flyfish.framework.approval.enums.ApproveStatus;
+import dev.flyfish.framework.domain.authorized.AuthorizedQo;
+import dev.flyfish.framework.query.QueryDefinition;
import lombok.Getter;
import lombok.Setter;
diff --git a/flyfish-approval/src/main/java/com/flyfish/framework/approval/domain/ApprovalDomainVo.java b/flyfish-approval/src/main/java/dev/flyfish/framework/approval/domain/ApprovalDomainVo.java
similarity index 85%
rename from flyfish-approval/src/main/java/com/flyfish/framework/approval/domain/ApprovalDomainVo.java
rename to flyfish-approval/src/main/java/dev/flyfish/framework/approval/domain/ApprovalDomainVo.java
index 908052a..ea9c7a4 100644
--- a/flyfish-approval/src/main/java/com/flyfish/framework/approval/domain/ApprovalDomainVo.java
+++ b/flyfish-approval/src/main/java/dev/flyfish/framework/approval/domain/ApprovalDomainVo.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.approval.domain;
+package dev.flyfish.framework.approval.domain;
-import com.flyfish.framework.approval.enums.ApproveStatus;
-import com.flyfish.framework.domain.base.Vo;
+import dev.flyfish.framework.approval.enums.ApproveStatus;
+import dev.flyfish.framework.domain.base.Vo;
import lombok.Data;
import java.util.Optional;
diff --git a/flyfish-approval/src/main/java/com/flyfish/framework/approval/domain/record/ApproveRecord.java b/flyfish-approval/src/main/java/dev/flyfish/framework/approval/domain/record/ApproveRecord.java
similarity index 82%
rename from flyfish-approval/src/main/java/com/flyfish/framework/approval/domain/record/ApproveRecord.java
rename to flyfish-approval/src/main/java/dev/flyfish/framework/approval/domain/record/ApproveRecord.java
index 4c86473..96907f9 100644
--- a/flyfish-approval/src/main/java/com/flyfish/framework/approval/domain/record/ApproveRecord.java
+++ b/flyfish-approval/src/main/java/dev/flyfish/framework/approval/domain/record/ApproveRecord.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.approval.domain.record;
+package dev.flyfish.framework.approval.domain.record;
-import com.flyfish.framework.approval.enums.ApproveAction;
-import com.flyfish.framework.domain.base.AuditDomain;
+import dev.flyfish.framework.approval.enums.ApproveAction;
+import dev.flyfish.framework.domain.base.AuditDomain;
import lombok.Getter;
import lombok.Setter;
import org.springframework.data.mongodb.core.mapping.Document;
diff --git a/flyfish-approval/src/main/java/com/flyfish/framework/approval/domain/record/ApproveRecordListVo.java b/flyfish-approval/src/main/java/dev/flyfish/framework/approval/domain/record/ApproveRecordListVo.java
similarity index 83%
rename from flyfish-approval/src/main/java/com/flyfish/framework/approval/domain/record/ApproveRecordListVo.java
rename to flyfish-approval/src/main/java/dev/flyfish/framework/approval/domain/record/ApproveRecordListVo.java
index c1ec7ca..c3444cd 100644
--- a/flyfish-approval/src/main/java/com/flyfish/framework/approval/domain/record/ApproveRecordListVo.java
+++ b/flyfish-approval/src/main/java/dev/flyfish/framework/approval/domain/record/ApproveRecordListVo.java
@@ -1,12 +1,11 @@
-package com.flyfish.framework.approval.domain.record;
+package dev.flyfish.framework.approval.domain.record;
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.flyfish.framework.approval.enums.ApproveAction;
-import com.flyfish.framework.domain.base.Vo;
+import dev.flyfish.framework.approval.enums.ApproveAction;
+import dev.flyfish.framework.domain.base.Vo;
import lombok.Data;
import java.time.LocalDateTime;
-import java.util.Date;
import java.util.Optional;
/**
diff --git a/flyfish-approval/src/main/java/com/flyfish/framework/approval/domain/record/ApproveRecordQo.java b/flyfish-approval/src/main/java/dev/flyfish/framework/approval/domain/record/ApproveRecordQo.java
similarity index 82%
rename from flyfish-approval/src/main/java/com/flyfish/framework/approval/domain/record/ApproveRecordQo.java
rename to flyfish-approval/src/main/java/dev/flyfish/framework/approval/domain/record/ApproveRecordQo.java
index aeb4204..c797590 100644
--- a/flyfish-approval/src/main/java/com/flyfish/framework/approval/domain/record/ApproveRecordQo.java
+++ b/flyfish-approval/src/main/java/dev/flyfish/framework/approval/domain/record/ApproveRecordQo.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.approval.domain.record;
+package dev.flyfish.framework.approval.domain.record;
-import com.flyfish.framework.domain.base.NameLikeQo;
-import com.flyfish.framework.query.QueryDefinition;
+import dev.flyfish.framework.domain.base.NameLikeQo;
+import dev.flyfish.framework.query.QueryDefinition;
import lombok.Getter;
import lombok.Setter;
diff --git a/flyfish-approval/src/main/java/com/flyfish/framework/approval/domain/submit/ApprovalSubmitDto.java b/flyfish-approval/src/main/java/dev/flyfish/framework/approval/domain/submit/ApprovalSubmitDto.java
similarity index 91%
rename from flyfish-approval/src/main/java/com/flyfish/framework/approval/domain/submit/ApprovalSubmitDto.java
rename to flyfish-approval/src/main/java/dev/flyfish/framework/approval/domain/submit/ApprovalSubmitDto.java
index 38a0597..a34c579 100644
--- a/flyfish-approval/src/main/java/com/flyfish/framework/approval/domain/submit/ApprovalSubmitDto.java
+++ b/flyfish-approval/src/main/java/dev/flyfish/framework/approval/domain/submit/ApprovalSubmitDto.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.approval.domain.submit;
+package dev.flyfish.framework.approval.domain.submit;
import lombok.Data;
diff --git a/flyfish-approval/src/main/java/com/flyfish/framework/approval/domain/todo/ApprovalDto.java b/flyfish-approval/src/main/java/dev/flyfish/framework/approval/domain/todo/ApprovalDto.java
similarity index 80%
rename from flyfish-approval/src/main/java/com/flyfish/framework/approval/domain/todo/ApprovalDto.java
rename to flyfish-approval/src/main/java/dev/flyfish/framework/approval/domain/todo/ApprovalDto.java
index f3a3259..81de27c 100644
--- a/flyfish-approval/src/main/java/com/flyfish/framework/approval/domain/todo/ApprovalDto.java
+++ b/flyfish-approval/src/main/java/dev/flyfish/framework/approval/domain/todo/ApprovalDto.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.approval.domain.todo;
+package dev.flyfish.framework.approval.domain.todo;
-import com.flyfish.framework.approval.enums.ApproveAction;
+import dev.flyfish.framework.approval.enums.ApproveAction;
import lombok.Data;
import jakarta.validation.constraints.NotBlank;
diff --git a/flyfish-approval/src/main/java/com/flyfish/framework/approval/domain/todo/ApprovalListVo.java b/flyfish-approval/src/main/java/dev/flyfish/framework/approval/domain/todo/ApprovalListVo.java
similarity index 81%
rename from flyfish-approval/src/main/java/com/flyfish/framework/approval/domain/todo/ApprovalListVo.java
rename to flyfish-approval/src/main/java/dev/flyfish/framework/approval/domain/todo/ApprovalListVo.java
index 3abcf3d..a2e27c2 100644
--- a/flyfish-approval/src/main/java/com/flyfish/framework/approval/domain/todo/ApprovalListVo.java
+++ b/flyfish-approval/src/main/java/dev/flyfish/framework/approval/domain/todo/ApprovalListVo.java
@@ -1,12 +1,11 @@
-package com.flyfish.framework.approval.domain.todo;
+package dev.flyfish.framework.approval.domain.todo;
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.flyfish.framework.approval.domain.record.ApproveRecord;
-import com.flyfish.framework.domain.base.Vo;
+import dev.flyfish.framework.approval.domain.record.ApproveRecord;
+import dev.flyfish.framework.domain.base.Vo;
import lombok.Data;
import java.time.LocalDateTime;
-import java.util.Date;
/**
* 待审批列表vo
diff --git a/flyfish-approval/src/main/java/com/flyfish/framework/approval/enums/ApproveAction.java b/flyfish-approval/src/main/java/dev/flyfish/framework/approval/enums/ApproveAction.java
similarity index 72%
rename from flyfish-approval/src/main/java/com/flyfish/framework/approval/enums/ApproveAction.java
rename to flyfish-approval/src/main/java/dev/flyfish/framework/approval/enums/ApproveAction.java
index 105344d..5873527 100644
--- a/flyfish-approval/src/main/java/com/flyfish/framework/approval/enums/ApproveAction.java
+++ b/flyfish-approval/src/main/java/dev/flyfish/framework/approval/enums/ApproveAction.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.approval.enums;
+package dev.flyfish.framework.approval.enums;
-import com.flyfish.framework.enums.NamedEnum;
+import dev.flyfish.framework.enums.NamedEnum;
import lombok.AllArgsConstructor;
import lombok.Getter;
diff --git a/flyfish-approval/src/main/java/com/flyfish/framework/approval/enums/ApproveStatus.java b/flyfish-approval/src/main/java/dev/flyfish/framework/approval/enums/ApproveStatus.java
similarity index 78%
rename from flyfish-approval/src/main/java/com/flyfish/framework/approval/enums/ApproveStatus.java
rename to flyfish-approval/src/main/java/dev/flyfish/framework/approval/enums/ApproveStatus.java
index 082ca32..4c01542 100644
--- a/flyfish-approval/src/main/java/com/flyfish/framework/approval/enums/ApproveStatus.java
+++ b/flyfish-approval/src/main/java/dev/flyfish/framework/approval/enums/ApproveStatus.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.approval.enums;
+package dev.flyfish.framework.approval.enums;
-import com.flyfish.framework.enums.NamedEnum;
+import dev.flyfish.framework.enums.NamedEnum;
import lombok.AllArgsConstructor;
import lombok.Getter;
diff --git a/flyfish-approval/src/main/java/dev/flyfish/framework/approval/repository/ApproveRecordRepository.java b/flyfish-approval/src/main/java/dev/flyfish/framework/approval/repository/ApproveRecordRepository.java
new file mode 100644
index 0000000..1ea46a0
--- /dev/null
+++ b/flyfish-approval/src/main/java/dev/flyfish/framework/approval/repository/ApproveRecordRepository.java
@@ -0,0 +1,11 @@
+package dev.flyfish.framework.approval.repository;
+
+import dev.flyfish.framework.approval.domain.record.ApproveRecord;
+import dev.flyfish.framework.repository.DefaultReactiveRepository;
+
+/**
+ * 审批记录仓库
+ * @author wangyu
+ */
+public interface ApproveRecordRepository extends DefaultReactiveRepository {
+}
diff --git a/flyfish-approval/src/main/java/com/flyfish/framework/approval/service/ApproveRecordService.java b/flyfish-approval/src/main/java/dev/flyfish/framework/approval/service/ApproveRecordService.java
similarity index 53%
rename from flyfish-approval/src/main/java/com/flyfish/framework/approval/service/ApproveRecordService.java
rename to flyfish-approval/src/main/java/dev/flyfish/framework/approval/service/ApproveRecordService.java
index 5aff31a..0862a6e 100644
--- a/flyfish-approval/src/main/java/com/flyfish/framework/approval/service/ApproveRecordService.java
+++ b/flyfish-approval/src/main/java/dev/flyfish/framework/approval/service/ApproveRecordService.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.approval.service;
+package dev.flyfish.framework.approval.service;
-import com.flyfish.framework.approval.domain.record.ApproveRecord;
-import com.flyfish.framework.service.impl.BaseReactiveServiceImpl;
+import dev.flyfish.framework.approval.domain.record.ApproveRecord;
+import dev.flyfish.framework.service.impl.BaseReactiveServiceImpl;
import org.springframework.stereotype.Service;
/**
diff --git a/flyfish-approval/src/main/java/com/flyfish/framework/approval/service/ModuleDelegateService.java b/flyfish-approval/src/main/java/dev/flyfish/framework/approval/service/ModuleDelegateService.java
similarity index 93%
rename from flyfish-approval/src/main/java/com/flyfish/framework/approval/service/ModuleDelegateService.java
rename to flyfish-approval/src/main/java/dev/flyfish/framework/approval/service/ModuleDelegateService.java
index c459317..bc1a867 100644
--- a/flyfish-approval/src/main/java/com/flyfish/framework/approval/service/ModuleDelegateService.java
+++ b/flyfish-approval/src/main/java/dev/flyfish/framework/approval/service/ModuleDelegateService.java
@@ -1,15 +1,15 @@
-package com.flyfish.framework.approval.service;
+package dev.flyfish.framework.approval.service;
-import com.flyfish.framework.approval.domain.ApprovalDomain;
-import com.flyfish.framework.approval.domain.record.ApproveRecord;
-import com.flyfish.framework.approval.domain.submit.ApprovalSubmitDto;
-import com.flyfish.framework.approval.domain.todo.ApprovalDto;
-import com.flyfish.framework.approval.enums.ApproveAction;
-import com.flyfish.framework.approval.enums.ApproveStatus;
-import com.flyfish.framework.beans.meta.RestBean;
-import com.flyfish.framework.exception.biz.InvalidBusinessException;
-import com.flyfish.framework.service.BaseReactiveService;
-import com.flyfish.framework.utils.ReflectionUtils;
+import dev.flyfish.framework.approval.domain.ApprovalDomain;
+import dev.flyfish.framework.approval.domain.record.ApproveRecord;
+import dev.flyfish.framework.approval.domain.submit.ApprovalSubmitDto;
+import dev.flyfish.framework.approval.domain.todo.ApprovalDto;
+import dev.flyfish.framework.approval.enums.ApproveAction;
+import dev.flyfish.framework.approval.enums.ApproveStatus;
+import dev.flyfish.framework.beans.meta.RestBean;
+import dev.flyfish.framework.exception.biz.InvalidBusinessException;
+import dev.flyfish.framework.service.BaseReactiveService;
+import dev.flyfish.framework.utils.ReflectionUtils;
import org.apache.commons.lang3.ClassUtils;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/flyfish-backup/pom.xml b/flyfish-backup/pom.xml
index 0bce73c..dda7af7 100644
--- a/flyfish-backup/pom.xml
+++ b/flyfish-backup/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
flyfish-framework
- com.flyfish.framework
+ dev.flyfish.framework
${revision}
4.0.0
@@ -28,7 +28,7 @@
true
- com.flyfish.framework
+ dev.flyfish.framework
flyfish-web
${revision}
diff --git a/flyfish-backup/src/main/java/com/flyfish/framework/backup/repository/BackupRepository.java b/flyfish-backup/src/main/java/com/flyfish/framework/backup/repository/BackupRepository.java
deleted file mode 100644
index bfd9412..0000000
--- a/flyfish-backup/src/main/java/com/flyfish/framework/backup/repository/BackupRepository.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.flyfish.framework.backup.repository;
-
-import com.flyfish.framework.backup.domain.Backup;
-import com.flyfish.framework.repository.DefaultReactiveRepository;
-
-/**
- * 备份仓库
- *
- * @author wangyu
- */
-public interface BackupRepository extends DefaultReactiveRepository {
-}
diff --git a/flyfish-backup/src/main/java/com/flyfish/framework/backup/config/VersionConfig.java b/flyfish-backup/src/main/java/dev/flyfish/framework/backup/config/VersionConfig.java
similarity index 83%
rename from flyfish-backup/src/main/java/com/flyfish/framework/backup/config/VersionConfig.java
rename to flyfish-backup/src/main/java/dev/flyfish/framework/backup/config/VersionConfig.java
index 6b05d3c..43455e5 100644
--- a/flyfish-backup/src/main/java/com/flyfish/framework/backup/config/VersionConfig.java
+++ b/flyfish-backup/src/main/java/dev/flyfish/framework/backup/config/VersionConfig.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.backup.config;
+package dev.flyfish.framework.backup.config;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
diff --git a/flyfish-backup/src/main/java/com/flyfish/framework/backup/config/VersionProperties.java b/flyfish-backup/src/main/java/dev/flyfish/framework/backup/config/VersionProperties.java
similarity index 92%
rename from flyfish-backup/src/main/java/com/flyfish/framework/backup/config/VersionProperties.java
rename to flyfish-backup/src/main/java/dev/flyfish/framework/backup/config/VersionProperties.java
index 9eff5f4..7e27038 100644
--- a/flyfish-backup/src/main/java/com/flyfish/framework/backup/config/VersionProperties.java
+++ b/flyfish-backup/src/main/java/dev/flyfish/framework/backup/config/VersionProperties.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.backup.config;
+package dev.flyfish.framework.backup.config;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
diff --git a/flyfish-backup/src/main/java/com/flyfish/framework/backup/controller/BackupController.java b/flyfish-backup/src/main/java/dev/flyfish/framework/backup/controller/BackupController.java
similarity index 70%
rename from flyfish-backup/src/main/java/com/flyfish/framework/backup/controller/BackupController.java
rename to flyfish-backup/src/main/java/dev/flyfish/framework/backup/controller/BackupController.java
index dfea906..36be992 100644
--- a/flyfish-backup/src/main/java/com/flyfish/framework/backup/controller/BackupController.java
+++ b/flyfish-backup/src/main/java/dev/flyfish/framework/backup/controller/BackupController.java
@@ -1,10 +1,10 @@
-package com.flyfish.framework.backup.controller;
+package dev.flyfish.framework.backup.controller;
-import com.flyfish.framework.backup.domain.Backup;
-import com.flyfish.framework.backup.scheduler.BackupScheduler;
-import com.flyfish.framework.bean.Result;
-import com.flyfish.framework.controller.reactive.ReactiveBaseController;
-import com.flyfish.framework.domain.base.NameLikeQo;
+import dev.flyfish.framework.backup.domain.Backup;
+import dev.flyfish.framework.backup.scheduler.BackupScheduler;
+import dev.flyfish.framework.bean.Result;
+import dev.flyfish.framework.controller.reactive.ReactiveBaseController;
+import dev.flyfish.framework.domain.base.NameLikeQo;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
diff --git a/flyfish-backup/src/main/java/com/flyfish/framework/backup/controller/VersionController.java b/flyfish-backup/src/main/java/dev/flyfish/framework/backup/controller/VersionController.java
similarity index 83%
rename from flyfish-backup/src/main/java/com/flyfish/framework/backup/controller/VersionController.java
rename to flyfish-backup/src/main/java/dev/flyfish/framework/backup/controller/VersionController.java
index 1391abb..9d324a2 100644
--- a/flyfish-backup/src/main/java/com/flyfish/framework/backup/controller/VersionController.java
+++ b/flyfish-backup/src/main/java/dev/flyfish/framework/backup/controller/VersionController.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.backup.controller;
+package dev.flyfish.framework.backup.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
diff --git a/flyfish-backup/src/main/java/com/flyfish/framework/backup/domain/Backup.java b/flyfish-backup/src/main/java/dev/flyfish/framework/backup/domain/Backup.java
similarity index 85%
rename from flyfish-backup/src/main/java/com/flyfish/framework/backup/domain/Backup.java
rename to flyfish-backup/src/main/java/dev/flyfish/framework/backup/domain/Backup.java
index 5b0570f..52209a0 100644
--- a/flyfish-backup/src/main/java/com/flyfish/framework/backup/domain/Backup.java
+++ b/flyfish-backup/src/main/java/dev/flyfish/framework/backup/domain/Backup.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.backup.domain;
+package dev.flyfish.framework.backup.domain;
-import com.flyfish.framework.domain.base.AuditDomain;
-import com.flyfish.framework.enums.NamedEnum;
+import dev.flyfish.framework.domain.base.AuditDomain;
+import dev.flyfish.framework.enums.NamedEnum;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.Setter;
diff --git a/flyfish-backup/src/main/java/com/flyfish/framework/backup/domain/Version.java b/flyfish-backup/src/main/java/dev/flyfish/framework/backup/domain/Version.java
similarity index 79%
rename from flyfish-backup/src/main/java/com/flyfish/framework/backup/domain/Version.java
rename to flyfish-backup/src/main/java/dev/flyfish/framework/backup/domain/Version.java
index a40a2c1..b8e814b 100644
--- a/flyfish-backup/src/main/java/com/flyfish/framework/backup/domain/Version.java
+++ b/flyfish-backup/src/main/java/dev/flyfish/framework/backup/domain/Version.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.backup.domain;
+package dev.flyfish.framework.backup.domain;
-import com.flyfish.framework.annotations.Property;
+import dev.flyfish.framework.annotations.Property;
import lombok.Data;
import java.time.LocalDateTime;
diff --git a/flyfish-backup/src/main/java/dev/flyfish/framework/backup/repository/BackupRepository.java b/flyfish-backup/src/main/java/dev/flyfish/framework/backup/repository/BackupRepository.java
new file mode 100644
index 0000000..e89a6e4
--- /dev/null
+++ b/flyfish-backup/src/main/java/dev/flyfish/framework/backup/repository/BackupRepository.java
@@ -0,0 +1,12 @@
+package dev.flyfish.framework.backup.repository;
+
+import dev.flyfish.framework.backup.domain.Backup;
+import dev.flyfish.framework.repository.DefaultReactiveRepository;
+
+/**
+ * 备份仓库
+ *
+ * @author wangyu
+ */
+public interface BackupRepository extends DefaultReactiveRepository {
+}
diff --git a/flyfish-backup/src/main/java/com/flyfish/framework/backup/scheduler/BackupIndex.java b/flyfish-backup/src/main/java/dev/flyfish/framework/backup/scheduler/BackupIndex.java
similarity index 94%
rename from flyfish-backup/src/main/java/com/flyfish/framework/backup/scheduler/BackupIndex.java
rename to flyfish-backup/src/main/java/dev/flyfish/framework/backup/scheduler/BackupIndex.java
index 894b6d2..cb81fe2 100644
--- a/flyfish-backup/src/main/java/com/flyfish/framework/backup/scheduler/BackupIndex.java
+++ b/flyfish-backup/src/main/java/dev/flyfish/framework/backup/scheduler/BackupIndex.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.backup.scheduler;
+package dev.flyfish.framework.backup.scheduler;
import lombok.AllArgsConstructor;
import lombok.Data;
diff --git a/flyfish-backup/src/main/java/com/flyfish/framework/backup/scheduler/BackupScheduler.java b/flyfish-backup/src/main/java/dev/flyfish/framework/backup/scheduler/BackupScheduler.java
similarity index 95%
rename from flyfish-backup/src/main/java/com/flyfish/framework/backup/scheduler/BackupScheduler.java
rename to flyfish-backup/src/main/java/dev/flyfish/framework/backup/scheduler/BackupScheduler.java
index 58652cd..00c837d 100644
--- a/flyfish-backup/src/main/java/com/flyfish/framework/backup/scheduler/BackupScheduler.java
+++ b/flyfish-backup/src/main/java/dev/flyfish/framework/backup/scheduler/BackupScheduler.java
@@ -1,11 +1,11 @@
-package com.flyfish.framework.backup.scheduler;
+package dev.flyfish.framework.backup.scheduler;
-import com.flyfish.framework.backup.domain.Backup;
-import com.flyfish.framework.context.DateContext;
-import com.flyfish.framework.domain.base.DomainService;
-import com.flyfish.framework.query.Query;
-import com.flyfish.framework.repository.ReactiveEntityOperations;
-import com.flyfish.framework.utils.JacksonUtil;
+import dev.flyfish.framework.backup.domain.Backup;
+import dev.flyfish.framework.context.DateContext;
+import dev.flyfish.framework.domain.base.DomainService;
+import dev.flyfish.framework.query.Query;
+import dev.flyfish.framework.repository.ReactiveEntityOperations;
+import dev.flyfish.framework.utils.JacksonUtil;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
diff --git a/flyfish-backup/src/main/java/com/flyfish/framework/backup/service/BackupService.java b/flyfish-backup/src/main/java/dev/flyfish/framework/backup/service/BackupService.java
similarity index 69%
rename from flyfish-backup/src/main/java/com/flyfish/framework/backup/service/BackupService.java
rename to flyfish-backup/src/main/java/dev/flyfish/framework/backup/service/BackupService.java
index 37956e6..c9e9d84 100644
--- a/flyfish-backup/src/main/java/com/flyfish/framework/backup/service/BackupService.java
+++ b/flyfish-backup/src/main/java/dev/flyfish/framework/backup/service/BackupService.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.backup.service;
+package dev.flyfish.framework.backup.service;
-import com.flyfish.framework.backup.domain.Backup;
-import com.flyfish.framework.service.impl.BaseReactiveServiceImpl;
+import dev.flyfish.framework.backup.domain.Backup;
+import dev.flyfish.framework.service.impl.BaseReactiveServiceImpl;
import org.springframework.stereotype.Service;
import reactor.core.publisher.Mono;
diff --git a/flyfish-backup/src/main/java/com/flyfish/framework/backup/service/VersionService.java b/flyfish-backup/src/main/java/dev/flyfish/framework/backup/service/VersionService.java
similarity index 82%
rename from flyfish-backup/src/main/java/com/flyfish/framework/backup/service/VersionService.java
rename to flyfish-backup/src/main/java/dev/flyfish/framework/backup/service/VersionService.java
index 2365915..9c2ca15 100644
--- a/flyfish-backup/src/main/java/com/flyfish/framework/backup/service/VersionService.java
+++ b/flyfish-backup/src/main/java/dev/flyfish/framework/backup/service/VersionService.java
@@ -1,8 +1,7 @@
-package com.flyfish.framework.backup.service;
+package dev.flyfish.framework.backup.service;
-import com.flyfish.framework.backup.config.VersionProperties;
-import com.flyfish.framework.backup.domain.Version;
-import org.springframework.stereotype.Service;
+import dev.flyfish.framework.backup.config.VersionProperties;
+import dev.flyfish.framework.backup.domain.Version;
import org.springframework.web.reactive.function.client.WebClient;
import reactor.core.publisher.Mono;
diff --git a/flyfish-common/pom.xml b/flyfish-common/pom.xml
index f069425..f09283e 100644
--- a/flyfish-common/pom.xml
+++ b/flyfish-common/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
flyfish-framework
- com.flyfish.framework
+ dev.flyfish.framework
${revision}
4.0.0
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/bean/BaseResponse.java b/flyfish-common/src/main/java/dev/flyfish/framework/bean/BaseResponse.java
similarity index 94%
rename from flyfish-common/src/main/java/com/flyfish/framework/bean/BaseResponse.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/bean/BaseResponse.java
index a3a803f..bbcc0d7 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/bean/BaseResponse.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/bean/BaseResponse.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.bean;
+package dev.flyfish.framework.bean;
/**
* Created by wangyu on 2017/8/23.
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/bean/EnumValue.java b/flyfish-common/src/main/java/dev/flyfish/framework/bean/EnumValue.java
similarity index 87%
rename from flyfish-common/src/main/java/com/flyfish/framework/bean/EnumValue.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/bean/EnumValue.java
index d60fdea..79e99fc 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/bean/EnumValue.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/bean/EnumValue.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.bean;
+package dev.flyfish.framework.bean;
import lombok.AllArgsConstructor;
import lombok.Data;
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/bean/ListRestResponse.java b/flyfish-common/src/main/java/dev/flyfish/framework/bean/ListRestResponse.java
similarity index 96%
rename from flyfish-common/src/main/java/com/flyfish/framework/bean/ListRestResponse.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/bean/ListRestResponse.java
index 958b47b..f268559 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/bean/ListRestResponse.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/bean/ListRestResponse.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.bean;
+package dev.flyfish.framework.bean;
/**
* ${DESCRIPTION}
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/bean/ObjectMap.java b/flyfish-common/src/main/java/dev/flyfish/framework/bean/ObjectMap.java
similarity index 78%
rename from flyfish-common/src/main/java/com/flyfish/framework/bean/ObjectMap.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/bean/ObjectMap.java
index 4c7063a..21dfde1 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/bean/ObjectMap.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/bean/ObjectMap.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.bean;
+package dev.flyfish.framework.bean;
import java.util.HashMap;
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/bean/ObjectRestResponse.java b/flyfish-common/src/main/java/dev/flyfish/framework/bean/ObjectRestResponse.java
similarity index 94%
rename from flyfish-common/src/main/java/com/flyfish/framework/bean/ObjectRestResponse.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/bean/ObjectRestResponse.java
index 7cb37f3..1e156de 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/bean/ObjectRestResponse.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/bean/ObjectRestResponse.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.bean;
+package dev.flyfish.framework.bean;
/**
* Created by Wangyu on 2017/6/11.
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/bean/PageBean.java b/flyfish-common/src/main/java/dev/flyfish/framework/bean/PageBean.java
similarity index 96%
rename from flyfish-common/src/main/java/com/flyfish/framework/bean/PageBean.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/bean/PageBean.java
index 5854713..0e6d296 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/bean/PageBean.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/bean/PageBean.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.bean;
+package dev.flyfish.framework.bean;
import org.springframework.data.domain.Page;
@@ -57,4 +57,4 @@ public class PageBean {
public void setSize(Integer size) {
this.size = size;
}
-}
\ No newline at end of file
+}
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/bean/PageResult.java b/flyfish-common/src/main/java/dev/flyfish/framework/bean/PageResult.java
similarity index 96%
rename from flyfish-common/src/main/java/com/flyfish/framework/bean/PageResult.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/bean/PageResult.java
index 94fd00b..f10d715 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/bean/PageResult.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/bean/PageResult.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.bean;
+package dev.flyfish.framework.bean;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/bean/Result.java b/flyfish-common/src/main/java/dev/flyfish/framework/bean/Result.java
similarity index 98%
rename from flyfish-common/src/main/java/com/flyfish/framework/bean/Result.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/bean/Result.java
index 0890b3f..80cba57 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/bean/Result.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/bean/Result.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.bean;
+package dev.flyfish.framework.bean;
-import com.flyfish.framework.constant.Frameworks;
+import dev.flyfish.framework.constant.Frameworks;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.Pageable;
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/bean/TableResultResponse.java b/flyfish-common/src/main/java/dev/flyfish/framework/bean/TableResultResponse.java
similarity index 97%
rename from flyfish-common/src/main/java/com/flyfish/framework/bean/TableResultResponse.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/bean/TableResultResponse.java
index cb930f2..3f3c65a 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/bean/TableResultResponse.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/bean/TableResultResponse.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.bean;
+package dev.flyfish.framework.bean;
import java.util.List;
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/bean/TreeNode.java b/flyfish-common/src/main/java/dev/flyfish/framework/bean/TreeNode.java
similarity index 95%
rename from flyfish-common/src/main/java/com/flyfish/framework/bean/TreeNode.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/bean/TreeNode.java
index a7ca24a..ece715c 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/bean/TreeNode.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/bean/TreeNode.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.bean;
+package dev.flyfish.framework.bean;
import java.util.ArrayList;
import java.util.List;
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/bean/auth/TokenErrorResponse.java b/flyfish-common/src/main/java/dev/flyfish/framework/bean/auth/TokenErrorResponse.java
similarity index 59%
rename from flyfish-common/src/main/java/com/flyfish/framework/bean/auth/TokenErrorResponse.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/bean/auth/TokenErrorResponse.java
index a09f577..a204bee 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/bean/auth/TokenErrorResponse.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/bean/auth/TokenErrorResponse.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.bean.auth;
+package dev.flyfish.framework.bean.auth;
-import com.flyfish.framework.bean.BaseResponse;
-import com.flyfish.framework.constant.RestCodeConstants;
+import dev.flyfish.framework.bean.BaseResponse;
+import dev.flyfish.framework.constant.RestCodeConstants;
/**
* Created by wangyu on 2017/8/23.
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/bean/auth/TokenForbiddenResponse.java b/flyfish-common/src/main/java/dev/flyfish/framework/bean/auth/TokenForbiddenResponse.java
similarity index 60%
rename from flyfish-common/src/main/java/com/flyfish/framework/bean/auth/TokenForbiddenResponse.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/bean/auth/TokenForbiddenResponse.java
index a950239..835f147 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/bean/auth/TokenForbiddenResponse.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/bean/auth/TokenForbiddenResponse.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.bean.auth;
+package dev.flyfish.framework.bean.auth;
-import com.flyfish.framework.bean.BaseResponse;
-import com.flyfish.framework.constant.RestCodeConstants;
+import dev.flyfish.framework.bean.BaseResponse;
+import dev.flyfish.framework.constant.RestCodeConstants;
/**
* Created by wangyu on 2017/8/25.
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/compiler/DynamicJavaCompiler.java b/flyfish-common/src/main/java/dev/flyfish/framework/compiler/DynamicJavaCompiler.java
similarity index 85%
rename from flyfish-common/src/main/java/com/flyfish/framework/compiler/DynamicJavaCompiler.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/compiler/DynamicJavaCompiler.java
index 80d2bbc..046925a 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/compiler/DynamicJavaCompiler.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/compiler/DynamicJavaCompiler.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.compiler;
+package dev.flyfish.framework.compiler;
-import com.flyfish.framework.compiler.support.DelegateJavaCompiler;
-import com.flyfish.framework.compiler.support.SimpleJavaCompiler;
+import dev.flyfish.framework.compiler.support.DelegateJavaCompiler;
+import dev.flyfish.framework.compiler.support.SimpleJavaCompiler;
import org.springframework.lang.Nullable;
import java.io.Closeable;
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/compiler/core/ClassLoaders.java b/flyfish-common/src/main/java/dev/flyfish/framework/compiler/core/ClassLoaders.java
similarity index 83%
rename from flyfish-common/src/main/java/com/flyfish/framework/compiler/core/ClassLoaders.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/compiler/core/ClassLoaders.java
index 7f75fbc..ca0242a 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/compiler/core/ClassLoaders.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/compiler/core/ClassLoaders.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.compiler.core;
+package dev.flyfish.framework.compiler.core;
/**
* 静态访问器
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/compiler/core/DynamicClassLoader.java b/flyfish-common/src/main/java/dev/flyfish/framework/compiler/core/DynamicClassLoader.java
similarity index 93%
rename from flyfish-common/src/main/java/com/flyfish/framework/compiler/core/DynamicClassLoader.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/compiler/core/DynamicClassLoader.java
index 48c9e1c..9a0aa8f 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/compiler/core/DynamicClassLoader.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/compiler/core/DynamicClassLoader.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.compiler.core;
+package dev.flyfish.framework.compiler.core;
import java.net.URL;
import java.net.URLClassLoader;
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/compiler/core/JavaStringCompiler.java b/flyfish-common/src/main/java/dev/flyfish/framework/compiler/core/JavaStringCompiler.java
similarity index 98%
rename from flyfish-common/src/main/java/com/flyfish/framework/compiler/core/JavaStringCompiler.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/compiler/core/JavaStringCompiler.java
index 0902d59..2edd909 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/compiler/core/JavaStringCompiler.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/compiler/core/JavaStringCompiler.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.compiler.core;
+package dev.flyfish.framework.compiler.core;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.BooleanUtils;
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/compiler/core/MemoryClassLoader.java b/flyfish-common/src/main/java/dev/flyfish/framework/compiler/core/MemoryClassLoader.java
similarity index 98%
rename from flyfish-common/src/main/java/com/flyfish/framework/compiler/core/MemoryClassLoader.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/compiler/core/MemoryClassLoader.java
index 00aa317..7476cb3 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/compiler/core/MemoryClassLoader.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/compiler/core/MemoryClassLoader.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.compiler.core;
+package dev.flyfish.framework.compiler.core;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/compiler/core/MemoryJavaFileManager.java b/flyfish-common/src/main/java/dev/flyfish/framework/compiler/core/MemoryJavaFileManager.java
similarity index 98%
rename from flyfish-common/src/main/java/com/flyfish/framework/compiler/core/MemoryJavaFileManager.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/compiler/core/MemoryJavaFileManager.java
index 254d7e7..b225784 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/compiler/core/MemoryJavaFileManager.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/compiler/core/MemoryJavaFileManager.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.compiler.core;
+package dev.flyfish.framework.compiler.core;
import lombok.Getter;
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/compiler/core/VendorJavaCompiler.java b/flyfish-common/src/main/java/dev/flyfish/framework/compiler/core/VendorJavaCompiler.java
similarity index 92%
rename from flyfish-common/src/main/java/com/flyfish/framework/compiler/core/VendorJavaCompiler.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/compiler/core/VendorJavaCompiler.java
index 6ab0c62..f55d4c6 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/compiler/core/VendorJavaCompiler.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/compiler/core/VendorJavaCompiler.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.compiler.core;
+package dev.flyfish.framework.compiler.core;
import java.io.Closeable;
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/compiler/support/DelegateJavaCompiler.java b/flyfish-common/src/main/java/dev/flyfish/framework/compiler/support/DelegateJavaCompiler.java
similarity index 88%
rename from flyfish-common/src/main/java/com/flyfish/framework/compiler/support/DelegateJavaCompiler.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/compiler/support/DelegateJavaCompiler.java
index 40fd687..e60992d 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/compiler/support/DelegateJavaCompiler.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/compiler/support/DelegateJavaCompiler.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.compiler.support;
+package dev.flyfish.framework.compiler.support;
-import com.flyfish.framework.compiler.DynamicJavaCompiler;
-import com.flyfish.framework.compiler.core.VendorJavaCompiler;
+import dev.flyfish.framework.compiler.DynamicJavaCompiler;
+import dev.flyfish.framework.compiler.core.VendorJavaCompiler;
import lombok.extern.slf4j.Slf4j;
import java.io.IOException;
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/compiler/support/JavaSource.java b/flyfish-common/src/main/java/dev/flyfish/framework/compiler/support/JavaSource.java
similarity index 96%
rename from flyfish-common/src/main/java/com/flyfish/framework/compiler/support/JavaSource.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/compiler/support/JavaSource.java
index ee25333..87a0076 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/compiler/support/JavaSource.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/compiler/support/JavaSource.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.compiler.support;
+package dev.flyfish.framework.compiler.support;
import lombok.Data;
import lombok.NoArgsConstructor;
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/compiler/support/SimpleJavaCompiler.java b/flyfish-common/src/main/java/dev/flyfish/framework/compiler/support/SimpleJavaCompiler.java
similarity index 94%
rename from flyfish-common/src/main/java/com/flyfish/framework/compiler/support/SimpleJavaCompiler.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/compiler/support/SimpleJavaCompiler.java
index eea5dd3..c3e6381 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/compiler/support/SimpleJavaCompiler.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/compiler/support/SimpleJavaCompiler.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.compiler.support;
+package dev.flyfish.framework.compiler.support;
-import com.flyfish.framework.compiler.DynamicJavaCompiler;
+import dev.flyfish.framework.compiler.DynamicJavaCompiler;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
@@ -57,7 +57,7 @@ public class SimpleJavaCompiler implements DynamicJavaCompiler {
options, null, Collections.singletonList(fileObject));
// 阻塞编译
if (BooleanUtils.isTrue(task.call())) {
- return "com.flyfish.project." + name;
+ return "dev.flyfish.project." + name;
}
return null;
}
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/compiler/support/StringJavaObject.java b/flyfish-common/src/main/java/dev/flyfish/framework/compiler/support/StringJavaObject.java
similarity index 94%
rename from flyfish-common/src/main/java/com/flyfish/framework/compiler/support/StringJavaObject.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/compiler/support/StringJavaObject.java
index 5465ad8..ae1cff3 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/compiler/support/StringJavaObject.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/compiler/support/StringJavaObject.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.compiler.support;
+package dev.flyfish.framework.compiler.support;
import javax.tools.SimpleJavaFileObject;
import java.io.IOException;
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/compiler/template/TemplateCompiler.java b/flyfish-common/src/main/java/dev/flyfish/framework/compiler/template/TemplateCompiler.java
similarity index 96%
rename from flyfish-common/src/main/java/com/flyfish/framework/compiler/template/TemplateCompiler.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/compiler/template/TemplateCompiler.java
index 7e1a1f2..1201dfc 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/compiler/template/TemplateCompiler.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/compiler/template/TemplateCompiler.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.compiler.template;
+package dev.flyfish.framework.compiler.template;
-import com.flyfish.framework.compiler.support.JavaSource;
+import dev.flyfish.framework.compiler.support.JavaSource;
import org.springframework.beans.BeanUtils;
import org.springframework.data.util.CastUtils;
import org.springframework.util.StreamUtils;
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/config/FrameworkConfiguration.java b/flyfish-common/src/main/java/dev/flyfish/framework/config/FrameworkConfiguration.java
similarity index 93%
rename from flyfish-common/src/main/java/com/flyfish/framework/config/FrameworkConfiguration.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/config/FrameworkConfiguration.java
index 2aaa078..fd4212d 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/config/FrameworkConfiguration.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/config/FrameworkConfiguration.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.config;
+package dev.flyfish.framework.config;
import lombok.Getter;
import lombok.Setter;
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/constant/CommonConstants.java b/flyfish-common/src/main/java/dev/flyfish/framework/constant/CommonConstants.java
similarity index 96%
rename from flyfish-common/src/main/java/com/flyfish/framework/constant/CommonConstants.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/constant/CommonConstants.java
index 617d704..04f68a2 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/constant/CommonConstants.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/constant/CommonConstants.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.constant;
+package dev.flyfish.framework.constant;
/**
* Created by wangyu on 2017/8/29.
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/constant/Frameworks.java b/flyfish-common/src/main/java/dev/flyfish/framework/constant/Frameworks.java
similarity index 81%
rename from flyfish-common/src/main/java/com/flyfish/framework/constant/Frameworks.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/constant/Frameworks.java
index 7f52480..9e7908f 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/constant/Frameworks.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/constant/Frameworks.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.constant;
+package dev.flyfish.framework.constant;
-import com.flyfish.framework.config.FrameworkConfiguration;
+import dev.flyfish.framework.config.FrameworkConfiguration;
/**
* 框架静态配置
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/constant/ReactiveConstants.java b/flyfish-common/src/main/java/dev/flyfish/framework/constant/ReactiveConstants.java
similarity index 76%
rename from flyfish-common/src/main/java/com/flyfish/framework/constant/ReactiveConstants.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/constant/ReactiveConstants.java
index fefbc68..a84fd42 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/constant/ReactiveConstants.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/constant/ReactiveConstants.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.constant;
+package dev.flyfish.framework.constant;
/**
* 异步接口常量
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/constant/RestCodeConstants.java b/flyfish-common/src/main/java/dev/flyfish/framework/constant/RestCodeConstants.java
similarity index 82%
rename from flyfish-common/src/main/java/com/flyfish/framework/constant/RestCodeConstants.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/constant/RestCodeConstants.java
index 0eefbcb..0f98d66 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/constant/RestCodeConstants.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/constant/RestCodeConstants.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.constant;
+package dev.flyfish.framework.constant;
/**
* Created by wangyu on 2017/8/23.
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/constant/UserConstant.java b/flyfish-common/src/main/java/dev/flyfish/framework/constant/UserConstant.java
similarity index 79%
rename from flyfish-common/src/main/java/com/flyfish/framework/constant/UserConstant.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/constant/UserConstant.java
index 2584898..9e62ec9 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/constant/UserConstant.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/constant/UserConstant.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.constant;
+package dev.flyfish.framework.constant;
/**
* ${DESCRIPTION}
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/context/DateContext.java b/flyfish-common/src/main/java/dev/flyfish/framework/context/DateContext.java
similarity index 98%
rename from flyfish-common/src/main/java/com/flyfish/framework/context/DateContext.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/context/DateContext.java
index 0556a31..f650219 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/context/DateContext.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/context/DateContext.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.context;
+package dev.flyfish.framework.context;
import org.springframework.stereotype.Component;
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/context/ReactiveContext.java b/flyfish-common/src/main/java/dev/flyfish/framework/context/ReactiveContext.java
similarity index 91%
rename from flyfish-common/src/main/java/com/flyfish/framework/context/ReactiveContext.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/context/ReactiveContext.java
index 2fb6f2f..0222e9a 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/context/ReactiveContext.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/context/ReactiveContext.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.context;
+package dev.flyfish.framework.context;
import reactor.core.publisher.Mono;
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/context/SpringContext.java b/flyfish-common/src/main/java/dev/flyfish/framework/context/SpringContext.java
similarity index 94%
rename from flyfish-common/src/main/java/com/flyfish/framework/context/SpringContext.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/context/SpringContext.java
index 4324b9a..f0ff334 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/context/SpringContext.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/context/SpringContext.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.context;
+package dev.flyfish.framework.context;
-import com.flyfish.framework.utils.Assert;
+import dev.flyfish.framework.utils.Assert;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanInitializationException;
import org.springframework.context.ApplicationContext;
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/enums/BlankEnum.java b/flyfish-common/src/main/java/dev/flyfish/framework/enums/BlankEnum.java
similarity index 82%
rename from flyfish-common/src/main/java/com/flyfish/framework/enums/BlankEnum.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/enums/BlankEnum.java
index abf80c2..8163573 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/enums/BlankEnum.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/enums/BlankEnum.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.enums;
+package dev.flyfish.framework.enums;
/**
* 空白的枚举
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/enums/CodeBasedEnum.java b/flyfish-common/src/main/java/dev/flyfish/framework/enums/CodeBasedEnum.java
similarity index 84%
rename from flyfish-common/src/main/java/com/flyfish/framework/enums/CodeBasedEnum.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/enums/CodeBasedEnum.java
index 948f289..d27a633 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/enums/CodeBasedEnum.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/enums/CodeBasedEnum.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.enums;
+package dev.flyfish.framework.enums;
/**
* 基于标识码的枚举基类
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/enums/NamedEnum.java b/flyfish-common/src/main/java/dev/flyfish/framework/enums/NamedEnum.java
similarity index 75%
rename from flyfish-common/src/main/java/com/flyfish/framework/enums/NamedEnum.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/enums/NamedEnum.java
index 161f37c..156dc5a 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/enums/NamedEnum.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/enums/NamedEnum.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.enums;
+package dev.flyfish.framework.enums;
/**
* 带有名称字段的枚举
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/enums/RoleType.java b/flyfish-common/src/main/java/dev/flyfish/framework/enums/RoleType.java
similarity index 84%
rename from flyfish-common/src/main/java/com/flyfish/framework/enums/RoleType.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/enums/RoleType.java
index 0ad4322..9d8da20 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/enums/RoleType.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/enums/RoleType.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.enums;
+package dev.flyfish.framework.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/enums/UserStatus.java b/flyfish-common/src/main/java/dev/flyfish/framework/enums/UserStatus.java
similarity index 90%
rename from flyfish-common/src/main/java/com/flyfish/framework/enums/UserStatus.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/enums/UserStatus.java
index f536b96..2da2a93 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/enums/UserStatus.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/enums/UserStatus.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.enums;
+package dev.flyfish.framework.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/enums/UserType.java b/flyfish-common/src/main/java/dev/flyfish/framework/enums/UserType.java
similarity index 94%
rename from flyfish-common/src/main/java/com/flyfish/framework/enums/UserType.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/enums/UserType.java
index c190913..9184766 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/enums/UserType.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/enums/UserType.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.enums;
+package dev.flyfish.framework.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/exception/BaseException.java b/flyfish-common/src/main/java/dev/flyfish/framework/exception/BaseException.java
similarity index 95%
rename from flyfish-common/src/main/java/com/flyfish/framework/exception/BaseException.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/exception/BaseException.java
index 08436e0..23b7009 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/exception/BaseException.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/exception/BaseException.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.exception;
+package dev.flyfish.framework.exception;
/**
* Created by wangyu on 2017/9/8.
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/exception/auth/ClientForbiddenException.java b/flyfish-common/src/main/java/dev/flyfish/framework/exception/auth/ClientForbiddenException.java
similarity index 60%
rename from flyfish-common/src/main/java/com/flyfish/framework/exception/auth/ClientForbiddenException.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/exception/auth/ClientForbiddenException.java
index 3e5623f..91f69b0 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/exception/auth/ClientForbiddenException.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/exception/auth/ClientForbiddenException.java
@@ -1,8 +1,8 @@
-package com.flyfish.framework.exception.auth;
+package dev.flyfish.framework.exception.auth;
-import com.flyfish.framework.constant.CommonConstants;
-import com.flyfish.framework.exception.BaseException;
+import dev.flyfish.framework.constant.CommonConstants;
+import dev.flyfish.framework.exception.BaseException;
/**
* Created by wangyu on 2017/9/12.
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/exception/auth/ClientInvalidException.java b/flyfish-common/src/main/java/dev/flyfish/framework/exception/auth/ClientInvalidException.java
similarity index 59%
rename from flyfish-common/src/main/java/com/flyfish/framework/exception/auth/ClientInvalidException.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/exception/auth/ClientInvalidException.java
index 79b7019..27d10a9 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/exception/auth/ClientInvalidException.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/exception/auth/ClientInvalidException.java
@@ -1,8 +1,8 @@
-package com.flyfish.framework.exception.auth;
+package dev.flyfish.framework.exception.auth;
-import com.flyfish.framework.constant.CommonConstants;
-import com.flyfish.framework.exception.BaseException;
+import dev.flyfish.framework.constant.CommonConstants;
+import dev.flyfish.framework.exception.BaseException;
/**
* Created by wangyu on 2017/9/10.
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/exception/auth/ClientTokenException.java b/flyfish-common/src/main/java/dev/flyfish/framework/exception/auth/ClientTokenException.java
similarity index 59%
rename from flyfish-common/src/main/java/com/flyfish/framework/exception/auth/ClientTokenException.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/exception/auth/ClientTokenException.java
index 778bb85..5422d27 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/exception/auth/ClientTokenException.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/exception/auth/ClientTokenException.java
@@ -1,8 +1,8 @@
-package com.flyfish.framework.exception.auth;
+package dev.flyfish.framework.exception.auth;
-import com.flyfish.framework.constant.CommonConstants;
-import com.flyfish.framework.exception.BaseException;
+import dev.flyfish.framework.constant.CommonConstants;
+import dev.flyfish.framework.exception.BaseException;
/**
* Created by wangyu on 2017/9/10.
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/exception/auth/UserInvalidException.java b/flyfish-common/src/main/java/dev/flyfish/framework/exception/auth/UserInvalidException.java
similarity index 59%
rename from flyfish-common/src/main/java/com/flyfish/framework/exception/auth/UserInvalidException.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/exception/auth/UserInvalidException.java
index 2f542b1..7432ef7 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/exception/auth/UserInvalidException.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/exception/auth/UserInvalidException.java
@@ -1,8 +1,8 @@
-package com.flyfish.framework.exception.auth;
+package dev.flyfish.framework.exception.auth;
-import com.flyfish.framework.constant.CommonConstants;
-import com.flyfish.framework.exception.BaseException;
+import dev.flyfish.framework.constant.CommonConstants;
+import dev.flyfish.framework.exception.BaseException;
/**
* Created by wangyu on 2017/9/8.
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/exception/auth/UserTokenException.java b/flyfish-common/src/main/java/dev/flyfish/framework/exception/auth/UserTokenException.java
similarity index 58%
rename from flyfish-common/src/main/java/com/flyfish/framework/exception/auth/UserTokenException.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/exception/auth/UserTokenException.java
index 1755f58..f364a5f 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/exception/auth/UserTokenException.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/exception/auth/UserTokenException.java
@@ -1,8 +1,8 @@
-package com.flyfish.framework.exception.auth;
+package dev.flyfish.framework.exception.auth;
-import com.flyfish.framework.constant.CommonConstants;
-import com.flyfish.framework.exception.BaseException;
+import dev.flyfish.framework.constant.CommonConstants;
+import dev.flyfish.framework.exception.BaseException;
/**
* Created by wangyu on 2017/9/8.
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/exception/biz/DataLackException.java b/flyfish-common/src/main/java/dev/flyfish/framework/exception/biz/DataLackException.java
similarity index 87%
rename from flyfish-common/src/main/java/com/flyfish/framework/exception/biz/DataLackException.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/exception/biz/DataLackException.java
index 7d2f49c..b33f839 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/exception/biz/DataLackException.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/exception/biz/DataLackException.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.exception.biz;
+package dev.flyfish.framework.exception.biz;
-import com.flyfish.framework.exception.BaseException;
+import dev.flyfish.framework.exception.BaseException;
import java.util.function.Supplier;
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/exception/biz/InvalidBusinessException.java b/flyfish-common/src/main/java/dev/flyfish/framework/exception/biz/InvalidBusinessException.java
similarity index 78%
rename from flyfish-common/src/main/java/com/flyfish/framework/exception/biz/InvalidBusinessException.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/exception/biz/InvalidBusinessException.java
index af05606..28da2b2 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/exception/biz/InvalidBusinessException.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/exception/biz/InvalidBusinessException.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.exception.biz;
+package dev.flyfish.framework.exception.biz;
-import com.flyfish.framework.exception.BaseException;
+import dev.flyfish.framework.exception.BaseException;
/**
* 业务限制异常
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/utils/Assert.java b/flyfish-common/src/main/java/dev/flyfish/framework/utils/Assert.java
similarity index 99%
rename from flyfish-common/src/main/java/com/flyfish/framework/utils/Assert.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/utils/Assert.java
index 1cf7fd3..8c0fc46 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/utils/Assert.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/utils/Assert.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.utils;
+package dev.flyfish.framework.utils;
-import com.flyfish.framework.exception.biz.InvalidBusinessException;
+import dev.flyfish.framework.exception.biz.InvalidBusinessException;
import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/utils/Builder.java b/flyfish-common/src/main/java/dev/flyfish/framework/utils/Builder.java
similarity index 81%
rename from flyfish-common/src/main/java/com/flyfish/framework/utils/Builder.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/utils/Builder.java
index 17ba447..8e84107 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/utils/Builder.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/utils/Builder.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.utils;
+package dev.flyfish.framework.utils;
/**
* 构建器表示
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/utils/ClassPathResourceScanner.java b/flyfish-common/src/main/java/dev/flyfish/framework/utils/ClassPathResourceScanner.java
similarity index 98%
rename from flyfish-common/src/main/java/com/flyfish/framework/utils/ClassPathResourceScanner.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/utils/ClassPathResourceScanner.java
index 9994f67..221288d 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/utils/ClassPathResourceScanner.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/utils/ClassPathResourceScanner.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.utils;
+package dev.flyfish.framework.utils;
import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition;
import org.springframework.beans.factory.config.BeanDefinition;
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/utils/EntityUtils.java b/flyfish-common/src/main/java/dev/flyfish/framework/utils/EntityUtils.java
similarity index 97%
rename from flyfish-common/src/main/java/com/flyfish/framework/utils/EntityUtils.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/utils/EntityUtils.java
index da6ef8e..2b6d2b5 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/utils/EntityUtils.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/utils/EntityUtils.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.utils;
+package dev.flyfish.framework.utils;
/**
* 实体类相关工具类
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/utils/EnumUtils.java b/flyfish-common/src/main/java/dev/flyfish/framework/utils/EnumUtils.java
similarity index 90%
rename from flyfish-common/src/main/java/com/flyfish/framework/utils/EnumUtils.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/utils/EnumUtils.java
index eee1be2..50cff59 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/utils/EnumUtils.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/utils/EnumUtils.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.utils;
+package dev.flyfish.framework.utils;
-import com.flyfish.framework.enums.CodeBasedEnum;
+import dev.flyfish.framework.enums.CodeBasedEnum;
import java.util.NoSuchElementException;
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/utils/JacksonUtil.java b/flyfish-common/src/main/java/dev/flyfish/framework/utils/JacksonUtil.java
similarity index 99%
rename from flyfish-common/src/main/java/com/flyfish/framework/utils/JacksonUtil.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/utils/JacksonUtil.java
index 9a1eed8..2458085 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/utils/JacksonUtil.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/utils/JacksonUtil.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.utils;
+package dev.flyfish.framework.utils;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.core.JsonParser;
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/utils/LRUCache.java b/flyfish-common/src/main/java/dev/flyfish/framework/utils/LRUCache.java
similarity index 97%
rename from flyfish-common/src/main/java/com/flyfish/framework/utils/LRUCache.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/utils/LRUCache.java
index 1b1bdaa..a9c81ff 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/utils/LRUCache.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/utils/LRUCache.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.utils;
+package dev.flyfish.framework.utils;
import java.util.LinkedHashMap;
import java.util.Map;
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/utils/MapBuilder.java b/flyfish-common/src/main/java/dev/flyfish/framework/utils/MapBuilder.java
similarity index 95%
rename from flyfish-common/src/main/java/com/flyfish/framework/utils/MapBuilder.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/utils/MapBuilder.java
index 2cc4b8e..9f97240 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/utils/MapBuilder.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/utils/MapBuilder.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.utils;
+package dev.flyfish.framework.utils;
import java.util.LinkedHashMap;
import java.util.Map;
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/utils/ReflectionUtils.java b/flyfish-common/src/main/java/dev/flyfish/framework/utils/ReflectionUtils.java
similarity index 99%
rename from flyfish-common/src/main/java/com/flyfish/framework/utils/ReflectionUtils.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/utils/ReflectionUtils.java
index dd45e5f..0e1deda 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/utils/ReflectionUtils.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/utils/ReflectionUtils.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.utils;
+package dev.flyfish.framework.utils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ArrayUtils;
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/utils/StringFormats.java b/flyfish-common/src/main/java/dev/flyfish/framework/utils/StringFormats.java
similarity index 95%
rename from flyfish-common/src/main/java/com/flyfish/framework/utils/StringFormats.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/utils/StringFormats.java
index 7ce4ba7..bb96fbf 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/utils/StringFormats.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/utils/StringFormats.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.utils;
+package dev.flyfish.framework.utils;
import org.apache.commons.lang3.StringUtils;
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/utils/StringHelper.java b/flyfish-common/src/main/java/dev/flyfish/framework/utils/StringHelper.java
similarity index 96%
rename from flyfish-common/src/main/java/com/flyfish/framework/utils/StringHelper.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/utils/StringHelper.java
index 26280da..88c8394 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/utils/StringHelper.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/utils/StringHelper.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.utils;
+package dev.flyfish.framework.utils;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/utils/Supportable.java b/flyfish-common/src/main/java/dev/flyfish/framework/utils/Supportable.java
similarity index 83%
rename from flyfish-common/src/main/java/com/flyfish/framework/utils/Supportable.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/utils/Supportable.java
index e84292e..caef983 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/utils/Supportable.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/utils/Supportable.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.utils;
+package dev.flyfish.framework.utils;
public interface Supportable {
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/utils/TreeUtil.java b/flyfish-common/src/main/java/dev/flyfish/framework/utils/TreeUtil.java
similarity index 95%
rename from flyfish-common/src/main/java/com/flyfish/framework/utils/TreeUtil.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/utils/TreeUtil.java
index 0241ede..07f1529 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/utils/TreeUtil.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/utils/TreeUtil.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.utils;
+package dev.flyfish.framework.utils;
-import com.flyfish.framework.bean.TreeNode;
+import dev.flyfish.framework.bean.TreeNode;
import java.util.ArrayList;
import java.util.List;
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/utils/UUIDUtils.java b/flyfish-common/src/main/java/dev/flyfish/framework/utils/UUIDUtils.java
similarity index 96%
rename from flyfish-common/src/main/java/com/flyfish/framework/utils/UUIDUtils.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/utils/UUIDUtils.java
index 118d320..e3fca48 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/utils/UUIDUtils.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/utils/UUIDUtils.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.utils;
+package dev.flyfish.framework.utils;
import java.util.UUID;
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/validation/annotations/ContainsBean.java b/flyfish-common/src/main/java/dev/flyfish/framework/validation/annotations/ContainsBean.java
similarity index 88%
rename from flyfish-common/src/main/java/com/flyfish/framework/validation/annotations/ContainsBean.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/validation/annotations/ContainsBean.java
index db9c9f4..27a8f20 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/validation/annotations/ContainsBean.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/validation/annotations/ContainsBean.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.validation.annotations;
+package dev.flyfish.framework.validation.annotations;
-import com.flyfish.framework.validation.validators.ContainsBeanValidator;
+import dev.flyfish.framework.validation.validators.ContainsBeanValidator;
import jakarta.validation.Constraint;
import jakarta.validation.Payload;
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/validation/annotations/IdCard.java b/flyfish-common/src/main/java/dev/flyfish/framework/validation/annotations/IdCard.java
similarity index 79%
rename from flyfish-common/src/main/java/com/flyfish/framework/validation/annotations/IdCard.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/validation/annotations/IdCard.java
index d4c5032..750be1d 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/validation/annotations/IdCard.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/validation/annotations/IdCard.java
@@ -1,11 +1,10 @@
-package com.flyfish.framework.validation.annotations;
+package dev.flyfish.framework.validation.annotations;
-import com.flyfish.framework.validation.validators.IdCardValidator;
-import com.flyfish.framework.validation.validators.MoneyValidator;
+import dev.flyfish.framework.validation.validators.IdCardValidator;
import jakarta.validation.Constraint;
import jakarta.validation.Payload;
-import com.flyfish.framework.validation.annotations.IdCard.List;
+import dev.flyfish.framework.validation.annotations.IdCard.List;
import java.lang.annotation.Documented;
import java.lang.annotation.Repeatable;
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/validation/annotations/IsJSONString.java b/flyfish-common/src/main/java/dev/flyfish/framework/validation/annotations/IsJSONString.java
similarity index 88%
rename from flyfish-common/src/main/java/com/flyfish/framework/validation/annotations/IsJSONString.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/validation/annotations/IsJSONString.java
index 51c982a..9b3485a 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/validation/annotations/IsJSONString.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/validation/annotations/IsJSONString.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.validation.annotations;
+package dev.flyfish.framework.validation.annotations;
-import com.flyfish.framework.validation.validators.IsJSONStringValidator;
+import dev.flyfish.framework.validation.validators.IsJSONStringValidator;
import jakarta.validation.Constraint;
import jakarta.validation.Payload;
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/validation/annotations/Money.java b/flyfish-common/src/main/java/dev/flyfish/framework/validation/annotations/Money.java
similarity index 83%
rename from flyfish-common/src/main/java/com/flyfish/framework/validation/annotations/Money.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/validation/annotations/Money.java
index ee4b8e4..0172c51 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/validation/annotations/Money.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/validation/annotations/Money.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.validation.annotations;
+package dev.flyfish.framework.validation.annotations;
-import com.flyfish.framework.validation.annotations.Money.List;
-import com.flyfish.framework.validation.validators.MoneyValidator;
+import dev.flyfish.framework.validation.annotations.Money.List;
+import dev.flyfish.framework.validation.validators.MoneyValidator;
import jakarta.validation.Constraint;
import jakarta.validation.Payload;
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/validation/annotations/Password.java b/flyfish-common/src/main/java/dev/flyfish/framework/validation/annotations/Password.java
similarity index 79%
rename from flyfish-common/src/main/java/com/flyfish/framework/validation/annotations/Password.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/validation/annotations/Password.java
index 7a9d2dd..c5dfdf9 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/validation/annotations/Password.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/validation/annotations/Password.java
@@ -1,8 +1,7 @@
-package com.flyfish.framework.validation.annotations;
+package dev.flyfish.framework.validation.annotations;
-import com.flyfish.framework.validation.annotations.Password.List;
-import com.flyfish.framework.validation.validators.IdCardValidator;
-import com.flyfish.framework.validation.validators.PasswordValidator;
+import dev.flyfish.framework.validation.annotations.Password.List;
+import dev.flyfish.framework.validation.validators.PasswordValidator;
import jakarta.validation.Constraint;
import jakarta.validation.Payload;
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/validation/annotations/Phone.java b/flyfish-common/src/main/java/dev/flyfish/framework/validation/annotations/Phone.java
similarity index 84%
rename from flyfish-common/src/main/java/com/flyfish/framework/validation/annotations/Phone.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/validation/annotations/Phone.java
index 88303e9..02b1955 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/validation/annotations/Phone.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/validation/annotations/Phone.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.validation.annotations;
+package dev.flyfish.framework.validation.annotations;
-import com.flyfish.framework.validation.enums.PhoneType;
-import com.flyfish.framework.validation.validators.PhoneValidator;
+import dev.flyfish.framework.validation.enums.PhoneType;
+import dev.flyfish.framework.validation.validators.PhoneValidator;
import jakarta.validation.Constraint;
import jakarta.validation.Payload;
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/validation/annotations/UniqueField.java b/flyfish-common/src/main/java/dev/flyfish/framework/validation/annotations/UniqueField.java
similarity index 84%
rename from flyfish-common/src/main/java/com/flyfish/framework/validation/annotations/UniqueField.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/validation/annotations/UniqueField.java
index 0fdef68..e6f72a8 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/validation/annotations/UniqueField.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/validation/annotations/UniqueField.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.validation.annotations;
+package dev.flyfish.framework.validation.annotations;
-import com.flyfish.framework.validation.annotations.UniqueField.List;
-import com.flyfish.framework.validation.validators.UniqueFieldValidator;
+import dev.flyfish.framework.validation.annotations.UniqueField.List;
+import dev.flyfish.framework.validation.validators.UniqueFieldValidator;
import jakarta.validation.Constraint;
import jakarta.validation.Payload;
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/validation/enums/PhoneType.java b/flyfish-common/src/main/java/dev/flyfish/framework/validation/enums/PhoneType.java
similarity index 60%
rename from flyfish-common/src/main/java/com/flyfish/framework/validation/enums/PhoneType.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/validation/enums/PhoneType.java
index a4f99f3..e2f1c28 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/validation/enums/PhoneType.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/validation/enums/PhoneType.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.validation.enums;
+package dev.flyfish.framework.validation.enums;
/**
* 电话类型
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/validation/groups/CodeValid.java b/flyfish-common/src/main/java/dev/flyfish/framework/validation/groups/CodeValid.java
similarity index 66%
rename from flyfish-common/src/main/java/com/flyfish/framework/validation/groups/CodeValid.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/validation/groups/CodeValid.java
index d21d9c6..f50443b 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/validation/groups/CodeValid.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/validation/groups/CodeValid.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.validation.groups;
+package dev.flyfish.framework.validation.groups;
/**
* 公共校验，可被策略忽略
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/validation/groups/NameValid.java b/flyfish-common/src/main/java/dev/flyfish/framework/validation/groups/NameValid.java
similarity index 66%
rename from flyfish-common/src/main/java/com/flyfish/framework/validation/groups/NameValid.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/validation/groups/NameValid.java
index 8598b9a..a25fae5 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/validation/groups/NameValid.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/validation/groups/NameValid.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.validation.groups;
+package dev.flyfish.framework.validation.groups;
/**
* 公共校验，可被策略忽略
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/validation/spi/ConditionalGroup.java b/flyfish-common/src/main/java/dev/flyfish/framework/validation/spi/ConditionalGroup.java
similarity index 94%
rename from flyfish-common/src/main/java/com/flyfish/framework/validation/spi/ConditionalGroup.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/validation/spi/ConditionalGroup.java
index f16a28e..71466dc 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/validation/spi/ConditionalGroup.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/validation/spi/ConditionalGroup.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.validation.spi;
+package dev.flyfish.framework.validation.spi;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/validation/spi/ConditionalValidGroupProvider.java b/flyfish-common/src/main/java/dev/flyfish/framework/validation/spi/ConditionalValidGroupProvider.java
similarity index 86%
rename from flyfish-common/src/main/java/com/flyfish/framework/validation/spi/ConditionalValidGroupProvider.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/validation/spi/ConditionalValidGroupProvider.java
index cc5968e..b01104b 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/validation/spi/ConditionalValidGroupProvider.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/validation/spi/ConditionalValidGroupProvider.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.validation.spi;
+package dev.flyfish.framework.validation.spi;
import jakarta.validation.groups.Default;
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/validation/validators/ContainsBeanValidator.java b/flyfish-common/src/main/java/dev/flyfish/framework/validation/validators/ContainsBeanValidator.java
similarity index 78%
rename from flyfish-common/src/main/java/com/flyfish/framework/validation/validators/ContainsBeanValidator.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/validation/validators/ContainsBeanValidator.java
index 2a38e41..20894be 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/validation/validators/ContainsBeanValidator.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/validation/validators/ContainsBeanValidator.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.validation.validators;
+package dev.flyfish.framework.validation.validators;
-import com.flyfish.framework.context.SpringContext;
-import com.flyfish.framework.validation.annotations.ContainsBean;
+import dev.flyfish.framework.context.SpringContext;
+import dev.flyfish.framework.validation.annotations.ContainsBean;
import org.apache.commons.lang3.StringUtils;
import jakarta.validation.ConstraintValidator;
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/validation/validators/IdCardValidator.java b/flyfish-common/src/main/java/dev/flyfish/framework/validation/validators/IdCardValidator.java
similarity index 90%
rename from flyfish-common/src/main/java/com/flyfish/framework/validation/validators/IdCardValidator.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/validation/validators/IdCardValidator.java
index c9fdb7d..0dea4fa 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/validation/validators/IdCardValidator.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/validation/validators/IdCardValidator.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.validation.validators;
+package dev.flyfish.framework.validation.validators;
-import com.flyfish.framework.validation.annotations.IdCard;
+import dev.flyfish.framework.validation.annotations.IdCard;
import jakarta.validation.ConstraintValidator;
import jakarta.validation.ConstraintValidatorContext;
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/validation/validators/IsJSONStringValidator.java b/flyfish-common/src/main/java/dev/flyfish/framework/validation/validators/IsJSONStringValidator.java
similarity index 86%
rename from flyfish-common/src/main/java/com/flyfish/framework/validation/validators/IsJSONStringValidator.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/validation/validators/IsJSONStringValidator.java
index 955ddad..9b30235 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/validation/validators/IsJSONStringValidator.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/validation/validators/IsJSONStringValidator.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.validation.validators;
+package dev.flyfish.framework.validation.validators;
-import com.flyfish.framework.validation.annotations.IsJSONString;
+import dev.flyfish.framework.validation.annotations.IsJSONString;
import org.apache.commons.lang3.StringUtils;
import jakarta.validation.ConstraintValidator;
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/validation/validators/MoneyValidator.java b/flyfish-common/src/main/java/dev/flyfish/framework/validation/validators/MoneyValidator.java
similarity index 87%
rename from flyfish-common/src/main/java/com/flyfish/framework/validation/validators/MoneyValidator.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/validation/validators/MoneyValidator.java
index 1c7aca3..3a42700 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/validation/validators/MoneyValidator.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/validation/validators/MoneyValidator.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.validation.validators;
+package dev.flyfish.framework.validation.validators;
-import com.flyfish.framework.validation.annotations.Money;
+import dev.flyfish.framework.validation.annotations.Money;
import jakarta.validation.ConstraintValidator;
import jakarta.validation.ConstraintValidatorContext;
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/validation/validators/PasswordValidator.java b/flyfish-common/src/main/java/dev/flyfish/framework/validation/validators/PasswordValidator.java
similarity index 91%
rename from flyfish-common/src/main/java/com/flyfish/framework/validation/validators/PasswordValidator.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/validation/validators/PasswordValidator.java
index 1fe21ad..103d0c3 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/validation/validators/PasswordValidator.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/validation/validators/PasswordValidator.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.validation.validators;
+package dev.flyfish.framework.validation.validators;
-import com.flyfish.framework.constant.Frameworks;
-import com.flyfish.framework.validation.annotations.Password;
+import dev.flyfish.framework.constant.Frameworks;
+import dev.flyfish.framework.validation.annotations.Password;
import jakarta.validation.ConstraintValidator;
import jakarta.validation.ConstraintValidatorContext;
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/validation/validators/PhoneValidator.java b/flyfish-common/src/main/java/dev/flyfish/framework/validation/validators/PhoneValidator.java
similarity index 89%
rename from flyfish-common/src/main/java/com/flyfish/framework/validation/validators/PhoneValidator.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/validation/validators/PhoneValidator.java
index 1f4850e..8856512 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/validation/validators/PhoneValidator.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/validation/validators/PhoneValidator.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.validation.validators;
+package dev.flyfish.framework.validation.validators;
-import com.flyfish.framework.validation.annotations.Phone;
-import com.flyfish.framework.validation.enums.PhoneType;
+import dev.flyfish.framework.validation.annotations.Phone;
+import dev.flyfish.framework.validation.enums.PhoneType;
import jakarta.validation.ConstraintValidator;
import jakarta.validation.ConstraintValidatorContext;
diff --git a/flyfish-common/src/main/java/com/flyfish/framework/validation/validators/UniqueFieldValidator.java b/flyfish-common/src/main/java/dev/flyfish/framework/validation/validators/UniqueFieldValidator.java
similarity index 94%
rename from flyfish-common/src/main/java/com/flyfish/framework/validation/validators/UniqueFieldValidator.java
rename to flyfish-common/src/main/java/dev/flyfish/framework/validation/validators/UniqueFieldValidator.java
index 3024337..056299b 100644
--- a/flyfish-common/src/main/java/com/flyfish/framework/validation/validators/UniqueFieldValidator.java
+++ b/flyfish-common/src/main/java/dev/flyfish/framework/validation/validators/UniqueFieldValidator.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.validation.validators;
+package dev.flyfish.framework.validation.validators;
-import com.flyfish.framework.validation.annotations.UniqueField;
+import dev.flyfish.framework.validation.annotations.UniqueField;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ClassUtils;
import org.springframework.beans.BeanUtils;
diff --git a/flyfish-data/flyfish-data-common/pom.xml b/flyfish-data/flyfish-data-common/pom.xml
index 7f21f67..027a104 100644
--- a/flyfish-data/flyfish-data-common/pom.xml
+++ b/flyfish-data/flyfish-data-common/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
flyfish-data
- com.flyfish.framework
+ dev.flyfish.framework
${revision}
4.0.0
@@ -18,7 +18,7 @@
- com.flyfish.framework
+ dev.flyfish.framework
flyfish-common
@@ -28,7 +28,7 @@
- com.flyfish.framework
+ dev.flyfish.framework
flyfish-data-domain
${revision}
compile
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/annotations/EnableEnumEndpoint.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/annotations/EnableEnumEndpoint.java
similarity index 71%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/annotations/EnableEnumEndpoint.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/annotations/EnableEnumEndpoint.java
index aa028a6..a398362 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/annotations/EnableEnumEndpoint.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/annotations/EnableEnumEndpoint.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.annotations;
+package dev.flyfish.framework.annotations;
-import com.flyfish.framework.config.EnumConfig;
+import dev.flyfish.framework.config.EnumConfig;
import org.springframework.context.annotation.Import;
import java.lang.annotation.*;
@@ -21,5 +21,5 @@ public @interface EnableEnumEndpoint {
*
* @return 结果
*/
- String[] scanPackages() default "com.flyfish.project";
+ String[] scanPackages() default "dev.flyfish.project";
}
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/annotations/EnablePropertyEncrypt.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/annotations/EnablePropertyEncrypt.java
similarity index 81%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/annotations/EnablePropertyEncrypt.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/annotations/EnablePropertyEncrypt.java
index 58c23ac..298e5b0 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/annotations/EnablePropertyEncrypt.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/annotations/EnablePropertyEncrypt.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.annotations;
+package dev.flyfish.framework.annotations;
-import com.flyfish.framework.config.DecryptConfig;
+import dev.flyfish.framework.config.DecryptConfig;
import org.springframework.context.annotation.Import;
import java.lang.annotation.*;
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/auditor/AuthorizeAuditor.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/auditor/AuthorizeAuditor.java
similarity index 77%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/auditor/AuthorizeAuditor.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/auditor/AuthorizeAuditor.java
index af907c4..b85b721 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/auditor/AuthorizeAuditor.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/auditor/AuthorizeAuditor.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.auditor;
+package dev.flyfish.framework.auditor;
-import com.flyfish.framework.context.UserContext;
-import com.flyfish.framework.domain.authorized.AuthorizedDomain;
+import dev.flyfish.framework.context.UserContext;
+import dev.flyfish.framework.domain.authorized.AuthorizedDomain;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Component;
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/auditor/BeanAuditor.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/auditor/BeanAuditor.java
similarity index 76%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/auditor/BeanAuditor.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/auditor/BeanAuditor.java
index dec283a..ba8843c 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/auditor/BeanAuditor.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/auditor/BeanAuditor.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.auditor;
+package dev.flyfish.framework.auditor;
-import com.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.domain.base.Domain;
/**
* 负责补全或者生成默认值（仅针对新建）
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/auditor/BeanPoster.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/auditor/BeanPoster.java
similarity index 74%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/auditor/BeanPoster.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/auditor/BeanPoster.java
index 478e2b8..3923dfa 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/auditor/BeanPoster.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/auditor/BeanPoster.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.auditor;
+package dev.flyfish.framework.auditor;
-import com.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.domain.base.Domain;
/**
* 存储完bean的后置审查
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/auditor/CommonBeanAuditor.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/auditor/CommonBeanAuditor.java
similarity index 78%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/auditor/CommonBeanAuditor.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/auditor/CommonBeanAuditor.java
index b500f95..219061e 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/auditor/CommonBeanAuditor.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/auditor/CommonBeanAuditor.java
@@ -1,8 +1,8 @@
-package com.flyfish.framework.auditor;
+package dev.flyfish.framework.auditor;
-import com.flyfish.framework.domain.base.Domain;
-import com.flyfish.framework.generation.code.CodeRules;
-import com.flyfish.framework.generation.property.Generations;
+import dev.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.generation.code.CodeRules;
+import dev.flyfish.framework.generation.property.Generations;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/auditor/OperationAuditor.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/auditor/OperationAuditor.java
similarity index 83%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/auditor/OperationAuditor.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/auditor/OperationAuditor.java
index 866c598..b0bb461 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/auditor/OperationAuditor.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/auditor/OperationAuditor.java
@@ -1,8 +1,8 @@
-package com.flyfish.framework.auditor;
+package dev.flyfish.framework.auditor;
-import com.flyfish.framework.context.UserContext;
-import com.flyfish.framework.domain.base.AuditDomain;
-import com.flyfish.framework.domain.po.User;
+import dev.flyfish.framework.context.UserContext;
+import dev.flyfish.framework.domain.base.AuditDomain;
+import dev.flyfish.framework.domain.po.User;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/auditor/ReactiveAuthorizeAuditor.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/auditor/ReactiveAuthorizeAuditor.java
similarity index 87%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/auditor/ReactiveAuthorizeAuditor.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/auditor/ReactiveAuthorizeAuditor.java
index 8fc5b65..2a94bda 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/auditor/ReactiveAuthorizeAuditor.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/auditor/ReactiveAuthorizeAuditor.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.auditor;
+package dev.flyfish.framework.auditor;
-import com.flyfish.framework.domain.authorized.AuthorizedDomain;
-import com.flyfish.framework.domain.base.IUser;
+import dev.flyfish.framework.domain.authorized.AuthorizedDomain;
+import dev.flyfish.framework.domain.base.IUser;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springframework.security.core.context.ReactiveSecurityContextHolder;
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/auditor/ReactiveBeanAuditor.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/auditor/ReactiveBeanAuditor.java
similarity index 78%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/auditor/ReactiveBeanAuditor.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/auditor/ReactiveBeanAuditor.java
index 73d0719..24aee19 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/auditor/ReactiveBeanAuditor.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/auditor/ReactiveBeanAuditor.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.auditor;
+package dev.flyfish.framework.auditor;
-import com.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.domain.base.Domain;
import reactor.core.publisher.Mono;
/**
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/auditor/ReactiveBeanPoster.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/auditor/ReactiveBeanPoster.java
similarity index 77%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/auditor/ReactiveBeanPoster.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/auditor/ReactiveBeanPoster.java
index 6f2dcdc..452da09 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/auditor/ReactiveBeanPoster.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/auditor/ReactiveBeanPoster.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.auditor;
+package dev.flyfish.framework.auditor;
-import com.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.domain.base.Domain;
import reactor.core.publisher.Mono;
/**
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/auditor/ReactiveCommonBeanAuditor.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/auditor/ReactiveCommonBeanAuditor.java
similarity index 86%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/auditor/ReactiveCommonBeanAuditor.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/auditor/ReactiveCommonBeanAuditor.java
index ced7a7b..d5f2b92 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/auditor/ReactiveCommonBeanAuditor.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/auditor/ReactiveCommonBeanAuditor.java
@@ -1,8 +1,8 @@
-package com.flyfish.framework.auditor;
+package dev.flyfish.framework.auditor;
-import com.flyfish.framework.domain.base.Domain;
-import com.flyfish.framework.generation.code.CodeRules;
-import com.flyfish.framework.generation.property.Generations;
+import dev.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.generation.code.CodeRules;
+import dev.flyfish.framework.generation.property.Generations;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/auditor/ReactiveOperationAuditor.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/auditor/ReactiveOperationAuditor.java
similarity index 89%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/auditor/ReactiveOperationAuditor.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/auditor/ReactiveOperationAuditor.java
index 122ff1c..e509832 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/auditor/ReactiveOperationAuditor.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/auditor/ReactiveOperationAuditor.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.auditor;
+package dev.flyfish.framework.auditor;
-import com.flyfish.framework.domain.base.AuditDomain;
-import com.flyfish.framework.domain.base.IUser;
+import dev.flyfish.framework.domain.base.AuditDomain;
+import dev.flyfish.framework.domain.base.IUser;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springframework.security.core.context.ReactiveSecurityContextHolder;
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/auditor/callback/AuditorCallback.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/auditor/callback/AuditorCallback.java
similarity index 85%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/auditor/callback/AuditorCallback.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/auditor/callback/AuditorCallback.java
index b7b2f3c..3110d7c 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/auditor/callback/AuditorCallback.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/auditor/callback/AuditorCallback.java
@@ -1,9 +1,9 @@
-package com.flyfish.framework.auditor.callback;
+package dev.flyfish.framework.auditor.callback;
-import com.flyfish.framework.auditor.BeanAuditor;
-import com.flyfish.framework.domain.authorized.AuthorizedDomain;
-import com.flyfish.framework.domain.base.AuditDomain;
-import com.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.auditor.BeanAuditor;
+import dev.flyfish.framework.domain.authorized.AuthorizedDomain;
+import dev.flyfish.framework.domain.base.AuditDomain;
+import dev.flyfish.framework.domain.base.Domain;
import lombok.Setter;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/auditor/callback/ReactiveAuditorCallback.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/auditor/callback/ReactiveAuditorCallback.java
similarity index 86%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/auditor/callback/ReactiveAuditorCallback.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/auditor/callback/ReactiveAuditorCallback.java
index 241ad90..28c7623 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/auditor/callback/ReactiveAuditorCallback.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/auditor/callback/ReactiveAuditorCallback.java
@@ -1,9 +1,9 @@
-package com.flyfish.framework.auditor.callback;
+package dev.flyfish.framework.auditor.callback;
-import com.flyfish.framework.auditor.ReactiveBeanAuditor;
-import com.flyfish.framework.domain.authorized.AuthorizedDomain;
-import com.flyfish.framework.domain.base.AuditDomain;
-import com.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.auditor.ReactiveBeanAuditor;
+import dev.flyfish.framework.domain.authorized.AuthorizedDomain;
+import dev.flyfish.framework.domain.base.AuditDomain;
+import dev.flyfish.framework.domain.base.Domain;
import lombok.Setter;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/config/CodeRuleConfig.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/config/CodeRuleConfig.java
similarity index 86%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/config/CodeRuleConfig.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/config/CodeRuleConfig.java
index 3be308a..0626c97 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/config/CodeRuleConfig.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/config/CodeRuleConfig.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.config;
+package dev.flyfish.framework.config;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.annotation.EnableScheduling;
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/config/DecryptConfig.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/config/DecryptConfig.java
similarity index 93%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/config/DecryptConfig.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/config/DecryptConfig.java
index 1b2b43b..0ab60e4 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/config/DecryptConfig.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/config/DecryptConfig.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.config;
+package dev.flyfish.framework.config;
-import com.flyfish.framework.config.encrypt.AESEncryptablePropertyResolver;
+import dev.flyfish.framework.config.encrypt.AESEncryptablePropertyResolver;
import com.ulisesbocchio.jasyptspringboot.EncryptablePropertyFilter;
import com.ulisesbocchio.jasyptspringboot.EncryptablePropertyResolver;
import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties;
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/config/EnumConfig.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/config/EnumConfig.java
similarity index 84%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/config/EnumConfig.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/config/EnumConfig.java
index 87c8560..85c754b 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/config/EnumConfig.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/config/EnumConfig.java
@@ -1,9 +1,9 @@
-package com.flyfish.framework.config;
+package dev.flyfish.framework.config;
-import com.flyfish.framework.bean.EnumValue;
-import com.flyfish.framework.enums.NamedEnum;
-import com.flyfish.framework.utils.ClassPathResourceScanner;
-import com.flyfish.framework.utils.StringFormats;
+import dev.flyfish.framework.bean.EnumValue;
+import dev.flyfish.framework.enums.NamedEnum;
+import dev.flyfish.framework.utils.ClassPathResourceScanner;
+import dev.flyfish.framework.utils.StringFormats;
import org.apache.commons.lang3.ClassUtils;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
@@ -26,7 +26,7 @@ public class EnumConfig implements InitializingBean, ImportBeanDefinitionRegistr
public EnumConfig() {
// 得到枚举类
ClassPathResourceScanner.forSuperType(NamedEnum.class)
- .scan("com.flyfish.project")
+ .scan("dev.flyfish.project")
.filter(clazz -> ClassUtils.isAssignable(clazz, Enum.class))
.forEach(clazz -> {
String name = StringFormats.camel2Line(clazz.getSimpleName());
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/config/encrypt/AESEncryptablePropertyResolver.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/config/encrypt/AESEncryptablePropertyResolver.java
similarity index 94%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/config/encrypt/AESEncryptablePropertyResolver.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/config/encrypt/AESEncryptablePropertyResolver.java
index ddbae70..076a5e0 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/config/encrypt/AESEncryptablePropertyResolver.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/config/encrypt/AESEncryptablePropertyResolver.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.config.encrypt;
+package dev.flyfish.framework.config.encrypt;
-import com.flyfish.framework.utils.HexUtils;
+import dev.flyfish.framework.utils.HexUtils;
import com.ulisesbocchio.jasyptspringboot.EncryptablePropertyResolver;
import org.apache.commons.lang3.StringUtils;
import org.jasypt.util.binary.AES256BinaryEncryptor;
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/context/ReactiveUserContext.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/context/ReactiveUserContext.java
similarity index 84%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/context/ReactiveUserContext.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/context/ReactiveUserContext.java
index c16fa37..31cc277 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/context/ReactiveUserContext.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/context/ReactiveUserContext.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.context;
+package dev.flyfish.framework.context;
-import com.flyfish.framework.domain.base.IUser;
+import dev.flyfish.framework.domain.base.IUser;
import org.springframework.security.core.context.ReactiveSecurityContextHolder;
import reactor.core.publisher.Mono;
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/context/UserContext.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/context/UserContext.java
similarity index 89%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/context/UserContext.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/context/UserContext.java
index fb0716b..1f3dd0b 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/context/UserContext.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/context/UserContext.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.context;
+package dev.flyfish.framework.context;
-import com.flyfish.framework.domain.po.User;
+import dev.flyfish.framework.domain.po.User;
import org.springframework.stereotype.Component;
import java.util.Optional;
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/domain/authorized/AbstractAuthorizedQo.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/domain/authorized/AbstractAuthorizedQo.java
similarity index 83%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/domain/authorized/AbstractAuthorizedQo.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/domain/authorized/AbstractAuthorizedQo.java
index 06e93a4..413fbba 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/domain/authorized/AbstractAuthorizedQo.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/domain/authorized/AbstractAuthorizedQo.java
@@ -1,9 +1,9 @@
-package com.flyfish.framework.domain.authorized;
+package dev.flyfish.framework.domain.authorized;
-import com.flyfish.framework.domain.base.NameLikeQo;
-import com.flyfish.framework.domain.po.Department;
-import com.flyfish.framework.query.LambdaQueryChain;
-import com.flyfish.framework.query.Queries;
+import dev.flyfish.framework.domain.base.NameLikeQo;
+import dev.flyfish.framework.domain.po.Department;
+import dev.flyfish.framework.query.LambdaQueryChain;
+import dev.flyfish.framework.query.Queries;
import lombok.Setter;
import org.apache.commons.lang3.BooleanUtils;
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/domain/authorized/AuthorizedQo.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/domain/authorized/AuthorizedQo.java
similarity index 86%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/domain/authorized/AuthorizedQo.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/domain/authorized/AuthorizedQo.java
index 6bd0eeb..93fd0cc 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/domain/authorized/AuthorizedQo.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/domain/authorized/AuthorizedQo.java
@@ -1,8 +1,8 @@
-package com.flyfish.framework.domain.authorized;
+package dev.flyfish.framework.domain.authorized;
-import com.flyfish.framework.enums.UserType;
-import com.flyfish.framework.query.QueryDefinition;
-import com.flyfish.framework.query.Queries;
+import dev.flyfish.framework.enums.UserType;
+import dev.flyfish.framework.query.QueryDefinition;
+import dev.flyfish.framework.query.Queries;
import lombok.Getter;
import lombok.Setter;
import org.apache.commons.lang3.BooleanUtils;
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/domain/authorized/advanced/OwnedAuthorizedQo.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/domain/authorized/advanced/OwnedAuthorizedQo.java
similarity index 83%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/domain/authorized/advanced/OwnedAuthorizedQo.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/domain/authorized/advanced/OwnedAuthorizedQo.java
index 6896ed3..90f6820 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/domain/authorized/advanced/OwnedAuthorizedQo.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/domain/authorized/advanced/OwnedAuthorizedQo.java
@@ -1,10 +1,10 @@
-package com.flyfish.framework.domain.authorized.advanced;
+package dev.flyfish.framework.domain.authorized.advanced;
-import com.flyfish.framework.domain.authorized.AbstractAuthorizedQo;
-import com.flyfish.framework.domain.authorized.AuthorizedUserDetails;
-import com.flyfish.framework.enums.UserType;
-import com.flyfish.framework.query.QueryDefinition;
-import com.flyfish.framework.query.Queries;
+import dev.flyfish.framework.domain.authorized.AbstractAuthorizedQo;
+import dev.flyfish.framework.domain.authorized.AuthorizedUserDetails;
+import dev.flyfish.framework.enums.UserType;
+import dev.flyfish.framework.query.QueryDefinition;
+import dev.flyfish.framework.query.Queries;
import lombok.Getter;
import lombok.Setter;
import org.apache.commons.lang3.BooleanUtils;
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/domain/base/BaseQo.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/domain/base/BaseQo.java
similarity index 95%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/domain/base/BaseQo.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/domain/base/BaseQo.java
index be0ef7e..b914beb 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/domain/base/BaseQo.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/domain/base/BaseQo.java
@@ -1,10 +1,10 @@
-package com.flyfish.framework.domain.base;
+package dev.flyfish.framework.domain.base;
import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.flyfish.framework.query.Queries;
-import com.flyfish.framework.query.Query;
-import com.flyfish.framework.query.QueryDefinition;
-import com.flyfish.framework.utils.CopyUtils;
+import dev.flyfish.framework.query.Queries;
+import dev.flyfish.framework.query.Query;
+import dev.flyfish.framework.query.QueryDefinition;
+import dev.flyfish.framework.utils.CopyUtils;
import lombok.Getter;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/domain/base/NameLikeQo.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/domain/base/NameLikeQo.java
similarity index 91%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/domain/base/NameLikeQo.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/domain/base/NameLikeQo.java
index 916da23..e377a9a 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/domain/base/NameLikeQo.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/domain/base/NameLikeQo.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.domain.base;
+package dev.flyfish.framework.domain.base;
-import com.flyfish.framework.query.QueryDefinition;
-import com.flyfish.framework.query.Queries;
+import dev.flyfish.framework.query.QueryDefinition;
+import dev.flyfish.framework.query.Queries;
import lombok.Getter;
import lombok.Setter;
import org.springframework.data.domain.Sort;
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/domain/base/SimpleQo.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/domain/base/SimpleQo.java
similarity index 81%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/domain/base/SimpleQo.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/domain/base/SimpleQo.java
index 463c2a5..85feda6 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/domain/base/SimpleQo.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/domain/base/SimpleQo.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.domain.base;
+package dev.flyfish.framework.domain.base;
-import com.flyfish.framework.query.QueryDefinition;
+import dev.flyfish.framework.query.QueryDefinition;
import lombok.RequiredArgsConstructor;
/**
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/domain/package-info.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/domain/package-info.java
similarity index 50%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/domain/package-info.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/domain/package-info.java
index 6196f85..2e07403 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/domain/package-info.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/domain/package-info.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.domain;
+package dev.flyfish.framework.domain;
/**
* 提供应用级别的实体
*/
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/domain/tree/TreeQo.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/domain/tree/TreeQo.java
similarity index 79%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/domain/tree/TreeQo.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/domain/tree/TreeQo.java
index dcf907d..703ba79 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/domain/tree/TreeQo.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/domain/tree/TreeQo.java
@@ -1,8 +1,8 @@
-package com.flyfish.framework.domain.tree;
+package dev.flyfish.framework.domain.tree;
-import com.flyfish.framework.domain.base.NameLikeQo;
-import com.flyfish.framework.query.QueryDefinition;
-import com.flyfish.framework.query.LambdaQueryChain;
+import dev.flyfish.framework.domain.base.NameLikeQo;
+import dev.flyfish.framework.query.QueryDefinition;
+import dev.flyfish.framework.query.LambdaQueryChain;
import lombok.Getter;
import lombok.Setter;
import org.apache.commons.lang3.BooleanUtils;
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/generation/code/CodeRules.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/generation/code/CodeRules.java
similarity index 79%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/generation/code/CodeRules.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/generation/code/CodeRules.java
index 5f51a5d..c4cf06a 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/generation/code/CodeRules.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/generation/code/CodeRules.java
@@ -1,11 +1,11 @@
-package com.flyfish.framework.generation.code;
+package dev.flyfish.framework.generation.code;
-import com.flyfish.framework.annotations.CodeRule;
-import com.flyfish.framework.domain.base.Domain;
-import com.flyfish.framework.generation.CodeRuleStrategy;
-import com.flyfish.framework.generation.code.strategy.TransactionCodeRuleStrategy;
-import com.flyfish.framework.generation.code.strategy.UUIDCodeRuleStrategy;
-import com.flyfish.framework.utils.ReflectionUtils;
+import dev.flyfish.framework.annotations.CodeRule;
+import dev.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.generation.CodeRuleStrategy;
+import dev.flyfish.framework.generation.code.strategy.TransactionCodeRuleStrategy;
+import dev.flyfish.framework.generation.code.strategy.UUIDCodeRuleStrategy;
+import dev.flyfish.framework.utils.ReflectionUtils;
import reactor.core.publisher.Mono;
import java.util.Map;
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/generation/code/strategy/TransactionCodeRuleStrategy.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/generation/code/strategy/TransactionCodeRuleStrategy.java
similarity index 86%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/generation/code/strategy/TransactionCodeRuleStrategy.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/generation/code/strategy/TransactionCodeRuleStrategy.java
index ea80631..b56272d 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/generation/code/strategy/TransactionCodeRuleStrategy.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/generation/code/strategy/TransactionCodeRuleStrategy.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.generation.code.strategy;
+package dev.flyfish.framework.generation.code.strategy;
-import com.flyfish.framework.domain.base.Domain;
-import com.flyfish.framework.generation.CodeRuleStrategy;
+import dev.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.generation.CodeRuleStrategy;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.springframework.scheduling.annotation.Scheduled;
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/generation/code/strategy/UUIDCodeRuleStrategy.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/generation/code/strategy/UUIDCodeRuleStrategy.java
similarity index 64%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/generation/code/strategy/UUIDCodeRuleStrategy.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/generation/code/strategy/UUIDCodeRuleStrategy.java
index 286698a..cfd0719 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/generation/code/strategy/UUIDCodeRuleStrategy.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/generation/code/strategy/UUIDCodeRuleStrategy.java
@@ -1,8 +1,8 @@
-package com.flyfish.framework.generation.code.strategy;
+package dev.flyfish.framework.generation.code.strategy;
-import com.flyfish.framework.domain.base.Domain;
-import com.flyfish.framework.generation.CodeRuleStrategy;
-import com.flyfish.framework.utils.UUIDUtils;
+import dev.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.generation.CodeRuleStrategy;
+import dev.flyfish.framework.utils.UUIDUtils;
import org.springframework.stereotype.Component;
/**
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/generation/property/GenerateStrategy.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/generation/property/GenerateStrategy.java
similarity index 72%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/generation/property/GenerateStrategy.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/generation/property/GenerateStrategy.java
index b356637..9b39b14 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/generation/property/GenerateStrategy.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/generation/property/GenerateStrategy.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.generation.property;
+package dev.flyfish.framework.generation.property;
-import com.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.domain.base.Domain;
/**
* 字段生成策略
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/generation/property/Generations.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/generation/property/Generations.java
similarity index 84%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/generation/property/Generations.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/generation/property/Generations.java
index f165727..cdcf285 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/generation/property/Generations.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/generation/property/Generations.java
@@ -1,9 +1,9 @@
-package com.flyfish.framework.generation.property;
+package dev.flyfish.framework.generation.property;
-import com.flyfish.framework.annotations.Generation;
-import com.flyfish.framework.domain.base.Domain;
-import com.flyfish.framework.utils.ReflectionUtils;
-import com.flyfish.framework.utils.UUIDUtils;
+import dev.flyfish.framework.annotations.Generation;
+import dev.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.utils.ReflectionUtils;
+import dev.flyfish.framework.utils.UUIDUtils;
import org.apache.commons.lang3.reflect.FieldUtils;
import org.springframework.data.util.CastUtils;
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/LambdaQueryChain.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/LambdaQueryChain.java
similarity index 88%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/LambdaQueryChain.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/LambdaQueryChain.java
index 017fc6a..d0e857a 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/LambdaQueryChain.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/LambdaQueryChain.java
@@ -1,8 +1,7 @@
-package com.flyfish.framework.query;
+package dev.flyfish.framework.query;
-import com.flyfish.framework.domain.base.Domain;
-import com.flyfish.framework.query.Queries.Combinator;
-import com.flyfish.framework.query.support.DomainFunction;
+import dev.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.query.support.DomainFunction;
import java.util.List;
import java.util.function.Supplier;
@@ -60,7 +59,7 @@ public interface LambdaQueryChain extends QueryChain> LambdaQueryChain and(List> chains, Combinator combinator);
+ > LambdaQueryChain and(List> chains, Queries.Combinator combinator);
/**
* 以或连接下一个字段
@@ -88,7 +87,7 @@ public interface LambdaQueryChain extends QueryChain> LambdaQueryChain or(List> chains, Combinator combinator);
+ > LambdaQueryChain or(List> chains, Queries.Combinator combinator);
/**
* 直接拼接提供者，此处懒加载，最终build才会执行
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/NamedQueryChain.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/NamedQueryChain.java
similarity index 92%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/NamedQueryChain.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/NamedQueryChain.java
index ba09c9d..ecfb030 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/NamedQueryChain.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/NamedQueryChain.java
@@ -1,6 +1,4 @@
-package com.flyfish.framework.query;
-
-import com.flyfish.framework.query.Queries.Combinator;
+package dev.flyfish.framework.query;
import java.util.List;
import java.util.function.Supplier;
@@ -58,7 +56,7 @@ public interface NamedQueryChain extends QueryChain {
* @return 结果
*/
@Override
- > NamedQueryChain and(List> chains, Combinator combinator);
+ > NamedQueryChain and(List> chains, Queries.Combinator combinator);
/**
* 以或连接下一个字段
@@ -95,6 +93,6 @@ public interface NamedQueryChain extends QueryChain {
* @return 结果
*/
@Override
- > NamedQueryChain or(List> chains, Combinator combinator);
+ > NamedQueryChain or(List> chains, Queries.Combinator combinator);
}
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/Queries.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/Queries.java
similarity index 89%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/Queries.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/Queries.java
index 35a087e..77b3fd4 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/Queries.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/Queries.java
@@ -1,9 +1,9 @@
-package com.flyfish.framework.query;
+package dev.flyfish.framework.query;
-import com.flyfish.framework.domain.base.Domain;
-import com.flyfish.framework.query.chain.DefaultLambdaQueryChain;
-import com.flyfish.framework.query.chain.DefaultNamedQueryChain;
-import com.flyfish.framework.query.support.DomainFunction;
+import dev.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.query.chain.DefaultLambdaQueryChain;
+import dev.flyfish.framework.query.chain.DefaultNamedQueryChain;
+import dev.flyfish.framework.query.support.DomainFunction;
import org.springframework.data.repository.core.EntityInformation;
/**
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/Query.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/Query.java
similarity index 94%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/Query.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/Query.java
index f8cf4f2..1a9b398 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/Query.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/Query.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.query;
+package dev.flyfish.framework.query;
-import com.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.domain.base.Domain;
import lombok.Data;
import org.springframework.data.domain.Example;
import org.springframework.data.domain.Pageable;
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/QueryChain.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/QueryChain.java
similarity index 91%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/QueryChain.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/QueryChain.java
index 8e4af61..3bb8572 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/QueryChain.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/QueryChain.java
@@ -1,6 +1,4 @@
-package com.flyfish.framework.query;
-
-import com.flyfish.framework.query.Queries.Combinator;
+package dev.flyfish.framework.query;
import java.util.List;
import java.util.function.Supplier;
@@ -48,7 +46,7 @@ public interface QueryChain, P> extends QueryDefiniti
* @return 结果
*/
default > C and(List> chains) {
- return and(chains, Combinator.AND);
+ return and(chains, Queries.Combinator.AND);
}
/**
@@ -58,7 +56,7 @@ public interface QueryChain, P> extends QueryDefiniti
* @param combinator 各个链条之间的连接方式
* @return 结果
*/
- > C and(List> chains, Combinator combinator);
+ > C and(List> chains, Queries.Combinator combinator);
/**
* 以或连接下一个字段
@@ -83,7 +81,7 @@ public interface QueryChain, P> extends QueryDefiniti
* @return 结果
*/
default > C or(List> chains) {
- return and(chains, Combinator.AND);
+ return and(chains, Queries.Combinator.AND);
}
/**
@@ -93,7 +91,7 @@ public interface QueryChain, P> extends QueryDefiniti
* @param combinator 各个链条之间的连接方式
* @return 结果
*/
- > C or(List> chains, Combinator combinator);
+ > C or(List> chains, Queries.Combinator combinator);
/**
* 直接拼接提供者，此处懒加载，最终build才会执行
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/QueryCondition.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/QueryCondition.java
similarity index 98%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/QueryCondition.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/QueryCondition.java
index 9cb3c27..21accde 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/QueryCondition.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/QueryCondition.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.query;
+package dev.flyfish.framework.query;
import java.util.Collection;
import java.util.List;
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/QueryDefinition.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/QueryDefinition.java
similarity index 77%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/QueryDefinition.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/QueryDefinition.java
index 7c31af3..b5d11e8 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/QueryDefinition.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/QueryDefinition.java
@@ -1,9 +1,9 @@
-package com.flyfish.framework.query;
+package dev.flyfish.framework.query;
-import com.flyfish.framework.domain.base.Domain;
-import com.flyfish.framework.domain.base.Qo;
-import com.flyfish.framework.domain.base.SimpleQo;
-import com.flyfish.framework.query.spi.adaptor.CriteriaAdaptor;
+import dev.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.domain.base.Qo;
+import dev.flyfish.framework.domain.base.SimpleQo;
+import dev.flyfish.framework.query.spi.adaptor.CriteriaAdaptor;
/**
* 可构建的
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/QueryFactories.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/QueryFactories.java
similarity index 85%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/QueryFactories.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/QueryFactories.java
index 595d7e0..1297287 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/QueryFactories.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/QueryFactories.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.query;
+package dev.flyfish.framework.query;
-import com.flyfish.framework.domain.base.Domain;
-import com.flyfish.framework.query.spi.QueryFactory;
+import dev.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.query.spi.QueryFactory;
import org.springframework.core.io.support.SpringFactoriesLoader;
import org.springframework.data.repository.core.EntityInformation;
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/QueryMutation.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/QueryMutation.java
similarity index 92%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/QueryMutation.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/QueryMutation.java
index 2bd65eb..a429b59 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/QueryMutation.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/QueryMutation.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.query;
+package dev.flyfish.framework.query;
-import com.flyfish.framework.domain.base.Domain;
-import com.flyfish.framework.query.support.DomainFunction;
+import dev.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.query.support.DomainFunction;
/**
* 查询修改逻辑
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/README.md b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/README.md
similarity index 100%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/README.md
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/README.md
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/chain/DefaultLambdaQueryChain.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/chain/DefaultLambdaQueryChain.java
similarity index 77%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/chain/DefaultLambdaQueryChain.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/chain/DefaultLambdaQueryChain.java
index 7dbbe4f..364ef48 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/chain/DefaultLambdaQueryChain.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/chain/DefaultLambdaQueryChain.java
@@ -1,9 +1,9 @@
-package com.flyfish.framework.query.chain;
+package dev.flyfish.framework.query.chain;
-import com.flyfish.framework.domain.base.Domain;
-import com.flyfish.framework.query.LambdaQueryChain;
-import com.flyfish.framework.query.QueryCondition;
-import com.flyfish.framework.query.support.DomainFunction;
+import dev.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.query.LambdaQueryChain;
+import dev.flyfish.framework.query.QueryCondition;
+import dev.flyfish.framework.query.support.DomainFunction;
/**
* 默认按lambda的查询链实现
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/chain/DefaultNamedQueryChain.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/chain/DefaultNamedQueryChain.java
similarity index 82%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/chain/DefaultNamedQueryChain.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/chain/DefaultNamedQueryChain.java
index 6ae97e4..3031c4a 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/chain/DefaultNamedQueryChain.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/chain/DefaultNamedQueryChain.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.query.chain;
+package dev.flyfish.framework.query.chain;
-import com.flyfish.framework.query.NamedQueryChain;
-import com.flyfish.framework.query.QueryCondition;
+import dev.flyfish.framework.query.NamedQueryChain;
+import dev.flyfish.framework.query.QueryCondition;
/**
* 默认按名称的查询链实现
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/chain/DefaultQueryChain.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/chain/DefaultQueryChain.java
similarity index 92%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/chain/DefaultQueryChain.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/chain/DefaultQueryChain.java
index 602cf15..4848d7d 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/chain/DefaultQueryChain.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/chain/DefaultQueryChain.java
@@ -1,11 +1,11 @@
-package com.flyfish.framework.query.chain;
+package dev.flyfish.framework.query.chain;
-import com.flyfish.framework.query.Queries;
-import com.flyfish.framework.query.QueryChain;
-import com.flyfish.framework.query.QueryCondition;
-import com.flyfish.framework.query.QueryMutation;
-import com.flyfish.framework.query.holder.QueryChainHolder;
-import com.flyfish.framework.query.spi.adaptor.CriteriaAdaptor;
+import dev.flyfish.framework.query.Queries;
+import dev.flyfish.framework.query.QueryChain;
+import dev.flyfish.framework.query.QueryCondition;
+import dev.flyfish.framework.query.QueryMutation;
+import dev.flyfish.framework.query.holder.QueryChainHolder;
+import dev.flyfish.framework.query.spi.adaptor.CriteriaAdaptor;
import lombok.Getter;
import org.springframework.data.util.CastUtils;
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/chain/DefaultQueryChainHolder.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/chain/DefaultQueryChainHolder.java
similarity index 91%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/chain/DefaultQueryChainHolder.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/chain/DefaultQueryChainHolder.java
index ced4a68..cd11cc5 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/chain/DefaultQueryChainHolder.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/chain/DefaultQueryChainHolder.java
@@ -1,8 +1,8 @@
-package com.flyfish.framework.query.chain;
+package dev.flyfish.framework.query.chain;
-import com.flyfish.framework.query.holder.QueryChainHolder;
-import com.flyfish.framework.query.spi.adaptor.CriteriaAdaptor;
-import com.flyfish.framework.utils.Assert;
+import dev.flyfish.framework.query.holder.QueryChainHolder;
+import dev.flyfish.framework.query.spi.adaptor.CriteriaAdaptor;
+import dev.flyfish.framework.utils.Assert;
import org.apache.commons.collections4.CollectionUtils;
import java.util.ArrayList;
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/chain/DefaultQueryCondition.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/chain/DefaultQueryCondition.java
similarity index 95%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/chain/DefaultQueryCondition.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/chain/DefaultQueryCondition.java
index aff1424..3999f0f 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/chain/DefaultQueryCondition.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/chain/DefaultQueryCondition.java
@@ -1,9 +1,9 @@
-package com.flyfish.framework.query.chain;
+package dev.flyfish.framework.query.chain;
-import com.flyfish.framework.query.Queries;
-import com.flyfish.framework.query.QueryChain;
-import com.flyfish.framework.query.QueryCondition;
-import com.flyfish.framework.query.holder.QueryChainHolder;
+import dev.flyfish.framework.query.Queries;
+import dev.flyfish.framework.query.QueryChain;
+import dev.flyfish.framework.query.QueryCondition;
+import dev.flyfish.framework.query.holder.QueryChainHolder;
import lombok.RequiredArgsConstructor;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ArrayUtils;
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/chain/DefaultQueryMutation.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/chain/DefaultQueryMutation.java
similarity index 93%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/chain/DefaultQueryMutation.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/chain/DefaultQueryMutation.java
index 4b273d1..3bcf35a 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/chain/DefaultQueryMutation.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/chain/DefaultQueryMutation.java
@@ -1,8 +1,9 @@
-package com.flyfish.framework.query.chain;
+package dev.flyfish.framework.query.chain;
-import com.flyfish.framework.domain.base.Domain;
-import com.flyfish.framework.query.*;
-import com.flyfish.framework.query.support.DomainFunction;
+import dev.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.query.*;
+import dev.flyfish.framework.query.*;
+import dev.flyfish.framework.query.support.DomainFunction;
import lombok.RequiredArgsConstructor;
import java.util.Collections;
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/holder/QueryChainHolder.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/holder/QueryChainHolder.java
similarity index 89%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/holder/QueryChainHolder.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/holder/QueryChainHolder.java
index 71afc87..3ec5dce 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/holder/QueryChainHolder.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/holder/QueryChainHolder.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.query.holder;
+package dev.flyfish.framework.query.holder;
-import com.flyfish.framework.query.spi.adaptor.CriteriaAdaptor;
+import dev.flyfish.framework.query.spi.adaptor.CriteriaAdaptor;
import java.util.function.BinaryOperator;
import java.util.function.Function;
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/spi/QueryFactory.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/spi/QueryFactory.java
similarity index 67%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/spi/QueryFactory.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/spi/QueryFactory.java
index 32fa546..5924360 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/spi/QueryFactory.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/spi/QueryFactory.java
@@ -1,9 +1,9 @@
-package com.flyfish.framework.query.spi;
+package dev.flyfish.framework.query.spi;
-import com.flyfish.framework.domain.base.Domain;
-import com.flyfish.framework.query.spi.adaptor.CriteriaAdaptor;
-import com.flyfish.framework.query.spi.converter.QueryConverter;
-import com.flyfish.framework.utils.Supportable;
+import dev.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.query.spi.adaptor.CriteriaAdaptor;
+import dev.flyfish.framework.query.spi.converter.QueryConverter;
+import dev.flyfish.framework.utils.Supportable;
import org.springframework.data.repository.core.EntityInformation;
/**
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/spi/adaptor/CriteriaAdaptor.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/spi/adaptor/CriteriaAdaptor.java
similarity index 97%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/spi/adaptor/CriteriaAdaptor.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/spi/adaptor/CriteriaAdaptor.java
index 18dad69..f937062 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/spi/adaptor/CriteriaAdaptor.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/spi/adaptor/CriteriaAdaptor.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.query.spi.adaptor;
+package dev.flyfish.framework.query.spi.adaptor;
-import com.flyfish.framework.query.Queries;
+import dev.flyfish.framework.query.Queries;
import java.util.Collection;
import java.util.List;
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/spi/converter/QueryConverter.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/spi/converter/QueryConverter.java
similarity index 71%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/spi/converter/QueryConverter.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/spi/converter/QueryConverter.java
index ca7cb9f..9627e60 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/spi/converter/QueryConverter.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/spi/converter/QueryConverter.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.query.spi.converter;
+package dev.flyfish.framework.query.spi.converter;
-import com.flyfish.framework.query.Query;
+import dev.flyfish.framework.query.Query;
/**
* 原生查询转换器
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/support/DomainFunction.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/support/DomainFunction.java
similarity index 79%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/support/DomainFunction.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/support/DomainFunction.java
index 21aa93a..7ba79d4 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/support/DomainFunction.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/support/DomainFunction.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.query.support;
+package dev.flyfish.framework.query.support;
-import com.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.domain.base.Domain;
/**
* 支持序列化的实体方法
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/support/EntityNameUtils.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/support/EntityNameUtils.java
similarity index 97%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/support/EntityNameUtils.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/support/EntityNameUtils.java
index 5bc9dcc..248ab0d 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/support/EntityNameUtils.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/support/EntityNameUtils.java
@@ -1,8 +1,8 @@
-package com.flyfish.framework.query.support;
+package dev.flyfish.framework.query.support;
-import com.flyfish.framework.annotations.Property;
-import com.flyfish.framework.utils.LRUCache;
+import dev.flyfish.framework.annotations.Property;
+import dev.flyfish.framework.utils.LRUCache;
import org.springframework.core.annotation.MergedAnnotations;
import org.springframework.util.ReflectionUtils;
import org.springframework.util.StringUtils;
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/support/SFunction.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/support/SFunction.java
similarity index 85%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/support/SFunction.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/support/SFunction.java
index ccffeb9..cffc9a5 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/support/SFunction.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/support/SFunction.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.query.support;
+package dev.flyfish.framework.query.support;
import java.io.Serializable;
import java.util.function.Function;
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/support/SerializedLambda.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/support/SerializedLambda.java
similarity index 99%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/support/SerializedLambda.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/support/SerializedLambda.java
index 574a027..01bd5f8 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/query/support/SerializedLambda.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/query/support/SerializedLambda.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.flyfish.framework.query.support;
+package dev.flyfish.framework.query.support;
import lombok.Getter;
import org.springframework.util.Assert;
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/repository/DefaultReactiveRepository.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/repository/DefaultReactiveRepository.java
similarity index 94%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/repository/DefaultReactiveRepository.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/repository/DefaultReactiveRepository.java
index 19ded1c..ef7529e 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/repository/DefaultReactiveRepository.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/repository/DefaultReactiveRepository.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.repository;
+package dev.flyfish.framework.repository;
-import com.flyfish.framework.repository.base.DomainRepository;
+import dev.flyfish.framework.repository.base.DomainRepository;
import org.reactivestreams.Publisher;
import org.springframework.data.repository.NoRepositoryBean;
import org.springframework.data.repository.reactive.ReactiveCrudRepository;
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/repository/DefaultRepository.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/repository/DefaultRepository.java
similarity index 85%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/repository/DefaultRepository.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/repository/DefaultRepository.java
index dea4ad7..ffaa482 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/repository/DefaultRepository.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/repository/DefaultRepository.java
@@ -1,8 +1,7 @@
-package com.flyfish.framework.repository;
+package dev.flyfish.framework.repository;
-import com.flyfish.framework.domain.base.Domain;
-import com.flyfish.framework.repository.base.DomainRepository;
-import org.springframework.data.domain.Sort;
+import dev.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.repository.base.DomainRepository;
import org.springframework.data.repository.CrudRepository;
import org.springframework.data.repository.NoRepositoryBean;
import org.springframework.data.repository.PagingAndSortingRepository;
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/repository/QueryModelExecutor.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/repository/QueryModelExecutor.java
similarity index 97%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/repository/QueryModelExecutor.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/repository/QueryModelExecutor.java
index 0f5b7c8..f4fe273 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/repository/QueryModelExecutor.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/repository/QueryModelExecutor.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.repository;
+package dev.flyfish.framework.repository;
-import com.flyfish.framework.domain.base.Qo;
+import dev.flyfish.framework.domain.base.Qo;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/repository/ReactiveEntityOperations.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/repository/ReactiveEntityOperations.java
similarity index 90%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/repository/ReactiveEntityOperations.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/repository/ReactiveEntityOperations.java
index b7ad5fe..392662b 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/repository/ReactiveEntityOperations.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/repository/ReactiveEntityOperations.java
@@ -1,8 +1,8 @@
-package com.flyfish.framework.repository;
+package dev.flyfish.framework.repository;
-import com.flyfish.framework.domain.base.Domain;
-import com.flyfish.framework.query.Queries;
-import com.flyfish.framework.query.Query;
+import dev.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.query.Queries;
+import dev.flyfish.framework.query.Query;
import org.springframework.data.repository.core.EntityInformation;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/repository/ReactiveQueryModelExecutor.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/repository/ReactiveQueryModelExecutor.java
similarity index 97%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/repository/ReactiveQueryModelExecutor.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/repository/ReactiveQueryModelExecutor.java
index de781e7..267a608 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/repository/ReactiveQueryModelExecutor.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/repository/ReactiveQueryModelExecutor.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.repository;
+package dev.flyfish.framework.repository;
-import com.flyfish.framework.domain.base.Qo;
+import dev.flyfish.framework.domain.base.Qo;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/repository/base/DomainRepository.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/repository/base/DomainRepository.java
similarity index 86%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/repository/base/DomainRepository.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/repository/base/DomainRepository.java
index 348babc..cf0e3b1 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/repository/base/DomainRepository.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/repository/base/DomainRepository.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.repository.base;
+package dev.flyfish.framework.repository.base;
import org.springframework.data.repository.core.EntityInformation;
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/utils/CopyUtils.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/utils/CopyUtils.java
similarity index 97%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/utils/CopyUtils.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/utils/CopyUtils.java
index 4d1d1fb..29db90d 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/utils/CopyUtils.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/utils/CopyUtils.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.utils;
+package dev.flyfish.framework.utils;
-import com.flyfish.framework.domain.base.Qo;
+import dev.flyfish.framework.domain.base.Qo;
import org.springframework.beans.BeanUtils;
import java.beans.PropertyDescriptor;
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/utils/DataUtils.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/utils/DataUtils.java
similarity index 95%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/utils/DataUtils.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/utils/DataUtils.java
index eb53bd7..3610015 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/utils/DataUtils.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/utils/DataUtils.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.utils;
+package dev.flyfish.framework.utils;
-import com.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.domain.base.Domain;
import java.util.ArrayList;
import java.util.List;
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/utils/DateRangeUtil.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/utils/DateRangeUtil.java
similarity index 99%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/utils/DateRangeUtil.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/utils/DateRangeUtil.java
index daa218d..7b140a6 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/utils/DateRangeUtil.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/utils/DateRangeUtil.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.utils;
+package dev.flyfish.framework.utils;
import lombok.extern.slf4j.Slf4j;
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/utils/DepartUtils.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/utils/DepartUtils.java
similarity index 90%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/utils/DepartUtils.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/utils/DepartUtils.java
index cd30069..67ce322 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/utils/DepartUtils.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/utils/DepartUtils.java
@@ -1,11 +1,11 @@
-package com.flyfish.framework.utils;
+package dev.flyfish.framework.utils;
-import com.flyfish.framework.domain.authorized.AuthorizedDomain;
-import com.flyfish.framework.domain.authorized.AuthorizedVo;
-import com.flyfish.framework.domain.base.IUser;
-import com.flyfish.framework.domain.po.Department;
-import com.flyfish.framework.domain.po.Role;
-import com.flyfish.framework.enums.UserType;
+import dev.flyfish.framework.domain.authorized.AuthorizedDomain;
+import dev.flyfish.framework.domain.authorized.AuthorizedVo;
+import dev.flyfish.framework.domain.base.IUser;
+import dev.flyfish.framework.domain.po.Department;
+import dev.flyfish.framework.domain.po.Role;
+import dev.flyfish.framework.enums.UserType;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.BooleanUtils;
import org.springframework.data.util.CastUtils;
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/utils/FieldUtils.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/utils/FieldUtils.java
similarity index 92%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/utils/FieldUtils.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/utils/FieldUtils.java
index a6f1114..a34d5fd 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/utils/FieldUtils.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/utils/FieldUtils.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.utils;
+package dev.flyfish.framework.utils;
import org.springframework.util.ObjectUtils;
diff --git a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/utils/HexUtils.java b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/utils/HexUtils.java
similarity index 98%
rename from flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/utils/HexUtils.java
rename to flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/utils/HexUtils.java
index 0a41dee..900d3e9 100644
--- a/flyfish-data/flyfish-data-common/src/main/java/com/flyfish/framework/utils/HexUtils.java
+++ b/flyfish-data/flyfish-data-common/src/main/java/dev/flyfish/framework/utils/HexUtils.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.utils;
+package dev.flyfish.framework.utils;
import java.nio.charset.StandardCharsets;
diff --git a/flyfish-data/flyfish-data-domain/pom.xml b/flyfish-data/flyfish-data-domain/pom.xml
index 5844130..2719d42 100644
--- a/flyfish-data/flyfish-data-domain/pom.xml
+++ b/flyfish-data/flyfish-data-domain/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- com.flyfish.framework
+ dev.flyfish.framework
flyfish-data
${revision}
@@ -19,11 +19,11 @@
- com.flyfish.framework
+ dev.flyfish.framework
flyfish-common
- com.flyfish.framework
+ dev.flyfish.framework
flyfish-data-relational
true
diff --git a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/annotations/CodeRule.java b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/annotations/CodeRule.java
similarity index 78%
rename from flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/annotations/CodeRule.java
rename to flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/annotations/CodeRule.java
index a051f25..f0dc5fd 100644
--- a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/annotations/CodeRule.java
+++ b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/annotations/CodeRule.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.annotations;
+package dev.flyfish.framework.annotations;
-import com.flyfish.framework.generation.CodeRuleStrategy;
+import dev.flyfish.framework.generation.CodeRuleStrategy;
import java.lang.annotation.*;
diff --git a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/annotations/ComputedProps.java b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/annotations/ComputedProps.java
similarity index 87%
rename from flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/annotations/ComputedProps.java
rename to flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/annotations/ComputedProps.java
index 064644a..c26f191 100644
--- a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/annotations/ComputedProps.java
+++ b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/annotations/ComputedProps.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.annotations;
+package dev.flyfish.framework.annotations;
-import com.flyfish.framework.annotations.ComputedProps.List;
+import dev.flyfish.framework.annotations.ComputedProps.List;
import java.lang.annotation.*;
diff --git a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/annotations/ConditionOn.java b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/annotations/ConditionOn.java
similarity index 88%
rename from flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/annotations/ConditionOn.java
rename to flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/annotations/ConditionOn.java
index 68b3202..ef0865d 100644
--- a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/annotations/ConditionOn.java
+++ b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/annotations/ConditionOn.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.annotations;
+package dev.flyfish.framework.annotations;
-import com.flyfish.framework.annotations.ConditionOn.List;
+import dev.flyfish.framework.annotations.ConditionOn.List;
import java.lang.annotation.*;
diff --git a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/annotations/DBRefValue.java b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/annotations/DBRefValue.java
similarity index 79%
rename from flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/annotations/DBRefValue.java
rename to flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/annotations/DBRefValue.java
index ad57bda..3f79ef0 100644
--- a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/annotations/DBRefValue.java
+++ b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/annotations/DBRefValue.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.annotations;
+package dev.flyfish.framework.annotations;
-import com.flyfish.framework.domain.base.Po;
+import dev.flyfish.framework.domain.base.Po;
import java.lang.annotation.*;
diff --git a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/annotations/DateRange.java b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/annotations/DateRange.java
similarity index 81%
rename from flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/annotations/DateRange.java
rename to flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/annotations/DateRange.java
index cf38867..cdb8390 100644
--- a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/annotations/DateRange.java
+++ b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/annotations/DateRange.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.annotations;
+package dev.flyfish.framework.annotations;
import java.lang.annotation.*;
diff --git a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/annotations/DictValue.java b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/annotations/DictValue.java
similarity index 74%
rename from flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/annotations/DictValue.java
rename to flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/annotations/DictValue.java
index 4adf68c..18309b5 100644
--- a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/annotations/DictValue.java
+++ b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/annotations/DictValue.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.annotations;
+package dev.flyfish.framework.annotations;
-import com.flyfish.framework.enums.BlankEnum;
-import com.flyfish.framework.enums.NamedEnum;
+import dev.flyfish.framework.enums.BlankEnum;
+import dev.flyfish.framework.enums.NamedEnum;
import java.lang.annotation.*;
diff --git a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/annotations/EnumValue.java b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/annotations/EnumValue.java
similarity index 79%
rename from flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/annotations/EnumValue.java
rename to flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/annotations/EnumValue.java
index 85b01a6..5af6459 100644
--- a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/annotations/EnumValue.java
+++ b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/annotations/EnumValue.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.annotations;
+package dev.flyfish.framework.annotations;
-import com.flyfish.framework.enums.NamedEnum;
+import dev.flyfish.framework.enums.NamedEnum;
import java.lang.annotation.*;
diff --git a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/annotations/FormItem.java b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/annotations/FormItem.java
similarity index 95%
rename from flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/annotations/FormItem.java
rename to flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/annotations/FormItem.java
index 74bbd49..7e60c48 100644
--- a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/annotations/FormItem.java
+++ b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/annotations/FormItem.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.annotations;
+package dev.flyfish.framework.annotations;
import java.lang.annotation.*;
diff --git a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/annotations/Generation.java b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/annotations/Generation.java
similarity index 95%
rename from flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/annotations/Generation.java
rename to flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/annotations/Generation.java
index 89d7520..01750a4 100644
--- a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/annotations/Generation.java
+++ b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/annotations/Generation.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.annotations;
+package dev.flyfish.framework.annotations;
import java.lang.annotation.*;
diff --git a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/annotations/MappedTo.java b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/annotations/MappedTo.java
similarity index 91%
rename from flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/annotations/MappedTo.java
rename to flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/annotations/MappedTo.java
index f963588..23a7af2 100644
--- a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/annotations/MappedTo.java
+++ b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/annotations/MappedTo.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.annotations;
+package dev.flyfish.framework.annotations;
import java.lang.annotation.*;
diff --git a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/annotations/Operation.java b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/annotations/Operation.java
similarity index 96%
rename from flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/annotations/Operation.java
rename to flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/annotations/Operation.java
index 72bd434..5869300 100644
--- a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/annotations/Operation.java
+++ b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/annotations/Operation.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.annotations;
+package dev.flyfish.framework.annotations;
import java.lang.annotation.*;
diff --git a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/annotations/Order.java b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/annotations/Order.java
similarity index 82%
rename from flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/annotations/Order.java
rename to flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/annotations/Order.java
index 38ca3cb..e6355a8 100644
--- a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/annotations/Order.java
+++ b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/annotations/Order.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.annotations;
+package dev.flyfish.framework.annotations;
import java.lang.annotation.*;
diff --git a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/annotations/Properties.java b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/annotations/Properties.java
similarity index 88%
rename from flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/annotations/Properties.java
rename to flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/annotations/Properties.java
index 215b1c2..0c67da7 100644
--- a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/annotations/Properties.java
+++ b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/annotations/Properties.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.annotations;
+package dev.flyfish.framework.annotations;
import java.lang.annotation.*;
diff --git a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/annotations/Property.java b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/annotations/Property.java
similarity index 97%
rename from flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/annotations/Property.java
rename to flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/annotations/Property.java
index c6d8aa4..b4df740 100644
--- a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/annotations/Property.java
+++ b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/annotations/Property.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.annotations;
+package dev.flyfish.framework.annotations;
import org.springframework.core.annotation.AliasFor;
diff --git a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/annotations/PropertyGroup.java b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/annotations/PropertyGroup.java
similarity index 93%
rename from flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/annotations/PropertyGroup.java
rename to flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/annotations/PropertyGroup.java
index e90995e..d0af7a9 100644
--- a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/annotations/PropertyGroup.java
+++ b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/annotations/PropertyGroup.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.annotations;
+package dev.flyfish.framework.annotations;
import java.lang.annotation.*;
diff --git a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/annotations/PropertyGroups.java b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/annotations/PropertyGroups.java
similarity index 83%
rename from flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/annotations/PropertyGroups.java
rename to flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/annotations/PropertyGroups.java
index a31a5f6..2878c24 100644
--- a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/annotations/PropertyGroups.java
+++ b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/annotations/PropertyGroups.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.annotations;
+package dev.flyfish.framework.annotations;
import java.lang.annotation.*;
diff --git a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/annotations/query/QueryField.java b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/annotations/query/QueryField.java
similarity index 95%
rename from flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/annotations/query/QueryField.java
rename to flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/annotations/query/QueryField.java
index bf1c978..be6af7c 100644
--- a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/annotations/query/QueryField.java
+++ b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/annotations/query/QueryField.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.annotations.query;
+package dev.flyfish.framework.annotations.query;
-import com.flyfish.framework.enums.NamedEnum;
+import dev.flyfish.framework.enums.NamedEnum;
import lombok.AllArgsConstructor;
import lombok.Getter;
import org.springframework.core.annotation.AliasFor;
diff --git a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/context/ViewModelContext.java b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/context/ViewModelContext.java
similarity index 92%
rename from flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/context/ViewModelContext.java
rename to flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/context/ViewModelContext.java
index 39c244e..287872a 100644
--- a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/context/ViewModelContext.java
+++ b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/context/ViewModelContext.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.context;
+package dev.flyfish.framework.context;
-import com.flyfish.framework.context.interceptor.ViewModelInterceptor;
+import dev.flyfish.framework.context.interceptor.ViewModelInterceptor;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.stereotype.Component;
import reactor.core.publisher.Mono;
diff --git a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/context/interceptor/ViewModelInterceptor.java b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/context/interceptor/ViewModelInterceptor.java
similarity index 89%
rename from flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/context/interceptor/ViewModelInterceptor.java
rename to flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/context/interceptor/ViewModelInterceptor.java
index 2a05490..f4e51ba 100644
--- a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/context/interceptor/ViewModelInterceptor.java
+++ b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/context/interceptor/ViewModelInterceptor.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.context.interceptor;
+package dev.flyfish.framework.context.interceptor;
import reactor.core.publisher.Mono;
diff --git a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/authorized/AuthorizedDomain.java b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/authorized/AuthorizedDomain.java
similarity index 74%
rename from flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/authorized/AuthorizedDomain.java
rename to flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/authorized/AuthorizedDomain.java
index d966992..93d34e8 100644
--- a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/authorized/AuthorizedDomain.java
+++ b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/authorized/AuthorizedDomain.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.domain.authorized;
+package dev.flyfish.framework.domain.authorized;
-import com.flyfish.framework.annotations.Property;
-import com.flyfish.framework.domain.base.AuditDomain;
+import dev.flyfish.framework.annotations.Property;
+import dev.flyfish.framework.domain.base.AuditDomain;
import lombok.Getter;
import lombok.Setter;
diff --git a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/authorized/AuthorizedUserDetails.java b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/authorized/AuthorizedUserDetails.java
similarity index 87%
rename from flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/authorized/AuthorizedUserDetails.java
rename to flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/authorized/AuthorizedUserDetails.java
index d4c4b9f..6aa110f 100644
--- a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/authorized/AuthorizedUserDetails.java
+++ b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/authorized/AuthorizedUserDetails.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.domain.authorized;
+package dev.flyfish.framework.domain.authorized;
import java.util.Set;
diff --git a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/authorized/AuthorizedVo.java b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/authorized/AuthorizedVo.java
similarity index 72%
rename from flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/authorized/AuthorizedVo.java
rename to flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/authorized/AuthorizedVo.java
index d90515c..07e8569 100644
--- a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/authorized/AuthorizedVo.java
+++ b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/authorized/AuthorizedVo.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.domain.authorized;
+package dev.flyfish.framework.domain.authorized;
-import com.flyfish.framework.domain.base.Vo;
+import dev.flyfish.framework.domain.base.Vo;
import lombok.Data;
/**
diff --git a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/authorized/advanced/OwnedAuthorizedDomain.java b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/authorized/advanced/OwnedAuthorizedDomain.java
similarity index 56%
rename from flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/authorized/advanced/OwnedAuthorizedDomain.java
rename to flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/authorized/advanced/OwnedAuthorizedDomain.java
index 028ad60..e7cbad4 100644
--- a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/authorized/advanced/OwnedAuthorizedDomain.java
+++ b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/authorized/advanced/OwnedAuthorizedDomain.java
@@ -1,13 +1,12 @@
-package com.flyfish.framework.domain.authorized.advanced;
+package dev.flyfish.framework.domain.authorized.advanced;
-import com.flyfish.framework.annotations.Order;
-import com.flyfish.framework.annotations.Property;
-import com.flyfish.framework.domain.authorized.AuthorizedDomain;
-import com.flyfish.framework.domain.po.User;
+import dev.flyfish.framework.annotations.Order;
+import dev.flyfish.framework.annotations.Property;
+import dev.flyfish.framework.domain.authorized.AuthorizedDomain;
+import dev.flyfish.framework.domain.po.User;
import lombok.Getter;
import lombok.Setter;
import org.springframework.data.annotation.Reference;
-import org.springframework.data.mongodb.core.mapping.DBRef;
import java.util.List;
diff --git a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/base/AuditDomain.java b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/base/AuditDomain.java
similarity index 93%
rename from flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/base/AuditDomain.java
rename to flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/base/AuditDomain.java
index a15fb29..b3819d1 100644
--- a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/base/AuditDomain.java
+++ b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/base/AuditDomain.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.domain.base;
+package dev.flyfish.framework.domain.base;
-import com.flyfish.framework.annotations.Property;
+import dev.flyfish.framework.annotations.Property;
import lombok.Getter;
import lombok.Setter;
import org.springframework.data.annotation.CreatedBy;
diff --git a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/base/Domain.java b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/base/Domain.java
similarity index 87%
rename from flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/base/Domain.java
rename to flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/base/Domain.java
index bdbd0b8..2414346 100644
--- a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/base/Domain.java
+++ b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/base/Domain.java
@@ -1,10 +1,10 @@
-package com.flyfish.framework.domain.base;
+package dev.flyfish.framework.domain.base;
import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.flyfish.framework.annotations.Generation;
-import com.flyfish.framework.annotations.Property;
-import com.flyfish.framework.validation.groups.CodeValid;
-import com.flyfish.framework.validation.groups.NameValid;
+import dev.flyfish.framework.annotations.Generation;
+import dev.flyfish.framework.annotations.Property;
+import dev.flyfish.framework.validation.groups.CodeValid;
+import dev.flyfish.framework.validation.groups.NameValid;
import jakarta.validation.constraints.NotBlank;
import lombok.Getter;
import lombok.Setter;
diff --git a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/base/DomainService.java b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/base/DomainService.java
similarity index 86%
rename from flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/base/DomainService.java
rename to flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/base/DomainService.java
index b41bd41..1b08936 100644
--- a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/base/DomainService.java
+++ b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/base/DomainService.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.domain.base;
+package dev.flyfish.framework.domain.base;
import org.springframework.data.repository.core.EntityInformation;
diff --git a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/base/Dto.java b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/base/Dto.java
similarity index 64%
rename from flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/base/Dto.java
rename to flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/base/Dto.java
index de64ba2..a208ff0 100644
--- a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/base/Dto.java
+++ b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/base/Dto.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.domain.base;
+package dev.flyfish.framework.domain.base;
/**
* 基础的DTO
diff --git a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/base/IUser.java b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/base/IUser.java
similarity index 80%
rename from flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/base/IUser.java
rename to flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/base/IUser.java
index 93bb839..c1bd1d2 100644
--- a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/base/IUser.java
+++ b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/base/IUser.java
@@ -1,10 +1,10 @@
-package com.flyfish.framework.domain.base;
+package dev.flyfish.framework.domain.base;
-import com.flyfish.framework.domain.po.Department;
-import com.flyfish.framework.domain.po.Role;
-import com.flyfish.framework.domain.po.User;
-import com.flyfish.framework.enums.UserStatus;
-import com.flyfish.framework.enums.UserType;
+import dev.flyfish.framework.domain.po.Department;
+import dev.flyfish.framework.domain.po.Role;
+import dev.flyfish.framework.domain.po.User;
+import dev.flyfish.framework.enums.UserStatus;
+import dev.flyfish.framework.enums.UserType;
import java.time.LocalDateTime;
import java.util.List;
diff --git a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/base/Named.java b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/base/Named.java
similarity index 69%
rename from flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/base/Named.java
rename to flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/base/Named.java
index 82d5c01..20dfa0f 100644
--- a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/base/Named.java
+++ b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/base/Named.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.domain.base;
+package dev.flyfish.framework.domain.base;
/**
* 有名称的
diff --git a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/base/Po.java b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/base/Po.java
similarity index 63%
rename from flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/base/Po.java
rename to flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/base/Po.java
index f300247..6d4e020 100644
--- a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/base/Po.java
+++ b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/base/Po.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.domain.base;
+package dev.flyfish.framework.domain.base;
/**
* 持久层模型
diff --git a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/base/Qo.java b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/base/Qo.java
similarity index 97%
rename from flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/base/Qo.java
rename to flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/base/Qo.java
index db49ea9..7123ae5 100644
--- a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/base/Qo.java
+++ b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/base/Qo.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.domain.base;
+package dev.flyfish.framework.domain.base;
import com.fasterxml.jackson.annotation.JsonIgnore;
import org.springframework.data.domain.Example;
diff --git a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/base/Vo.java b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/base/Vo.java
similarity index 88%
rename from flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/base/Vo.java
rename to flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/base/Vo.java
index 9a2ee52..e897ff8 100644
--- a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/base/Vo.java
+++ b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/base/Vo.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.domain.base;
+package dev.flyfish.framework.domain.base;
-import com.flyfish.framework.context.ViewModelContext;
+import dev.flyfish.framework.context.ViewModelContext;
import reactor.core.publisher.Mono;
/**
diff --git a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/po/Department.java b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/po/Department.java
similarity index 91%
rename from flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/po/Department.java
rename to flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/po/Department.java
index 0b8864f..65828a6 100644
--- a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/po/Department.java
+++ b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/po/Department.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.domain.po;
+package dev.flyfish.framework.domain.po;
-import com.flyfish.framework.domain.tree.TreeDomain;
+import dev.flyfish.framework.domain.tree.TreeDomain;
import lombok.*;
import org.springframework.data.mongodb.core.mapping.Document;
import org.springframework.data.relational.core.mapping.Column;
diff --git a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/po/ExcelMapping.java b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/po/ExcelMapping.java
similarity index 82%
rename from flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/po/ExcelMapping.java
rename to flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/po/ExcelMapping.java
index 6feb850..7331250 100644
--- a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/po/ExcelMapping.java
+++ b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/po/ExcelMapping.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.domain.po;
+package dev.flyfish.framework.domain.po;
-import com.flyfish.framework.domain.base.AuditDomain;
+import dev.flyfish.framework.domain.base.AuditDomain;
import lombok.Getter;
import lombok.Setter;
import org.springframework.data.mongodb.core.mapping.Document;
diff --git a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/po/Permission.java b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/po/Permission.java
similarity index 86%
rename from flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/po/Permission.java
rename to flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/po/Permission.java
index a0fa828..2b5ebb5 100644
--- a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/po/Permission.java
+++ b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/po/Permission.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.domain.po;
+package dev.flyfish.framework.domain.po;
-import com.flyfish.framework.domain.tree.TreeDomain;
-import com.flyfish.framework.enums.NamedEnum;
+import dev.flyfish.framework.domain.tree.TreeDomain;
+import dev.flyfish.framework.enums.NamedEnum;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.Getter;
diff --git a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/po/Role.java b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/po/Role.java
similarity index 84%
rename from flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/po/Role.java
rename to flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/po/Role.java
index f9b3f4a..be89165 100644
--- a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/po/Role.java
+++ b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/po/Role.java
@@ -1,9 +1,9 @@
-package com.flyfish.framework.domain.po;
+package dev.flyfish.framework.domain.po;
-import com.flyfish.framework.domain.base.AuditDomain;
-import com.flyfish.framework.enums.NamedEnum;
-import com.flyfish.framework.enums.RoleType;
-import com.flyfish.framework.relational.mapping.Association;
+import dev.flyfish.framework.domain.base.AuditDomain;
+import dev.flyfish.framework.enums.NamedEnum;
+import dev.flyfish.framework.enums.RoleType;
+import dev.flyfish.framework.relational.mapping.Association;
import lombok.*;
import org.springframework.data.mongodb.core.mapping.DBRef;
import org.springframework.data.mongodb.core.mapping.Document;
diff --git a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/po/User.java b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/po/User.java
similarity index 87%
rename from flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/po/User.java
rename to flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/po/User.java
index 7a10646..222fe4b 100644
--- a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/po/User.java
+++ b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/po/User.java
@@ -1,13 +1,13 @@
-package com.flyfish.framework.domain.po;
+package dev.flyfish.framework.domain.po;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonProperty;
-import com.flyfish.framework.domain.base.AuditDomain;
-import com.flyfish.framework.domain.base.IUser;
-import com.flyfish.framework.enums.UserStatus;
-import com.flyfish.framework.enums.UserType;
-import com.flyfish.framework.relational.mapping.Association;
-import com.flyfish.framework.validation.spi.ConditionalGroup;
+import dev.flyfish.framework.domain.base.AuditDomain;
+import dev.flyfish.framework.domain.base.IUser;
+import dev.flyfish.framework.enums.UserStatus;
+import dev.flyfish.framework.enums.UserType;
+import dev.flyfish.framework.relational.mapping.Association;
+import dev.flyfish.framework.validation.spi.ConditionalGroup;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/tree/RootTreeNode.java b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/tree/RootTreeNode.java
similarity index 93%
rename from flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/tree/RootTreeNode.java
rename to flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/tree/RootTreeNode.java
index 8cd6dec..6cab4e5 100644
--- a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/tree/RootTreeNode.java
+++ b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/tree/RootTreeNode.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.domain.tree;
+package dev.flyfish.framework.domain.tree;
import org.springframework.data.util.CastUtils;
diff --git a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/tree/TreeDomain.java b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/tree/TreeDomain.java
similarity index 87%
rename from flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/tree/TreeDomain.java
rename to flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/tree/TreeDomain.java
index a160855..5db2bf6 100644
--- a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/domain/tree/TreeDomain.java
+++ b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/domain/tree/TreeDomain.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.domain.tree;
+package dev.flyfish.framework.domain.tree;
-import com.flyfish.framework.domain.base.AuditDomain;
+import dev.flyfish.framework.domain.base.AuditDomain;
import lombok.Getter;
import lombok.Setter;
import org.springframework.data.annotation.Transient;
diff --git a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/generation/CodeRuleStrategy.java b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/generation/CodeRuleStrategy.java
similarity index 83%
rename from flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/generation/CodeRuleStrategy.java
rename to flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/generation/CodeRuleStrategy.java
index 67edd27..985d2cf 100644
--- a/flyfish-data/flyfish-data-domain/src/main/java/com/flyfish/framework/generation/CodeRuleStrategy.java
+++ b/flyfish-data/flyfish-data-domain/src/main/java/dev/flyfish/framework/generation/CodeRuleStrategy.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.generation;
+package dev.flyfish.framework.generation;
-import com.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.domain.base.Domain;
import reactor.core.publisher.Mono;
/**
diff --git a/flyfish-data/flyfish-data-mongodb/pom.xml b/flyfish-data/flyfish-data-mongodb/pom.xml
index 6e40e0b..cf0a6c5 100644
--- a/flyfish-data/flyfish-data-mongodb/pom.xml
+++ b/flyfish-data/flyfish-data-mongodb/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
flyfish-data
- com.flyfish.framework
+ dev.flyfish.framework
${revision}
4.0.0
@@ -28,7 +28,7 @@
- com.flyfish.framework
+ dev.flyfish.framework
flyfish-data-common
diff --git a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/builder/CriteriaBuilder.java b/flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/builder/CriteriaBuilder.java
similarity index 97%
rename from flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/builder/CriteriaBuilder.java
rename to flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/builder/CriteriaBuilder.java
index c232000..80d4ade 100644
--- a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/builder/CriteriaBuilder.java
+++ b/flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/builder/CriteriaBuilder.java
@@ -1,8 +1,8 @@
-package com.flyfish.framework.mongodb.builder;
+package dev.flyfish.framework.mongodb.builder;
-import com.flyfish.framework.context.DateContext;
-import com.flyfish.framework.domain.base.Domain;
-import com.flyfish.framework.domain.base.Qo;
+import dev.flyfish.framework.context.DateContext;
+import dev.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.domain.base.Qo;
import com.mongodb.BasicDBList;
import lombok.Getter;
import lombok.Setter;
diff --git a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/config/MongoDataConfig.java b/flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/config/MongoDataConfig.java
similarity index 77%
rename from flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/config/MongoDataConfig.java
rename to flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/config/MongoDataConfig.java
index 7df0a78..a325edb 100644
--- a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/config/MongoDataConfig.java
+++ b/flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/config/MongoDataConfig.java
@@ -1,15 +1,15 @@
-package com.flyfish.framework.mongodb.config;
+package dev.flyfish.framework.mongodb.config;
-import com.flyfish.framework.mongodb.config.annotations.EnableMongoRepo;
-import com.flyfish.framework.mongodb.config.annotations.EnableReactiveMongoRepo;
-import com.flyfish.framework.mongodb.config.callback.MongoAuditorMongoCallback;
-import com.flyfish.framework.mongodb.config.callback.MongoReactiveAuditorMongoCallback;
-import com.flyfish.framework.mongodb.operations.MongoReactiveEntityOperations;
-import com.flyfish.framework.mongodb.repository.factory.DefaultReactiveRepositoryFactoryBean;
-import com.flyfish.framework.mongodb.repository.factory.DefaultRepositoryFactoryBean;
-import com.flyfish.framework.mongodb.repository.impl.DefaultReactiveRepositoryImpl;
-import com.flyfish.framework.mongodb.repository.impl.DefaultRepositoryImpl;
-import com.flyfish.framework.repository.ReactiveEntityOperations;
+import dev.flyfish.framework.mongodb.config.annotations.EnableMongoRepo;
+import dev.flyfish.framework.mongodb.config.annotations.EnableReactiveMongoRepo;
+import dev.flyfish.framework.mongodb.config.callback.MongoAuditorMongoCallback;
+import dev.flyfish.framework.mongodb.config.callback.MongoReactiveAuditorMongoCallback;
+import dev.flyfish.framework.mongodb.operations.MongoReactiveEntityOperations;
+import dev.flyfish.framework.mongodb.repository.factory.DefaultReactiveRepositoryFactoryBean;
+import dev.flyfish.framework.mongodb.repository.factory.DefaultRepositoryFactoryBean;
+import dev.flyfish.framework.mongodb.repository.impl.DefaultReactiveRepositoryImpl;
+import dev.flyfish.framework.mongodb.repository.impl.DefaultRepositoryImpl;
+import dev.flyfish.framework.repository.ReactiveEntityOperations;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.data.mongo.MongoDataAutoConfiguration;
import org.springframework.context.annotation.Bean;
@@ -26,7 +26,7 @@ import org.springframework.lang.NonNull;
import java.util.ArrayList;
import java.util.List;
-import static com.flyfish.framework.mongodb.config.MongoDataConfig.MongoRepositoriesImportSelector;
+import static dev.flyfish.framework.mongodb.config.MongoDataConfig.MongoRepositoriesImportSelector;
@AutoConfiguration(before = MongoDataAutoConfiguration.class)
@Import(MongoRepositoriesImportSelector.class)
@@ -52,7 +52,7 @@ public class MongoDataConfig {
@EnableReactiveMongoRepositories(
repositoryFactoryBeanClass = DefaultReactiveRepositoryFactoryBean.class,
repositoryBaseClass = DefaultReactiveRepositoryImpl.class,
- basePackages = "com.flyfish.framework.*.repository"
+ basePackages = "dev.flyfish.framework.*.repository"
)
@EnableReactiveMongoAuditing
public static class ReactiveMongoRepoConfig {
@@ -71,7 +71,7 @@ public class MongoDataConfig {
@EnableMongoRepositories(
repositoryFactoryBeanClass = DefaultRepositoryFactoryBean.class,
repositoryBaseClass = DefaultRepositoryImpl.class,
- basePackages = "com.flyfish.framework.*.repository"
+ basePackages = "dev.flyfish.framework.*.repository"
)
@EnableMongoAuditing
public static class MongoRepoConfig {
diff --git a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/config/annotations/EnableMongoRepo.java b/flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/config/annotations/EnableMongoRepo.java
similarity index 78%
rename from flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/config/annotations/EnableMongoRepo.java
rename to flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/config/annotations/EnableMongoRepo.java
index d6025e5..8dd4ecc 100644
--- a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/config/annotations/EnableMongoRepo.java
+++ b/flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/config/annotations/EnableMongoRepo.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.mongodb.config.annotations;
+package dev.flyfish.framework.mongodb.config.annotations;
-import com.flyfish.framework.mongodb.repository.factory.DefaultRepositoryFactoryBean;
-import com.flyfish.framework.mongodb.repository.impl.DefaultRepositoryImpl;
+import dev.flyfish.framework.mongodb.repository.factory.DefaultRepositoryFactoryBean;
+import dev.flyfish.framework.mongodb.repository.impl.DefaultRepositoryImpl;
import org.springframework.core.annotation.AliasFor;
import org.springframework.data.mongodb.repository.config.EnableMongoRepositories;
diff --git a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/config/annotations/EnableReactiveMongoRepo.java b/flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/config/annotations/EnableReactiveMongoRepo.java
similarity index 79%
rename from flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/config/annotations/EnableReactiveMongoRepo.java
rename to flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/config/annotations/EnableReactiveMongoRepo.java
index 791b860..115274c 100644
--- a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/config/annotations/EnableReactiveMongoRepo.java
+++ b/flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/config/annotations/EnableReactiveMongoRepo.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.mongodb.config.annotations;
+package dev.flyfish.framework.mongodb.config.annotations;
-import com.flyfish.framework.mongodb.repository.factory.DefaultReactiveRepositoryFactoryBean;
-import com.flyfish.framework.mongodb.repository.impl.DefaultReactiveRepositoryImpl;
+import dev.flyfish.framework.mongodb.repository.factory.DefaultReactiveRepositoryFactoryBean;
+import dev.flyfish.framework.mongodb.repository.impl.DefaultReactiveRepositoryImpl;
import org.springframework.core.annotation.AliasFor;
import org.springframework.data.mongodb.repository.config.EnableReactiveMongoRepositories;
diff --git a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/config/callback/MongoAuditorMongoCallback.java b/flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/config/callback/MongoAuditorMongoCallback.java
similarity index 84%
rename from flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/config/callback/MongoAuditorMongoCallback.java
rename to flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/config/callback/MongoAuditorMongoCallback.java
index f196212..678823f 100644
--- a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/config/callback/MongoAuditorMongoCallback.java
+++ b/flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/config/callback/MongoAuditorMongoCallback.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.mongodb.config.callback;
+package dev.flyfish.framework.mongodb.config.callback;
-import com.flyfish.framework.auditor.callback.AuditorCallback;
-import com.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.auditor.callback.AuditorCallback;
+import dev.flyfish.framework.domain.base.Domain;
import org.reactivestreams.Publisher;
import org.springframework.data.mongodb.core.mapping.event.BeforeConvertCallback;
import org.springframework.lang.NonNull;
diff --git a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/config/callback/MongoReactiveAuditorMongoCallback.java b/flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/config/callback/MongoReactiveAuditorMongoCallback.java
similarity index 85%
rename from flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/config/callback/MongoReactiveAuditorMongoCallback.java
rename to flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/config/callback/MongoReactiveAuditorMongoCallback.java
index b44b065..18ad742 100644
--- a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/config/callback/MongoReactiveAuditorMongoCallback.java
+++ b/flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/config/callback/MongoReactiveAuditorMongoCallback.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.mongodb.config.callback;
+package dev.flyfish.framework.mongodb.config.callback;
-import com.flyfish.framework.auditor.callback.ReactiveAuditorCallback;
-import com.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.auditor.callback.ReactiveAuditorCallback;
+import dev.flyfish.framework.domain.base.Domain;
import org.reactivestreams.Publisher;
import org.springframework.data.mongodb.core.mapping.event.ReactiveBeforeConvertCallback;
import org.springframework.lang.NonNull;
diff --git a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/operations/MongoReactiveEntityOperations.java b/flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/operations/MongoReactiveEntityOperations.java
similarity index 89%
rename from flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/operations/MongoReactiveEntityOperations.java
rename to flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/operations/MongoReactiveEntityOperations.java
index 018cf4a..1c9e0ec 100644
--- a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/operations/MongoReactiveEntityOperations.java
+++ b/flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/operations/MongoReactiveEntityOperations.java
@@ -1,8 +1,8 @@
-package com.flyfish.framework.mongodb.operations;
+package dev.flyfish.framework.mongodb.operations;
-import com.flyfish.framework.domain.base.Domain;
-import com.flyfish.framework.query.Query;
-import com.flyfish.framework.repository.ReactiveEntityOperations;
+import dev.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.query.Query;
+import dev.flyfish.framework.repository.ReactiveEntityOperations;
import lombok.RequiredArgsConstructor;
import org.springframework.data.mongodb.core.ReactiveMongoOperations;
import org.springframework.data.mongodb.repository.query.MongoEntityInformation;
diff --git a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/query/MongoQueryFactory.java b/flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/query/MongoQueryFactory.java
similarity index 69%
rename from flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/query/MongoQueryFactory.java
rename to flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/query/MongoQueryFactory.java
index 803dc92..1595b76 100644
--- a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/query/MongoQueryFactory.java
+++ b/flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/query/MongoQueryFactory.java
@@ -1,11 +1,11 @@
-package com.flyfish.framework.mongodb.query;
+package dev.flyfish.framework.mongodb.query;
-import com.flyfish.framework.domain.base.Domain;
-import com.flyfish.framework.mongodb.query.adaptor.MongoCriteriaAdaptor;
-import com.flyfish.framework.mongodb.query.converter.MongoQueryConverter;
-import com.flyfish.framework.query.spi.QueryFactory;
-import com.flyfish.framework.query.spi.adaptor.CriteriaAdaptor;
-import com.flyfish.framework.query.spi.converter.QueryConverter;
+import dev.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.mongodb.query.adaptor.MongoCriteriaAdaptor;
+import dev.flyfish.framework.mongodb.query.converter.MongoQueryConverter;
+import dev.flyfish.framework.query.spi.QueryFactory;
+import dev.flyfish.framework.query.spi.adaptor.CriteriaAdaptor;
+import dev.flyfish.framework.query.spi.converter.QueryConverter;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.data.mongodb.repository.query.MongoEntityInformation;
diff --git a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/query/adaptor/MongoCriteriaAdaptor.java b/flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/query/adaptor/MongoCriteriaAdaptor.java
similarity index 92%
rename from flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/query/adaptor/MongoCriteriaAdaptor.java
rename to flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/query/adaptor/MongoCriteriaAdaptor.java
index 6a089e6..7d29347 100644
--- a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/query/adaptor/MongoCriteriaAdaptor.java
+++ b/flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/query/adaptor/MongoCriteriaAdaptor.java
@@ -1,8 +1,8 @@
-package com.flyfish.framework.mongodb.query.adaptor;
+package dev.flyfish.framework.mongodb.query.adaptor;
-import com.flyfish.framework.mongodb.utils.CriteriaUtils;
-import com.flyfish.framework.query.Queries;
-import com.flyfish.framework.query.spi.adaptor.CriteriaAdaptor;
+import dev.flyfish.framework.mongodb.utils.CriteriaUtils;
+import dev.flyfish.framework.query.Queries;
+import dev.flyfish.framework.query.spi.adaptor.CriteriaAdaptor;
import org.bson.types.ObjectId;
import org.springframework.data.mongodb.core.query.Criteria;
diff --git a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/query/converter/MongoQueryConverter.java b/flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/query/converter/MongoQueryConverter.java
similarity index 84%
rename from flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/query/converter/MongoQueryConverter.java
rename to flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/query/converter/MongoQueryConverter.java
index e158bd6..b3bb0e6 100644
--- a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/query/converter/MongoQueryConverter.java
+++ b/flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/query/converter/MongoQueryConverter.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.mongodb.query.converter;
+package dev.flyfish.framework.mongodb.query.converter;
-import com.flyfish.framework.query.spi.adaptor.CriteriaAdaptor;
-import com.flyfish.framework.query.spi.converter.QueryConverter;
+import dev.flyfish.framework.query.spi.adaptor.CriteriaAdaptor;
+import dev.flyfish.framework.query.spi.converter.QueryConverter;
import lombok.RequiredArgsConstructor;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.data.mongodb.core.query.Criteria;
@@ -19,7 +19,7 @@ public class MongoQueryConverter implements QueryConverter {
* @return 本地查询
*/
@Override
- public Query convert(com.flyfish.framework.query.Query query) {
+ public Query convert(dev.flyfish.framework.query.Query query) {
Criteria condition = Criteria.where("delete").ne(true);
// 添加条件
Criteria criteria = getCriteria(query);
@@ -46,7 +46,7 @@ public class MongoQueryConverter implements QueryConverter {
* @param query 查询信息
* @return 结果
*/
- private Criteria getCriteria(com.flyfish.framework.query.Query query) {
+ private Criteria getCriteria(dev.flyfish.framework.query.Query query) {
// 当且仅当有example且正确生成条件时，才允许使用example构造
if (null != query.getExample()) {
return new Criteria().alike(query.getExample());
diff --git a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/repository/factory/DefaultReactiveRepositoryFactory.java b/flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/repository/factory/DefaultReactiveRepositoryFactory.java
similarity index 88%
rename from flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/repository/factory/DefaultReactiveRepositoryFactory.java
rename to flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/repository/factory/DefaultReactiveRepositoryFactory.java
index 20b4ba8..6233a6f 100644
--- a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/repository/factory/DefaultReactiveRepositoryFactory.java
+++ b/flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/repository/factory/DefaultReactiveRepositoryFactory.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.mongodb.repository.factory;
+package dev.flyfish.framework.mongodb.repository.factory;
-import com.flyfish.framework.mongodb.repository.impl.DefaultReactiveRepositoryImpl;
+import dev.flyfish.framework.mongodb.repository.impl.DefaultReactiveRepositoryImpl;
import org.springframework.data.mongodb.core.ReactiveMongoOperations;
import org.springframework.data.mongodb.repository.support.ReactiveMongoRepositoryFactory;
import org.springframework.data.repository.core.RepositoryMetadata;
diff --git a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/repository/factory/DefaultReactiveRepositoryFactoryBean.java b/flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/repository/factory/DefaultReactiveRepositoryFactoryBean.java
similarity index 94%
rename from flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/repository/factory/DefaultReactiveRepositoryFactoryBean.java
rename to flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/repository/factory/DefaultReactiveRepositoryFactoryBean.java
index 2306f29..a83a479 100644
--- a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/repository/factory/DefaultReactiveRepositoryFactoryBean.java
+++ b/flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/repository/factory/DefaultReactiveRepositoryFactoryBean.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.mongodb.repository.factory;
+package dev.flyfish.framework.mongodb.repository.factory;
import org.springframework.data.mongodb.core.ReactiveMongoOperations;
import org.springframework.data.mongodb.repository.support.ReactiveMongoRepositoryFactoryBean;
diff --git a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/repository/factory/DefaultRepositoryFactory.java b/flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/repository/factory/DefaultRepositoryFactory.java
similarity index 87%
rename from flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/repository/factory/DefaultRepositoryFactory.java
rename to flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/repository/factory/DefaultRepositoryFactory.java
index a09b592..70975c0 100644
--- a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/repository/factory/DefaultRepositoryFactory.java
+++ b/flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/repository/factory/DefaultRepositoryFactory.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.mongodb.repository.factory;
+package dev.flyfish.framework.mongodb.repository.factory;
-import com.flyfish.framework.mongodb.repository.impl.DefaultRepositoryImpl;
+import dev.flyfish.framework.mongodb.repository.impl.DefaultRepositoryImpl;
import org.springframework.data.mongodb.core.MongoOperations;
import org.springframework.data.mongodb.repository.support.MongoRepositoryFactory;
import org.springframework.data.repository.core.RepositoryMetadata;
diff --git a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/repository/factory/DefaultRepositoryFactoryBean.java b/flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/repository/factory/DefaultRepositoryFactoryBean.java
similarity index 94%
rename from flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/repository/factory/DefaultRepositoryFactoryBean.java
rename to flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/repository/factory/DefaultRepositoryFactoryBean.java
index 2afc503..2e5c5c1 100644
--- a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/repository/factory/DefaultRepositoryFactoryBean.java
+++ b/flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/repository/factory/DefaultRepositoryFactoryBean.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.mongodb.repository.factory;
+package dev.flyfish.framework.mongodb.repository.factory;
import org.springframework.data.mongodb.core.MongoOperations;
import org.springframework.data.mongodb.repository.support.MongoRepositoryFactoryBean;
diff --git a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/repository/impl/DefaultReactiveRepositoryImpl.java b/flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/repository/impl/DefaultReactiveRepositoryImpl.java
similarity index 97%
rename from flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/repository/impl/DefaultReactiveRepositoryImpl.java
rename to flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/repository/impl/DefaultReactiveRepositoryImpl.java
index 69771e4..75f7fa9 100644
--- a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/repository/impl/DefaultReactiveRepositoryImpl.java
+++ b/flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/repository/impl/DefaultReactiveRepositoryImpl.java
@@ -1,8 +1,8 @@
-package com.flyfish.framework.mongodb.repository.impl;
+package dev.flyfish.framework.mongodb.repository.impl;
-import com.flyfish.framework.domain.base.Domain;
-import com.flyfish.framework.domain.base.Qo;
-import com.flyfish.framework.repository.DefaultReactiveRepository;
+import dev.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.domain.base.Qo;
+import dev.flyfish.framework.repository.DefaultReactiveRepository;
import lombok.Getter;
import lombok.NonNull;
import org.apache.commons.lang3.StringUtils;
diff --git a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/repository/impl/DefaultRepositoryImpl.java b/flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/repository/impl/DefaultRepositoryImpl.java
similarity index 97%
rename from flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/repository/impl/DefaultRepositoryImpl.java
rename to flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/repository/impl/DefaultRepositoryImpl.java
index 7c2cc8e..cd81388 100644
--- a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/repository/impl/DefaultRepositoryImpl.java
+++ b/flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/repository/impl/DefaultRepositoryImpl.java
@@ -1,8 +1,8 @@
-package com.flyfish.framework.mongodb.repository.impl;
+package dev.flyfish.framework.mongodb.repository.impl;
-import com.flyfish.framework.domain.base.Domain;
-import com.flyfish.framework.domain.base.Qo;
-import com.flyfish.framework.repository.DefaultRepository;
+import dev.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.domain.base.Qo;
+import dev.flyfish.framework.repository.DefaultRepository;
import lombok.Getter;
import org.apache.commons.lang3.StringUtils;
import org.springframework.dao.IncorrectResultSizeDataAccessException;
diff --git a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/repository/impl/ReactivePageableExecutionUtils.java b/flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/repository/impl/ReactivePageableExecutionUtils.java
similarity index 97%
rename from flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/repository/impl/ReactivePageableExecutionUtils.java
rename to flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/repository/impl/ReactivePageableExecutionUtils.java
index a3bb98e..0be614d 100644
--- a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/repository/impl/ReactivePageableExecutionUtils.java
+++ b/flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/repository/impl/ReactivePageableExecutionUtils.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.flyfish.framework.mongodb.repository.impl;
+package dev.flyfish.framework.mongodb.repository.impl;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl;
diff --git a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/utils/CriteriaUtils.java b/flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/utils/CriteriaUtils.java
similarity index 93%
rename from flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/utils/CriteriaUtils.java
rename to flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/utils/CriteriaUtils.java
index a93fca5..1d61f99 100644
--- a/flyfish-data/flyfish-data-mongodb/src/main/java/com/flyfish/framework/mongodb/utils/CriteriaUtils.java
+++ b/flyfish-data/flyfish-data-mongodb/src/main/java/dev/flyfish/framework/mongodb/utils/CriteriaUtils.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.mongodb.utils;
+package dev.flyfish.framework.mongodb.utils;
import org.bson.Document;
import org.springframework.data.mongodb.core.query.Criteria;
diff --git a/flyfish-data/flyfish-data-mongodb/src/main/resources/META-INF/spring.factories b/flyfish-data/flyfish-data-mongodb/src/main/resources/META-INF/spring.factories
index 40e4d74..57e181b 100644
--- a/flyfish-data/flyfish-data-mongodb/src/main/resources/META-INF/spring.factories
+++ b/flyfish-data/flyfish-data-mongodb/src/main/resources/META-INF/spring.factories
@@ -1,4 +1,4 @@
-com.flyfish.framework.query.spi.QueryFactory=\
- com.flyfish.framework.mongodb.query.MongoQueryFactory
+dev.flyfish.framework.query.spi.QueryFactory=\
+ dev.flyfish.framework.mongodb.query.MongoQueryFactory
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
- com.flyfish.framework.mongodb.config.MongoDataConfig
+ dev.flyfish.framework.mongodb.config.MongoDataConfig
diff --git a/flyfish-data/flyfish-data-mongodb/src/test/java/com/flyfish/test/mongo/repository/TestQO.java b/flyfish-data/flyfish-data-mongodb/src/test/java/com/flyfish/test/mongo/repository/TestQO.java
deleted file mode 100644
index 474ed34..0000000
--- a/flyfish-data/flyfish-data-mongodb/src/test/java/com/flyfish/test/mongo/repository/TestQO.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.flyfish.test.mongo.repository;
-
-import com.flyfish.framework.domain.base.NameLikeQo;
-
-public class TestQO extends NameLikeQo {
-
-}
diff --git a/flyfish-data/flyfish-data-mongodb/src/test/java/com/flyfish/test/mongo/MongoRepositoryTest.java b/flyfish-data/flyfish-data-mongodb/src/test/java/dev/flyfish/test/mongo/MongoRepositoryTest.java
similarity index 72%
rename from flyfish-data/flyfish-data-mongodb/src/test/java/com/flyfish/test/mongo/MongoRepositoryTest.java
rename to flyfish-data/flyfish-data-mongodb/src/test/java/dev/flyfish/test/mongo/MongoRepositoryTest.java
index 4d296c9..7fcf6dd 100644
--- a/flyfish-data/flyfish-data-mongodb/src/test/java/com/flyfish/test/mongo/MongoRepositoryTest.java
+++ b/flyfish-data/flyfish-data-mongodb/src/test/java/dev/flyfish/test/mongo/MongoRepositoryTest.java
@@ -1,10 +1,10 @@
-package com.flyfish.test.mongo;
+package dev.flyfish.test.mongo;
-import com.flyfish.test.mongo.repository.TestDO;
-import com.flyfish.test.mongo.repository.TestQO;
-import com.flyfish.test.mongo.repository.TestRepository;
-import com.flyfish.framework.mongodb.config.MongoDataConfig;
-import com.flyfish.framework.mongodb.config.annotations.EnableReactiveMongoRepo;
+import dev.flyfish.test.mongo.repository.TestDO;
+import dev.flyfish.test.mongo.repository.TestQO;
+import dev.flyfish.test.mongo.repository.TestRepository;
+import dev.flyfish.framework.mongodb.config.MongoDataConfig;
+import dev.flyfish.framework.mongodb.config.annotations.EnableReactiveMongoRepo;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -16,7 +16,7 @@ import jakarta.annotation.Resource;
@ExtendWith(SpringExtension.class)
@SpringBootTest(classes = MongoRepositoryTest.class)
-@SpringBootApplication(scanBasePackages = "com.flyfish.framework")
+@SpringBootApplication(scanBasePackages = "dev.flyfish.framework")
@Import(MongoDataConfig.class)
@EnableReactiveMongoRepo
public class MongoRepositoryTest {
diff --git a/flyfish-data/flyfish-data-mongodb/src/test/java/com/flyfish/test/mongo/repository/TestDO.java b/flyfish-data/flyfish-data-mongodb/src/test/java/dev/flyfish/test/mongo/repository/TestDO.java
similarity index 61%
rename from flyfish-data/flyfish-data-mongodb/src/test/java/com/flyfish/test/mongo/repository/TestDO.java
rename to flyfish-data/flyfish-data-mongodb/src/test/java/dev/flyfish/test/mongo/repository/TestDO.java
index 4d3b427..88869a2 100644
--- a/flyfish-data/flyfish-data-mongodb/src/test/java/com/flyfish/test/mongo/repository/TestDO.java
+++ b/flyfish-data/flyfish-data-mongodb/src/test/java/dev/flyfish/test/mongo/repository/TestDO.java
@@ -1,6 +1,6 @@
-package com.flyfish.test.mongo.repository;
+package dev.flyfish.test.mongo.repository;
-import com.flyfish.framework.domain.base.AuditDomain;
+import dev.flyfish.framework.domain.base.AuditDomain;
import lombok.Data;
import org.springframework.data.mongodb.core.mapping.Document;
diff --git a/flyfish-data/flyfish-data-mongodb/src/test/java/dev/flyfish/test/mongo/repository/TestQO.java b/flyfish-data/flyfish-data-mongodb/src/test/java/dev/flyfish/test/mongo/repository/TestQO.java
new file mode 100644
index 0000000..cb286fe
--- /dev/null
+++ b/flyfish-data/flyfish-data-mongodb/src/test/java/dev/flyfish/test/mongo/repository/TestQO.java
@@ -0,0 +1,7 @@
+package dev.flyfish.test.mongo.repository;
+
+import dev.flyfish.framework.domain.base.NameLikeQo;
+
+public class TestQO extends NameLikeQo {
+
+}
diff --git a/flyfish-data/flyfish-data-mongodb/src/test/java/com/flyfish/test/mongo/repository/TestRepository.java b/flyfish-data/flyfish-data-mongodb/src/test/java/dev/flyfish/test/mongo/repository/TestRepository.java
similarity index 50%
rename from flyfish-data/flyfish-data-mongodb/src/test/java/com/flyfish/test/mongo/repository/TestRepository.java
rename to flyfish-data/flyfish-data-mongodb/src/test/java/dev/flyfish/test/mongo/repository/TestRepository.java
index 8952f63..f474a5a 100644
--- a/flyfish-data/flyfish-data-mongodb/src/test/java/com/flyfish/test/mongo/repository/TestRepository.java
+++ b/flyfish-data/flyfish-data-mongodb/src/test/java/dev/flyfish/test/mongo/repository/TestRepository.java
@@ -1,6 +1,6 @@
-package com.flyfish.test.mongo.repository;
+package dev.flyfish.test.mongo.repository;
-import com.flyfish.framework.repository.DefaultReactiveRepository;
+import dev.flyfish.framework.repository.DefaultReactiveRepository;
/**
* 测试仓库
diff --git a/flyfish-data/flyfish-data-r2dbc/pom.xml b/flyfish-data/flyfish-data-r2dbc/pom.xml
index c4bacab..2a15cdd 100644
--- a/flyfish-data/flyfish-data-r2dbc/pom.xml
+++ b/flyfish-data/flyfish-data-r2dbc/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
flyfish-data
- com.flyfish.framework
+ dev.flyfish.framework
${revision}
4.0.0
@@ -22,7 +22,7 @@
spring-boot-starter-data-r2dbc
- com.flyfish.framework
+ dev.flyfish.framework
flyfish-data-relational
@@ -30,7 +30,7 @@
r2dbc-mysql
- com.flyfish.framework
+ dev.flyfish.framework
flyfish-data-common
diff --git a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/config/R2dbcDataConfig.java b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/config/R2dbcDataConfig.java
similarity index 89%
rename from flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/config/R2dbcDataConfig.java
rename to flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/config/R2dbcDataConfig.java
index 7102445..8dd2666 100644
--- a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/config/R2dbcDataConfig.java
+++ b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/config/R2dbcDataConfig.java
@@ -1,16 +1,16 @@
-package com.flyfish.framework.r2dbc.config;
+package dev.flyfish.framework.r2dbc.config;
-import com.flyfish.framework.domain.base.Domain;
-import com.flyfish.framework.r2dbc.config.callback.ReferenceR2dbcCallback;
-import com.flyfish.framework.r2dbc.config.mapping.AdditionalConverters;
-import com.flyfish.framework.r2dbc.config.mapping.FullMappingR2dbcConverter;
-import com.flyfish.framework.r2dbc.config.mapping.FullReactiveDataAccessStrategy;
-import com.flyfish.framework.r2dbc.metadata.R2dbcMetadataManager;
-import com.flyfish.framework.r2dbc.metadata.impl.SimpleR2dbcMetadataManager;
-import com.flyfish.framework.r2dbc.operations.R2dbcReactiveEntityOperations;
-import com.flyfish.framework.r2dbc.repository.factory.DefaultReactiveRepositoryFactoryBean;
-import com.flyfish.framework.r2dbc.repository.impl.QueryingR2dbcReactiveRepository;
-import com.flyfish.framework.repository.ReactiveEntityOperations;
+import dev.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.r2dbc.config.callback.ReferenceR2dbcCallback;
+import dev.flyfish.framework.r2dbc.config.mapping.AdditionalConverters;
+import dev.flyfish.framework.r2dbc.config.mapping.FullMappingR2dbcConverter;
+import dev.flyfish.framework.r2dbc.config.mapping.FullReactiveDataAccessStrategy;
+import dev.flyfish.framework.r2dbc.metadata.R2dbcMetadataManager;
+import dev.flyfish.framework.r2dbc.metadata.impl.SimpleR2dbcMetadataManager;
+import dev.flyfish.framework.r2dbc.operations.R2dbcReactiveEntityOperations;
+import dev.flyfish.framework.r2dbc.repository.factory.DefaultReactiveRepositoryFactoryBean;
+import dev.flyfish.framework.r2dbc.repository.impl.QueryingR2dbcReactiveRepository;
+import dev.flyfish.framework.repository.ReactiveEntityOperations;
import io.r2dbc.spi.ConnectionFactory;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.ObjectProvider;
@@ -55,7 +55,7 @@ import java.util.Optional;
@EnableR2dbcRepositories(
repositoryFactoryBeanClass = DefaultReactiveRepositoryFactoryBean.class,
repositoryBaseClass = QueryingR2dbcReactiveRepository.class,
- basePackages = "com.flyfish.framework.*.repository"
+ basePackages = "dev.flyfish.framework.*.repository"
)
@EnableR2dbcAuditing
public class R2dbcDataConfig {
diff --git a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/config/annotations/EnableR2dbcRepo.java b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/config/annotations/EnableR2dbcRepo.java
similarity index 80%
rename from flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/config/annotations/EnableR2dbcRepo.java
rename to flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/config/annotations/EnableR2dbcRepo.java
index 0710713..dee06a6 100644
--- a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/config/annotations/EnableR2dbcRepo.java
+++ b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/config/annotations/EnableR2dbcRepo.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.r2dbc.config.annotations;
+package dev.flyfish.framework.r2dbc.config.annotations;
-import com.flyfish.framework.r2dbc.repository.factory.DefaultReactiveRepositoryFactoryBean;
-import com.flyfish.framework.r2dbc.repository.impl.QueryingR2dbcReactiveRepository;
+import dev.flyfish.framework.r2dbc.repository.factory.DefaultReactiveRepositoryFactoryBean;
+import dev.flyfish.framework.r2dbc.repository.impl.QueryingR2dbcReactiveRepository;
import org.springframework.core.annotation.AliasFor;
import org.springframework.data.r2dbc.repository.config.EnableR2dbcRepositories;
diff --git a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/config/callback/AssociationFetcher.java b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/config/callback/AssociationFetcher.java
similarity index 91%
rename from flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/config/callback/AssociationFetcher.java
rename to flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/config/callback/AssociationFetcher.java
index fc0acb1..8e2968c 100644
--- a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/config/callback/AssociationFetcher.java
+++ b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/config/callback/AssociationFetcher.java
@@ -1,13 +1,13 @@
-package com.flyfish.framework.r2dbc.config.callback;
+package dev.flyfish.framework.r2dbc.config.callback;
-import com.flyfish.framework.domain.base.Domain;
-import com.flyfish.framework.query.Queries;
-import com.flyfish.framework.r2dbc.metadata.reference.R2dbcAssociation;
-import com.flyfish.framework.r2dbc.metadata.reference.R2dbcCollection;
-import com.flyfish.framework.r2dbc.metadata.reference.R2dbcRelation;
-import com.flyfish.framework.r2dbc.metadata.reference.field.FieldAccessor;
-import com.flyfish.framework.r2dbc.metadata.visitor.MetadataHandler;
-import com.flyfish.framework.repository.DefaultReactiveRepository;
+import dev.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.query.Queries;
+import dev.flyfish.framework.r2dbc.metadata.reference.R2dbcAssociation;
+import dev.flyfish.framework.r2dbc.metadata.reference.R2dbcCollection;
+import dev.flyfish.framework.r2dbc.metadata.reference.R2dbcRelation;
+import dev.flyfish.framework.r2dbc.metadata.reference.field.FieldAccessor;
+import dev.flyfish.framework.r2dbc.metadata.visitor.MetadataHandler;
+import dev.flyfish.framework.repository.DefaultReactiveRepository;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.data.mapping.PersistentProperty;
diff --git a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/config/callback/AssociationWriter.java b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/config/callback/AssociationWriter.java
similarity index 94%
rename from flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/config/callback/AssociationWriter.java
rename to flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/config/callback/AssociationWriter.java
index 2077cb1..84e5aa6 100644
--- a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/config/callback/AssociationWriter.java
+++ b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/config/callback/AssociationWriter.java
@@ -1,11 +1,11 @@
-package com.flyfish.framework.r2dbc.config.callback;
+package dev.flyfish.framework.r2dbc.config.callback;
-import com.flyfish.framework.domain.base.Domain;
-import com.flyfish.framework.r2dbc.metadata.reference.R2dbcAssociation;
-import com.flyfish.framework.r2dbc.metadata.reference.R2dbcCollection;
-import com.flyfish.framework.r2dbc.metadata.reference.R2dbcRelation;
-import com.flyfish.framework.r2dbc.metadata.visitor.MetadataHandler;
-import com.flyfish.framework.repository.DefaultReactiveRepository;
+import dev.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.r2dbc.metadata.reference.R2dbcAssociation;
+import dev.flyfish.framework.r2dbc.metadata.reference.R2dbcCollection;
+import dev.flyfish.framework.r2dbc.metadata.reference.R2dbcRelation;
+import dev.flyfish.framework.r2dbc.metadata.visitor.MetadataHandler;
+import dev.flyfish.framework.repository.DefaultReactiveRepository;
import lombok.RequiredArgsConstructor;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.data.mapping.PersistentEntity;
diff --git a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/config/callback/ReferenceR2dbcCallback.java b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/config/callback/ReferenceR2dbcCallback.java
similarity index 90%
rename from flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/config/callback/ReferenceR2dbcCallback.java
rename to flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/config/callback/ReferenceR2dbcCallback.java
index d875a58..87141ca 100644
--- a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/config/callback/ReferenceR2dbcCallback.java
+++ b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/config/callback/ReferenceR2dbcCallback.java
@@ -1,13 +1,13 @@
-package com.flyfish.framework.r2dbc.config.callback;
+package dev.flyfish.framework.r2dbc.config.callback;
-import com.flyfish.framework.auditor.callback.ReactiveAuditorCallback;
-import com.flyfish.framework.domain.base.Domain;
-import com.flyfish.framework.domain.base.Qo;
-import com.flyfish.framework.r2dbc.metadata.R2dbcMetadataManager;
-import com.flyfish.framework.r2dbc.metadata.R2dbcTableMetadata;
-import com.flyfish.framework.r2dbc.metadata.visitor.MetadataHandler;
-import com.flyfish.framework.r2dbc.metadata.visitor.R2dbcTableMetadataVisitor;
-import com.flyfish.framework.repository.DefaultReactiveRepository;
+import dev.flyfish.framework.auditor.callback.ReactiveAuditorCallback;
+import dev.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.domain.base.Qo;
+import dev.flyfish.framework.r2dbc.metadata.R2dbcMetadataManager;
+import dev.flyfish.framework.r2dbc.metadata.R2dbcTableMetadata;
+import dev.flyfish.framework.r2dbc.metadata.visitor.MetadataHandler;
+import dev.flyfish.framework.r2dbc.metadata.visitor.R2dbcTableMetadataVisitor;
+import dev.flyfish.framework.repository.DefaultReactiveRepository;
import org.reactivestreams.Publisher;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/config/callback/RepositoryProvider.java b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/config/callback/RepositoryProvider.java
similarity index 56%
rename from flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/config/callback/RepositoryProvider.java
rename to flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/config/callback/RepositoryProvider.java
index 536954d..a73ce68 100644
--- a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/config/callback/RepositoryProvider.java
+++ b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/config/callback/RepositoryProvider.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.r2dbc.config.callback;
+package dev.flyfish.framework.r2dbc.config.callback;
-import com.flyfish.framework.domain.base.Domain;
-import com.flyfish.framework.repository.DefaultReactiveRepository;
+import dev.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.repository.DefaultReactiveRepository;
import org.springframework.data.mapping.PersistentEntity;
@FunctionalInterface
diff --git a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/config/mapping/AdditionalConverters.java b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/config/mapping/AdditionalConverters.java
similarity index 96%
rename from flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/config/mapping/AdditionalConverters.java
rename to flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/config/mapping/AdditionalConverters.java
index 6d23535..e177916 100644
--- a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/config/mapping/AdditionalConverters.java
+++ b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/config/mapping/AdditionalConverters.java
@@ -1,8 +1,8 @@
-package com.flyfish.framework.r2dbc.config.mapping;
+package dev.flyfish.framework.r2dbc.config.mapping;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.type.TypeFactory;
-import com.flyfish.framework.utils.JacksonUtil;
+import dev.flyfish.framework.utils.JacksonUtil;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.core.convert.TypeDescriptor;
import org.springframework.core.convert.converter.Converter;
diff --git a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/config/mapping/FullMappingR2dbcConverter.java b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/config/mapping/FullMappingR2dbcConverter.java
similarity index 98%
rename from flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/config/mapping/FullMappingR2dbcConverter.java
rename to flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/config/mapping/FullMappingR2dbcConverter.java
index 9075833..63fcfc9 100644
--- a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/config/mapping/FullMappingR2dbcConverter.java
+++ b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/config/mapping/FullMappingR2dbcConverter.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.r2dbc.config.mapping;
+package dev.flyfish.framework.r2dbc.config.mapping;
-import com.flyfish.framework.utils.JacksonUtil;
+import dev.flyfish.framework.utils.JacksonUtil;
import org.springframework.data.convert.CustomConversions;
import org.springframework.data.mapping.IdentifierAccessor;
import org.springframework.data.mapping.PersistentPropertyAccessor;
diff --git a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/config/mapping/FullReactiveDataAccessStrategy.java b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/config/mapping/FullReactiveDataAccessStrategy.java
similarity index 98%
rename from flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/config/mapping/FullReactiveDataAccessStrategy.java
rename to flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/config/mapping/FullReactiveDataAccessStrategy.java
index ff4c3cd..24b0b51 100644
--- a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/config/mapping/FullReactiveDataAccessStrategy.java
+++ b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/config/mapping/FullReactiveDataAccessStrategy.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.r2dbc.config.mapping;
+package dev.flyfish.framework.r2dbc.config.mapping;
-import com.flyfish.framework.utils.JacksonUtil;
+import dev.flyfish.framework.utils.JacksonUtil;
import io.r2dbc.spi.Readable;
import io.r2dbc.spi.ReadableMetadata;
import io.r2dbc.spi.Row;
diff --git a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/metadata/R2dbcMetadataManager.java b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/metadata/R2dbcMetadataManager.java
similarity index 74%
rename from flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/metadata/R2dbcMetadataManager.java
rename to flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/metadata/R2dbcMetadataManager.java
index 44919c9..468a8c6 100644
--- a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/metadata/R2dbcMetadataManager.java
+++ b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/metadata/R2dbcMetadataManager.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.r2dbc.metadata;
+package dev.flyfish.framework.r2dbc.metadata;
-import com.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.domain.base.Domain;
/**
* r2dbc元数据管理器
diff --git a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/metadata/R2dbcTableMetadata.java b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/metadata/R2dbcTableMetadata.java
similarity index 80%
rename from flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/metadata/R2dbcTableMetadata.java
rename to flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/metadata/R2dbcTableMetadata.java
index d02fed0..6a27cd8 100644
--- a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/metadata/R2dbcTableMetadata.java
+++ b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/metadata/R2dbcTableMetadata.java
@@ -1,11 +1,11 @@
-package com.flyfish.framework.r2dbc.metadata;
+package dev.flyfish.framework.r2dbc.metadata;
-import com.flyfish.framework.annotations.Property;
-import com.flyfish.framework.r2dbc.metadata.reference.R2dbcAssociation;
-import com.flyfish.framework.r2dbc.metadata.reference.R2dbcCollection;
-import com.flyfish.framework.r2dbc.metadata.reference.R2dbcRelation;
-import com.flyfish.framework.r2dbc.metadata.reference.field.FieldAccessor;
-import com.flyfish.framework.relational.mapping.Association;
+import dev.flyfish.framework.annotations.Property;
+import dev.flyfish.framework.r2dbc.metadata.reference.R2dbcAssociation;
+import dev.flyfish.framework.r2dbc.metadata.reference.R2dbcCollection;
+import dev.flyfish.framework.r2dbc.metadata.reference.R2dbcRelation;
+import dev.flyfish.framework.r2dbc.metadata.reference.field.FieldAccessor;
+import dev.flyfish.framework.relational.mapping.Association;
import lombok.Data;
import org.springframework.data.mapping.PersistentEntity;
import org.springframework.data.mapping.PersistentProperty;
diff --git a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/metadata/impl/SimpleR2dbcMetadataManager.java b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/metadata/impl/SimpleR2dbcMetadataManager.java
similarity index 95%
rename from flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/metadata/impl/SimpleR2dbcMetadataManager.java
rename to flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/metadata/impl/SimpleR2dbcMetadataManager.java
index 25d4078..92843df 100644
--- a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/metadata/impl/SimpleR2dbcMetadataManager.java
+++ b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/metadata/impl/SimpleR2dbcMetadataManager.java
@@ -1,10 +1,10 @@
-package com.flyfish.framework.r2dbc.metadata.impl;
+package dev.flyfish.framework.r2dbc.metadata.impl;
-import com.flyfish.framework.domain.base.Domain;
-import com.flyfish.framework.r2dbc.metadata.R2dbcMetadataManager;
-import com.flyfish.framework.r2dbc.metadata.R2dbcTableMetadata;
-import com.flyfish.framework.r2dbc.metadata.reference.field.FieldAccessor;
-import com.flyfish.framework.relational.mapping.Association;
+import dev.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.r2dbc.metadata.R2dbcMetadataManager;
+import dev.flyfish.framework.r2dbc.metadata.R2dbcTableMetadata;
+import dev.flyfish.framework.r2dbc.metadata.reference.field.FieldAccessor;
+import dev.flyfish.framework.relational.mapping.Association;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.ClassUtils;
import org.apache.commons.lang3.StringUtils;
diff --git a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/metadata/reference/R2dbcAssociation.java b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/metadata/reference/R2dbcAssociation.java
similarity index 82%
rename from flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/metadata/reference/R2dbcAssociation.java
rename to flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/metadata/reference/R2dbcAssociation.java
index cb327e9..15d8cbc 100644
--- a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/metadata/reference/R2dbcAssociation.java
+++ b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/metadata/reference/R2dbcAssociation.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.r2dbc.metadata.reference;
+package dev.flyfish.framework.r2dbc.metadata.reference;
-import com.flyfish.framework.annotations.Property;
-import com.flyfish.framework.r2dbc.metadata.reference.field.FieldAccessor;
+import dev.flyfish.framework.annotations.Property;
+import dev.flyfish.framework.r2dbc.metadata.reference.field.FieldAccessor;
import lombok.AllArgsConstructor;
import lombok.Data;
import org.springframework.data.mapping.PersistentEntity;
diff --git a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/metadata/reference/R2dbcCollection.java b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/metadata/reference/R2dbcCollection.java
similarity index 80%
rename from flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/metadata/reference/R2dbcCollection.java
rename to flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/metadata/reference/R2dbcCollection.java
index a96dfec..22fd2ea 100644
--- a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/metadata/reference/R2dbcCollection.java
+++ b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/metadata/reference/R2dbcCollection.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.r2dbc.metadata.reference;
+package dev.flyfish.framework.r2dbc.metadata.reference;
-import com.flyfish.framework.annotations.Property;
-import com.flyfish.framework.r2dbc.metadata.reference.field.FieldAccessor;
+import dev.flyfish.framework.annotations.Property;
+import dev.flyfish.framework.r2dbc.metadata.reference.field.FieldAccessor;
import lombok.AllArgsConstructor;
import lombok.Data;
import org.springframework.data.mapping.PersistentEntity;
diff --git a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/metadata/reference/R2dbcRelation.java b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/metadata/reference/R2dbcRelation.java
similarity index 79%
rename from flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/metadata/reference/R2dbcRelation.java
rename to flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/metadata/reference/R2dbcRelation.java
index 37ce7ab..a5a769f 100644
--- a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/metadata/reference/R2dbcRelation.java
+++ b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/metadata/reference/R2dbcRelation.java
@@ -1,8 +1,8 @@
-package com.flyfish.framework.r2dbc.metadata.reference;
+package dev.flyfish.framework.r2dbc.metadata.reference;
-import com.flyfish.framework.annotations.Property;
-import com.flyfish.framework.r2dbc.metadata.reference.field.FieldAccessor;
-import com.flyfish.framework.relational.mapping.Association;
+import dev.flyfish.framework.annotations.Property;
+import dev.flyfish.framework.r2dbc.metadata.reference.field.FieldAccessor;
+import dev.flyfish.framework.relational.mapping.Association;
import lombok.AllArgsConstructor;
import lombok.Data;
import org.springframework.data.mapping.PersistentEntity;
diff --git a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/metadata/reference/field/DefaultFieldAccessor.java b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/metadata/reference/field/DefaultFieldAccessor.java
similarity index 94%
rename from flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/metadata/reference/field/DefaultFieldAccessor.java
rename to flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/metadata/reference/field/DefaultFieldAccessor.java
index c47b3b3..a907168 100644
--- a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/metadata/reference/field/DefaultFieldAccessor.java
+++ b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/metadata/reference/field/DefaultFieldAccessor.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.r2dbc.metadata.reference.field;
+package dev.flyfish.framework.r2dbc.metadata.reference.field;
-import com.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.domain.base.Domain;
import java.beans.PropertyDescriptor;
import java.lang.reflect.Method;
diff --git a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/metadata/reference/field/FieldAccessor.java b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/metadata/reference/field/FieldAccessor.java
similarity index 91%
rename from flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/metadata/reference/field/FieldAccessor.java
rename to flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/metadata/reference/field/FieldAccessor.java
index b5d0ded..b7b65e4 100644
--- a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/metadata/reference/field/FieldAccessor.java
+++ b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/metadata/reference/field/FieldAccessor.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.r2dbc.metadata.reference.field;
+package dev.flyfish.framework.r2dbc.metadata.reference.field;
-import com.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.domain.base.Domain;
import org.springframework.beans.BeanUtils;
import java.beans.PropertyDescriptor;
diff --git a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/metadata/visitor/MetadataHandler.java b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/metadata/visitor/MetadataHandler.java
similarity index 78%
rename from flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/metadata/visitor/MetadataHandler.java
rename to flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/metadata/visitor/MetadataHandler.java
index 5106379..993e18d 100644
--- a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/metadata/visitor/MetadataHandler.java
+++ b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/metadata/visitor/MetadataHandler.java
@@ -1,9 +1,9 @@
-package com.flyfish.framework.r2dbc.metadata.visitor;
+package dev.flyfish.framework.r2dbc.metadata.visitor;
-import com.flyfish.framework.domain.base.Domain;
-import com.flyfish.framework.r2dbc.metadata.reference.R2dbcAssociation;
-import com.flyfish.framework.r2dbc.metadata.reference.R2dbcCollection;
-import com.flyfish.framework.r2dbc.metadata.reference.R2dbcRelation;
+import dev.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.r2dbc.metadata.reference.R2dbcAssociation;
+import dev.flyfish.framework.r2dbc.metadata.reference.R2dbcCollection;
+import dev.flyfish.framework.r2dbc.metadata.reference.R2dbcRelation;
import org.springframework.data.mapping.PersistentPropertyAccessor;
import org.springframework.lang.Nullable;
import reactor.core.publisher.Mono;
diff --git a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/metadata/visitor/MetadataVisitor.java b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/metadata/visitor/MetadataVisitor.java
similarity index 83%
rename from flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/metadata/visitor/MetadataVisitor.java
rename to flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/metadata/visitor/MetadataVisitor.java
index 4943ce1..e50d1b6 100644
--- a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/metadata/visitor/MetadataVisitor.java
+++ b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/metadata/visitor/MetadataVisitor.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.r2dbc.metadata.visitor;
+package dev.flyfish.framework.r2dbc.metadata.visitor;
-import com.flyfish.framework.r2dbc.metadata.R2dbcTableMetadata;
+import dev.flyfish.framework.r2dbc.metadata.R2dbcTableMetadata;
import org.springframework.data.relational.core.sql.Visitable;
import org.springframework.data.relational.core.sql.Visitor;
import org.springframework.lang.NonNull;
diff --git a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/metadata/visitor/R2dbcTableMetadataVisitor.java b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/metadata/visitor/R2dbcTableMetadataVisitor.java
similarity index 89%
rename from flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/metadata/visitor/R2dbcTableMetadataVisitor.java
rename to flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/metadata/visitor/R2dbcTableMetadataVisitor.java
index 1dd1747..3e7c378 100644
--- a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/metadata/visitor/R2dbcTableMetadataVisitor.java
+++ b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/metadata/visitor/R2dbcTableMetadataVisitor.java
@@ -1,10 +1,10 @@
-package com.flyfish.framework.r2dbc.metadata.visitor;
+package dev.flyfish.framework.r2dbc.metadata.visitor;
-import com.flyfish.framework.domain.base.Domain;
-import com.flyfish.framework.r2dbc.metadata.R2dbcTableMetadata;
-import com.flyfish.framework.r2dbc.metadata.reference.R2dbcAssociation;
-import com.flyfish.framework.r2dbc.metadata.reference.R2dbcCollection;
-import com.flyfish.framework.r2dbc.metadata.reference.R2dbcRelation;
+import dev.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.r2dbc.metadata.R2dbcTableMetadata;
+import dev.flyfish.framework.r2dbc.metadata.reference.R2dbcAssociation;
+import dev.flyfish.framework.r2dbc.metadata.reference.R2dbcCollection;
+import dev.flyfish.framework.r2dbc.metadata.reference.R2dbcRelation;
import lombok.Getter;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.data.mapping.PersistentEntity;
diff --git a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/operations/R2dbcReactiveEntityOperations.java b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/operations/R2dbcReactiveEntityOperations.java
similarity index 90%
rename from flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/operations/R2dbcReactiveEntityOperations.java
rename to flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/operations/R2dbcReactiveEntityOperations.java
index 488487b..2d945d6 100644
--- a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/operations/R2dbcReactiveEntityOperations.java
+++ b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/operations/R2dbcReactiveEntityOperations.java
@@ -1,8 +1,8 @@
-package com.flyfish.framework.r2dbc.operations;
+package dev.flyfish.framework.r2dbc.operations;
-import com.flyfish.framework.domain.base.Domain;
-import com.flyfish.framework.query.Query;
-import com.flyfish.framework.repository.ReactiveEntityOperations;
+import dev.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.query.Query;
+import dev.flyfish.framework.repository.ReactiveEntityOperations;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springframework.data.r2dbc.core.R2dbcEntityOperations;
diff --git a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/query/R2dbcQueryFactory.java b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/query/R2dbcQueryFactory.java
similarity index 70%
rename from flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/query/R2dbcQueryFactory.java
rename to flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/query/R2dbcQueryFactory.java
index b3da79c..a6b35b8 100644
--- a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/query/R2dbcQueryFactory.java
+++ b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/query/R2dbcQueryFactory.java
@@ -1,11 +1,11 @@
-package com.flyfish.framework.r2dbc.query;
+package dev.flyfish.framework.r2dbc.query;
-import com.flyfish.framework.domain.base.Domain;
-import com.flyfish.framework.query.spi.QueryFactory;
-import com.flyfish.framework.query.spi.adaptor.CriteriaAdaptor;
-import com.flyfish.framework.query.spi.converter.QueryConverter;
-import com.flyfish.framework.r2dbc.query.adaptor.R2dbcCriteriaAdaptor;
-import com.flyfish.framework.r2dbc.query.converter.R2dbcQueryConverter;
+import dev.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.query.spi.QueryFactory;
+import dev.flyfish.framework.query.spi.adaptor.CriteriaAdaptor;
+import dev.flyfish.framework.query.spi.converter.QueryConverter;
+import dev.flyfish.framework.r2dbc.query.adaptor.R2dbcCriteriaAdaptor;
+import dev.flyfish.framework.r2dbc.query.converter.R2dbcQueryConverter;
import org.springframework.data.relational.core.query.Criteria;
import org.springframework.data.relational.core.query.Query;
import org.springframework.data.relational.repository.query.RelationalEntityInformation;
diff --git a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/query/adaptor/FunctionCriteria.java b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/query/adaptor/FunctionCriteria.java
similarity index 97%
rename from flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/query/adaptor/FunctionCriteria.java
rename to flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/query/adaptor/FunctionCriteria.java
index 4d24e20..274956f 100644
--- a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/query/adaptor/FunctionCriteria.java
+++ b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/query/adaptor/FunctionCriteria.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.r2dbc.query.adaptor;
+package dev.flyfish.framework.r2dbc.query.adaptor;
-import com.flyfish.framework.utils.JacksonUtil;
+import dev.flyfish.framework.utils.JacksonUtil;
import lombok.Getter;
import org.springframework.data.relational.core.query.Criteria;
import org.springframework.data.relational.core.query.CriteriaDefinition;
diff --git a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/query/adaptor/R2dbcCriteriaAdaptor.java b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/query/adaptor/R2dbcCriteriaAdaptor.java
similarity index 95%
rename from flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/query/adaptor/R2dbcCriteriaAdaptor.java
rename to flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/query/adaptor/R2dbcCriteriaAdaptor.java
index 8f0b24a..16725de 100644
--- a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/query/adaptor/R2dbcCriteriaAdaptor.java
+++ b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/query/adaptor/R2dbcCriteriaAdaptor.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.r2dbc.query.adaptor;
+package dev.flyfish.framework.r2dbc.query.adaptor;
-import com.flyfish.framework.query.Queries;
-import com.flyfish.framework.query.spi.adaptor.CriteriaAdaptor;
+import dev.flyfish.framework.query.Queries;
+import dev.flyfish.framework.query.spi.adaptor.CriteriaAdaptor;
import org.apache.commons.lang3.StringUtils;
import org.springframework.data.relational.core.query.Criteria;
diff --git a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/query/converter/R2dbcQueryConverter.java b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/query/converter/R2dbcQueryConverter.java
similarity index 88%
rename from flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/query/converter/R2dbcQueryConverter.java
rename to flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/query/converter/R2dbcQueryConverter.java
index 1334003..f7b3f98 100644
--- a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/query/converter/R2dbcQueryConverter.java
+++ b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/query/converter/R2dbcQueryConverter.java
@@ -1,8 +1,8 @@
-package com.flyfish.framework.r2dbc.query.converter;
+package dev.flyfish.framework.r2dbc.query.converter;
-import com.flyfish.framework.context.SpringContext;
-import com.flyfish.framework.query.spi.adaptor.CriteriaAdaptor;
-import com.flyfish.framework.query.spi.converter.QueryConverter;
+import dev.flyfish.framework.context.SpringContext;
+import dev.flyfish.framework.query.spi.adaptor.CriteriaAdaptor;
+import dev.flyfish.framework.query.spi.converter.QueryConverter;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
@@ -40,7 +40,7 @@ public class R2dbcQueryConverter implements QueryConverter {
* @return 本地查询
*/
@Override
- public Query convert(com.flyfish.framework.query.Query query) {
+ public Query convert(dev.flyfish.framework.query.Query query) {
Criteria condition = Criteria.where("delete").not(true);
// 添加条件
Criteria criteria = getCriteria(query);
@@ -67,7 +67,7 @@ public class R2dbcQueryConverter implements QueryConverter {
* @param query 查询信息
* @return 结果
*/
- private Criteria getCriteria(com.flyfish.framework.query.Query query) {
+ private Criteria getCriteria(dev.flyfish.framework.query.Query query) {
// 当且仅当有example且正确生成条件时，才允许使用example构造
if (null != query.getExample()) {
Optional optional = ofExample(query.getExample());
diff --git a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/repository/factory/DefaultReactiveRepositoryFactory.java b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/repository/factory/DefaultReactiveRepositoryFactory.java
similarity index 88%
rename from flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/repository/factory/DefaultReactiveRepositoryFactory.java
rename to flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/repository/factory/DefaultReactiveRepositoryFactory.java
index 2467e8c..af9bbd3 100644
--- a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/repository/factory/DefaultReactiveRepositoryFactory.java
+++ b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/repository/factory/DefaultReactiveRepositoryFactory.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.r2dbc.repository.factory;
+package dev.flyfish.framework.r2dbc.repository.factory;
-import com.flyfish.framework.r2dbc.repository.impl.QueryingR2dbcReactiveRepository;
+import dev.flyfish.framework.r2dbc.repository.impl.QueryingR2dbcReactiveRepository;
import org.springframework.data.r2dbc.core.R2dbcEntityOperations;
import org.springframework.data.r2dbc.repository.support.R2dbcRepositoryFactory;
import org.springframework.data.repository.core.RepositoryMetadata;
diff --git a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/repository/factory/DefaultReactiveRepositoryFactoryBean.java b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/repository/factory/DefaultReactiveRepositoryFactoryBean.java
similarity index 94%
rename from flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/repository/factory/DefaultReactiveRepositoryFactoryBean.java
rename to flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/repository/factory/DefaultReactiveRepositoryFactoryBean.java
index 7b8d0d6..cd31381 100644
--- a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/repository/factory/DefaultReactiveRepositoryFactoryBean.java
+++ b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/repository/factory/DefaultReactiveRepositoryFactoryBean.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.r2dbc.repository.factory;
+package dev.flyfish.framework.r2dbc.repository.factory;
import org.springframework.data.r2dbc.core.R2dbcEntityOperations;
import org.springframework.data.r2dbc.repository.support.R2dbcRepositoryFactoryBean;
diff --git a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/repository/impl/QueryingR2dbcReactiveRepository.java b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/repository/impl/QueryingR2dbcReactiveRepository.java
similarity index 97%
rename from flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/repository/impl/QueryingR2dbcReactiveRepository.java
rename to flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/repository/impl/QueryingR2dbcReactiveRepository.java
index 164673a..c86a117 100644
--- a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/repository/impl/QueryingR2dbcReactiveRepository.java
+++ b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/repository/impl/QueryingR2dbcReactiveRepository.java
@@ -1,8 +1,8 @@
-package com.flyfish.framework.r2dbc.repository.impl;
+package dev.flyfish.framework.r2dbc.repository.impl;
-import com.flyfish.framework.domain.base.Domain;
-import com.flyfish.framework.domain.base.Qo;
-import com.flyfish.framework.repository.DefaultReactiveRepository;
+import dev.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.domain.base.Qo;
+import dev.flyfish.framework.repository.DefaultReactiveRepository;
import lombok.Getter;
import org.apache.commons.lang3.StringUtils;
import org.reactivestreams.Publisher;
diff --git a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/repository/impl/ReactivePageableExecutionUtils.java b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/repository/impl/ReactivePageableExecutionUtils.java
similarity index 97%
rename from flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/repository/impl/ReactivePageableExecutionUtils.java
rename to flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/repository/impl/ReactivePageableExecutionUtils.java
index 9faf997..5dbc096 100644
--- a/flyfish-data/flyfish-data-r2dbc/src/main/java/com/flyfish/framework/r2dbc/repository/impl/ReactivePageableExecutionUtils.java
+++ b/flyfish-data/flyfish-data-r2dbc/src/main/java/dev/flyfish/framework/r2dbc/repository/impl/ReactivePageableExecutionUtils.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.flyfish.framework.r2dbc.repository.impl;
+package dev.flyfish.framework.r2dbc.repository.impl;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl;
diff --git a/flyfish-data/flyfish-data-r2dbc/src/main/java/org/springframework/data/r2dbc/query/FullUpdateMapper.java b/flyfish-data/flyfish-data-r2dbc/src/main/java/org/springframework/data/r2dbc/query/FullUpdateMapper.java
index b71b3f8..fc13907 100644
--- a/flyfish-data/flyfish-data-r2dbc/src/main/java/org/springframework/data/r2dbc/query/FullUpdateMapper.java
+++ b/flyfish-data/flyfish-data-r2dbc/src/main/java/org/springframework/data/r2dbc/query/FullUpdateMapper.java
@@ -1,6 +1,6 @@
package org.springframework.data.r2dbc.query;
-import com.flyfish.framework.r2dbc.query.adaptor.FunctionCriteria;
+import dev.flyfish.framework.r2dbc.query.adaptor.FunctionCriteria;
import org.springframework.data.mapping.context.MappingContext;
import org.springframework.data.r2dbc.convert.R2dbcConverter;
import org.springframework.data.r2dbc.dialect.R2dbcDialect;
diff --git a/flyfish-data/flyfish-data-r2dbc/src/main/resources/META-INF/spring.factories b/flyfish-data/flyfish-data-r2dbc/src/main/resources/META-INF/spring.factories
index 815b156..bd35a8e 100644
--- a/flyfish-data/flyfish-data-r2dbc/src/main/resources/META-INF/spring.factories
+++ b/flyfish-data/flyfish-data-r2dbc/src/main/resources/META-INF/spring.factories
@@ -1,4 +1,4 @@
-com.flyfish.framework.query.spi.QueryFactory=\
- com.flyfish.framework.r2dbc.query.R2dbcQueryFactory
+dev.flyfish.framework.query.spi.QueryFactory=\
+ dev.flyfish.framework.r2dbc.query.R2dbcQueryFactory
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
- com.flyfish.framework.r2dbc.config.R2dbcDataConfig
+ dev.flyfish.framework.r2dbc.config.R2dbcDataConfig
diff --git a/flyfish-data/flyfish-data-r2dbc/src/test/java/com/flyfish/framework/r2dbc/domain/TestQO.java b/flyfish-data/flyfish-data-r2dbc/src/test/java/com/flyfish/framework/r2dbc/domain/TestQO.java
deleted file mode 100644
index 1288775..0000000
--- a/flyfish-data/flyfish-data-r2dbc/src/test/java/com/flyfish/framework/r2dbc/domain/TestQO.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.flyfish.framework.r2dbc.domain;
-
-import com.flyfish.framework.domain.base.NameLikeQo;
-
-public class TestQO extends NameLikeQo {
-
-}
diff --git a/flyfish-data/flyfish-data-r2dbc/src/test/java/com/flyfish/framework/r2dbc/repository/TestAssoRepository.java b/flyfish-data/flyfish-data-r2dbc/src/test/java/com/flyfish/framework/r2dbc/repository/TestAssoRepository.java
deleted file mode 100644
index aed6e88..0000000
--- a/flyfish-data/flyfish-data-r2dbc/src/test/java/com/flyfish/framework/r2dbc/repository/TestAssoRepository.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.flyfish.framework.r2dbc.repository;
-
-import com.flyfish.framework.r2dbc.domain.reference.TestAsso;
-import com.flyfish.framework.repository.DefaultReactiveRepository;
-
-/**
- * 测试仓库
- */
-public interface TestAssoRepository extends DefaultReactiveRepository {
-}
diff --git a/flyfish-data/flyfish-data-r2dbc/src/test/java/com/flyfish/framework/r2dbc/repository/TestChildRepository.java b/flyfish-data/flyfish-data-r2dbc/src/test/java/com/flyfish/framework/r2dbc/repository/TestChildRepository.java
deleted file mode 100644
index c0ac26f..0000000
--- a/flyfish-data/flyfish-data-r2dbc/src/test/java/com/flyfish/framework/r2dbc/repository/TestChildRepository.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.flyfish.framework.r2dbc.repository;
-
-import com.flyfish.framework.r2dbc.domain.reference.TestChild;
-import com.flyfish.framework.repository.DefaultReactiveRepository;
-
-/**
- * 测试仓库
- */
-public interface TestChildRepository extends DefaultReactiveRepository {
-}
diff --git a/flyfish-data/flyfish-data-r2dbc/src/test/java/com/flyfish/framework/r2dbc/repository/TestOtherRepository.java b/flyfish-data/flyfish-data-r2dbc/src/test/java/com/flyfish/framework/r2dbc/repository/TestOtherRepository.java
deleted file mode 100644
index 7ff2e10..0000000
--- a/flyfish-data/flyfish-data-r2dbc/src/test/java/com/flyfish/framework/r2dbc/repository/TestOtherRepository.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.flyfish.framework.r2dbc.repository;
-
-import com.flyfish.framework.r2dbc.domain.reference.TestOther;
-import com.flyfish.framework.repository.DefaultReactiveRepository;
-
-/**
- * 测试仓库
- */
-public interface TestOtherRepository extends DefaultReactiveRepository {
-}
diff --git a/flyfish-data/flyfish-data-r2dbc/src/test/java/com/flyfish/framework/r2dbc/R2DbcRepositoryTest.java b/flyfish-data/flyfish-data-r2dbc/src/test/java/dev/flyfish/framework/r2dbc/R2DbcRepositoryTest.java
similarity index 80%
rename from flyfish-data/flyfish-data-r2dbc/src/test/java/com/flyfish/framework/r2dbc/R2DbcRepositoryTest.java
rename to flyfish-data/flyfish-data-r2dbc/src/test/java/dev/flyfish/framework/r2dbc/R2DbcRepositoryTest.java
index a20b047..23788ad 100644
--- a/flyfish-data/flyfish-data-r2dbc/src/test/java/com/flyfish/framework/r2dbc/R2DbcRepositoryTest.java
+++ b/flyfish-data/flyfish-data-r2dbc/src/test/java/dev/flyfish/framework/r2dbc/R2DbcRepositoryTest.java
@@ -1,11 +1,11 @@
-package com.flyfish.framework.r2dbc;
+package dev.flyfish.framework.r2dbc;
-import com.flyfish.framework.r2dbc.config.R2dbcDataConfig;
-import com.flyfish.framework.r2dbc.domain.TestDO;
-import com.flyfish.framework.r2dbc.domain.TestQO;
-import com.flyfish.framework.r2dbc.repository.TestAssoRepository;
-import com.flyfish.framework.r2dbc.repository.TestRepository;
-import com.flyfish.framework.utils.JacksonUtil;
+import dev.flyfish.framework.r2dbc.config.R2dbcDataConfig;
+import dev.flyfish.framework.r2dbc.domain.TestDO;
+import dev.flyfish.framework.r2dbc.domain.TestQO;
+import dev.flyfish.framework.r2dbc.repository.TestAssoRepository;
+import dev.flyfish.framework.r2dbc.repository.TestRepository;
+import dev.flyfish.framework.utils.JacksonUtil;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.Test;
@@ -20,7 +20,7 @@ import java.util.List;
@ExtendWith(SpringExtension.class)
@SpringBootTest(classes = R2DbcRepositoryTest.class)
-@SpringBootApplication(scanBasePackages = "com.flyfish.framework")
+@SpringBootApplication(scanBasePackages = "dev.flyfish.framework")
@Import(R2dbcDataConfig.class)
@Slf4j
public class R2DbcRepositoryTest {
diff --git a/flyfish-data/flyfish-data-r2dbc/src/test/java/com/flyfish/framework/r2dbc/domain/TestDO.java b/flyfish-data/flyfish-data-r2dbc/src/test/java/dev/flyfish/framework/r2dbc/domain/TestDO.java
similarity index 67%
rename from flyfish-data/flyfish-data-r2dbc/src/test/java/com/flyfish/framework/r2dbc/domain/TestDO.java
rename to flyfish-data/flyfish-data-r2dbc/src/test/java/dev/flyfish/framework/r2dbc/domain/TestDO.java
index e7775ea..9b43782 100644
--- a/flyfish-data/flyfish-data-r2dbc/src/test/java/com/flyfish/framework/r2dbc/domain/TestDO.java
+++ b/flyfish-data/flyfish-data-r2dbc/src/test/java/dev/flyfish/framework/r2dbc/domain/TestDO.java
@@ -1,10 +1,10 @@
-package com.flyfish.framework.r2dbc.domain;
+package dev.flyfish.framework.r2dbc.domain;
-import com.flyfish.framework.relational.mapping.Association;
-import com.flyfish.framework.domain.base.AuditDomain;
-import com.flyfish.framework.r2dbc.domain.reference.TestAsso;
-import com.flyfish.framework.r2dbc.domain.reference.TestChild;
-import com.flyfish.framework.r2dbc.domain.reference.TestOther;
+import dev.flyfish.framework.relational.mapping.Association;
+import dev.flyfish.framework.domain.base.AuditDomain;
+import dev.flyfish.framework.r2dbc.domain.reference.TestAsso;
+import dev.flyfish.framework.r2dbc.domain.reference.TestChild;
+import dev.flyfish.framework.r2dbc.domain.reference.TestOther;
import lombok.Data;
import org.springframework.data.annotation.Reference;
import org.springframework.data.relational.core.mapping.Column;
diff --git a/flyfish-data/flyfish-data-r2dbc/src/test/java/dev/flyfish/framework/r2dbc/domain/TestQO.java b/flyfish-data/flyfish-data-r2dbc/src/test/java/dev/flyfish/framework/r2dbc/domain/TestQO.java
new file mode 100644
index 0000000..d568e63
--- /dev/null
+++ b/flyfish-data/flyfish-data-r2dbc/src/test/java/dev/flyfish/framework/r2dbc/domain/TestQO.java
@@ -0,0 +1,7 @@
+package dev.flyfish.framework.r2dbc.domain;
+
+import dev.flyfish.framework.domain.base.NameLikeQo;
+
+public class TestQO extends NameLikeQo {
+
+}
diff --git a/flyfish-data/flyfish-data-r2dbc/src/test/java/com/flyfish/framework/r2dbc/domain/reference/TestAsso.java b/flyfish-data/flyfish-data-r2dbc/src/test/java/dev/flyfish/framework/r2dbc/domain/reference/TestAsso.java
similarity index 59%
rename from flyfish-data/flyfish-data-r2dbc/src/test/java/com/flyfish/framework/r2dbc/domain/reference/TestAsso.java
rename to flyfish-data/flyfish-data-r2dbc/src/test/java/dev/flyfish/framework/r2dbc/domain/reference/TestAsso.java
index afef584..128d3f3 100644
--- a/flyfish-data/flyfish-data-r2dbc/src/test/java/com/flyfish/framework/r2dbc/domain/reference/TestAsso.java
+++ b/flyfish-data/flyfish-data-r2dbc/src/test/java/dev/flyfish/framework/r2dbc/domain/reference/TestAsso.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.r2dbc.domain.reference;
+package dev.flyfish.framework.r2dbc.domain.reference;
-import com.flyfish.framework.domain.base.AuditDomain;
+import dev.flyfish.framework.domain.base.AuditDomain;
import lombok.Data;
import org.springframework.data.relational.core.mapping.Table;
diff --git a/flyfish-data/flyfish-data-r2dbc/src/test/java/com/flyfish/framework/r2dbc/domain/reference/TestChild.java b/flyfish-data/flyfish-data-r2dbc/src/test/java/dev/flyfish/framework/r2dbc/domain/reference/TestChild.java
similarity index 69%
rename from flyfish-data/flyfish-data-r2dbc/src/test/java/com/flyfish/framework/r2dbc/domain/reference/TestChild.java
rename to flyfish-data/flyfish-data-r2dbc/src/test/java/dev/flyfish/framework/r2dbc/domain/reference/TestChild.java
index d2b821d..59d3fb0 100644
--- a/flyfish-data/flyfish-data-r2dbc/src/test/java/com/flyfish/framework/r2dbc/domain/reference/TestChild.java
+++ b/flyfish-data/flyfish-data-r2dbc/src/test/java/dev/flyfish/framework/r2dbc/domain/reference/TestChild.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.r2dbc.domain.reference;
+package dev.flyfish.framework.r2dbc.domain.reference;
-import com.flyfish.framework.domain.base.AuditDomain;
-import com.flyfish.framework.r2dbc.domain.TestDO;
+import dev.flyfish.framework.domain.base.AuditDomain;
+import dev.flyfish.framework.r2dbc.domain.TestDO;
import lombok.Data;
import org.springframework.data.annotation.Reference;
import org.springframework.data.relational.core.mapping.Column;
diff --git a/flyfish-data/flyfish-data-r2dbc/src/test/java/com/flyfish/framework/r2dbc/domain/reference/TestOther.java b/flyfish-data/flyfish-data-r2dbc/src/test/java/dev/flyfish/framework/r2dbc/domain/reference/TestOther.java
similarity index 69%
rename from flyfish-data/flyfish-data-r2dbc/src/test/java/com/flyfish/framework/r2dbc/domain/reference/TestOther.java
rename to flyfish-data/flyfish-data-r2dbc/src/test/java/dev/flyfish/framework/r2dbc/domain/reference/TestOther.java
index 8366eba..9101142 100644
--- a/flyfish-data/flyfish-data-r2dbc/src/test/java/com/flyfish/framework/r2dbc/domain/reference/TestOther.java
+++ b/flyfish-data/flyfish-data-r2dbc/src/test/java/dev/flyfish/framework/r2dbc/domain/reference/TestOther.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.r2dbc.domain.reference;
+package dev.flyfish.framework.r2dbc.domain.reference;
-import com.flyfish.framework.domain.base.AuditDomain;
-import com.flyfish.framework.r2dbc.domain.TestDO;
+import dev.flyfish.framework.domain.base.AuditDomain;
+import dev.flyfish.framework.r2dbc.domain.TestDO;
import lombok.Data;
import org.springframework.data.annotation.Reference;
import org.springframework.data.relational.core.mapping.Column;
diff --git a/flyfish-data/flyfish-data-r2dbc/src/test/java/dev/flyfish/framework/r2dbc/repository/TestAssoRepository.java b/flyfish-data/flyfish-data-r2dbc/src/test/java/dev/flyfish/framework/r2dbc/repository/TestAssoRepository.java
new file mode 100644
index 0000000..de77308
--- /dev/null
+++ b/flyfish-data/flyfish-data-r2dbc/src/test/java/dev/flyfish/framework/r2dbc/repository/TestAssoRepository.java
@@ -0,0 +1,10 @@
+package dev.flyfish.framework.r2dbc.repository;
+
+import dev.flyfish.framework.r2dbc.domain.reference.TestAsso;
+import dev.flyfish.framework.repository.DefaultReactiveRepository;
+
+/**
+ * 测试仓库
+ */
+public interface TestAssoRepository extends DefaultReactiveRepository {
+}
diff --git a/flyfish-data/flyfish-data-r2dbc/src/test/java/dev/flyfish/framework/r2dbc/repository/TestChildRepository.java b/flyfish-data/flyfish-data-r2dbc/src/test/java/dev/flyfish/framework/r2dbc/repository/TestChildRepository.java
new file mode 100644
index 0000000..729c234
--- /dev/null
+++ b/flyfish-data/flyfish-data-r2dbc/src/test/java/dev/flyfish/framework/r2dbc/repository/TestChildRepository.java
@@ -0,0 +1,10 @@
+package dev.flyfish.framework.r2dbc.repository;
+
+import dev.flyfish.framework.r2dbc.domain.reference.TestChild;
+import dev.flyfish.framework.repository.DefaultReactiveRepository;
+
+/**
+ * 测试仓库
+ */
+public interface TestChildRepository extends DefaultReactiveRepository {
+}
diff --git a/flyfish-data/flyfish-data-r2dbc/src/test/java/dev/flyfish/framework/r2dbc/repository/TestOtherRepository.java b/flyfish-data/flyfish-data-r2dbc/src/test/java/dev/flyfish/framework/r2dbc/repository/TestOtherRepository.java
new file mode 100644
index 0000000..4b8bd17
--- /dev/null
+++ b/flyfish-data/flyfish-data-r2dbc/src/test/java/dev/flyfish/framework/r2dbc/repository/TestOtherRepository.java
@@ -0,0 +1,10 @@
+package dev.flyfish.framework.r2dbc.repository;
+
+import dev.flyfish.framework.r2dbc.domain.reference.TestOther;
+import dev.flyfish.framework.repository.DefaultReactiveRepository;
+
+/**
+ * 测试仓库
+ */
+public interface TestOtherRepository extends DefaultReactiveRepository {
+}
diff --git a/flyfish-data/flyfish-data-r2dbc/src/test/java/com/flyfish/framework/r2dbc/repository/TestRepository.java b/flyfish-data/flyfish-data-r2dbc/src/test/java/dev/flyfish/framework/r2dbc/repository/TestRepository.java
similarity index 54%
rename from flyfish-data/flyfish-data-r2dbc/src/test/java/com/flyfish/framework/r2dbc/repository/TestRepository.java
rename to flyfish-data/flyfish-data-r2dbc/src/test/java/dev/flyfish/framework/r2dbc/repository/TestRepository.java
index 203c943..ad74d02 100644
--- a/flyfish-data/flyfish-data-r2dbc/src/test/java/com/flyfish/framework/r2dbc/repository/TestRepository.java
+++ b/flyfish-data/flyfish-data-r2dbc/src/test/java/dev/flyfish/framework/r2dbc/repository/TestRepository.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.r2dbc.repository;
+package dev.flyfish.framework.r2dbc.repository;
-import com.flyfish.framework.r2dbc.domain.TestDO;
-import com.flyfish.framework.repository.DefaultReactiveRepository;
+import dev.flyfish.framework.r2dbc.domain.TestDO;
+import dev.flyfish.framework.repository.DefaultReactiveRepository;
import reactor.core.publisher.Mono;
/**
diff --git a/flyfish-data/flyfish-data-relational/pom.xml b/flyfish-data/flyfish-data-relational/pom.xml
index 1a1261b..6c6009e 100644
--- a/flyfish-data/flyfish-data-relational/pom.xml
+++ b/flyfish-data/flyfish-data-relational/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- com.flyfish.framework
+ dev.flyfish.framework
flyfish-data
${revision}
diff --git a/flyfish-data/flyfish-data-relational/src/main/java/com/flyfish/framework/relational/package-info.java b/flyfish-data/flyfish-data-relational/src/main/java/com/flyfish/framework/relational/package-info.java
deleted file mode 100644
index 58c63d5..0000000
--- a/flyfish-data/flyfish-data-relational/src/main/java/com/flyfish/framework/relational/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-package com.flyfish.framework.relational;
diff --git a/flyfish-data/flyfish-data-relational/src/main/java/com/flyfish/framework/relational/mapping/Association.java b/flyfish-data/flyfish-data-relational/src/main/java/dev/flyfish/framework/relational/mapping/Association.java
similarity index 95%
rename from flyfish-data/flyfish-data-relational/src/main/java/com/flyfish/framework/relational/mapping/Association.java
rename to flyfish-data/flyfish-data-relational/src/main/java/dev/flyfish/framework/relational/mapping/Association.java
index b31e7f4..6297210 100644
--- a/flyfish-data/flyfish-data-relational/src/main/java/com/flyfish/framework/relational/mapping/Association.java
+++ b/flyfish-data/flyfish-data-relational/src/main/java/dev/flyfish/framework/relational/mapping/Association.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.relational.mapping;
+package dev.flyfish.framework.relational.mapping;
import org.springframework.data.annotation.Transient;
diff --git a/flyfish-data/flyfish-data-relational/src/main/java/dev/flyfish/framework/relational/package-info.java b/flyfish-data/flyfish-data-relational/src/main/java/dev/flyfish/framework/relational/package-info.java
new file mode 100644
index 0000000..e802cab
--- /dev/null
+++ b/flyfish-data/flyfish-data-relational/src/main/java/dev/flyfish/framework/relational/package-info.java
@@ -0,0 +1 @@
+package dev.flyfish.framework.relational;
diff --git a/flyfish-data/pom.xml b/flyfish-data/pom.xml
index aeee09a..1ada2eb 100644
--- a/flyfish-data/pom.xml
+++ b/flyfish-data/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
flyfish-framework
- com.flyfish.framework
+ dev.flyfish.framework
${revision}
4.0.0
diff --git a/flyfish-dict/pom.xml b/flyfish-dict/pom.xml
index b8e4e9f..29a23b8 100644
--- a/flyfish-dict/pom.xml
+++ b/flyfish-dict/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
flyfish-framework
- com.flyfish.framework
+ dev.flyfish.framework
${revision}
4.0.0
@@ -19,7 +19,7 @@
- com.flyfish.framework
+ dev.flyfish.framework
flyfish-data-relational
true
@@ -29,13 +29,13 @@
true
- com.flyfish.framework
+ dev.flyfish.framework
flyfish-web
${revision}
true
- com.flyfish.framework
+ dev.flyfish.framework
flyfish-data-r2dbc
${revision}
test
diff --git a/flyfish-dict/src/main/java/com/flyfish/framework/dict/controller/AutoCompleteController.java b/flyfish-dict/src/main/java/com/flyfish/framework/dict/controller/AutoCompleteController.java
deleted file mode 100644
index 272af99..0000000
--- a/flyfish-dict/src/main/java/com/flyfish/framework/dict/controller/AutoCompleteController.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.flyfish.framework.dict.controller;
-
-import com.flyfish.framework.beans.annotations.RestMapping;
-import com.flyfish.framework.controller.reactive.ReactiveBaseController;
-import com.flyfish.framework.dict.domain.AutoComplete;
-import com.flyfish.framework.domain.base.NameLikeQo;
-
-@RestMapping("auto-completes")
-public class AutoCompleteController extends ReactiveBaseController> {
-}
diff --git a/flyfish-dict/src/main/java/com/flyfish/framework/dict/controller/DictionaryController.java b/flyfish-dict/src/main/java/com/flyfish/framework/dict/controller/DictionaryController.java
deleted file mode 100644
index 65e1a89..0000000
--- a/flyfish-dict/src/main/java/com/flyfish/framework/dict/controller/DictionaryController.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.flyfish.framework.dict.controller;
-
-
-import com.flyfish.framework.beans.annotations.RestMapping;
-import com.flyfish.framework.controller.reactive.ReactiveBaseController;
-import com.flyfish.framework.dict.domain.Dictionary;
-import com.flyfish.framework.dict.domain.DictionaryQo;
-
-/**
- * 字典表controller
- *
- * @author wangyu
- */
-@RestMapping("dictionaries")
-public class DictionaryController extends ReactiveBaseController {
-
-}
diff --git a/flyfish-dict/src/main/java/com/flyfish/framework/dict/repository/AutoCompleteRepository.java b/flyfish-dict/src/main/java/com/flyfish/framework/dict/repository/AutoCompleteRepository.java
deleted file mode 100644
index 8e68103..0000000
--- a/flyfish-dict/src/main/java/com/flyfish/framework/dict/repository/AutoCompleteRepository.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.flyfish.framework.dict.repository;
-
-import com.flyfish.framework.dict.domain.AutoComplete;
-import com.flyfish.framework.repository.DefaultReactiveRepository;
-
-public interface AutoCompleteRepository extends DefaultReactiveRepository {
-}
diff --git a/flyfish-dict/src/main/java/com/flyfish/framework/dict/service/AutoCompleteService.java b/flyfish-dict/src/main/java/com/flyfish/framework/dict/service/AutoCompleteService.java
deleted file mode 100644
index 2ae6e26..0000000
--- a/flyfish-dict/src/main/java/com/flyfish/framework/dict/service/AutoCompleteService.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.flyfish.framework.dict.service;
-
-import com.flyfish.framework.dict.domain.AutoComplete;
-import com.flyfish.framework.service.impl.BaseReactiveServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service
-public class AutoCompleteService extends BaseReactiveServiceImpl {
-}
diff --git a/flyfish-dict/src/main/java/com/flyfish/framework/dict/annotations/EnableDictProcess.java b/flyfish-dict/src/main/java/dev/flyfish/framework/dict/annotations/EnableDictProcess.java
similarity index 62%
rename from flyfish-dict/src/main/java/com/flyfish/framework/dict/annotations/EnableDictProcess.java
rename to flyfish-dict/src/main/java/dev/flyfish/framework/dict/annotations/EnableDictProcess.java
index fe24f26..76ca516 100644
--- a/flyfish-dict/src/main/java/com/flyfish/framework/dict/annotations/EnableDictProcess.java
+++ b/flyfish-dict/src/main/java/dev/flyfish/framework/dict/annotations/EnableDictProcess.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.dict.annotations;
+package dev.flyfish.framework.dict.annotations;
-import com.flyfish.framework.configuration.redis.EnableReactiveRedis;
-import com.flyfish.framework.dict.config.DictionaryConfig;
+import dev.flyfish.framework.configuration.redis.EnableReactiveRedis;
+import dev.flyfish.framework.dict.config.DictionaryConfig;
import org.springframework.context.annotation.Import;
import java.lang.annotation.*;
@@ -23,5 +23,5 @@ public @interface EnableDictProcess {
*
* @return 结果
*/
- String[] basePackages() default "com.flyfish.framework";
+ String[] basePackages() default "dev.flyfish.framework";
}
diff --git a/flyfish-dict/src/main/java/com/flyfish/framework/dict/config/DictionaryConfig.java b/flyfish-dict/src/main/java/dev/flyfish/framework/dict/config/DictionaryConfig.java
similarity index 91%
rename from flyfish-dict/src/main/java/com/flyfish/framework/dict/config/DictionaryConfig.java
rename to flyfish-dict/src/main/java/dev/flyfish/framework/dict/config/DictionaryConfig.java
index 7e156e3..2dc5b63 100644
--- a/flyfish-dict/src/main/java/com/flyfish/framework/dict/config/DictionaryConfig.java
+++ b/flyfish-dict/src/main/java/dev/flyfish/framework/dict/config/DictionaryConfig.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.dict.config;
+package dev.flyfish.framework.dict.config;
-import com.flyfish.framework.dict.annotations.EnableDictProcess;
+import dev.flyfish.framework.dict.annotations.EnableDictProcess;
import org.apache.commons.collections4.MapUtils;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
diff --git a/flyfish-dict/src/main/java/com/flyfish/framework/dict/config/DictionaryProcessor.java b/flyfish-dict/src/main/java/dev/flyfish/framework/dict/config/DictionaryProcessor.java
similarity index 86%
rename from flyfish-dict/src/main/java/com/flyfish/framework/dict/config/DictionaryProcessor.java
rename to flyfish-dict/src/main/java/dev/flyfish/framework/dict/config/DictionaryProcessor.java
index 1a34670..cdb9df0 100644
--- a/flyfish-dict/src/main/java/com/flyfish/framework/dict/config/DictionaryProcessor.java
+++ b/flyfish-dict/src/main/java/dev/flyfish/framework/dict/config/DictionaryProcessor.java
@@ -1,14 +1,14 @@
-package com.flyfish.framework.dict.config;
+package dev.flyfish.framework.dict.config;
-import com.flyfish.framework.annotations.DictValue;
-import com.flyfish.framework.dict.domain.Dictionary;
-import com.flyfish.framework.dict.domain.DictionaryValue;
-import com.flyfish.framework.dict.service.DictionaryService;
-import com.flyfish.framework.domain.base.Domain;
-import com.flyfish.framework.enums.BlankEnum;
-import com.flyfish.framework.enums.NamedEnum;
-import com.flyfish.framework.utils.Assert;
-import com.flyfish.framework.utils.ClassPathResourceScanner;
+import dev.flyfish.framework.annotations.DictValue;
+import dev.flyfish.framework.dict.domain.Dictionary;
+import dev.flyfish.framework.dict.domain.DictionaryValue;
+import dev.flyfish.framework.dict.service.DictionaryService;
+import dev.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.enums.BlankEnum;
+import dev.flyfish.framework.enums.NamedEnum;
+import dev.flyfish.framework.utils.Assert;
+import dev.flyfish.framework.utils.ClassPathResourceScanner;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
diff --git a/flyfish-dict/src/main/java/dev/flyfish/framework/dict/controller/AutoCompleteController.java b/flyfish-dict/src/main/java/dev/flyfish/framework/dict/controller/AutoCompleteController.java
new file mode 100644
index 0000000..d3237d2
--- /dev/null
+++ b/flyfish-dict/src/main/java/dev/flyfish/framework/dict/controller/AutoCompleteController.java
@@ -0,0 +1,10 @@
+package dev.flyfish.framework.dict.controller;
+
+import dev.flyfish.framework.beans.annotations.RestMapping;
+import dev.flyfish.framework.controller.reactive.ReactiveBaseController;
+import dev.flyfish.framework.dict.domain.AutoComplete;
+import dev.flyfish.framework.domain.base.NameLikeQo;
+
+@RestMapping("auto-completes")
+public class AutoCompleteController extends ReactiveBaseController> {
+}
diff --git a/flyfish-dict/src/main/java/dev/flyfish/framework/dict/controller/DictionaryController.java b/flyfish-dict/src/main/java/dev/flyfish/framework/dict/controller/DictionaryController.java
new file mode 100644
index 0000000..0cb4532
--- /dev/null
+++ b/flyfish-dict/src/main/java/dev/flyfish/framework/dict/controller/DictionaryController.java
@@ -0,0 +1,17 @@
+package dev.flyfish.framework.dict.controller;
+
+
+import dev.flyfish.framework.beans.annotations.RestMapping;
+import dev.flyfish.framework.controller.reactive.ReactiveBaseController;
+import dev.flyfish.framework.dict.domain.Dictionary;
+import dev.flyfish.framework.dict.domain.DictionaryQo;
+
+/**
+ * 字典表controller
+ *
+ * @author wangyu
+ */
+@RestMapping("dictionaries")
+public class DictionaryController extends ReactiveBaseController {
+
+}
diff --git a/flyfish-dict/src/main/java/com/flyfish/framework/dict/domain/AutoComplete.java b/flyfish-dict/src/main/java/dev/flyfish/framework/dict/domain/AutoComplete.java
similarity index 85%
rename from flyfish-dict/src/main/java/com/flyfish/framework/dict/domain/AutoComplete.java
rename to flyfish-dict/src/main/java/dev/flyfish/framework/dict/domain/AutoComplete.java
index c5f2fe8..03c2bc2 100644
--- a/flyfish-dict/src/main/java/com/flyfish/framework/dict/domain/AutoComplete.java
+++ b/flyfish-dict/src/main/java/dev/flyfish/framework/dict/domain/AutoComplete.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.dict.domain;
+package dev.flyfish.framework.dict.domain;
-import com.flyfish.framework.domain.base.AuditDomain;
+import dev.flyfish.framework.domain.base.AuditDomain;
import lombok.Getter;
import lombok.Setter;
import org.springframework.data.mongodb.core.mapping.Document;
diff --git a/flyfish-dict/src/main/java/com/flyfish/framework/dict/domain/Dictionary.java b/flyfish-dict/src/main/java/dev/flyfish/framework/dict/domain/Dictionary.java
similarity index 91%
rename from flyfish-dict/src/main/java/com/flyfish/framework/dict/domain/Dictionary.java
rename to flyfish-dict/src/main/java/dev/flyfish/framework/dict/domain/Dictionary.java
index 874ecfd..d73924c 100644
--- a/flyfish-dict/src/main/java/com/flyfish/framework/dict/domain/Dictionary.java
+++ b/flyfish-dict/src/main/java/dev/flyfish/framework/dict/domain/Dictionary.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.dict.domain;
+package dev.flyfish.framework.dict.domain;
-import com.flyfish.framework.domain.base.AuditDomain;
+import dev.flyfish.framework.domain.base.AuditDomain;
import lombok.Getter;
import lombok.Setter;
import org.apache.commons.lang3.StringUtils;
diff --git a/flyfish-dict/src/main/java/com/flyfish/framework/dict/domain/DictionaryQo.java b/flyfish-dict/src/main/java/dev/flyfish/framework/dict/domain/DictionaryQo.java
similarity index 82%
rename from flyfish-dict/src/main/java/com/flyfish/framework/dict/domain/DictionaryQo.java
rename to flyfish-dict/src/main/java/dev/flyfish/framework/dict/domain/DictionaryQo.java
index 0b1c6ad..5bf5bf3 100644
--- a/flyfish-dict/src/main/java/com/flyfish/framework/dict/domain/DictionaryQo.java
+++ b/flyfish-dict/src/main/java/dev/flyfish/framework/dict/domain/DictionaryQo.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.dict.domain;
+package dev.flyfish.framework.dict.domain;
-import com.flyfish.framework.domain.base.NameLikeQo;
-import com.flyfish.framework.query.QueryDefinition;
+import dev.flyfish.framework.domain.base.NameLikeQo;
+import dev.flyfish.framework.query.QueryDefinition;
import lombok.Getter;
import lombok.Setter;
import org.apache.commons.collections4.CollectionUtils;
diff --git a/flyfish-dict/src/main/java/com/flyfish/framework/dict/domain/DictionaryValue.java b/flyfish-dict/src/main/java/dev/flyfish/framework/dict/domain/DictionaryValue.java
similarity index 92%
rename from flyfish-dict/src/main/java/com/flyfish/framework/dict/domain/DictionaryValue.java
rename to flyfish-dict/src/main/java/dev/flyfish/framework/dict/domain/DictionaryValue.java
index 6df8131..431a544 100644
--- a/flyfish-dict/src/main/java/com/flyfish/framework/dict/domain/DictionaryValue.java
+++ b/flyfish-dict/src/main/java/dev/flyfish/framework/dict/domain/DictionaryValue.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.dict.domain;
+package dev.flyfish.framework.dict.domain;
import lombok.Data;
diff --git a/flyfish-dict/src/main/java/com/flyfish/framework/dict/handler/DictAnnotationInterceptor.java b/flyfish-dict/src/main/java/dev/flyfish/framework/dict/handler/DictAnnotationInterceptor.java
similarity index 88%
rename from flyfish-dict/src/main/java/com/flyfish/framework/dict/handler/DictAnnotationInterceptor.java
rename to flyfish-dict/src/main/java/dev/flyfish/framework/dict/handler/DictAnnotationInterceptor.java
index 152a75b..eb29384 100644
--- a/flyfish-dict/src/main/java/com/flyfish/framework/dict/handler/DictAnnotationInterceptor.java
+++ b/flyfish-dict/src/main/java/dev/flyfish/framework/dict/handler/DictAnnotationInterceptor.java
@@ -1,10 +1,10 @@
-package com.flyfish.framework.dict.handler;
+package dev.flyfish.framework.dict.handler;
-import com.flyfish.framework.annotations.DictValue;
-import com.flyfish.framework.context.interceptor.ViewModelInterceptor;
-import com.flyfish.framework.dict.domain.DictionaryValue;
-import com.flyfish.framework.dict.service.DictionaryService;
-import com.flyfish.framework.utils.ReflectionUtils;
+import dev.flyfish.framework.annotations.DictValue;
+import dev.flyfish.framework.context.interceptor.ViewModelInterceptor;
+import dev.flyfish.framework.dict.domain.DictionaryValue;
+import dev.flyfish.framework.dict.service.DictionaryService;
+import dev.flyfish.framework.utils.ReflectionUtils;
import lombok.RequiredArgsConstructor;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.reflect.FieldUtils;
diff --git a/flyfish-dict/src/main/java/dev/flyfish/framework/dict/repository/AutoCompleteRepository.java b/flyfish-dict/src/main/java/dev/flyfish/framework/dict/repository/AutoCompleteRepository.java
new file mode 100644
index 0000000..3d3ca8d
--- /dev/null
+++ b/flyfish-dict/src/main/java/dev/flyfish/framework/dict/repository/AutoCompleteRepository.java
@@ -0,0 +1,7 @@
+package dev.flyfish.framework.dict.repository;
+
+import dev.flyfish.framework.dict.domain.AutoComplete;
+import dev.flyfish.framework.repository.DefaultReactiveRepository;
+
+public interface AutoCompleteRepository extends DefaultReactiveRepository {
+}
diff --git a/flyfish-dict/src/main/java/com/flyfish/framework/dict/repository/DictionaryRepository.java b/flyfish-dict/src/main/java/dev/flyfish/framework/dict/repository/DictionaryRepository.java
similarity index 62%
rename from flyfish-dict/src/main/java/com/flyfish/framework/dict/repository/DictionaryRepository.java
rename to flyfish-dict/src/main/java/dev/flyfish/framework/dict/repository/DictionaryRepository.java
index 7328abd..6720f23 100644
--- a/flyfish-dict/src/main/java/com/flyfish/framework/dict/repository/DictionaryRepository.java
+++ b/flyfish-dict/src/main/java/dev/flyfish/framework/dict/repository/DictionaryRepository.java
@@ -1,11 +1,9 @@
-package com.flyfish.framework.dict.repository;
+package dev.flyfish.framework.dict.repository;
-import com.flyfish.framework.dict.domain.Dictionary;
-import com.flyfish.framework.repository.DefaultReactiveRepository;
+import dev.flyfish.framework.dict.domain.Dictionary;
+import dev.flyfish.framework.repository.DefaultReactiveRepository;
import reactor.core.publisher.Mono;
-import java.util.Optional;
-
/**
* 字典的仓库
*
diff --git a/flyfish-dict/src/main/java/dev/flyfish/framework/dict/service/AutoCompleteService.java b/flyfish-dict/src/main/java/dev/flyfish/framework/dict/service/AutoCompleteService.java
new file mode 100644
index 0000000..a4bdd59
--- /dev/null
+++ b/flyfish-dict/src/main/java/dev/flyfish/framework/dict/service/AutoCompleteService.java
@@ -0,0 +1,9 @@
+package dev.flyfish.framework.dict.service;
+
+import dev.flyfish.framework.dict.domain.AutoComplete;
+import dev.flyfish.framework.service.impl.BaseReactiveServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service
+public class AutoCompleteService extends BaseReactiveServiceImpl {
+}
diff --git a/flyfish-dict/src/main/java/com/flyfish/framework/dict/service/DictionaryService.java b/flyfish-dict/src/main/java/dev/flyfish/framework/dict/service/DictionaryService.java
similarity index 77%
rename from flyfish-dict/src/main/java/com/flyfish/framework/dict/service/DictionaryService.java
rename to flyfish-dict/src/main/java/dev/flyfish/framework/dict/service/DictionaryService.java
index 53320ec..654b6eb 100644
--- a/flyfish-dict/src/main/java/com/flyfish/framework/dict/service/DictionaryService.java
+++ b/flyfish-dict/src/main/java/dev/flyfish/framework/dict/service/DictionaryService.java
@@ -1,10 +1,10 @@
-package com.flyfish.framework.dict.service;
+package dev.flyfish.framework.dict.service;
-import com.flyfish.framework.dict.domain.Dictionary;
-import com.flyfish.framework.dict.repository.DictionaryRepository;
-import com.flyfish.framework.service.impl.BaseReactiveServiceImpl;
-import com.flyfish.framework.utils.ReactiveRedisOperations;
+import dev.flyfish.framework.dict.domain.Dictionary;
+import dev.flyfish.framework.dict.repository.DictionaryRepository;
+import dev.flyfish.framework.service.impl.BaseReactiveServiceImpl;
+import dev.flyfish.framework.utils.ReactiveRedisOperations;
import org.springframework.stereotype.Service;
import reactor.core.publisher.Mono;
diff --git a/flyfish-dict/src/test/java/com/flyfish/framework/dict/package-info.java b/flyfish-dict/src/test/java/com/flyfish/framework/dict/package-info.java
deleted file mode 100644
index 31b8aea..0000000
--- a/flyfish-dict/src/test/java/com/flyfish/framework/dict/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-package com.flyfish.framework.dict;
diff --git a/flyfish-dict/src/test/java/com/flyfish/framework/dict/FlyfishDictTest.java b/flyfish-dict/src/test/java/dev/flyfish/framework/dict/FlyfishDictTest.java
similarity index 70%
rename from flyfish-dict/src/test/java/com/flyfish/framework/dict/FlyfishDictTest.java
rename to flyfish-dict/src/test/java/dev/flyfish/framework/dict/FlyfishDictTest.java
index d365c25..3cacf9b 100644
--- a/flyfish-dict/src/test/java/com/flyfish/framework/dict/FlyfishDictTest.java
+++ b/flyfish-dict/src/test/java/dev/flyfish/framework/dict/FlyfishDictTest.java
@@ -1,12 +1,12 @@
-package com.flyfish.framework.dict;
+package dev.flyfish.framework.dict;
-import com.flyfish.framework.configuration.boot.FlyfishApplication;
-import com.flyfish.framework.dict.annotations.EnableDictProcess;
-import com.flyfish.framework.dict.domain.Dictionary;
-import com.flyfish.framework.dict.domain.DictionaryValue;
-import com.flyfish.framework.dict.repository.DictionaryRepository;
-import com.flyfish.framework.r2dbc.config.R2dbcDataConfig;
-import com.flyfish.framework.utils.JacksonUtil;
+import dev.flyfish.framework.configuration.boot.FlyfishApplication;
+import dev.flyfish.framework.dict.annotations.EnableDictProcess;
+import dev.flyfish.framework.dict.domain.Dictionary;
+import dev.flyfish.framework.dict.domain.DictionaryValue;
+import dev.flyfish.framework.dict.repository.DictionaryRepository;
+import dev.flyfish.framework.r2dbc.config.R2dbcDataConfig;
+import dev.flyfish.framework.utils.JacksonUtil;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.Test;
@@ -19,7 +19,7 @@ import java.util.Arrays;
@ExtendWith(SpringExtension.class)
@SpringBootTest(classes = FlyfishDictTest.class)
-@FlyfishApplication(scanBasePackages = "com.flyfish.framework")
+@FlyfishApplication(scanBasePackages = "dev.flyfish.framework")
@Import(R2dbcDataConfig.class)
@EnableDictProcess
@Slf4j
diff --git a/flyfish-dict/src/test/java/dev/flyfish/framework/dict/package-info.java b/flyfish-dict/src/test/java/dev/flyfish/framework/dict/package-info.java
new file mode 100644
index 0000000..616ad1b
--- /dev/null
+++ b/flyfish-dict/src/test/java/dev/flyfish/framework/dict/package-info.java
@@ -0,0 +1 @@
+package dev.flyfish.framework.dict;
diff --git a/flyfish-file/pom.xml b/flyfish-file/pom.xml
index 3365c13..a80c3f8 100644
--- a/flyfish-file/pom.xml
+++ b/flyfish-file/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
flyfish-framework
- com.flyfish.framework
+ dev.flyfish.framework
${revision}
4.0.0
@@ -28,7 +28,7 @@
true
- com.flyfish.framework
+ dev.flyfish.framework
flyfish-web
${revision}
true
diff --git a/flyfish-file/src/main/java/com/flyfish/framework/file/domain/AttachmentQo.java b/flyfish-file/src/main/java/com/flyfish/framework/file/domain/AttachmentQo.java
deleted file mode 100644
index acb083b..0000000
--- a/flyfish-file/src/main/java/com/flyfish/framework/file/domain/AttachmentQo.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.flyfish.framework.file.domain;
-
-
-import com.flyfish.framework.domain.base.NameLikeQo;
-
-public class AttachmentQo extends NameLikeQo {
-}
diff --git a/flyfish-file/src/main/java/com/flyfish/framework/file/repository/AttachmentRepository.java b/flyfish-file/src/main/java/com/flyfish/framework/file/repository/AttachmentRepository.java
deleted file mode 100644
index a4f19e4..0000000
--- a/flyfish-file/src/main/java/com/flyfish/framework/file/repository/AttachmentRepository.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.flyfish.framework.file.repository;
-
-
-import com.flyfish.framework.file.domain.Attachment;
-import com.flyfish.framework.repository.DefaultReactiveRepository;
-
-public interface AttachmentRepository extends DefaultReactiveRepository {
-}
diff --git a/flyfish-file/src/main/java/com/flyfish/framework/file/config/UploadConfiguration.java b/flyfish-file/src/main/java/dev/flyfish/framework/file/config/UploadConfiguration.java
similarity index 87%
rename from flyfish-file/src/main/java/com/flyfish/framework/file/config/UploadConfiguration.java
rename to flyfish-file/src/main/java/dev/flyfish/framework/file/config/UploadConfiguration.java
index debb853..8f840f6 100644
--- a/flyfish-file/src/main/java/com/flyfish/framework/file/config/UploadConfiguration.java
+++ b/flyfish-file/src/main/java/dev/flyfish/framework/file/config/UploadConfiguration.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.file.config;
+package dev.flyfish.framework.file.config;
-import com.flyfish.framework.file.utils.SystemUtils;
+import dev.flyfish.framework.file.utils.SystemUtils;
import lombok.Getter;
import lombok.Setter;
import org.springframework.boot.context.properties.ConfigurationProperties;
diff --git a/flyfish-file/src/main/java/com/flyfish/framework/file/controller/AttachmentController.java b/flyfish-file/src/main/java/dev/flyfish/framework/file/controller/AttachmentController.java
similarity index 56%
rename from flyfish-file/src/main/java/com/flyfish/framework/file/controller/AttachmentController.java
rename to flyfish-file/src/main/java/dev/flyfish/framework/file/controller/AttachmentController.java
index 1f91f34..c56bd81 100644
--- a/flyfish-file/src/main/java/com/flyfish/framework/file/controller/AttachmentController.java
+++ b/flyfish-file/src/main/java/dev/flyfish/framework/file/controller/AttachmentController.java
@@ -1,9 +1,9 @@
-package com.flyfish.framework.file.controller;
+package dev.flyfish.framework.file.controller;
-import com.flyfish.framework.controller.reactive.ReactiveBaseController;
-import com.flyfish.framework.file.domain.Attachment;
-import com.flyfish.framework.file.domain.AttachmentQo;
+import dev.flyfish.framework.controller.reactive.ReactiveBaseController;
+import dev.flyfish.framework.file.domain.Attachment;
+import dev.flyfish.framework.file.domain.AttachmentQo;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
diff --git a/flyfish-file/src/main/java/com/flyfish/framework/file/controller/AttachmentUploadController.java b/flyfish-file/src/main/java/dev/flyfish/framework/file/controller/AttachmentUploadController.java
similarity index 84%
rename from flyfish-file/src/main/java/com/flyfish/framework/file/controller/AttachmentUploadController.java
rename to flyfish-file/src/main/java/dev/flyfish/framework/file/controller/AttachmentUploadController.java
index abdab46..0dbec07 100644
--- a/flyfish-file/src/main/java/com/flyfish/framework/file/controller/AttachmentUploadController.java
+++ b/flyfish-file/src/main/java/dev/flyfish/framework/file/controller/AttachmentUploadController.java
@@ -1,11 +1,11 @@
-package com.flyfish.framework.file.controller;
+package dev.flyfish.framework.file.controller;
-import com.flyfish.framework.bean.Result;
-import com.flyfish.framework.beans.annotations.RestMapping;
-import com.flyfish.framework.file.config.UploadConfiguration;
-import com.flyfish.framework.file.domain.Attachment;
-import com.flyfish.framework.file.service.AttachmentService;
-import com.flyfish.framework.file.utils.DownloadUtils;
+import dev.flyfish.framework.bean.Result;
+import dev.flyfish.framework.beans.annotations.RestMapping;
+import dev.flyfish.framework.file.config.UploadConfiguration;
+import dev.flyfish.framework.file.domain.Attachment;
+import dev.flyfish.framework.file.service.AttachmentService;
+import dev.flyfish.framework.file.utils.DownloadUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.http.codec.multipart.FilePart;
import org.springframework.http.server.reactive.ServerHttpRequest;
diff --git a/flyfish-file/src/main/java/com/flyfish/framework/file/controller/MediaController.java b/flyfish-file/src/main/java/dev/flyfish/framework/file/controller/MediaController.java
similarity index 86%
rename from flyfish-file/src/main/java/com/flyfish/framework/file/controller/MediaController.java
rename to flyfish-file/src/main/java/dev/flyfish/framework/file/controller/MediaController.java
index ddd885c..e447693 100644
--- a/flyfish-file/src/main/java/com/flyfish/framework/file/controller/MediaController.java
+++ b/flyfish-file/src/main/java/dev/flyfish/framework/file/controller/MediaController.java
@@ -1,10 +1,10 @@
-package com.flyfish.framework.file.controller;
+package dev.flyfish.framework.file.controller;
-import com.flyfish.framework.bean.Result;
-import com.flyfish.framework.file.config.UploadConfiguration;
-import com.flyfish.framework.file.domain.Media;
-import com.flyfish.framework.file.service.MediaService;
-import com.flyfish.framework.file.utils.DownloadUtils;
+import dev.flyfish.framework.bean.Result;
+import dev.flyfish.framework.file.config.UploadConfiguration;
+import dev.flyfish.framework.file.domain.Media;
+import dev.flyfish.framework.file.service.MediaService;
+import dev.flyfish.framework.file.utils.DownloadUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.http.codec.multipart.FilePart;
import org.springframework.http.server.reactive.ServerHttpRequest;
diff --git a/flyfish-file/src/main/java/com/flyfish/framework/file/domain/Attachment.java b/flyfish-file/src/main/java/dev/flyfish/framework/file/domain/Attachment.java
similarity index 78%
rename from flyfish-file/src/main/java/com/flyfish/framework/file/domain/Attachment.java
rename to flyfish-file/src/main/java/dev/flyfish/framework/file/domain/Attachment.java
index 9d5b5ef..dab11bc 100644
--- a/flyfish-file/src/main/java/com/flyfish/framework/file/domain/Attachment.java
+++ b/flyfish-file/src/main/java/dev/flyfish/framework/file/domain/Attachment.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.file.domain;
+package dev.flyfish.framework.file.domain;
-import com.flyfish.framework.annotations.Property;
-import com.flyfish.framework.domain.base.AuditDomain;
+import dev.flyfish.framework.annotations.Property;
+import dev.flyfish.framework.domain.base.AuditDomain;
import lombok.*;
import org.springframework.data.mongodb.core.mapping.Document;
import org.springframework.data.relational.core.mapping.Table;
diff --git a/flyfish-file/src/main/java/dev/flyfish/framework/file/domain/AttachmentQo.java b/flyfish-file/src/main/java/dev/flyfish/framework/file/domain/AttachmentQo.java
new file mode 100644
index 0000000..5408ddd
--- /dev/null
+++ b/flyfish-file/src/main/java/dev/flyfish/framework/file/domain/AttachmentQo.java
@@ -0,0 +1,7 @@
+package dev.flyfish.framework.file.domain;
+
+
+import dev.flyfish.framework.domain.base.NameLikeQo;
+
+public class AttachmentQo extends NameLikeQo {
+}
diff --git a/flyfish-file/src/main/java/com/flyfish/framework/file/domain/Media.java b/flyfish-file/src/main/java/dev/flyfish/framework/file/domain/Media.java
similarity index 82%
rename from flyfish-file/src/main/java/com/flyfish/framework/file/domain/Media.java
rename to flyfish-file/src/main/java/dev/flyfish/framework/file/domain/Media.java
index 5d4b7c3..2f2d1ff 100644
--- a/flyfish-file/src/main/java/com/flyfish/framework/file/domain/Media.java
+++ b/flyfish-file/src/main/java/dev/flyfish/framework/file/domain/Media.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.file.domain;
+package dev.flyfish.framework.file.domain;
-import com.flyfish.framework.file.enums.MediaType;
+import dev.flyfish.framework.file.enums.MediaType;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/flyfish-file/src/main/java/com/flyfish/framework/file/enums/MediaType.java b/flyfish-file/src/main/java/dev/flyfish/framework/file/enums/MediaType.java
similarity index 95%
rename from flyfish-file/src/main/java/com/flyfish/framework/file/enums/MediaType.java
rename to flyfish-file/src/main/java/dev/flyfish/framework/file/enums/MediaType.java
index 14819de..ed2fcf6 100644
--- a/flyfish-file/src/main/java/com/flyfish/framework/file/enums/MediaType.java
+++ b/flyfish-file/src/main/java/dev/flyfish/framework/file/enums/MediaType.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.file.enums;
+package dev.flyfish.framework.file.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
diff --git a/flyfish-file/src/main/java/com/flyfish/framework/file/enums/MediaTypes.java b/flyfish-file/src/main/java/dev/flyfish/framework/file/enums/MediaTypes.java
similarity index 96%
rename from flyfish-file/src/main/java/com/flyfish/framework/file/enums/MediaTypes.java
rename to flyfish-file/src/main/java/dev/flyfish/framework/file/enums/MediaTypes.java
index 3855e9c..46d434d 100644
--- a/flyfish-file/src/main/java/com/flyfish/framework/file/enums/MediaTypes.java
+++ b/flyfish-file/src/main/java/dev/flyfish/framework/file/enums/MediaTypes.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.file.enums;
+package dev.flyfish.framework.file.enums;
import lombok.AllArgsConstructor;
import lombok.Getter;
diff --git a/flyfish-file/src/main/java/dev/flyfish/framework/file/repository/AttachmentRepository.java b/flyfish-file/src/main/java/dev/flyfish/framework/file/repository/AttachmentRepository.java
new file mode 100644
index 0000000..cb5873c
--- /dev/null
+++ b/flyfish-file/src/main/java/dev/flyfish/framework/file/repository/AttachmentRepository.java
@@ -0,0 +1,8 @@
+package dev.flyfish.framework.file.repository;
+
+
+import dev.flyfish.framework.file.domain.Attachment;
+import dev.flyfish.framework.repository.DefaultReactiveRepository;
+
+public interface AttachmentRepository extends DefaultReactiveRepository {
+}
diff --git a/flyfish-file/src/main/java/com/flyfish/framework/file/service/AttachmentService.java b/flyfish-file/src/main/java/dev/flyfish/framework/file/service/AttachmentService.java
similarity index 85%
rename from flyfish-file/src/main/java/com/flyfish/framework/file/service/AttachmentService.java
rename to flyfish-file/src/main/java/dev/flyfish/framework/file/service/AttachmentService.java
index 952714c..9953b34 100644
--- a/flyfish-file/src/main/java/com/flyfish/framework/file/service/AttachmentService.java
+++ b/flyfish-file/src/main/java/dev/flyfish/framework/file/service/AttachmentService.java
@@ -1,9 +1,9 @@
-package com.flyfish.framework.file.service;
+package dev.flyfish.framework.file.service;
-import com.flyfish.framework.file.domain.Attachment;
-import com.flyfish.framework.file.utils.FileSizeUtils;
-import com.flyfish.framework.service.impl.BaseReactiveServiceImpl;
+import dev.flyfish.framework.file.domain.Attachment;
+import dev.flyfish.framework.file.utils.FileSizeUtils;
+import dev.flyfish.framework.service.impl.BaseReactiveServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.springframework.http.codec.multipart.FilePart;
import org.springframework.stereotype.Service;
diff --git a/flyfish-file/src/main/java/com/flyfish/framework/file/service/FileService.java b/flyfish-file/src/main/java/dev/flyfish/framework/file/service/FileService.java
similarity index 90%
rename from flyfish-file/src/main/java/com/flyfish/framework/file/service/FileService.java
rename to flyfish-file/src/main/java/dev/flyfish/framework/file/service/FileService.java
index cc6401f..d34fcc1 100644
--- a/flyfish-file/src/main/java/com/flyfish/framework/file/service/FileService.java
+++ b/flyfish-file/src/main/java/dev/flyfish/framework/file/service/FileService.java
@@ -1,8 +1,8 @@
-package com.flyfish.framework.file.service;
+package dev.flyfish.framework.file.service;
-import com.flyfish.framework.file.config.UploadConfiguration;
-import com.flyfish.framework.file.utils.SystemUtils;
+import dev.flyfish.framework.file.config.UploadConfiguration;
+import dev.flyfish.framework.file.utils.SystemUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.http.codec.multipart.FilePart;
import org.springframework.stereotype.Service;
diff --git a/flyfish-file/src/main/java/com/flyfish/framework/file/service/MediaService.java b/flyfish-file/src/main/java/dev/flyfish/framework/file/service/MediaService.java
similarity index 90%
rename from flyfish-file/src/main/java/com/flyfish/framework/file/service/MediaService.java
rename to flyfish-file/src/main/java/dev/flyfish/framework/file/service/MediaService.java
index 02d44b7..c5c209a 100644
--- a/flyfish-file/src/main/java/com/flyfish/framework/file/service/MediaService.java
+++ b/flyfish-file/src/main/java/dev/flyfish/framework/file/service/MediaService.java
@@ -1,11 +1,11 @@
-package com.flyfish.framework.file.service;
+package dev.flyfish.framework.file.service;
-import com.flyfish.framework.file.config.UploadConfiguration;
-import com.flyfish.framework.file.domain.Media;
-import com.flyfish.framework.file.enums.MediaType;
-import com.flyfish.framework.file.utils.FileSizeUtils;
-import com.flyfish.framework.file.utils.ZipUtils;
+import dev.flyfish.framework.file.config.UploadConfiguration;
+import dev.flyfish.framework.file.domain.Media;
+import dev.flyfish.framework.file.enums.MediaType;
+import dev.flyfish.framework.file.utils.FileSizeUtils;
+import dev.flyfish.framework.file.utils.ZipUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.http.codec.multipart.FilePart;
diff --git a/flyfish-file/src/main/java/com/flyfish/framework/file/utils/DownloadUtils.java b/flyfish-file/src/main/java/dev/flyfish/framework/file/utils/DownloadUtils.java
similarity index 91%
rename from flyfish-file/src/main/java/com/flyfish/framework/file/utils/DownloadUtils.java
rename to flyfish-file/src/main/java/dev/flyfish/framework/file/utils/DownloadUtils.java
index 5723627..9ad44fc 100644
--- a/flyfish-file/src/main/java/com/flyfish/framework/file/utils/DownloadUtils.java
+++ b/flyfish-file/src/main/java/dev/flyfish/framework/file/utils/DownloadUtils.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.file.utils;
+package dev.flyfish.framework.file.utils;
-import com.flyfish.framework.file.enums.MediaTypes;
+import dev.flyfish.framework.file.enums.MediaTypes;
import org.apache.commons.lang3.StringUtils;
import org.springframework.http.ContentDisposition;
import org.springframework.http.HttpHeaders;
diff --git a/flyfish-file/src/main/java/com/flyfish/framework/file/utils/FileMD5Utils.java b/flyfish-file/src/main/java/dev/flyfish/framework/file/utils/FileMD5Utils.java
similarity index 97%
rename from flyfish-file/src/main/java/com/flyfish/framework/file/utils/FileMD5Utils.java
rename to flyfish-file/src/main/java/dev/flyfish/framework/file/utils/FileMD5Utils.java
index ee5e73c..567911a 100644
--- a/flyfish-file/src/main/java/com/flyfish/framework/file/utils/FileMD5Utils.java
+++ b/flyfish-file/src/main/java/dev/flyfish/framework/file/utils/FileMD5Utils.java
@@ -11,10 +11,10 @@
* Copyright (c) 2016, www.bibenet.com All Rights Reserved.O(∩_∩)O
*/
-package com.flyfish.framework.file.utils;
+package dev.flyfish.framework.file.utils;
-import com.flyfish.framework.utils.Assert;
+import dev.flyfish.framework.utils.Assert;
import java.io.*;
import java.math.BigInteger;
diff --git a/flyfish-file/src/main/java/com/flyfish/framework/file/utils/FileSizeUtils.java b/flyfish-file/src/main/java/dev/flyfish/framework/file/utils/FileSizeUtils.java
similarity index 97%
rename from flyfish-file/src/main/java/com/flyfish/framework/file/utils/FileSizeUtils.java
rename to flyfish-file/src/main/java/dev/flyfish/framework/file/utils/FileSizeUtils.java
index e69a6a8..3ad1c05 100644
--- a/flyfish-file/src/main/java/com/flyfish/framework/file/utils/FileSizeUtils.java
+++ b/flyfish-file/src/main/java/dev/flyfish/framework/file/utils/FileSizeUtils.java
@@ -8,7 +8,7 @@
* ****************************************************************************
* Copyright (c) 2018, www.bibenet.com All Rights Reserved.O(∩_∩)O
*/
-package com.flyfish.framework.file.utils;
+package dev.flyfish.framework.file.utils;
/**
* 文件大小工具类
diff --git a/flyfish-file/src/main/java/com/flyfish/framework/file/utils/SystemUtils.java b/flyfish-file/src/main/java/dev/flyfish/framework/file/utils/SystemUtils.java
similarity index 94%
rename from flyfish-file/src/main/java/com/flyfish/framework/file/utils/SystemUtils.java
rename to flyfish-file/src/main/java/dev/flyfish/framework/file/utils/SystemUtils.java
index fc2c11b..5c34c51 100644
--- a/flyfish-file/src/main/java/com/flyfish/framework/file/utils/SystemUtils.java
+++ b/flyfish-file/src/main/java/dev/flyfish/framework/file/utils/SystemUtils.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.file.utils;
+package dev.flyfish.framework.file.utils;
-import com.flyfish.framework.context.DateContext;
-import com.flyfish.framework.utils.Assert;
+import dev.flyfish.framework.context.DateContext;
+import dev.flyfish.framework.utils.Assert;
import org.apache.commons.lang3.StringUtils;
import java.io.File;
diff --git a/flyfish-file/src/main/java/com/flyfish/framework/file/utils/ZipUtils.java b/flyfish-file/src/main/java/dev/flyfish/framework/file/utils/ZipUtils.java
similarity index 98%
rename from flyfish-file/src/main/java/com/flyfish/framework/file/utils/ZipUtils.java
rename to flyfish-file/src/main/java/dev/flyfish/framework/file/utils/ZipUtils.java
index b6e668d..c2bff40 100644
--- a/flyfish-file/src/main/java/com/flyfish/framework/file/utils/ZipUtils.java
+++ b/flyfish-file/src/main/java/dev/flyfish/framework/file/utils/ZipUtils.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.file.utils;
+package dev.flyfish.framework.file.utils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
diff --git a/flyfish-form/pom.xml b/flyfish-form/pom.xml
index cec403b..39e5e8d 100644
--- a/flyfish-form/pom.xml
+++ b/flyfish-form/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
flyfish-framework
- com.flyfish.framework
+ dev.flyfish.framework
${revision}
4.0.0
@@ -18,11 +18,11 @@
- com.flyfish.framework
+ dev.flyfish.framework
flyfish-data-common
- com.flyfish.framework
+ dev.flyfish.framework
flyfish-web
${revision}
@@ -37,7 +37,7 @@
true
- com.flyfish.framework
+ dev.flyfish.framework
flyfish-data-r2dbc
${revision}
test
diff --git a/flyfish-form/src/main/java/com/flyfish/framework/form/repository/OnlineFormRepository.java b/flyfish-form/src/main/java/com/flyfish/framework/form/repository/OnlineFormRepository.java
deleted file mode 100644
index 49b683b..0000000
--- a/flyfish-form/src/main/java/com/flyfish/framework/form/repository/OnlineFormRepository.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.flyfish.framework.form.repository;
-
-import com.flyfish.framework.form.domain.OnlineForm;
-import com.flyfish.framework.repository.DefaultReactiveRepository;
-
-/**
- * 在线表单
- */
-public interface OnlineFormRepository extends DefaultReactiveRepository {
-}
diff --git a/flyfish-form/src/main/java/com/flyfish/framework/form/controller/OnlineFormController.java b/flyfish-form/src/main/java/dev/flyfish/framework/form/controller/OnlineFormController.java
similarity index 61%
rename from flyfish-form/src/main/java/com/flyfish/framework/form/controller/OnlineFormController.java
rename to flyfish-form/src/main/java/dev/flyfish/framework/form/controller/OnlineFormController.java
index a08ed48..63b8ca8 100644
--- a/flyfish-form/src/main/java/com/flyfish/framework/form/controller/OnlineFormController.java
+++ b/flyfish-form/src/main/java/dev/flyfish/framework/form/controller/OnlineFormController.java
@@ -1,8 +1,8 @@
-package com.flyfish.framework.form.controller;
+package dev.flyfish.framework.form.controller;
-import com.flyfish.framework.controller.reactive.ReactiveBaseController;
-import com.flyfish.framework.domain.base.NameLikeQo;
-import com.flyfish.framework.form.domain.OnlineForm;
+import dev.flyfish.framework.controller.reactive.ReactiveBaseController;
+import dev.flyfish.framework.domain.base.NameLikeQo;
+import dev.flyfish.framework.form.domain.OnlineForm;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
diff --git a/flyfish-form/src/main/java/com/flyfish/framework/form/domain/OnlineForm.java b/flyfish-form/src/main/java/dev/flyfish/framework/form/domain/OnlineForm.java
similarity index 95%
rename from flyfish-form/src/main/java/com/flyfish/framework/form/domain/OnlineForm.java
rename to flyfish-form/src/main/java/dev/flyfish/framework/form/domain/OnlineForm.java
index 44d965b..9be6607 100644
--- a/flyfish-form/src/main/java/com/flyfish/framework/form/domain/OnlineForm.java
+++ b/flyfish-form/src/main/java/dev/flyfish/framework/form/domain/OnlineForm.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.form.domain;
+package dev.flyfish.framework.form.domain;
-import com.flyfish.framework.bean.ObjectMap;
-import com.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.bean.ObjectMap;
+import dev.flyfish.framework.domain.base.Domain;
import lombok.Data;
import org.springframework.data.mongodb.core.index.CompoundIndex;
import org.springframework.data.mongodb.core.mapping.Document;
diff --git a/flyfish-form/src/main/java/dev/flyfish/framework/form/repository/OnlineFormRepository.java b/flyfish-form/src/main/java/dev/flyfish/framework/form/repository/OnlineFormRepository.java
new file mode 100644
index 0000000..803354a
--- /dev/null
+++ b/flyfish-form/src/main/java/dev/flyfish/framework/form/repository/OnlineFormRepository.java
@@ -0,0 +1,10 @@
+package dev.flyfish.framework.form.repository;
+
+import dev.flyfish.framework.form.domain.OnlineForm;
+import dev.flyfish.framework.repository.DefaultReactiveRepository;
+
+/**
+ * 在线表单
+ */
+public interface OnlineFormRepository extends DefaultReactiveRepository {
+}
diff --git a/flyfish-form/src/main/java/com/flyfish/framework/form/service/OnlineFormService.java b/flyfish-form/src/main/java/dev/flyfish/framework/form/service/OnlineFormService.java
similarity index 53%
rename from flyfish-form/src/main/java/com/flyfish/framework/form/service/OnlineFormService.java
rename to flyfish-form/src/main/java/dev/flyfish/framework/form/service/OnlineFormService.java
index 132c70e..9c1f17e 100644
--- a/flyfish-form/src/main/java/com/flyfish/framework/form/service/OnlineFormService.java
+++ b/flyfish-form/src/main/java/dev/flyfish/framework/form/service/OnlineFormService.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.form.service;
+package dev.flyfish.framework.form.service;
-import com.flyfish.framework.form.domain.OnlineForm;
-import com.flyfish.framework.service.impl.BaseReactiveServiceImpl;
+import dev.flyfish.framework.form.domain.OnlineForm;
+import dev.flyfish.framework.service.impl.BaseReactiveServiceImpl;
import org.springframework.stereotype.Service;
/**
diff --git a/flyfish-form/src/test/java/com/flyfish/framework/form/package-info.java b/flyfish-form/src/test/java/com/flyfish/framework/form/package-info.java
deleted file mode 100644
index 71672f4..0000000
--- a/flyfish-form/src/test/java/com/flyfish/framework/form/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-package com.flyfish.framework.form;
diff --git a/flyfish-form/src/test/java/com/flyfish/framework/form/FlyfishFormTest.java b/flyfish-form/src/test/java/dev/flyfish/framework/form/FlyfishFormTest.java
similarity index 72%
rename from flyfish-form/src/test/java/com/flyfish/framework/form/FlyfishFormTest.java
rename to flyfish-form/src/test/java/dev/flyfish/framework/form/FlyfishFormTest.java
index 6738221..4dea274 100644
--- a/flyfish-form/src/test/java/com/flyfish/framework/form/FlyfishFormTest.java
+++ b/flyfish-form/src/test/java/dev/flyfish/framework/form/FlyfishFormTest.java
@@ -1,11 +1,11 @@
-package com.flyfish.framework.form;
+package dev.flyfish.framework.form;
-import com.flyfish.framework.bean.ObjectMap;
-import com.flyfish.framework.configuration.boot.FlyfishApplication;
-import com.flyfish.framework.form.domain.OnlineForm;
-import com.flyfish.framework.form.repository.OnlineFormRepository;
-import com.flyfish.framework.r2dbc.config.R2dbcDataConfig;
-import com.flyfish.framework.utils.JacksonUtil;
+import dev.flyfish.framework.bean.ObjectMap;
+import dev.flyfish.framework.configuration.boot.FlyfishApplication;
+import dev.flyfish.framework.form.domain.OnlineForm;
+import dev.flyfish.framework.form.repository.OnlineFormRepository;
+import dev.flyfish.framework.r2dbc.config.R2dbcDataConfig;
+import dev.flyfish.framework.utils.JacksonUtil;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.Test;
@@ -18,7 +18,7 @@ import java.util.Arrays;
@ExtendWith(SpringExtension.class)
@SpringBootTest(classes = FlyfishFormTest.class)
-@FlyfishApplication(scanBasePackages = "com.flyfish.framework")
+@FlyfishApplication(scanBasePackages = "dev.flyfish.framework")
@Import(R2dbcDataConfig.class)
@Slf4j
public class FlyfishFormTest {
diff --git a/flyfish-form/src/test/java/dev/flyfish/framework/form/package-info.java b/flyfish-form/src/test/java/dev/flyfish/framework/form/package-info.java
new file mode 100644
index 0000000..70278e4
--- /dev/null
+++ b/flyfish-form/src/test/java/dev/flyfish/framework/form/package-info.java
@@ -0,0 +1 @@
+package dev.flyfish.framework.form;
diff --git a/flyfish-logging/pom.xml b/flyfish-logging/pom.xml
index 9b59bf1..9fe9d33 100644
--- a/flyfish-logging/pom.xml
+++ b/flyfish-logging/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
flyfish-framework
- com.flyfish.framework
+ dev.flyfish.framework
${revision}
4.0.0
@@ -29,7 +29,7 @@
true
- com.flyfish.framework
+ dev.flyfish.framework
flyfish-web
${revision}
diff --git a/flyfish-logging/src/main/java/com/flyfish/framework/logging/controller/LogController.java b/flyfish-logging/src/main/java/com/flyfish/framework/logging/controller/LogController.java
deleted file mode 100644
index 01656be..0000000
--- a/flyfish-logging/src/main/java/com/flyfish/framework/logging/controller/LogController.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.flyfish.framework.logging.controller;
-
-import com.flyfish.framework.beans.annotations.RestMapping;
-import com.flyfish.framework.controller.reactive.ReactiveBaseController;
-import com.flyfish.framework.logging.domain.Log;
-import com.flyfish.framework.logging.domain.LogQo;
-
-/**
- * 日志controller
- *
- * @author wangyu
- */
-@RestMapping("logs")
-public class LogController extends ReactiveBaseController {
-
-}
diff --git a/flyfish-logging/src/main/java/com/flyfish/framework/logging/repository/LogRepository.java b/flyfish-logging/src/main/java/com/flyfish/framework/logging/repository/LogRepository.java
deleted file mode 100644
index 2d4ba23..0000000
--- a/flyfish-logging/src/main/java/com/flyfish/framework/logging/repository/LogRepository.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.flyfish.framework.logging.repository;
-
-import com.flyfish.framework.logging.domain.Log;
-import com.flyfish.framework.repository.DefaultReactiveRepository;
-
-/**
- * 日志仓库
- * @author wangyu
- */
-public interface LogRepository extends DefaultReactiveRepository {
-}
diff --git a/flyfish-logging/src/main/java/com/flyfish/framework/logging/advice/LogAdvice.java b/flyfish-logging/src/main/java/dev/flyfish/framework/logging/advice/LogAdvice.java
similarity index 92%
rename from flyfish-logging/src/main/java/com/flyfish/framework/logging/advice/LogAdvice.java
rename to flyfish-logging/src/main/java/dev/flyfish/framework/logging/advice/LogAdvice.java
index 1d3326d..41698a8 100644
--- a/flyfish-logging/src/main/java/com/flyfish/framework/logging/advice/LogAdvice.java
+++ b/flyfish-logging/src/main/java/dev/flyfish/framework/logging/advice/LogAdvice.java
@@ -1,8 +1,8 @@
-package com.flyfish.framework.logging.advice;
+package dev.flyfish.framework.logging.advice;
-import com.flyfish.framework.logging.service.LogContext;
-import com.flyfish.framework.logging.service.LogManager;
-import com.flyfish.framework.utils.UserUtils;
+import dev.flyfish.framework.logging.service.LogContext;
+import dev.flyfish.framework.logging.service.LogManager;
+import dev.flyfish.framework.utils.UserUtils;
import lombok.RequiredArgsConstructor;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
@@ -27,7 +27,7 @@ public class LogAdvice {
/**
* 切入注解
*/
- @Pointcut("execution(public * com.flyfish..*.*Controller.*(..))")
+ @Pointcut("execution(public * dev.flyfish..*.*Controller.*(..))")
public void pointCut() {
}
diff --git a/flyfish-logging/src/main/java/com/flyfish/framework/logging/annotation/EnableLogging.java b/flyfish-logging/src/main/java/dev/flyfish/framework/logging/annotation/EnableLogging.java
similarity index 71%
rename from flyfish-logging/src/main/java/com/flyfish/framework/logging/annotation/EnableLogging.java
rename to flyfish-logging/src/main/java/dev/flyfish/framework/logging/annotation/EnableLogging.java
index 586c26e..d2c650e 100644
--- a/flyfish-logging/src/main/java/com/flyfish/framework/logging/annotation/EnableLogging.java
+++ b/flyfish-logging/src/main/java/dev/flyfish/framework/logging/annotation/EnableLogging.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.logging.annotation;
+package dev.flyfish.framework.logging.annotation;
-import com.flyfish.framework.logging.config.LoggingConfig;
+import dev.flyfish.framework.logging.config.LoggingConfig;
import org.springframework.context.annotation.Import;
import java.lang.annotation.*;
diff --git a/flyfish-logging/src/main/java/com/flyfish/framework/logging/config/LoggingConfig.java b/flyfish-logging/src/main/java/dev/flyfish/framework/logging/config/LoggingConfig.java
similarity index 84%
rename from flyfish-logging/src/main/java/com/flyfish/framework/logging/config/LoggingConfig.java
rename to flyfish-logging/src/main/java/dev/flyfish/framework/logging/config/LoggingConfig.java
index 577b996..2ded1ad 100644
--- a/flyfish-logging/src/main/java/com/flyfish/framework/logging/config/LoggingConfig.java
+++ b/flyfish-logging/src/main/java/dev/flyfish/framework/logging/config/LoggingConfig.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.logging.config;
+package dev.flyfish.framework.logging.config;
-import com.flyfish.framework.logging.advice.LogAdvice;
-import com.flyfish.framework.logging.service.LogManager;
+import dev.flyfish.framework.logging.advice.LogAdvice;
+import dev.flyfish.framework.logging.service.LogManager;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.EnableAspectJAutoProxy;
diff --git a/flyfish-logging/src/main/java/com/flyfish/framework/logging/config/LoggingTextModifier.java b/flyfish-logging/src/main/java/dev/flyfish/framework/logging/config/LoggingTextModifier.java
similarity index 81%
rename from flyfish-logging/src/main/java/com/flyfish/framework/logging/config/LoggingTextModifier.java
rename to flyfish-logging/src/main/java/dev/flyfish/framework/logging/config/LoggingTextModifier.java
index 0dce351..3632fe4 100644
--- a/flyfish-logging/src/main/java/com/flyfish/framework/logging/config/LoggingTextModifier.java
+++ b/flyfish-logging/src/main/java/dev/flyfish/framework/logging/config/LoggingTextModifier.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.logging.config;
+package dev.flyfish.framework.logging.config;
import java.util.Map;
diff --git a/flyfish-logging/src/main/java/com/flyfish/framework/logging/config/LoggingTextRegistry.java b/flyfish-logging/src/main/java/dev/flyfish/framework/logging/config/LoggingTextRegistry.java
similarity index 95%
rename from flyfish-logging/src/main/java/com/flyfish/framework/logging/config/LoggingTextRegistry.java
rename to flyfish-logging/src/main/java/dev/flyfish/framework/logging/config/LoggingTextRegistry.java
index cefe2b5..13a7ee5 100644
--- a/flyfish-logging/src/main/java/com/flyfish/framework/logging/config/LoggingTextRegistry.java
+++ b/flyfish-logging/src/main/java/dev/flyfish/framework/logging/config/LoggingTextRegistry.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.logging.config;
+package dev.flyfish.framework.logging.config;
import org.springframework.beans.factory.InitializingBean;
diff --git a/flyfish-logging/src/main/java/dev/flyfish/framework/logging/controller/LogController.java b/flyfish-logging/src/main/java/dev/flyfish/framework/logging/controller/LogController.java
new file mode 100644
index 0000000..aa7feb5
--- /dev/null
+++ b/flyfish-logging/src/main/java/dev/flyfish/framework/logging/controller/LogController.java
@@ -0,0 +1,16 @@
+package dev.flyfish.framework.logging.controller;
+
+import dev.flyfish.framework.beans.annotations.RestMapping;
+import dev.flyfish.framework.controller.reactive.ReactiveBaseController;
+import dev.flyfish.framework.logging.domain.Log;
+import dev.flyfish.framework.logging.domain.LogQo;
+
+/**
+ * 日志controller
+ *
+ * @author wangyu
+ */
+@RestMapping("logs")
+public class LogController extends ReactiveBaseController {
+
+}
diff --git a/flyfish-logging/src/main/java/com/flyfish/framework/logging/domain/DomainDescriptions.java b/flyfish-logging/src/main/java/dev/flyfish/framework/logging/domain/DomainDescriptions.java
similarity index 72%
rename from flyfish-logging/src/main/java/com/flyfish/framework/logging/domain/DomainDescriptions.java
rename to flyfish-logging/src/main/java/dev/flyfish/framework/logging/domain/DomainDescriptions.java
index ef16aae..c924d8d 100644
--- a/flyfish-logging/src/main/java/com/flyfish/framework/logging/domain/DomainDescriptions.java
+++ b/flyfish-logging/src/main/java/dev/flyfish/framework/logging/domain/DomainDescriptions.java
@@ -1,10 +1,10 @@
-package com.flyfish.framework.logging.domain;
+package dev.flyfish.framework.logging.domain;
-import com.flyfish.framework.domain.base.Domain;
-import com.flyfish.framework.domain.po.Department;
-import com.flyfish.framework.domain.po.Permission;
-import com.flyfish.framework.domain.po.Role;
-import com.flyfish.framework.domain.po.User;
+import dev.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.domain.po.Department;
+import dev.flyfish.framework.domain.po.Permission;
+import dev.flyfish.framework.domain.po.Role;
+import dev.flyfish.framework.domain.po.User;
import lombok.AllArgsConstructor;
import lombok.Getter;
diff --git a/flyfish-logging/src/main/java/com/flyfish/framework/logging/domain/Log.java b/flyfish-logging/src/main/java/dev/flyfish/framework/logging/domain/Log.java
similarity index 91%
rename from flyfish-logging/src/main/java/com/flyfish/framework/logging/domain/Log.java
rename to flyfish-logging/src/main/java/dev/flyfish/framework/logging/domain/Log.java
index 491b5cb..3e5a0ba 100644
--- a/flyfish-logging/src/main/java/com/flyfish/framework/logging/domain/Log.java
+++ b/flyfish-logging/src/main/java/dev/flyfish/framework/logging/domain/Log.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.logging.domain;
+package dev.flyfish.framework.logging.domain;
-import com.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.domain.base.Domain;
import lombok.Data;
import org.springframework.data.mongodb.core.mapping.Document;
import org.springframework.data.relational.core.mapping.Column;
diff --git a/flyfish-logging/src/main/java/com/flyfish/framework/logging/domain/LogQo.java b/flyfish-logging/src/main/java/dev/flyfish/framework/logging/domain/LogQo.java
similarity index 85%
rename from flyfish-logging/src/main/java/com/flyfish/framework/logging/domain/LogQo.java
rename to flyfish-logging/src/main/java/dev/flyfish/framework/logging/domain/LogQo.java
index c42d9fb..e83c7e2 100644
--- a/flyfish-logging/src/main/java/com/flyfish/framework/logging/domain/LogQo.java
+++ b/flyfish-logging/src/main/java/dev/flyfish/framework/logging/domain/LogQo.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.logging.domain;
+package dev.flyfish.framework.logging.domain;
-import com.flyfish.framework.domain.base.NameLikeQo;
-import com.flyfish.framework.query.QueryDefinition;
+import dev.flyfish.framework.domain.base.NameLikeQo;
+import dev.flyfish.framework.query.QueryDefinition;
import lombok.Getter;
import lombok.Setter;
import org.springframework.data.domain.Sort;
diff --git a/flyfish-logging/src/main/java/com/flyfish/framework/logging/domain/LogType.java b/flyfish-logging/src/main/java/dev/flyfish/framework/logging/domain/LogType.java
similarity index 70%
rename from flyfish-logging/src/main/java/com/flyfish/framework/logging/domain/LogType.java
rename to flyfish-logging/src/main/java/dev/flyfish/framework/logging/domain/LogType.java
index 937a4d0..5e99de8 100644
--- a/flyfish-logging/src/main/java/com/flyfish/framework/logging/domain/LogType.java
+++ b/flyfish-logging/src/main/java/dev/flyfish/framework/logging/domain/LogType.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.logging.domain;
+package dev.flyfish.framework.logging.domain;
-import com.flyfish.framework.enums.NamedEnum;
+import dev.flyfish.framework.enums.NamedEnum;
import lombok.AllArgsConstructor;
import lombok.Getter;
diff --git a/flyfish-logging/src/main/java/dev/flyfish/framework/logging/repository/LogRepository.java b/flyfish-logging/src/main/java/dev/flyfish/framework/logging/repository/LogRepository.java
new file mode 100644
index 0000000..d35d2c3
--- /dev/null
+++ b/flyfish-logging/src/main/java/dev/flyfish/framework/logging/repository/LogRepository.java
@@ -0,0 +1,11 @@
+package dev.flyfish.framework.logging.repository;
+
+import dev.flyfish.framework.logging.domain.Log;
+import dev.flyfish.framework.repository.DefaultReactiveRepository;
+
+/**
+ * 日志仓库
+ * @author wangyu
+ */
+public interface LogRepository extends DefaultReactiveRepository {
+}
diff --git a/flyfish-logging/src/main/java/com/flyfish/framework/logging/service/LogContext.java b/flyfish-logging/src/main/java/dev/flyfish/framework/logging/service/LogContext.java
similarity index 91%
rename from flyfish-logging/src/main/java/com/flyfish/framework/logging/service/LogContext.java
rename to flyfish-logging/src/main/java/dev/flyfish/framework/logging/service/LogContext.java
index 6045849..c54e45a 100644
--- a/flyfish-logging/src/main/java/com/flyfish/framework/logging/service/LogContext.java
+++ b/flyfish-logging/src/main/java/dev/flyfish/framework/logging/service/LogContext.java
@@ -1,11 +1,11 @@
-package com.flyfish.framework.logging.service;
+package dev.flyfish.framework.logging.service;
-import com.flyfish.framework.annotations.Operation;
-import com.flyfish.framework.beans.meta.RestBean;
-import com.flyfish.framework.context.UserContext;
-import com.flyfish.framework.domain.base.Domain;
-import com.flyfish.framework.logging.domain.DomainDescriptions;
-import com.flyfish.framework.utils.ReflectionUtils;
+import dev.flyfish.framework.annotations.Operation;
+import dev.flyfish.framework.beans.meta.RestBean;
+import dev.flyfish.framework.context.UserContext;
+import dev.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.logging.domain.DomainDescriptions;
+import dev.flyfish.framework.utils.ReflectionUtils;
import lombok.AccessLevel;
import lombok.Data;
import lombok.Setter;
diff --git a/flyfish-logging/src/main/java/com/flyfish/framework/logging/service/LogManager.java b/flyfish-logging/src/main/java/dev/flyfish/framework/logging/service/LogManager.java
similarity index 88%
rename from flyfish-logging/src/main/java/com/flyfish/framework/logging/service/LogManager.java
rename to flyfish-logging/src/main/java/dev/flyfish/framework/logging/service/LogManager.java
index 2aad6a7..cbbc157 100644
--- a/flyfish-logging/src/main/java/com/flyfish/framework/logging/service/LogManager.java
+++ b/flyfish-logging/src/main/java/dev/flyfish/framework/logging/service/LogManager.java
@@ -1,10 +1,10 @@
-package com.flyfish.framework.logging.service;
+package dev.flyfish.framework.logging.service;
-import com.flyfish.framework.context.DateContext;
-import com.flyfish.framework.logging.config.LoggingTextRegistry;
-import com.flyfish.framework.logging.domain.Log;
-import com.flyfish.framework.logging.domain.LogType;
-import com.flyfish.framework.utils.JacksonUtil;
+import dev.flyfish.framework.context.DateContext;
+import dev.flyfish.framework.logging.config.LoggingTextRegistry;
+import dev.flyfish.framework.logging.domain.Log;
+import dev.flyfish.framework.logging.domain.LogType;
+import dev.flyfish.framework.utils.JacksonUtil;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ArrayUtils;
diff --git a/flyfish-logging/src/main/java/com/flyfish/framework/logging/service/LogService.java b/flyfish-logging/src/main/java/dev/flyfish/framework/logging/service/LogService.java
similarity index 51%
rename from flyfish-logging/src/main/java/com/flyfish/framework/logging/service/LogService.java
rename to flyfish-logging/src/main/java/dev/flyfish/framework/logging/service/LogService.java
index a321be7..a17ec1e 100644
--- a/flyfish-logging/src/main/java/com/flyfish/framework/logging/service/LogService.java
+++ b/flyfish-logging/src/main/java/dev/flyfish/framework/logging/service/LogService.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.logging.service;
+package dev.flyfish.framework.logging.service;
-import com.flyfish.framework.logging.domain.Log;
-import com.flyfish.framework.service.impl.BaseReactiveServiceImpl;
+import dev.flyfish.framework.logging.domain.Log;
+import dev.flyfish.framework.service.impl.BaseReactiveServiceImpl;
import org.springframework.stereotype.Service;
/**
diff --git a/flyfish-logging/src/main/java/com/flyfish/framework/logging/service/SimpleAuthenticationLogger.java b/flyfish-logging/src/main/java/dev/flyfish/framework/logging/service/SimpleAuthenticationLogger.java
similarity index 86%
rename from flyfish-logging/src/main/java/com/flyfish/framework/logging/service/SimpleAuthenticationLogger.java
rename to flyfish-logging/src/main/java/dev/flyfish/framework/logging/service/SimpleAuthenticationLogger.java
index e2daa51..c81bd64 100644
--- a/flyfish-logging/src/main/java/com/flyfish/framework/logging/service/SimpleAuthenticationLogger.java
+++ b/flyfish-logging/src/main/java/dev/flyfish/framework/logging/service/SimpleAuthenticationLogger.java
@@ -1,13 +1,13 @@
-package com.flyfish.framework.logging.service;
+package dev.flyfish.framework.logging.service;
-import com.flyfish.framework.domain.base.Domain;
-import com.flyfish.framework.domain.po.User;
-import com.flyfish.framework.logging.config.LoggingTextRegistry;
-import com.flyfish.framework.logging.domain.Log;
-import com.flyfish.framework.logging.domain.LogType;
-import com.flyfish.framework.service.AuthenticationLogger;
-import com.flyfish.framework.utils.AuthenticationMessages;
-import com.flyfish.framework.utils.UserUtils;
+import dev.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.domain.po.User;
+import dev.flyfish.framework.logging.config.LoggingTextRegistry;
+import dev.flyfish.framework.logging.domain.Log;
+import dev.flyfish.framework.logging.domain.LogType;
+import dev.flyfish.framework.service.AuthenticationLogger;
+import dev.flyfish.framework.utils.AuthenticationMessages;
+import dev.flyfish.framework.utils.UserUtils;
import org.springframework.security.core.AuthenticationException;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.stereotype.Service;
diff --git a/flyfish-user/pom.xml b/flyfish-user/pom.xml
index f7f7c35..b2421d2 100644
--- a/flyfish-user/pom.xml
+++ b/flyfish-user/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
flyfish-framework
- com.flyfish.framework
+ dev.flyfish.framework
${revision}
4.0.0
@@ -29,11 +29,11 @@
true
- com.flyfish.framework
+ dev.flyfish.framework
flyfish-data-common
- com.flyfish.framework
+ dev.flyfish.framework
flyfish-web
${revision}
@@ -42,7 +42,7 @@
spring-boot-starter-captcha
- com.flyfish.framework
+ dev.flyfish.framework
flyfish-data-r2dbc
${revision}
test
diff --git a/flyfish-user/src/main/java/com/flyfish/framework/user/repository/DepartmentRepository.java b/flyfish-user/src/main/java/com/flyfish/framework/user/repository/DepartmentRepository.java
deleted file mode 100644
index 6b655d6..0000000
--- a/flyfish-user/src/main/java/com/flyfish/framework/user/repository/DepartmentRepository.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.flyfish.framework.user.repository;
-
-import com.flyfish.framework.domain.po.Department;
-import com.flyfish.framework.repository.DefaultReactiveRepository;
-
-/**
- * 部门仓库
- *
- * @author wybab
- */
-public interface DepartmentRepository extends DefaultReactiveRepository {
-}
diff --git a/flyfish-user/src/main/java/com/flyfish/framework/user/repository/PermissionRepository.java b/flyfish-user/src/main/java/com/flyfish/framework/user/repository/PermissionRepository.java
deleted file mode 100644
index 6ee7b90..0000000
--- a/flyfish-user/src/main/java/com/flyfish/framework/user/repository/PermissionRepository.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.flyfish.framework.user.repository;
-
-
-import com.flyfish.framework.domain.po.Permission;
-import com.flyfish.framework.repository.DefaultReactiveRepository;
-
-/**
- * 权限仓库
- *
- * @author wybab
- */
-public interface PermissionRepository extends DefaultReactiveRepository {
-}
diff --git a/flyfish-user/src/main/java/com/flyfish/framework/user/repository/RoleRepository.java b/flyfish-user/src/main/java/com/flyfish/framework/user/repository/RoleRepository.java
deleted file mode 100644
index c4042e6..0000000
--- a/flyfish-user/src/main/java/com/flyfish/framework/user/repository/RoleRepository.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.flyfish.framework.user.repository;
-
-import com.flyfish.framework.domain.po.Role;
-import com.flyfish.framework.repository.DefaultReactiveRepository;
-
-/**
- * 角色仓库
- *
- * @author wybab
- */
-public interface RoleRepository extends DefaultReactiveRepository {
-}
diff --git a/flyfish-user/src/main/java/com/flyfish/framework/user/annotations/.gitkeep b/flyfish-user/src/main/java/dev/flyfish/framework/user/annotations/.gitkeep
similarity index 100%
rename from flyfish-user/src/main/java/com/flyfish/framework/user/annotations/.gitkeep
rename to flyfish-user/src/main/java/dev/flyfish/framework/user/annotations/.gitkeep
diff --git a/flyfish-user/src/main/java/com/flyfish/framework/user/annotations/EnableAutoSecurity.java b/flyfish-user/src/main/java/dev/flyfish/framework/user/annotations/EnableAutoSecurity.java
similarity index 65%
rename from flyfish-user/src/main/java/com/flyfish/framework/user/annotations/EnableAutoSecurity.java
rename to flyfish-user/src/main/java/dev/flyfish/framework/user/annotations/EnableAutoSecurity.java
index a8d0f45..2465124 100644
--- a/flyfish-user/src/main/java/com/flyfish/framework/user/annotations/EnableAutoSecurity.java
+++ b/flyfish-user/src/main/java/dev/flyfish/framework/user/annotations/EnableAutoSecurity.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.user.annotations;
+package dev.flyfish.framework.user.annotations;
-import com.flyfish.framework.user.config.WebSecurityConfig;
-import com.flyfish.framework.configuration.redis.EnableReactiveRedis;
+import dev.flyfish.framework.user.config.WebSecurityConfig;
+import dev.flyfish.framework.configuration.redis.EnableReactiveRedis;
import org.springframework.context.annotation.Import;
import java.lang.annotation.*;
diff --git a/flyfish-user/src/main/java/com/flyfish/framework/user/config/AuthenticationAuditorImpl.java b/flyfish-user/src/main/java/dev/flyfish/framework/user/config/AuthenticationAuditorImpl.java
similarity index 87%
rename from flyfish-user/src/main/java/com/flyfish/framework/user/config/AuthenticationAuditorImpl.java
rename to flyfish-user/src/main/java/dev/flyfish/framework/user/config/AuthenticationAuditorImpl.java
index 2e9f87a..b261f7f 100644
--- a/flyfish-user/src/main/java/com/flyfish/framework/user/config/AuthenticationAuditorImpl.java
+++ b/flyfish-user/src/main/java/dev/flyfish/framework/user/config/AuthenticationAuditorImpl.java
@@ -1,12 +1,12 @@
-package com.flyfish.framework.user.config;
+package dev.flyfish.framework.user.config;
-import com.flyfish.framework.user.domain.AdminUserDetails;
-import com.flyfish.framework.domain.po.User;
-import com.flyfish.framework.enums.UserStatus;
-import com.flyfish.framework.service.AuthenticationAuditor;
-import com.flyfish.framework.service.AuthenticationLogger;
-import com.flyfish.framework.user.service.UserService;
-import com.flyfish.framework.transform.ResultDataTransformer;
+import dev.flyfish.framework.user.domain.AdminUserDetails;
+import dev.flyfish.framework.domain.po.User;
+import dev.flyfish.framework.enums.UserStatus;
+import dev.flyfish.framework.service.AuthenticationAuditor;
+import dev.flyfish.framework.service.AuthenticationLogger;
+import dev.flyfish.framework.user.service.UserService;
+import dev.flyfish.framework.transform.ResultDataTransformer;
import org.springframework.security.authentication.BadCredentialsException;
import org.springframework.security.core.AuthenticationException;
import org.springframework.security.core.userdetails.UserDetails;
diff --git a/flyfish-user/src/main/java/com/flyfish/framework/user/config/RSAKeys.java b/flyfish-user/src/main/java/dev/flyfish/framework/user/config/RSAKeys.java
similarity index 96%
rename from flyfish-user/src/main/java/com/flyfish/framework/user/config/RSAKeys.java
rename to flyfish-user/src/main/java/dev/flyfish/framework/user/config/RSAKeys.java
index 6d5d94d..0ef832d 100644
--- a/flyfish-user/src/main/java/com/flyfish/framework/user/config/RSAKeys.java
+++ b/flyfish-user/src/main/java/dev/flyfish/framework/user/config/RSAKeys.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.user.config;
+package dev.flyfish.framework.user.config;
/**
* rsa密钥，使用PKCS8的私钥格式
diff --git a/flyfish-user/src/main/java/com/flyfish/framework/user/config/WebSecurityConfig.java b/flyfish-user/src/main/java/dev/flyfish/framework/user/config/WebSecurityConfig.java
similarity index 90%
rename from flyfish-user/src/main/java/com/flyfish/framework/user/config/WebSecurityConfig.java
rename to flyfish-user/src/main/java/dev/flyfish/framework/user/config/WebSecurityConfig.java
index 5d143fc..460276b 100644
--- a/flyfish-user/src/main/java/com/flyfish/framework/user/config/WebSecurityConfig.java
+++ b/flyfish-user/src/main/java/dev/flyfish/framework/user/config/WebSecurityConfig.java
@@ -1,26 +1,26 @@
-package com.flyfish.framework.user.config;
+package dev.flyfish.framework.user.config;
import com.anji.captcha.config.AjCaptchaAutoConfiguration;
import com.anji.captcha.config.AjCaptchaServiceAutoConfiguration;
import com.anji.captcha.config.AjCaptchaStorageAutoConfiguration;
import com.anji.captcha.properties.AjCaptchaProperties;
-import com.flyfish.framework.configuration.jwt.JwtProperties;
-import com.flyfish.framework.configuration.jwt.JwtSecurityContextRepository;
-import com.flyfish.framework.configuration.jwt.TokenProvider;
-import com.flyfish.framework.domain.po.User;
-import com.flyfish.framework.enums.UserStatus;
-import com.flyfish.framework.enums.UserType;
-import com.flyfish.framework.handler.JsonAuthenticationFailureHandler;
-import com.flyfish.framework.handler.JsonAuthenticationSuccessHandler;
-import com.flyfish.framework.handler.JsonLogoutSuccessHandler;
-import com.flyfish.framework.service.AuthenticationAuditor;
-import com.flyfish.framework.service.AuthenticationLogger;
-import com.flyfish.framework.user.config.captcha.CaptchaValidator;
-import com.flyfish.framework.user.config.converter.EncryptedAuthenticationConverter;
-import com.flyfish.framework.user.config.properties.SecurityProperties;
-import com.flyfish.framework.user.domain.UserQo;
-import com.flyfish.framework.user.initializer.UserInitializer;
-import com.flyfish.framework.user.service.UserService;
+import dev.flyfish.framework.configuration.jwt.JwtProperties;
+import dev.flyfish.framework.configuration.jwt.JwtSecurityContextRepository;
+import dev.flyfish.framework.configuration.jwt.TokenProvider;
+import dev.flyfish.framework.domain.po.User;
+import dev.flyfish.framework.enums.UserStatus;
+import dev.flyfish.framework.enums.UserType;
+import dev.flyfish.framework.handler.JsonAuthenticationFailureHandler;
+import dev.flyfish.framework.handler.JsonAuthenticationSuccessHandler;
+import dev.flyfish.framework.handler.JsonLogoutSuccessHandler;
+import dev.flyfish.framework.service.AuthenticationAuditor;
+import dev.flyfish.framework.service.AuthenticationLogger;
+import dev.flyfish.framework.user.config.captcha.CaptchaValidator;
+import dev.flyfish.framework.user.config.converter.EncryptedAuthenticationConverter;
+import dev.flyfish.framework.user.config.properties.SecurityProperties;
+import dev.flyfish.framework.user.domain.UserQo;
+import dev.flyfish.framework.user.initializer.UserInitializer;
+import dev.flyfish.framework.user.service.UserService;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
diff --git a/flyfish-user/src/main/java/com/flyfish/framework/user/config/audit/ReactiveUserAuditor.java b/flyfish-user/src/main/java/dev/flyfish/framework/user/config/audit/ReactiveUserAuditor.java
similarity index 87%
rename from flyfish-user/src/main/java/com/flyfish/framework/user/config/audit/ReactiveUserAuditor.java
rename to flyfish-user/src/main/java/dev/flyfish/framework/user/config/audit/ReactiveUserAuditor.java
index 2f25720..a6bd81f 100644
--- a/flyfish-user/src/main/java/com/flyfish/framework/user/config/audit/ReactiveUserAuditor.java
+++ b/flyfish-user/src/main/java/dev/flyfish/framework/user/config/audit/ReactiveUserAuditor.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.user.config.audit;
+package dev.flyfish.framework.user.config.audit;
-import com.flyfish.framework.utils.UserUtils;
+import dev.flyfish.framework.utils.UserUtils;
import org.springframework.data.domain.ReactiveAuditorAware;
import org.springframework.lang.NonNull;
import org.springframework.security.core.context.ReactiveSecurityContextHolder;
diff --git a/flyfish-user/src/main/java/com/flyfish/framework/user/config/audit/RoleBeanPoster.java b/flyfish-user/src/main/java/dev/flyfish/framework/user/config/audit/RoleBeanPoster.java
similarity index 72%
rename from flyfish-user/src/main/java/com/flyfish/framework/user/config/audit/RoleBeanPoster.java
rename to flyfish-user/src/main/java/dev/flyfish/framework/user/config/audit/RoleBeanPoster.java
index 960fabe..0d5af1f 100644
--- a/flyfish-user/src/main/java/com/flyfish/framework/user/config/audit/RoleBeanPoster.java
+++ b/flyfish-user/src/main/java/dev/flyfish/framework/user/config/audit/RoleBeanPoster.java
@@ -1,9 +1,9 @@
-package com.flyfish.framework.user.config.audit;
+package dev.flyfish.framework.user.config.audit;
-import com.flyfish.framework.auditor.ReactiveBeanPoster;
-import com.flyfish.framework.domain.po.Role;
-import com.flyfish.framework.user.service.UserDetailsConverter;
-import com.flyfish.framework.utils.ReactiveRedisOperations;
+import dev.flyfish.framework.auditor.ReactiveBeanPoster;
+import dev.flyfish.framework.domain.po.Role;
+import dev.flyfish.framework.user.service.UserDetailsConverter;
+import dev.flyfish.framework.utils.ReactiveRedisOperations;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Component;
import reactor.core.publisher.Mono;
diff --git a/flyfish-user/src/main/java/com/flyfish/framework/user/config/audit/UserAuditor.java b/flyfish-user/src/main/java/dev/flyfish/framework/user/config/audit/UserAuditor.java
similarity index 81%
rename from flyfish-user/src/main/java/com/flyfish/framework/user/config/audit/UserAuditor.java
rename to flyfish-user/src/main/java/dev/flyfish/framework/user/config/audit/UserAuditor.java
index 9e4ad77..da1622e 100644
--- a/flyfish-user/src/main/java/com/flyfish/framework/user/config/audit/UserAuditor.java
+++ b/flyfish-user/src/main/java/dev/flyfish/framework/user/config/audit/UserAuditor.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.user.config.audit;
+package dev.flyfish.framework.user.config.audit;
-import com.flyfish.framework.context.UserContext;
-import com.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.context.UserContext;
+import dev.flyfish.framework.domain.base.Domain;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.AuditorAware;
import org.springframework.stereotype.Component;
diff --git a/flyfish-user/src/main/java/com/flyfish/framework/user/config/audit/UserBeanAuditor.java b/flyfish-user/src/main/java/dev/flyfish/framework/user/config/audit/UserBeanAuditor.java
similarity index 77%
rename from flyfish-user/src/main/java/com/flyfish/framework/user/config/audit/UserBeanAuditor.java
rename to flyfish-user/src/main/java/dev/flyfish/framework/user/config/audit/UserBeanAuditor.java
index e17a327..32a8759 100644
--- a/flyfish-user/src/main/java/com/flyfish/framework/user/config/audit/UserBeanAuditor.java
+++ b/flyfish-user/src/main/java/dev/flyfish/framework/user/config/audit/UserBeanAuditor.java
@@ -1,14 +1,14 @@
-package com.flyfish.framework.user.config.audit;
+package dev.flyfish.framework.user.config.audit;
-import com.flyfish.framework.auditor.ReactiveBeanAuditor;
-import com.flyfish.framework.auditor.ReactiveBeanPoster;
-import com.flyfish.framework.user.service.UserDetailsConverter;
-import com.flyfish.framework.user.utils.StrengthUtils;
-import com.flyfish.framework.user.config.constants.UserCacheKeys;
-import com.flyfish.framework.domain.po.User;
-import com.flyfish.framework.enums.UserType;
-import com.flyfish.framework.utils.Assert;
-import com.flyfish.framework.utils.ReactiveRedisOperations;
+import dev.flyfish.framework.auditor.ReactiveBeanAuditor;
+import dev.flyfish.framework.auditor.ReactiveBeanPoster;
+import dev.flyfish.framework.user.service.UserDetailsConverter;
+import dev.flyfish.framework.user.utils.StrengthUtils;
+import dev.flyfish.framework.user.config.constants.UserCacheKeys;
+import dev.flyfish.framework.domain.po.User;
+import dev.flyfish.framework.enums.UserType;
+import dev.flyfish.framework.utils.Assert;
+import dev.flyfish.framework.utils.ReactiveRedisOperations;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springframework.security.crypto.password.PasswordEncoder;
diff --git a/flyfish-user/src/main/java/com/flyfish/framework/user/config/captcha/AnjiCaptchaValidator.java b/flyfish-user/src/main/java/dev/flyfish/framework/user/config/captcha/AnjiCaptchaValidator.java
similarity index 85%
rename from flyfish-user/src/main/java/com/flyfish/framework/user/config/captcha/AnjiCaptchaValidator.java
rename to flyfish-user/src/main/java/dev/flyfish/framework/user/config/captcha/AnjiCaptchaValidator.java
index 5a1eea8..db45f20 100644
--- a/flyfish-user/src/main/java/com/flyfish/framework/user/config/captcha/AnjiCaptchaValidator.java
+++ b/flyfish-user/src/main/java/dev/flyfish/framework/user/config/captcha/AnjiCaptchaValidator.java
@@ -1,10 +1,10 @@
-package com.flyfish.framework.user.config.captcha;
+package dev.flyfish.framework.user.config.captcha;
import com.anji.captcha.model.common.ResponseModel;
import com.anji.captcha.model.vo.CaptchaVO;
import com.anji.captcha.service.CaptchaService;
-import com.flyfish.framework.user.config.properties.SecurityProperties;
-import com.flyfish.framework.utils.Assert;
+import dev.flyfish.framework.user.config.properties.SecurityProperties;
+import dev.flyfish.framework.utils.Assert;
import lombok.RequiredArgsConstructor;
@RequiredArgsConstructor
diff --git a/flyfish-user/src/main/java/com/flyfish/framework/user/config/captcha/CaptchaValidator.java b/flyfish-user/src/main/java/dev/flyfish/framework/user/config/captcha/CaptchaValidator.java
similarity index 81%
rename from flyfish-user/src/main/java/com/flyfish/framework/user/config/captcha/CaptchaValidator.java
rename to flyfish-user/src/main/java/dev/flyfish/framework/user/config/captcha/CaptchaValidator.java
index 11eb493..6244782 100644
--- a/flyfish-user/src/main/java/com/flyfish/framework/user/config/captcha/CaptchaValidator.java
+++ b/flyfish-user/src/main/java/dev/flyfish/framework/user/config/captcha/CaptchaValidator.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.user.config.captcha;
+package dev.flyfish.framework.user.config.captcha;
/**
* 验证码验证器
diff --git a/flyfish-user/src/main/java/com/flyfish/framework/user/config/constants/UserCacheKeys.java b/flyfish-user/src/main/java/dev/flyfish/framework/user/config/constants/UserCacheKeys.java
similarity index 80%
rename from flyfish-user/src/main/java/com/flyfish/framework/user/config/constants/UserCacheKeys.java
rename to flyfish-user/src/main/java/dev/flyfish/framework/user/config/constants/UserCacheKeys.java
index 4eae820..fd68fe9 100644
--- a/flyfish-user/src/main/java/com/flyfish/framework/user/config/constants/UserCacheKeys.java
+++ b/flyfish-user/src/main/java/dev/flyfish/framework/user/config/constants/UserCacheKeys.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.user.config.constants;
+package dev.flyfish.framework.user.config.constants;
public interface UserCacheKeys {
diff --git a/flyfish-user/src/main/java/com/flyfish/framework/user/config/converter/EncryptedAuthenticationConverter.java b/flyfish-user/src/main/java/dev/flyfish/framework/user/config/converter/EncryptedAuthenticationConverter.java
similarity index 90%
rename from flyfish-user/src/main/java/com/flyfish/framework/user/config/converter/EncryptedAuthenticationConverter.java
rename to flyfish-user/src/main/java/dev/flyfish/framework/user/config/converter/EncryptedAuthenticationConverter.java
index 65a2bf0..09e8bb8 100644
--- a/flyfish-user/src/main/java/com/flyfish/framework/user/config/converter/EncryptedAuthenticationConverter.java
+++ b/flyfish-user/src/main/java/dev/flyfish/framework/user/config/converter/EncryptedAuthenticationConverter.java
@@ -1,9 +1,9 @@
-package com.flyfish.framework.user.config.converter;
+package dev.flyfish.framework.user.config.converter;
-import com.flyfish.framework.user.config.RSAKeys;
-import com.flyfish.framework.user.config.captcha.CaptchaValidator;
-import com.flyfish.framework.user.config.properties.SecurityProperties;
-import com.flyfish.framework.user.utils.RSAUtils;
+import dev.flyfish.framework.user.config.RSAKeys;
+import dev.flyfish.framework.user.config.captcha.CaptchaValidator;
+import dev.flyfish.framework.user.config.properties.SecurityProperties;
+import dev.flyfish.framework.user.utils.RSAUtils;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import lombok.val;
diff --git a/flyfish-user/src/main/java/com/flyfish/framework/user/config/properties/SecurityProperties.java b/flyfish-user/src/main/java/dev/flyfish/framework/user/config/properties/SecurityProperties.java
similarity index 92%
rename from flyfish-user/src/main/java/com/flyfish/framework/user/config/properties/SecurityProperties.java
rename to flyfish-user/src/main/java/dev/flyfish/framework/user/config/properties/SecurityProperties.java
index b808692..56048f6 100644
--- a/flyfish-user/src/main/java/com/flyfish/framework/user/config/properties/SecurityProperties.java
+++ b/flyfish-user/src/main/java/dev/flyfish/framework/user/config/properties/SecurityProperties.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.user.config.properties;
+package dev.flyfish.framework.user.config.properties;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
diff --git a/flyfish-user/src/main/java/com/flyfish/framework/user/controller/CaptchaController.java b/flyfish-user/src/main/java/dev/flyfish/framework/user/controller/CaptchaController.java
similarity index 97%
rename from flyfish-user/src/main/java/com/flyfish/framework/user/controller/CaptchaController.java
rename to flyfish-user/src/main/java/dev/flyfish/framework/user/controller/CaptchaController.java
index e5a4df0..b2848e2 100644
--- a/flyfish-user/src/main/java/com/flyfish/framework/user/controller/CaptchaController.java
+++ b/flyfish-user/src/main/java/dev/flyfish/framework/user/controller/CaptchaController.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.user.controller;
+package dev.flyfish.framework.user.controller;
import com.anji.captcha.model.common.ResponseModel;
import com.anji.captcha.model.vo.CaptchaVO;
diff --git a/flyfish-user/src/main/java/com/flyfish/framework/user/controller/DepartmentController.java b/flyfish-user/src/main/java/dev/flyfish/framework/user/controller/DepartmentController.java
similarity index 80%
rename from flyfish-user/src/main/java/com/flyfish/framework/user/controller/DepartmentController.java
rename to flyfish-user/src/main/java/dev/flyfish/framework/user/controller/DepartmentController.java
index d8ce182..c20531b 100644
--- a/flyfish-user/src/main/java/com/flyfish/framework/user/controller/DepartmentController.java
+++ b/flyfish-user/src/main/java/dev/flyfish/framework/user/controller/DepartmentController.java
@@ -1,14 +1,14 @@
-package com.flyfish.framework.user.controller;
+package dev.flyfish.framework.user.controller;
-import com.flyfish.framework.bean.Result;
-import com.flyfish.framework.controller.reactive.ReactiveTreeController;
-import com.flyfish.framework.user.service.DepartmentService;
-import com.flyfish.framework.user.domain.AdminUserDetails;
-import com.flyfish.framework.user.domain.DepartmentQo;
-import com.flyfish.framework.domain.po.Department;
-import com.flyfish.framework.enums.UserType;
-import com.flyfish.framework.utils.DepartUtils;
-import com.flyfish.framework.utils.UserUtils;
+import dev.flyfish.framework.bean.Result;
+import dev.flyfish.framework.controller.reactive.ReactiveTreeController;
+import dev.flyfish.framework.user.service.DepartmentService;
+import dev.flyfish.framework.user.domain.AdminUserDetails;
+import dev.flyfish.framework.user.domain.DepartmentQo;
+import dev.flyfish.framework.domain.po.Department;
+import dev.flyfish.framework.enums.UserType;
+import dev.flyfish.framework.utils.DepartUtils;
+import dev.flyfish.framework.utils.UserUtils;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.security.core.context.ReactiveSecurityContextHolder;
import org.springframework.web.bind.annotation.GetMapping;
diff --git a/flyfish-user/src/main/java/com/flyfish/framework/user/controller/LoginController.java b/flyfish-user/src/main/java/dev/flyfish/framework/user/controller/LoginController.java
similarity index 84%
rename from flyfish-user/src/main/java/com/flyfish/framework/user/controller/LoginController.java
rename to flyfish-user/src/main/java/dev/flyfish/framework/user/controller/LoginController.java
index aa4ee59..fd92aaa 100644
--- a/flyfish-user/src/main/java/com/flyfish/framework/user/controller/LoginController.java
+++ b/flyfish-user/src/main/java/dev/flyfish/framework/user/controller/LoginController.java
@@ -1,9 +1,9 @@
-package com.flyfish.framework.user.controller;
+package dev.flyfish.framework.user.controller;
-import com.flyfish.framework.bean.Result;
-import com.flyfish.framework.user.config.RSAKeys;
-import com.flyfish.framework.user.config.properties.SecurityProperties;
-import com.flyfish.framework.configuration.jwt.TokenProvider;
+import dev.flyfish.framework.bean.Result;
+import dev.flyfish.framework.user.config.RSAKeys;
+import dev.flyfish.framework.user.config.properties.SecurityProperties;
+import dev.flyfish.framework.configuration.jwt.TokenProvider;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.ReactiveSecurityContextHolder;
import org.springframework.web.bind.annotation.*;
diff --git a/flyfish-user/src/main/java/com/flyfish/framework/user/controller/PermissionController.java b/flyfish-user/src/main/java/dev/flyfish/framework/user/controller/PermissionController.java
similarity index 60%
rename from flyfish-user/src/main/java/com/flyfish/framework/user/controller/PermissionController.java
rename to flyfish-user/src/main/java/dev/flyfish/framework/user/controller/PermissionController.java
index 6985e32..df9b7fa 100644
--- a/flyfish-user/src/main/java/com/flyfish/framework/user/controller/PermissionController.java
+++ b/flyfish-user/src/main/java/dev/flyfish/framework/user/controller/PermissionController.java
@@ -1,8 +1,8 @@
-package com.flyfish.framework.user.controller;
+package dev.flyfish.framework.user.controller;
-import com.flyfish.framework.controller.reactive.ReactiveTreeController;
-import com.flyfish.framework.user.domain.PermissionQo;
-import com.flyfish.framework.domain.po.Permission;
+import dev.flyfish.framework.controller.reactive.ReactiveTreeController;
+import dev.flyfish.framework.user.domain.PermissionQo;
+import dev.flyfish.framework.domain.po.Permission;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
diff --git a/flyfish-user/src/main/java/com/flyfish/framework/user/controller/RoleController.java b/flyfish-user/src/main/java/dev/flyfish/framework/user/controller/RoleController.java
similarity index 59%
rename from flyfish-user/src/main/java/com/flyfish/framework/user/controller/RoleController.java
rename to flyfish-user/src/main/java/dev/flyfish/framework/user/controller/RoleController.java
index b094f5c..70d0a50 100644
--- a/flyfish-user/src/main/java/com/flyfish/framework/user/controller/RoleController.java
+++ b/flyfish-user/src/main/java/dev/flyfish/framework/user/controller/RoleController.java
@@ -1,8 +1,8 @@
-package com.flyfish.framework.user.controller;
+package dev.flyfish.framework.user.controller;
-import com.flyfish.framework.controller.reactive.ReactiveBaseController;
-import com.flyfish.framework.user.domain.RoleQo;
-import com.flyfish.framework.domain.po.Role;
+import dev.flyfish.framework.controller.reactive.ReactiveBaseController;
+import dev.flyfish.framework.user.domain.RoleQo;
+import dev.flyfish.framework.domain.po.Role;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
diff --git a/flyfish-user/src/main/java/com/flyfish/framework/user/controller/UserController.java b/flyfish-user/src/main/java/dev/flyfish/framework/user/controller/UserController.java
similarity index 83%
rename from flyfish-user/src/main/java/com/flyfish/framework/user/controller/UserController.java
rename to flyfish-user/src/main/java/dev/flyfish/framework/user/controller/UserController.java
index 0f35c10..abf5561 100644
--- a/flyfish-user/src/main/java/com/flyfish/framework/user/controller/UserController.java
+++ b/flyfish-user/src/main/java/dev/flyfish/framework/user/controller/UserController.java
@@ -1,19 +1,19 @@
-package com.flyfish.framework.user.controller;
+package dev.flyfish.framework.user.controller;
-import com.flyfish.framework.annotations.Operation;
-import com.flyfish.framework.bean.Result;
-import com.flyfish.framework.configuration.annotations.CurrentUser;
-import com.flyfish.framework.controller.reactive.ReactiveBaseController;
-import com.flyfish.framework.user.utils.StrengthUtils;
-import com.flyfish.framework.user.domain.UserPasswordDto;
-import com.flyfish.framework.user.domain.UserQo;
-import com.flyfish.framework.domain.base.IUser;
-import com.flyfish.framework.domain.po.Role;
-import com.flyfish.framework.domain.po.User;
-import com.flyfish.framework.enums.UserStatus;
-import com.flyfish.framework.user.service.UserService;
-import com.flyfish.framework.utils.Assert;
-import com.flyfish.framework.utils.UserUtils;
+import dev.flyfish.framework.annotations.Operation;
+import dev.flyfish.framework.bean.Result;
+import dev.flyfish.framework.configuration.annotations.CurrentUser;
+import dev.flyfish.framework.controller.reactive.ReactiveBaseController;
+import dev.flyfish.framework.user.utils.StrengthUtils;
+import dev.flyfish.framework.user.domain.UserPasswordDto;
+import dev.flyfish.framework.user.domain.UserQo;
+import dev.flyfish.framework.domain.base.IUser;
+import dev.flyfish.framework.domain.po.Role;
+import dev.flyfish.framework.domain.po.User;
+import dev.flyfish.framework.enums.UserStatus;
+import dev.flyfish.framework.user.service.UserService;
+import dev.flyfish.framework.utils.Assert;
+import dev.flyfish.framework.utils.UserUtils;
import org.springframework.security.core.context.ReactiveSecurityContextHolder;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.web.bind.annotation.*;
diff --git a/flyfish-user/src/main/java/com/flyfish/framework/user/domain/AdminUserDetails.java b/flyfish-user/src/main/java/dev/flyfish/framework/user/domain/AdminUserDetails.java
similarity index 87%
rename from flyfish-user/src/main/java/com/flyfish/framework/user/domain/AdminUserDetails.java
rename to flyfish-user/src/main/java/dev/flyfish/framework/user/domain/AdminUserDetails.java
index 63870f8..5470935 100644
--- a/flyfish-user/src/main/java/com/flyfish/framework/user/domain/AdminUserDetails.java
+++ b/flyfish-user/src/main/java/dev/flyfish/framework/user/domain/AdminUserDetails.java
@@ -1,16 +1,16 @@
-package com.flyfish.framework.user.domain;
+package dev.flyfish.framework.user.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.flyfish.framework.domain.authorized.AuthorizedUserDetails;
-import com.flyfish.framework.domain.base.Domain;
-import com.flyfish.framework.domain.base.IUser;
-import com.flyfish.framework.domain.po.Department;
-import com.flyfish.framework.domain.po.Role;
-import com.flyfish.framework.domain.po.User;
-import com.flyfish.framework.enums.UserStatus;
-import com.flyfish.framework.enums.UserType;
-import com.flyfish.framework.utils.CopyUtils;
+import dev.flyfish.framework.domain.authorized.AuthorizedUserDetails;
+import dev.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.domain.base.IUser;
+import dev.flyfish.framework.domain.po.Department;
+import dev.flyfish.framework.domain.po.Role;
+import dev.flyfish.framework.domain.po.User;
+import dev.flyfish.framework.enums.UserStatus;
+import dev.flyfish.framework.enums.UserType;
+import dev.flyfish.framework.utils.CopyUtils;
import lombok.AccessLevel;
import lombok.Getter;
import lombok.Setter;
diff --git a/flyfish-user/src/main/java/com/flyfish/framework/user/domain/DepartmentQo.java b/flyfish-user/src/main/java/dev/flyfish/framework/user/domain/DepartmentQo.java
similarity index 76%
rename from flyfish-user/src/main/java/com/flyfish/framework/user/domain/DepartmentQo.java
rename to flyfish-user/src/main/java/dev/flyfish/framework/user/domain/DepartmentQo.java
index cac3626..47dd6e5 100644
--- a/flyfish-user/src/main/java/com/flyfish/framework/user/domain/DepartmentQo.java
+++ b/flyfish-user/src/main/java/dev/flyfish/framework/user/domain/DepartmentQo.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.user.domain;
+package dev.flyfish.framework.user.domain;
-import com.flyfish.framework.domain.po.Department;
-import com.flyfish.framework.domain.tree.TreeQo;
+import dev.flyfish.framework.domain.po.Department;
+import dev.flyfish.framework.domain.tree.TreeQo;
import lombok.Getter;
import lombok.Setter;
import org.apache.commons.lang3.StringUtils;
diff --git a/flyfish-user/src/main/java/com/flyfish/framework/user/domain/LoginDto.java b/flyfish-user/src/main/java/dev/flyfish/framework/user/domain/LoginDto.java
similarity index 78%
rename from flyfish-user/src/main/java/com/flyfish/framework/user/domain/LoginDto.java
rename to flyfish-user/src/main/java/dev/flyfish/framework/user/domain/LoginDto.java
index 0b1f218..0e4abe8 100644
--- a/flyfish-user/src/main/java/com/flyfish/framework/user/domain/LoginDto.java
+++ b/flyfish-user/src/main/java/dev/flyfish/framework/user/domain/LoginDto.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.user.domain;
+package dev.flyfish.framework.user.domain;
import lombok.Data;
diff --git a/flyfish-user/src/main/java/com/flyfish/framework/user/domain/PermissionQo.java b/flyfish-user/src/main/java/dev/flyfish/framework/user/domain/PermissionQo.java
similarity index 74%
rename from flyfish-user/src/main/java/com/flyfish/framework/user/domain/PermissionQo.java
rename to flyfish-user/src/main/java/dev/flyfish/framework/user/domain/PermissionQo.java
index c164d62..f26b920 100644
--- a/flyfish-user/src/main/java/com/flyfish/framework/user/domain/PermissionQo.java
+++ b/flyfish-user/src/main/java/dev/flyfish/framework/user/domain/PermissionQo.java
@@ -1,9 +1,9 @@
-package com.flyfish.framework.user.domain;
+package dev.flyfish.framework.user.domain;
-import com.flyfish.framework.domain.po.Permission;
-import com.flyfish.framework.domain.tree.TreeQo;
-import com.flyfish.framework.query.QueryDefinition;
+import dev.flyfish.framework.domain.po.Permission;
+import dev.flyfish.framework.domain.tree.TreeQo;
+import dev.flyfish.framework.query.QueryDefinition;
import lombok.Getter;
import lombok.Setter;
import org.springframework.data.domain.Sort;
diff --git a/flyfish-user/src/main/java/com/flyfish/framework/user/domain/RoleQo.java b/flyfish-user/src/main/java/dev/flyfish/framework/user/domain/RoleQo.java
similarity index 81%
rename from flyfish-user/src/main/java/com/flyfish/framework/user/domain/RoleQo.java
rename to flyfish-user/src/main/java/dev/flyfish/framework/user/domain/RoleQo.java
index ffdf302..043a75e 100644
--- a/flyfish-user/src/main/java/com/flyfish/framework/user/domain/RoleQo.java
+++ b/flyfish-user/src/main/java/dev/flyfish/framework/user/domain/RoleQo.java
@@ -1,8 +1,8 @@
-package com.flyfish.framework.user.domain;
+package dev.flyfish.framework.user.domain;
-import com.flyfish.framework.domain.base.NameLikeQo;
-import com.flyfish.framework.domain.po.Role;
-import com.flyfish.framework.query.QueryDefinition;
+import dev.flyfish.framework.domain.base.NameLikeQo;
+import dev.flyfish.framework.domain.po.Role;
+import dev.flyfish.framework.query.QueryDefinition;
import lombok.Getter;
import lombok.Setter;
diff --git a/flyfish-user/src/main/java/com/flyfish/framework/user/domain/UserPasswordDto.java b/flyfish-user/src/main/java/dev/flyfish/framework/user/domain/UserPasswordDto.java
similarity index 78%
rename from flyfish-user/src/main/java/com/flyfish/framework/user/domain/UserPasswordDto.java
rename to flyfish-user/src/main/java/dev/flyfish/framework/user/domain/UserPasswordDto.java
index eddb50c..f966571 100644
--- a/flyfish-user/src/main/java/com/flyfish/framework/user/domain/UserPasswordDto.java
+++ b/flyfish-user/src/main/java/dev/flyfish/framework/user/domain/UserPasswordDto.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.user.domain;
+package dev.flyfish.framework.user.domain;
-import com.flyfish.framework.validation.annotations.Password;
+import dev.flyfish.framework.validation.annotations.Password;
import lombok.Getter;
import lombok.Setter;
diff --git a/flyfish-user/src/main/java/com/flyfish/framework/user/domain/UserQo.java b/flyfish-user/src/main/java/dev/flyfish/framework/user/domain/UserQo.java
similarity index 79%
rename from flyfish-user/src/main/java/com/flyfish/framework/user/domain/UserQo.java
rename to flyfish-user/src/main/java/dev/flyfish/framework/user/domain/UserQo.java
index 9a74190..b08c8e3 100644
--- a/flyfish-user/src/main/java/com/flyfish/framework/user/domain/UserQo.java
+++ b/flyfish-user/src/main/java/dev/flyfish/framework/user/domain/UserQo.java
@@ -1,8 +1,8 @@
-package com.flyfish.framework.user.domain;
+package dev.flyfish.framework.user.domain;
-import com.flyfish.framework.domain.base.NameLikeQo;
-import com.flyfish.framework.domain.po.User;
-import com.flyfish.framework.query.QueryDefinition;
+import dev.flyfish.framework.domain.base.NameLikeQo;
+import dev.flyfish.framework.domain.po.User;
+import dev.flyfish.framework.query.QueryDefinition;
import lombok.*;
import java.util.List;
diff --git a/flyfish-user/src/main/java/com/flyfish/framework/user/initializer/UserInitializer.java b/flyfish-user/src/main/java/dev/flyfish/framework/user/initializer/UserInitializer.java
similarity index 89%
rename from flyfish-user/src/main/java/com/flyfish/framework/user/initializer/UserInitializer.java
rename to flyfish-user/src/main/java/dev/flyfish/framework/user/initializer/UserInitializer.java
index 13b7d32..a673fb2 100644
--- a/flyfish-user/src/main/java/com/flyfish/framework/user/initializer/UserInitializer.java
+++ b/flyfish-user/src/main/java/dev/flyfish/framework/user/initializer/UserInitializer.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.user.initializer;
+package dev.flyfish.framework.user.initializer;
import org.springframework.beans.factory.InitializingBean;
diff --git a/flyfish-user/src/main/java/dev/flyfish/framework/user/repository/DepartmentRepository.java b/flyfish-user/src/main/java/dev/flyfish/framework/user/repository/DepartmentRepository.java
new file mode 100644
index 0000000..76bfe03
--- /dev/null
+++ b/flyfish-user/src/main/java/dev/flyfish/framework/user/repository/DepartmentRepository.java
@@ -0,0 +1,12 @@
+package dev.flyfish.framework.user.repository;
+
+import dev.flyfish.framework.domain.po.Department;
+import dev.flyfish.framework.repository.DefaultReactiveRepository;
+
+/**
+ * 部门仓库
+ *
+ * @author wybab
+ */
+public interface DepartmentRepository extends DefaultReactiveRepository {
+}
diff --git a/flyfish-user/src/main/java/dev/flyfish/framework/user/repository/PermissionRepository.java b/flyfish-user/src/main/java/dev/flyfish/framework/user/repository/PermissionRepository.java
new file mode 100644
index 0000000..c54fe3d
--- /dev/null
+++ b/flyfish-user/src/main/java/dev/flyfish/framework/user/repository/PermissionRepository.java
@@ -0,0 +1,13 @@
+package dev.flyfish.framework.user.repository;
+
+
+import dev.flyfish.framework.domain.po.Permission;
+import dev.flyfish.framework.repository.DefaultReactiveRepository;
+
+/**
+ * 权限仓库
+ *
+ * @author wybab
+ */
+public interface PermissionRepository extends DefaultReactiveRepository {
+}
diff --git a/flyfish-user/src/main/java/dev/flyfish/framework/user/repository/RoleRepository.java b/flyfish-user/src/main/java/dev/flyfish/framework/user/repository/RoleRepository.java
new file mode 100644
index 0000000..94a3c76
--- /dev/null
+++ b/flyfish-user/src/main/java/dev/flyfish/framework/user/repository/RoleRepository.java
@@ -0,0 +1,12 @@
+package dev.flyfish.framework.user.repository;
+
+import dev.flyfish.framework.domain.po.Role;
+import dev.flyfish.framework.repository.DefaultReactiveRepository;
+
+/**
+ * 角色仓库
+ *
+ * @author wybab
+ */
+public interface RoleRepository extends DefaultReactiveRepository {
+}
diff --git a/flyfish-user/src/main/java/com/flyfish/framework/user/repository/UserRepository.java b/flyfish-user/src/main/java/dev/flyfish/framework/user/repository/UserRepository.java
similarity index 77%
rename from flyfish-user/src/main/java/com/flyfish/framework/user/repository/UserRepository.java
rename to flyfish-user/src/main/java/dev/flyfish/framework/user/repository/UserRepository.java
index 9602c71..3ed19a7 100644
--- a/flyfish-user/src/main/java/com/flyfish/framework/user/repository/UserRepository.java
+++ b/flyfish-user/src/main/java/dev/flyfish/framework/user/repository/UserRepository.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.user.repository;
+package dev.flyfish.framework.user.repository;
-import com.flyfish.framework.domain.po.User;
-import com.flyfish.framework.repository.DefaultReactiveRepository;
+import dev.flyfish.framework.domain.po.User;
+import dev.flyfish.framework.repository.DefaultReactiveRepository;
import reactor.core.publisher.Mono;
/**
diff --git a/flyfish-user/src/main/java/com/flyfish/framework/user/service/DepartmentService.java b/flyfish-user/src/main/java/dev/flyfish/framework/user/service/DepartmentService.java
similarity index 67%
rename from flyfish-user/src/main/java/com/flyfish/framework/user/service/DepartmentService.java
rename to flyfish-user/src/main/java/dev/flyfish/framework/user/service/DepartmentService.java
index ad11382..18860fa 100644
--- a/flyfish-user/src/main/java/com/flyfish/framework/user/service/DepartmentService.java
+++ b/flyfish-user/src/main/java/dev/flyfish/framework/user/service/DepartmentService.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.user.service;
+package dev.flyfish.framework.user.service;
-import com.flyfish.framework.domain.po.Department;
-import com.flyfish.framework.service.BaseReactiveService;
+import dev.flyfish.framework.domain.po.Department;
+import dev.flyfish.framework.service.BaseReactiveService;
import reactor.core.publisher.Mono;
import java.util.Set;
diff --git a/flyfish-user/src/main/java/com/flyfish/framework/user/service/FlyfishUserDetailsServiceImpl.java b/flyfish-user/src/main/java/dev/flyfish/framework/user/service/FlyfishUserDetailsServiceImpl.java
similarity index 93%
rename from flyfish-user/src/main/java/com/flyfish/framework/user/service/FlyfishUserDetailsServiceImpl.java
rename to flyfish-user/src/main/java/dev/flyfish/framework/user/service/FlyfishUserDetailsServiceImpl.java
index 60d98aa..5e68967 100644
--- a/flyfish-user/src/main/java/com/flyfish/framework/user/service/FlyfishUserDetailsServiceImpl.java
+++ b/flyfish-user/src/main/java/dev/flyfish/framework/user/service/FlyfishUserDetailsServiceImpl.java
@@ -1,12 +1,12 @@
-package com.flyfish.framework.user.service;
+package dev.flyfish.framework.user.service;
-import com.flyfish.framework.user.config.constants.UserCacheKeys;
-import com.flyfish.framework.configuration.jwt.TokenProvider;
-import com.flyfish.framework.domain.base.IUser;
-import com.flyfish.framework.enums.UserStatus;
-import com.flyfish.framework.service.FlyfishUserDetailsService;
-import com.flyfish.framework.utils.Assert;
-import com.flyfish.framework.utils.ReactiveRedisOperations;
+import dev.flyfish.framework.user.config.constants.UserCacheKeys;
+import dev.flyfish.framework.configuration.jwt.TokenProvider;
+import dev.flyfish.framework.domain.base.IUser;
+import dev.flyfish.framework.enums.UserStatus;
+import dev.flyfish.framework.service.FlyfishUserDetailsService;
+import dev.flyfish.framework.utils.Assert;
+import dev.flyfish.framework.utils.ReactiveRedisOperations;
import jakarta.annotation.PostConstruct;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.BooleanUtils;
diff --git a/flyfish-user/src/main/java/com/flyfish/framework/user/service/PermissionService.java b/flyfish-user/src/main/java/dev/flyfish/framework/user/service/PermissionService.java
similarity index 53%
rename from flyfish-user/src/main/java/com/flyfish/framework/user/service/PermissionService.java
rename to flyfish-user/src/main/java/dev/flyfish/framework/user/service/PermissionService.java
index e51ac86..575fc08 100644
--- a/flyfish-user/src/main/java/com/flyfish/framework/user/service/PermissionService.java
+++ b/flyfish-user/src/main/java/dev/flyfish/framework/user/service/PermissionService.java
@@ -1,8 +1,8 @@
-package com.flyfish.framework.user.service;
+package dev.flyfish.framework.user.service;
-import com.flyfish.framework.domain.po.Permission;
-import com.flyfish.framework.service.impl.BaseReactiveServiceImpl;
+import dev.flyfish.framework.domain.po.Permission;
+import dev.flyfish.framework.service.impl.BaseReactiveServiceImpl;
import org.springframework.stereotype.Service;
/**
diff --git a/flyfish-user/src/main/java/com/flyfish/framework/user/service/RoleService.java b/flyfish-user/src/main/java/dev/flyfish/framework/user/service/RoleService.java
similarity index 81%
rename from flyfish-user/src/main/java/com/flyfish/framework/user/service/RoleService.java
rename to flyfish-user/src/main/java/dev/flyfish/framework/user/service/RoleService.java
index 6f459ca..a97b19d 100644
--- a/flyfish-user/src/main/java/com/flyfish/framework/user/service/RoleService.java
+++ b/flyfish-user/src/main/java/dev/flyfish/framework/user/service/RoleService.java
@@ -1,19 +1,19 @@
-package com.flyfish.framework.user.service;
+package dev.flyfish.framework.user.service;
-import com.flyfish.framework.domain.base.Domain;
-import com.flyfish.framework.domain.base.IUser;
-import com.flyfish.framework.domain.base.Qo;
-import com.flyfish.framework.domain.po.Permission;
-import com.flyfish.framework.domain.po.Role;
-import com.flyfish.framework.enums.RoleType;
-import com.flyfish.framework.enums.UserType;
-import com.flyfish.framework.query.Queries;
-import com.flyfish.framework.query.Query;
-import com.flyfish.framework.repository.ReactiveEntityOperations;
-import com.flyfish.framework.service.impl.BaseReactiveServiceImpl;
-import com.flyfish.framework.user.domain.PermissionQo;
-import com.flyfish.framework.user.domain.RoleQo;
+import dev.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.domain.base.IUser;
+import dev.flyfish.framework.domain.base.Qo;
+import dev.flyfish.framework.domain.po.Permission;
+import dev.flyfish.framework.domain.po.Role;
+import dev.flyfish.framework.enums.RoleType;
+import dev.flyfish.framework.enums.UserType;
+import dev.flyfish.framework.query.Queries;
+import dev.flyfish.framework.query.Query;
+import dev.flyfish.framework.repository.ReactiveEntityOperations;
+import dev.flyfish.framework.service.impl.BaseReactiveServiceImpl;
+import dev.flyfish.framework.user.domain.PermissionQo;
+import dev.flyfish.framework.user.domain.RoleQo;
import lombok.RequiredArgsConstructor;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.BooleanUtils;
diff --git a/flyfish-user/src/main/java/com/flyfish/framework/user/service/UserDetailsConverter.java b/flyfish-user/src/main/java/dev/flyfish/framework/user/service/UserDetailsConverter.java
similarity index 90%
rename from flyfish-user/src/main/java/com/flyfish/framework/user/service/UserDetailsConverter.java
rename to flyfish-user/src/main/java/dev/flyfish/framework/user/service/UserDetailsConverter.java
index 1789286..04404e8 100644
--- a/flyfish-user/src/main/java/com/flyfish/framework/user/service/UserDetailsConverter.java
+++ b/flyfish-user/src/main/java/dev/flyfish/framework/user/service/UserDetailsConverter.java
@@ -1,12 +1,12 @@
-package com.flyfish.framework.user.service;
+package dev.flyfish.framework.user.service;
-import com.flyfish.framework.user.domain.AdminUserDetails;
-import com.flyfish.framework.domain.base.IUser;
-import com.flyfish.framework.domain.po.Department;
-import com.flyfish.framework.domain.po.Role;
-import com.flyfish.framework.enums.UserType;
-import com.flyfish.framework.utils.CopyUtils;
-import com.flyfish.framework.utils.DepartUtils;
+import dev.flyfish.framework.user.domain.AdminUserDetails;
+import dev.flyfish.framework.domain.base.IUser;
+import dev.flyfish.framework.domain.po.Department;
+import dev.flyfish.framework.domain.po.Role;
+import dev.flyfish.framework.enums.UserType;
+import dev.flyfish.framework.utils.CopyUtils;
+import dev.flyfish.framework.utils.DepartUtils;
import lombok.RequiredArgsConstructor;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
diff --git a/flyfish-user/src/main/java/com/flyfish/framework/user/service/UserService.java b/flyfish-user/src/main/java/dev/flyfish/framework/user/service/UserService.java
similarity index 77%
rename from flyfish-user/src/main/java/com/flyfish/framework/user/service/UserService.java
rename to flyfish-user/src/main/java/dev/flyfish/framework/user/service/UserService.java
index c8f669f..38dda90 100644
--- a/flyfish-user/src/main/java/com/flyfish/framework/user/service/UserService.java
+++ b/flyfish-user/src/main/java/dev/flyfish/framework/user/service/UserService.java
@@ -1,13 +1,13 @@
-package com.flyfish.framework.user.service;
+package dev.flyfish.framework.user.service;
-import com.flyfish.framework.user.repository.UserRepository;
-import com.flyfish.framework.user.domain.UserQo;
-import com.flyfish.framework.domain.authorized.AuthorizedUserDetails;
-import com.flyfish.framework.domain.base.Qo;
-import com.flyfish.framework.domain.po.User;
-import com.flyfish.framework.enums.UserType;
-import com.flyfish.framework.service.UserFindService;
-import com.flyfish.framework.service.impl.BaseReactiveServiceImpl;
+import dev.flyfish.framework.user.repository.UserRepository;
+import dev.flyfish.framework.user.domain.UserQo;
+import dev.flyfish.framework.domain.authorized.AuthorizedUserDetails;
+import dev.flyfish.framework.domain.base.Qo;
+import dev.flyfish.framework.domain.po.User;
+import dev.flyfish.framework.enums.UserType;
+import dev.flyfish.framework.service.UserFindService;
+import dev.flyfish.framework.service.impl.BaseReactiveServiceImpl;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.data.domain.Page;
import org.springframework.stereotype.Service;
diff --git a/flyfish-user/src/main/java/com/flyfish/framework/user/service/impl/DepartmentServiceHelper.java b/flyfish-user/src/main/java/dev/flyfish/framework/user/service/impl/DepartmentServiceHelper.java
similarity index 89%
rename from flyfish-user/src/main/java/com/flyfish/framework/user/service/impl/DepartmentServiceHelper.java
rename to flyfish-user/src/main/java/dev/flyfish/framework/user/service/impl/DepartmentServiceHelper.java
index 8a5defc..9894b2b 100644
--- a/flyfish-user/src/main/java/com/flyfish/framework/user/service/impl/DepartmentServiceHelper.java
+++ b/flyfish-user/src/main/java/dev/flyfish/framework/user/service/impl/DepartmentServiceHelper.java
@@ -1,10 +1,10 @@
-package com.flyfish.framework.user.service.impl;
+package dev.flyfish.framework.user.service.impl;
-import com.flyfish.framework.user.domain.AdminUserDetails;
-import com.flyfish.framework.user.domain.DepartmentQo;
-import com.flyfish.framework.domain.base.Qo;
-import com.flyfish.framework.domain.po.Department;
-import com.flyfish.framework.enums.UserType;
+import dev.flyfish.framework.user.domain.AdminUserDetails;
+import dev.flyfish.framework.user.domain.DepartmentQo;
+import dev.flyfish.framework.domain.base.Qo;
+import dev.flyfish.framework.domain.po.Department;
+import dev.flyfish.framework.enums.UserType;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
diff --git a/flyfish-user/src/main/java/com/flyfish/framework/user/service/impl/MongoDepartmentServiceImpl.java b/flyfish-user/src/main/java/dev/flyfish/framework/user/service/impl/MongoDepartmentServiceImpl.java
similarity index 84%
rename from flyfish-user/src/main/java/com/flyfish/framework/user/service/impl/MongoDepartmentServiceImpl.java
rename to flyfish-user/src/main/java/dev/flyfish/framework/user/service/impl/MongoDepartmentServiceImpl.java
index 141f2a9..64c7c63 100644
--- a/flyfish-user/src/main/java/com/flyfish/framework/user/service/impl/MongoDepartmentServiceImpl.java
+++ b/flyfish-user/src/main/java/dev/flyfish/framework/user/service/impl/MongoDepartmentServiceImpl.java
@@ -1,12 +1,11 @@
-package com.flyfish.framework.user.service.impl;
+package dev.flyfish.framework.user.service.impl;
-import com.flyfish.framework.domain.base.Qo;
-import com.flyfish.framework.domain.po.Department;
-import com.flyfish.framework.domain.tree.TreeDomain;
-import com.flyfish.framework.user.service.DepartmentService;
-import com.flyfish.framework.service.impl.BaseReactiveServiceImpl;
+import dev.flyfish.framework.domain.base.Qo;
+import dev.flyfish.framework.domain.po.Department;
+import dev.flyfish.framework.domain.tree.TreeDomain;
+import dev.flyfish.framework.user.service.DepartmentService;
+import dev.flyfish.framework.service.impl.BaseReactiveServiceImpl;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.data.mongodb.core.ReactiveMongoOperations;
import org.springframework.data.mongodb.core.aggregation.Aggregation;
diff --git a/flyfish-user/src/main/java/com/flyfish/framework/user/service/impl/R2dbcDepartmentServiceImpl.java b/flyfish-user/src/main/java/dev/flyfish/framework/user/service/impl/R2dbcDepartmentServiceImpl.java
similarity index 76%
rename from flyfish-user/src/main/java/com/flyfish/framework/user/service/impl/R2dbcDepartmentServiceImpl.java
rename to flyfish-user/src/main/java/dev/flyfish/framework/user/service/impl/R2dbcDepartmentServiceImpl.java
index 28ed746..b89e328 100644
--- a/flyfish-user/src/main/java/com/flyfish/framework/user/service/impl/R2dbcDepartmentServiceImpl.java
+++ b/flyfish-user/src/main/java/dev/flyfish/framework/user/service/impl/R2dbcDepartmentServiceImpl.java
@@ -1,11 +1,10 @@
-package com.flyfish.framework.user.service.impl;
+package dev.flyfish.framework.user.service.impl;
-import com.flyfish.framework.domain.base.Qo;
-import com.flyfish.framework.domain.po.Department;
-import com.flyfish.framework.user.service.DepartmentService;
-import com.flyfish.framework.service.impl.BaseReactiveServiceImpl;
+import dev.flyfish.framework.domain.base.Qo;
+import dev.flyfish.framework.domain.po.Department;
+import dev.flyfish.framework.user.service.DepartmentService;
+import dev.flyfish.framework.service.impl.BaseReactiveServiceImpl;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.data.r2dbc.core.R2dbcEntityOperations;
import org.springframework.data.relational.core.query.Criteria;
@@ -19,8 +18,6 @@ import java.util.Collection;
import java.util.Set;
import java.util.stream.Collectors;
-import static com.flyfish.framework.user.service.impl.DepartmentServiceHelper.convertQo;
-
/**
* 部门服务
*
@@ -53,7 +50,7 @@ public class R2dbcDepartmentServiceImpl extends BaseReactiveServiceImpl getList(Qo query) {
- return convertQo(query, this::getMinDepthInIds).flatMapMany(super::getList);
+ return DepartmentServiceHelper.convertQo(query, this::getMinDepthInIds).flatMapMany(super::getList);
}
/**
diff --git a/flyfish-user/src/main/java/com/flyfish/framework/user/utils/RSAUtils.java b/flyfish-user/src/main/java/dev/flyfish/framework/user/utils/RSAUtils.java
similarity index 98%
rename from flyfish-user/src/main/java/com/flyfish/framework/user/utils/RSAUtils.java
rename to flyfish-user/src/main/java/dev/flyfish/framework/user/utils/RSAUtils.java
index 88c2903..fd0e7cd 100644
--- a/flyfish-user/src/main/java/com/flyfish/framework/user/utils/RSAUtils.java
+++ b/flyfish-user/src/main/java/dev/flyfish/framework/user/utils/RSAUtils.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.user.utils;
+package dev.flyfish.framework.user.utils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.lang.Nullable;
diff --git a/flyfish-user/src/main/java/com/flyfish/framework/user/utils/StrengthUtils.java b/flyfish-user/src/main/java/dev/flyfish/framework/user/utils/StrengthUtils.java
similarity index 77%
rename from flyfish-user/src/main/java/com/flyfish/framework/user/utils/StrengthUtils.java
rename to flyfish-user/src/main/java/dev/flyfish/framework/user/utils/StrengthUtils.java
index d5fb8a8..7e70ff5 100644
--- a/flyfish-user/src/main/java/com/flyfish/framework/user/utils/StrengthUtils.java
+++ b/flyfish-user/src/main/java/dev/flyfish/framework/user/utils/StrengthUtils.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.user.utils;
+package dev.flyfish.framework.user.utils;
-import com.flyfish.framework.validation.validators.PasswordValidator;
+import dev.flyfish.framework.validation.validators.PasswordValidator;
/**
* 密码强度工具
diff --git a/flyfish-user/src/main/java/com/flyfish/framework/user/validation/.gitkeep b/flyfish-user/src/main/java/dev/flyfish/framework/user/validation/.gitkeep
similarity index 100%
rename from flyfish-user/src/main/java/com/flyfish/framework/user/validation/.gitkeep
rename to flyfish-user/src/main/java/dev/flyfish/framework/user/validation/.gitkeep
diff --git a/flyfish-user/src/test/java/com/flyfish/framework/web/package-info.java b/flyfish-user/src/test/java/com/flyfish/framework/web/package-info.java
deleted file mode 100644
index 051c3b1..0000000
--- a/flyfish-user/src/test/java/com/flyfish/framework/web/package-info.java
+++ /dev/null
@@ -1 +0,0 @@
-package com.flyfish.framework.web;
\ No newline at end of file
diff --git a/flyfish-user/src/test/java/com/flyfish/framework/web/FlyfishUserTest.java b/flyfish-user/src/test/java/dev/flyfish/framework/web/FlyfishUserTest.java
similarity index 76%
rename from flyfish-user/src/test/java/com/flyfish/framework/web/FlyfishUserTest.java
rename to flyfish-user/src/test/java/dev/flyfish/framework/web/FlyfishUserTest.java
index 01db544..fe2efa3 100644
--- a/flyfish-user/src/test/java/com/flyfish/framework/web/FlyfishUserTest.java
+++ b/flyfish-user/src/test/java/dev/flyfish/framework/web/FlyfishUserTest.java
@@ -1,16 +1,16 @@
-package com.flyfish.framework.web;
+package dev.flyfish.framework.web;
-import com.flyfish.framework.configuration.boot.FlyfishApplication;
-import com.flyfish.framework.domain.po.Department;
-import com.flyfish.framework.domain.po.Role;
-import com.flyfish.framework.domain.po.User;
-import com.flyfish.framework.enums.RoleType;
-import com.flyfish.framework.query.Queries;
-import com.flyfish.framework.r2dbc.config.R2dbcDataConfig;
-import com.flyfish.framework.user.annotations.EnableAutoSecurity;
-import com.flyfish.framework.user.repository.RoleRepository;
-import com.flyfish.framework.user.repository.UserRepository;
-import com.flyfish.framework.utils.JacksonUtil;
+import dev.flyfish.framework.configuration.boot.FlyfishApplication;
+import dev.flyfish.framework.domain.po.Department;
+import dev.flyfish.framework.domain.po.Role;
+import dev.flyfish.framework.domain.po.User;
+import dev.flyfish.framework.enums.RoleType;
+import dev.flyfish.framework.query.Queries;
+import dev.flyfish.framework.r2dbc.config.R2dbcDataConfig;
+import dev.flyfish.framework.user.annotations.EnableAutoSecurity;
+import dev.flyfish.framework.user.repository.RoleRepository;
+import dev.flyfish.framework.user.repository.UserRepository;
+import dev.flyfish.framework.utils.JacksonUtil;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.Test;
@@ -23,7 +23,7 @@ import java.util.Arrays;
@ExtendWith(SpringExtension.class)
@SpringBootTest(classes = FlyfishUserTest.class)
-@FlyfishApplication(scanBasePackages = "com.flyfish.framework")
+@FlyfishApplication(scanBasePackages = "dev.flyfish.framework")
@Import(R2dbcDataConfig.class)
@EnableAutoSecurity
@Slf4j
diff --git a/flyfish-user/src/test/java/dev/flyfish/framework/web/package-info.java b/flyfish-user/src/test/java/dev/flyfish/framework/web/package-info.java
new file mode 100644
index 0000000..6f25813
--- /dev/null
+++ b/flyfish-user/src/test/java/dev/flyfish/framework/web/package-info.java
@@ -0,0 +1 @@
+package dev.flyfish.framework.web;
diff --git a/flyfish-web/pom.xml b/flyfish-web/pom.xml
index 5064d4d..c863a03 100644
--- a/flyfish-web/pom.xml
+++ b/flyfish-web/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
flyfish-framework
- com.flyfish.framework
+ dev.flyfish.framework
${revision}
4.0.0
@@ -13,7 +13,7 @@
- com.flyfish.framework
+ dev.flyfish.framework
flyfish-data-common
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/excel/repository/ExcelMappingRepository.java b/flyfish-web/src/main/java/com/flyfish/framework/excel/repository/ExcelMappingRepository.java
deleted file mode 100644
index 16eaf6f..0000000
--- a/flyfish-web/src/main/java/com/flyfish/framework/excel/repository/ExcelMappingRepository.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.flyfish.framework.excel.repository;
-
-import com.flyfish.framework.domain.po.ExcelMapping;
-import com.flyfish.framework.repository.DefaultReactiveRepository;
-
-/**
- * excel导入方案
- *
- * @author wangyu
- */
-public interface ExcelMappingRepository extends DefaultReactiveRepository {
-
-}
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/excel/service/ExcelMappingService.java b/flyfish-web/src/main/java/com/flyfish/framework/excel/service/ExcelMappingService.java
deleted file mode 100644
index ee2e11b..0000000
--- a/flyfish-web/src/main/java/com/flyfish/framework/excel/service/ExcelMappingService.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.flyfish.framework.excel.service;
-
-import com.flyfish.framework.domain.po.ExcelMapping;
-import com.flyfish.framework.service.impl.BaseReactiveServiceImpl;
-import org.springframework.stereotype.Service;
-
-@Service
-public class ExcelMappingService extends BaseReactiveServiceImpl {
-}
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/bean/SyncVo.java b/flyfish-web/src/main/java/dev/flyfish/framework/bean/SyncVo.java
similarity index 81%
rename from flyfish-web/src/main/java/com/flyfish/framework/bean/SyncVo.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/bean/SyncVo.java
index 677b549..c69e8e8 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/bean/SyncVo.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/bean/SyncVo.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.bean;
+package dev.flyfish.framework.bean;
-import com.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.domain.base.Domain;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/beans/annotations/EnableRestBeanDetect.java b/flyfish-web/src/main/java/dev/flyfish/framework/beans/annotations/EnableRestBeanDetect.java
similarity index 64%
rename from flyfish-web/src/main/java/com/flyfish/framework/beans/annotations/EnableRestBeanDetect.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/beans/annotations/EnableRestBeanDetect.java
index 67d6820..4535067 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/beans/annotations/EnableRestBeanDetect.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/beans/annotations/EnableRestBeanDetect.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.beans.annotations;
+package dev.flyfish.framework.beans.annotations;
-import com.flyfish.framework.config.BeanConfig;
-import com.flyfish.framework.config.RestBeanAutoConfigure;
+import dev.flyfish.framework.config.BeanConfig;
+import dev.flyfish.framework.config.RestBeanAutoConfigure;
import org.springframework.context.annotation.Import;
import java.lang.annotation.*;
@@ -20,5 +20,5 @@ public @interface EnableRestBeanDetect {
* 扫描的基本路径
* @return 结果
*/
- String[] basePackages() default "com.flyfish.project";
+ String[] basePackages() default "dev.flyfish.project";
}
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/beans/annotations/RestMapping.java b/flyfish-web/src/main/java/dev/flyfish/framework/beans/annotations/RestMapping.java
similarity index 96%
rename from flyfish-web/src/main/java/com/flyfish/framework/beans/annotations/RestMapping.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/beans/annotations/RestMapping.java
index 2e98b3f..a9afb35 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/beans/annotations/RestMapping.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/beans/annotations/RestMapping.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.beans.annotations;
+package dev.flyfish.framework.beans.annotations;
import org.springframework.core.annotation.AliasFor;
import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/beans/enums/RestBeanCandidate.java b/flyfish-web/src/main/java/dev/flyfish/framework/beans/enums/RestBeanCandidate.java
similarity index 81%
rename from flyfish-web/src/main/java/com/flyfish/framework/beans/enums/RestBeanCandidate.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/beans/enums/RestBeanCandidate.java
index ae3a6b7..1241d09 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/beans/enums/RestBeanCandidate.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/beans/enums/RestBeanCandidate.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.beans.enums;
+package dev.flyfish.framework.beans.enums;
-import com.flyfish.framework.enums.NamedEnum;
+import dev.flyfish.framework.enums.NamedEnum;
import lombok.AllArgsConstructor;
import lombok.Getter;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/beans/enums/ValidationCandidate.java b/flyfish-web/src/main/java/dev/flyfish/framework/beans/enums/ValidationCandidate.java
similarity index 90%
rename from flyfish-web/src/main/java/com/flyfish/framework/beans/enums/ValidationCandidate.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/beans/enums/ValidationCandidate.java
index 436c467..4232291 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/beans/enums/ValidationCandidate.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/beans/enums/ValidationCandidate.java
@@ -1,13 +1,13 @@
-package com.flyfish.framework.beans.enums;
+package dev.flyfish.framework.beans.enums;
-import com.flyfish.framework.annotations.ConditionOn;
-import com.flyfish.framework.beans.meta.BeanPropertyType;
-import com.flyfish.framework.beans.meta.BeanValidation;
-import com.flyfish.framework.validation.annotations.IdCard;
-import com.flyfish.framework.validation.annotations.Money;
-import com.flyfish.framework.validation.annotations.Phone;
-import com.flyfish.framework.validation.annotations.UniqueField;
-import com.flyfish.framework.validation.enums.PhoneType;
+import dev.flyfish.framework.annotations.ConditionOn;
+import dev.flyfish.framework.beans.meta.BeanPropertyType;
+import dev.flyfish.framework.beans.meta.BeanValidation;
+import dev.flyfish.framework.validation.annotations.IdCard;
+import dev.flyfish.framework.validation.annotations.Money;
+import dev.flyfish.framework.validation.annotations.Phone;
+import dev.flyfish.framework.validation.annotations.UniqueField;
+import dev.flyfish.framework.validation.enums.PhoneType;
import lombok.Getter;
import lombok.val;
import org.apache.commons.lang3.ArrayUtils;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/BeanController.java b/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/BeanController.java
similarity index 92%
rename from flyfish-web/src/main/java/com/flyfish/framework/beans/meta/BeanController.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/BeanController.java
index ffec20a..6b4e03b 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/BeanController.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/BeanController.java
@@ -1,11 +1,11 @@
-package com.flyfish.framework.beans.meta;
+package dev.flyfish.framework.beans.meta;
-import com.flyfish.framework.annotations.PropertyGroup;
-import com.flyfish.framework.annotations.PropertyGroups;
-import com.flyfish.framework.bean.Result;
-import com.flyfish.framework.beans.resolver.DynamicRestBeanResolver;
-import com.flyfish.framework.domain.base.Vo;
-import com.flyfish.framework.utils.StringFormats;
+import dev.flyfish.framework.annotations.PropertyGroup;
+import dev.flyfish.framework.annotations.PropertyGroups;
+import dev.flyfish.framework.bean.Result;
+import dev.flyfish.framework.beans.resolver.DynamicRestBeanResolver;
+import dev.flyfish.framework.domain.base.Vo;
+import dev.flyfish.framework.utils.StringFormats;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.ClassUtils;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/BeanInfo.java b/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/BeanInfo.java
similarity index 96%
rename from flyfish-web/src/main/java/com/flyfish/framework/beans/meta/BeanInfo.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/BeanInfo.java
index 9bec8d0..9892c40 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/BeanInfo.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/BeanInfo.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.beans.meta;
+package dev.flyfish.framework.beans.meta;
import lombok.Data;
import org.springframework.beans.BeanUtils;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/BeanProperty.java b/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/BeanProperty.java
similarity index 96%
rename from flyfish-web/src/main/java/com/flyfish/framework/beans/meta/BeanProperty.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/BeanProperty.java
index fa656e7..2ce59b3 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/BeanProperty.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/BeanProperty.java
@@ -1,18 +1,19 @@
-package com.flyfish.framework.beans.meta;
+package dev.flyfish.framework.beans.meta;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.flyfish.framework.annotations.Properties;
-import com.flyfish.framework.annotations.*;
-import com.flyfish.framework.beans.enums.ValidationCandidate;
-import com.flyfish.framework.beans.meta.builtin.BeanUris;
-import com.flyfish.framework.beans.meta.parser.BeanPropertyAnnotations;
-import com.flyfish.framework.beans.meta.parser.SimpleBeanPropertyAnnotations;
-import com.flyfish.framework.domain.base.Qo;
-import com.flyfish.framework.domain.base.Vo;
-import com.flyfish.framework.utils.ReflectionUtils;
-import com.flyfish.framework.utils.StringFormats;
-import com.flyfish.framework.validation.annotations.Money;
+import dev.flyfish.framework.annotations.Properties;
+import dev.flyfish.framework.annotations.*;
+import dev.flyfish.framework.beans.enums.ValidationCandidate;
+import dev.flyfish.framework.beans.meta.builtin.BeanUris;
+import dev.flyfish.framework.beans.meta.parser.BeanPropertyAnnotations;
+import dev.flyfish.framework.beans.meta.parser.SimpleBeanPropertyAnnotations;
+import dev.flyfish.framework.domain.base.Qo;
+import dev.flyfish.framework.domain.base.Vo;
+import dev.flyfish.framework.utils.ReflectionUtils;
+import dev.flyfish.framework.utils.StringFormats;
+import dev.flyfish.framework.validation.annotations.Money;
+import dev.flyfish.framework.annotations.*;
import lombok.Data;
import lombok.val;
import org.apache.commons.collections4.CollectionUtils;
@@ -375,8 +376,8 @@ public class BeanProperty {
private static List parseExtras(Class clazz, List origin) {
List result = new ArrayList<>();
// 包含properties
- if (clazz.isAnnotationPresent(Properties.class)) {
- Properties properties = clazz.getAnnotation(Properties.class);
+ if (clazz.isAnnotationPresent(dev.flyfish.framework.annotations.Properties.class)) {
+ dev.flyfish.framework.annotations.Properties properties = clazz.getAnnotation(Properties.class);
for (Property prop : properties.value()) {
applyExtraProperty(result, origin, prop);
}
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/BeanPropertyGroup.java b/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/BeanPropertyGroup.java
similarity index 87%
rename from flyfish-web/src/main/java/com/flyfish/framework/beans/meta/BeanPropertyGroup.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/BeanPropertyGroup.java
index 380e6b0..eaec397 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/BeanPropertyGroup.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/BeanPropertyGroup.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.beans.meta;
+package dev.flyfish.framework.beans.meta;
import lombok.AllArgsConstructor;
import lombok.Data;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/BeanPropertyType.java b/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/BeanPropertyType.java
similarity index 95%
rename from flyfish-web/src/main/java/com/flyfish/framework/beans/meta/BeanPropertyType.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/BeanPropertyType.java
index 727697d..e31a8e9 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/BeanPropertyType.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/BeanPropertyType.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.beans.meta;
+package dev.flyfish.framework.beans.meta;
-import com.flyfish.framework.domain.base.Po;
+import dev.flyfish.framework.domain.base.Po;
import lombok.Getter;
import java.beans.PropertyDescriptor;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/BeanProps.java b/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/BeanProps.java
similarity index 93%
rename from flyfish-web/src/main/java/com/flyfish/framework/beans/meta/BeanProps.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/BeanProps.java
index 6a94b4d..72141c3 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/BeanProps.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/BeanProps.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.beans.meta;
+package dev.flyfish.framework.beans.meta;
/**
* 枚举常用的bean属性
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/BeanValidation.java b/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/BeanValidation.java
similarity index 95%
rename from flyfish-web/src/main/java/com/flyfish/framework/beans/meta/BeanValidation.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/BeanValidation.java
index 752c5a1..1a2917e 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/BeanValidation.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/BeanValidation.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.beans.meta;
+package dev.flyfish.framework.beans.meta;
import lombok.Data;
import lombok.experimental.Accessors;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/RestBean.java b/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/RestBean.java
similarity index 80%
rename from flyfish-web/src/main/java/com/flyfish/framework/beans/meta/RestBean.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/RestBean.java
index 508236e..39d7ccd 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/RestBean.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/RestBean.java
@@ -1,13 +1,13 @@
-package com.flyfish.framework.beans.meta;
+package dev.flyfish.framework.beans.meta;
-import com.flyfish.framework.controller.SafeController;
-import com.flyfish.framework.controller.reactive.ReactiveBaseController;
-import com.flyfish.framework.domain.base.DomainService;
-import com.flyfish.framework.domain.base.NameLikeQo;
-import com.flyfish.framework.domain.base.Qo;
-import com.flyfish.framework.domain.base.Vo;
-import com.flyfish.framework.repository.DefaultReactiveRepository;
-import com.flyfish.framework.service.impl.BaseReactiveServiceImpl;
+import dev.flyfish.framework.controller.SafeController;
+import dev.flyfish.framework.controller.reactive.ReactiveBaseController;
+import dev.flyfish.framework.domain.base.DomainService;
+import dev.flyfish.framework.domain.base.NameLikeQo;
+import dev.flyfish.framework.domain.base.Qo;
+import dev.flyfish.framework.domain.base.Vo;
+import dev.flyfish.framework.repository.DefaultReactiveRepository;
+import dev.flyfish.framework.service.impl.BaseReactiveServiceImpl;
import org.springframework.core.annotation.AliasFor;
import org.springframework.data.mongodb.core.mapping.Document;
import org.springframework.data.relational.core.mapping.Table;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/SubBean.java b/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/SubBean.java
similarity index 90%
rename from flyfish-web/src/main/java/com/flyfish/framework/beans/meta/SubBean.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/SubBean.java
index c72477c..06803c8 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/SubBean.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/SubBean.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.beans.meta;
+package dev.flyfish.framework.beans.meta;
import jakarta.validation.Valid;
import java.lang.annotation.*;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/builtin/BeanUris.java b/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/builtin/BeanUris.java
similarity index 72%
rename from flyfish-web/src/main/java/com/flyfish/framework/beans/meta/builtin/BeanUris.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/builtin/BeanUris.java
index 074bd39..1aa272c 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/builtin/BeanUris.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/builtin/BeanUris.java
@@ -1,9 +1,9 @@
-package com.flyfish.framework.beans.meta.builtin;
+package dev.flyfish.framework.beans.meta.builtin;
-import com.flyfish.framework.domain.po.Department;
-import com.flyfish.framework.domain.po.Permission;
-import com.flyfish.framework.domain.po.Role;
-import com.flyfish.framework.domain.po.User;
+import dev.flyfish.framework.domain.po.Department;
+import dev.flyfish.framework.domain.po.Permission;
+import dev.flyfish.framework.domain.po.Role;
+import dev.flyfish.framework.domain.po.User;
import java.util.HashMap;
import java.util.Map;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/parser/BeanPropertyAnnotationParser.java b/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/BeanPropertyAnnotationParser.java
similarity index 67%
rename from flyfish-web/src/main/java/com/flyfish/framework/beans/meta/parser/BeanPropertyAnnotationParser.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/BeanPropertyAnnotationParser.java
index 217054c..8f0facc 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/parser/BeanPropertyAnnotationParser.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/BeanPropertyAnnotationParser.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.beans.meta.parser;
+package dev.flyfish.framework.beans.meta.parser;
/**
* bean属性注解解析器
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/parser/BeanPropertyAnnotations.java b/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/BeanPropertyAnnotations.java
similarity index 92%
rename from flyfish-web/src/main/java/com/flyfish/framework/beans/meta/parser/BeanPropertyAnnotations.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/BeanPropertyAnnotations.java
index 9ac9ac1..a374e63 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/parser/BeanPropertyAnnotations.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/BeanPropertyAnnotations.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.beans.meta.parser;
+package dev.flyfish.framework.beans.meta.parser;
-import com.flyfish.framework.beans.meta.parser.chain.BeanPropertyAnnotationBatchChain;
-import com.flyfish.framework.beans.meta.parser.chain.BeanPropertyAnnotationChain;
+import dev.flyfish.framework.beans.meta.parser.chain.BeanPropertyAnnotationBatchChain;
+import dev.flyfish.framework.beans.meta.parser.chain.BeanPropertyAnnotationChain;
import org.springframework.core.annotation.MergedAnnotation;
import org.springframework.core.annotation.MergedAnnotations;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/parser/SimpleBeanPropertyAnnotations.java b/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/SimpleBeanPropertyAnnotations.java
similarity index 91%
rename from flyfish-web/src/main/java/com/flyfish/framework/beans/meta/parser/SimpleBeanPropertyAnnotations.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/SimpleBeanPropertyAnnotations.java
index 2fc78de..08ce8ed 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/parser/SimpleBeanPropertyAnnotations.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/SimpleBeanPropertyAnnotations.java
@@ -1,11 +1,11 @@
-package com.flyfish.framework.beans.meta.parser;
+package dev.flyfish.framework.beans.meta.parser;
-import com.flyfish.framework.beans.meta.parser.chain.BeanPropertyAnnotationBatchChain;
-import com.flyfish.framework.beans.meta.parser.chain.BeanPropertyAnnotationChain;
-import com.flyfish.framework.beans.meta.parser.chain.impl.EmptyAnnotationBatchChain;
-import com.flyfish.framework.beans.meta.parser.chain.impl.EmptyAnnotationChain;
-import com.flyfish.framework.beans.meta.parser.chain.impl.SimpleAnnotationBatchChain;
-import com.flyfish.framework.beans.meta.parser.chain.impl.SimpleAnnotationChain;
+import dev.flyfish.framework.beans.meta.parser.chain.BeanPropertyAnnotationBatchChain;
+import dev.flyfish.framework.beans.meta.parser.chain.BeanPropertyAnnotationChain;
+import dev.flyfish.framework.beans.meta.parser.chain.impl.EmptyAnnotationBatchChain;
+import dev.flyfish.framework.beans.meta.parser.chain.impl.EmptyAnnotationChain;
+import dev.flyfish.framework.beans.meta.parser.chain.impl.SimpleAnnotationBatchChain;
+import dev.flyfish.framework.beans.meta.parser.chain.impl.SimpleAnnotationChain;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.core.annotation.MergedAnnotation;
import org.springframework.core.annotation.MergedAnnotations;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/parser/chain/AnnotationChainSupport.java b/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/AnnotationChainSupport.java
similarity index 80%
rename from flyfish-web/src/main/java/com/flyfish/framework/beans/meta/parser/chain/AnnotationChainSupport.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/AnnotationChainSupport.java
index 750380c..183fcad 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/parser/chain/AnnotationChainSupport.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/AnnotationChainSupport.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.beans.meta.parser.chain;
+package dev.flyfish.framework.beans.meta.parser.chain;
-import com.flyfish.framework.beans.meta.parser.BeanPropertyAnnotations;
+import dev.flyfish.framework.beans.meta.parser.BeanPropertyAnnotations;
/**
* 链式支持
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/parser/chain/BeanPropertyAnnotationBatchChain.java b/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/BeanPropertyAnnotationBatchChain.java
similarity index 96%
rename from flyfish-web/src/main/java/com/flyfish/framework/beans/meta/parser/chain/BeanPropertyAnnotationBatchChain.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/BeanPropertyAnnotationBatchChain.java
index c1e60f4..c725192 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/parser/chain/BeanPropertyAnnotationBatchChain.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/BeanPropertyAnnotationBatchChain.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.beans.meta.parser.chain;
+package dev.flyfish.framework.beans.meta.parser.chain;
import java.lang.annotation.Annotation;
import java.util.List;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/parser/chain/BeanPropertyAnnotationChain.java b/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/BeanPropertyAnnotationChain.java
similarity index 96%
rename from flyfish-web/src/main/java/com/flyfish/framework/beans/meta/parser/chain/BeanPropertyAnnotationChain.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/BeanPropertyAnnotationChain.java
index 0eda8b4..088a613 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/parser/chain/BeanPropertyAnnotationChain.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/BeanPropertyAnnotationChain.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.beans.meta.parser.chain;
+package dev.flyfish.framework.beans.meta.parser.chain;
import java.lang.annotation.Annotation;
import java.util.function.Consumer;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/parser/chain/impl/BasicAnnotationChainSupport.java b/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/impl/BasicAnnotationChainSupport.java
similarity index 80%
rename from flyfish-web/src/main/java/com/flyfish/framework/beans/meta/parser/chain/impl/BasicAnnotationChainSupport.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/impl/BasicAnnotationChainSupport.java
index 4dc6cc4..cbf0fe9 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/parser/chain/impl/BasicAnnotationChainSupport.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/impl/BasicAnnotationChainSupport.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.beans.meta.parser.chain.impl;
+package dev.flyfish.framework.beans.meta.parser.chain.impl;
-import com.flyfish.framework.beans.meta.parser.BeanPropertyAnnotations;
-import com.flyfish.framework.beans.meta.parser.chain.AnnotationChainSupport;
+import dev.flyfish.framework.beans.meta.parser.BeanPropertyAnnotations;
+import dev.flyfish.framework.beans.meta.parser.chain.AnnotationChainSupport;
import lombok.RequiredArgsConstructor;
/**
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/parser/chain/impl/EmptyAnnotationBatchChain.java b/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/impl/EmptyAnnotationBatchChain.java
similarity index 92%
rename from flyfish-web/src/main/java/com/flyfish/framework/beans/meta/parser/chain/impl/EmptyAnnotationBatchChain.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/impl/EmptyAnnotationBatchChain.java
index a113f1d..1832e7c 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/parser/chain/impl/EmptyAnnotationBatchChain.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/impl/EmptyAnnotationBatchChain.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.beans.meta.parser.chain.impl;
+package dev.flyfish.framework.beans.meta.parser.chain.impl;
-import com.flyfish.framework.beans.meta.parser.BeanPropertyAnnotations;
-import com.flyfish.framework.beans.meta.parser.chain.BeanPropertyAnnotationBatchChain;
+import dev.flyfish.framework.beans.meta.parser.BeanPropertyAnnotations;
+import dev.flyfish.framework.beans.meta.parser.chain.BeanPropertyAnnotationBatchChain;
import org.springframework.data.util.CastUtils;
import java.lang.annotation.Annotation;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/parser/chain/impl/EmptyAnnotationChain.java b/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/impl/EmptyAnnotationChain.java
similarity index 92%
rename from flyfish-web/src/main/java/com/flyfish/framework/beans/meta/parser/chain/impl/EmptyAnnotationChain.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/impl/EmptyAnnotationChain.java
index ed19f8d..c889515 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/parser/chain/impl/EmptyAnnotationChain.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/impl/EmptyAnnotationChain.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.beans.meta.parser.chain.impl;
+package dev.flyfish.framework.beans.meta.parser.chain.impl;
-import com.flyfish.framework.beans.meta.parser.BeanPropertyAnnotations;
-import com.flyfish.framework.beans.meta.parser.chain.BeanPropertyAnnotationChain;
+import dev.flyfish.framework.beans.meta.parser.BeanPropertyAnnotations;
+import dev.flyfish.framework.beans.meta.parser.chain.BeanPropertyAnnotationChain;
import org.springframework.data.util.CastUtils;
import java.lang.annotation.Annotation;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/parser/chain/impl/SimpleAnnotationBatchChain.java b/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/impl/SimpleAnnotationBatchChain.java
similarity index 94%
rename from flyfish-web/src/main/java/com/flyfish/framework/beans/meta/parser/chain/impl/SimpleAnnotationBatchChain.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/impl/SimpleAnnotationBatchChain.java
index 4e3f89c..19c4fa8 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/parser/chain/impl/SimpleAnnotationBatchChain.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/impl/SimpleAnnotationBatchChain.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.beans.meta.parser.chain.impl;
+package dev.flyfish.framework.beans.meta.parser.chain.impl;
-import com.flyfish.framework.beans.meta.parser.BeanPropertyAnnotations;
-import com.flyfish.framework.beans.meta.parser.chain.BeanPropertyAnnotationBatchChain;
+import dev.flyfish.framework.beans.meta.parser.BeanPropertyAnnotations;
+import dev.flyfish.framework.beans.meta.parser.chain.BeanPropertyAnnotationBatchChain;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.core.annotation.MergedAnnotation;
import org.springframework.data.util.CastUtils;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/parser/chain/impl/SimpleAnnotationChain.java b/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/impl/SimpleAnnotationChain.java
similarity index 93%
rename from flyfish-web/src/main/java/com/flyfish/framework/beans/meta/parser/chain/impl/SimpleAnnotationChain.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/impl/SimpleAnnotationChain.java
index f4991ec..d8268d9 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/beans/meta/parser/chain/impl/SimpleAnnotationChain.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/beans/meta/parser/chain/impl/SimpleAnnotationChain.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.beans.meta.parser.chain.impl;
+package dev.flyfish.framework.beans.meta.parser.chain.impl;
-import com.flyfish.framework.beans.meta.parser.BeanPropertyAnnotations;
-import com.flyfish.framework.beans.meta.parser.chain.BeanPropertyAnnotationChain;
+import dev.flyfish.framework.beans.meta.parser.BeanPropertyAnnotations;
+import dev.flyfish.framework.beans.meta.parser.chain.BeanPropertyAnnotationChain;
import org.springframework.core.annotation.MergedAnnotation;
import org.springframework.data.util.CastUtils;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/beans/repository/CustomRepositoryBuilder.java b/flyfish-web/src/main/java/dev/flyfish/framework/beans/repository/CustomRepositoryBuilder.java
similarity index 99%
rename from flyfish-web/src/main/java/com/flyfish/framework/beans/repository/CustomRepositoryBuilder.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/beans/repository/CustomRepositoryBuilder.java
index f3759f3..16d2d55 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/beans/repository/CustomRepositoryBuilder.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/beans/repository/CustomRepositoryBuilder.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.beans.repository;
+package dev.flyfish.framework.beans.repository;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/beans/repository/RepositoryRegistrar.java b/flyfish-web/src/main/java/dev/flyfish/framework/beans/repository/RepositoryRegistrar.java
similarity index 96%
rename from flyfish-web/src/main/java/com/flyfish/framework/beans/repository/RepositoryRegistrar.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/beans/repository/RepositoryRegistrar.java
index 10aaed6..d4bc10d 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/beans/repository/RepositoryRegistrar.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/beans/repository/RepositoryRegistrar.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.beans.repository;
+package dev.flyfish.framework.beans.repository;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.beans.factory.support.BeanNameGenerator;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/beans/repository/RepositoryRegistrarComposite.java b/flyfish-web/src/main/java/dev/flyfish/framework/beans/repository/RepositoryRegistrarComposite.java
similarity index 94%
rename from flyfish-web/src/main/java/com/flyfish/framework/beans/repository/RepositoryRegistrarComposite.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/beans/repository/RepositoryRegistrarComposite.java
index f936622..1694d43 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/beans/repository/RepositoryRegistrarComposite.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/beans/repository/RepositoryRegistrarComposite.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.beans.repository;
+package dev.flyfish.framework.beans.repository;
-import com.flyfish.framework.repository.DefaultReactiveRepository;
-import com.flyfish.framework.repository.DefaultRepository;
+import dev.flyfish.framework.repository.DefaultReactiveRepository;
+import dev.flyfish.framework.repository.DefaultRepository;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.beans.factory.support.BeanNameGenerator;
import org.springframework.core.env.Environment;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/beans/repository/SimpleRepositoryRegistrar.java b/flyfish-web/src/main/java/dev/flyfish/framework/beans/repository/SimpleRepositoryRegistrar.java
similarity index 98%
rename from flyfish-web/src/main/java/com/flyfish/framework/beans/repository/SimpleRepositoryRegistrar.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/beans/repository/SimpleRepositoryRegistrar.java
index c7b33d7..e9e542b 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/beans/repository/SimpleRepositoryRegistrar.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/beans/repository/SimpleRepositoryRegistrar.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.beans.repository;
+package dev.flyfish.framework.beans.repository;
import org.apache.commons.lang3.ClassUtils;
import org.apache.commons.lang3.StringUtils;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/beans/resolver/DynamicRestBeanResolver.java b/flyfish-web/src/main/java/dev/flyfish/framework/beans/resolver/DynamicRestBeanResolver.java
similarity index 89%
rename from flyfish-web/src/main/java/com/flyfish/framework/beans/resolver/DynamicRestBeanResolver.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/beans/resolver/DynamicRestBeanResolver.java
index e2ad200..29b74c7 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/beans/resolver/DynamicRestBeanResolver.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/beans/resolver/DynamicRestBeanResolver.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.beans.resolver;
+package dev.flyfish.framework.beans.resolver;
-import com.flyfish.framework.compiler.DynamicJavaCompiler;
+import dev.flyfish.framework.compiler.DynamicJavaCompiler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.context.annotation.Lazy;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/boot/FlyfishAppRunner.java b/flyfish-web/src/main/java/dev/flyfish/framework/boot/FlyfishAppRunner.java
similarity index 75%
rename from flyfish-web/src/main/java/com/flyfish/framework/boot/FlyfishAppRunner.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/boot/FlyfishAppRunner.java
index 1d54e85..c3d8e39 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/boot/FlyfishAppRunner.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/boot/FlyfishAppRunner.java
@@ -1,8 +1,7 @@
-package com.flyfish.framework.boot;
+package dev.flyfish.framework.boot;
-import com.flyfish.framework.compiler.core.ClassLoaders;
-import com.flyfish.framework.compiler.support.DelegateJavaCompiler;
+import dev.flyfish.framework.compiler.core.ClassLoaders;
import org.springframework.boot.SpringApplication;
import org.springframework.context.ConfigurableApplicationContext;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/config/BeanConfig.java b/flyfish-web/src/main/java/dev/flyfish/framework/config/BeanConfig.java
similarity index 92%
rename from flyfish-web/src/main/java/com/flyfish/framework/config/BeanConfig.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/config/BeanConfig.java
index 1469cec..8c405a9 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/config/BeanConfig.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/config/BeanConfig.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.config;
+package dev.flyfish.framework.config;
-import com.flyfish.framework.beans.resolver.DynamicRestBeanResolver;
+import dev.flyfish.framework.beans.resolver.DynamicRestBeanResolver;
import org.springframework.boot.autoconfigure.web.ServerProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.http.server.reactive.ServerHttpRequest;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/config/RestBeanAutoConfigure.java b/flyfish-web/src/main/java/dev/flyfish/framework/config/RestBeanAutoConfigure.java
similarity index 91%
rename from flyfish-web/src/main/java/com/flyfish/framework/config/RestBeanAutoConfigure.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/config/RestBeanAutoConfigure.java
index 26e0791..37df464 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/config/RestBeanAutoConfigure.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/config/RestBeanAutoConfigure.java
@@ -1,19 +1,19 @@
-package com.flyfish.framework.config;
+package dev.flyfish.framework.config;
-import com.flyfish.framework.beans.annotations.EnableRestBeanDetect;
-import com.flyfish.framework.beans.enums.RestBeanCandidate;
-import com.flyfish.framework.beans.meta.RestBean;
-import com.flyfish.framework.beans.repository.RepositoryRegistrar;
-import com.flyfish.framework.beans.resolver.DynamicRestBeanResolver;
-import com.flyfish.framework.compiler.DynamicJavaCompiler;
-import com.flyfish.framework.compiler.support.JavaSource;
-import com.flyfish.framework.compiler.template.TemplateCompiler;
-import com.flyfish.framework.domain.base.Vo;
-import com.flyfish.framework.repository.DefaultReactiveRepository;
-import com.flyfish.framework.repository.DefaultRepository;
-import com.flyfish.framework.utils.Assert;
-import com.flyfish.framework.utils.ClassPathResourceScanner;
-import com.flyfish.framework.utils.StringFormats;
+import dev.flyfish.framework.beans.annotations.EnableRestBeanDetect;
+import dev.flyfish.framework.beans.enums.RestBeanCandidate;
+import dev.flyfish.framework.beans.meta.RestBean;
+import dev.flyfish.framework.beans.repository.RepositoryRegistrar;
+import dev.flyfish.framework.beans.resolver.DynamicRestBeanResolver;
+import dev.flyfish.framework.compiler.DynamicJavaCompiler;
+import dev.flyfish.framework.compiler.support.JavaSource;
+import dev.flyfish.framework.compiler.template.TemplateCompiler;
+import dev.flyfish.framework.domain.base.Vo;
+import dev.flyfish.framework.repository.DefaultReactiveRepository;
+import dev.flyfish.framework.repository.DefaultRepository;
+import dev.flyfish.framework.utils.Assert;
+import dev.flyfish.framework.utils.ClassPathResourceScanner;
+import dev.flyfish.framework.utils.StringFormats;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
@@ -35,7 +35,7 @@ import java.util.function.Function;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import static com.flyfish.framework.beans.enums.RestBeanCandidate.*;
+import static dev.flyfish.framework.beans.enums.RestBeanCandidate.*;
/**
* rest bean的自动配置
@@ -82,7 +82,7 @@ public class RestBeanAutoConfigure implements ImportBeanDefinitionRegistrar, Res
RepositoryRegistrar repositoryRegistrar = RepositoryRegistrar.newInstance(metadata)
.init(metadata, resourceLoader, environment, registry, beanNameGenerator);
// 寻找基本包路径
- String basePackage = basePackages.stream().findFirst().orElse("com.flyfish.project");
+ String basePackage = basePackages.stream().findFirst().orElse("dev.flyfish.project");
// 获取被注解的类，开始编译
Stream> classes = ClassPathResourceScanner.forAnnotation(RestBean.class).scan(basePackages);
// 并发编译，快速接入，准备注册的repo
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/configuration/WebfluxConfig.java b/flyfish-web/src/main/java/dev/flyfish/framework/configuration/WebfluxConfig.java
similarity index 89%
rename from flyfish-web/src/main/java/com/flyfish/framework/configuration/WebfluxConfig.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/configuration/WebfluxConfig.java
index f881d1f..6447542 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/configuration/WebfluxConfig.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/configuration/WebfluxConfig.java
@@ -1,12 +1,12 @@
-package com.flyfish.framework.configuration;
+package dev.flyfish.framework.configuration;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.flyfish.framework.configuration.resolver.PageQueryArgumentResolver;
-import com.flyfish.framework.configuration.resolver.RequestContextBodyArgumentResolver;
-import com.flyfish.framework.configuration.resolver.UserArgumentResolver;
-import com.flyfish.framework.configuration.resolver.ValidRequestBodyMethodArgumentResolver;
-import com.flyfish.framework.context.SpringContext;
+import dev.flyfish.framework.configuration.resolver.PageQueryArgumentResolver;
+import dev.flyfish.framework.configuration.resolver.RequestContextBodyArgumentResolver;
+import dev.flyfish.framework.configuration.resolver.UserArgumentResolver;
+import dev.flyfish.framework.configuration.resolver.ValidRequestBodyMethodArgumentResolver;
+import dev.flyfish.framework.context.SpringContext;
import jakarta.annotation.Resource;
import org.springframework.boot.autoconfigure.jackson.JacksonProperties;
import org.springframework.context.annotation.Configuration;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/configuration/annotations/CurrentUser.java b/flyfish-web/src/main/java/dev/flyfish/framework/configuration/annotations/CurrentUser.java
similarity index 86%
rename from flyfish-web/src/main/java/com/flyfish/framework/configuration/annotations/CurrentUser.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/configuration/annotations/CurrentUser.java
index 31ba50d..8acc240 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/configuration/annotations/CurrentUser.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/configuration/annotations/CurrentUser.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.configuration.annotations;
+package dev.flyfish.framework.configuration.annotations;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/configuration/annotations/PagedQuery.java b/flyfish-web/src/main/java/dev/flyfish/framework/configuration/annotations/PagedQuery.java
similarity index 84%
rename from flyfish-web/src/main/java/com/flyfish/framework/configuration/annotations/PagedQuery.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/configuration/annotations/PagedQuery.java
index 331a519..35b7842 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/configuration/annotations/PagedQuery.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/configuration/annotations/PagedQuery.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.configuration.annotations;
+package dev.flyfish.framework.configuration.annotations;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/configuration/annotations/RequestContextBody.java b/flyfish-web/src/main/java/dev/flyfish/framework/configuration/annotations/RequestContextBody.java
similarity index 86%
rename from flyfish-web/src/main/java/com/flyfish/framework/configuration/annotations/RequestContextBody.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/configuration/annotations/RequestContextBody.java
index 20ba596..e3c7caf 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/configuration/annotations/RequestContextBody.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/configuration/annotations/RequestContextBody.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.configuration.annotations;
+package dev.flyfish.framework.configuration.annotations;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/configuration/annotations/ValidRequestBody.java b/flyfish-web/src/main/java/dev/flyfish/framework/configuration/annotations/ValidRequestBody.java
similarity index 82%
rename from flyfish-web/src/main/java/com/flyfish/framework/configuration/annotations/ValidRequestBody.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/configuration/annotations/ValidRequestBody.java
index bd66b1d..87900c4 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/configuration/annotations/ValidRequestBody.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/configuration/annotations/ValidRequestBody.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.configuration.annotations;
+package dev.flyfish.framework.configuration.annotations;
import java.lang.annotation.*;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/configuration/backup/.gitkeep b/flyfish-web/src/main/java/dev/flyfish/framework/configuration/backup/.gitkeep
similarity index 100%
rename from flyfish-web/src/main/java/com/flyfish/framework/configuration/backup/.gitkeep
rename to flyfish-web/src/main/java/dev/flyfish/framework/configuration/backup/.gitkeep
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/configuration/boot/FlyfishApplication.java b/flyfish-web/src/main/java/dev/flyfish/framework/configuration/boot/FlyfishApplication.java
similarity index 88%
rename from flyfish-web/src/main/java/com/flyfish/framework/configuration/boot/FlyfishApplication.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/configuration/boot/FlyfishApplication.java
index d355b94..854bee2 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/configuration/boot/FlyfishApplication.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/configuration/boot/FlyfishApplication.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.configuration.boot;
+package dev.flyfish.framework.configuration.boot;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.EnableAspectJAutoProxy;
@@ -30,5 +30,5 @@ public @interface FlyfishApplication {
@AliasFor(
annotation = SpringBootApplication.class
)
- String[] scanBasePackages() default "com.flyfish";
+ String[] scanBasePackages() default "dev.flyfish";
}
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/configuration/jwt/JwtProperties.java b/flyfish-web/src/main/java/dev/flyfish/framework/configuration/jwt/JwtProperties.java
similarity index 95%
rename from flyfish-web/src/main/java/com/flyfish/framework/configuration/jwt/JwtProperties.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/configuration/jwt/JwtProperties.java
index 3db3644..63e34a6 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/configuration/jwt/JwtProperties.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/configuration/jwt/JwtProperties.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.configuration.jwt;
+package dev.flyfish.framework.configuration.jwt;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/configuration/jwt/JwtSecurityContextRepository.java b/flyfish-web/src/main/java/dev/flyfish/framework/configuration/jwt/JwtSecurityContextRepository.java
similarity index 95%
rename from flyfish-web/src/main/java/com/flyfish/framework/configuration/jwt/JwtSecurityContextRepository.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/configuration/jwt/JwtSecurityContextRepository.java
index d799194..ac2e4ba 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/configuration/jwt/JwtSecurityContextRepository.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/configuration/jwt/JwtSecurityContextRepository.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.configuration.jwt;
+package dev.flyfish.framework.configuration.jwt;
-import com.flyfish.framework.service.FlyfishUserDetailsService;
+import dev.flyfish.framework.service.FlyfishUserDetailsService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.server.reactive.ServerHttpRequest;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/configuration/jwt/TokenProvider.java b/flyfish-web/src/main/java/dev/flyfish/framework/configuration/jwt/TokenProvider.java
similarity index 98%
rename from flyfish-web/src/main/java/com/flyfish/framework/configuration/jwt/TokenProvider.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/configuration/jwt/TokenProvider.java
index 4650534..de05bba 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/configuration/jwt/TokenProvider.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/configuration/jwt/TokenProvider.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.configuration.jwt;
+package dev.flyfish.framework.configuration.jwt;
-import com.flyfish.framework.utils.ReactiveRedisOperations;
-import com.flyfish.framework.utils.UUIDUtils;
+import dev.flyfish.framework.utils.ReactiveRedisOperations;
+import dev.flyfish.framework.utils.UUIDUtils;
import io.jsonwebtoken.*;
import io.jsonwebtoken.io.Decoders;
import io.jsonwebtoken.io.DecodingException;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/configuration/mail/.gitkeep b/flyfish-web/src/main/java/dev/flyfish/framework/configuration/mail/.gitkeep
similarity index 100%
rename from flyfish-web/src/main/java/com/flyfish/framework/configuration/mail/.gitkeep
rename to flyfish-web/src/main/java/dev/flyfish/framework/configuration/mail/.gitkeep
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/configuration/redis/EnableReactiveRedis.java b/flyfish-web/src/main/java/dev/flyfish/framework/configuration/redis/EnableReactiveRedis.java
similarity index 85%
rename from flyfish-web/src/main/java/com/flyfish/framework/configuration/redis/EnableReactiveRedis.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/configuration/redis/EnableReactiveRedis.java
index f1d0ad0..4a2c20a 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/configuration/redis/EnableReactiveRedis.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/configuration/redis/EnableReactiveRedis.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.configuration.redis;
+package dev.flyfish.framework.configuration.redis;
import org.springframework.context.annotation.Import;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/configuration/redis/EnableRedis.java b/flyfish-web/src/main/java/dev/flyfish/framework/configuration/redis/EnableRedis.java
similarity index 84%
rename from flyfish-web/src/main/java/com/flyfish/framework/configuration/redis/EnableRedis.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/configuration/redis/EnableRedis.java
index b40c7c6..03a3be5 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/configuration/redis/EnableRedis.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/configuration/redis/EnableRedis.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.configuration.redis;
+package dev.flyfish.framework.configuration.redis;
import org.springframework.context.annotation.Import;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/configuration/redis/JacksonRedisSerializerFactory.java b/flyfish-web/src/main/java/dev/flyfish/framework/configuration/redis/JacksonRedisSerializerFactory.java
similarity index 93%
rename from flyfish-web/src/main/java/com/flyfish/framework/configuration/redis/JacksonRedisSerializerFactory.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/configuration/redis/JacksonRedisSerializerFactory.java
index 0a79754..bae05c9 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/configuration/redis/JacksonRedisSerializerFactory.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/configuration/redis/JacksonRedisSerializerFactory.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.configuration.redis;
+package dev.flyfish.framework.configuration.redis;
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.PropertyAccessor;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/configuration/redis/ReactiveRedisConfig.java b/flyfish-web/src/main/java/dev/flyfish/framework/configuration/redis/ReactiveRedisConfig.java
similarity index 95%
rename from flyfish-web/src/main/java/com/flyfish/framework/configuration/redis/ReactiveRedisConfig.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/configuration/redis/ReactiveRedisConfig.java
index a7eeb85..69c3d2f 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/configuration/redis/ReactiveRedisConfig.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/configuration/redis/ReactiveRedisConfig.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.configuration.redis;
+package dev.flyfish.framework.configuration.redis;
-import com.flyfish.framework.utils.ReactiveRedisOperations;
+import dev.flyfish.framework.utils.ReactiveRedisOperations;
import org.springframework.context.annotation.Bean;
import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
import org.springframework.data.redis.core.ReactiveRedisTemplate;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/configuration/redis/RedisConfig.java b/flyfish-web/src/main/java/dev/flyfish/framework/configuration/redis/RedisConfig.java
similarity index 94%
rename from flyfish-web/src/main/java/com/flyfish/framework/configuration/redis/RedisConfig.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/configuration/redis/RedisConfig.java
index faf5ff8..5b8a7b6 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/configuration/redis/RedisConfig.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/configuration/redis/RedisConfig.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.configuration.redis;
+package dev.flyfish.framework.configuration.redis;
-import com.flyfish.framework.utils.RedisOperations;
+import dev.flyfish.framework.utils.RedisOperations;
import org.springframework.context.annotation.Bean;
import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
import org.springframework.data.redis.core.RedisTemplate;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/configuration/resolver/ModelAttributeFilter.java b/flyfish-web/src/main/java/dev/flyfish/framework/configuration/resolver/ModelAttributeFilter.java
similarity index 99%
rename from flyfish-web/src/main/java/com/flyfish/framework/configuration/resolver/ModelAttributeFilter.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/configuration/resolver/ModelAttributeFilter.java
index a3083fd..c50ad68 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/configuration/resolver/ModelAttributeFilter.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/configuration/resolver/ModelAttributeFilter.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.configuration.resolver;
+package dev.flyfish.framework.configuration.resolver;
import org.springframework.beans.BeanUtils;
import org.springframework.core.*;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/configuration/resolver/PageParameterFilter.java b/flyfish-web/src/main/java/dev/flyfish/framework/configuration/resolver/PageParameterFilter.java
similarity index 99%
rename from flyfish-web/src/main/java/com/flyfish/framework/configuration/resolver/PageParameterFilter.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/configuration/resolver/PageParameterFilter.java
index 5975518..d7975ac 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/configuration/resolver/PageParameterFilter.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/configuration/resolver/PageParameterFilter.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.configuration.resolver;
+package dev.flyfish.framework.configuration.resolver;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.core.MethodParameter;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/configuration/resolver/PageQueryArgumentResolver.java b/flyfish-web/src/main/java/dev/flyfish/framework/configuration/resolver/PageQueryArgumentResolver.java
similarity index 92%
rename from flyfish-web/src/main/java/com/flyfish/framework/configuration/resolver/PageQueryArgumentResolver.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/configuration/resolver/PageQueryArgumentResolver.java
index 5f7d1fd..18b922f 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/configuration/resolver/PageQueryArgumentResolver.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/configuration/resolver/PageQueryArgumentResolver.java
@@ -1,8 +1,8 @@
-package com.flyfish.framework.configuration.resolver;
+package dev.flyfish.framework.configuration.resolver;
-import com.flyfish.framework.configuration.annotations.PagedQuery;
-import com.flyfish.framework.domain.base.Qo;
-import com.flyfish.framework.utils.UserUtils;
+import dev.flyfish.framework.configuration.annotations.PagedQuery;
+import dev.flyfish.framework.domain.base.Qo;
+import dev.flyfish.framework.utils.UserUtils;
import org.springframework.core.MethodParameter;
import org.springframework.core.ReactiveAdapterRegistry;
import org.springframework.data.domain.Pageable;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/configuration/resolver/ParameterFilter.java b/flyfish-web/src/main/java/dev/flyfish/framework/configuration/resolver/ParameterFilter.java
similarity index 92%
rename from flyfish-web/src/main/java/com/flyfish/framework/configuration/resolver/ParameterFilter.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/configuration/resolver/ParameterFilter.java
index dd0cb07..d3c13cb 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/configuration/resolver/ParameterFilter.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/configuration/resolver/ParameterFilter.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.configuration.resolver;
+package dev.flyfish.framework.configuration.resolver;
import org.springframework.core.MethodParameter;
import org.springframework.web.reactive.BindingContext;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/configuration/resolver/RequestContextBodyArgumentResolver.java b/flyfish-web/src/main/java/dev/flyfish/framework/configuration/resolver/RequestContextBodyArgumentResolver.java
similarity index 88%
rename from flyfish-web/src/main/java/com/flyfish/framework/configuration/resolver/RequestContextBodyArgumentResolver.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/configuration/resolver/RequestContextBodyArgumentResolver.java
index 5e2c9bf..ac557ff 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/configuration/resolver/RequestContextBodyArgumentResolver.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/configuration/resolver/RequestContextBodyArgumentResolver.java
@@ -1,14 +1,13 @@
-package com.flyfish.framework.configuration.resolver;
+package dev.flyfish.framework.configuration.resolver;
-import com.flyfish.framework.configuration.annotations.RequestContextBody;
-import com.flyfish.framework.domain.base.Domain;
-import com.flyfish.framework.utils.UserUtils;
+import dev.flyfish.framework.configuration.annotations.RequestContextBody;
+import dev.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.utils.UserUtils;
import org.springframework.core.MethodParameter;
import org.springframework.core.ReactiveAdapterRegistry;
import org.springframework.http.codec.HttpMessageReader;
import org.springframework.security.core.context.ReactiveSecurityContextHolder;
import org.springframework.util.Assert;
-import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.reactive.BindingContext;
import org.springframework.web.reactive.result.method.annotation.AbstractMessageReaderArgumentResolver;
import org.springframework.web.server.ServerWebExchange;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/configuration/resolver/SortParameterFilter.java b/flyfish-web/src/main/java/dev/flyfish/framework/configuration/resolver/SortParameterFilter.java
similarity index 99%
rename from flyfish-web/src/main/java/com/flyfish/framework/configuration/resolver/SortParameterFilter.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/configuration/resolver/SortParameterFilter.java
index 69ee67b..850b91f 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/configuration/resolver/SortParameterFilter.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/configuration/resolver/SortParameterFilter.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.configuration.resolver;
+package dev.flyfish.framework.configuration.resolver;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.core.MethodParameter;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/configuration/resolver/UserArgumentResolver.java b/flyfish-web/src/main/java/dev/flyfish/framework/configuration/resolver/UserArgumentResolver.java
similarity index 85%
rename from flyfish-web/src/main/java/com/flyfish/framework/configuration/resolver/UserArgumentResolver.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/configuration/resolver/UserArgumentResolver.java
index 6187efa..ff190e6 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/configuration/resolver/UserArgumentResolver.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/configuration/resolver/UserArgumentResolver.java
@@ -1,8 +1,8 @@
-package com.flyfish.framework.configuration.resolver;
+package dev.flyfish.framework.configuration.resolver;
-import com.flyfish.framework.configuration.annotations.CurrentUser;
-import com.flyfish.framework.domain.po.User;
-import com.flyfish.framework.utils.UserUtils;
+import dev.flyfish.framework.configuration.annotations.CurrentUser;
+import dev.flyfish.framework.domain.po.User;
+import dev.flyfish.framework.utils.UserUtils;
import org.springframework.core.MethodParameter;
import org.springframework.core.ReactiveAdapterRegistry;
import org.springframework.security.core.context.ReactiveSecurityContextHolder;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/configuration/resolver/ValidRequestBodyMethodArgumentResolver.java b/flyfish-web/src/main/java/dev/flyfish/framework/configuration/resolver/ValidRequestBodyMethodArgumentResolver.java
similarity index 96%
rename from flyfish-web/src/main/java/com/flyfish/framework/configuration/resolver/ValidRequestBodyMethodArgumentResolver.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/configuration/resolver/ValidRequestBodyMethodArgumentResolver.java
index a2555b8..e3f7ecb 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/configuration/resolver/ValidRequestBodyMethodArgumentResolver.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/configuration/resolver/ValidRequestBodyMethodArgumentResolver.java
@@ -1,10 +1,10 @@
-package com.flyfish.framework.configuration.resolver;
+package dev.flyfish.framework.configuration.resolver;
-import com.flyfish.framework.configuration.annotations.ValidRequestBody;
-import com.flyfish.framework.validation.groups.CodeValid;
-import com.flyfish.framework.validation.groups.NameValid;
-import com.flyfish.framework.validation.spi.ConditionalGroup;
-import com.flyfish.framework.validation.spi.ConditionalValidGroupProvider;
+import dev.flyfish.framework.configuration.annotations.ValidRequestBody;
+import dev.flyfish.framework.validation.groups.CodeValid;
+import dev.flyfish.framework.validation.groups.NameValid;
+import dev.flyfish.framework.validation.spi.ConditionalGroup;
+import dev.flyfish.framework.validation.spi.ConditionalValidGroupProvider;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.core.*;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/controller/BaseController.java b/flyfish-web/src/main/java/dev/flyfish/framework/controller/BaseController.java
similarity index 81%
rename from flyfish-web/src/main/java/com/flyfish/framework/controller/BaseController.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/controller/BaseController.java
index 5ec5a66..7363c65 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/controller/BaseController.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/controller/BaseController.java
@@ -1,23 +1,22 @@
-package com.flyfish.framework.controller;
+package dev.flyfish.framework.controller;
-import com.flyfish.framework.annotations.Operation;
-import com.flyfish.framework.bean.Result;
-import com.flyfish.framework.bean.SyncVo;
-import com.flyfish.framework.configuration.annotations.CurrentUser;
-import com.flyfish.framework.configuration.annotations.PagedQuery;
-import com.flyfish.framework.configuration.annotations.ValidRequestBody;
-import com.flyfish.framework.constant.ReactiveConstants;
-import com.flyfish.framework.context.UserContext;
-import com.flyfish.framework.domain.base.Domain;
-import com.flyfish.framework.domain.base.Qo;
-import com.flyfish.framework.domain.po.User;
-import com.flyfish.framework.service.BaseReactiveService;
-import com.flyfish.framework.service.BaseService;
+import dev.flyfish.framework.annotations.Operation;
+import dev.flyfish.framework.bean.Result;
+import dev.flyfish.framework.bean.SyncVo;
+import dev.flyfish.framework.configuration.annotations.CurrentUser;
+import dev.flyfish.framework.configuration.annotations.PagedQuery;
+import dev.flyfish.framework.configuration.annotations.ValidRequestBody;
+import dev.flyfish.framework.constant.ReactiveConstants;
+import dev.flyfish.framework.context.UserContext;
+import dev.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.domain.base.Qo;
+import dev.flyfish.framework.domain.po.User;
+import dev.flyfish.framework.service.BaseReactiveService;
+import dev.flyfish.framework.service.BaseService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import reactor.core.publisher.Mono;
-import java.util.Arrays;
import java.util.List;
/**
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/controller/EnumController.java b/flyfish-web/src/main/java/dev/flyfish/framework/controller/EnumController.java
similarity index 86%
rename from flyfish-web/src/main/java/com/flyfish/framework/controller/EnumController.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/controller/EnumController.java
index c5f85d2..03ce083 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/controller/EnumController.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/controller/EnumController.java
@@ -1,10 +1,10 @@
-package com.flyfish.framework.controller;
+package dev.flyfish.framework.controller;
-import com.flyfish.framework.bean.EnumValue;
-import com.flyfish.framework.bean.Result;
-import com.flyfish.framework.enums.NamedEnum;
-import com.flyfish.framework.utils.ClassPathResourceScanner;
-import com.flyfish.framework.utils.StringFormats;
+import dev.flyfish.framework.bean.EnumValue;
+import dev.flyfish.framework.bean.Result;
+import dev.flyfish.framework.enums.NamedEnum;
+import dev.flyfish.framework.utils.ClassPathResourceScanner;
+import dev.flyfish.framework.utils.StringFormats;
import org.apache.commons.lang3.ClassUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@@ -32,7 +32,7 @@ public class EnumController {
public EnumController() {
// 注入
ClassPathResourceScanner.forSuperType(NamedEnum.class)
- .scan("com.flyfish.project", "com.flyfish.framework")
+ .scan("dev.flyfish.project", "dev.flyfish.framework")
.filter(clazz -> ClassUtils.isAssignable(clazz, Enum.class))
.forEach(clazz -> {
String name = StringFormats.camel2Line(ClassUtils.getShortClassName(clazz));
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/controller/SafeController.java b/flyfish-web/src/main/java/dev/flyfish/framework/controller/SafeController.java
similarity index 71%
rename from flyfish-web/src/main/java/com/flyfish/framework/controller/SafeController.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/controller/SafeController.java
index 255f5a8..7e04290 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/controller/SafeController.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/controller/SafeController.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.controller;
+package dev.flyfish.framework.controller;
/**
* 安全的controller
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/controller/TreeController.java b/flyfish-web/src/main/java/dev/flyfish/framework/controller/TreeController.java
similarity index 91%
rename from flyfish-web/src/main/java/com/flyfish/framework/controller/TreeController.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/controller/TreeController.java
index 831bab3..3dd0596 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/controller/TreeController.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/controller/TreeController.java
@@ -1,8 +1,8 @@
-package com.flyfish.framework.controller;
+package dev.flyfish.framework.controller;
-import com.flyfish.framework.bean.Result;
-import com.flyfish.framework.domain.tree.TreeDomain;
-import com.flyfish.framework.domain.tree.TreeQo;
+import dev.flyfish.framework.bean.Result;
+import dev.flyfish.framework.domain.tree.TreeDomain;
+import dev.flyfish.framework.domain.tree.TreeQo;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.web.bind.annotation.GetMapping;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/controller/reactive/ReactiveBaseController.java b/flyfish-web/src/main/java/dev/flyfish/framework/controller/reactive/ReactiveBaseController.java
similarity index 87%
rename from flyfish-web/src/main/java/com/flyfish/framework/controller/reactive/ReactiveBaseController.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/controller/reactive/ReactiveBaseController.java
index 4e4287a..93ec179 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/controller/reactive/ReactiveBaseController.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/controller/reactive/ReactiveBaseController.java
@@ -1,14 +1,14 @@
-package com.flyfish.framework.controller.reactive;
+package dev.flyfish.framework.controller.reactive;
-import com.flyfish.framework.annotations.Operation;
-import com.flyfish.framework.bean.Result;
-import com.flyfish.framework.bean.SyncVo;
-import com.flyfish.framework.configuration.annotations.PagedQuery;
-import com.flyfish.framework.configuration.annotations.ValidRequestBody;
-import com.flyfish.framework.controller.SafeController;
-import com.flyfish.framework.domain.base.Domain;
-import com.flyfish.framework.domain.base.Qo;
-import com.flyfish.framework.service.BaseReactiveService;
+import dev.flyfish.framework.annotations.Operation;
+import dev.flyfish.framework.bean.Result;
+import dev.flyfish.framework.bean.SyncVo;
+import dev.flyfish.framework.configuration.annotations.PagedQuery;
+import dev.flyfish.framework.configuration.annotations.ValidRequestBody;
+import dev.flyfish.framework.controller.SafeController;
+import dev.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.domain.base.Qo;
+import dev.flyfish.framework.service.BaseReactiveService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.util.CastUtils;
import org.springframework.web.bind.annotation.*;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/controller/reactive/ReactiveTreeController.java b/flyfish-web/src/main/java/dev/flyfish/framework/controller/reactive/ReactiveTreeController.java
similarity index 91%
rename from flyfish-web/src/main/java/com/flyfish/framework/controller/reactive/ReactiveTreeController.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/controller/reactive/ReactiveTreeController.java
index 7980a42..68daccb 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/controller/reactive/ReactiveTreeController.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/controller/reactive/ReactiveTreeController.java
@@ -1,10 +1,10 @@
-package com.flyfish.framework.controller.reactive;
+package dev.flyfish.framework.controller.reactive;
-import com.flyfish.framework.bean.Result;
-import com.flyfish.framework.configuration.annotations.PagedQuery;
-import com.flyfish.framework.domain.tree.RootTreeNode;
-import com.flyfish.framework.domain.tree.TreeDomain;
-import com.flyfish.framework.domain.tree.TreeQo;
+import dev.flyfish.framework.bean.Result;
+import dev.flyfish.framework.configuration.annotations.PagedQuery;
+import dev.flyfish.framework.domain.tree.RootTreeNode;
+import dev.flyfish.framework.domain.tree.TreeDomain;
+import dev.flyfish.framework.domain.tree.TreeQo;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.web.bind.annotation.GetMapping;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/excel/controller/ExcelMappingController.java b/flyfish-web/src/main/java/dev/flyfish/framework/excel/controller/ExcelMappingController.java
similarity index 61%
rename from flyfish-web/src/main/java/com/flyfish/framework/excel/controller/ExcelMappingController.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/excel/controller/ExcelMappingController.java
index f92b8af..aae8806 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/excel/controller/ExcelMappingController.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/excel/controller/ExcelMappingController.java
@@ -1,9 +1,9 @@
-package com.flyfish.framework.excel.controller;
+package dev.flyfish.framework.excel.controller;
-import com.flyfish.framework.controller.reactive.ReactiveBaseController;
-import com.flyfish.framework.domain.base.NameLikeQo;
-import com.flyfish.framework.domain.po.ExcelMapping;
+import dev.flyfish.framework.controller.reactive.ReactiveBaseController;
+import dev.flyfish.framework.domain.base.NameLikeQo;
+import dev.flyfish.framework.domain.po.ExcelMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
diff --git a/flyfish-web/src/main/java/dev/flyfish/framework/excel/repository/ExcelMappingRepository.java b/flyfish-web/src/main/java/dev/flyfish/framework/excel/repository/ExcelMappingRepository.java
new file mode 100644
index 0000000..b7e4407
--- /dev/null
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/excel/repository/ExcelMappingRepository.java
@@ -0,0 +1,13 @@
+package dev.flyfish.framework.excel.repository;
+
+import dev.flyfish.framework.domain.po.ExcelMapping;
+import dev.flyfish.framework.repository.DefaultReactiveRepository;
+
+/**
+ * excel导入方案
+ *
+ * @author wangyu
+ */
+public interface ExcelMappingRepository extends DefaultReactiveRepository {
+
+}
diff --git a/flyfish-web/src/main/java/dev/flyfish/framework/excel/service/ExcelMappingService.java b/flyfish-web/src/main/java/dev/flyfish/framework/excel/service/ExcelMappingService.java
new file mode 100644
index 0000000..bbde630
--- /dev/null
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/excel/service/ExcelMappingService.java
@@ -0,0 +1,9 @@
+package dev.flyfish.framework.excel.service;
+
+import dev.flyfish.framework.domain.po.ExcelMapping;
+import dev.flyfish.framework.service.impl.BaseReactiveServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ExcelMappingService extends BaseReactiveServiceImpl {
+}
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/handler/GlobalExceptionHandler.java b/flyfish-web/src/main/java/dev/flyfish/framework/handler/GlobalExceptionHandler.java
similarity index 88%
rename from flyfish-web/src/main/java/com/flyfish/framework/handler/GlobalExceptionHandler.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/handler/GlobalExceptionHandler.java
index ff44ff3..19c8559 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/handler/GlobalExceptionHandler.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/handler/GlobalExceptionHandler.java
@@ -1,12 +1,12 @@
-package com.flyfish.framework.handler;
+package dev.flyfish.framework.handler;
-import com.flyfish.framework.bean.BaseResponse;
-import com.flyfish.framework.bean.Result;
-import com.flyfish.framework.controller.SafeController;
-import com.flyfish.framework.exception.BaseException;
-import com.flyfish.framework.exception.auth.ClientTokenException;
-import com.flyfish.framework.exception.auth.UserInvalidException;
-import com.flyfish.framework.exception.auth.UserTokenException;
+import dev.flyfish.framework.bean.BaseResponse;
+import dev.flyfish.framework.bean.Result;
+import dev.flyfish.framework.controller.SafeController;
+import dev.flyfish.framework.exception.BaseException;
+import dev.flyfish.framework.exception.auth.ClientTokenException;
+import dev.flyfish.framework.exception.auth.UserInvalidException;
+import dev.flyfish.framework.exception.auth.UserTokenException;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/handler/JsonAuthenticationFailureHandler.java b/flyfish-web/src/main/java/dev/flyfish/framework/handler/JsonAuthenticationFailureHandler.java
similarity index 89%
rename from flyfish-web/src/main/java/com/flyfish/framework/handler/JsonAuthenticationFailureHandler.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/handler/JsonAuthenticationFailureHandler.java
index b72403e..6190654 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/handler/JsonAuthenticationFailureHandler.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/handler/JsonAuthenticationFailureHandler.java
@@ -1,8 +1,8 @@
-package com.flyfish.framework.handler;
+package dev.flyfish.framework.handler;
-import com.flyfish.framework.bean.Result;
-import com.flyfish.framework.service.AuthenticationAuditor;
-import com.flyfish.framework.utils.AuthenticationMessages;
+import dev.flyfish.framework.bean.Result;
+import dev.flyfish.framework.service.AuthenticationAuditor;
+import dev.flyfish.framework.utils.AuthenticationMessages;
import org.springframework.http.MediaType;
import org.springframework.http.server.reactive.ServerHttpResponse;
import org.springframework.security.core.AuthenticationException;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/handler/JsonAuthenticationSuccessHandler.java b/flyfish-web/src/main/java/dev/flyfish/framework/handler/JsonAuthenticationSuccessHandler.java
similarity index 92%
rename from flyfish-web/src/main/java/com/flyfish/framework/handler/JsonAuthenticationSuccessHandler.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/handler/JsonAuthenticationSuccessHandler.java
index eab3a94..86a5371 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/handler/JsonAuthenticationSuccessHandler.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/handler/JsonAuthenticationSuccessHandler.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.handler;
+package dev.flyfish.framework.handler;
-import com.flyfish.framework.bean.Result;
-import com.flyfish.framework.service.AuthenticationAuditor;
+import dev.flyfish.framework.bean.Result;
+import dev.flyfish.framework.service.AuthenticationAuditor;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/handler/JsonLogoutSuccessHandler.java b/flyfish-web/src/main/java/dev/flyfish/framework/handler/JsonLogoutSuccessHandler.java
similarity index 88%
rename from flyfish-web/src/main/java/com/flyfish/framework/handler/JsonLogoutSuccessHandler.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/handler/JsonLogoutSuccessHandler.java
index 4da92e4..ea97c0c 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/handler/JsonLogoutSuccessHandler.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/handler/JsonLogoutSuccessHandler.java
@@ -1,8 +1,8 @@
-package com.flyfish.framework.handler;
+package dev.flyfish.framework.handler;
-import com.flyfish.framework.bean.Result;
-import com.flyfish.framework.configuration.jwt.TokenProvider;
-import com.flyfish.framework.service.AuthenticationAuditor;
+import dev.flyfish.framework.bean.Result;
+import dev.flyfish.framework.configuration.jwt.TokenProvider;
+import dev.flyfish.framework.service.AuthenticationAuditor;
import lombok.RequiredArgsConstructor;
import org.springframework.http.MediaType;
import org.springframework.http.server.reactive.ServerHttpResponse;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/service/AuthenticationAuditor.java b/flyfish-web/src/main/java/dev/flyfish/framework/service/AuthenticationAuditor.java
similarity index 85%
rename from flyfish-web/src/main/java/com/flyfish/framework/service/AuthenticationAuditor.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/service/AuthenticationAuditor.java
index 1e877d4..766af80 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/service/AuthenticationAuditor.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/service/AuthenticationAuditor.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.service;
+package dev.flyfish.framework.service;
-import com.flyfish.framework.bean.Result;
-import com.flyfish.framework.transform.DataBufferTransformer;
+import dev.flyfish.framework.bean.Result;
+import dev.flyfish.framework.transform.DataBufferTransformer;
import org.springframework.security.core.AuthenticationException;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.web.server.WebFilterExchange;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/service/AuthenticationLogger.java b/flyfish-web/src/main/java/dev/flyfish/framework/service/AuthenticationLogger.java
similarity index 88%
rename from flyfish-web/src/main/java/com/flyfish/framework/service/AuthenticationLogger.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/service/AuthenticationLogger.java
index 112fee0..d0c2802 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/service/AuthenticationLogger.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/service/AuthenticationLogger.java
@@ -1,6 +1,6 @@
-package com.flyfish.framework.service;
+package dev.flyfish.framework.service;
-import com.flyfish.framework.domain.po.User;
+import dev.flyfish.framework.domain.po.User;
import org.springframework.security.core.AuthenticationException;
import org.springframework.security.core.userdetails.UserDetails;
import reactor.core.publisher.Mono;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/service/BaseReactiveService.java b/flyfish-web/src/main/java/dev/flyfish/framework/service/BaseReactiveService.java
similarity index 91%
rename from flyfish-web/src/main/java/com/flyfish/framework/service/BaseReactiveService.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/service/BaseReactiveService.java
index 8c760f2..82de2f5 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/service/BaseReactiveService.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/service/BaseReactiveService.java
@@ -1,11 +1,10 @@
-package com.flyfish.framework.service;
+package dev.flyfish.framework.service;
-import com.flyfish.framework.bean.SyncVo;
-import com.flyfish.framework.domain.base.Domain;
-import com.flyfish.framework.domain.base.DomainService;
-import com.flyfish.framework.domain.base.Qo;
+import dev.flyfish.framework.bean.SyncVo;
+import dev.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.domain.base.DomainService;
+import dev.flyfish.framework.domain.base.Qo;
import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/service/BaseService.java b/flyfish-web/src/main/java/dev/flyfish/framework/service/BaseService.java
similarity index 92%
rename from flyfish-web/src/main/java/com/flyfish/framework/service/BaseService.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/service/BaseService.java
index 755391d..42bafc7 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/service/BaseService.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/service/BaseService.java
@@ -1,9 +1,9 @@
-package com.flyfish.framework.service;
+package dev.flyfish.framework.service;
-import com.flyfish.framework.bean.SyncVo;
-import com.flyfish.framework.domain.base.Domain;
-import com.flyfish.framework.domain.base.DomainService;
-import com.flyfish.framework.domain.base.Qo;
+import dev.flyfish.framework.bean.SyncVo;
+import dev.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.domain.base.DomainService;
+import dev.flyfish.framework.domain.base.Qo;
import org.springframework.data.domain.Page;
import java.util.Collection;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/service/FlyfishUserDetailsService.java b/flyfish-web/src/main/java/dev/flyfish/framework/service/FlyfishUserDetailsService.java
similarity index 97%
rename from flyfish-web/src/main/java/com/flyfish/framework/service/FlyfishUserDetailsService.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/service/FlyfishUserDetailsService.java
index ca1846b..be0a2dd 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/service/FlyfishUserDetailsService.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/service/FlyfishUserDetailsService.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.service;
+package dev.flyfish.framework.service;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.security.core.Authentication;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/service/UserFindService.java b/flyfish-web/src/main/java/dev/flyfish/framework/service/UserFindService.java
similarity index 70%
rename from flyfish-web/src/main/java/com/flyfish/framework/service/UserFindService.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/service/UserFindService.java
index 92f57c5..42ce204 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/service/UserFindService.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/service/UserFindService.java
@@ -1,11 +1,9 @@
-package com.flyfish.framework.service;
+package dev.flyfish.framework.service;
-import com.flyfish.framework.domain.po.User;
+import dev.flyfish.framework.domain.po.User;
import reactor.core.publisher.Mono;
-import java.util.Optional;
-
/**
* 用户查找service
* @author wangyu
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/service/impl/BaseReactiveServiceImpl.java b/flyfish-web/src/main/java/dev/flyfish/framework/service/impl/BaseReactiveServiceImpl.java
similarity index 93%
rename from flyfish-web/src/main/java/com/flyfish/framework/service/impl/BaseReactiveServiceImpl.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/service/impl/BaseReactiveServiceImpl.java
index 0c7aace..8d63856 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/service/impl/BaseReactiveServiceImpl.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/service/impl/BaseReactiveServiceImpl.java
@@ -1,15 +1,15 @@
-package com.flyfish.framework.service.impl;
+package dev.flyfish.framework.service.impl;
-import com.flyfish.framework.auditor.ReactiveBeanAuditor;
-import com.flyfish.framework.auditor.ReactiveBeanPoster;
-import com.flyfish.framework.bean.SyncVo;
-import com.flyfish.framework.domain.base.Domain;
-import com.flyfish.framework.domain.base.Qo;
-import com.flyfish.framework.exception.biz.InvalidBusinessException;
-import com.flyfish.framework.repository.DefaultReactiveRepository;
-import com.flyfish.framework.service.BaseReactiveService;
-import com.flyfish.framework.utils.Assert;
-import com.flyfish.framework.utils.CopyUtils;
+import dev.flyfish.framework.auditor.ReactiveBeanAuditor;
+import dev.flyfish.framework.auditor.ReactiveBeanPoster;
+import dev.flyfish.framework.bean.SyncVo;
+import dev.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.domain.base.Qo;
+import dev.flyfish.framework.exception.biz.InvalidBusinessException;
+import dev.flyfish.framework.repository.DefaultReactiveRepository;
+import dev.flyfish.framework.service.BaseReactiveService;
+import dev.flyfish.framework.utils.Assert;
+import dev.flyfish.framework.utils.CopyUtils;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/service/impl/BaseServiceImpl.java b/flyfish-web/src/main/java/dev/flyfish/framework/service/impl/BaseServiceImpl.java
similarity index 93%
rename from flyfish-web/src/main/java/com/flyfish/framework/service/impl/BaseServiceImpl.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/service/impl/BaseServiceImpl.java
index 6bc7af1..e991e26 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/service/impl/BaseServiceImpl.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/service/impl/BaseServiceImpl.java
@@ -1,14 +1,14 @@
-package com.flyfish.framework.service.impl;
+package dev.flyfish.framework.service.impl;
-import com.flyfish.framework.auditor.BeanAuditor;
-import com.flyfish.framework.auditor.BeanPoster;
-import com.flyfish.framework.bean.SyncVo;
-import com.flyfish.framework.domain.base.Domain;
-import com.flyfish.framework.domain.base.Qo;
-import com.flyfish.framework.repository.DefaultRepository;
-import com.flyfish.framework.service.BaseService;
-import com.flyfish.framework.utils.Assert;
-import com.flyfish.framework.utils.CopyUtils;
+import dev.flyfish.framework.auditor.BeanAuditor;
+import dev.flyfish.framework.auditor.BeanPoster;
+import dev.flyfish.framework.bean.SyncVo;
+import dev.flyfish.framework.domain.base.Domain;
+import dev.flyfish.framework.domain.base.Qo;
+import dev.flyfish.framework.repository.DefaultRepository;
+import dev.flyfish.framework.service.BaseService;
+import dev.flyfish.framework.utils.Assert;
+import dev.flyfish.framework.utils.CopyUtils;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/transform/DataBufferTransformer.java b/flyfish-web/src/main/java/dev/flyfish/framework/transform/DataBufferTransformer.java
similarity index 89%
rename from flyfish-web/src/main/java/com/flyfish/framework/transform/DataBufferTransformer.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/transform/DataBufferTransformer.java
index 8c28b3f..8737975 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/transform/DataBufferTransformer.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/transform/DataBufferTransformer.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.transform;
+package dev.flyfish.framework.transform;
import org.springframework.core.io.buffer.DataBuffer;
import reactor.core.publisher.Mono;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/transform/ResultDataTransformer.java b/flyfish-web/src/main/java/dev/flyfish/framework/transform/ResultDataTransformer.java
similarity index 85%
rename from flyfish-web/src/main/java/com/flyfish/framework/transform/ResultDataTransformer.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/transform/ResultDataTransformer.java
index 0809a97..b248427 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/transform/ResultDataTransformer.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/transform/ResultDataTransformer.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.transform;
+package dev.flyfish.framework.transform;
-import com.flyfish.framework.bean.Result;
-import com.flyfish.framework.utils.JacksonUtil;
+import dev.flyfish.framework.bean.Result;
+import dev.flyfish.framework.utils.JacksonUtil;
import org.springframework.core.io.buffer.DataBuffer;
import org.springframework.core.io.buffer.DataBufferFactory;
import reactor.core.publisher.Mono;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/transform/SharedDataBufferFactory.java b/flyfish-web/src/main/java/dev/flyfish/framework/transform/SharedDataBufferFactory.java
similarity index 91%
rename from flyfish-web/src/main/java/com/flyfish/framework/transform/SharedDataBufferFactory.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/transform/SharedDataBufferFactory.java
index 174fb13..d7b8082 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/transform/SharedDataBufferFactory.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/transform/SharedDataBufferFactory.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.transform;
+package dev.flyfish.framework.transform;
import org.springframework.core.io.buffer.DataBufferFactory;
import org.springframework.core.io.buffer.DefaultDataBufferFactory;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/utils/AuthenticationMessages.java b/flyfish-web/src/main/java/dev/flyfish/framework/utils/AuthenticationMessages.java
similarity index 95%
rename from flyfish-web/src/main/java/com/flyfish/framework/utils/AuthenticationMessages.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/utils/AuthenticationMessages.java
index 032c80b..7fb90b2 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/utils/AuthenticationMessages.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/utils/AuthenticationMessages.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.utils;
+package dev.flyfish.framework.utils;
import org.springframework.security.authentication.BadCredentialsException;
import org.springframework.security.core.AuthenticationException;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/utils/ClientUtil.java b/flyfish-web/src/main/java/dev/flyfish/framework/utils/ClientUtil.java
similarity index 96%
rename from flyfish-web/src/main/java/com/flyfish/framework/utils/ClientUtil.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/utils/ClientUtil.java
index d288e84..350556d 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/utils/ClientUtil.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/utils/ClientUtil.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.utils;
+package dev.flyfish.framework.utils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.web.reactive.function.server.ServerRequest;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/utils/ReactiveRedisOperations.java b/flyfish-web/src/main/java/dev/flyfish/framework/utils/ReactiveRedisOperations.java
similarity index 99%
rename from flyfish-web/src/main/java/com/flyfish/framework/utils/ReactiveRedisOperations.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/utils/ReactiveRedisOperations.java
index 2379401..a5e2161 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/utils/ReactiveRedisOperations.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/utils/ReactiveRedisOperations.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.utils;
+package dev.flyfish.framework.utils;
import lombok.RequiredArgsConstructor;
import org.springframework.data.redis.core.ReactiveRedisTemplate;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/utils/RedisOperations.java b/flyfish-web/src/main/java/dev/flyfish/framework/utils/RedisOperations.java
similarity index 99%
rename from flyfish-web/src/main/java/com/flyfish/framework/utils/RedisOperations.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/utils/RedisOperations.java
index 07fb166..276dfee 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/utils/RedisOperations.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/utils/RedisOperations.java
@@ -1,4 +1,4 @@
-package com.flyfish.framework.utils;
+package dev.flyfish.framework.utils;
import lombok.RequiredArgsConstructor;
import org.springframework.data.redis.core.RedisTemplate;
diff --git a/flyfish-web/src/main/java/com/flyfish/framework/utils/UserUtils.java b/flyfish-web/src/main/java/dev/flyfish/framework/utils/UserUtils.java
similarity index 91%
rename from flyfish-web/src/main/java/com/flyfish/framework/utils/UserUtils.java
rename to flyfish-web/src/main/java/dev/flyfish/framework/utils/UserUtils.java
index 6edf329..6874082 100644
--- a/flyfish-web/src/main/java/com/flyfish/framework/utils/UserUtils.java
+++ b/flyfish-web/src/main/java/dev/flyfish/framework/utils/UserUtils.java
@@ -1,7 +1,7 @@
-package com.flyfish.framework.utils;
+package dev.flyfish.framework.utils;
-import com.flyfish.framework.domain.base.IUser;
-import com.flyfish.framework.domain.po.User;
+import dev.flyfish.framework.domain.base.IUser;
+import dev.flyfish.framework.domain.po.User;
import org.springframework.security.core.context.SecurityContext;
import org.springframework.security.core.userdetails.UserDetails;
diff --git a/flyfish-web/src/main/resources/templates/ReactiveViewController.tpl b/flyfish-web/src/main/resources/templates/ReactiveViewController.tpl
index ff55280..49a072f 100644
--- a/flyfish-web/src/main/resources/templates/ReactiveViewController.tpl
+++ b/flyfish-web/src/main/resources/templates/ReactiveViewController.tpl
@@ -8,10 +8,10 @@ import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
-import com.flyfish.framework.bean.Result;
-import com.flyfish.framework.configuration.annotations.PagedQuery;
-import com.flyfish.framework.domain.base.Vo;
-import com.flyfish.framework.service.BaseReactiveService;
+import dev.flyfish.framework.bean.Result;
+import dev.flyfish.framework.configuration.annotations.PagedQuery;
+import dev.flyfish.framework.domain.base.Vo;
+import dev.flyfish.framework.service.BaseReactiveService;
import reactor.core.publisher.Mono;
import reactor.core.publisher.Flux;
diff --git a/flyfish-web/src/main/resources/templates/ViewController.tpl b/flyfish-web/src/main/resources/templates/ViewController.tpl
index 027dffd..16080c0 100644
--- a/flyfish-web/src/main/resources/templates/ViewController.tpl
+++ b/flyfish-web/src/main/resources/templates/ViewController.tpl
@@ -9,10 +9,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.stream.Collectors;
-import com.flyfish.framework.bean.Result;
-import com.flyfish.framework.configuration.annotations.PagedQuery;
-import com.flyfish.framework.domain.base.Vo;
-import com.flyfish.framework.service.BaseService;
+import dev.flyfish.framework.bean.Result;
+import dev.flyfish.framework.configuration.annotations.PagedQuery;
+import dev.flyfish.framework.domain.base.Vo;
+import dev.flyfish.framework.service.BaseService;
@RestController
@RequestMapping("#{uri}")
diff --git a/flyfish-web/src/test/java/com/flyfish/project/.gitkeep b/flyfish-web/src/test/java/dev/flyfish/project/.gitkeep
similarity index 100%
rename from flyfish-web/src/test/java/com/flyfish/project/.gitkeep
rename to flyfish-web/src/test/java/dev/flyfish/project/.gitkeep
diff --git a/pom.xml b/pom.xml
index daa76e3..f0ad18a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
- com.flyfish.framework
+ dev.flyfish.framework
flyfish-framework
${revision}
pom
@@ -87,20 +87,20 @@
- com.flyfish.framework
+ dev.flyfish.framework
flyfish-common
${revision}
- com.flyfish.framework
+ dev.flyfish.framework
flyfish-data-common
${revision}
compile
- com.flyfish.framework
+ dev.flyfish.framework
flyfish-data-relational
${revision}