From 9b6d4c306c7f079282acfae20f27b3ceaddc724b Mon Sep 17 00:00:00 2001 From: Hccake Date: Wed, 7 Jun 2023 16:55:38 +0800 Subject: [PATCH] =?UTF-8?q?:boom:=20=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=8C=85=E5=90=8D=EF=BC=8C=E4=BD=BF=E7=94=A8=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E5=9F=9F=E5=90=8D=20org.ballcat=20=E4=BD=9C=E4=B8=BA=E5=89=8D?= =?UTF-8?q?=E7=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit link gh-172 --- .../common/core/compose/ContextComponent.java | 2 +- .../common/core/constant/GlobalConstants.java | 2 +- .../common/core/constant/HeaderConstants.java | 2 +- .../common/core/constant/HttpsConstants.java | 6 ++-- .../common/core/constant/MDCConstants.java | 2 +- .../core/constant/enums/BooleanEnum.java | 2 +- .../core/constant/enums/ImportModeEnum.java | 2 +- .../core/exception/BusinessException.java | 4 +-- .../core/exception/SqlCheckedException.java | 4 +-- .../handler/GlobalExceptionHandler.java | 2 +- .../core/https/CompatibleSSLFactory.java | 6 ++-- .../https/SSLSocketFactoryInitException.java | 2 +- .../core/jackson/CustomJavaTimeModule.java | 2 +- .../core/jackson/NullArrayJsonSerializer.java | 2 +- .../core/jackson/NullMapJsonSerializer.java | 2 +- .../core/jackson/NullSerializerProvider.java | 2 +- .../jackson/NullStringJsonSerializer.java | 2 +- .../wrapper/ModifyParamMapRequestWrapper.java | 2 +- .../wrapper/RepeatBodyRequestWrapper.java | 2 +- .../core/spring/BallcatBeanPostProcessor.java | 2 +- .../ContextComposeBeanPostProcessor.java | 6 ++-- .../spring/compose/SpringContextClosed.java | 4 +-- .../thread/AbstractBlockingQueueThread.java | 4 +-- .../core/thread/AbstractDynamicTimer.java | 4 +-- .../core/thread/AbstractQueueThread.java | 4 +-- .../AbstractThreadContextComponent.java | 4 +-- .../common/core/thread/AbstractTimer.java | 4 +-- .../ballcat/common/core/util/WebUtils.java | 2 +- ...mptyCurlyToDefaultMessageInterpolator.java | 2 +- .../validation/constraints/OneOfClasses.java | 4 +-- .../validation/constraints/OneOfInts.java | 4 +-- .../validation/constraints/OneOfStrings.java | 4 +-- .../validation/constraints/ValueOfEnum.java | 4 +-- .../core/validation/group/CreateGroup.java | 2 +- .../core/validation/group/UpdateGroup.java | 2 +- .../validator/EnumValueValidatorOfClass.java | 4 +-- .../validator/EnumValueValidatorOfInt.java | 4 +-- .../validator/EnumValueValidatorOfString.java | 4 +-- .../validator/ValueOfEnumValidator.java | 4 +-- .../core/jackson/NullSerializerTest.java | 3 +- .../core/jackson/NullSeriralDemoData.java | 2 +- .../core/thread/AbstractDynamicTimerTest.java | 6 ++-- .../ballcat/common}/core/validation/Car.java | 2 +- .../common}/core/validation/CarTest.java | 2 +- .../ballcat/common}/core/validation/Demo.java | 8 ++--- .../common}/core/validation/DemoTest.java | 6 ++-- .../common}/core/validation/StatusEnum.java | 2 +- .../common/model/domain/PageParam.java | 2 +- .../common/model/domain/PageResult.java | 2 +- .../model/domain/PageableConstants.java | 2 +- .../common/model/domain/SelectData.java | 2 +- .../common/model/entity/BaseEntity.java | 2 +- .../model/entity/LogicDeletedBaseEntity.java | 2 +- .../common/model/result/BaseResultCode.java | 2 +- .../ballcat/common/model/result/R.java | 4 +-- .../common/model/result/ResultCode.java | 2 +- .../common/model/result/SystemResultCode.java | 2 +- .../ballcat/common/charset/GSMCharset.java | 2 +- .../exception/CommandTimeoutException.java | 2 +- .../common/lock/JavaReentrantLock.java | 2 +- .../ballcat/common/lock/LockRunnable.java | 2 +- .../ballcat/common/lock/LockSupplier.java | 2 +- .../common/markdown/MarkdownBuilder.java | 4 +-- .../ballcat/common/queue/CircularQueue.java | 4 +-- .../ballcat/common/queue/WaitQueue.java | 2 +- .../ballcat/common/system/Command.java | 8 ++--- .../ballcat/common/system/CommandResult.java | 4 +-- .../ballcat/common/system/StopWatch.java | 2 +- .../ballcat/common/thread/ThreadPool.java | 2 +- .../ballcat/common/util/ArrayUtils.java | 2 +- .../ballcat/common/util/BooleanUtils.java | 2 +- .../ballcat/common/util/ClassUtils.java | 2 +- .../ballcat/common/util/EnvironmentUtils.java | 2 +- .../ballcat/common/util/FileUtils.java | 2 +- .../ballcat/common/util/HtmlUtils.java | 2 +- .../ballcat/common/util/ImageUtils.java | 2 +- .../ballcat/common/util/IpUtils.java | 2 +- .../ballcat/common/util/JsonUtils.java | 16 ++++----- .../common/util/LocalDateTimeUtils.java | 2 +- .../ballcat/common/util/SmsUtils.java | 4 +-- .../ballcat/common/util/SpelUtils.java | 2 +- .../ballcat/common/util/SpringUtils.java | 2 +- .../ballcat/common/util/StreamUtils.java | 2 +- .../ballcat/common/util/SystemUtils.java | 2 +- .../util/json/FastjsonJsonToolAdapter.java | 2 +- .../common/util/json/GsonJsonToolAdapter.java | 2 +- .../util/json/HuToolJsonToolAdapter.java | 2 +- .../util/json/JacksonJsonToolAdapter.java | 2 +- .../ballcat/common/util/json/JsonTool.java | 2 +- .../common/util/json/TypeReference.java | 2 +- .../ballcat/common/util/tree/TreeNode.java | 2 +- .../ballcat/common/util/tree/TreeUtils.java | 2 +- .../ballcat/common/util/FileUtilsTest.java | 2 +- .../ballcat/common/util/ImageUtilsTest.java | 2 +- .../ballcat/common/util/TreeUtilsTest.java | 6 ++-- .../ballcat}/datascope/DataScope.java | 2 +- .../datascope/DataScopeAutoConfiguration.java | 12 +++---- .../datascope/annotation/DataPermission.java | 2 +- .../ballcat}/datascope/function/Action.java | 2 +- .../datascope/function/ResultAction.java | 2 +- .../handler/DataPermissionHandler.java | 4 +-- .../datascope/handler/DataPermissionRule.java | 4 +-- .../handler/DefaultDataPermissionHandler.java | 8 ++--- .../holder/DataPermissionRuleHolder.java | 8 ++--- .../holder/DataScopeMatchNumHolder.java | 2 +- .../MappedStatementIdsWithoutDataScope.java | 4 +-- .../DataPermissionAnnotationAdvisor.java | 4 +-- .../DataPermissionAnnotationInterceptor.java | 8 ++--- .../interceptor/DataPermissionFinder.java | 4 +-- .../DataPermissionInterceptor.java | 14 ++++---- .../datascope/parser/JsqlParserSupport.java | 2 +- .../processor/DataScopeSqlProcessor.java | 12 +++---- .../datascope/util/AnnotationUtil.java | 2 +- .../datascope/util/CollectionUtils.java | 2 +- .../datascope/util/DataPermissionUtils.java | 10 +++--- .../ballcat}/datascope/util/PluginUtils.java | 2 +- .../datascope/util/SqlParseUtils.java | 2 +- .../main/resources/META-INF/spring.factories | 2 +- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- .../datapermission/DataPermissionTest.java | 8 ++--- .../DataPermissionTestConfiguration.java | 4 +-- .../test/datapermission/TestService.java | 4 +-- .../test/datapermission/TestServiceImpl.java | 8 ++--- .../test/datarule/StudentMapperTest.java | 36 +++++++++---------- .../DataPermissionRuleTestConfiguration.java | 12 +++---- .../config/DataSourceConfiguration.java | 2 +- .../datarule/datascope/ClassDataScope.java | 12 +++---- .../datarule/datascope/SchoolDataScope.java | 12 +++---- .../datarule/datascope/StudentDataScope.java | 10 +++--- .../test/datarule/entity/Student.java | 2 +- .../test/datarule/mapper/StudentMapper.java | 4 +-- .../test/datarule/service/StudentService.java | 12 +++---- .../test/datarule/user/LoginUser.java | 2 +- .../test/datarule/user/LoginUserHolder.java | 2 +- .../test/datarule/user/UserRoleType.java | 2 +- .../test/datascope/DataScopeMatchTest.java | 12 +++---- .../test/datascope/SqlParseTest.java | 12 +++---- .../desensitize/AnnotationHandlerHolder.java | 20 +++++------ .../DesensitizationHandlerHolder.java | 10 +++--- .../enums/RegexDesensitizationTypeEnum.java | 2 +- .../enums/SlideDesensitizationTypeEnum.java | 2 +- .../functions/DesensitizeFunction.java | 2 +- .../handler/DesensitizationHandler.java | 2 +- .../handler/RegexDesensitizationHandler.java | 4 +-- .../handler/SimpleDesensitizationHandler.java | 2 +- .../SixAsteriskDesensitizationHandler.java | 2 +- .../handler/SlideDesensitizationHandler.java | 4 +-- .../desensitize/json/DesensitizeStrategy.java | 2 +- .../json/JsonDesensitizeModule.java | 2 +- .../json/JsonDesensitizeSerializer.java | 6 ++-- .../JsonDesensitizeSerializerModifier.java | 4 +-- .../json/annotation/JsonRegexDesensitize.java | 6 ++-- .../annotation/JsonSimpleDesensitize.java | 4 +-- .../json/annotation/JsonSlideDesensitize.java | 6 ++-- ...itize.handler.SimpleDesensitizationHandler | 1 - ...itize.handler.SimpleDesensitizationHandler | 1 + .../ballcat}/desensite/DesensitisedTest.java | 18 +++++----- .../desensite/DesensitizationUser.java | 14 ++++---- .../desensite/TestDesensitizationHandler.java | 4 +-- .../ballcat}/desensite/TestUtils.java | 6 ++-- .../custom/CustomDesensitisedHandler.java | 4 +-- .../custom/CustomDesensitisedTest.java | 12 +++---- .../desensite/custom/CustomerDesensitize.java | 2 +- ...itize.handler.SimpleDesensitizationHandler | 1 - ...itize.handler.SimpleDesensitizationHandler | 1 + .../dingtalk/DingTalkBalancedSender.java | 6 ++-- .../ballcat}/dingtalk/DingTalkParams.java | 4 +-- .../ballcat}/dingtalk/DingTalkResponse.java | 2 +- .../ballcat}/dingtalk/DingTalkSender.java | 4 +-- .../enums/ActionBtnOrientationEnum.java | 2 +- .../dingtalk/enums/MessageTypeEnum.java | 2 +- .../message/AbstractDingTalkMessage.java | 6 ++-- .../message/DingTalkActionCardMessage.java | 10 +++--- .../dingtalk/message/DingTalkLinkMessage.java | 6 ++-- .../message/DingTalkMarkDownMessage.java | 8 ++--- .../dingtalk/message/DingTalkMessage.java | 2 +- .../dingtalk/message/DingTalkTextMessage.java | 6 ++-- .../ballcat}/dingtalk/DingTalkTest.java | 4 +-- .../dingtalk/DingTalkAutoConfiguration.java | 4 +-- .../dingtalk/DingTalkProperties.java | 2 +- .../main/resources/META-INF/spring.factories | 2 +- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- .../easyexcel}/ExcelHandlerConfiguration.java | 18 +++++----- .../ResponseExcelAutoConfiguration.java | 16 ++++----- .../easyexcel}/annotation/RequestExcel.java | 6 ++-- .../easyexcel}/annotation/ResponseExcel.java | 4 +-- .../ballcat/easyexcel}/annotation/Sheet.java | 4 +-- .../easyexcel}/aop/DynamicNameAspect.java | 6 ++-- .../aop/RequestExcelArgumentResolver.java | 10 +++--- .../aop/ResponseExcelReturnValueHandler.java | 6 ++-- .../config/ExcelConfigProperties.java | 2 +- .../converters/LocalDateStringConverter.java | 2 +- .../LocalDateTimeStringConverter.java | 2 +- .../easyexcel}/domain/ErrorMessage.java | 2 +- .../domain/SheetBuildProperties.java | 6 ++-- .../enhance/DefaultWriterBuilderEnhancer.java | 6 ++-- .../enhance/WriterBuilderEnhancer.java | 6 ++-- .../handler/AbstractSheetWriteHandler.java | 26 +++++++------- .../handler/DefaultAnalysisEventListener.java | 6 ++-- .../handler/ListAnalysisEventListener.java | 4 +-- .../handler/ManySheetWriteHandler.java | 14 ++++---- .../easyexcel}/handler/SheetWriteHandler.java | 4 +-- .../handler/SingleSheetWriteHandler.java | 14 ++++---- .../easyexcel}/head/EmptyHeadGenerator.java | 2 +- .../easyexcel}/head/HeadGenerator.java | 2 +- .../ballcat/easyexcel}/head/HeadMeta.java | 2 +- .../head/I18nHeaderCellWriteHandler.java | 2 +- .../easyexcel}/kit/ExcelException.java | 2 +- .../ballcat/easyexcel}/kit/Validators.java | 2 +- .../easyexcel}/processor/NameProcessor.java | 2 +- .../NameSpelExpressionProcessor.java | 2 +- .../main/resources/META-INF/spring.factories | 2 +- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- .../easyexcel}/application/DemoData.java | 2 +- .../ExcelExportTestController.java | 8 ++--- .../application/ExcelFillTestController.java | 4 +-- .../ExcelImportTestController.java | 4 +-- .../application/ExcelTestApplication.java | 2 +- .../easyexcel}/test/ExcelExportTest.java | 12 +++---- .../easyexcel}/test/ExcelFillTest.java | 12 +++---- .../easyexcel}/test/ExcelImportTest.java | 6 ++-- .../ballcat}/file/FileAutoConfiguration.java | 13 ++++--- .../ballcat}/file/FileProperties.java | 4 +-- .../file/core/AbstractFileClient.java | 2 +- .../ballcat}/file/core/FileClient.java | 2 +- .../file/exception/FileException.java | 2 +- .../ballcat}/file/ftp/FtpFileClient.java | 8 ++--- .../ballcat}/file/ftp/FtpMode.java | 2 +- .../ballcat}/file/local/LocalFileClient.java | 10 +++--- .../main/resources/META-INF/spring.factories | 2 +- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- .../ballcat}/file/FtpFileClientTest.java | 8 ++--- .../ballcat}/file/LocalFileClientTest.java | 6 ++-- .../ballcat}/grpc/GrpcClient.java | 4 +-- .../ballcat}/grpc/GrpcClientChannel.java | 4 +-- .../ballcat}/grpc/GrpcServer.java | 6 ++-- .../grpc/annotation/EnableGrpcServer.java | 4 +-- .../GrpcClientAutoConfiguration.java | 8 ++--- .../GrpcServerConfiguration.java | 6 ++-- .../ballcat}/grpc/constant/GrpcConstants.java | 2 +- .../ballcat}/grpc/enums/GrpcLogType.java | 2 +- .../grpc/interceptor/CrossInterceptor.java | 4 +-- .../grpc/interceptor/LogInterceptor.java | 10 +++--- .../grpc/interceptor/TraceIdInterceptor.java | 4 +-- .../grpc/log/DefaultGrpcLogHandler.java | 4 +-- .../ballcat}/grpc/log/GrpcLog.java | 4 +-- .../ballcat}/grpc/log/GrpcLogHandler.java | 2 +- .../grpc/properties/GrpcClientProperties.java | 2 +- .../grpc/properties/GrpcServerProperties.java | 2 +- .../main/resources/META-INF/spring.factories | 2 +- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- .../ballcat}/i18n/DynamicMessageSource.java | 2 +- .../ballcat}/i18n/I18nClass.java | 2 +- .../ballcat}/i18n/I18nField.java | 2 +- .../ballcat}/i18n/I18nIgnore.java | 2 +- .../ballcat}/i18n/I18nMessage.java | 2 +- .../ballcat}/i18n/I18nMessageCreateEvent.java | 2 +- .../ballcat}/i18n/I18nMessageProvider.java | 2 +- .../ballcat}/i18n/I18nOptions.java | 2 +- .../ballcat}/i18n/I18nResponseAdvice.java | 2 +- .../MessageSourceHierarchicalChanger.java | 2 +- ...ReloadableResourceBundleMessageSource.java | 2 +- .../i18n/DefautlI18nMessageProvider.java | 2 +- .../CustomMessageSourceAutoConfiguration.java | 4 +-- .../i18n/I18nAutoConfiguration.java | 4 +-- .../I18nMessageSourceAutoConfiguration.java | 8 ++--- .../autoconfigure/i18n/I18nProperties.java | 4 +-- .../i18n/I18nValidationConfiguration.java | 4 +-- .../main/resources/META-INF/spring.factories | 8 ++--- ...ot.autoconfigure.AutoConfiguration.imports | 8 ++--- .../ballcat}/idempotent/IdempotentAspect.java | 12 +++---- .../idempotent/annotation/Idempotent.java | 2 +- .../exception/IdempotentException.java | 4 +-- .../DefaultIdempotentKeyGenerator.java | 6 ++-- .../key/generator/IdempotentKeyGenerator.java | 4 +-- .../key/store/IdempotentKeyStore.java | 2 +- .../key/store/InMemoryIdempotentKeyStore.java | 2 +- .../key/store/RedisIdempotentKeyStore.java | 2 +- .../idempotent/test/IdempotentController.java | 4 +-- .../idempotent/test/IdempotentMethods.java | 4 +-- .../test/IdempotentTestConfiguration.java | 10 +++--- .../test/InMemoryIdempotentTest.java | 6 ++-- .../idempotent/test/TestException.java | 2 +- .../idempotent/test/WebIdempotentTest.java | 6 ++-- .../IdempotentAutoConfiguration.java | 14 ++++---- .../idempotent/IdempotentProperties.java | 2 +- .../main/resources/META-INF/spring.factories | 2 +- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- .../idempotent/IdempotentTest.java | 6 ++-- .../Ip2regionAutoConfiguration.java | 14 ++++---- .../ip2region}/Ip2regionProperties.java | 4 +-- .../ballcat}/ip2region/core/CacheType.java | 2 +- .../ballcat}/ip2region/core/IpInfo.java | 2 +- .../exception/Ip2regionException.java | 2 +- .../CacheVectorIndexIp2regionSearcher.java | 4 +-- .../CacheXdbFileIp2regionSearcher.java | 4 +-- .../ip2region/searcher/Ip2regionSearcher.java | 4 +-- .../searcher/Ip2regionSearcherTemplate.java | 8 ++--- .../searcher/NoneCacheIp2regionSearcher.java | 4 +-- .../ballcat}/ip2region/util/IpInfoUtils.java | 4 +-- .../main/resources/META-INF/spring.factories | 2 +- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- .../IndexCacheIp2RegionSearcherTest.java | 2 +- .../searcher/Ip2regionSearcherTest.java | 6 ++-- .../NoneCacheIp2RegionSearcherTest.java | 2 +- .../XdbCacheIp2RegionSearcherTest.java | 2 +- .../xxljob}/XxlJobAutoConfiguration.java | 6 ++-- .../properties/XxlAdminProperties.java | 2 +- .../properties/XxlExecutorProperties.java | 2 +- .../xxljob}/properties/XxlJobProperties.java | 2 +- .../main/resources/META-INF/spring.factories | 2 +- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- .../kafka/stream/KafkaStreamBuilder.java | 2 +- .../kafka/stream/core/AbstractProcessor.java | 4 +-- .../kafka/stream/core/AbstractPunctuator.java | 4 +-- .../ballcat}/kafka/stream/core/Kafka.java | 4 +-- .../stream/exception/NotAllowedException.java | 2 +- .../AbstractKeyValueStorePunctuator.java | 11 +++--- .../AbstractStringStringStorePunctuator.java | 2 +- .../stream/store/KafkaKeyValueStore.java | 2 +- .../kafka/stream/store/KafkaWindow.java | 2 +- .../stream/util/ProcessorContextUtil.java | 2 +- .../ballcat}/kafka/KafkaConstants.java | 2 +- .../ballcat}/kafka/KafkaConsumerBuilder.java | 4 +-- .../ballcat}/kafka/KafkaExtendProducer.java | 2 +- .../ballcat}/kafka/KafkaProducerBuilder.java | 4 +-- .../kafka/KafkaAutoConfiguration.java | 8 ++--- .../autoconfigure}/kafka/KafkaProperties.java | 2 +- .../main/resources/META-INF/spring.factories | 2 +- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- .../log/access/filter/AccessLogFilter.java | 10 +++--- .../log/access/handler/AccessLogHandler.java | 2 +- .../annotation/CreateOperationLogging.java | 4 +-- .../annotation/DeleteOperationLogging.java | 4 +-- .../annotation/OperationLogging.java | 2 +- .../annotation/ReadOperationLogging.java | 4 +-- .../annotation/UpdateOperationLogging.java | 4 +-- .../operation/aspect/OperationLogAspect.java | 10 +++--- .../log/operation/enums/LogStatusEnum.java | 2 +- .../log/operation/enums/OperationTypes.java | 2 +- .../handler/AbstractOperationLogHandler.java | 4 +-- .../handler/OperationLogHandler.java | 4 +-- .../ballcat}/log/util/LogUtils.java | 2 +- .../log/AccessLogAutoConfiguration.java | 8 ++--- .../log/OperationLogAutoConfiguration.java | 8 ++--- .../log/properties/AccessLogProperties.java | 2 +- .../properties/OperationLogProperties.java | 2 +- .../main/resources/META-INF/spring.factories | 4 +-- ...ot.autoconfigure.AutoConfiguration.imports | 4 +-- .../ballcat}/mail/MailAutoConfiguration.java | 6 ++-- .../ballcat}/mail/event/MailSendEvent.java | 4 +-- .../ballcat}/mail/model/MailDetails.java | 2 +- .../ballcat}/mail/model/MailSendInfo.java | 2 +- .../ballcat}/mail/sender/MailSender.java | 6 ++-- .../ballcat}/mail/sender/MailSenderImpl.java | 8 ++--- .../main/resources/META-INF/spring.factories | 2 +- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- .../mybatisplus}/alias/TableAlias.java | 5 +-- .../mybatisplus}/alias/TableAliasHelper.java | 2 +- .../alias/TableAliasNotFoundException.java | 2 +- .../conditions/query/ColumnFunction.java | 2 +- .../query/LambdaAliasQueryWrapperX.java | 7 ++-- .../conditions/query/LambdaQueryWrapperX.java | 2 +- .../injector/CustomSqlInjector.java | 2 +- .../mybatisplus}/mapper/ExtendMapper.java | 6 ++-- .../mybatisplus}/methods/BaseInsertBatch.java | 2 +- .../InsertBatchSomeColumnByCollection.java | 2 +- .../methods/InsertIgnoreByBatch.java | 2 +- .../methods/InsertOrUpdateByBatch.java | 2 +- .../methods/InsertOrUpdateFieldByBatch.java | 2 +- .../mybatisplus}/service/ExtendService.java | 2 +- .../service/impl/ExtendServiceImpl.java | 6 ++-- .../mybatisplus}/toolkit/PageUtil.java | 4 +-- .../mybatisplus}/toolkit/WrappersX.java | 6 ++-- .../type/EnumNameTypeHandler.java | 2 +- .../ballcat/mybatisplus}/Demo.java | 4 +-- .../mybatisplus}/LambdaAliasQueryXTest.java | 8 ++--- .../extend => org/ballcat}/ntp/Ntp.java | 2 +- .../extend => org/ballcat}/ntp/NtpCn.java | 2 +- .../ballcat}/ntp/NtpException.java | 2 +- .../extend => org/ballcat}/ntp/NtpTest.java | 2 +- .../openapi/OpenApiAutoConfiguration.java | 12 +++---- .../openapi/OpenApiProperties.java | 2 +- ...StatusReplaceEnvironmentPostProcessor.java | 2 +- .../openapi/pageable/ByteClassLoader.java | 2 +- .../pageable/PageParamOpenAPIConverter.java | 10 ++++-- .../openapi/pageable/PageableRequest.java | 6 ++-- .../pageable/PageableRequestClassCreator.java | 2 +- .../main/resources/META-INF/spring.factories | 4 +-- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- ....boot.env.EnvironmentPostProcessor.imports | 2 +- .../ballcat}/oss/DefaultOssTemplate.java | 2 +- .../ObjectWithGlobalKeyPrefixOssTemplate.java | 4 +-- .../ballcat}/oss/OssAutoConfiguration.java | 6 ++-- .../common => org/ballcat}/oss/OssClient.java | 4 +-- .../ballcat}/oss/OssConstants.java | 2 +- .../ballcat}/oss/OssProperties.java | 2 +- .../ballcat}/oss/OssTemplate.java | 2 +- .../DefaultObjectKeyPrefixConverter.java | 6 ++-- .../oss/prefix/ObjectKeyPrefixConverter.java | 2 +- .../main/resources/META-INF/spring.factories | 2 +- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- .../ballcat/oss}/AbstractOssTemplateTest.java | 8 ++--- .../ballcat/oss}/MinioOssTemplateTest.java | 4 +-- .../ballcat}/pay/ali/AliPay.java | 8 ++--- .../pay/ali/constants/AliPayConstant.java | 2 +- .../ballcat}/pay/ali/domain/AliAppPay.java | 6 ++-- .../pay/ali/domain/AliPayCallback.java | 19 +++++----- .../ballcat}/pay/ali/domain/AliPayQuery.java | 9 +++-- .../ballcat}/pay/ali/enums/TradeStatus.java | 2 +- .../pay/viratual/AbstractVerifyThread.java | 4 +-- .../ballcat}/pay/viratual/VerifyObj.java | 2 +- .../extend => org/ballcat}/pay/wx/WxPay.java | 28 +++++++-------- .../pay/wx/constants/WxPayConstant.java | 2 +- .../pay/wx/domain/DefaultWxDomain.java | 6 ++-- .../ballcat}/pay/wx/domain/WxDomain.java | 16 ++++----- .../ballcat}/pay/wx/enums/RequestSuffix.java | 2 +- .../ballcat}/pay/wx/enums/ResponseCode.java | 2 +- .../ballcat}/pay/wx/enums/SignType.java | 2 +- .../ballcat}/pay/wx/enums/TradeState.java | 2 +- .../ballcat}/pay/wx/enums/TradeType.java | 2 +- .../pay/wx/response/WxPayCallback.java | 10 +++--- .../wx/response/WxPayOrderQueryResponse.java | 10 +++--- .../pay/wx/response/WxPayResponse.java | 8 ++--- .../ballcat}/pay/wx/utils/WxPayUtil.java | 6 ++-- .../pay/ali/AliPayAutoConfiguration.java | 6 ++-- .../pay/ali/AliPayProperties.java | 2 +- .../pay/virtual/BitcoinProperties.java | 2 +- .../pay/virtual/EtherscanProperties.java | 2 +- .../pay/virtual/TronscanProperties.java | 2 +- .../virtual/VirtualPayAutoConfiguration.java | 2 +- .../pay/wx/WxPayAutoConfiguration.java | 4 +-- .../pay/wx/WxPayProperties.java | 2 +- .../main/resources/META-INF/spring.factories | 6 ++-- ...ot.autoconfigure.AutoConfiguration.imports | 6 ++-- .../moudle/AbstractRedisModuleHelper.java | 2 +- .../moudle/bloom/BloomInsertKeywordEnum.java | 2 +- .../moudle/bloom/BloomInsertOptions.java | 2 +- .../moudle/bloom/BloomRedisModuleHelper.java | 4 +-- .../module/BloomRedisModuleHelperConfig.java | 8 ++--- .../RedisBloomDemoApplicationTests.java | 12 +++---- .../ballcat}/redis/RedisHelper.java | 2 +- .../redis/config/CacheProperties.java | 2 +- .../redis/config/CachePropertiesHolder.java | 2 +- .../ballcat}/redis/config/KeyEventConfig.java | 2 +- .../redis/core/CacheStringAspect.java | 32 ++++++++--------- .../ballcat}/redis/core/KeyGenerator.java | 6 ++-- .../redis/core/annotation/CacheDel.java | 2 +- .../redis/core/annotation/CacheDels.java | 2 +- .../redis/core/annotation/CachePut.java | 2 +- .../redis/core/annotation/Cached.java | 2 +- .../core/annotation/MetaCacheAnnotation.java | 2 +- ...bstractDeletedKeyEventMessageListener.java | 2 +- ...bstractExpiredKeyEventMessageListener.java | 2 +- .../AbstractKeySpaceEventMessageListener.java | 2 +- .../AbstractSetKeyEventMessageListener.java | 2 +- ...DefaultDeletedKeyEventMessageListener.java | 4 +-- ...DefaultExpiredKeyEventMessageListener.java | 4 +-- .../DefaultSetKeyEventMessageListener.java | 4 +-- .../ballcat}/redis/keyevent/package-info.java | 2 +- .../KeyDeletedEventMessageTemplate.java | 2 +- .../template/KeyEventMessageTemplate.java | 2 +- .../KeyExpiredEventMessageTemplate.java | 2 +- .../template/KeySetEventMessageTemplate.java | 2 +- .../AbstractMessageEventListener.java | 4 +-- .../redis/listener/MessageEventListener.java | 2 +- .../ballcat}/redis/lock/Action.java | 6 ++-- .../ballcat}/redis/lock/CacheLock.java | 6 ++-- .../ballcat}/redis/lock/DistributedLock.java | 6 ++-- .../ballcat}/redis/lock/StateHandler.java | 4 +-- .../redis/lock/function/ExceptionHandler.java | 2 +- .../redis/lock/function/ThrowingExecutor.java | 2 +- .../redis/operation/AbstractCacheOps.java | 4 +-- .../ballcat}/redis/operation/CacheDelOps.java | 4 +-- .../redis/operation/CacheDelsOps.java | 4 +-- .../ballcat}/redis/operation/CachePutOps.java | 2 +- .../ballcat}/redis/operation/CachedOps.java | 2 +- .../operation/function/ResultMethod.java | 2 +- .../redis/operation/function/VoidMethod.java | 2 +- .../redis/prefix/IRedisPrefixConverter.java | 2 +- .../impl/DefaultRedisPrefixConverter.java | 4 +-- .../redis/serialize/CacheSerializer.java | 2 +- .../redis/serialize/JacksonSerializer.java | 2 +- .../serialize/PrefixJdkRedisSerializer.java | 4 +-- .../PrefixStringRedisSerializer.java | 4 +-- .../redis/thread/AbstractRedisThread.java | 8 ++--- .../ballcat/redis}/DistributeLockTest.java | 6 ++-- .../redis/TestRedisConfiguration.java} | 16 ++++----- .../AddMessageEventListenerToContainer.java | 4 +-- .../redis/BallcatRedisAutoConfiguration.java | 22 ++++++------ ...MessageEventListenerAutoConfiguration.java | 4 +-- .../redis/RedisKeyEventAutoConfiguration.java | 12 +++---- .../main/resources/META-INF/spring.factories | 6 ++-- ...ot.autoconfigure.AutoConfiguration.imports | 6 ++-- ...2AuthorizationServerAutoConfiguration.java | 12 +++---- .../token/BallcatOAuth2TokenCustomizer.java | 6 ++-- .../web/filter/LoginCaptchaFilter.java | 8 ++--- .../filter/LoginPasswordDecoderFilter.java | 12 +++---- .../TestOAuth2Authorizations.java | 2 +- ...erPasswordAuthenticationProviderTests.java | 2 +- .../BallcatOAuth2TokenCustomizerTests.java | 6 ++-- .../server/authorization/user/TestUsers.java | 4 +-- .../ballcat/security/oauth2}/ScopeNames.java | 2 +- .../OAuth2UserAuthenticationToken.java | 2 +- .../component/CustomPermissionEvaluator.java | 2 +- .../constant/TokenAttributeNameConstants.java | 2 +- .../constant/UserAttributeNameConstants.java | 2 +- .../constant/UserInfoFiledNameConstants.java | 2 +- .../security/oauth2}/jackson2/LongMixin.java | 2 +- ...h2UserAuthenticationTokenDeserializer.java | 6 ++-- .../OAuth2UserAuthenticationTokenMixin.java | 2 +- .../oauth2}/jackson2/UserDeserializer.java | 4 +-- .../security/oauth2}/jackson2/UserMixin.java | 2 +- .../oauth2}/userdetails/ClientPrincipal.java | 2 +- .../security/oauth2}/userdetails/User.java | 2 +- .../security/oauth2}/util/PasswordUtils.java | 2 +- .../security/oauth2}/util/SecurityUtils.java | 6 ++-- .../security/oauth2}/test/PasswordTest.java | 4 +-- ...OAuth2ResourceServerAutoConfiguration.java | 2 +- .../BallcatRemoteOpaqueTokenIntrospector.java | 12 +++---- ...erSharedStoredOpaqueTokenIntrospector.java | 2 +- .../web/CustomAuthenticationEntryPoint.java | 7 ++-- .../ballcat}/sms/SmsAutoConfiguration.java | 10 +++--- .../ballcat}/sms/SmsSender.java | 2 +- .../ballcat}/sms/SmsSenderParams.java | 4 +-- .../ballcat}/sms/SmsSenderResult.java | 13 +++---- .../ballcat}/sms/constant/SmsConstants.java | 2 +- .../sms/constant/SmsSendConstants.java | 2 +- .../ballcat}/sms/enums/TypeEnum.java | 2 +- .../ballcat}/sms/exception/SmsException.java | 2 +- .../ballcat}/sms/impl/AliyunSenderImpl.java | 14 ++++---- .../ballcat}/sms/impl/BaseServiceImpl.java | 6 ++-- .../ballcat}/sms/impl/TencentSenderImpl.java | 14 ++++---- .../sms/impl/TianYiHongSenderImpl.java | 16 ++++----- .../sms/properties/SmsProperties.java | 12 +++---- .../sms/properties/extra/Account.java | 2 +- .../ballcat}/sms/properties/extra/Aliyun.java | 2 +- .../sms/properties/extra/Tencent.java | 2 +- .../sms/properties/extra/TianYiHong.java | 2 +- .../main/resources/META-INF/spring.factories | 2 +- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- .../ballcat}/tesseract/Tesseract.java | 12 +++---- .../ballcat}/tesseract/TesseractBox.java | 4 +-- .../ballcat}/tesseract/TesseractCommand.java | 4 +-- .../ballcat}/tesseract/TesseractImage.java | 2 +- .../tesseract/enums/TesseractLang.java | 2 +- .../tesseract/exception/OcrException.java | 2 +- .../tesseract/TesseractCommandTest.java | 4 +-- .../tesseract/TesseractImageTest.java | 2 +- .../ballcat}/tesseract/TesseractTest.java | 2 +- .../ActuatorSecurityAutoConfiguration.java | 2 +- .../web/actuate/ActuatorSecurityFilter.java | 10 +++--- .../actuate/ActuatorSecurityProperties.java | 2 +- .../event/ApplicationContextInitialized.java | 4 +-- .../web/event/EnvironmentPost.java | 4 +-- .../exception/ExceptionAutoConfiguration.java | 20 +++++------ .../exception/ExceptionHandleProperties.java | 4 +-- .../exception/domain/ExceptionMessage.java | 2 +- .../domain/ExceptionNoticeResponse.java | 2 +- .../enums/ExceptionHandleTypeEnum.java | 4 +-- .../AbstractNoticeGlobalExceptionHandler.java | 12 +++---- .../DefaultGlobalExceptionHandler.java | 4 +-- .../DingTalkGlobalExceptionHandler.java | 14 ++++---- .../handler/MailGlobalExceptionHandler.java | 12 +++---- .../handler/MultiGlobalExceptionHandler.java | 14 ++++---- .../GlobalHandlerExceptionResolver.java | 12 +++---- .../SecurityHandlerExceptionResolver.java | 8 ++--- .../CustomJacksonAutoConfiguration.java | 14 ++++---- .../DefaultPageParamArgumentResolver.java | 4 +-- .../pageable/PageParamArgumentResolver.java | 4 +-- .../PageParamArgumentResolverSupport.java | 6 ++-- .../web/pageable/PageableProperties.java | 4 +-- .../web/servlet/WebMvcAutoConfiguration.java | 12 +++---- .../web/servlet/WebProperties.java | 2 +- .../web/trace/TraceIdFilter.java | 4 +-- .../web/trace/TraceIdGenerator.java | 2 +- .../BallcatValidationAutoConfiguration.java | 4 +-- .../main/resources/META-INF/spring.factories | 12 +++---- ...ot.autoconfigure.AutoConfiguration.imports | 10 +++--- .../MessageDistributorTypeConstants.java | 2 +- .../websocket/SockJsServiceConfigurer.java | 2 +- .../websocket/WebSocketAutoConfiguration.java | 18 +++++----- .../websocket/WebSocketProperties.java | 4 +-- .../config/LocalMessageDistributorConfig.java | 12 +++---- .../config/RedisMessageDistributorConfig.java | 14 ++++---- .../RocketMqMessageDistributorConfig.java | 12 +++---- .../config/WebSocketHandlerConfig.java | 16 ++++----- ...itional-spring-configuration-metadata.json | 8 ++--- .../main/resources/META-INF/spring.factories | 2 +- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- .../websocket/WebSocketMessageSender.java | 6 ++-- .../AbstractMessageDistributor.java | 6 ++-- .../distribute/LocalMessageDistributor.java | 4 +-- .../websocket/distribute/MessageDO.java | 2 +- .../distribute/MessageDistributor.java | 2 +- .../distribute/RedisMessageDistributor.java | 6 ++-- .../RedisMessageListenerInitializer.java | 2 +- .../RocketmqMessageDistributor.java | 8 ++--- .../exception/ErrorJsonMessageException.java | 2 +- .../ConcurrentWebSocketSessionOptions.java | 2 +- .../handler/CustomWebSocketHandler.java | 8 ++--- .../websocket/handler/JsonMessageHandler.java | 4 +-- .../handler/PingJsonMessageHandler.java | 12 +++---- .../handler/PlanTextMessageHandler.java | 4 +-- .../holder/JsonMessageHandlerHolder.java | 6 ++-- .../holder/JsonMessageHandlerInitializer.java | 6 ++-- .../message/JsonWebSocketMessage.java | 2 +- .../message/PingJsonWebSocketMessage.java | 2 +- .../message/PongJsonWebSocketMessage.java | 2 +- .../message/WebSocketMessageTypeEnum.java | 2 +- .../session/DefaultWebSocketSessionStore.java | 2 +- .../MapSessionWebSocketHandlerDecorator.java | 6 ++-- .../session/SessionKeyGenerator.java | 2 +- .../session/WebSocketSessionStore.java | 2 +- .../ballcat}/xss/XssAutoConfiguration.java | 12 +++---- .../ballcat}/xss/cleaner/JsoupXssCleaner.java | 2 +- .../ballcat}/xss/cleaner/XssCleaner.java | 2 +- .../ballcat}/xss/config/XssProperties.java | 2 +- .../ballcat}/xss/core/XssFilter.java | 6 ++-- .../ballcat}/xss/core/XssRequestWrapper.java | 4 +-- .../ballcat}/xss/core/XssStateHolder.java | 2 +- .../xss/core/XssStringJsonDeserializer.java | 4 +-- .../xss/core/XssStringJsonSerializer.java | 4 +-- .../main/resources/META-INF/spring.factories | 2 +- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- 625 files changed, 1437 insertions(+), 1442 deletions(-) rename common/ballcat-common-core/src/main/java/{com/hccake => org}/ballcat/common/core/compose/ContextComponent.java (96%) rename common/ballcat-common-core/src/main/java/{com/hccake => org}/ballcat/common/core/constant/GlobalConstants.java (96%) rename common/ballcat-common-core/src/main/java/{com/hccake => org}/ballcat/common/core/constant/HeaderConstants.java (95%) rename common/ballcat-common-core/src/main/java/{com/hccake => org}/ballcat/common/core/constant/HttpsConstants.java (94%) rename common/ballcat-common-core/src/main/java/{com/hccake => org}/ballcat/common/core/constant/MDCConstants.java (94%) rename common/ballcat-common-core/src/main/java/{com/hccake => org}/ballcat/common/core/constant/enums/BooleanEnum.java (94%) rename common/ballcat-common-core/src/main/java/{com/hccake => org}/ballcat/common/core/constant/enums/ImportModeEnum.java (94%) rename common/ballcat-common-core/src/main/java/{com/hccake => org}/ballcat/common/core/exception/BusinessException.java (94%) rename common/ballcat-common-core/src/main/java/{com/hccake => org}/ballcat/common/core/exception/SqlCheckedException.java (90%) rename common/ballcat-common-core/src/main/java/{com/hccake => org}/ballcat/common/core/exception/handler/GlobalExceptionHandler.java (93%) rename common/ballcat-common-core/src/main/java/{com/hccake => org}/ballcat/common/core/https/CompatibleSSLFactory.java (95%) rename common/ballcat-common-core/src/main/java/{com/hccake => org}/ballcat/common/core/https/SSLSocketFactoryInitException.java (94%) rename common/ballcat-common-core/src/main/java/{com/hccake => org}/ballcat/common/core/jackson/CustomJavaTimeModule.java (98%) rename common/ballcat-common-core/src/main/java/{com/hccake => org}/ballcat/common/core/jackson/NullArrayJsonSerializer.java (96%) rename common/ballcat-common-core/src/main/java/{com/hccake => org}/ballcat/common/core/jackson/NullMapJsonSerializer.java (96%) rename common/ballcat-common-core/src/main/java/{com/hccake => org}/ballcat/common/core/jackson/NullSerializerProvider.java (98%) rename common/ballcat-common-core/src/main/java/{com/hccake => org}/ballcat/common/core/jackson/NullStringJsonSerializer.java (96%) rename common/ballcat-common-core/src/main/java/{com/hccake => org}/ballcat/common/core/request/wrapper/ModifyParamMapRequestWrapper.java (95%) rename common/ballcat-common-core/src/main/java/{com/hccake => org}/ballcat/common/core/request/wrapper/RepeatBodyRequestWrapper.java (98%) rename common/ballcat-common-core/src/main/java/{com/hccake => org}/ballcat/common/core/spring/BallcatBeanPostProcessor.java (98%) rename common/ballcat-common-core/src/main/java/{com/hccake => org}/ballcat/common/core/spring/compose/ContextComposeBeanPostProcessor.java (85%) rename common/ballcat-common-core/src/main/java/{com/hccake => org}/ballcat/common/core/spring/compose/SpringContextClosed.java (93%) rename common/ballcat-common-core/src/main/java/{com/hccake => org}/ballcat/common/core/thread/AbstractBlockingQueueThread.java (94%) rename common/ballcat-common-core/src/main/java/{com/hccake => org}/ballcat/common/core/thread/AbstractDynamicTimer.java (96%) rename common/ballcat-common-core/src/main/java/{com/hccake => org}/ballcat/common/core/thread/AbstractQueueThread.java (97%) rename common/ballcat-common-core/src/main/java/{com/hccake => org}/ballcat/common/core/thread/AbstractThreadContextComponent.java (92%) rename common/ballcat-common-core/src/main/java/{com/hccake => org}/ballcat/common/core/thread/AbstractTimer.java (94%) rename common/ballcat-common-core/src/main/java/{com/hccake => org}/ballcat/common/core/util/WebUtils.java (97%) rename common/ballcat-common-core/src/main/java/{com/hccake => org}/ballcat/common/core/validation/EmptyCurlyToDefaultMessageInterpolator.java (97%) rename common/ballcat-common-core/src/main/java/{com/hccake => org}/ballcat/common/core/validation/constraints/OneOfClasses.java (91%) rename common/ballcat-common-core/src/main/java/{com/hccake => org}/ballcat/common/core/validation/constraints/OneOfInts.java (91%) rename common/ballcat-common-core/src/main/java/{com/hccake => org}/ballcat/common/core/validation/constraints/OneOfStrings.java (91%) rename common/ballcat-common-core/src/main/java/{com/hccake => org}/ballcat/common/core/validation/constraints/ValueOfEnum.java (92%) rename common/ballcat-common-core/src/main/java/{com/hccake => org}/ballcat/common/core/validation/group/CreateGroup.java (92%) rename common/ballcat-common-core/src/main/java/{com/hccake => org}/ballcat/common/core/validation/group/UpdateGroup.java (92%) rename common/ballcat-common-core/src/main/java/{com/hccake => org}/ballcat/common/core/validation/validator/EnumValueValidatorOfClass.java (90%) rename common/ballcat-common-core/src/main/java/{com/hccake => org}/ballcat/common/core/validation/validator/EnumValueValidatorOfInt.java (90%) rename common/ballcat-common-core/src/main/java/{com/hccake => org}/ballcat/common/core/validation/validator/EnumValueValidatorOfString.java (90%) rename common/ballcat-common-core/src/main/java/{com/hccake => org}/ballcat/common/core/validation/validator/ValueOfEnumValidator.java (93%) rename common/ballcat-common-core/src/test/java/{com/ballcat => org/ballcat/common}/core/jackson/NullSerializerTest.java (93%) rename common/ballcat-common-core/src/test/java/{com/ballcat => org/ballcat/common}/core/jackson/NullSeriralDemoData.java (96%) rename common/ballcat-common-core/src/test/java/{com/ballcat => org/ballcat/common}/core/thread/AbstractDynamicTimerTest.java (95%) rename common/ballcat-common-core/src/test/java/{com/ballcat => org/ballcat/common}/core/validation/Car.java (95%) rename common/ballcat-common-core/src/test/java/{com/ballcat => org/ballcat/common}/core/validation/CarTest.java (98%) rename common/ballcat-common-core/src/test/java/{com/ballcat => org/ballcat/common}/core/validation/Demo.java (79%) rename common/ballcat-common-core/src/test/java/{com/ballcat => org/ballcat/common}/core/validation/DemoTest.java (92%) rename common/ballcat-common-core/src/test/java/{com/ballcat => org/ballcat/common}/core/validation/StatusEnum.java (95%) rename common/ballcat-common-model/src/main/java/{com/hccake => org}/ballcat/common/model/domain/PageParam.java (97%) rename common/ballcat-common-model/src/main/java/{com/hccake => org}/ballcat/common/model/domain/PageResult.java (96%) rename common/ballcat-common-model/src/main/java/{com/hccake => org}/ballcat/common/model/domain/PageableConstants.java (97%) rename common/ballcat-common-model/src/main/java/{com/hccake => org}/ballcat/common/model/domain/SelectData.java (96%) rename common/ballcat-common-model/src/main/java/{com/hccake => org}/ballcat/common/model/entity/BaseEntity.java (96%) rename common/ballcat-common-model/src/main/java/{com/hccake => org}/ballcat/common/model/entity/LogicDeletedBaseEntity.java (96%) rename common/ballcat-common-model/src/main/java/{com/hccake => org}/ballcat/common/model/result/BaseResultCode.java (96%) rename common/ballcat-common-model/src/main/java/{com/hccake => org}/ballcat/common/model/result/R.java (95%) rename common/ballcat-common-model/src/main/java/{com/hccake => org}/ballcat/common/model/result/ResultCode.java (94%) rename common/ballcat-common-model/src/main/java/{com/hccake => org}/ballcat/common/model/result/SystemResultCode.java (98%) rename common/ballcat-common-util/src/main/java/{com/hccake => org}/ballcat/common/charset/GSMCharset.java (99%) rename common/ballcat-common-util/src/main/java/{com/hccake => org}/ballcat/common/exception/CommandTimeoutException.java (94%) rename common/ballcat-common-util/src/main/java/{com/hccake => org}/ballcat/common/lock/JavaReentrantLock.java (98%) rename common/ballcat-common-util/src/main/java/{com/hccake => org}/ballcat/common/lock/LockRunnable.java (94%) rename common/ballcat-common-util/src/main/java/{com/hccake => org}/ballcat/common/lock/LockSupplier.java (94%) rename common/ballcat-common-util/src/main/java/{com/hccake => org}/ballcat/common/markdown/MarkdownBuilder.java (98%) rename common/ballcat-common-util/src/main/java/{com/hccake => org}/ballcat/common/queue/CircularQueue.java (94%) rename common/ballcat-common-util/src/main/java/{com/hccake => org}/ballcat/common/queue/WaitQueue.java (97%) rename common/ballcat-common-util/src/main/java/{com/hccake => org}/ballcat/common/system/Command.java (95%) rename common/ballcat-common-util/src/main/java/{com/hccake => org}/ballcat/common/system/CommandResult.java (96%) rename common/ballcat-common-util/src/main/java/{com/hccake => org}/ballcat/common/system/StopWatch.java (97%) rename common/ballcat-common-util/src/main/java/{com/hccake => org}/ballcat/common/thread/ThreadPool.java (98%) rename common/ballcat-common-util/src/main/java/{com/hccake => org}/ballcat/common/util/ArrayUtils.java (96%) rename common/ballcat-common-util/src/main/java/{com/hccake => org}/ballcat/common/util/BooleanUtils.java (97%) rename common/ballcat-common-util/src/main/java/{com/hccake => org}/ballcat/common/util/ClassUtils.java (99%) rename common/ballcat-common-util/src/main/java/{com/hccake => org}/ballcat/common/util/EnvironmentUtils.java (99%) rename common/ballcat-common-util/src/main/java/{com/hccake => org}/ballcat/common/util/FileUtils.java (99%) rename common/ballcat-common-util/src/main/java/{com/hccake => org}/ballcat/common/util/HtmlUtils.java (98%) rename common/ballcat-common-util/src/main/java/{com/hccake => org}/ballcat/common/util/ImageUtils.java (99%) rename common/ballcat-common-util/src/main/java/{com/hccake => org}/ballcat/common/util/IpUtils.java (98%) rename common/ballcat-common-util/src/main/java/{com/hccake => org}/ballcat/common/util/JsonUtils.java (88%) rename common/ballcat-common-util/src/main/java/{com/hccake => org}/ballcat/common/util/LocalDateTimeUtils.java (98%) rename common/ballcat-common-util/src/main/java/{com/hccake => org}/ballcat/common/util/SmsUtils.java (97%) rename common/ballcat-common-util/src/main/java/{com/hccake => org}/ballcat/common/util/SpelUtils.java (98%) rename common/ballcat-common-util/src/main/java/{com/hccake => org}/ballcat/common/util/SpringUtils.java (98%) rename common/ballcat-common-util/src/main/java/{com/hccake => org}/ballcat/common/util/StreamUtils.java (98%) rename common/ballcat-common-util/src/main/java/{com/hccake => org}/ballcat/common/util/SystemUtils.java (98%) rename common/ballcat-common-util/src/main/java/{com/hccake => org}/ballcat/common/util/json/FastjsonJsonToolAdapter.java (98%) rename common/ballcat-common-util/src/main/java/{com/hccake => org}/ballcat/common/util/json/GsonJsonToolAdapter.java (97%) rename common/ballcat-common-util/src/main/java/{com/hccake => org}/ballcat/common/util/json/HuToolJsonToolAdapter.java (97%) rename common/ballcat-common-util/src/main/java/{com/hccake => org}/ballcat/common/util/json/JacksonJsonToolAdapter.java (97%) rename common/ballcat-common-util/src/main/java/{com/hccake => org}/ballcat/common/util/json/JsonTool.java (96%) rename common/ballcat-common-util/src/main/java/{com/hccake => org}/ballcat/common/util/json/TypeReference.java (96%) rename common/ballcat-common-util/src/main/java/{com/hccake => org}/ballcat/common/util/tree/TreeNode.java (96%) rename common/ballcat-common-util/src/main/java/{com/hccake => org}/ballcat/common/util/tree/TreeUtils.java (99%) rename common/ballcat-common-util/src/test/java/{com/hccake => org}/ballcat/common/util/FileUtilsTest.java (95%) rename common/ballcat-common-util/src/test/java/{com/hccake => org}/ballcat/common/util/ImageUtilsTest.java (97%) rename common/ballcat-common-util/src/test/java/{com/hccake => org}/ballcat/common/util/TreeUtilsTest.java (95%) rename datascope/ballcat-spring-boot-starter-datascope/src/main/java/{com/hccake/ballcat/common => org/ballcat}/datascope/DataScope.java (96%) rename datascope/ballcat-spring-boot-starter-datascope/src/main/java/{com/hccake/ballcat/common => org/ballcat}/datascope/DataScopeAutoConfiguration.java (82%) rename datascope/ballcat-spring-boot-starter-datascope/src/main/java/{com/hccake/ballcat/common => org/ballcat}/datascope/annotation/DataPermission.java (96%) rename datascope/ballcat-spring-boot-starter-datascope/src/main/java/{com/hccake/ballcat/common => org/ballcat}/datascope/function/Action.java (93%) rename datascope/ballcat-spring-boot-starter-datascope/src/main/java/{com/hccake/ballcat/common => org/ballcat}/datascope/function/ResultAction.java (93%) rename datascope/ballcat-spring-boot-starter-datascope/src/main/java/{com/hccake/ballcat/common => org/ballcat}/datascope/handler/DataPermissionHandler.java (93%) rename datascope/ballcat-spring-boot-starter-datascope/src/main/java/{com/hccake/ballcat/common => org/ballcat}/datascope/handler/DataPermissionRule.java (95%) rename datascope/ballcat-spring-boot-starter-datascope/src/main/java/{com/hccake/ballcat/common => org/ballcat}/datascope/handler/DefaultDataPermissionHandler.java (92%) rename datascope/ballcat-spring-boot-starter-datascope/src/main/java/{com/hccake/ballcat/common => org/ballcat}/datascope/holder/DataPermissionRuleHolder.java (87%) rename datascope/ballcat-spring-boot-starter-datascope/src/main/java/{com/hccake/ballcat/common => org/ballcat}/datascope/holder/DataScopeMatchNumHolder.java (97%) rename datascope/ballcat-spring-boot-starter-datascope/src/main/java/{com/hccake/ballcat/common => org/ballcat}/datascope/holder/MappedStatementIdsWithoutDataScope.java (95%) rename datascope/ballcat-spring-boot-starter-datascope/src/main/java/{com/hccake/ballcat/common => org/ballcat}/datascope/interceptor/DataPermissionAnnotationAdvisor.java (92%) rename datascope/ballcat-spring-boot-starter-datascope/src/main/java/{com/hccake/ballcat/common => org/ballcat}/datascope/interceptor/DataPermissionAnnotationInterceptor.java (86%) rename datascope/ballcat-spring-boot-starter-datascope/src/main/java/{com/hccake/ballcat/common => org/ballcat}/datascope/interceptor/DataPermissionFinder.java (97%) rename datascope/ballcat-spring-boot-starter-datascope/src/main/java/{com/hccake/ballcat/common => org/ballcat}/datascope/interceptor/DataPermissionInterceptor.java (88%) rename datascope/ballcat-spring-boot-starter-datascope/src/main/java/{com/hccake/ballcat/common => org/ballcat}/datascope/parser/JsqlParserSupport.java (98%) rename datascope/ballcat-spring-boot-starter-datascope/src/main/java/{com/hccake/ballcat/common => org/ballcat}/datascope/processor/DataScopeSqlProcessor.java (97%) rename datascope/ballcat-spring-boot-starter-datascope/src/main/java/{com/hccake/ballcat/common => org/ballcat}/datascope/util/AnnotationUtil.java (97%) rename datascope/ballcat-spring-boot-starter-datascope/src/main/java/{com/hccake/ballcat/common => org/ballcat}/datascope/util/CollectionUtils.java (95%) rename datascope/ballcat-spring-boot-starter-datascope/src/main/java/{com/hccake/ballcat/common => org/ballcat}/datascope/util/DataPermissionUtils.java (87%) rename datascope/ballcat-spring-boot-starter-datascope/src/main/java/{com/hccake/ballcat/common => org/ballcat}/datascope/util/PluginUtils.java (98%) rename datascope/ballcat-spring-boot-starter-datascope/src/main/java/{com/hccake/ballcat/common => org/ballcat}/datascope/util/SqlParseUtils.java (98%) rename datascope/ballcat-spring-boot-starter-datascope/src/test/java/{com/hccake/ballcat/common => org/ballcat}/datascope/test/datapermission/DataPermissionTest.java (88%) rename datascope/ballcat-spring-boot-starter-datascope/src/test/java/{com/hccake/ballcat/common => org/ballcat}/datascope/test/datapermission/DataPermissionTestConfiguration.java (90%) rename datascope/ballcat-spring-boot-starter-datascope/src/test/java/{com/hccake/ballcat/common => org/ballcat}/datascope/test/datapermission/TestService.java (85%) rename datascope/ballcat-spring-boot-starter-datascope/src/test/java/{com/hccake/ballcat/common => org/ballcat}/datascope/test/datapermission/TestServiceImpl.java (80%) rename datascope/ballcat-spring-boot-starter-datascope/src/test/java/{com/hccake/ballcat/common => org/ballcat}/datascope/test/datarule/StudentMapperTest.java (86%) rename datascope/ballcat-spring-boot-starter-datascope/src/test/java/{com/hccake/ballcat/common => org/ballcat}/datascope/test/datarule/config/DataPermissionRuleTestConfiguration.java (73%) rename datascope/ballcat-spring-boot-starter-datascope/src/test/java/{com/hccake/ballcat/common => org/ballcat}/datascope/test/datarule/config/DataSourceConfiguration.java (95%) rename datascope/ballcat-spring-boot-starter-datascope/src/test/java/{com/hccake/ballcat/common => org/ballcat}/datascope/test/datarule/datascope/ClassDataScope.java (87%) rename datascope/ballcat-spring-boot-starter-datascope/src/test/java/{com/hccake/ballcat/common => org/ballcat}/datascope/test/datarule/datascope/SchoolDataScope.java (86%) rename datascope/ballcat-spring-boot-starter-datascope/src/test/java/{com/hccake/ballcat/common => org/ballcat}/datascope/test/datarule/datascope/StudentDataScope.java (85%) rename datascope/ballcat-spring-boot-starter-datascope/src/test/java/{com/hccake/ballcat/common => org/ballcat}/datascope/test/datarule/entity/Student.java (92%) rename datascope/ballcat-spring-boot-starter-datascope/src/test/java/{com/hccake/ballcat/common => org/ballcat}/datascope/test/datarule/mapper/StudentMapper.java (85%) rename datascope/ballcat-spring-boot-starter-datascope/src/test/java/{com/hccake/ballcat/common => org/ballcat}/datascope/test/datarule/service/StudentService.java (75%) rename datascope/ballcat-spring-boot-starter-datascope/src/test/java/{com/hccake/ballcat/common => org/ballcat}/datascope/test/datarule/user/LoginUser.java (94%) rename datascope/ballcat-spring-boot-starter-datascope/src/test/java/{com/hccake/ballcat/common => org/ballcat}/datascope/test/datarule/user/LoginUserHolder.java (94%) rename datascope/ballcat-spring-boot-starter-datascope/src/test/java/{com/hccake/ballcat/common => org/ballcat}/datascope/test/datarule/user/UserRoleType.java (92%) rename datascope/ballcat-spring-boot-starter-datascope/src/test/java/{com/hccake/ballcat/common => org/ballcat}/datascope/test/datascope/DataScopeMatchTest.java (90%) rename datascope/ballcat-spring-boot-starter-datascope/src/test/java/{com/hccake/ballcat/common => org/ballcat}/datascope/test/datascope/SqlParseTest.java (97%) rename desensitize/ballcat-desensitize/src/main/java/{com/hccake/ballcat/common => org/ballcat}/desensitize/AnnotationHandlerHolder.java (83%) rename desensitize/ballcat-desensitize/src/main/java/{com/hccake/ballcat/common => org/ballcat}/desensitize/DesensitizationHandlerHolder.java (90%) rename desensitize/ballcat-desensitize/src/main/java/{com/hccake/ballcat/common => org/ballcat}/desensitize/enums/RegexDesensitizationTypeEnum.java (96%) rename desensitize/ballcat-desensitize/src/main/java/{com/hccake/ballcat/common => org/ballcat}/desensitize/enums/SlideDesensitizationTypeEnum.java (96%) rename desensitize/ballcat-desensitize/src/main/java/{com/hccake/ballcat/common => org/ballcat}/desensitize/functions/DesensitizeFunction.java (94%) rename desensitize/ballcat-desensitize/src/main/java/{com/hccake/ballcat/common => org/ballcat}/desensitize/handler/DesensitizationHandler.java (92%) rename desensitize/ballcat-desensitize/src/main/java/{com/hccake/ballcat/common => org/ballcat}/desensitize/handler/RegexDesensitizationHandler.java (91%) rename desensitize/ballcat-desensitize/src/main/java/{com/hccake/ballcat/common => org/ballcat}/desensitize/handler/SimpleDesensitizationHandler.java (94%) rename desensitize/ballcat-desensitize/src/main/java/{com/hccake/ballcat/common => org/ballcat}/desensitize/handler/SixAsteriskDesensitizationHandler.java (94%) rename desensitize/ballcat-desensitize/src/main/java/{com/hccake/ballcat/common => org/ballcat}/desensitize/handler/SlideDesensitizationHandler.java (94%) rename desensitize/ballcat-desensitize/src/main/java/{com/hccake/ballcat/common => org/ballcat}/desensitize/json/DesensitizeStrategy.java (94%) rename desensitize/ballcat-desensitize/src/main/java/{com/hccake/ballcat/common => org/ballcat}/desensitize/json/JsonDesensitizeModule.java (94%) rename desensitize/ballcat-desensitize/src/main/java/{com/hccake/ballcat/common => org/ballcat}/desensitize/json/JsonDesensitizeSerializer.java (91%) rename desensitize/ballcat-desensitize/src/main/java/{com/hccake/ballcat/common => org/ballcat}/desensitize/json/JsonDesensitizeSerializerModifier.java (94%) rename desensitize/ballcat-desensitize/src/main/java/{com/hccake/ballcat/common => org/ballcat}/desensitize/json/annotation/JsonRegexDesensitize.java (86%) rename desensitize/ballcat-desensitize/src/main/java/{com/hccake/ballcat/common => org/ballcat}/desensitize/json/annotation/JsonSimpleDesensitize.java (88%) rename desensitize/ballcat-desensitize/src/main/java/{com/hccake/ballcat/common => org/ballcat}/desensitize/json/annotation/JsonSlideDesensitize.java (86%) delete mode 100644 desensitize/ballcat-desensitize/src/main/resources/META-INF/services/com.hccake.ballcat.common.desensitize.handler.SimpleDesensitizationHandler create mode 100644 desensitize/ballcat-desensitize/src/main/resources/META-INF/services/org.ballcat.desensitize.handler.SimpleDesensitizationHandler rename desensitize/ballcat-desensitize/src/test/java/{com/hccake/common/core/test => org/ballcat}/desensite/DesensitisedTest.java (83%) rename desensitize/ballcat-desensitize/src/test/java/{com/hccake/common/core/test => org/ballcat}/desensite/DesensitizationUser.java (73%) rename desensitize/ballcat-desensitize/src/test/java/{com/hccake/common/core/test => org/ballcat}/desensite/TestDesensitizationHandler.java (86%) rename desensitize/ballcat-desensitize/src/test/java/{com/hccake/common/core/test => org/ballcat}/desensite/TestUtils.java (91%) rename desensitize/ballcat-desensitize/src/test/java/{com/hccake/common/core/test => org/ballcat}/desensite/custom/CustomDesensitisedHandler.java (85%) rename desensitize/ballcat-desensitize/src/test/java/{com/hccake/common/core/test => org/ballcat}/desensite/custom/CustomDesensitisedTest.java (86%) rename desensitize/ballcat-desensitize/src/test/java/{com/hccake/common/core/test => org/ballcat}/desensite/custom/CustomerDesensitize.java (94%) delete mode 100644 desensitize/ballcat-desensitize/src/test/resources/META-INF/services/com.hccake.ballcat.common.desensitize.handler.SimpleDesensitizationHandler create mode 100644 desensitize/ballcat-desensitize/src/test/resources/META-INF/services/org.ballcat.desensitize.handler.SimpleDesensitizationHandler rename dingtalk/ballcat-dingtalk/src/main/java/{com/hccake/extend => org/ballcat}/dingtalk/DingTalkBalancedSender.java (90%) rename dingtalk/ballcat-dingtalk/src/main/java/{com/hccake/extend => org/ballcat}/dingtalk/DingTalkParams.java (95%) rename dingtalk/ballcat-dingtalk/src/main/java/{com/hccake/extend => org/ballcat}/dingtalk/DingTalkResponse.java (98%) rename dingtalk/ballcat-dingtalk/src/main/java/{com/hccake/extend => org/ballcat}/dingtalk/DingTalkSender.java (97%) rename dingtalk/ballcat-dingtalk/src/main/java/{com/hccake/extend => org/ballcat}/dingtalk/enums/ActionBtnOrientationEnum.java (96%) rename dingtalk/ballcat-dingtalk/src/main/java/{com/hccake/extend => org/ballcat}/dingtalk/enums/MessageTypeEnum.java (96%) rename dingtalk/ballcat-dingtalk/src/main/java/{com/hccake/extend => org/ballcat}/dingtalk/message/AbstractDingTalkMessage.java (91%) rename dingtalk/ballcat-dingtalk/src/main/java/{com/hccake/extend => org/ballcat}/dingtalk/message/DingTalkActionCardMessage.java (89%) rename dingtalk/ballcat-dingtalk/src/main/java/{com/hccake/extend => org/ballcat}/dingtalk/message/DingTalkLinkMessage.java (89%) rename dingtalk/ballcat-dingtalk/src/main/java/{com/hccake/extend => org/ballcat}/dingtalk/message/DingTalkMarkDownMessage.java (85%) rename dingtalk/ballcat-dingtalk/src/main/java/{com/hccake/extend => org/ballcat}/dingtalk/message/DingTalkMessage.java (94%) rename dingtalk/ballcat-dingtalk/src/main/java/{com/hccake/extend => org/ballcat}/dingtalk/message/DingTalkTextMessage.java (88%) rename dingtalk/ballcat-dingtalk/src/test/java/{com/hccake/extend => org/ballcat}/dingtalk/DingTalkTest.java (93%) rename dingtalk/ballcat-spring-boot-starter-dingtalk/src/main/java/{com/hccake/starter => org/ballcat/autoconfigure}/dingtalk/DingTalkAutoConfiguration.java (94%) rename dingtalk/ballcat-spring-boot-starter-dingtalk/src/main/java/{com/hccake/starter => org/ballcat/autoconfigure}/dingtalk/DingTalkProperties.java (95%) rename excel/ballcat-spring-boot-starter-easyexcel/src/main/java/{com/hccake/common/excel => org/ballcat/easyexcel}/ExcelHandlerConfiguration.java (83%) rename excel/ballcat-spring-boot-starter-easyexcel/src/main/java/{com/hccake/common/excel => org/ballcat/easyexcel}/ResponseExcelAutoConfiguration.java (88%) rename excel/ballcat-spring-boot-starter-easyexcel/src/main/java/{com/hccake/common/excel => org/ballcat/easyexcel}/annotation/RequestExcel.java (90%) rename excel/ballcat-spring-boot-starter-easyexcel/src/main/java/{com/hccake/common/excel => org/ballcat/easyexcel}/annotation/ResponseExcel.java (95%) rename excel/ballcat-spring-boot-starter-easyexcel/src/main/java/{com/hccake/common/excel => org/ballcat/easyexcel}/annotation/Sheet.java (92%) rename excel/ballcat-spring-boot-starter-easyexcel/src/main/java/{com/hccake/common/excel => org/ballcat/easyexcel}/aop/DynamicNameAspect.java (92%) rename excel/ballcat-spring-boot-starter-easyexcel/src/main/java/{com/hccake/common/excel => org/ballcat/easyexcel}/aop/RequestExcelArgumentResolver.java (93%) rename excel/ballcat-spring-boot-starter-easyexcel/src/main/java/{com/hccake/common/excel => org/ballcat/easyexcel}/aop/ResponseExcelReturnValueHandler.java (94%) rename excel/ballcat-spring-boot-starter-easyexcel/src/main/java/{com/hccake/common/excel => org/ballcat/easyexcel}/config/ExcelConfigProperties.java (96%) rename excel/ballcat-spring-boot-starter-easyexcel/src/main/java/{com/hccake/common/excel => org/ballcat/easyexcel}/converters/LocalDateStringConverter.java (98%) rename excel/ballcat-spring-boot-starter-easyexcel/src/main/java/{com/hccake/common/excel => org/ballcat/easyexcel}/converters/LocalDateTimeStringConverter.java (98%) rename excel/ballcat-spring-boot-starter-easyexcel/src/main/java/{com/hccake/common/excel => org/ballcat/easyexcel}/domain/ErrorMessage.java (96%) rename excel/ballcat-spring-boot-starter-easyexcel/src/main/java/{com/hccake/common/excel => org/ballcat/easyexcel}/domain/SheetBuildProperties.java (91%) rename excel/ballcat-spring-boot-starter-easyexcel/src/main/java/{com/hccake/common/excel => org/ballcat/easyexcel}/enhance/DefaultWriterBuilderEnhancer.java (93%) rename excel/ballcat-spring-boot-starter-easyexcel/src/main/java/{com/hccake/common/excel => org/ballcat/easyexcel}/enhance/WriterBuilderEnhancer.java (92%) rename excel/ballcat-spring-boot-starter-easyexcel/src/main/java/{com/hccake/common/excel => org/ballcat/easyexcel}/handler/AbstractSheetWriteHandler.java (93%) rename excel/ballcat-spring-boot-starter-easyexcel/src/main/java/{com/hccake/common/excel => org/ballcat/easyexcel}/handler/DefaultAnalysisEventListener.java (93%) rename excel/ballcat-spring-boot-starter-easyexcel/src/main/java/{com/hccake/common/excel => org/ballcat/easyexcel}/handler/ListAnalysisEventListener.java (91%) rename excel/ballcat-spring-boot-starter-easyexcel/src/main/java/{com/hccake/common/excel => org/ballcat/easyexcel}/handler/ManySheetWriteHandler.java (90%) rename excel/ballcat-spring-boot-starter-easyexcel/src/main/java/{com/hccake/common/excel => org/ballcat/easyexcel}/handler/SheetWriteHandler.java (93%) rename excel/ballcat-spring-boot-starter-easyexcel/src/main/java/{com/hccake/common/excel => org/ballcat/easyexcel}/handler/SingleSheetWriteHandler.java (87%) rename excel/ballcat-spring-boot-starter-easyexcel/src/main/java/{com/hccake/common/excel => org/ballcat/easyexcel}/head/EmptyHeadGenerator.java (95%) rename excel/ballcat-spring-boot-starter-easyexcel/src/main/java/{com/hccake/common/excel => org/ballcat/easyexcel}/head/HeadGenerator.java (96%) rename excel/ballcat-spring-boot-starter-easyexcel/src/main/java/{com/hccake/common/excel => org/ballcat/easyexcel}/head/HeadMeta.java (96%) rename excel/ballcat-spring-boot-starter-easyexcel/src/main/java/{com/hccake/common/excel => org/ballcat/easyexcel}/head/I18nHeaderCellWriteHandler.java (98%) rename excel/ballcat-spring-boot-starter-easyexcel/src/main/java/{com/hccake/common/excel => org/ballcat/easyexcel}/kit/ExcelException.java (95%) rename excel/ballcat-spring-boot-starter-easyexcel/src/main/java/{com/hccake/common/excel => org/ballcat/easyexcel}/kit/Validators.java (97%) rename excel/ballcat-spring-boot-starter-easyexcel/src/main/java/{com/hccake/common/excel => org/ballcat/easyexcel}/processor/NameProcessor.java (95%) rename excel/ballcat-spring-boot-starter-easyexcel/src/main/java/{com/hccake/common/excel => org/ballcat/easyexcel}/processor/NameSpelExpressionProcessor.java (97%) rename excel/ballcat-spring-boot-starter-easyexcel/src/test/java/{hccake/ballcat/excel => org/ballcat/easyexcel}/application/DemoData.java (94%) rename excel/ballcat-spring-boot-starter-easyexcel/src/test/java/{hccake/ballcat/excel => org/ballcat/easyexcel}/application/ExcelExportTestController.java (89%) rename excel/ballcat-spring-boot-starter-easyexcel/src/test/java/{hccake/ballcat/excel => org/ballcat/easyexcel}/application/ExcelFillTestController.java (93%) rename excel/ballcat-spring-boot-starter-easyexcel/src/test/java/{hccake/ballcat/excel => org/ballcat/easyexcel}/application/ExcelImportTestController.java (91%) rename excel/ballcat-spring-boot-starter-easyexcel/src/test/java/{hccake/ballcat/excel => org/ballcat/easyexcel}/application/ExcelTestApplication.java (95%) rename excel/ballcat-spring-boot-starter-easyexcel/src/test/java/{hccake/ballcat/excel => org/ballcat/easyexcel}/test/ExcelExportTest.java (90%) rename excel/ballcat-spring-boot-starter-easyexcel/src/test/java/{hccake/ballcat/excel => org/ballcat/easyexcel}/test/ExcelFillTest.java (87%) rename excel/ballcat-spring-boot-starter-easyexcel/src/test/java/{hccake/ballcat/excel => org/ballcat/easyexcel}/test/ExcelImportTest.java (95%) rename file/ballcat-spring-boot-starter-file/src/main/java/{com/hccake/starter => org/ballcat}/file/FileAutoConfiguration.java (81%) rename file/ballcat-spring-boot-starter-file/src/main/java/{com/hccake/starter => org/ballcat}/file/FileProperties.java (95%) rename file/ballcat-spring-boot-starter-file/src/main/java/{com/hccake/starter => org/ballcat}/file/core/AbstractFileClient.java (96%) rename file/ballcat-spring-boot-starter-file/src/main/java/{com/hccake/starter => org/ballcat}/file/core/FileClient.java (97%) rename file/ballcat-spring-boot-starter-file/src/main/java/{com/hccake/starter => org/ballcat}/file/exception/FileException.java (95%) rename file/ballcat-spring-boot-starter-file/src/main/java/{com/hccake/starter => org/ballcat}/file/ftp/FtpFileClient.java (94%) rename file/ballcat-spring-boot-starter-file/src/main/java/{com/hccake/starter => org/ballcat}/file/ftp/FtpMode.java (95%) rename file/ballcat-spring-boot-starter-file/src/main/java/{com/hccake/starter => org/ballcat}/file/local/LocalFileClient.java (91%) rename file/ballcat-spring-boot-starter-file/src/test/java/{com/hccake/starter => org/ballcat}/file/FtpFileClientTest.java (94%) rename file/ballcat-spring-boot-starter-file/src/test/java/{com/hccake/starter => org/ballcat}/file/LocalFileClientTest.java (94%) rename grpc/ballcat-spring-boot-starter-grpc/src/main/java/{com/hccake/starter => org/ballcat}/grpc/GrpcClient.java (94%) rename grpc/ballcat-spring-boot-starter-grpc/src/main/java/{com/hccake/starter => org/ballcat}/grpc/GrpcClientChannel.java (96%) rename grpc/ballcat-spring-boot-starter-grpc/src/main/java/{com/hccake/starter => org/ballcat}/grpc/GrpcServer.java (91%) rename grpc/ballcat-spring-boot-starter-grpc/src/main/java/{com/hccake/starter => org/ballcat}/grpc/annotation/EnableGrpcServer.java (88%) rename grpc/ballcat-spring-boot-starter-grpc/src/main/java/{com/hccake/starter => org/ballcat}/grpc/configuration/GrpcClientAutoConfiguration.java (88%) rename grpc/ballcat-spring-boot-starter-grpc/src/main/java/{com/hccake/starter => org/ballcat}/grpc/configuration/GrpcServerConfiguration.java (93%) rename grpc/ballcat-spring-boot-starter-grpc/src/main/java/{com/hccake/starter => org/ballcat}/grpc/constant/GrpcConstants.java (95%) rename grpc/ballcat-spring-boot-starter-grpc/src/main/java/{com/hccake/starter => org/ballcat}/grpc/enums/GrpcLogType.java (95%) rename grpc/ballcat-spring-boot-starter-grpc/src/main/java/{com/hccake/starter => org/ballcat}/grpc/interceptor/CrossInterceptor.java (93%) rename grpc/ballcat-spring-boot-starter-grpc/src/main/java/{com/hccake/starter => org/ballcat}/grpc/interceptor/LogInterceptor.java (92%) rename grpc/ballcat-spring-boot-starter-grpc/src/main/java/{com/hccake/starter => org/ballcat}/grpc/interceptor/TraceIdInterceptor.java (94%) rename grpc/ballcat-spring-boot-starter-grpc/src/main/java/{com/hccake/starter => org/ballcat}/grpc/log/DefaultGrpcLogHandler.java (93%) rename grpc/ballcat-spring-boot-starter-grpc/src/main/java/{com/hccake/starter => org/ballcat}/grpc/log/GrpcLog.java (92%) rename grpc/ballcat-spring-boot-starter-grpc/src/main/java/{com/hccake/starter => org/ballcat}/grpc/log/GrpcLogHandler.java (95%) rename grpc/ballcat-spring-boot-starter-grpc/src/main/java/{com/hccake/starter => org/ballcat}/grpc/properties/GrpcClientProperties.java (96%) rename grpc/ballcat-spring-boot-starter-grpc/src/main/java/{com/hccake/starter => org/ballcat}/grpc/properties/GrpcServerProperties.java (96%) rename i18n/ballcat-i18n/src/main/java/{com/hccake/ballcat/common => org/ballcat}/i18n/DynamicMessageSource.java (97%) rename i18n/ballcat-i18n/src/main/java/{com/hccake/ballcat/common => org/ballcat}/i18n/I18nClass.java (95%) rename i18n/ballcat-i18n/src/main/java/{com/hccake/ballcat/common => org/ballcat}/i18n/I18nField.java (97%) rename i18n/ballcat-i18n/src/main/java/{com/hccake/ballcat/common => org/ballcat}/i18n/I18nIgnore.java (95%) rename i18n/ballcat-i18n/src/main/java/{com/hccake/ballcat/common => org/ballcat}/i18n/I18nMessage.java (97%) rename i18n/ballcat-i18n/src/main/java/{com/hccake/ballcat/common => org/ballcat}/i18n/I18nMessageCreateEvent.java (96%) rename i18n/ballcat-i18n/src/main/java/{com/hccake/ballcat/common => org/ballcat}/i18n/I18nMessageProvider.java (96%) rename i18n/ballcat-i18n/src/main/java/{com/hccake/ballcat/common => org/ballcat}/i18n/I18nOptions.java (96%) rename i18n/ballcat-i18n/src/main/java/{com/hccake/ballcat/common => org/ballcat}/i18n/I18nResponseAdvice.java (99%) rename i18n/ballcat-i18n/src/main/java/{com/hccake/ballcat/common => org/ballcat}/i18n/MessageSourceHierarchicalChanger.java (98%) rename i18n/ballcat-i18n/src/main/java/{com/hccake/ballcat/common => org/ballcat}/i18n/WildcardReloadableResourceBundleMessageSource.java (98%) rename i18n/ballcat-i18n/src/test/java/{com/hccake/ballcat/common => org/ballcat}/i18n/DefautlI18nMessageProvider.java (97%) rename i18n/ballcat-spring-boot-starter-i18n/src/main/java/{com/hccake => org}/ballcat/autoconfigure/i18n/CustomMessageSourceAutoConfiguration.java (97%) rename i18n/ballcat-spring-boot-starter-i18n/src/main/java/{com/hccake => org}/ballcat/autoconfigure/i18n/I18nAutoConfiguration.java (92%) rename i18n/ballcat-spring-boot-starter-i18n/src/main/java/{com/hccake => org}/ballcat/autoconfigure/i18n/I18nMessageSourceAutoConfiguration.java (90%) rename i18n/ballcat-spring-boot-starter-i18n/src/main/java/{com/hccake => org}/ballcat/autoconfigure/i18n/I18nProperties.java (89%) rename i18n/ballcat-spring-boot-starter-i18n/src/main/java/{com/hccake => org}/ballcat/autoconfigure/i18n/I18nValidationConfiguration.java (95%) rename idempotent/ballcat-idempotent/src/main/java/{com/hccake/ballcat/common => org/ballcat}/idempotent/IdempotentAspect.java (83%) rename idempotent/ballcat-idempotent/src/main/java/{com/hccake/ballcat/common => org/ballcat}/idempotent/annotation/Idempotent.java (97%) rename idempotent/ballcat-idempotent/src/main/java/{com/hccake/ballcat/common => org/ballcat}/idempotent/exception/IdempotentException.java (87%) rename idempotent/ballcat-idempotent/src/main/java/{com/hccake/ballcat/common => org/ballcat}/idempotent/key/generator/DefaultIdempotentKeyGenerator.java (93%) rename idempotent/ballcat-idempotent/src/main/java/{com/hccake/ballcat/common => org/ballcat}/idempotent/key/generator/IdempotentKeyGenerator.java (89%) rename idempotent/ballcat-idempotent/src/main/java/{com/hccake/ballcat/common => org/ballcat}/idempotent/key/store/IdempotentKeyStore.java (95%) rename idempotent/ballcat-idempotent/src/main/java/{com/hccake/ballcat/common => org/ballcat}/idempotent/key/store/InMemoryIdempotentKeyStore.java (96%) rename idempotent/ballcat-idempotent/src/main/java/{com/hccake/ballcat/common => org/ballcat}/idempotent/key/store/RedisIdempotentKeyStore.java (96%) rename idempotent/ballcat-idempotent/src/test/java/{com/hccake/ballcat/common => org/ballcat}/idempotent/test/IdempotentController.java (89%) rename idempotent/ballcat-idempotent/src/test/java/{com/hccake/ballcat/common => org/ballcat}/idempotent/test/IdempotentMethods.java (94%) rename idempotent/ballcat-idempotent/src/test/java/{com/hccake/ballcat/common => org/ballcat}/idempotent/test/IdempotentTestConfiguration.java (79%) rename idempotent/ballcat-idempotent/src/test/java/{com/hccake/ballcat/common => org/ballcat}/idempotent/test/InMemoryIdempotentTest.java (94%) rename idempotent/ballcat-idempotent/src/test/java/{com/hccake/ballcat/common => org/ballcat}/idempotent/test/TestException.java (93%) rename idempotent/ballcat-idempotent/src/test/java/{com/hccake/ballcat/common => org/ballcat}/idempotent/test/WebIdempotentTest.java (93%) rename idempotent/ballcat-spring-boot-starter-idempotent/src/main/java/{com/hccake => org}/ballcat/autoconfigure/idempotent/IdempotentAutoConfiguration.java (80%) rename idempotent/ballcat-spring-boot-starter-idempotent/src/main/java/{com/hccake => org}/ballcat/autoconfigure/idempotent/IdempotentProperties.java (95%) rename idempotent/ballcat-spring-boot-starter-idempotent/src/test/java/{com/hccake => org}/ballcat/autoconfigure/idempotent/IdempotentTest.java (85%) rename ip/ballcat-spring-boot-starter-ip2region/src/main/java/{com/hccake/ballcat/starter/ip2region/config => org/ballcat/autoconfigure/ip2region}/Ip2regionAutoConfiguration.java (77%) rename ip/ballcat-spring-boot-starter-ip2region/src/main/java/{com/hccake/ballcat/starter/ip2region/config => org/ballcat/autoconfigure/ip2region}/Ip2regionProperties.java (91%) rename ip/ballcat-spring-boot-starter-ip2region/src/main/java/{com/hccake/ballcat/starter => org/ballcat}/ip2region/core/CacheType.java (96%) rename ip/ballcat-spring-boot-starter-ip2region/src/main/java/{com/hccake/ballcat/starter => org/ballcat}/ip2region/core/IpInfo.java (98%) rename ip/ballcat-spring-boot-starter-ip2region/src/main/java/{com/hccake/ballcat/starter => org/ballcat}/ip2region/exception/Ip2regionException.java (93%) rename ip/ballcat-spring-boot-starter-ip2region/src/main/java/{com/hccake/ballcat/starter => org/ballcat}/ip2region/searcher/CacheVectorIndexIp2regionSearcher.java (93%) rename ip/ballcat-spring-boot-starter-ip2region/src/main/java/{com/hccake/ballcat/starter => org/ballcat}/ip2region/searcher/CacheXdbFileIp2regionSearcher.java (93%) rename ip/ballcat-spring-boot-starter-ip2region/src/main/java/{com/hccake/ballcat/starter => org/ballcat}/ip2region/searcher/Ip2regionSearcher.java (91%) rename ip/ballcat-spring-boot-starter-ip2region/src/main/java/{com/hccake/ballcat/starter => org/ballcat}/ip2region/searcher/Ip2regionSearcherTemplate.java (89%) rename ip/ballcat-spring-boot-starter-ip2region/src/main/java/{com/hccake/ballcat/starter => org/ballcat}/ip2region/searcher/NoneCacheIp2regionSearcher.java (91%) rename ip/ballcat-spring-boot-starter-ip2region/src/main/java/{com/hccake/ballcat/starter => org/ballcat}/ip2region/util/IpInfoUtils.java (95%) rename ip/ballcat-spring-boot-starter-ip2region/src/test/java/{com/hccake/ballcat/starter => org/ballcat}/ip2region/searcher/IndexCacheIp2RegionSearcherTest.java (94%) rename ip/ballcat-spring-boot-starter-ip2region/src/test/java/{com/hccake/ballcat/starter => org/ballcat}/ip2region/searcher/Ip2regionSearcherTest.java (93%) rename ip/ballcat-spring-boot-starter-ip2region/src/test/java/{com/hccake/ballcat/starter => org/ballcat}/ip2region/searcher/NoneCacheIp2RegionSearcherTest.java (94%) rename ip/ballcat-spring-boot-starter-ip2region/src/test/java/{com/hccake/ballcat/starter => org/ballcat}/ip2region/searcher/XdbCacheIp2RegionSearcherTest.java (94%) rename job/ballcat-spring-boot-starter-job/src/main/java/{com/hccake/ballcat/common/job => org/ballcat/autoconfigure/xxljob}/XxlJobAutoConfiguration.java (95%) rename job/ballcat-spring-boot-starter-job/src/main/java/{com/hccake/ballcat/common/job => org/ballcat/autoconfigure/xxljob}/properties/XxlAdminProperties.java (95%) rename job/ballcat-spring-boot-starter-job/src/main/java/{com/hccake/ballcat/common/job => org/ballcat/autoconfigure/xxljob}/properties/XxlExecutorProperties.java (97%) rename job/ballcat-spring-boot-starter-job/src/main/java/{com/hccake/ballcat/common/job => org/ballcat/autoconfigure/xxljob}/properties/XxlJobProperties.java (96%) rename kafka/ballcat-kafka-stream/src/main/java/{com/hccake/extend => org/ballcat}/kafka/stream/KafkaStreamBuilder.java (99%) rename kafka/ballcat-kafka-stream/src/main/java/{com/hccake/extend => org/ballcat}/kafka/stream/core/AbstractProcessor.java (96%) rename kafka/ballcat-kafka-stream/src/main/java/{com/hccake/extend => org/ballcat}/kafka/stream/core/AbstractPunctuator.java (95%) rename kafka/ballcat-kafka-stream/src/main/java/{com/hccake/extend => org/ballcat}/kafka/stream/core/Kafka.java (91%) rename kafka/ballcat-kafka-stream/src/main/java/{com/hccake/extend => org/ballcat}/kafka/stream/exception/NotAllowedException.java (93%) rename kafka/ballcat-kafka-stream/src/main/java/{com/hccake/extend => org/ballcat}/kafka/stream/extend/AbstractKeyValueStorePunctuator.java (88%) rename kafka/ballcat-kafka-stream/src/main/java/{com/hccake/extend => org/ballcat}/kafka/stream/extend/AbstractStringStringStorePunctuator.java (94%) rename kafka/ballcat-kafka-stream/src/main/java/{com/hccake/extend => org/ballcat}/kafka/stream/store/KafkaKeyValueStore.java (98%) rename kafka/ballcat-kafka-stream/src/main/java/{com/hccake/extend => org/ballcat}/kafka/stream/store/KafkaWindow.java (97%) rename kafka/ballcat-kafka-stream/src/main/java/{com/hccake/extend => org/ballcat}/kafka/stream/util/ProcessorContextUtil.java (96%) rename kafka/ballcat-kafka/src/main/java/{com/hccake/extend => org/ballcat}/kafka/KafkaConstants.java (96%) rename kafka/ballcat-kafka/src/main/java/{com/hccake/extend => org/ballcat}/kafka/KafkaConsumerBuilder.java (97%) rename kafka/ballcat-kafka/src/main/java/{com/hccake/extend => org/ballcat}/kafka/KafkaExtendProducer.java (99%) rename kafka/ballcat-kafka/src/main/java/{com/hccake/extend => org/ballcat}/kafka/KafkaProducerBuilder.java (96%) rename kafka/ballcat-spring-boot-starter-kafka/src/main/java/{com/hccake/starter => org/ballcat/autoconfigure}/kafka/KafkaAutoConfiguration.java (91%) rename kafka/ballcat-spring-boot-starter-kafka/src/main/java/{com/hccake/starter => org/ballcat/autoconfigure}/kafka/KafkaProperties.java (98%) rename log/ballcat-log/src/main/java/{com/hccake/ballcat/common => org/ballcat}/log/access/filter/AccessLogFilter.java (93%) rename log/ballcat-log/src/main/java/{com/hccake/ballcat/common => org/ballcat}/log/access/handler/AccessLogHandler.java (96%) rename log/ballcat-log/src/main/java/{com/hccake/ballcat/common => org/ballcat}/log/operation/annotation/CreateOperationLogging.java (92%) rename log/ballcat-log/src/main/java/{com/hccake/ballcat/common => org/ballcat}/log/operation/annotation/DeleteOperationLogging.java (92%) rename log/ballcat-log/src/main/java/{com/hccake/ballcat/common => org/ballcat}/log/operation/annotation/OperationLogging.java (95%) rename log/ballcat-log/src/main/java/{com/hccake/ballcat/common => org/ballcat}/log/operation/annotation/ReadOperationLogging.java (92%) rename log/ballcat-log/src/main/java/{com/hccake/ballcat/common => org/ballcat}/log/operation/annotation/UpdateOperationLogging.java (92%) rename log/ballcat-log/src/main/java/{com/hccake/ballcat/common => org/ballcat}/log/operation/aspect/OperationLogAspect.java (87%) rename log/ballcat-log/src/main/java/{com/hccake/ballcat/common => org/ballcat}/log/operation/enums/LogStatusEnum.java (94%) rename log/ballcat-log/src/main/java/{com/hccake/ballcat/common => org/ballcat}/log/operation/enums/OperationTypes.java (95%) rename log/ballcat-log/src/main/java/{com/hccake/ballcat/common => org/ballcat}/log/operation/handler/AbstractOperationLogHandler.java (96%) rename log/ballcat-log/src/main/java/{com/hccake/ballcat/common => org/ballcat}/log/operation/handler/OperationLogHandler.java (93%) rename log/ballcat-log/src/main/java/{com/hccake/ballcat/common => org/ballcat}/log/util/LogUtils.java (98%) rename log/ballcat-spring-boot-starter-log/src/main/java/{com/hccake => org}/ballcat/autoconfigure/log/AccessLogAutoConfiguration.java (88%) rename log/ballcat-spring-boot-starter-log/src/main/java/{com/hccake => org}/ballcat/autoconfigure/log/OperationLogAutoConfiguration.java (84%) rename log/ballcat-spring-boot-starter-log/src/main/java/{com/hccake => org}/ballcat/autoconfigure/log/properties/AccessLogProperties.java (96%) rename log/ballcat-spring-boot-starter-log/src/main/java/{com/hccake => org}/ballcat/autoconfigure/log/properties/OperationLogProperties.java (94%) rename mail/ballcat-spring-boot-starter-mail/src/main/java/{com/hccake/ballcat/common => org/ballcat}/mail/MailAutoConfiguration.java (90%) rename mail/ballcat-spring-boot-starter-mail/src/main/java/{com/hccake/ballcat/common => org/ballcat}/mail/event/MailSendEvent.java (89%) rename mail/ballcat-spring-boot-starter-mail/src/main/java/{com/hccake/ballcat/common => org/ballcat}/mail/model/MailDetails.java (96%) rename mail/ballcat-spring-boot-starter-mail/src/main/java/{com/hccake/ballcat/common => org/ballcat}/mail/model/MailSendInfo.java (97%) rename mail/ballcat-spring-boot-starter-mail/src/main/java/{com/hccake/ballcat/common => org/ballcat}/mail/sender/MailSender.java (95%) rename mail/ballcat-spring-boot-starter-mail/src/main/java/{com/hccake/ballcat/common => org/ballcat}/mail/sender/MailSenderImpl.java (93%) rename mybatis-plus/ballcat-mybatis-plus/src/main/java/{com/hccake/extend/mybatis/plus => org/ballcat/mybatisplus}/alias/TableAlias.java (89%) rename mybatis-plus/ballcat-mybatis-plus/src/main/java/{com/hccake/extend/mybatis/plus => org/ballcat/mybatisplus}/alias/TableAliasHelper.java (98%) rename mybatis-plus/ballcat-mybatis-plus/src/main/java/{com/hccake/extend/mybatis/plus => org/ballcat/mybatisplus}/alias/TableAliasNotFoundException.java (95%) rename mybatis-plus/ballcat-mybatis-plus/src/main/java/{com/hccake/extend/mybatis/plus => org/ballcat/mybatisplus}/conditions/query/ColumnFunction.java (94%) rename mybatis-plus/ballcat-mybatis-plus/src/main/java/{com/hccake/extend/mybatis/plus => org/ballcat/mybatisplus}/conditions/query/LambdaAliasQueryWrapperX.java (95%) rename mybatis-plus/ballcat-mybatis-plus/src/main/java/{com/hccake/extend/mybatis/plus => org/ballcat/mybatisplus}/conditions/query/LambdaQueryWrapperX.java (99%) rename mybatis-plus/ballcat-mybatis-plus/src/main/java/{com/hccake/extend/mybatis/plus => org/ballcat/mybatisplus}/injector/CustomSqlInjector.java (96%) rename mybatis-plus/ballcat-mybatis-plus/src/main/java/{com/hccake/extend/mybatis/plus => org/ballcat/mybatisplus}/mapper/ExtendMapper.java (90%) rename mybatis-plus/ballcat-mybatis-plus/src/main/java/{com/hccake/extend/mybatis/plus => org/ballcat/mybatisplus}/methods/BaseInsertBatch.java (98%) rename mybatis-plus/ballcat-mybatis-plus/src/main/java/{com/hccake/extend/mybatis/plus => org/ballcat/mybatisplus}/methods/InsertBatchSomeColumnByCollection.java (98%) rename mybatis-plus/ballcat-mybatis-plus/src/main/java/{com/hccake/extend/mybatis/plus => org/ballcat/mybatisplus}/methods/InsertIgnoreByBatch.java (95%) rename mybatis-plus/ballcat-mybatis-plus/src/main/java/{com/hccake/extend/mybatis/plus => org/ballcat/mybatisplus}/methods/InsertOrUpdateByBatch.java (97%) rename mybatis-plus/ballcat-mybatis-plus/src/main/java/{com/hccake/extend/mybatis/plus => org/ballcat/mybatisplus}/methods/InsertOrUpdateFieldByBatch.java (97%) rename mybatis-plus/ballcat-mybatis-plus/src/main/java/{com/hccake/extend/mybatis/plus => org/ballcat/mybatisplus}/service/ExtendService.java (99%) rename mybatis-plus/ballcat-mybatis-plus/src/main/java/{com/hccake/extend/mybatis/plus => org/ballcat/mybatisplus}/service/impl/ExtendServiceImpl.java (98%) rename mybatis-plus/ballcat-mybatis-plus/src/main/java/{com/hccake/extend/mybatis/plus => org/ballcat/mybatisplus}/toolkit/PageUtil.java (93%) rename mybatis-plus/ballcat-mybatis-plus/src/main/java/{com/hccake/extend/mybatis/plus => org/ballcat/mybatisplus}/toolkit/WrappersX.java (93%) rename mybatis-plus/ballcat-mybatis-plus/src/main/java/{com/hccake/extend/mybatis/plus => org/ballcat/mybatisplus}/type/EnumNameTypeHandler.java (98%) rename mybatis-plus/ballcat-mybatis-plus/src/test/java/{com/ballcat/extend/mybatis/plus => org/ballcat/mybatisplus}/Demo.java (89%) rename mybatis-plus/ballcat-mybatis-plus/src/test/java/{com/ballcat/extend/mybatis/plus => org/ballcat/mybatisplus}/LambdaAliasQueryXTest.java (90%) rename ntp/ballcat-ntp/src/main/java/{com/hccake/ballcat/extend => org/ballcat}/ntp/Ntp.java (97%) rename ntp/ballcat-ntp/src/main/java/{com/hccake/ballcat/extend => org/ballcat}/ntp/NtpCn.java (97%) rename ntp/ballcat-ntp/src/main/java/{com/hccake/ballcat/extend => org/ballcat}/ntp/NtpException.java (95%) rename ntp/ballcat-ntp/src/test/java/{com/hccake/ballcat/extend => org/ballcat}/ntp/NtpTest.java (96%) rename openapi/ballcat-spring-boot-starter-openapi/src/main/java/{com/hccake/ballcat/extend => org/ballcat/autoconfigure}/openapi/OpenApiAutoConfiguration.java (94%) rename openapi/ballcat-spring-boot-starter-openapi/src/main/java/{com/hccake/ballcat/extend => org/ballcat/autoconfigure}/openapi/OpenApiProperties.java (99%) rename openapi/ballcat-spring-boot-starter-openapi/src/main/java/{com/hccake/ballcat/extend => org/ballcat/autoconfigure}/openapi/SwaggerEnabledStatusReplaceEnvironmentPostProcessor.java (98%) rename openapi/ballcat-spring-boot-starter-openapi/src/main/java/{com/hccake/ballcat/extend => org/ballcat}/openapi/pageable/ByteClassLoader.java (94%) rename openapi/ballcat-spring-boot-starter-openapi/src/main/java/{com/hccake/ballcat/extend => org/ballcat}/openapi/pageable/PageParamOpenAPIConverter.java (90%) rename openapi/ballcat-spring-boot-starter-openapi/src/main/java/{com/hccake/ballcat/extend => org/ballcat}/openapi/pageable/PageableRequest.java (92%) rename openapi/ballcat-spring-boot-starter-openapi/src/main/java/{com/hccake/ballcat/extend => org/ballcat}/openapi/pageable/PageableRequestClassCreator.java (98%) rename oss/ballcat-spring-boot-starter-oss/src/main/java/{com/hccake/ballcat/common => org/ballcat}/oss/DefaultOssTemplate.java (99%) rename oss/ballcat-spring-boot-starter-oss/src/main/java/{com/hccake/ballcat/common => org/ballcat}/oss/ObjectWithGlobalKeyPrefixOssTemplate.java (99%) rename oss/ballcat-spring-boot-starter-oss/src/main/java/{com/hccake/ballcat/common => org/ballcat}/oss/OssAutoConfiguration.java (96%) rename oss/ballcat-spring-boot-starter-oss/src/main/java/{com/hccake/ballcat/common => org/ballcat}/oss/OssClient.java (96%) rename oss/ballcat-spring-boot-starter-oss/src/main/java/{com/hccake/ballcat/common => org/ballcat}/oss/OssConstants.java (95%) rename oss/ballcat-spring-boot-starter-oss/src/main/java/{com/hccake/ballcat/common => org/ballcat}/oss/OssProperties.java (99%) rename oss/ballcat-spring-boot-starter-oss/src/main/java/{com/hccake/ballcat/common => org/ballcat}/oss/OssTemplate.java (99%) rename oss/ballcat-spring-boot-starter-oss/src/main/java/{com/hccake/ballcat/common => org/ballcat}/oss/prefix/DefaultObjectKeyPrefixConverter.java (96%) rename oss/ballcat-spring-boot-starter-oss/src/main/java/{com/hccake/ballcat/common => org/ballcat}/oss/prefix/ObjectKeyPrefixConverter.java (96%) rename oss/ballcat-spring-boot-starter-oss/src/test/java/{com/ballcat/startes/oss/test => org/ballcat/oss}/AbstractOssTemplateTest.java (84%) rename oss/ballcat-spring-boot-starter-oss/src/test/java/{com/ballcat/startes/oss/test => org/ballcat/oss}/MinioOssTemplateTest.java (96%) rename pay/ballcat-pay-ali/src/main/java/{com/hccake/extend => org/ballcat}/pay/ali/AliPay.java (98%) rename pay/ballcat-pay-ali/src/main/java/{com/hccake/extend => org/ballcat}/pay/ali/constants/AliPayConstant.java (96%) rename pay/ballcat-pay-ali/src/main/java/{com/hccake/extend => org/ballcat}/pay/ali/domain/AliAppPay.java (90%) rename pay/ballcat-pay-ali/src/main/java/{com/hccake/extend => org/ballcat}/pay/ali/domain/AliPayCallback.java (82%) rename pay/ballcat-pay-ali/src/main/java/{com/hccake/extend => org/ballcat}/pay/ali/domain/AliPayQuery.java (91%) rename pay/ballcat-pay-ali/src/main/java/{com/hccake/extend => org/ballcat}/pay/ali/enums/TradeStatus.java (97%) rename pay/ballcat-pay-virtual/src/main/java/{com/hccake/extend => org/ballcat}/pay/viratual/AbstractVerifyThread.java (95%) rename pay/ballcat-pay-virtual/src/main/java/{com/hccake/extend => org/ballcat}/pay/viratual/VerifyObj.java (95%) rename pay/ballcat-pay-wx/src/main/java/{com/hccake/extend => org/ballcat}/pay/wx/WxPay.java (88%) rename pay/ballcat-pay-wx/src/main/java/{com/hccake/extend => org/ballcat}/pay/wx/constants/WxPayConstant.java (97%) rename pay/ballcat-pay-wx/src/main/java/{com/hccake/extend => org/ballcat}/pay/wx/domain/DefaultWxDomain.java (93%) rename pay/ballcat-pay-wx/src/main/java/{com/hccake/extend => org/ballcat}/pay/wx/domain/WxDomain.java (86%) rename pay/ballcat-pay-wx/src/main/java/{com/hccake/extend => org/ballcat}/pay/wx/enums/RequestSuffix.java (96%) rename pay/ballcat-pay-wx/src/main/java/{com/hccake/extend => org/ballcat}/pay/wx/enums/ResponseCode.java (96%) rename pay/ballcat-pay-wx/src/main/java/{com/hccake/extend => org/ballcat}/pay/wx/enums/SignType.java (96%) rename pay/ballcat-pay-wx/src/main/java/{com/hccake/extend => org/ballcat}/pay/wx/enums/TradeState.java (97%) rename pay/ballcat-pay-wx/src/main/java/{com/hccake/extend => org/ballcat}/pay/wx/enums/TradeType.java (95%) rename pay/ballcat-pay-wx/src/main/java/{com/hccake/extend => org/ballcat}/pay/wx/response/WxPayCallback.java (89%) rename pay/ballcat-pay-wx/src/main/java/{com/hccake/extend => org/ballcat}/pay/wx/response/WxPayOrderQueryResponse.java (91%) rename pay/ballcat-pay-wx/src/main/java/{com/hccake/extend => org/ballcat}/pay/wx/response/WxPayResponse.java (94%) rename pay/ballcat-pay-wx/src/main/java/{com/hccake/extend => org/ballcat}/pay/wx/utils/WxPayUtil.java (97%) rename pay/ballcat-spring-boot-starter-pay/src/main/java/{com/hccake/starter => org/ballcat/autoconfigure}/pay/ali/AliPayAutoConfiguration.java (93%) rename pay/ballcat-spring-boot-starter-pay/src/main/java/{com/hccake/starter => org/ballcat/autoconfigure}/pay/ali/AliPayProperties.java (97%) rename pay/ballcat-spring-boot-starter-pay/src/main/java/{com/hccake/starter => org/ballcat/autoconfigure}/pay/virtual/BitcoinProperties.java (95%) rename pay/ballcat-spring-boot-starter-pay/src/main/java/{com/hccake/starter => org/ballcat/autoconfigure}/pay/virtual/EtherscanProperties.java (96%) rename pay/ballcat-spring-boot-starter-pay/src/main/java/{com/hccake/starter => org/ballcat/autoconfigure}/pay/virtual/TronscanProperties.java (95%) rename pay/ballcat-spring-boot-starter-pay/src/main/java/{com/hccake/starter => org/ballcat/autoconfigure}/pay/virtual/VirtualPayAutoConfiguration.java (98%) rename pay/ballcat-spring-boot-starter-pay/src/main/java/{com/hccake/starter => org/ballcat/autoconfigure}/pay/wx/WxPayAutoConfiguration.java (95%) rename pay/ballcat-spring-boot-starter-pay/src/main/java/{com/hccake/starter => org/ballcat/autoconfigure}/pay/wx/WxPayProperties.java (96%) rename redis/ballcat-redis-module/src/main/java/{com/hccake/extend => org/ballcat}/redis/moudle/AbstractRedisModuleHelper.java (98%) rename redis/ballcat-redis-module/src/main/java/{com/hccake/extend => org/ballcat}/redis/moudle/bloom/BloomInsertKeywordEnum.java (95%) rename redis/ballcat-redis-module/src/main/java/{com/hccake/extend => org/ballcat}/redis/moudle/bloom/BloomInsertOptions.java (98%) rename redis/ballcat-redis-module/src/main/java/{com/hccake/extend => org/ballcat}/redis/moudle/bloom/BloomRedisModuleHelper.java (98%) rename redis/ballcat-redis-module/src/test/java/{com/hccake/extend => org/ballcat}/redis/module/BloomRedisModuleHelperConfig.java (86%) rename redis/ballcat-redis-module/src/test/java/{com/hccake/extend => org/ballcat}/redis/module/RedisBloomDemoApplicationTests.java (91%) rename redis/ballcat-redis/src/main/java/{com/hccake/ballcat/common => org/ballcat}/redis/RedisHelper.java (99%) rename redis/ballcat-redis/src/main/java/{com/hccake/ballcat/common => org/ballcat}/redis/config/CacheProperties.java (97%) rename redis/ballcat-redis/src/main/java/{com/hccake/ballcat/common => org/ballcat}/redis/config/CachePropertiesHolder.java (97%) rename redis/ballcat-redis/src/main/java/{com/hccake/ballcat/common => org/ballcat}/redis/config/KeyEventConfig.java (94%) rename redis/ballcat-redis/src/main/java/{com/hccake/ballcat/common => org/ballcat}/redis/core/CacheStringAspect.java (90%) rename redis/ballcat-redis/src/main/java/{com/hccake/ballcat/common => org/ballcat}/redis/core/KeyGenerator.java (94%) rename redis/ballcat-redis/src/main/java/{com/hccake/ballcat/common => org/ballcat}/redis/core/annotation/CacheDel.java (96%) rename redis/ballcat-redis/src/main/java/{com/hccake/ballcat/common => org/ballcat}/redis/core/annotation/CacheDels.java (93%) rename redis/ballcat-redis/src/main/java/{com/hccake/ballcat/common => org/ballcat}/redis/core/annotation/CachePut.java (96%) rename redis/ballcat-redis/src/main/java/{com/hccake/ballcat/common => org/ballcat}/redis/core/annotation/Cached.java (96%) rename redis/ballcat-redis/src/main/java/{com/hccake/ballcat/common => org/ballcat}/redis/core/annotation/MetaCacheAnnotation.java (93%) rename redis/ballcat-redis/src/main/java/{com/hccake/ballcat/common => org/ballcat}/redis/keyevent/listener/AbstractDeletedKeyEventMessageListener.java (96%) rename redis/ballcat-redis/src/main/java/{com/hccake/ballcat/common => org/ballcat}/redis/keyevent/listener/AbstractExpiredKeyEventMessageListener.java (96%) rename redis/ballcat-redis/src/main/java/{com/hccake/ballcat/common => org/ballcat}/redis/keyevent/listener/AbstractKeySpaceEventMessageListener.java (98%) rename redis/ballcat-redis/src/main/java/{com/hccake/ballcat/common => org/ballcat}/redis/keyevent/listener/AbstractSetKeyEventMessageListener.java (96%) rename redis/ballcat-redis/src/main/java/{com/hccake/ballcat/common => org/ballcat}/redis/keyevent/listener/DefaultDeletedKeyEventMessageListener.java (94%) rename redis/ballcat-redis/src/main/java/{com/hccake/ballcat/common => org/ballcat}/redis/keyevent/listener/DefaultExpiredKeyEventMessageListener.java (94%) rename redis/ballcat-redis/src/main/java/{com/hccake/ballcat/common => org/ballcat}/redis/keyevent/listener/DefaultSetKeyEventMessageListener.java (94%) rename redis/ballcat-redis/src/main/java/{com/hccake/ballcat/common => org/ballcat}/redis/keyevent/package-info.java (93%) rename redis/ballcat-redis/src/main/java/{com/hccake/ballcat/common => org/ballcat}/redis/keyevent/template/KeyDeletedEventMessageTemplate.java (93%) rename redis/ballcat-redis/src/main/java/{com/hccake/ballcat/common => org/ballcat}/redis/keyevent/template/KeyEventMessageTemplate.java (95%) rename redis/ballcat-redis/src/main/java/{com/hccake/ballcat/common => org/ballcat}/redis/keyevent/template/KeyExpiredEventMessageTemplate.java (93%) rename redis/ballcat-redis/src/main/java/{com/hccake/ballcat/common => org/ballcat}/redis/keyevent/template/KeySetEventMessageTemplate.java (93%) rename redis/ballcat-redis/src/main/java/{com/hccake/ballcat/common => org/ballcat}/redis/listener/AbstractMessageEventListener.java (95%) rename redis/ballcat-redis/src/main/java/{com/hccake/ballcat/common => org/ballcat}/redis/listener/MessageEventListener.java (94%) rename redis/ballcat-redis/src/main/java/{com/hccake/ballcat/common => org/ballcat}/redis/lock/Action.java (90%) rename redis/ballcat-redis/src/main/java/{com/hccake/ballcat/common => org/ballcat}/redis/lock/CacheLock.java (94%) rename redis/ballcat-redis/src/main/java/{com/hccake/ballcat/common => org/ballcat}/redis/lock/DistributedLock.java (94%) rename redis/ballcat-redis/src/main/java/{com/hccake/ballcat/common => org/ballcat}/redis/lock/StateHandler.java (92%) rename redis/ballcat-redis/src/main/java/{com/hccake/ballcat/common => org/ballcat}/redis/lock/function/ExceptionHandler.java (94%) rename redis/ballcat-redis/src/main/java/{com/hccake/ballcat/common => org/ballcat}/redis/lock/function/ThrowingExecutor.java (94%) rename redis/ballcat-redis/src/main/java/{com/hccake/ballcat/common => org/ballcat}/redis/operation/AbstractCacheOps.java (91%) rename redis/ballcat-redis/src/main/java/{com/hccake/ballcat/common => org/ballcat}/redis/operation/CacheDelOps.java (89%) rename redis/ballcat-redis/src/main/java/{com/hccake/ballcat/common => org/ballcat}/redis/operation/CacheDelsOps.java (89%) rename redis/ballcat-redis/src/main/java/{com/hccake/ballcat/common => org/ballcat}/redis/operation/CachePutOps.java (95%) rename redis/ballcat-redis/src/main/java/{com/hccake/ballcat/common => org/ballcat}/redis/operation/CachedOps.java (97%) rename redis/ballcat-redis/src/main/java/{com/hccake/ballcat/common => org/ballcat}/redis/operation/function/ResultMethod.java (92%) rename redis/ballcat-redis/src/main/java/{com/hccake/ballcat/common => org/ballcat}/redis/operation/function/VoidMethod.java (92%) rename redis/ballcat-redis/src/main/java/{com/hccake/ballcat/common => org/ballcat}/redis/prefix/IRedisPrefixConverter.java (98%) rename redis/ballcat-redis/src/main/java/{com/hccake/ballcat/common => org/ballcat}/redis/prefix/impl/DefaultRedisPrefixConverter.java (89%) rename redis/ballcat-redis/src/main/java/{com/hccake/ballcat/common => org/ballcat}/redis/serialize/CacheSerializer.java (97%) rename redis/ballcat-redis/src/main/java/{com/hccake/ballcat/common => org/ballcat}/redis/serialize/JacksonSerializer.java (96%) rename redis/ballcat-redis/src/main/java/{com/hccake/ballcat/common => org/ballcat}/redis/serialize/PrefixJdkRedisSerializer.java (92%) rename redis/ballcat-redis/src/main/java/{com/hccake/ballcat/common => org/ballcat}/redis/serialize/PrefixStringRedisSerializer.java (92%) rename redis/ballcat-redis/src/main/java/{com/hccake/ballcat/common => org/ballcat}/redis/thread/AbstractRedisThread.java (94%) rename redis/ballcat-redis/src/test/java/{com/hccake/ballcat/common/redis/test => org/ballcat/redis}/DistributeLockTest.java (91%) rename redis/ballcat-redis/src/test/java/{com/hccake/ballcat/common/redis/test/RedisConfiguration.java => org/ballcat/redis/TestRedisConfiguration.java} (84%) rename redis/ballcat-spring-boot-starter-redis/src/main/java/{com/hccake => org}/ballcat/autoconfigure/redis/AddMessageEventListenerToContainer.java (92%) rename redis/ballcat-spring-boot-starter-redis/src/main/java/{com/hccake => org}/ballcat/autoconfigure/redis/BallcatRedisAutoConfiguration.java (85%) rename redis/ballcat-spring-boot-starter-redis/src/main/java/{com/hccake => org}/ballcat/autoconfigure/redis/MessageEventListenerAutoConfiguration.java (93%) rename redis/ballcat-spring-boot-starter-redis/src/main/java/{com/hccake => org}/ballcat/autoconfigure/redis/RedisKeyEventAutoConfiguration.java (92%) rename security/ballcat-spring-security-oauth2-core/src/main/java/{com/hccake/ballcat/common/security => org/ballcat/security/oauth2}/ScopeNames.java (95%) rename security/ballcat-spring-security-oauth2-core/src/main/java/{com/hccake/ballcat/common/security => org/ballcat/security/oauth2}/authentication/OAuth2UserAuthenticationToken.java (96%) rename security/ballcat-spring-security-oauth2-core/src/main/java/{com/hccake/ballcat/common/security => org/ballcat/security/oauth2}/component/CustomPermissionEvaluator.java (96%) rename security/ballcat-spring-security-oauth2-core/src/main/java/{com/hccake/ballcat/common/security => org/ballcat/security/oauth2}/constant/TokenAttributeNameConstants.java (94%) rename security/ballcat-spring-security-oauth2-core/src/main/java/{com/hccake/ballcat/common/security => org/ballcat/security/oauth2}/constant/UserAttributeNameConstants.java (95%) rename security/ballcat-spring-security-oauth2-core/src/main/java/{com/hccake/ballcat/common/security => org/ballcat/security/oauth2}/constant/UserInfoFiledNameConstants.java (96%) rename security/ballcat-spring-security-oauth2-core/src/main/java/{com/hccake/ballcat/common/security => org/ballcat/security/oauth2}/jackson2/LongMixin.java (94%) rename security/ballcat-spring-security-oauth2-core/src/main/java/{com/hccake/ballcat/common/security => org/ballcat/security/oauth2}/jackson2/OAuth2UserAuthenticationTokenDeserializer.java (93%) rename security/ballcat-spring-security-oauth2-core/src/main/java/{com/hccake/ballcat/common/security => org/ballcat/security/oauth2}/jackson2/OAuth2UserAuthenticationTokenMixin.java (96%) rename security/ballcat-spring-security-oauth2-core/src/main/java/{com/hccake/ballcat/common/security => org/ballcat/security/oauth2}/jackson2/UserDeserializer.java (97%) rename security/ballcat-spring-security-oauth2-core/src/main/java/{com/hccake/ballcat/common/security => org/ballcat/security/oauth2}/jackson2/UserMixin.java (95%) rename security/ballcat-spring-security-oauth2-core/src/main/java/{com/hccake/ballcat/common/security => org/ballcat/security/oauth2}/userdetails/ClientPrincipal.java (97%) rename security/ballcat-spring-security-oauth2-core/src/main/java/{com/hccake/ballcat/common/security => org/ballcat/security/oauth2}/userdetails/User.java (97%) rename security/ballcat-spring-security-oauth2-core/src/main/java/{com/hccake/ballcat/common/security => org/ballcat/security/oauth2}/util/PasswordUtils.java (98%) rename security/ballcat-spring-security-oauth2-core/src/main/java/{com/hccake/ballcat/common/security => org/ballcat/security/oauth2}/util/SecurityUtils.java (91%) rename security/ballcat-spring-security-oauth2-core/src/test/java/{com/hccake/ballcat/common/security => org/ballcat/security/oauth2}/test/PasswordTest.java (94%) rename sms/ballcat-spring-boot-starter-sms/src/main/java/{com/hccake/starter => org/ballcat}/sms/SmsAutoConfiguration.java (89%) rename sms/ballcat-spring-boot-starter-sms/src/main/java/{com/hccake/starter => org/ballcat}/sms/SmsSender.java (96%) rename sms/ballcat-spring-boot-starter-sms/src/main/java/{com/hccake/starter => org/ballcat}/sms/SmsSenderParams.java (95%) rename sms/ballcat-spring-boot-starter-sms/src/main/java/{com/hccake/starter => org/ballcat}/sms/SmsSenderResult.java (92%) rename sms/ballcat-spring-boot-starter-sms/src/main/java/{com/hccake/starter => org/ballcat}/sms/constant/SmsConstants.java (95%) rename sms/ballcat-spring-boot-starter-sms/src/main/java/{com/hccake/starter => org/ballcat}/sms/constant/SmsSendConstants.java (96%) rename sms/ballcat-spring-boot-starter-sms/src/main/java/{com/hccake/starter => org/ballcat}/sms/enums/TypeEnum.java (95%) rename sms/ballcat-spring-boot-starter-sms/src/main/java/{com/hccake/starter => org/ballcat}/sms/exception/SmsException.java (95%) rename sms/ballcat-spring-boot-starter-sms/src/main/java/{com/hccake/starter => org/ballcat}/sms/impl/AliyunSenderImpl.java (88%) rename sms/ballcat-spring-boot-starter-sms/src/main/java/{com/hccake/starter => org/ballcat}/sms/impl/BaseServiceImpl.java (89%) rename sms/ballcat-spring-boot-starter-sms/src/main/java/{com/hccake/starter => org/ballcat}/sms/impl/TencentSenderImpl.java (90%) rename sms/ballcat-spring-boot-starter-sms/src/main/java/{com/hccake/starter => org/ballcat}/sms/impl/TianYiHongSenderImpl.java (86%) rename sms/ballcat-spring-boot-starter-sms/src/main/java/{com/hccake/starter => org/ballcat}/sms/properties/SmsProperties.java (83%) rename sms/ballcat-spring-boot-starter-sms/src/main/java/{com/hccake/starter => org/ballcat}/sms/properties/extra/Account.java (94%) rename sms/ballcat-spring-boot-starter-sms/src/main/java/{com/hccake/starter => org/ballcat}/sms/properties/extra/Aliyun.java (95%) rename sms/ballcat-spring-boot-starter-sms/src/main/java/{com/hccake/starter => org/ballcat}/sms/properties/extra/Tencent.java (95%) rename sms/ballcat-spring-boot-starter-sms/src/main/java/{com/hccake/starter => org/ballcat}/sms/properties/extra/TianYiHong.java (95%) rename tesseract/ballcat-tesseract/src/main/java/{com/hccake/ballcat/extend => org/ballcat}/tesseract/Tesseract.java (86%) rename tesseract/ballcat-tesseract/src/main/java/{com/hccake/ballcat/extend => org/ballcat}/tesseract/TesseractBox.java (94%) rename tesseract/ballcat-tesseract/src/main/java/{com/hccake/ballcat/extend => org/ballcat}/tesseract/TesseractCommand.java (96%) rename tesseract/ballcat-tesseract/src/main/java/{com/hccake/ballcat/extend => org/ballcat}/tesseract/TesseractImage.java (98%) rename tesseract/ballcat-tesseract/src/main/java/{com/hccake/ballcat/extend => org/ballcat}/tesseract/enums/TesseractLang.java (94%) rename tesseract/ballcat-tesseract/src/main/java/{com/hccake/ballcat/extend => org/ballcat}/tesseract/exception/OcrException.java (95%) rename tesseract/ballcat-tesseract/src/test/java/{com/hccake/ballcat/extend => org/ballcat}/tesseract/TesseractCommandTest.java (94%) rename tesseract/ballcat-tesseract/src/test/java/{com/hccake/ballcat/extend => org/ballcat}/tesseract/TesseractImageTest.java (97%) rename tesseract/ballcat-tesseract/src/test/java/{com/hccake/ballcat/extend => org/ballcat}/tesseract/TesseractTest.java (96%) rename web/ballcat-spring-boot-starter-web/src/main/java/{com/hccake => org}/ballcat/autoconfigure/web/actuate/ActuatorSecurityAutoConfiguration.java (98%) rename web/ballcat-spring-boot-starter-web/src/main/java/{com/hccake => org}/ballcat/autoconfigure/web/actuate/ActuatorSecurityFilter.java (92%) rename web/ballcat-spring-boot-starter-web/src/main/java/{com/hccake => org}/ballcat/autoconfigure/web/actuate/ActuatorSecurityProperties.java (95%) rename web/ballcat-spring-boot-starter-web/src/main/java/{com/hccake => org}/ballcat/autoconfigure/web/event/ApplicationContextInitialized.java (93%) rename web/ballcat-spring-boot-starter-web/src/main/java/{com/hccake => org}/ballcat/autoconfigure/web/event/EnvironmentPost.java (92%) rename web/ballcat-spring-boot-starter-web/src/main/java/{com/hccake => org}/ballcat/autoconfigure/web/exception/ExceptionAutoConfiguration.java (86%) rename web/ballcat-spring-boot-starter-web/src/main/java/{com/hccake => org}/ballcat/autoconfigure/web/exception/ExceptionHandleProperties.java (94%) rename web/ballcat-spring-boot-starter-web/src/main/java/{com/hccake => org}/ballcat/autoconfigure/web/exception/domain/ExceptionMessage.java (96%) rename web/ballcat-spring-boot-starter-web/src/main/java/{com/hccake => org}/ballcat/autoconfigure/web/exception/domain/ExceptionNoticeResponse.java (93%) rename web/ballcat-spring-boot-starter-web/src/main/java/{com/hccake => org}/ballcat/autoconfigure/web/exception/enums/ExceptionHandleTypeEnum.java (92%) rename web/ballcat-spring-boot-starter-web/src/main/java/{com/hccake => org}/ballcat/autoconfigure/web/exception/handler/AbstractNoticeGlobalExceptionHandler.java (92%) rename web/ballcat-spring-boot-starter-web/src/main/java/{com/hccake => org}/ballcat/autoconfigure/web/exception/handler/DefaultGlobalExceptionHandler.java (86%) rename web/ballcat-spring-boot-starter-web/src/main/java/{com/hccake => org}/ballcat/autoconfigure/web/exception/handler/DingTalkGlobalExceptionHandler.java (74%) rename web/ballcat-spring-boot-starter-web/src/main/java/{com/hccake => org}/ballcat/autoconfigure/web/exception/handler/MailGlobalExceptionHandler.java (77%) rename web/ballcat-spring-boot-starter-web/src/main/java/{com/hccake => org}/ballcat/autoconfigure/web/exception/handler/MultiGlobalExceptionHandler.java (86%) rename web/ballcat-spring-boot-starter-web/src/main/java/{com/hccake => org}/ballcat/autoconfigure/web/exception/resolver/GlobalHandlerExceptionResolver.java (94%) rename web/ballcat-spring-boot-starter-web/src/main/java/{com/hccake => org}/ballcat/autoconfigure/web/exception/resolver/SecurityHandlerExceptionResolver.java (87%) rename web/ballcat-spring-boot-starter-web/src/main/java/{com/hccake => org}/ballcat/autoconfigure/web/jackson/CustomJacksonAutoConfiguration.java (88%) rename web/ballcat-spring-boot-starter-web/src/main/java/{com/hccake => org}/ballcat/autoconfigure/web/pageable/DefaultPageParamArgumentResolver.java (95%) rename web/ballcat-spring-boot-starter-web/src/main/java/{com/hccake => org}/ballcat/autoconfigure/web/pageable/PageParamArgumentResolver.java (94%) rename web/ballcat-spring-boot-starter-web/src/main/java/{com/hccake => org}/ballcat/autoconfigure/web/pageable/PageParamArgumentResolverSupport.java (97%) rename web/ballcat-spring-boot-starter-web/src/main/java/{com/hccake => org}/ballcat/autoconfigure/web/pageable/PageableProperties.java (90%) rename web/ballcat-spring-boot-starter-web/src/main/java/{com/hccake => org}/ballcat/autoconfigure/web/servlet/WebMvcAutoConfiguration.java (87%) rename web/ballcat-spring-boot-starter-web/src/main/java/{com/hccake => org}/ballcat/autoconfigure/web/servlet/WebProperties.java (94%) rename web/ballcat-spring-boot-starter-web/src/main/java/{com/hccake => org}/ballcat/autoconfigure/web/trace/TraceIdFilter.java (94%) rename web/ballcat-spring-boot-starter-web/src/main/java/{com/hccake => org}/ballcat/autoconfigure/web/trace/TraceIdGenerator.java (93%) rename web/ballcat-spring-boot-starter-web/src/main/java/{com/hccake => org}/ballcat/autoconfigure/web/validation/BallcatValidationAutoConfiguration.java (94%) rename websocket/ballcat-spring-boot-starter-websocket/src/main/java/{com/hccake => org}/ballcat/autoconfigure/websocket/MessageDistributorTypeConstants.java (95%) rename websocket/ballcat-spring-boot-starter-websocket/src/main/java/{com/hccake => org}/ballcat/autoconfigure/websocket/SockJsServiceConfigurer.java (94%) rename websocket/ballcat-spring-boot-starter-websocket/src/main/java/{com/hccake => org}/ballcat/autoconfigure/websocket/WebSocketAutoConfiguration.java (84%) rename websocket/ballcat-spring-boot-starter-websocket/src/main/java/{com/hccake => org}/ballcat/autoconfigure/websocket/WebSocketProperties.java (94%) rename websocket/ballcat-spring-boot-starter-websocket/src/main/java/{com/hccake => org}/ballcat/autoconfigure/websocket/config/LocalMessageDistributorConfig.java (78%) rename websocket/ballcat-spring-boot-starter-websocket/src/main/java/{com/hccake => org}/ballcat/autoconfigure/websocket/config/RedisMessageDistributorConfig.java (83%) rename websocket/ballcat-spring-boot-starter-websocket/src/main/java/{com/hccake => org}/ballcat/autoconfigure/websocket/config/RocketMqMessageDistributorConfig.java (78%) rename websocket/ballcat-spring-boot-starter-websocket/src/main/java/{com/hccake => org}/ballcat/autoconfigure/websocket/config/WebSocketHandlerConfig.java (76%) rename websocket/ballcat-websocket/src/main/java/{com/hccake/ballcat/common => org/ballcat}/websocket/WebSocketMessageSender.java (90%) rename websocket/ballcat-websocket/src/main/java/{com/hccake/ballcat/common => org/ballcat}/websocket/distribute/AbstractMessageDistributor.java (92%) rename websocket/ballcat-websocket/src/main/java/{com/hccake/ballcat/common => org/ballcat}/websocket/distribute/LocalMessageDistributor.java (88%) rename websocket/ballcat-websocket/src/main/java/{com/hccake/ballcat/common => org/ballcat}/websocket/distribute/MessageDO.java (95%) rename websocket/ballcat-websocket/src/main/java/{com/hccake/ballcat/common => org/ballcat}/websocket/distribute/MessageDistributor.java (93%) rename websocket/ballcat-websocket/src/main/java/{com/hccake/ballcat/common => org/ballcat}/websocket/distribute/RedisMessageDistributor.java (92%) rename websocket/ballcat-websocket/src/main/java/{com/hccake/ballcat/common => org/ballcat}/websocket/distribute/RedisMessageListenerInitializer.java (95%) rename websocket/ballcat-websocket/src/main/java/{com/hccake/ballcat/common => org/ballcat}/websocket/distribute/RocketmqMessageDistributor.java (92%) rename websocket/ballcat-websocket/src/main/java/{com/hccake/ballcat/common => org/ballcat}/websocket/exception/ErrorJsonMessageException.java (93%) rename websocket/ballcat-websocket/src/main/java/{com/hccake/ballcat/common => org/ballcat}/websocket/handler/ConcurrentWebSocketSessionOptions.java (96%) rename websocket/ballcat-websocket/src/main/java/{com/hccake/ballcat/common => org/ballcat}/websocket/handler/CustomWebSocketHandler.java (93%) rename websocket/ballcat-websocket/src/main/java/{com/hccake/ballcat/common => org/ballcat}/websocket/handler/JsonMessageHandler.java (90%) rename websocket/ballcat-websocket/src/main/java/{com/hccake/ballcat/common => org/ballcat}/websocket/handler/PingJsonMessageHandler.java (75%) rename websocket/ballcat-websocket/src/main/java/{com/hccake/ballcat/common => org/ballcat}/websocket/handler/PlanTextMessageHandler.java (89%) rename websocket/ballcat-websocket/src/main/java/{com/hccake/ballcat/common => org/ballcat}/websocket/holder/JsonMessageHandlerHolder.java (86%) rename websocket/ballcat-websocket/src/main/java/{com/hccake/ballcat/common => org/ballcat}/websocket/holder/JsonMessageHandlerInitializer.java (87%) rename websocket/ballcat-websocket/src/main/java/{com/hccake/ballcat/common => org/ballcat}/websocket/message/JsonWebSocketMessage.java (95%) rename websocket/ballcat-websocket/src/main/java/{com/hccake/ballcat/common => org/ballcat}/websocket/message/PingJsonWebSocketMessage.java (93%) rename websocket/ballcat-websocket/src/main/java/{com/hccake/ballcat/common => org/ballcat}/websocket/message/PongJsonWebSocketMessage.java (93%) rename websocket/ballcat-websocket/src/main/java/{com/hccake/ballcat/common => org/ballcat}/websocket/message/WebSocketMessageTypeEnum.java (94%) rename websocket/ballcat-websocket/src/main/java/{com/hccake/ballcat/common => org/ballcat}/websocket/session/DefaultWebSocketSessionStore.java (98%) rename websocket/ballcat-websocket/src/main/java/{com/hccake/ballcat/common => org/ballcat}/websocket/session/MapSessionWebSocketHandlerDecorator.java (93%) rename websocket/ballcat-websocket/src/main/java/{com/hccake/ballcat/common => org/ballcat}/websocket/session/SessionKeyGenerator.java (94%) rename websocket/ballcat-websocket/src/main/java/{com/hccake/ballcat/common => org/ballcat}/websocket/session/WebSocketSessionStore.java (96%) rename xss/ballcat-spring-boot-starter-xss/src/main/java/{com/hccake/ballcat/common => org/ballcat}/xss/XssAutoConfiguration.java (89%) rename xss/ballcat-spring-boot-starter-xss/src/main/java/{com/hccake/ballcat/common => org/ballcat}/xss/cleaner/JsoupXssCleaner.java (98%) rename xss/ballcat-spring-boot-starter-xss/src/main/java/{com/hccake/ballcat/common => org/ballcat}/xss/cleaner/XssCleaner.java (94%) rename xss/ballcat-spring-boot-starter-xss/src/main/java/{com/hccake/ballcat/common => org/ballcat}/xss/config/XssProperties.java (97%) rename xss/ballcat-spring-boot-starter-xss/src/main/java/{com/hccake/ballcat/common => org/ballcat}/xss/core/XssFilter.java (94%) rename xss/ballcat-spring-boot-starter-xss/src/main/java/{com/hccake/ballcat/common => org/ballcat}/xss/core/XssRequestWrapper.java (96%) rename xss/ballcat-spring-boot-starter-xss/src/main/java/{com/hccake/ballcat/common => org/ballcat}/xss/core/XssStateHolder.java (96%) rename xss/ballcat-spring-boot-starter-xss/src/main/java/{com/hccake/ballcat/common => org/ballcat}/xss/core/XssStringJsonDeserializer.java (96%) rename xss/ballcat-spring-boot-starter-xss/src/main/java/{com/hccake/ballcat/common => org/ballcat}/xss/core/XssStringJsonSerializer.java (93%) diff --git a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/compose/ContextComponent.java b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/compose/ContextComponent.java similarity index 96% rename from common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/compose/ContextComponent.java rename to common/ballcat-common-core/src/main/java/org/ballcat/common/core/compose/ContextComponent.java index a4aaab0cd..e00dd1b5f 100644 --- a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/compose/ContextComponent.java +++ b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/compose/ContextComponent.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.core.compose; +package org.ballcat.common.core.compose; /** * 上下文组件, 在接入对应的上下文时(如: spring 的 bean) 便于在 开始和结束时执行对应的方法 diff --git a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/constant/GlobalConstants.java b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/constant/GlobalConstants.java similarity index 96% rename from common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/constant/GlobalConstants.java rename to common/ballcat-common-core/src/main/java/org/ballcat/common/core/constant/GlobalConstants.java index f4a324ca1..beba3b0cb 100644 --- a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/constant/GlobalConstants.java +++ b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/constant/GlobalConstants.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.core.constant; +package org.ballcat.common.core.constant; /** * @author Hccake 2020/6/9 17:17 diff --git a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/constant/HeaderConstants.java b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/constant/HeaderConstants.java similarity index 95% rename from common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/constant/HeaderConstants.java rename to common/ballcat-common-core/src/main/java/org/ballcat/common/core/constant/HeaderConstants.java index 5208e579f..9512a88ca 100644 --- a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/constant/HeaderConstants.java +++ b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/constant/HeaderConstants.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.core.constant; +package org.ballcat.common.core.constant; /** * @author Hccake 2019/10/31 11:55 diff --git a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/constant/HttpsConstants.java b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/constant/HttpsConstants.java similarity index 94% rename from common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/constant/HttpsConstants.java rename to common/ballcat-common-core/src/main/java/org/ballcat/common/core/constant/HttpsConstants.java index ca4d9b104..4abb44a06 100644 --- a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/constant/HttpsConstants.java +++ b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/constant/HttpsConstants.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.core.constant; +package org.ballcat.common.core.constant; -import com.hccake.ballcat.common.core.https.CompatibleSSLFactory; -import com.hccake.ballcat.common.core.https.SSLSocketFactoryInitException; +import org.ballcat.common.core.https.CompatibleSSLFactory; +import org.ballcat.common.core.https.SSLSocketFactoryInitException; import lombok.experimental.UtilityClass; import javax.net.ssl.HostnameVerifier; diff --git a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/constant/MDCConstants.java b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/constant/MDCConstants.java similarity index 94% rename from common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/constant/MDCConstants.java rename to common/ballcat-common-core/src/main/java/org/ballcat/common/core/constant/MDCConstants.java index 69e778a41..69a859d0e 100644 --- a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/constant/MDCConstants.java +++ b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/constant/MDCConstants.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.core.constant; +package org.ballcat.common.core.constant; /** * MDC 相关常量 diff --git a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/constant/enums/BooleanEnum.java b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/constant/enums/BooleanEnum.java similarity index 94% rename from common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/constant/enums/BooleanEnum.java rename to common/ballcat-common-core/src/main/java/org/ballcat/common/core/constant/enums/BooleanEnum.java index 9379c0461..0abc5354d 100644 --- a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/constant/enums/BooleanEnum.java +++ b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/constant/enums/BooleanEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.core.constant.enums; +package org.ballcat.common.core.constant.enums; import lombok.AllArgsConstructor; diff --git a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/constant/enums/ImportModeEnum.java b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/constant/enums/ImportModeEnum.java similarity index 94% rename from common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/constant/enums/ImportModeEnum.java rename to common/ballcat-common-core/src/main/java/org/ballcat/common/core/constant/enums/ImportModeEnum.java index cf057c02d..6ab38fe6f 100644 --- a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/constant/enums/ImportModeEnum.java +++ b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/constant/enums/ImportModeEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.core.constant.enums; +package org.ballcat.common.core.constant.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/exception/BusinessException.java b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/exception/BusinessException.java similarity index 94% rename from common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/exception/BusinessException.java rename to common/ballcat-common-core/src/main/java/org/ballcat/common/core/exception/BusinessException.java index f48bc4ab6..872ed8e94 100644 --- a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/exception/BusinessException.java +++ b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/exception/BusinessException.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.core.exception; +package org.ballcat.common.core.exception; import cn.hutool.core.text.CharSequenceUtil; -import com.hccake.ballcat.common.model.result.ResultCode; +import org.ballcat.common.model.result.ResultCode; import lombok.Getter; /** diff --git a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/exception/SqlCheckedException.java b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/exception/SqlCheckedException.java similarity index 90% rename from common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/exception/SqlCheckedException.java rename to common/ballcat-common-core/src/main/java/org/ballcat/common/core/exception/SqlCheckedException.java index a1ca88d02..4bbbb119a 100644 --- a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/exception/SqlCheckedException.java +++ b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/exception/SqlCheckedException.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.core.exception; +package org.ballcat.common.core.exception; -import com.hccake.ballcat.common.model.result.SystemResultCode; +import org.ballcat.common.model.result.SystemResultCode; /** * sql防注入校验异常 diff --git a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/exception/handler/GlobalExceptionHandler.java b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/exception/handler/GlobalExceptionHandler.java similarity index 93% rename from common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/exception/handler/GlobalExceptionHandler.java rename to common/ballcat-common-core/src/main/java/org/ballcat/common/core/exception/handler/GlobalExceptionHandler.java index 2e9d0e02c..bf19b77e9 100644 --- a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/exception/handler/GlobalExceptionHandler.java +++ b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/exception/handler/GlobalExceptionHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.core.exception.handler; +package org.ballcat.common.core.exception.handler; /** * 异常日志处理类 diff --git a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/https/CompatibleSSLFactory.java b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/https/CompatibleSSLFactory.java similarity index 95% rename from common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/https/CompatibleSSLFactory.java rename to common/ballcat-common-core/src/main/java/org/ballcat/common/core/https/CompatibleSSLFactory.java index f80035a31..f61df3d55 100644 --- a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/https/CompatibleSSLFactory.java +++ b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/https/CompatibleSSLFactory.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.core.https; +package org.ballcat.common.core.https; -import com.hccake.ballcat.common.core.constant.HttpsConstants; -import com.hccake.ballcat.common.util.ArrayUtils; +import org.ballcat.common.core.constant.HttpsConstants; +import org.ballcat.common.util.ArrayUtils; import javax.net.ssl.KeyManager; import javax.net.ssl.SSLContext; diff --git a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/https/SSLSocketFactoryInitException.java b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/https/SSLSocketFactoryInitException.java similarity index 94% rename from common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/https/SSLSocketFactoryInitException.java rename to common/ballcat-common-core/src/main/java/org/ballcat/common/core/https/SSLSocketFactoryInitException.java index 5ed731a79..68f80e575 100644 --- a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/https/SSLSocketFactoryInitException.java +++ b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/https/SSLSocketFactoryInitException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.core.https; +package org.ballcat.common.core.https; /** * @author lingting 2023/2/1 14:29 diff --git a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/jackson/CustomJavaTimeModule.java b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/jackson/CustomJavaTimeModule.java similarity index 98% rename from common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/jackson/CustomJavaTimeModule.java rename to common/ballcat-common-core/src/main/java/org/ballcat/common/core/jackson/CustomJavaTimeModule.java index a165387f7..1430e9ff8 100644 --- a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/jackson/CustomJavaTimeModule.java +++ b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/jackson/CustomJavaTimeModule.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.core.jackson; +package org.ballcat.common.core.jackson; import cn.hutool.core.date.DatePattern; import com.fasterxml.jackson.databind.module.SimpleModule; diff --git a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/jackson/NullArrayJsonSerializer.java b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/jackson/NullArrayJsonSerializer.java similarity index 96% rename from common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/jackson/NullArrayJsonSerializer.java rename to common/ballcat-common-core/src/main/java/org/ballcat/common/core/jackson/NullArrayJsonSerializer.java index 089a5c2f3..e971453ae 100644 --- a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/jackson/NullArrayJsonSerializer.java +++ b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/jackson/NullArrayJsonSerializer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.core.jackson; +package org.ballcat.common.core.jackson; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; diff --git a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/jackson/NullMapJsonSerializer.java b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/jackson/NullMapJsonSerializer.java similarity index 96% rename from common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/jackson/NullMapJsonSerializer.java rename to common/ballcat-common-core/src/main/java/org/ballcat/common/core/jackson/NullMapJsonSerializer.java index 49733b941..da6ce1625 100644 --- a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/jackson/NullMapJsonSerializer.java +++ b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/jackson/NullMapJsonSerializer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.core.jackson; +package org.ballcat.common.core.jackson; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; diff --git a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/jackson/NullSerializerProvider.java b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/jackson/NullSerializerProvider.java similarity index 98% rename from common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/jackson/NullSerializerProvider.java rename to common/ballcat-common-core/src/main/java/org/ballcat/common/core/jackson/NullSerializerProvider.java index 68a55e478..7c560d66e 100644 --- a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/jackson/NullSerializerProvider.java +++ b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/jackson/NullSerializerProvider.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.core.jackson; +package org.ballcat.common.core.jackson; import com.fasterxml.jackson.databind.BeanProperty; import com.fasterxml.jackson.databind.JavaType; diff --git a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/jackson/NullStringJsonSerializer.java b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/jackson/NullStringJsonSerializer.java similarity index 96% rename from common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/jackson/NullStringJsonSerializer.java rename to common/ballcat-common-core/src/main/java/org/ballcat/common/core/jackson/NullStringJsonSerializer.java index 82d7e6052..71cc56082 100644 --- a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/jackson/NullStringJsonSerializer.java +++ b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/jackson/NullStringJsonSerializer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.core.jackson; +package org.ballcat.common.core.jackson; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; diff --git a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/request/wrapper/ModifyParamMapRequestWrapper.java b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/request/wrapper/ModifyParamMapRequestWrapper.java similarity index 95% rename from common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/request/wrapper/ModifyParamMapRequestWrapper.java rename to common/ballcat-common-core/src/main/java/org/ballcat/common/core/request/wrapper/ModifyParamMapRequestWrapper.java index a61e6c18b..d992d5f5c 100644 --- a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/request/wrapper/ModifyParamMapRequestWrapper.java +++ b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/request/wrapper/ModifyParamMapRequestWrapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.core.request.wrapper; +package org.ballcat.common.core.request.wrapper; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; diff --git a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/request/wrapper/RepeatBodyRequestWrapper.java b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/request/wrapper/RepeatBodyRequestWrapper.java similarity index 98% rename from common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/request/wrapper/RepeatBodyRequestWrapper.java rename to common/ballcat-common-core/src/main/java/org/ballcat/common/core/request/wrapper/RepeatBodyRequestWrapper.java index a79c4cc9d..996f43dbf 100644 --- a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/request/wrapper/RepeatBodyRequestWrapper.java +++ b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/request/wrapper/RepeatBodyRequestWrapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.core.request.wrapper; +package org.ballcat.common.core.request.wrapper; import lombok.extern.slf4j.Slf4j; import org.springframework.util.ObjectUtils; diff --git a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/spring/BallcatBeanPostProcessor.java b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/spring/BallcatBeanPostProcessor.java similarity index 98% rename from common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/spring/BallcatBeanPostProcessor.java rename to common/ballcat-common-core/src/main/java/org/ballcat/common/core/spring/BallcatBeanPostProcessor.java index 23391e662..c5a362422 100644 --- a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/spring/BallcatBeanPostProcessor.java +++ b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/spring/BallcatBeanPostProcessor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.core.spring; +package org.ballcat.common.core.spring; import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanPostProcessor; diff --git a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/spring/compose/ContextComposeBeanPostProcessor.java b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/spring/compose/ContextComposeBeanPostProcessor.java similarity index 85% rename from common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/spring/compose/ContextComposeBeanPostProcessor.java rename to common/ballcat-common-core/src/main/java/org/ballcat/common/core/spring/compose/ContextComposeBeanPostProcessor.java index b7727ba5d..bc9a707e9 100644 --- a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/spring/compose/ContextComposeBeanPostProcessor.java +++ b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/spring/compose/ContextComposeBeanPostProcessor.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.core.spring.compose; +package org.ballcat.common.core.spring.compose; -import com.hccake.ballcat.common.core.compose.ContextComponent; -import com.hccake.ballcat.common.core.spring.BallcatBeanPostProcessor; +import org.ballcat.common.core.compose.ContextComponent; +import org.ballcat.common.core.spring.BallcatBeanPostProcessor; import org.springframework.stereotype.Component; /** diff --git a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/spring/compose/SpringContextClosed.java b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/spring/compose/SpringContextClosed.java similarity index 93% rename from common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/spring/compose/SpringContextClosed.java rename to common/ballcat-common-core/src/main/java/org/ballcat/common/core/spring/compose/SpringContextClosed.java index 882607f4a..4872a1738 100644 --- a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/spring/compose/SpringContextClosed.java +++ b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/spring/compose/SpringContextClosed.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.core.spring.compose; +package org.ballcat.common.core.spring.compose; -import com.hccake.ballcat.common.core.compose.ContextComponent; +import org.ballcat.common.core.compose.ContextComponent; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.context.ApplicationContext; diff --git a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/thread/AbstractBlockingQueueThread.java b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/thread/AbstractBlockingQueueThread.java similarity index 94% rename from common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/thread/AbstractBlockingQueueThread.java rename to common/ballcat-common-core/src/main/java/org/ballcat/common/core/thread/AbstractBlockingQueueThread.java index e7f8d0d8c..0bc214b2d 100644 --- a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/thread/AbstractBlockingQueueThread.java +++ b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/thread/AbstractBlockingQueueThread.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.core.thread; +package org.ballcat.common.core.thread; import lombok.extern.slf4j.Slf4j; @@ -38,7 +38,7 @@ public void put(T t) { queue.put(t); } catch (InterruptedException e) { - Thread.currentThread().interrupt(); + currentThread().interrupt(); } catch (Exception e) { log.error("{} put Object error, param: {}", this.getClass().toString(), t, e); diff --git a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/thread/AbstractDynamicTimer.java b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/thread/AbstractDynamicTimer.java similarity index 96% rename from common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/thread/AbstractDynamicTimer.java rename to common/ballcat-common-core/src/main/java/org/ballcat/common/core/thread/AbstractDynamicTimer.java index 3eb07bc50..b4ef0753f 100644 --- a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/thread/AbstractDynamicTimer.java +++ b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/thread/AbstractDynamicTimer.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.core.thread; +package org.ballcat.common.core.thread; -import com.hccake.ballcat.common.lock.JavaReentrantLock; +import org.ballcat.common.lock.JavaReentrantLock; import lombok.extern.slf4j.Slf4j; import java.util.Comparator; diff --git a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/thread/AbstractQueueThread.java b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/thread/AbstractQueueThread.java similarity index 97% rename from common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/thread/AbstractQueueThread.java rename to common/ballcat-common-core/src/main/java/org/ballcat/common/core/thread/AbstractQueueThread.java index 65570e0f6..85f04377b 100644 --- a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/thread/AbstractQueueThread.java +++ b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/thread/AbstractQueueThread.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.core.thread; +package org.ballcat.common.core.thread; -import com.hccake.ballcat.common.core.compose.ContextComponent; +import org.ballcat.common.core.compose.ContextComponent; import lombok.extern.slf4j.Slf4j; import org.springframework.util.CollectionUtils; diff --git a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/thread/AbstractThreadContextComponent.java b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/thread/AbstractThreadContextComponent.java similarity index 92% rename from common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/thread/AbstractThreadContextComponent.java rename to common/ballcat-common-core/src/main/java/org/ballcat/common/core/thread/AbstractThreadContextComponent.java index 0450ebe44..34a016cf2 100644 --- a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/thread/AbstractThreadContextComponent.java +++ b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/thread/AbstractThreadContextComponent.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.core.thread; +package org.ballcat.common.core.thread; -import com.hccake.ballcat.common.core.compose.ContextComponent; +import org.ballcat.common.core.compose.ContextComponent; import lombok.extern.slf4j.Slf4j; /** diff --git a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/thread/AbstractTimer.java b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/thread/AbstractTimer.java similarity index 94% rename from common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/thread/AbstractTimer.java rename to common/ballcat-common-core/src/main/java/org/ballcat/common/core/thread/AbstractTimer.java index 90faf8a8b..334252a11 100644 --- a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/thread/AbstractTimer.java +++ b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/thread/AbstractTimer.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.core.thread; +package org.ballcat.common.core.thread; -import com.hccake.ballcat.common.core.compose.ContextComponent; +import org.ballcat.common.core.compose.ContextComponent; import lombok.extern.slf4j.Slf4j; import java.util.concurrent.TimeUnit; diff --git a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/util/WebUtils.java b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/util/WebUtils.java similarity index 97% rename from common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/util/WebUtils.java rename to common/ballcat-common-core/src/main/java/org/ballcat/common/core/util/WebUtils.java index 1a57e0d32..1bcb5da39 100644 --- a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/util/WebUtils.java +++ b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/util/WebUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.core.util; +package org.ballcat.common.core.util; import lombok.experimental.UtilityClass; import lombok.extern.slf4j.Slf4j; diff --git a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/validation/EmptyCurlyToDefaultMessageInterpolator.java b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/validation/EmptyCurlyToDefaultMessageInterpolator.java similarity index 97% rename from common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/validation/EmptyCurlyToDefaultMessageInterpolator.java rename to common/ballcat-common-core/src/main/java/org/ballcat/common/core/validation/EmptyCurlyToDefaultMessageInterpolator.java index 29a908995..229db8e1d 100644 --- a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/validation/EmptyCurlyToDefaultMessageInterpolator.java +++ b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/validation/EmptyCurlyToDefaultMessageInterpolator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.core.validation; +package org.ballcat.common.core.validation; import org.hibernate.validator.messageinterpolation.ResourceBundleMessageInterpolator; import org.hibernate.validator.spi.resourceloading.ResourceBundleLocator; diff --git a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/validation/constraints/OneOfClasses.java b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/validation/constraints/OneOfClasses.java similarity index 91% rename from common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/validation/constraints/OneOfClasses.java rename to common/ballcat-common-core/src/main/java/org/ballcat/common/core/validation/constraints/OneOfClasses.java index 9083824b7..3df4199fd 100644 --- a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/validation/constraints/OneOfClasses.java +++ b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/validation/constraints/OneOfClasses.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.core.validation.constraints; +package org.ballcat.common.core.validation.constraints; -import com.hccake.ballcat.common.core.validation.validator.EnumValueValidatorOfClass; +import org.ballcat.common.core.validation.validator.EnumValueValidatorOfClass; import javax.validation.Constraint; import javax.validation.Payload; diff --git a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/validation/constraints/OneOfInts.java b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/validation/constraints/OneOfInts.java similarity index 91% rename from common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/validation/constraints/OneOfInts.java rename to common/ballcat-common-core/src/main/java/org/ballcat/common/core/validation/constraints/OneOfInts.java index 3c8f94e53..6991f5c58 100644 --- a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/validation/constraints/OneOfInts.java +++ b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/validation/constraints/OneOfInts.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.core.validation.constraints; +package org.ballcat.common.core.validation.constraints; -import com.hccake.ballcat.common.core.validation.validator.EnumValueValidatorOfInt; +import org.ballcat.common.core.validation.validator.EnumValueValidatorOfInt; import javax.validation.Constraint; import javax.validation.Payload; diff --git a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/validation/constraints/OneOfStrings.java b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/validation/constraints/OneOfStrings.java similarity index 91% rename from common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/validation/constraints/OneOfStrings.java rename to common/ballcat-common-core/src/main/java/org/ballcat/common/core/validation/constraints/OneOfStrings.java index fe87fddd6..e6b8d07c1 100644 --- a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/validation/constraints/OneOfStrings.java +++ b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/validation/constraints/OneOfStrings.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.core.validation.constraints; +package org.ballcat.common.core.validation.constraints; -import com.hccake.ballcat.common.core.validation.validator.EnumValueValidatorOfString; +import org.ballcat.common.core.validation.validator.EnumValueValidatorOfString; import javax.validation.Constraint; import javax.validation.Payload; diff --git a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/validation/constraints/ValueOfEnum.java b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/validation/constraints/ValueOfEnum.java similarity index 92% rename from common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/validation/constraints/ValueOfEnum.java rename to common/ballcat-common-core/src/main/java/org/ballcat/common/core/validation/constraints/ValueOfEnum.java index 942b0752f..7aa91d151 100644 --- a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/validation/constraints/ValueOfEnum.java +++ b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/validation/constraints/ValueOfEnum.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.core.validation.constraints; +package org.ballcat.common.core.validation.constraints; -import com.hccake.ballcat.common.core.validation.validator.ValueOfEnumValidator; +import org.ballcat.common.core.validation.validator.ValueOfEnumValidator; import javax.validation.Constraint; import javax.validation.Payload; diff --git a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/validation/group/CreateGroup.java b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/validation/group/CreateGroup.java similarity index 92% rename from common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/validation/group/CreateGroup.java rename to common/ballcat-common-core/src/main/java/org/ballcat/common/core/validation/group/CreateGroup.java index 1d329a353..d242a403a 100644 --- a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/validation/group/CreateGroup.java +++ b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/validation/group/CreateGroup.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.core.validation.group; +package org.ballcat.common.core.validation.group; /** * Validation Group，新建时校验 diff --git a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/validation/group/UpdateGroup.java b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/validation/group/UpdateGroup.java similarity index 92% rename from common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/validation/group/UpdateGroup.java rename to common/ballcat-common-core/src/main/java/org/ballcat/common/core/validation/group/UpdateGroup.java index 8b9839d99..c2ec4c104 100644 --- a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/validation/group/UpdateGroup.java +++ b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/validation/group/UpdateGroup.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.core.validation.group; +package org.ballcat.common.core.validation.group; /** * Validation Group，更新时校验 diff --git a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/validation/validator/EnumValueValidatorOfClass.java b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/validation/validator/EnumValueValidatorOfClass.java similarity index 90% rename from common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/validation/validator/EnumValueValidatorOfClass.java rename to common/ballcat-common-core/src/main/java/org/ballcat/common/core/validation/validator/EnumValueValidatorOfClass.java index e073fc499..50a40b2e2 100644 --- a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/validation/validator/EnumValueValidatorOfClass.java +++ b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/validation/validator/EnumValueValidatorOfClass.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.core.validation.validator; +package org.ballcat.common.core.validation.validator; -import com.hccake.ballcat.common.core.validation.constraints.OneOfClasses; +import org.ballcat.common.core.validation.constraints.OneOfClasses; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; diff --git a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/validation/validator/EnumValueValidatorOfInt.java b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/validation/validator/EnumValueValidatorOfInt.java similarity index 90% rename from common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/validation/validator/EnumValueValidatorOfInt.java rename to common/ballcat-common-core/src/main/java/org/ballcat/common/core/validation/validator/EnumValueValidatorOfInt.java index b53b697cd..7ea0aac25 100644 --- a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/validation/validator/EnumValueValidatorOfInt.java +++ b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/validation/validator/EnumValueValidatorOfInt.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.core.validation.validator; +package org.ballcat.common.core.validation.validator; -import com.hccake.ballcat.common.core.validation.constraints.OneOfInts; +import org.ballcat.common.core.validation.constraints.OneOfInts; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; diff --git a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/validation/validator/EnumValueValidatorOfString.java b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/validation/validator/EnumValueValidatorOfString.java similarity index 90% rename from common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/validation/validator/EnumValueValidatorOfString.java rename to common/ballcat-common-core/src/main/java/org/ballcat/common/core/validation/validator/EnumValueValidatorOfString.java index 07ffd61cb..001e58d18 100644 --- a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/validation/validator/EnumValueValidatorOfString.java +++ b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/validation/validator/EnumValueValidatorOfString.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.core.validation.validator; +package org.ballcat.common.core.validation.validator; -import com.hccake.ballcat.common.core.validation.constraints.OneOfStrings; +import org.ballcat.common.core.validation.constraints.OneOfStrings; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; diff --git a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/validation/validator/ValueOfEnumValidator.java b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/validation/validator/ValueOfEnumValidator.java similarity index 93% rename from common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/validation/validator/ValueOfEnumValidator.java rename to common/ballcat-common-core/src/main/java/org/ballcat/common/core/validation/validator/ValueOfEnumValidator.java index a2c9f0250..c6d9094cb 100644 --- a/common/ballcat-common-core/src/main/java/com/hccake/ballcat/common/core/validation/validator/ValueOfEnumValidator.java +++ b/common/ballcat-common-core/src/main/java/org/ballcat/common/core/validation/validator/ValueOfEnumValidator.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.core.validation.validator; +package org.ballcat.common.core.validation.validator; -import com.hccake.ballcat.common.core.validation.constraints.ValueOfEnum; +import org.ballcat.common.core.validation.constraints.ValueOfEnum; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ClassUtils; import org.apache.commons.lang3.reflect.MethodUtils; diff --git a/common/ballcat-common-core/src/test/java/com/ballcat/core/jackson/NullSerializerTest.java b/common/ballcat-common-core/src/test/java/org/ballcat/common/core/jackson/NullSerializerTest.java similarity index 93% rename from common/ballcat-common-core/src/test/java/com/ballcat/core/jackson/NullSerializerTest.java rename to common/ballcat-common-core/src/test/java/org/ballcat/common/core/jackson/NullSerializerTest.java index 3075f71f6..857fa1bdf 100644 --- a/common/ballcat-common-core/src/test/java/com/ballcat/core/jackson/NullSerializerTest.java +++ b/common/ballcat-common-core/src/test/java/org/ballcat/common/core/jackson/NullSerializerTest.java @@ -13,11 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ballcat.core.jackson; +package org.ballcat.common.core.jackson; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.hccake.ballcat.common.core.jackson.NullSerializerProvider; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/common/ballcat-common-core/src/test/java/com/ballcat/core/jackson/NullSeriralDemoData.java b/common/ballcat-common-core/src/test/java/org/ballcat/common/core/jackson/NullSeriralDemoData.java similarity index 96% rename from common/ballcat-common-core/src/test/java/com/ballcat/core/jackson/NullSeriralDemoData.java rename to common/ballcat-common-core/src/test/java/org/ballcat/common/core/jackson/NullSeriralDemoData.java index de2e7bc7e..2c56a25fc 100644 --- a/common/ballcat-common-core/src/test/java/com/ballcat/core/jackson/NullSeriralDemoData.java +++ b/common/ballcat-common-core/src/test/java/org/ballcat/common/core/jackson/NullSeriralDemoData.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ballcat.core.jackson; +package org.ballcat.common.core.jackson; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; diff --git a/common/ballcat-common-core/src/test/java/com/ballcat/core/thread/AbstractDynamicTimerTest.java b/common/ballcat-common-core/src/test/java/org/ballcat/common/core/thread/AbstractDynamicTimerTest.java similarity index 95% rename from common/ballcat-common-core/src/test/java/com/ballcat/core/thread/AbstractDynamicTimerTest.java rename to common/ballcat-common-core/src/test/java/org/ballcat/common/core/thread/AbstractDynamicTimerTest.java index 2226ffff4..034f5e7d3 100644 --- a/common/ballcat-common-core/src/test/java/com/ballcat/core/thread/AbstractDynamicTimerTest.java +++ b/common/ballcat-common-core/src/test/java/org/ballcat/common/core/thread/AbstractDynamicTimerTest.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ballcat.core.thread; +package org.ballcat.common.core.thread; -import com.hccake.ballcat.common.core.thread.AbstractDynamicTimer; -import com.hccake.ballcat.common.util.LocalDateTimeUtils; +import org.ballcat.common.core.thread.AbstractDynamicTimer; +import org.ballcat.common.util.LocalDateTimeUtils; import lombok.AllArgsConstructor; import lombok.Data; import lombok.extern.slf4j.Slf4j; diff --git a/common/ballcat-common-core/src/test/java/com/ballcat/core/validation/Car.java b/common/ballcat-common-core/src/test/java/org/ballcat/common/core/validation/Car.java similarity index 95% rename from common/ballcat-common-core/src/test/java/com/ballcat/core/validation/Car.java rename to common/ballcat-common-core/src/test/java/org/ballcat/common/core/validation/Car.java index 9a47acca3..1235aa750 100644 --- a/common/ballcat-common-core/src/test/java/com/ballcat/core/validation/Car.java +++ b/common/ballcat-common-core/src/test/java/org/ballcat/common/core/validation/Car.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ballcat.core.validation; +package org.ballcat.common.core.validation; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/common/ballcat-common-core/src/test/java/com/ballcat/core/validation/CarTest.java b/common/ballcat-common-core/src/test/java/org/ballcat/common/core/validation/CarTest.java similarity index 98% rename from common/ballcat-common-core/src/test/java/com/ballcat/core/validation/CarTest.java rename to common/ballcat-common-core/src/test/java/org/ballcat/common/core/validation/CarTest.java index f1700c80e..e73039141 100644 --- a/common/ballcat-common-core/src/test/java/com/ballcat/core/validation/CarTest.java +++ b/common/ballcat-common-core/src/test/java/org/ballcat/common/core/validation/CarTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ballcat.core.validation; +package org.ballcat.common.core.validation; import org.hibernate.validator.HibernateValidator; import org.hibernate.validator.HibernateValidatorConfiguration; diff --git a/common/ballcat-common-core/src/test/java/com/ballcat/core/validation/Demo.java b/common/ballcat-common-core/src/test/java/org/ballcat/common/core/validation/Demo.java similarity index 79% rename from common/ballcat-common-core/src/test/java/com/ballcat/core/validation/Demo.java rename to common/ballcat-common-core/src/test/java/org/ballcat/common/core/validation/Demo.java index 1ebb49ae5..080cdb7a3 100644 --- a/common/ballcat-common-core/src/test/java/com/ballcat/core/validation/Demo.java +++ b/common/ballcat-common-core/src/test/java/org/ballcat/common/core/validation/Demo.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ballcat.core.validation; +package org.ballcat.common.core.validation; -import com.hccake.ballcat.common.core.validation.constraints.OneOfInts; -import com.hccake.ballcat.common.core.validation.constraints.OneOfStrings; -import com.hccake.ballcat.common.core.validation.constraints.ValueOfEnum; +import org.ballcat.common.core.validation.constraints.OneOfInts; +import org.ballcat.common.core.validation.constraints.OneOfStrings; +import org.ballcat.common.core.validation.constraints.ValueOfEnum; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/common/ballcat-common-core/src/test/java/com/ballcat/core/validation/DemoTest.java b/common/ballcat-common-core/src/test/java/org/ballcat/common/core/validation/DemoTest.java similarity index 92% rename from common/ballcat-common-core/src/test/java/com/ballcat/core/validation/DemoTest.java rename to common/ballcat-common-core/src/test/java/org/ballcat/common/core/validation/DemoTest.java index 9cbf96bb4..7c8ce47f5 100644 --- a/common/ballcat-common-core/src/test/java/com/ballcat/core/validation/DemoTest.java +++ b/common/ballcat-common-core/src/test/java/org/ballcat/common/core/validation/DemoTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ballcat.core.validation; +package org.ballcat.common.core.validation; import lombok.extern.slf4j.Slf4j; import org.hibernate.validator.HibernateValidator; @@ -70,11 +70,11 @@ void manufacturerIsNull() { constraintViolation.getMessage()); break; case "status": - assertEquals("value is not in enum [class com.ballcat.core.validation.StatusEnum]", + assertEquals("value is not in enum [class " + StatusEnum.class.getName() + "]", constraintViolation.getMessage()); break; case "statusName": - assertEquals("value is not in enum [class com.ballcat.core.validation.StatusEnum]", + assertEquals("value is not in enum [class " + StatusEnum.class.getName() + "]", constraintViolation.getMessage()); break; } diff --git a/common/ballcat-common-core/src/test/java/com/ballcat/core/validation/StatusEnum.java b/common/ballcat-common-core/src/test/java/org/ballcat/common/core/validation/StatusEnum.java similarity index 95% rename from common/ballcat-common-core/src/test/java/com/ballcat/core/validation/StatusEnum.java rename to common/ballcat-common-core/src/test/java/org/ballcat/common/core/validation/StatusEnum.java index 9251061e2..fe77a65d7 100644 --- a/common/ballcat-common-core/src/test/java/com/ballcat/core/validation/StatusEnum.java +++ b/common/ballcat-common-core/src/test/java/org/ballcat/common/core/validation/StatusEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ballcat.core.validation; +package org.ballcat.common.core.validation; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/common/ballcat-common-model/src/main/java/com/hccake/ballcat/common/model/domain/PageParam.java b/common/ballcat-common-model/src/main/java/org/ballcat/common/model/domain/PageParam.java similarity index 97% rename from common/ballcat-common-model/src/main/java/com/hccake/ballcat/common/model/domain/PageParam.java rename to common/ballcat-common-model/src/main/java/org/ballcat/common/model/domain/PageParam.java index 171effa55..cd3086523 100644 --- a/common/ballcat-common-model/src/main/java/com/hccake/ballcat/common/model/domain/PageParam.java +++ b/common/ballcat-common-model/src/main/java/org/ballcat/common/model/domain/PageParam.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.model.domain; +package org.ballcat.common.model.domain; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/common/ballcat-common-model/src/main/java/com/hccake/ballcat/common/model/domain/PageResult.java b/common/ballcat-common-model/src/main/java/org/ballcat/common/model/domain/PageResult.java similarity index 96% rename from common/ballcat-common-model/src/main/java/com/hccake/ballcat/common/model/domain/PageResult.java rename to common/ballcat-common-model/src/main/java/org/ballcat/common/model/domain/PageResult.java index b69ebd851..c43d0921e 100644 --- a/common/ballcat-common-model/src/main/java/com/hccake/ballcat/common/model/domain/PageResult.java +++ b/common/ballcat-common-model/src/main/java/org/ballcat/common/model/domain/PageResult.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.model.domain; +package org.ballcat.common.model.domain; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/common/ballcat-common-model/src/main/java/com/hccake/ballcat/common/model/domain/PageableConstants.java b/common/ballcat-common-model/src/main/java/org/ballcat/common/model/domain/PageableConstants.java similarity index 97% rename from common/ballcat-common-model/src/main/java/com/hccake/ballcat/common/model/domain/PageableConstants.java rename to common/ballcat-common-model/src/main/java/org/ballcat/common/model/domain/PageableConstants.java index d5e03945b..c606faf51 100644 --- a/common/ballcat-common-model/src/main/java/com/hccake/ballcat/common/model/domain/PageableConstants.java +++ b/common/ballcat-common-model/src/main/java/org/ballcat/common/model/domain/PageableConstants.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.model.domain; +package org.ballcat.common.model.domain; import cn.hutool.core.collection.CollUtil; diff --git a/common/ballcat-common-model/src/main/java/com/hccake/ballcat/common/model/domain/SelectData.java b/common/ballcat-common-model/src/main/java/org/ballcat/common/model/domain/SelectData.java similarity index 96% rename from common/ballcat-common-model/src/main/java/com/hccake/ballcat/common/model/domain/SelectData.java rename to common/ballcat-common-model/src/main/java/org/ballcat/common/model/domain/SelectData.java index 50e545ea7..a5c03a071 100644 --- a/common/ballcat-common-model/src/main/java/com/hccake/ballcat/common/model/domain/SelectData.java +++ b/common/ballcat-common-model/src/main/java/org/ballcat/common/model/domain/SelectData.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.model.domain; +package org.ballcat.common.model.domain; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/common/ballcat-common-model/src/main/java/com/hccake/ballcat/common/model/entity/BaseEntity.java b/common/ballcat-common-model/src/main/java/org/ballcat/common/model/entity/BaseEntity.java similarity index 96% rename from common/ballcat-common-model/src/main/java/com/hccake/ballcat/common/model/entity/BaseEntity.java rename to common/ballcat-common-model/src/main/java/org/ballcat/common/model/entity/BaseEntity.java index c5ee59775..ed9079274 100644 --- a/common/ballcat-common-model/src/main/java/com/hccake/ballcat/common/model/entity/BaseEntity.java +++ b/common/ballcat-common-model/src/main/java/org/ballcat/common/model/entity/BaseEntity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.model.entity; +package org.ballcat.common.model.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/common/ballcat-common-model/src/main/java/com/hccake/ballcat/common/model/entity/LogicDeletedBaseEntity.java b/common/ballcat-common-model/src/main/java/org/ballcat/common/model/entity/LogicDeletedBaseEntity.java similarity index 96% rename from common/ballcat-common-model/src/main/java/com/hccake/ballcat/common/model/entity/LogicDeletedBaseEntity.java rename to common/ballcat-common-model/src/main/java/org/ballcat/common/model/entity/LogicDeletedBaseEntity.java index 9944db7a1..0471b7912 100644 --- a/common/ballcat-common-model/src/main/java/com/hccake/ballcat/common/model/entity/LogicDeletedBaseEntity.java +++ b/common/ballcat-common-model/src/main/java/org/ballcat/common/model/entity/LogicDeletedBaseEntity.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.model.entity; +package org.ballcat.common.model.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/common/ballcat-common-model/src/main/java/com/hccake/ballcat/common/model/result/BaseResultCode.java b/common/ballcat-common-model/src/main/java/org/ballcat/common/model/result/BaseResultCode.java similarity index 96% rename from common/ballcat-common-model/src/main/java/com/hccake/ballcat/common/model/result/BaseResultCode.java rename to common/ballcat-common-model/src/main/java/org/ballcat/common/model/result/BaseResultCode.java index 3bc0d087b..0e48fd423 100644 --- a/common/ballcat-common-model/src/main/java/com/hccake/ballcat/common/model/result/BaseResultCode.java +++ b/common/ballcat-common-model/src/main/java/org/ballcat/common/model/result/BaseResultCode.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.model.result; +package org.ballcat.common.model.result; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/common/ballcat-common-model/src/main/java/com/hccake/ballcat/common/model/result/R.java b/common/ballcat-common-model/src/main/java/org/ballcat/common/model/result/R.java similarity index 95% rename from common/ballcat-common-model/src/main/java/com/hccake/ballcat/common/model/result/R.java rename to common/ballcat-common-model/src/main/java/org/ballcat/common/model/result/R.java index 5ee1caae7..0d6865ca8 100644 --- a/common/ballcat-common-model/src/main/java/com/hccake/ballcat/common/model/result/R.java +++ b/common/ballcat-common-model/src/main/java/org/ballcat/common/model/result/R.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.model.result; +package org.ballcat.common.model.result; -import com.hccake.ballcat.common.i18n.I18nClass; +import org.ballcat.i18n.I18nClass; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import lombok.experimental.Accessors; diff --git a/common/ballcat-common-model/src/main/java/com/hccake/ballcat/common/model/result/ResultCode.java b/common/ballcat-common-model/src/main/java/org/ballcat/common/model/result/ResultCode.java similarity index 94% rename from common/ballcat-common-model/src/main/java/com/hccake/ballcat/common/model/result/ResultCode.java rename to common/ballcat-common-model/src/main/java/org/ballcat/common/model/result/ResultCode.java index 9c7e947a8..88a336cf0 100644 --- a/common/ballcat-common-model/src/main/java/com/hccake/ballcat/common/model/result/ResultCode.java +++ b/common/ballcat-common-model/src/main/java/org/ballcat/common/model/result/ResultCode.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.model.result; +package org.ballcat.common.model.result; /** * @author Hccake 2020/3/20 14:45 diff --git a/common/ballcat-common-model/src/main/java/com/hccake/ballcat/common/model/result/SystemResultCode.java b/common/ballcat-common-model/src/main/java/org/ballcat/common/model/result/SystemResultCode.java similarity index 98% rename from common/ballcat-common-model/src/main/java/com/hccake/ballcat/common/model/result/SystemResultCode.java rename to common/ballcat-common-model/src/main/java/org/ballcat/common/model/result/SystemResultCode.java index da67dce7c..8cf3cafcc 100644 --- a/common/ballcat-common-model/src/main/java/com/hccake/ballcat/common/model/result/SystemResultCode.java +++ b/common/ballcat-common-model/src/main/java/org/ballcat/common/model/result/SystemResultCode.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.model.result; +package org.ballcat.common.model.result; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/charset/GSMCharset.java b/common/ballcat-common-util/src/main/java/org/ballcat/common/charset/GSMCharset.java similarity index 99% rename from common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/charset/GSMCharset.java rename to common/ballcat-common-util/src/main/java/org/ballcat/common/charset/GSMCharset.java index fa3733759..d34b7f4f3 100644 --- a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/charset/GSMCharset.java +++ b/common/ballcat-common-util/src/main/java/org/ballcat/common/charset/GSMCharset.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.charset; +package org.ballcat.common.charset; /** * This class encodes and decodes Java Strings to and from the SMS default alphabet. It diff --git a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/exception/CommandTimeoutException.java b/common/ballcat-common-util/src/main/java/org/ballcat/common/exception/CommandTimeoutException.java similarity index 94% rename from common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/exception/CommandTimeoutException.java rename to common/ballcat-common-util/src/main/java/org/ballcat/common/exception/CommandTimeoutException.java index 345e1b109..4e1c32535 100644 --- a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/exception/CommandTimeoutException.java +++ b/common/ballcat-common-util/src/main/java/org/ballcat/common/exception/CommandTimeoutException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.exception; +package org.ballcat.common.exception; /** * @author lingting 2022/7/15 15:33 diff --git a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/lock/JavaReentrantLock.java b/common/ballcat-common-util/src/main/java/org/ballcat/common/lock/JavaReentrantLock.java similarity index 98% rename from common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/lock/JavaReentrantLock.java rename to common/ballcat-common-util/src/main/java/org/ballcat/common/lock/JavaReentrantLock.java index 7d9007407..c3f2a08e3 100644 --- a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/lock/JavaReentrantLock.java +++ b/common/ballcat-common-util/src/main/java/org/ballcat/common/lock/JavaReentrantLock.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.lock; +package org.ballcat.common.lock; import lombok.Getter; diff --git a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/lock/LockRunnable.java b/common/ballcat-common-util/src/main/java/org/ballcat/common/lock/LockRunnable.java similarity index 94% rename from common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/lock/LockRunnable.java rename to common/ballcat-common-util/src/main/java/org/ballcat/common/lock/LockRunnable.java index b420c8f38..434eda8b3 100644 --- a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/lock/LockRunnable.java +++ b/common/ballcat-common-util/src/main/java/org/ballcat/common/lock/LockRunnable.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.lock; +package org.ballcat.common.lock; /** * @author lingting 2023-04-22 11:35 diff --git a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/lock/LockSupplier.java b/common/ballcat-common-util/src/main/java/org/ballcat/common/lock/LockSupplier.java similarity index 94% rename from common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/lock/LockSupplier.java rename to common/ballcat-common-util/src/main/java/org/ballcat/common/lock/LockSupplier.java index 29570cf80..6e01fc08c 100644 --- a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/lock/LockSupplier.java +++ b/common/ballcat-common-util/src/main/java/org/ballcat/common/lock/LockSupplier.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.lock; +package org.ballcat.common.lock; /** * @author lingting 2023-04-22 11:35 diff --git a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/markdown/MarkdownBuilder.java b/common/ballcat-common-util/src/main/java/org/ballcat/common/markdown/MarkdownBuilder.java similarity index 98% rename from common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/markdown/MarkdownBuilder.java rename to common/ballcat-common-util/src/main/java/org/ballcat/common/markdown/MarkdownBuilder.java index f39056f00..3d5b7d2f6 100644 --- a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/markdown/MarkdownBuilder.java +++ b/common/ballcat-common-util/src/main/java/org/ballcat/common/markdown/MarkdownBuilder.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.markdown; +package org.ballcat.common.markdown; import cn.hutool.core.convert.Convert; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; -import com.hccake.ballcat.common.util.json.JacksonJsonToolAdapter; +import org.ballcat.common.util.json.JacksonJsonToolAdapter; import lombok.SneakyThrows; import java.util.ArrayList; diff --git a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/queue/CircularQueue.java b/common/ballcat-common-util/src/main/java/org/ballcat/common/queue/CircularQueue.java similarity index 94% rename from common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/queue/CircularQueue.java rename to common/ballcat-common-util/src/main/java/org/ballcat/common/queue/CircularQueue.java index d8200e3db..41a2f1149 100644 --- a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/queue/CircularQueue.java +++ b/common/ballcat-common-util/src/main/java/org/ballcat/common/queue/CircularQueue.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.queue; +package org.ballcat.common.queue; -import com.hccake.ballcat.common.lock.JavaReentrantLock; +import org.ballcat.common.lock.JavaReentrantLock; import org.springframework.util.CollectionUtils; import java.util.ArrayList; diff --git a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/queue/WaitQueue.java b/common/ballcat-common-util/src/main/java/org/ballcat/common/queue/WaitQueue.java similarity index 97% rename from common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/queue/WaitQueue.java rename to common/ballcat-common-util/src/main/java/org/ballcat/common/queue/WaitQueue.java index 3aaa032ad..40d6424eb 100644 --- a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/queue/WaitQueue.java +++ b/common/ballcat-common-util/src/main/java/org/ballcat/common/queue/WaitQueue.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.queue; +package org.ballcat.common.queue; import java.util.Collection; import java.util.concurrent.LinkedBlockingQueue; diff --git a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/system/Command.java b/common/ballcat-common-util/src/main/java/org/ballcat/common/system/Command.java similarity index 95% rename from common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/system/Command.java rename to common/ballcat-common-util/src/main/java/org/ballcat/common/system/Command.java index f1f49b958..b28dd6211 100644 --- a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/system/Command.java +++ b/common/ballcat-common-util/src/main/java/org/ballcat/common/system/Command.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.system; +package org.ballcat.common.system; -import com.hccake.ballcat.common.exception.CommandTimeoutException; -import com.hccake.ballcat.common.util.FileUtils; -import com.hccake.ballcat.common.util.SystemUtils; +import org.ballcat.common.exception.CommandTimeoutException; +import org.ballcat.common.util.FileUtils; +import org.ballcat.common.util.SystemUtils; import org.springframework.util.StringUtils; import java.io.File; diff --git a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/system/CommandResult.java b/common/ballcat-common-util/src/main/java/org/ballcat/common/system/CommandResult.java similarity index 96% rename from common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/system/CommandResult.java rename to common/ballcat-common-util/src/main/java/org/ballcat/common/system/CommandResult.java index 0afade0d1..876fe7873 100644 --- a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/system/CommandResult.java +++ b/common/ballcat-common-util/src/main/java/org/ballcat/common/system/CommandResult.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.system; +package org.ballcat.common.system; -import com.hccake.ballcat.common.util.StreamUtils; +import org.ballcat.common.util.StreamUtils; import lombok.Getter; import org.springframework.util.StringUtils; diff --git a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/system/StopWatch.java b/common/ballcat-common-util/src/main/java/org/ballcat/common/system/StopWatch.java similarity index 97% rename from common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/system/StopWatch.java rename to common/ballcat-common-util/src/main/java/org/ballcat/common/system/StopWatch.java index 861e9f4d5..234d137b0 100644 --- a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/system/StopWatch.java +++ b/common/ballcat-common-util/src/main/java/org/ballcat/common/system/StopWatch.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.system; +package org.ballcat.common.system; import java.util.concurrent.TimeUnit; diff --git a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/thread/ThreadPool.java b/common/ballcat-common-util/src/main/java/org/ballcat/common/thread/ThreadPool.java similarity index 98% rename from common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/thread/ThreadPool.java rename to common/ballcat-common-util/src/main/java/org/ballcat/common/thread/ThreadPool.java index 3d1a56a11..c0cdb7739 100644 --- a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/thread/ThreadPool.java +++ b/common/ballcat-common-util/src/main/java/org/ballcat/common/thread/ThreadPool.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.thread; +package org.ballcat.common.thread; import lombok.AccessLevel; import lombok.Getter; diff --git a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/ArrayUtils.java b/common/ballcat-common-util/src/main/java/org/ballcat/common/util/ArrayUtils.java similarity index 96% rename from common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/ArrayUtils.java rename to common/ballcat-common-util/src/main/java/org/ballcat/common/util/ArrayUtils.java index 4358065e6..a3ce26eca 100644 --- a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/ArrayUtils.java +++ b/common/ballcat-common-util/src/main/java/org/ballcat/common/util/ArrayUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.util; +package org.ballcat.common.util; import lombok.experimental.UtilityClass; diff --git a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/BooleanUtils.java b/common/ballcat-common-util/src/main/java/org/ballcat/common/util/BooleanUtils.java similarity index 97% rename from common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/BooleanUtils.java rename to common/ballcat-common-util/src/main/java/org/ballcat/common/util/BooleanUtils.java index 7ef003aa1..6e92b0ebc 100644 --- a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/BooleanUtils.java +++ b/common/ballcat-common-util/src/main/java/org/ballcat/common/util/BooleanUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.util; +package org.ballcat.common.util; import lombok.experimental.UtilityClass; diff --git a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/ClassUtils.java b/common/ballcat-common-util/src/main/java/org/ballcat/common/util/ClassUtils.java similarity index 99% rename from common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/ClassUtils.java rename to common/ballcat-common-util/src/main/java/org/ballcat/common/util/ClassUtils.java index 0d954e53a..14f1ef6b5 100644 --- a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/ClassUtils.java +++ b/common/ballcat-common-util/src/main/java/org/ballcat/common/util/ClassUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.util; +package org.ballcat.common.util; import cn.hutool.core.util.ClassUtil; import java.io.File; diff --git a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/EnvironmentUtils.java b/common/ballcat-common-util/src/main/java/org/ballcat/common/util/EnvironmentUtils.java similarity index 99% rename from common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/EnvironmentUtils.java rename to common/ballcat-common-util/src/main/java/org/ballcat/common/util/EnvironmentUtils.java index 1ca02b4b5..421a0b49e 100644 --- a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/EnvironmentUtils.java +++ b/common/ballcat-common-util/src/main/java/org/ballcat/common/util/EnvironmentUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.util; +package org.ballcat.common.util; import lombok.Getter; import lombok.Setter; diff --git a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/FileUtils.java b/common/ballcat-common-util/src/main/java/org/ballcat/common/util/FileUtils.java similarity index 99% rename from common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/FileUtils.java rename to common/ballcat-common-util/src/main/java/org/ballcat/common/util/FileUtils.java index 8a78d60ed..1cac14c07 100644 --- a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/FileUtils.java +++ b/common/ballcat-common-util/src/main/java/org/ballcat/common/util/FileUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.util; +package org.ballcat.common.util; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/HtmlUtils.java b/common/ballcat-common-util/src/main/java/org/ballcat/common/util/HtmlUtils.java similarity index 98% rename from common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/HtmlUtils.java rename to common/ballcat-common-util/src/main/java/org/ballcat/common/util/HtmlUtils.java index 313926a6d..c485e2824 100644 --- a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/HtmlUtils.java +++ b/common/ballcat-common-util/src/main/java/org/ballcat/common/util/HtmlUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.util; +package org.ballcat.common.util; import cn.hutool.core.text.CharSequenceUtil; import org.jsoup.Jsoup; diff --git a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/ImageUtils.java b/common/ballcat-common-util/src/main/java/org/ballcat/common/util/ImageUtils.java similarity index 99% rename from common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/ImageUtils.java rename to common/ballcat-common-util/src/main/java/org/ballcat/common/util/ImageUtils.java index 432bd8115..b52753b0a 100644 --- a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/ImageUtils.java +++ b/common/ballcat-common-util/src/main/java/org/ballcat/common/util/ImageUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.util; +package org.ballcat.common.util; import lombok.Getter; import lombok.Setter; diff --git a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/IpUtils.java b/common/ballcat-common-util/src/main/java/org/ballcat/common/util/IpUtils.java similarity index 98% rename from common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/IpUtils.java rename to common/ballcat-common-util/src/main/java/org/ballcat/common/util/IpUtils.java index 58e1d6920..ab3db30fb 100644 --- a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/IpUtils.java +++ b/common/ballcat-common-util/src/main/java/org/ballcat/common/util/IpUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.util; +package org.ballcat.common.util; import cn.hutool.core.net.NetUtil; import cn.hutool.core.util.ArrayUtil; diff --git a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/JsonUtils.java b/common/ballcat-common-util/src/main/java/org/ballcat/common/util/JsonUtils.java similarity index 88% rename from common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/JsonUtils.java rename to common/ballcat-common-util/src/main/java/org/ballcat/common/util/JsonUtils.java index 5017ff2d1..07fee374f 100644 --- a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/JsonUtils.java +++ b/common/ballcat-common-util/src/main/java/org/ballcat/common/util/JsonUtils.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.util; - -import com.hccake.ballcat.common.util.json.FastjsonJsonToolAdapter; -import com.hccake.ballcat.common.util.json.GsonJsonToolAdapter; -import com.hccake.ballcat.common.util.json.HuToolJsonToolAdapter; -import com.hccake.ballcat.common.util.json.JacksonJsonToolAdapter; -import com.hccake.ballcat.common.util.json.JsonTool; -import com.hccake.ballcat.common.util.json.TypeReference; +package org.ballcat.common.util; + +import org.ballcat.common.util.json.FastjsonJsonToolAdapter; +import org.ballcat.common.util.json.GsonJsonToolAdapter; +import org.ballcat.common.util.json.HuToolJsonToolAdapter; +import org.ballcat.common.util.json.JacksonJsonToolAdapter; +import org.ballcat.common.util.json.JsonTool; +import org.ballcat.common.util.json.TypeReference; import lombok.Getter; import java.lang.reflect.Type; diff --git a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/LocalDateTimeUtils.java b/common/ballcat-common-util/src/main/java/org/ballcat/common/util/LocalDateTimeUtils.java similarity index 98% rename from common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/LocalDateTimeUtils.java rename to common/ballcat-common-util/src/main/java/org/ballcat/common/util/LocalDateTimeUtils.java index 5d9d28f10..d5bb9f2e5 100644 --- a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/LocalDateTimeUtils.java +++ b/common/ballcat-common-util/src/main/java/org/ballcat/common/util/LocalDateTimeUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.util; +package org.ballcat.common.util; import lombok.experimental.UtilityClass; diff --git a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/SmsUtils.java b/common/ballcat-common-util/src/main/java/org/ballcat/common/util/SmsUtils.java similarity index 97% rename from common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/SmsUtils.java rename to common/ballcat-common-util/src/main/java/org/ballcat/common/util/SmsUtils.java index 87f47cba0..1d49588fa 100644 --- a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/SmsUtils.java +++ b/common/ballcat-common-util/src/main/java/org/ballcat/common/util/SmsUtils.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.util; +package org.ballcat.common.util; -import com.hccake.ballcat.common.charset.GSMCharset; +import org.ballcat.common.charset.GSMCharset; import java.nio.charset.StandardCharsets; diff --git a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/SpelUtils.java b/common/ballcat-common-util/src/main/java/org/ballcat/common/util/SpelUtils.java similarity index 98% rename from common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/SpelUtils.java rename to common/ballcat-common-util/src/main/java/org/ballcat/common/util/SpelUtils.java index 1dd211816..eed441495 100644 --- a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/SpelUtils.java +++ b/common/ballcat-common-util/src/main/java/org/ballcat/common/util/SpelUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.util; +package org.ballcat.common.util; import org.springframework.context.expression.MethodBasedEvaluationContext; import org.springframework.core.LocalVariableTableParameterNameDiscoverer; diff --git a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/SpringUtils.java b/common/ballcat-common-util/src/main/java/org/ballcat/common/util/SpringUtils.java similarity index 98% rename from common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/SpringUtils.java rename to common/ballcat-common-util/src/main/java/org/ballcat/common/util/SpringUtils.java index be0237e73..1e1a5fa62 100644 --- a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/SpringUtils.java +++ b/common/ballcat-common-util/src/main/java/org/ballcat/common/util/SpringUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.util; +package org.ballcat.common.util; import lombok.Setter; import org.springframework.beans.BeansException; diff --git a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/StreamUtils.java b/common/ballcat-common-util/src/main/java/org/ballcat/common/util/StreamUtils.java similarity index 98% rename from common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/StreamUtils.java rename to common/ballcat-common-util/src/main/java/org/ballcat/common/util/StreamUtils.java index 34ab0e7c4..761b6cc8a 100644 --- a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/StreamUtils.java +++ b/common/ballcat-common-util/src/main/java/org/ballcat/common/util/StreamUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.util; +package org.ballcat.common.util; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/SystemUtils.java b/common/ballcat-common-util/src/main/java/org/ballcat/common/util/SystemUtils.java similarity index 98% rename from common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/SystemUtils.java rename to common/ballcat-common-util/src/main/java/org/ballcat/common/util/SystemUtils.java index 660d57eba..e749c15e4 100644 --- a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/SystemUtils.java +++ b/common/ballcat-common-util/src/main/java/org/ballcat/common/util/SystemUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.util; +package org.ballcat.common.util; import lombok.experimental.UtilityClass; diff --git a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/json/FastjsonJsonToolAdapter.java b/common/ballcat-common-util/src/main/java/org/ballcat/common/util/json/FastjsonJsonToolAdapter.java similarity index 98% rename from common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/json/FastjsonJsonToolAdapter.java rename to common/ballcat-common-util/src/main/java/org/ballcat/common/util/json/FastjsonJsonToolAdapter.java index 752568f12..1a0a0dc96 100644 --- a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/json/FastjsonJsonToolAdapter.java +++ b/common/ballcat-common-util/src/main/java/org/ballcat/common/util/json/FastjsonJsonToolAdapter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.util.json; +package org.ballcat.common.util.json; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.parser.Feature; diff --git a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/json/GsonJsonToolAdapter.java b/common/ballcat-common-util/src/main/java/org/ballcat/common/util/json/GsonJsonToolAdapter.java similarity index 97% rename from common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/json/GsonJsonToolAdapter.java rename to common/ballcat-common-util/src/main/java/org/ballcat/common/util/json/GsonJsonToolAdapter.java index 46b9c454b..aeeb5f86b 100644 --- a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/json/GsonJsonToolAdapter.java +++ b/common/ballcat-common-util/src/main/java/org/ballcat/common/util/json/GsonJsonToolAdapter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.util.json; +package org.ballcat.common.util.json; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/json/HuToolJsonToolAdapter.java b/common/ballcat-common-util/src/main/java/org/ballcat/common/util/json/HuToolJsonToolAdapter.java similarity index 97% rename from common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/json/HuToolJsonToolAdapter.java rename to common/ballcat-common-util/src/main/java/org/ballcat/common/util/json/HuToolJsonToolAdapter.java index b39216625..302d622d6 100644 --- a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/json/HuToolJsonToolAdapter.java +++ b/common/ballcat-common-util/src/main/java/org/ballcat/common/util/json/HuToolJsonToolAdapter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.util.json; +package org.ballcat.common.util.json; import cn.hutool.json.JSONConfig; import cn.hutool.json.JSONUtil; diff --git a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/json/JacksonJsonToolAdapter.java b/common/ballcat-common-util/src/main/java/org/ballcat/common/util/json/JacksonJsonToolAdapter.java similarity index 97% rename from common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/json/JacksonJsonToolAdapter.java rename to common/ballcat-common-util/src/main/java/org/ballcat/common/util/json/JacksonJsonToolAdapter.java index 4a1ffdd65..e8ac1c6a9 100644 --- a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/json/JacksonJsonToolAdapter.java +++ b/common/ballcat-common-util/src/main/java/org/ballcat/common/util/json/JacksonJsonToolAdapter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.util.json; +package org.ballcat.common.util.json; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.DeserializationFeature; diff --git a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/json/JsonTool.java b/common/ballcat-common-util/src/main/java/org/ballcat/common/util/json/JsonTool.java similarity index 96% rename from common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/json/JsonTool.java rename to common/ballcat-common-util/src/main/java/org/ballcat/common/util/json/JsonTool.java index 86da348ff..33c5f907f 100644 --- a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/json/JsonTool.java +++ b/common/ballcat-common-util/src/main/java/org/ballcat/common/util/json/JsonTool.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.util.json; +package org.ballcat.common.util.json; import java.lang.reflect.Type; diff --git a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/json/TypeReference.java b/common/ballcat-common-util/src/main/java/org/ballcat/common/util/json/TypeReference.java similarity index 96% rename from common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/json/TypeReference.java rename to common/ballcat-common-util/src/main/java/org/ballcat/common/util/json/TypeReference.java index a6ca1c8ca..e47605f06 100644 --- a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/json/TypeReference.java +++ b/common/ballcat-common-util/src/main/java/org/ballcat/common/util/json/TypeReference.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.util.json; +package org.ballcat.common.util.json; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; diff --git a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/tree/TreeNode.java b/common/ballcat-common-util/src/main/java/org/ballcat/common/util/tree/TreeNode.java similarity index 96% rename from common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/tree/TreeNode.java rename to common/ballcat-common-util/src/main/java/org/ballcat/common/util/tree/TreeNode.java index 46849c725..e9c5202fa 100644 --- a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/tree/TreeNode.java +++ b/common/ballcat-common-util/src/main/java/org/ballcat/common/util/tree/TreeNode.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.util.tree; +package org.ballcat.common.util.tree; import java.util.List; diff --git a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/tree/TreeUtils.java b/common/ballcat-common-util/src/main/java/org/ballcat/common/util/tree/TreeUtils.java similarity index 99% rename from common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/tree/TreeUtils.java rename to common/ballcat-common-util/src/main/java/org/ballcat/common/util/tree/TreeUtils.java index 0fa700ae3..d283feb01 100644 --- a/common/ballcat-common-util/src/main/java/com/hccake/ballcat/common/util/tree/TreeUtils.java +++ b/common/ballcat-common-util/src/main/java/org/ballcat/common/util/tree/TreeUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.util.tree; +package org.ballcat.common.util.tree; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; diff --git a/common/ballcat-common-util/src/test/java/com/hccake/ballcat/common/util/FileUtilsTest.java b/common/ballcat-common-util/src/test/java/org/ballcat/common/util/FileUtilsTest.java similarity index 95% rename from common/ballcat-common-util/src/test/java/com/hccake/ballcat/common/util/FileUtilsTest.java rename to common/ballcat-common-util/src/test/java/org/ballcat/common/util/FileUtilsTest.java index 5bb9134a6..1d767ab2c 100644 --- a/common/ballcat-common-util/src/test/java/com/hccake/ballcat/common/util/FileUtilsTest.java +++ b/common/ballcat-common-util/src/test/java/org/ballcat/common/util/FileUtilsTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.util; +package org.ballcat.common.util; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/common/ballcat-common-util/src/test/java/com/hccake/ballcat/common/util/ImageUtilsTest.java b/common/ballcat-common-util/src/test/java/org/ballcat/common/util/ImageUtilsTest.java similarity index 97% rename from common/ballcat-common-util/src/test/java/com/hccake/ballcat/common/util/ImageUtilsTest.java rename to common/ballcat-common-util/src/test/java/org/ballcat/common/util/ImageUtilsTest.java index 5561f6c1b..1ea63e089 100644 --- a/common/ballcat-common-util/src/test/java/com/hccake/ballcat/common/util/ImageUtilsTest.java +++ b/common/ballcat-common-util/src/test/java/org/ballcat/common/util/ImageUtilsTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.util; +package org.ballcat.common.util; import lombok.SneakyThrows; import org.junit.jupiter.api.Assertions; diff --git a/common/ballcat-common-util/src/test/java/com/hccake/ballcat/common/util/TreeUtilsTest.java b/common/ballcat-common-util/src/test/java/org/ballcat/common/util/TreeUtilsTest.java similarity index 95% rename from common/ballcat-common-util/src/test/java/com/hccake/ballcat/common/util/TreeUtilsTest.java rename to common/ballcat-common-util/src/test/java/org/ballcat/common/util/TreeUtilsTest.java index edb3cd513..51a3d4d02 100644 --- a/common/ballcat-common-util/src/test/java/com/hccake/ballcat/common/util/TreeUtilsTest.java +++ b/common/ballcat-common-util/src/test/java/org/ballcat/common/util/TreeUtilsTest.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.util; +package org.ballcat.common.util; -import com.hccake.ballcat.common.util.tree.TreeNode; -import com.hccake.ballcat.common.util.tree.TreeUtils; +import org.ballcat.common.util.tree.TreeNode; +import org.ballcat.common.util.tree.TreeUtils; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/DataScope.java b/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/DataScope.java similarity index 96% rename from datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/DataScope.java rename to datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/DataScope.java index f409ce6b9..f5af6055b 100644 --- a/datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/DataScope.java +++ b/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/DataScope.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.datascope; +package org.ballcat.datascope; import net.sf.jsqlparser.expression.Alias; import net.sf.jsqlparser.expression.Expression; diff --git a/datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/DataScopeAutoConfiguration.java b/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/DataScopeAutoConfiguration.java similarity index 82% rename from datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/DataScopeAutoConfiguration.java rename to datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/DataScopeAutoConfiguration.java index 6c0dea064..2a0c6d5d5 100644 --- a/datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/DataScopeAutoConfiguration.java +++ b/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/DataScopeAutoConfiguration.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.datascope; +package org.ballcat.datascope; -import com.hccake.ballcat.common.datascope.handler.DataPermissionHandler; -import com.hccake.ballcat.common.datascope.handler.DefaultDataPermissionHandler; -import com.hccake.ballcat.common.datascope.interceptor.DataPermissionAnnotationAdvisor; -import com.hccake.ballcat.common.datascope.interceptor.DataPermissionInterceptor; -import com.hccake.ballcat.common.datascope.processor.DataScopeSqlProcessor; +import org.ballcat.datascope.handler.DataPermissionHandler; +import org.ballcat.datascope.handler.DefaultDataPermissionHandler; +import org.ballcat.datascope.interceptor.DataPermissionAnnotationAdvisor; +import org.ballcat.datascope.interceptor.DataPermissionInterceptor; +import org.ballcat.datascope.processor.DataScopeSqlProcessor; import lombok.RequiredArgsConstructor; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; diff --git a/datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/annotation/DataPermission.java b/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/annotation/DataPermission.java similarity index 96% rename from datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/annotation/DataPermission.java rename to datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/annotation/DataPermission.java index a33385afe..4e06a6f11 100644 --- a/datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/annotation/DataPermission.java +++ b/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/annotation/DataPermission.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.datascope.annotation; +package org.ballcat.datascope.annotation; import java.lang.annotation.*; diff --git a/datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/function/Action.java b/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/function/Action.java similarity index 93% rename from datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/function/Action.java rename to datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/function/Action.java index 3ba6276e4..37d665f96 100644 --- a/datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/function/Action.java +++ b/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/function/Action.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.datascope.function; +package org.ballcat.datascope.function; /** * 操作接口 diff --git a/datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/function/ResultAction.java b/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/function/ResultAction.java similarity index 93% rename from datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/function/ResultAction.java rename to datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/function/ResultAction.java index 4455c534e..8e1bc6b2b 100644 --- a/datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/function/ResultAction.java +++ b/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/function/ResultAction.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.datascope.function; +package org.ballcat.datascope.function; /** * 有返回值的操作接口 diff --git a/datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/handler/DataPermissionHandler.java b/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/handler/DataPermissionHandler.java similarity index 93% rename from datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/handler/DataPermissionHandler.java rename to datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/handler/DataPermissionHandler.java index 99136b821..e19183837 100644 --- a/datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/handler/DataPermissionHandler.java +++ b/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/handler/DataPermissionHandler.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.datascope.handler; +package org.ballcat.datascope.handler; -import com.hccake.ballcat.common.datascope.DataScope; +import org.ballcat.datascope.DataScope; import java.util.List; diff --git a/datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/handler/DataPermissionRule.java b/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/handler/DataPermissionRule.java similarity index 95% rename from datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/handler/DataPermissionRule.java rename to datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/handler/DataPermissionRule.java index fc105a69b..863847284 100644 --- a/datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/handler/DataPermissionRule.java +++ b/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/handler/DataPermissionRule.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.datascope.handler; +package org.ballcat.datascope.handler; -import com.hccake.ballcat.common.datascope.annotation.DataPermission; +import org.ballcat.datascope.annotation.DataPermission; /** * 数据权限的规则抽象类 diff --git a/datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/handler/DefaultDataPermissionHandler.java b/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/handler/DefaultDataPermissionHandler.java similarity index 92% rename from datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/handler/DefaultDataPermissionHandler.java rename to datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/handler/DefaultDataPermissionHandler.java index 458adbf77..e85a11c57 100644 --- a/datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/handler/DefaultDataPermissionHandler.java +++ b/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/handler/DefaultDataPermissionHandler.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.datascope.handler; +package org.ballcat.datascope.handler; -import com.hccake.ballcat.common.datascope.DataScope; -import com.hccake.ballcat.common.datascope.holder.DataPermissionRuleHolder; -import com.hccake.ballcat.common.datascope.holder.MappedStatementIdsWithoutDataScope; +import org.ballcat.datascope.DataScope; +import org.ballcat.datascope.holder.DataPermissionRuleHolder; +import org.ballcat.datascope.holder.MappedStatementIdsWithoutDataScope; import lombok.RequiredArgsConstructor; import java.util.ArrayList; diff --git a/datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/holder/DataPermissionRuleHolder.java b/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/holder/DataPermissionRuleHolder.java similarity index 87% rename from datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/holder/DataPermissionRuleHolder.java rename to datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/holder/DataPermissionRuleHolder.java index 8e786a1a0..aa30dd0b7 100644 --- a/datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/holder/DataPermissionRuleHolder.java +++ b/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/holder/DataPermissionRuleHolder.java @@ -13,9 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.datascope.holder; +package org.ballcat.datascope.holder; -import com.hccake.ballcat.common.datascope.handler.DataPermissionRule; +import org.ballcat.datascope.handler.DataPermissionRule; +import org.ballcat.datascope.annotation.DataPermission; import java.util.ArrayDeque; import java.util.Deque; @@ -23,8 +24,7 @@ /** * 数据权限规则的持有者，使用栈存储调用链中的数据权限规则 *

- * 区别于{@link com.hccake.ballcat.common.datascope.annotation.DataPermission} - * {@link DataPermissionRule} 是编程式数据权限控制的使用，优先级高于注解 + * 区别于{@link DataPermission} {@link DataPermissionRule} 是编程式数据权限控制的使用，优先级高于注解 * * @author hccake */ diff --git a/datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/holder/DataScopeMatchNumHolder.java b/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/holder/DataScopeMatchNumHolder.java similarity index 97% rename from datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/holder/DataScopeMatchNumHolder.java rename to datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/holder/DataScopeMatchNumHolder.java index 094395041..4d27017a4 100644 --- a/datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/holder/DataScopeMatchNumHolder.java +++ b/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/holder/DataScopeMatchNumHolder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.datascope.holder; +package org.ballcat.datascope.holder; import java.util.ArrayDeque; import java.util.Deque; diff --git a/datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/holder/MappedStatementIdsWithoutDataScope.java b/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/holder/MappedStatementIdsWithoutDataScope.java similarity index 95% rename from datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/holder/MappedStatementIdsWithoutDataScope.java rename to datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/holder/MappedStatementIdsWithoutDataScope.java index b45c8e7f1..b96bf7e45 100644 --- a/datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/holder/MappedStatementIdsWithoutDataScope.java +++ b/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/holder/MappedStatementIdsWithoutDataScope.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.datascope.holder; +package org.ballcat.datascope.holder; -import com.hccake.ballcat.common.datascope.DataScope; +import org.ballcat.datascope.DataScope; import java.util.HashSet; import java.util.List; diff --git a/datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/interceptor/DataPermissionAnnotationAdvisor.java b/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/interceptor/DataPermissionAnnotationAdvisor.java similarity index 92% rename from datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/interceptor/DataPermissionAnnotationAdvisor.java rename to datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/interceptor/DataPermissionAnnotationAdvisor.java index eae65c0df..5d35b1320 100644 --- a/datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/interceptor/DataPermissionAnnotationAdvisor.java +++ b/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/interceptor/DataPermissionAnnotationAdvisor.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.datascope.interceptor; +package org.ballcat.datascope.interceptor; -import com.hccake.ballcat.common.datascope.annotation.DataPermission; +import org.ballcat.datascope.annotation.DataPermission; import lombok.EqualsAndHashCode; import lombok.Getter; import org.aopalliance.aop.Advice; diff --git a/datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/interceptor/DataPermissionAnnotationInterceptor.java b/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/interceptor/DataPermissionAnnotationInterceptor.java similarity index 86% rename from datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/interceptor/DataPermissionAnnotationInterceptor.java rename to datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/interceptor/DataPermissionAnnotationInterceptor.java index c21c39c37..955878c35 100644 --- a/datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/interceptor/DataPermissionAnnotationInterceptor.java +++ b/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/interceptor/DataPermissionAnnotationInterceptor.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.datascope.interceptor; +package org.ballcat.datascope.interceptor; -import com.hccake.ballcat.common.datascope.annotation.DataPermission; -import com.hccake.ballcat.common.datascope.handler.DataPermissionRule; -import com.hccake.ballcat.common.datascope.holder.DataPermissionRuleHolder; +import org.ballcat.datascope.annotation.DataPermission; +import org.ballcat.datascope.handler.DataPermissionRule; +import org.ballcat.datascope.holder.DataPermissionRuleHolder; import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInvocation; diff --git a/datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/interceptor/DataPermissionFinder.java b/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/interceptor/DataPermissionFinder.java similarity index 97% rename from datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/interceptor/DataPermissionFinder.java rename to datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/interceptor/DataPermissionFinder.java index c9bcfa81a..33075eb71 100644 --- a/datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/interceptor/DataPermissionFinder.java +++ b/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/interceptor/DataPermissionFinder.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.datascope.interceptor; +package org.ballcat.datascope.interceptor; -import com.hccake.ballcat.common.datascope.annotation.DataPermission; +import org.ballcat.datascope.annotation.DataPermission; import org.springframework.aop.support.AopUtils; import org.springframework.core.MethodClassKey; import org.springframework.core.annotation.AnnotatedElementUtils; diff --git a/datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/interceptor/DataPermissionInterceptor.java b/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/interceptor/DataPermissionInterceptor.java similarity index 88% rename from datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/interceptor/DataPermissionInterceptor.java rename to datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/interceptor/DataPermissionInterceptor.java index 0252612a8..fda6c71a2 100644 --- a/datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/interceptor/DataPermissionInterceptor.java +++ b/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/interceptor/DataPermissionInterceptor.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.datascope.interceptor; +package org.ballcat.datascope.interceptor; -import com.hccake.ballcat.common.datascope.DataScope; -import com.hccake.ballcat.common.datascope.handler.DataPermissionHandler; -import com.hccake.ballcat.common.datascope.holder.DataScopeMatchNumHolder; -import com.hccake.ballcat.common.datascope.holder.MappedStatementIdsWithoutDataScope; -import com.hccake.ballcat.common.datascope.processor.DataScopeSqlProcessor; -import com.hccake.ballcat.common.datascope.util.PluginUtils; +import org.ballcat.datascope.DataScope; +import org.ballcat.datascope.handler.DataPermissionHandler; +import org.ballcat.datascope.holder.DataScopeMatchNumHolder; +import org.ballcat.datascope.holder.MappedStatementIdsWithoutDataScope; +import org.ballcat.datascope.processor.DataScopeSqlProcessor; +import org.ballcat.datascope.util.PluginUtils; import lombok.RequiredArgsConstructor; import org.apache.ibatis.executor.statement.StatementHandler; import org.apache.ibatis.mapping.MappedStatement; diff --git a/datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/parser/JsqlParserSupport.java b/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/parser/JsqlParserSupport.java similarity index 98% rename from datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/parser/JsqlParserSupport.java rename to datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/parser/JsqlParserSupport.java index 687e378f0..53f186a70 100644 --- a/datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/parser/JsqlParserSupport.java +++ b/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/parser/JsqlParserSupport.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.datascope.parser; +package org.ballcat.datascope.parser; import lombok.extern.slf4j.Slf4j; import net.sf.jsqlparser.JSQLParserException; diff --git a/datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/processor/DataScopeSqlProcessor.java b/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/processor/DataScopeSqlProcessor.java similarity index 97% rename from datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/processor/DataScopeSqlProcessor.java rename to datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/processor/DataScopeSqlProcessor.java index a00e3d1fd..75c9c77dc 100644 --- a/datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/processor/DataScopeSqlProcessor.java +++ b/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/processor/DataScopeSqlProcessor.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.datascope.processor; +package org.ballcat.datascope.processor; -import com.hccake.ballcat.common.datascope.DataScope; -import com.hccake.ballcat.common.datascope.holder.DataScopeMatchNumHolder; -import com.hccake.ballcat.common.datascope.parser.JsqlParserSupport; -import com.hccake.ballcat.common.datascope.util.CollectionUtils; -import com.hccake.ballcat.common.datascope.util.SqlParseUtils; +import org.ballcat.datascope.DataScope; +import org.ballcat.datascope.holder.DataScopeMatchNumHolder; +import org.ballcat.datascope.parser.JsqlParserSupport; +import org.ballcat.datascope.util.CollectionUtils; +import org.ballcat.datascope.util.SqlParseUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import net.sf.jsqlparser.expression.*; diff --git a/datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/util/AnnotationUtil.java b/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/util/AnnotationUtil.java similarity index 97% rename from datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/util/AnnotationUtil.java rename to datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/util/AnnotationUtil.java index bf447d185..2bc8a86c4 100644 --- a/datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/util/AnnotationUtil.java +++ b/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/util/AnnotationUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.datascope.util; +package org.ballcat.datascope.util; import java.lang.annotation.Annotation; import java.lang.reflect.Method; diff --git a/datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/util/CollectionUtils.java b/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/util/CollectionUtils.java similarity index 95% rename from datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/util/CollectionUtils.java rename to datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/util/CollectionUtils.java index 3e662fb20..759973530 100644 --- a/datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/util/CollectionUtils.java +++ b/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/util/CollectionUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.datascope.util; +package org.ballcat.datascope.util; import java.util.Collection; diff --git a/datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/util/DataPermissionUtils.java b/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/util/DataPermissionUtils.java similarity index 87% rename from datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/util/DataPermissionUtils.java rename to datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/util/DataPermissionUtils.java index 95edb22f2..1d029d1c7 100644 --- a/datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/util/DataPermissionUtils.java +++ b/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/util/DataPermissionUtils.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.datascope.util; +package org.ballcat.datascope.util; -import com.hccake.ballcat.common.datascope.function.Action; -import com.hccake.ballcat.common.datascope.function.ResultAction; -import com.hccake.ballcat.common.datascope.handler.DataPermissionRule; -import com.hccake.ballcat.common.datascope.holder.DataPermissionRuleHolder; +import org.ballcat.datascope.function.Action; +import org.ballcat.datascope.function.ResultAction; +import org.ballcat.datascope.handler.DataPermissionRule; +import org.ballcat.datascope.holder.DataPermissionRuleHolder; /** * @author hccake diff --git a/datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/util/PluginUtils.java b/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/util/PluginUtils.java similarity index 98% rename from datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/util/PluginUtils.java rename to datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/util/PluginUtils.java index abd78d48c..27a141ae9 100644 --- a/datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/util/PluginUtils.java +++ b/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/util/PluginUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.datascope.util; +package org.ballcat.datascope.util; import org.apache.ibatis.executor.Executor; import org.apache.ibatis.executor.parameter.ParameterHandler; diff --git a/datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/util/SqlParseUtils.java b/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/util/SqlParseUtils.java similarity index 98% rename from datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/util/SqlParseUtils.java rename to datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/util/SqlParseUtils.java index 0ff719802..7a00b4e81 100644 --- a/datascope/ballcat-spring-boot-starter-datascope/src/main/java/com/hccake/ballcat/common/datascope/util/SqlParseUtils.java +++ b/datascope/ballcat-spring-boot-starter-datascope/src/main/java/org/ballcat/datascope/util/SqlParseUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.datascope.util; +package org.ballcat.datascope.util; import net.sf.jsqlparser.expression.Alias; import net.sf.jsqlparser.schema.Column; diff --git a/datascope/ballcat-spring-boot-starter-datascope/src/main/resources/META-INF/spring.factories b/datascope/ballcat-spring-boot-starter-datascope/src/main/resources/META-INF/spring.factories index 9336fac8b..ff1be5fce 100644 --- a/datascope/ballcat-spring-boot-starter-datascope/src/main/resources/META-INF/spring.factories +++ b/datascope/ballcat-spring-boot-starter-datascope/src/main/resources/META-INF/spring.factories @@ -1,3 +1,3 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.hccake.ballcat.common.datascope.DataScopeAutoConfiguration + org.ballcat.datascope.DataScopeAutoConfiguration diff --git a/datascope/ballcat-spring-boot-starter-datascope/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/datascope/ballcat-spring-boot-starter-datascope/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 0499f02c0..0ac78e175 100644 --- a/datascope/ballcat-spring-boot-starter-datascope/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/datascope/ballcat-spring-boot-starter-datascope/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.hccake.ballcat.common.datascope.DataScopeAutoConfiguration \ No newline at end of file +org.ballcat.datascope.DataScopeAutoConfiguration \ No newline at end of file diff --git a/datascope/ballcat-spring-boot-starter-datascope/src/test/java/com/hccake/ballcat/common/datascope/test/datapermission/DataPermissionTest.java b/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datapermission/DataPermissionTest.java similarity index 88% rename from datascope/ballcat-spring-boot-starter-datascope/src/test/java/com/hccake/ballcat/common/datascope/test/datapermission/DataPermissionTest.java rename to datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datapermission/DataPermissionTest.java index 767f89f03..d80d76cf7 100644 --- a/datascope/ballcat-spring-boot-starter-datascope/src/test/java/com/hccake/ballcat/common/datascope/test/datapermission/DataPermissionTest.java +++ b/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datapermission/DataPermissionTest.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.datascope.test.datapermission; +package org.ballcat.datascope.test.datapermission; -import com.hccake.ballcat.common.datascope.handler.DataPermissionRule; -import com.hccake.ballcat.common.datascope.holder.DataPermissionRuleHolder; -import com.hccake.ballcat.common.datascope.interceptor.DataPermissionAnnotationAdvisor; +import org.ballcat.datascope.handler.DataPermissionRule; +import org.ballcat.datascope.holder.DataPermissionRuleHolder; +import org.ballcat.datascope.interceptor.DataPermissionAnnotationAdvisor; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.aop.MethodMatcher; diff --git a/datascope/ballcat-spring-boot-starter-datascope/src/test/java/com/hccake/ballcat/common/datascope/test/datapermission/DataPermissionTestConfiguration.java b/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datapermission/DataPermissionTestConfiguration.java similarity index 90% rename from datascope/ballcat-spring-boot-starter-datascope/src/test/java/com/hccake/ballcat/common/datascope/test/datapermission/DataPermissionTestConfiguration.java rename to datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datapermission/DataPermissionTestConfiguration.java index 891e79ac2..05274e1d8 100644 --- a/datascope/ballcat-spring-boot-starter-datascope/src/test/java/com/hccake/ballcat/common/datascope/test/datapermission/DataPermissionTestConfiguration.java +++ b/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datapermission/DataPermissionTestConfiguration.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.datascope.test.datapermission; +package org.ballcat.datascope.test.datapermission; -import com.hccake.ballcat.common.datascope.interceptor.DataPermissionAnnotationAdvisor; +import org.ballcat.datascope.interceptor.DataPermissionAnnotationAdvisor; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/datascope/ballcat-spring-boot-starter-datascope/src/test/java/com/hccake/ballcat/common/datascope/test/datapermission/TestService.java b/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datapermission/TestService.java similarity index 85% rename from datascope/ballcat-spring-boot-starter-datascope/src/test/java/com/hccake/ballcat/common/datascope/test/datapermission/TestService.java rename to datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datapermission/TestService.java index 60de8a118..351cb3337 100644 --- a/datascope/ballcat-spring-boot-starter-datascope/src/test/java/com/hccake/ballcat/common/datascope/test/datapermission/TestService.java +++ b/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datapermission/TestService.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.datascope.test.datapermission; +package org.ballcat.datascope.test.datapermission; -import com.hccake.ballcat.common.datascope.handler.DataPermissionRule; +import org.ballcat.datascope.handler.DataPermissionRule; /** * @author hccake diff --git a/datascope/ballcat-spring-boot-starter-datascope/src/test/java/com/hccake/ballcat/common/datascope/test/datapermission/TestServiceImpl.java b/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datapermission/TestServiceImpl.java similarity index 80% rename from datascope/ballcat-spring-boot-starter-datascope/src/test/java/com/hccake/ballcat/common/datascope/test/datapermission/TestServiceImpl.java rename to datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datapermission/TestServiceImpl.java index 844524616..f9408c93c 100644 --- a/datascope/ballcat-spring-boot-starter-datascope/src/test/java/com/hccake/ballcat/common/datascope/test/datapermission/TestServiceImpl.java +++ b/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datapermission/TestServiceImpl.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.datascope.test.datapermission; +package org.ballcat.datascope.test.datapermission; -import com.hccake.ballcat.common.datascope.annotation.DataPermission; -import com.hccake.ballcat.common.datascope.handler.DataPermissionRule; -import com.hccake.ballcat.common.datascope.holder.DataPermissionRuleHolder; +import org.ballcat.datascope.annotation.DataPermission; +import org.ballcat.datascope.handler.DataPermissionRule; +import org.ballcat.datascope.holder.DataPermissionRuleHolder; import org.springframework.stereotype.Component; /** diff --git a/datascope/ballcat-spring-boot-starter-datascope/src/test/java/com/hccake/ballcat/common/datascope/test/datarule/StudentMapperTest.java b/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datarule/StudentMapperTest.java similarity index 86% rename from datascope/ballcat-spring-boot-starter-datascope/src/test/java/com/hccake/ballcat/common/datascope/test/datarule/StudentMapperTest.java rename to datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datarule/StudentMapperTest.java index 092d18b20..2da1ade22 100644 --- a/datascope/ballcat-spring-boot-starter-datascope/src/test/java/com/hccake/ballcat/common/datascope/test/datarule/StudentMapperTest.java +++ b/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datarule/StudentMapperTest.java @@ -13,23 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.datascope.test.datarule; - -import com.hccake.ballcat.common.datascope.DataScope; -import com.hccake.ballcat.common.datascope.DataScopeAutoConfiguration; -import com.hccake.ballcat.common.datascope.handler.DataPermissionHandler; -import com.hccake.ballcat.common.datascope.handler.DataPermissionRule; -import com.hccake.ballcat.common.datascope.test.datarule.config.DataPermissionRuleTestConfiguration; -import com.hccake.ballcat.common.datascope.test.datarule.config.DataSourceConfiguration; -import com.hccake.ballcat.common.datascope.test.datarule.datascope.ClassDataScope; -import com.hccake.ballcat.common.datascope.test.datarule.datascope.SchoolDataScope; -import com.hccake.ballcat.common.datascope.test.datarule.datascope.StudentDataScope; -import com.hccake.ballcat.common.datascope.test.datarule.entity.Student; -import com.hccake.ballcat.common.datascope.test.datarule.service.StudentService; -import com.hccake.ballcat.common.datascope.test.datarule.user.LoginUser; -import com.hccake.ballcat.common.datascope.test.datarule.user.LoginUserHolder; -import com.hccake.ballcat.common.datascope.test.datarule.user.UserRoleType; -import com.hccake.ballcat.common.datascope.util.DataPermissionUtils; +package org.ballcat.datascope.test.datarule; + +import org.ballcat.datascope.DataScope; +import org.ballcat.datascope.DataScopeAutoConfiguration; +import org.ballcat.datascope.handler.DataPermissionHandler; +import org.ballcat.datascope.handler.DataPermissionRule; +import org.ballcat.datascope.test.datarule.config.DataPermissionRuleTestConfiguration; +import org.ballcat.datascope.test.datarule.config.DataSourceConfiguration; +import org.ballcat.datascope.test.datarule.datascope.ClassDataScope; +import org.ballcat.datascope.test.datarule.datascope.SchoolDataScope; +import org.ballcat.datascope.test.datarule.datascope.StudentDataScope; +import org.ballcat.datascope.test.datarule.entity.Student; +import org.ballcat.datascope.test.datarule.service.StudentService; +import org.ballcat.datascope.test.datarule.user.LoginUser; +import org.ballcat.datascope.test.datarule.user.LoginUserHolder; +import org.ballcat.datascope.test.datarule.user.UserRoleType; +import org.ballcat.datascope.util.DataPermissionUtils; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; @@ -49,7 +49,7 @@ @ExtendWith(SpringExtension.class) @ContextConfiguration(classes = { DataSourceConfiguration.class, DataPermissionRuleTestConfiguration.class, DataScopeAutoConfiguration.class, MybatisAutoConfiguration.class }) -@MapperScan("com.hccake.ballcat.common.datascope.test.datarule.mapper") +@MapperScan(basePackageClasses = StudentMapperTest.class) class StudentMapperTest { @Autowired diff --git a/datascope/ballcat-spring-boot-starter-datascope/src/test/java/com/hccake/ballcat/common/datascope/test/datarule/config/DataPermissionRuleTestConfiguration.java b/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datarule/config/DataPermissionRuleTestConfiguration.java similarity index 73% rename from datascope/ballcat-spring-boot-starter-datascope/src/test/java/com/hccake/ballcat/common/datascope/test/datarule/config/DataPermissionRuleTestConfiguration.java rename to datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datarule/config/DataPermissionRuleTestConfiguration.java index e78e43045..03d823e25 100644 --- a/datascope/ballcat-spring-boot-starter-datascope/src/test/java/com/hccake/ballcat/common/datascope/test/datarule/config/DataPermissionRuleTestConfiguration.java +++ b/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datarule/config/DataPermissionRuleTestConfiguration.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.datascope.test.datarule.config; +package org.ballcat.datascope.test.datarule.config; -import com.hccake.ballcat.common.datascope.DataScope; -import com.hccake.ballcat.common.datascope.test.datarule.datascope.ClassDataScope; -import com.hccake.ballcat.common.datascope.test.datarule.datascope.SchoolDataScope; -import com.hccake.ballcat.common.datascope.test.datarule.datascope.StudentDataScope; -import com.hccake.ballcat.common.datascope.test.datarule.service.StudentService; +import org.ballcat.datascope.DataScope; +import org.ballcat.datascope.test.datarule.datascope.ClassDataScope; +import org.ballcat.datascope.test.datarule.datascope.SchoolDataScope; +import org.ballcat.datascope.test.datarule.datascope.StudentDataScope; +import org.ballcat.datascope.test.datarule.service.StudentService; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.EnableAspectJAutoProxy; diff --git a/datascope/ballcat-spring-boot-starter-datascope/src/test/java/com/hccake/ballcat/common/datascope/test/datarule/config/DataSourceConfiguration.java b/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datarule/config/DataSourceConfiguration.java similarity index 95% rename from datascope/ballcat-spring-boot-starter-datascope/src/test/java/com/hccake/ballcat/common/datascope/test/datarule/config/DataSourceConfiguration.java rename to datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datarule/config/DataSourceConfiguration.java index aff624293..c24ab7c48 100644 --- a/datascope/ballcat-spring-boot-starter-datascope/src/test/java/com/hccake/ballcat/common/datascope/test/datarule/config/DataSourceConfiguration.java +++ b/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datarule/config/DataSourceConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.datascope.test.datarule.config; +package org.ballcat.datascope.test.datarule.config; import org.h2.Driver; import org.springframework.context.annotation.Bean; diff --git a/datascope/ballcat-spring-boot-starter-datascope/src/test/java/com/hccake/ballcat/common/datascope/test/datarule/datascope/ClassDataScope.java b/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datarule/datascope/ClassDataScope.java similarity index 87% rename from datascope/ballcat-spring-boot-starter-datascope/src/test/java/com/hccake/ballcat/common/datascope/test/datarule/datascope/ClassDataScope.java rename to datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datarule/datascope/ClassDataScope.java index 874bba78a..a078d2103 100644 --- a/datascope/ballcat-spring-boot-starter-datascope/src/test/java/com/hccake/ballcat/common/datascope/test/datarule/datascope/ClassDataScope.java +++ b/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datarule/datascope/ClassDataScope.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.datascope.test.datarule.datascope; +package org.ballcat.datascope.test.datarule.datascope; -import com.hccake.ballcat.common.datascope.DataScope; -import com.hccake.ballcat.common.datascope.test.datarule.user.LoginUser; -import com.hccake.ballcat.common.datascope.test.datarule.user.LoginUserHolder; -import com.hccake.ballcat.common.datascope.test.datarule.user.UserRoleType; -import com.hccake.ballcat.common.datascope.util.CollectionUtils; +import org.ballcat.datascope.DataScope; +import org.ballcat.datascope.test.datarule.user.LoginUser; +import org.ballcat.datascope.test.datarule.user.LoginUserHolder; +import org.ballcat.datascope.test.datarule.user.UserRoleType; +import org.ballcat.datascope.util.CollectionUtils; import net.sf.jsqlparser.expression.Alias; import net.sf.jsqlparser.expression.Expression; import net.sf.jsqlparser.expression.LongValue; diff --git a/datascope/ballcat-spring-boot-starter-datascope/src/test/java/com/hccake/ballcat/common/datascope/test/datarule/datascope/SchoolDataScope.java b/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datarule/datascope/SchoolDataScope.java similarity index 86% rename from datascope/ballcat-spring-boot-starter-datascope/src/test/java/com/hccake/ballcat/common/datascope/test/datarule/datascope/SchoolDataScope.java rename to datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datarule/datascope/SchoolDataScope.java index ddea2b124..628c46df5 100644 --- a/datascope/ballcat-spring-boot-starter-datascope/src/test/java/com/hccake/ballcat/common/datascope/test/datarule/datascope/SchoolDataScope.java +++ b/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datarule/datascope/SchoolDataScope.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.datascope.test.datarule.datascope; +package org.ballcat.datascope.test.datarule.datascope; -import com.hccake.ballcat.common.datascope.DataScope; -import com.hccake.ballcat.common.datascope.test.datarule.user.LoginUser; -import com.hccake.ballcat.common.datascope.test.datarule.user.LoginUserHolder; -import com.hccake.ballcat.common.datascope.test.datarule.user.UserRoleType; -import com.hccake.ballcat.common.datascope.util.CollectionUtils; +import org.ballcat.datascope.DataScope; +import org.ballcat.datascope.test.datarule.user.LoginUser; +import org.ballcat.datascope.test.datarule.user.LoginUserHolder; +import org.ballcat.datascope.test.datarule.user.UserRoleType; +import org.ballcat.datascope.util.CollectionUtils; import net.sf.jsqlparser.expression.Alias; import net.sf.jsqlparser.expression.Expression; import net.sf.jsqlparser.expression.LongValue; diff --git a/datascope/ballcat-spring-boot-starter-datascope/src/test/java/com/hccake/ballcat/common/datascope/test/datarule/datascope/StudentDataScope.java b/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datarule/datascope/StudentDataScope.java similarity index 85% rename from datascope/ballcat-spring-boot-starter-datascope/src/test/java/com/hccake/ballcat/common/datascope/test/datarule/datascope/StudentDataScope.java rename to datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datarule/datascope/StudentDataScope.java index 60a71b015..d399bc8b3 100644 --- a/datascope/ballcat-spring-boot-starter-datascope/src/test/java/com/hccake/ballcat/common/datascope/test/datarule/datascope/StudentDataScope.java +++ b/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datarule/datascope/StudentDataScope.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.datascope.test.datarule.datascope; +package org.ballcat.datascope.test.datarule.datascope; -import com.hccake.ballcat.common.datascope.DataScope; -import com.hccake.ballcat.common.datascope.test.datarule.user.LoginUser; -import com.hccake.ballcat.common.datascope.test.datarule.user.LoginUserHolder; -import com.hccake.ballcat.common.datascope.test.datarule.user.UserRoleType; +import org.ballcat.datascope.DataScope; +import org.ballcat.datascope.test.datarule.user.LoginUser; +import org.ballcat.datascope.test.datarule.user.LoginUserHolder; +import org.ballcat.datascope.test.datarule.user.UserRoleType; import net.sf.jsqlparser.expression.Alias; import net.sf.jsqlparser.expression.Expression; import net.sf.jsqlparser.expression.LongValue; diff --git a/datascope/ballcat-spring-boot-starter-datascope/src/test/java/com/hccake/ballcat/common/datascope/test/datarule/entity/Student.java b/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datarule/entity/Student.java similarity index 92% rename from datascope/ballcat-spring-boot-starter-datascope/src/test/java/com/hccake/ballcat/common/datascope/test/datarule/entity/Student.java rename to datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datarule/entity/Student.java index f705d7a9e..3be7a3591 100644 --- a/datascope/ballcat-spring-boot-starter-datascope/src/test/java/com/hccake/ballcat/common/datascope/test/datarule/entity/Student.java +++ b/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datarule/entity/Student.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.datascope.test.datarule.entity; +package org.ballcat.datascope.test.datarule.entity; import lombok.Data; diff --git a/datascope/ballcat-spring-boot-starter-datascope/src/test/java/com/hccake/ballcat/common/datascope/test/datarule/mapper/StudentMapper.java b/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datarule/mapper/StudentMapper.java similarity index 85% rename from datascope/ballcat-spring-boot-starter-datascope/src/test/java/com/hccake/ballcat/common/datascope/test/datarule/mapper/StudentMapper.java rename to datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datarule/mapper/StudentMapper.java index bfce25fa4..7995cb636 100644 --- a/datascope/ballcat-spring-boot-starter-datascope/src/test/java/com/hccake/ballcat/common/datascope/test/datarule/mapper/StudentMapper.java +++ b/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datarule/mapper/StudentMapper.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.datascope.test.datarule.mapper; +package org.ballcat.datascope.test.datarule.mapper; -import com.hccake.ballcat.common.datascope.test.datarule.entity.Student; +import org.ballcat.datascope.test.datarule.entity.Student; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; diff --git a/datascope/ballcat-spring-boot-starter-datascope/src/test/java/com/hccake/ballcat/common/datascope/test/datarule/service/StudentService.java b/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datarule/service/StudentService.java similarity index 75% rename from datascope/ballcat-spring-boot-starter-datascope/src/test/java/com/hccake/ballcat/common/datascope/test/datarule/service/StudentService.java rename to datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datarule/service/StudentService.java index 2dd40ea56..7118630f9 100644 --- a/datascope/ballcat-spring-boot-starter-datascope/src/test/java/com/hccake/ballcat/common/datascope/test/datarule/service/StudentService.java +++ b/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datarule/service/StudentService.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.datascope.test.datarule.service; +package org.ballcat.datascope.test.datarule.service; -import com.hccake.ballcat.common.datascope.annotation.DataPermission; -import com.hccake.ballcat.common.datascope.test.datarule.datascope.ClassDataScope; -import com.hccake.ballcat.common.datascope.test.datarule.datascope.SchoolDataScope; -import com.hccake.ballcat.common.datascope.test.datarule.entity.Student; -import com.hccake.ballcat.common.datascope.test.datarule.mapper.StudentMapper; +import org.ballcat.datascope.annotation.DataPermission; +import org.ballcat.datascope.test.datarule.datascope.ClassDataScope; +import org.ballcat.datascope.test.datarule.datascope.SchoolDataScope; +import org.ballcat.datascope.test.datarule.entity.Student; +import org.ballcat.datascope.test.datarule.mapper.StudentMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/datascope/ballcat-spring-boot-starter-datascope/src/test/java/com/hccake/ballcat/common/datascope/test/datarule/user/LoginUser.java b/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datarule/user/LoginUser.java similarity index 94% rename from datascope/ballcat-spring-boot-starter-datascope/src/test/java/com/hccake/ballcat/common/datascope/test/datarule/user/LoginUser.java rename to datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datarule/user/LoginUser.java index 1a50780be..6529d9079 100644 --- a/datascope/ballcat-spring-boot-starter-datascope/src/test/java/com/hccake/ballcat/common/datascope/test/datarule/user/LoginUser.java +++ b/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datarule/user/LoginUser.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.datascope.test.datarule.user; +package org.ballcat.datascope.test.datarule.user; import lombok.Data; diff --git a/datascope/ballcat-spring-boot-starter-datascope/src/test/java/com/hccake/ballcat/common/datascope/test/datarule/user/LoginUserHolder.java b/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datarule/user/LoginUserHolder.java similarity index 94% rename from datascope/ballcat-spring-boot-starter-datascope/src/test/java/com/hccake/ballcat/common/datascope/test/datarule/user/LoginUserHolder.java rename to datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datarule/user/LoginUserHolder.java index 19598ffcb..cee806030 100644 --- a/datascope/ballcat-spring-boot-starter-datascope/src/test/java/com/hccake/ballcat/common/datascope/test/datarule/user/LoginUserHolder.java +++ b/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datarule/user/LoginUserHolder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.datascope.test.datarule.user; +package org.ballcat.datascope.test.datarule.user; /** * 登录用户上下文 diff --git a/datascope/ballcat-spring-boot-starter-datascope/src/test/java/com/hccake/ballcat/common/datascope/test/datarule/user/UserRoleType.java b/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datarule/user/UserRoleType.java similarity index 92% rename from datascope/ballcat-spring-boot-starter-datascope/src/test/java/com/hccake/ballcat/common/datascope/test/datarule/user/UserRoleType.java rename to datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datarule/user/UserRoleType.java index 1990ec8f1..a3a8de1f0 100644 --- a/datascope/ballcat-spring-boot-starter-datascope/src/test/java/com/hccake/ballcat/common/datascope/test/datarule/user/UserRoleType.java +++ b/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datarule/user/UserRoleType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.datascope.test.datarule.user; +package org.ballcat.datascope.test.datarule.user; /** * 登录用户角色 diff --git a/datascope/ballcat-spring-boot-starter-datascope/src/test/java/com/hccake/ballcat/common/datascope/test/datascope/DataScopeMatchTest.java b/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datascope/DataScopeMatchTest.java similarity index 90% rename from datascope/ballcat-spring-boot-starter-datascope/src/test/java/com/hccake/ballcat/common/datascope/test/datascope/DataScopeMatchTest.java rename to datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datascope/DataScopeMatchTest.java index 8b64dc084..fc45c1d05 100644 --- a/datascope/ballcat-spring-boot-starter-datascope/src/test/java/com/hccake/ballcat/common/datascope/test/datascope/DataScopeMatchTest.java +++ b/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datascope/DataScopeMatchTest.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.datascope.test.datascope; +package org.ballcat.datascope.test.datascope; -import com.hccake.ballcat.common.datascope.DataScope; -import com.hccake.ballcat.common.datascope.handler.DataPermissionHandler; -import com.hccake.ballcat.common.datascope.handler.DefaultDataPermissionHandler; -import com.hccake.ballcat.common.datascope.holder.DataScopeMatchNumHolder; -import com.hccake.ballcat.common.datascope.processor.DataScopeSqlProcessor; +import org.ballcat.datascope.DataScope; +import org.ballcat.datascope.handler.DataPermissionHandler; +import org.ballcat.datascope.handler.DefaultDataPermissionHandler; +import org.ballcat.datascope.holder.DataScopeMatchNumHolder; +import org.ballcat.datascope.processor.DataScopeSqlProcessor; import net.sf.jsqlparser.expression.Alias; import net.sf.jsqlparser.expression.Expression; import net.sf.jsqlparser.expression.StringValue; diff --git a/datascope/ballcat-spring-boot-starter-datascope/src/test/java/com/hccake/ballcat/common/datascope/test/datascope/SqlParseTest.java b/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datascope/SqlParseTest.java similarity index 97% rename from datascope/ballcat-spring-boot-starter-datascope/src/test/java/com/hccake/ballcat/common/datascope/test/datascope/SqlParseTest.java rename to datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datascope/SqlParseTest.java index d5174ab74..1155641f3 100644 --- a/datascope/ballcat-spring-boot-starter-datascope/src/test/java/com/hccake/ballcat/common/datascope/test/datascope/SqlParseTest.java +++ b/datascope/ballcat-spring-boot-starter-datascope/src/test/java/org/ballcat/datascope/test/datascope/SqlParseTest.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.datascope.test.datascope; +package org.ballcat.datascope.test.datascope; -import com.hccake.ballcat.common.datascope.DataScope; -import com.hccake.ballcat.common.datascope.handler.DataPermissionHandler; -import com.hccake.ballcat.common.datascope.handler.DefaultDataPermissionHandler; -import com.hccake.ballcat.common.datascope.processor.DataScopeSqlProcessor; -import com.hccake.ballcat.common.datascope.util.SqlParseUtils; +import org.ballcat.datascope.DataScope; +import org.ballcat.datascope.handler.DataPermissionHandler; +import org.ballcat.datascope.handler.DefaultDataPermissionHandler; +import org.ballcat.datascope.processor.DataScopeSqlProcessor; +import org.ballcat.datascope.util.SqlParseUtils; import net.sf.jsqlparser.expression.Alias; import net.sf.jsqlparser.expression.Expression; import net.sf.jsqlparser.expression.LongValue; diff --git a/desensitize/ballcat-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/AnnotationHandlerHolder.java b/desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/AnnotationHandlerHolder.java similarity index 83% rename from desensitize/ballcat-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/AnnotationHandlerHolder.java rename to desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/AnnotationHandlerHolder.java index b10070210..89d82caf9 100644 --- a/desensitize/ballcat-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/AnnotationHandlerHolder.java +++ b/desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/AnnotationHandlerHolder.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.desensitize; +package org.ballcat.desensitize; import cn.hutool.core.lang.Assert; -import com.hccake.ballcat.common.desensitize.enums.RegexDesensitizationTypeEnum; -import com.hccake.ballcat.common.desensitize.enums.SlideDesensitizationTypeEnum; -import com.hccake.ballcat.common.desensitize.functions.DesensitizeFunction; -import com.hccake.ballcat.common.desensitize.handler.RegexDesensitizationHandler; -import com.hccake.ballcat.common.desensitize.handler.SimpleDesensitizationHandler; -import com.hccake.ballcat.common.desensitize.handler.SlideDesensitizationHandler; -import com.hccake.ballcat.common.desensitize.json.annotation.JsonRegexDesensitize; -import com.hccake.ballcat.common.desensitize.json.annotation.JsonSimpleDesensitize; -import com.hccake.ballcat.common.desensitize.json.annotation.JsonSlideDesensitize; +import org.ballcat.desensitize.enums.RegexDesensitizationTypeEnum; +import org.ballcat.desensitize.enums.SlideDesensitizationTypeEnum; +import org.ballcat.desensitize.functions.DesensitizeFunction; +import org.ballcat.desensitize.handler.RegexDesensitizationHandler; +import org.ballcat.desensitize.handler.SimpleDesensitizationHandler; +import org.ballcat.desensitize.handler.SlideDesensitizationHandler; +import org.ballcat.desensitize.json.annotation.JsonRegexDesensitize; +import org.ballcat.desensitize.json.annotation.JsonSimpleDesensitize; +import org.ballcat.desensitize.json.annotation.JsonSlideDesensitize; import java.lang.annotation.Annotation; import java.util.Map; diff --git a/desensitize/ballcat-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/DesensitizationHandlerHolder.java b/desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/DesensitizationHandlerHolder.java similarity index 90% rename from desensitize/ballcat-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/DesensitizationHandlerHolder.java rename to desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/DesensitizationHandlerHolder.java index be7d9ae6c..5fbe0858a 100644 --- a/desensitize/ballcat-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/DesensitizationHandlerHolder.java +++ b/desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/DesensitizationHandlerHolder.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.desensitize; +package org.ballcat.desensitize; -import com.hccake.ballcat.common.desensitize.handler.DesensitizationHandler; -import com.hccake.ballcat.common.desensitize.handler.RegexDesensitizationHandler; -import com.hccake.ballcat.common.desensitize.handler.SimpleDesensitizationHandler; -import com.hccake.ballcat.common.desensitize.handler.SlideDesensitizationHandler; +import org.ballcat.desensitize.handler.DesensitizationHandler; +import org.ballcat.desensitize.handler.RegexDesensitizationHandler; +import org.ballcat.desensitize.handler.SimpleDesensitizationHandler; +import org.ballcat.desensitize.handler.SlideDesensitizationHandler; import java.util.Map; import java.util.ServiceLoader; diff --git a/desensitize/ballcat-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/enums/RegexDesensitizationTypeEnum.java b/desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/enums/RegexDesensitizationTypeEnum.java similarity index 96% rename from desensitize/ballcat-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/enums/RegexDesensitizationTypeEnum.java rename to desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/enums/RegexDesensitizationTypeEnum.java index 62c20e65e..0f02e1f85 100644 --- a/desensitize/ballcat-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/enums/RegexDesensitizationTypeEnum.java +++ b/desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/enums/RegexDesensitizationTypeEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.desensitize.enums; +package org.ballcat.desensitize.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/desensitize/ballcat-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/enums/SlideDesensitizationTypeEnum.java b/desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/enums/SlideDesensitizationTypeEnum.java similarity index 96% rename from desensitize/ballcat-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/enums/SlideDesensitizationTypeEnum.java rename to desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/enums/SlideDesensitizationTypeEnum.java index 71b1c02c1..83dab10e6 100644 --- a/desensitize/ballcat-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/enums/SlideDesensitizationTypeEnum.java +++ b/desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/enums/SlideDesensitizationTypeEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.desensitize.enums; +package org.ballcat.desensitize.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/desensitize/ballcat-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/functions/DesensitizeFunction.java b/desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/functions/DesensitizeFunction.java similarity index 94% rename from desensitize/ballcat-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/functions/DesensitizeFunction.java rename to desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/functions/DesensitizeFunction.java index 7a87d7895..321b71028 100644 --- a/desensitize/ballcat-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/functions/DesensitizeFunction.java +++ b/desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/functions/DesensitizeFunction.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.desensitize.functions; +package org.ballcat.desensitize.functions; import java.lang.annotation.Annotation; diff --git a/desensitize/ballcat-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/handler/DesensitizationHandler.java b/desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/handler/DesensitizationHandler.java similarity index 92% rename from desensitize/ballcat-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/handler/DesensitizationHandler.java rename to desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/handler/DesensitizationHandler.java index a4aadd313..8b49698b1 100644 --- a/desensitize/ballcat-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/handler/DesensitizationHandler.java +++ b/desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/handler/DesensitizationHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.desensitize.handler; +package org.ballcat.desensitize.handler; /** * 脱敏处理器 diff --git a/desensitize/ballcat-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/handler/RegexDesensitizationHandler.java b/desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/handler/RegexDesensitizationHandler.java similarity index 91% rename from desensitize/ballcat-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/handler/RegexDesensitizationHandler.java rename to desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/handler/RegexDesensitizationHandler.java index bc8085df0..1863454b4 100644 --- a/desensitize/ballcat-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/handler/RegexDesensitizationHandler.java +++ b/desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/handler/RegexDesensitizationHandler.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.desensitize.handler; +package org.ballcat.desensitize.handler; -import com.hccake.ballcat.common.desensitize.enums.RegexDesensitizationTypeEnum; +import org.ballcat.desensitize.enums.RegexDesensitizationTypeEnum; /** * 正则替换脱敏处理器，使用正则匹配替换处理原数据 diff --git a/desensitize/ballcat-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/handler/SimpleDesensitizationHandler.java b/desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/handler/SimpleDesensitizationHandler.java similarity index 94% rename from desensitize/ballcat-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/handler/SimpleDesensitizationHandler.java rename to desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/handler/SimpleDesensitizationHandler.java index e5bf5b456..a2210c507 100644 --- a/desensitize/ballcat-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/handler/SimpleDesensitizationHandler.java +++ b/desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/handler/SimpleDesensitizationHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.desensitize.handler; +package org.ballcat.desensitize.handler; /** * 简单的脱敏处理器，传入源数据直接返回脱敏后的数据 diff --git a/desensitize/ballcat-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/handler/SixAsteriskDesensitizationHandler.java b/desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/handler/SixAsteriskDesensitizationHandler.java similarity index 94% rename from desensitize/ballcat-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/handler/SixAsteriskDesensitizationHandler.java rename to desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/handler/SixAsteriskDesensitizationHandler.java index 4754e8d7a..aa71c5298 100644 --- a/desensitize/ballcat-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/handler/SixAsteriskDesensitizationHandler.java +++ b/desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/handler/SixAsteriskDesensitizationHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.desensitize.handler; +package org.ballcat.desensitize.handler; /** * 【6*脱敏】，不管原文是什么，一律返回6个* eg. ****** diff --git a/desensitize/ballcat-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/handler/SlideDesensitizationHandler.java b/desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/handler/SlideDesensitizationHandler.java similarity index 94% rename from desensitize/ballcat-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/handler/SlideDesensitizationHandler.java rename to desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/handler/SlideDesensitizationHandler.java index fd0437d5a..d4dc1bd9b 100644 --- a/desensitize/ballcat-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/handler/SlideDesensitizationHandler.java +++ b/desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/handler/SlideDesensitizationHandler.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.desensitize.handler; +package org.ballcat.desensitize.handler; -import com.hccake.ballcat.common.desensitize.enums.SlideDesensitizationTypeEnum; +import org.ballcat.desensitize.enums.SlideDesensitizationTypeEnum; /** * 滑动脱敏处理器，根据左右边界值滑动左右指针，中间处脱敏 diff --git a/desensitize/ballcat-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/json/DesensitizeStrategy.java b/desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/json/DesensitizeStrategy.java similarity index 94% rename from desensitize/ballcat-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/json/DesensitizeStrategy.java rename to desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/json/DesensitizeStrategy.java index 30751fb53..f943362a3 100644 --- a/desensitize/ballcat-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/json/DesensitizeStrategy.java +++ b/desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/json/DesensitizeStrategy.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.desensitize.json; +package org.ballcat.desensitize.json; /** * 脱敏工具类 定义开启脱敏规则 diff --git a/desensitize/ballcat-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/json/JsonDesensitizeModule.java b/desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/json/JsonDesensitizeModule.java similarity index 94% rename from desensitize/ballcat-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/json/JsonDesensitizeModule.java rename to desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/json/JsonDesensitizeModule.java index dcb887e8a..3bde4b145 100644 --- a/desensitize/ballcat-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/json/JsonDesensitizeModule.java +++ b/desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/json/JsonDesensitizeModule.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.desensitize.json; +package org.ballcat.desensitize.json; import com.fasterxml.jackson.databind.module.SimpleModule; diff --git a/desensitize/ballcat-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/json/JsonDesensitizeSerializer.java b/desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/json/JsonDesensitizeSerializer.java similarity index 91% rename from desensitize/ballcat-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/json/JsonDesensitizeSerializer.java rename to desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/json/JsonDesensitizeSerializer.java index 087672e6a..8fe39a75a 100644 --- a/desensitize/ballcat-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/json/JsonDesensitizeSerializer.java +++ b/desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/json/JsonDesensitizeSerializer.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.desensitize.json; +package org.ballcat.desensitize.json; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; -import com.hccake.ballcat.common.desensitize.AnnotationHandlerHolder; -import com.hccake.ballcat.common.desensitize.functions.DesensitizeFunction; +import org.ballcat.desensitize.AnnotationHandlerHolder; +import org.ballcat.desensitize.functions.DesensitizeFunction; import java.io.IOException; import java.lang.annotation.Annotation; diff --git a/desensitize/ballcat-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/json/JsonDesensitizeSerializerModifier.java b/desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/json/JsonDesensitizeSerializerModifier.java similarity index 94% rename from desensitize/ballcat-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/json/JsonDesensitizeSerializerModifier.java rename to desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/json/JsonDesensitizeSerializerModifier.java index b3fefcbe5..691bef204 100644 --- a/desensitize/ballcat-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/json/JsonDesensitizeSerializerModifier.java +++ b/desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/json/JsonDesensitizeSerializerModifier.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.desensitize.json; +package org.ballcat.desensitize.json; import com.fasterxml.jackson.databind.BeanDescription; import com.fasterxml.jackson.databind.SerializationConfig; import com.fasterxml.jackson.databind.ser.BeanPropertyWriter; import com.fasterxml.jackson.databind.ser.BeanSerializerModifier; -import com.hccake.ballcat.common.desensitize.AnnotationHandlerHolder; +import org.ballcat.desensitize.AnnotationHandlerHolder; import java.lang.annotation.Annotation; diff --git a/desensitize/ballcat-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/json/annotation/JsonRegexDesensitize.java b/desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/json/annotation/JsonRegexDesensitize.java similarity index 86% rename from desensitize/ballcat-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/json/annotation/JsonRegexDesensitize.java rename to desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/json/annotation/JsonRegexDesensitize.java index 78993e2fe..488e3f75c 100644 --- a/desensitize/ballcat-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/json/annotation/JsonRegexDesensitize.java +++ b/desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/json/annotation/JsonRegexDesensitize.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.desensitize.json.annotation; +package org.ballcat.desensitize.json.annotation; -import com.hccake.ballcat.common.desensitize.enums.RegexDesensitizationTypeEnum; -import com.hccake.ballcat.common.desensitize.handler.RegexDesensitizationHandler; +import org.ballcat.desensitize.enums.RegexDesensitizationTypeEnum; +import org.ballcat.desensitize.handler.RegexDesensitizationHandler; import java.lang.annotation.*; diff --git a/desensitize/ballcat-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/json/annotation/JsonSimpleDesensitize.java b/desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/json/annotation/JsonSimpleDesensitize.java similarity index 88% rename from desensitize/ballcat-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/json/annotation/JsonSimpleDesensitize.java rename to desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/json/annotation/JsonSimpleDesensitize.java index d4c1e8787..c1f54cf58 100644 --- a/desensitize/ballcat-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/json/annotation/JsonSimpleDesensitize.java +++ b/desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/json/annotation/JsonSimpleDesensitize.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.desensitize.json.annotation; +package org.ballcat.desensitize.json.annotation; -import com.hccake.ballcat.common.desensitize.handler.SimpleDesensitizationHandler; +import org.ballcat.desensitize.handler.SimpleDesensitizationHandler; import java.lang.annotation.*; diff --git a/desensitize/ballcat-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/json/annotation/JsonSlideDesensitize.java b/desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/json/annotation/JsonSlideDesensitize.java similarity index 86% rename from desensitize/ballcat-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/json/annotation/JsonSlideDesensitize.java rename to desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/json/annotation/JsonSlideDesensitize.java index d4a4b9352..6c5c98c4d 100644 --- a/desensitize/ballcat-desensitize/src/main/java/com/hccake/ballcat/common/desensitize/json/annotation/JsonSlideDesensitize.java +++ b/desensitize/ballcat-desensitize/src/main/java/org/ballcat/desensitize/json/annotation/JsonSlideDesensitize.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.desensitize.json.annotation; +package org.ballcat.desensitize.json.annotation; -import com.hccake.ballcat.common.desensitize.enums.SlideDesensitizationTypeEnum; -import com.hccake.ballcat.common.desensitize.handler.SlideDesensitizationHandler; +import org.ballcat.desensitize.enums.SlideDesensitizationTypeEnum; +import org.ballcat.desensitize.handler.SlideDesensitizationHandler; import java.lang.annotation.*; diff --git a/desensitize/ballcat-desensitize/src/main/resources/META-INF/services/com.hccake.ballcat.common.desensitize.handler.SimpleDesensitizationHandler b/desensitize/ballcat-desensitize/src/main/resources/META-INF/services/com.hccake.ballcat.common.desensitize.handler.SimpleDesensitizationHandler deleted file mode 100644 index b1429f0fc..000000000 --- a/desensitize/ballcat-desensitize/src/main/resources/META-INF/services/com.hccake.ballcat.common.desensitize.handler.SimpleDesensitizationHandler +++ /dev/null @@ -1 +0,0 @@ -com.hccake.ballcat.common.desensitize.handler.SixAsteriskDesensitizationHandler diff --git a/desensitize/ballcat-desensitize/src/main/resources/META-INF/services/org.ballcat.desensitize.handler.SimpleDesensitizationHandler b/desensitize/ballcat-desensitize/src/main/resources/META-INF/services/org.ballcat.desensitize.handler.SimpleDesensitizationHandler new file mode 100644 index 000000000..31b9c2f97 --- /dev/null +++ b/desensitize/ballcat-desensitize/src/main/resources/META-INF/services/org.ballcat.desensitize.handler.SimpleDesensitizationHandler @@ -0,0 +1 @@ +org.ballcat.desensitize.handler.SixAsteriskDesensitizationHandler diff --git a/desensitize/ballcat-desensitize/src/test/java/com/hccake/common/core/test/desensite/DesensitisedTest.java b/desensitize/ballcat-desensitize/src/test/java/org/ballcat/desensite/DesensitisedTest.java similarity index 83% rename from desensitize/ballcat-desensitize/src/test/java/com/hccake/common/core/test/desensite/DesensitisedTest.java rename to desensitize/ballcat-desensitize/src/test/java/org/ballcat/desensite/DesensitisedTest.java index cd25b8950..316a58573 100644 --- a/desensitize/ballcat-desensitize/src/test/java/com/hccake/common/core/test/desensite/DesensitisedTest.java +++ b/desensitize/ballcat-desensitize/src/test/java/org/ballcat/desensite/DesensitisedTest.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.common.core.test.desensite; +package org.ballcat.desensite; import com.fasterxml.jackson.databind.ObjectMapper; -import com.hccake.ballcat.common.desensitize.DesensitizationHandlerHolder; -import com.hccake.ballcat.common.desensitize.enums.RegexDesensitizationTypeEnum; -import com.hccake.ballcat.common.desensitize.enums.SlideDesensitizationTypeEnum; -import com.hccake.ballcat.common.desensitize.handler.RegexDesensitizationHandler; -import com.hccake.ballcat.common.desensitize.handler.SimpleDesensitizationHandler; -import com.hccake.ballcat.common.desensitize.handler.SixAsteriskDesensitizationHandler; -import com.hccake.ballcat.common.desensitize.handler.SlideDesensitizationHandler; -import com.hccake.ballcat.common.desensitize.json.JsonDesensitizeSerializerModifier; +import org.ballcat.desensitize.DesensitizationHandlerHolder; +import org.ballcat.desensitize.enums.RegexDesensitizationTypeEnum; +import org.ballcat.desensitize.enums.SlideDesensitizationTypeEnum; +import org.ballcat.desensitize.handler.RegexDesensitizationHandler; +import org.ballcat.desensitize.handler.SimpleDesensitizationHandler; +import org.ballcat.desensitize.handler.SixAsteriskDesensitizationHandler; +import org.ballcat.desensitize.handler.SlideDesensitizationHandler; +import org.ballcat.desensitize.json.JsonDesensitizeSerializerModifier; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.*; diff --git a/desensitize/ballcat-desensitize/src/test/java/com/hccake/common/core/test/desensite/DesensitizationUser.java b/desensitize/ballcat-desensitize/src/test/java/org/ballcat/desensite/DesensitizationUser.java similarity index 73% rename from desensitize/ballcat-desensitize/src/test/java/com/hccake/common/core/test/desensite/DesensitizationUser.java rename to desensitize/ballcat-desensitize/src/test/java/org/ballcat/desensite/DesensitizationUser.java index 93a2c12f5..9870f4a7e 100644 --- a/desensitize/ballcat-desensitize/src/test/java/com/hccake/common/core/test/desensite/DesensitizationUser.java +++ b/desensitize/ballcat-desensitize/src/test/java/org/ballcat/desensite/DesensitizationUser.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.common.core.test.desensite; +package org.ballcat.desensite; -import com.hccake.ballcat.common.desensitize.json.annotation.JsonRegexDesensitize; -import com.hccake.ballcat.common.desensitize.json.annotation.JsonSimpleDesensitize; -import com.hccake.ballcat.common.desensitize.json.annotation.JsonSlideDesensitize; -import com.hccake.ballcat.common.desensitize.enums.RegexDesensitizationTypeEnum; -import com.hccake.ballcat.common.desensitize.enums.SlideDesensitizationTypeEnum; -import com.hccake.common.core.test.desensite.custom.CustomerDesensitize; +import org.ballcat.desensite.custom.CustomerDesensitize; +import org.ballcat.desensitize.json.annotation.JsonRegexDesensitize; +import org.ballcat.desensitize.json.annotation.JsonSimpleDesensitize; +import org.ballcat.desensitize.json.annotation.JsonSlideDesensitize; +import org.ballcat.desensitize.enums.RegexDesensitizationTypeEnum; +import org.ballcat.desensitize.enums.SlideDesensitizationTypeEnum; import lombok.Data; import lombok.experimental.Accessors; diff --git a/desensitize/ballcat-desensitize/src/test/java/com/hccake/common/core/test/desensite/TestDesensitizationHandler.java b/desensitize/ballcat-desensitize/src/test/java/org/ballcat/desensite/TestDesensitizationHandler.java similarity index 86% rename from desensitize/ballcat-desensitize/src/test/java/com/hccake/common/core/test/desensite/TestDesensitizationHandler.java rename to desensitize/ballcat-desensitize/src/test/java/org/ballcat/desensite/TestDesensitizationHandler.java index f84b823f2..f6f41d654 100644 --- a/desensitize/ballcat-desensitize/src/test/java/com/hccake/common/core/test/desensite/TestDesensitizationHandler.java +++ b/desensitize/ballcat-desensitize/src/test/java/org/ballcat/desensite/TestDesensitizationHandler.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.common.core.test.desensite; +package org.ballcat.desensite; -import com.hccake.ballcat.common.desensitize.handler.SimpleDesensitizationHandler; +import org.ballcat.desensitize.handler.SimpleDesensitizationHandler; /** * @author Hccake 2021/1/23 diff --git a/desensitize/ballcat-desensitize/src/test/java/com/hccake/common/core/test/desensite/TestUtils.java b/desensitize/ballcat-desensitize/src/test/java/org/ballcat/desensite/TestUtils.java similarity index 91% rename from desensitize/ballcat-desensitize/src/test/java/com/hccake/common/core/test/desensite/TestUtils.java rename to desensitize/ballcat-desensitize/src/test/java/org/ballcat/desensite/TestUtils.java index b0866a0c1..23b795897 100644 --- a/desensitize/ballcat-desensitize/src/test/java/com/hccake/common/core/test/desensite/TestUtils.java +++ b/desensitize/ballcat-desensitize/src/test/java/org/ballcat/desensite/TestUtils.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.common.core.test.desensite; +package org.ballcat.desensite; -import com.hccake.ballcat.common.desensitize.AnnotationHandlerHolder; -import com.hccake.ballcat.common.desensitize.DesensitizationHandlerHolder; +import org.ballcat.desensitize.AnnotationHandlerHolder; +import org.ballcat.desensitize.DesensitizationHandlerHolder; import java.lang.reflect.Constructor; import java.lang.reflect.Field; diff --git a/desensitize/ballcat-desensitize/src/test/java/com/hccake/common/core/test/desensite/custom/CustomDesensitisedHandler.java b/desensitize/ballcat-desensitize/src/test/java/org/ballcat/desensite/custom/CustomDesensitisedHandler.java similarity index 85% rename from desensitize/ballcat-desensitize/src/test/java/com/hccake/common/core/test/desensite/custom/CustomDesensitisedHandler.java rename to desensitize/ballcat-desensitize/src/test/java/org/ballcat/desensite/custom/CustomDesensitisedHandler.java index 43130d6cb..b45daaf10 100644 --- a/desensitize/ballcat-desensitize/src/test/java/com/hccake/common/core/test/desensite/custom/CustomDesensitisedHandler.java +++ b/desensitize/ballcat-desensitize/src/test/java/org/ballcat/desensite/custom/CustomDesensitisedHandler.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.common.core.test.desensite.custom; +package org.ballcat.desensite.custom; -import com.hccake.ballcat.common.desensitize.handler.DesensitizationHandler; +import org.ballcat.desensitize.handler.DesensitizationHandler; public class CustomDesensitisedHandler implements DesensitizationHandler { diff --git a/desensitize/ballcat-desensitize/src/test/java/com/hccake/common/core/test/desensite/custom/CustomDesensitisedTest.java b/desensitize/ballcat-desensitize/src/test/java/org/ballcat/desensite/custom/CustomDesensitisedTest.java similarity index 86% rename from desensitize/ballcat-desensitize/src/test/java/com/hccake/common/core/test/desensite/custom/CustomDesensitisedTest.java rename to desensitize/ballcat-desensitize/src/test/java/org/ballcat/desensite/custom/CustomDesensitisedTest.java index 57a5909cc..860748553 100644 --- a/desensitize/ballcat-desensitize/src/test/java/com/hccake/common/core/test/desensite/custom/CustomDesensitisedTest.java +++ b/desensitize/ballcat-desensitize/src/test/java/org/ballcat/desensite/custom/CustomDesensitisedTest.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.common.core.test.desensite.custom; +package org.ballcat.desensite.custom; import com.fasterxml.jackson.databind.ObjectMapper; -import com.hccake.ballcat.common.desensitize.AnnotationHandlerHolder; -import com.hccake.ballcat.common.desensitize.DesensitizationHandlerHolder; -import com.hccake.ballcat.common.desensitize.json.JsonDesensitizeSerializerModifier; -import com.hccake.common.core.test.desensite.DesensitizationUser; -import com.hccake.common.core.test.desensite.TestUtils; +import org.ballcat.desensitize.AnnotationHandlerHolder; +import org.ballcat.desensitize.DesensitizationHandlerHolder; +import org.ballcat.desensitize.json.JsonDesensitizeSerializerModifier; +import org.ballcat.desensite.DesensitizationUser; +import org.ballcat.desensite.TestUtils; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/desensitize/ballcat-desensitize/src/test/java/com/hccake/common/core/test/desensite/custom/CustomerDesensitize.java b/desensitize/ballcat-desensitize/src/test/java/org/ballcat/desensite/custom/CustomerDesensitize.java similarity index 94% rename from desensitize/ballcat-desensitize/src/test/java/com/hccake/common/core/test/desensite/custom/CustomerDesensitize.java rename to desensitize/ballcat-desensitize/src/test/java/org/ballcat/desensite/custom/CustomerDesensitize.java index e594f9f11..38e3e1492 100644 --- a/desensitize/ballcat-desensitize/src/test/java/com/hccake/common/core/test/desensite/custom/CustomerDesensitize.java +++ b/desensitize/ballcat-desensitize/src/test/java/org/ballcat/desensite/custom/CustomerDesensitize.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.common.core.test.desensite.custom; +package org.ballcat.desensite.custom; import java.lang.annotation.*; diff --git a/desensitize/ballcat-desensitize/src/test/resources/META-INF/services/com.hccake.ballcat.common.desensitize.handler.SimpleDesensitizationHandler b/desensitize/ballcat-desensitize/src/test/resources/META-INF/services/com.hccake.ballcat.common.desensitize.handler.SimpleDesensitizationHandler deleted file mode 100644 index f5da8dc9d..000000000 --- a/desensitize/ballcat-desensitize/src/test/resources/META-INF/services/com.hccake.ballcat.common.desensitize.handler.SimpleDesensitizationHandler +++ /dev/null @@ -1 +0,0 @@ -com.hccake.common.core.test.desensite.TestDesensitizationHandler \ No newline at end of file diff --git a/desensitize/ballcat-desensitize/src/test/resources/META-INF/services/org.ballcat.desensitize.handler.SimpleDesensitizationHandler b/desensitize/ballcat-desensitize/src/test/resources/META-INF/services/org.ballcat.desensitize.handler.SimpleDesensitizationHandler new file mode 100644 index 000000000..effaee99f --- /dev/null +++ b/desensitize/ballcat-desensitize/src/test/resources/META-INF/services/org.ballcat.desensitize.handler.SimpleDesensitizationHandler @@ -0,0 +1 @@ +org.ballcat.desensite.TestDesensitizationHandler \ No newline at end of file diff --git a/dingtalk/ballcat-dingtalk/src/main/java/com/hccake/extend/dingtalk/DingTalkBalancedSender.java b/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/DingTalkBalancedSender.java similarity index 90% rename from dingtalk/ballcat-dingtalk/src/main/java/com/hccake/extend/dingtalk/DingTalkBalancedSender.java rename to dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/DingTalkBalancedSender.java index 3c86c6956..9a597afa5 100644 --- a/dingtalk/ballcat-dingtalk/src/main/java/com/hccake/extend/dingtalk/DingTalkBalancedSender.java +++ b/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/DingTalkBalancedSender.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.dingtalk; +package org.ballcat.dingtalk; -import com.hccake.ballcat.common.queue.WaitQueue; -import com.hccake.extend.dingtalk.message.DingTalkMessage; +import org.ballcat.common.queue.WaitQueue; +import org.ballcat.dingtalk.message.DingTalkMessage; import lombok.SneakyThrows; import java.util.Collection; diff --git a/dingtalk/ballcat-dingtalk/src/main/java/com/hccake/extend/dingtalk/DingTalkParams.java b/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/DingTalkParams.java similarity index 95% rename from dingtalk/ballcat-dingtalk/src/main/java/com/hccake/extend/dingtalk/DingTalkParams.java rename to dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/DingTalkParams.java index 0cba78b86..e7e0d7780 100644 --- a/dingtalk/ballcat-dingtalk/src/main/java/com/hccake/extend/dingtalk/DingTalkParams.java +++ b/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/DingTalkParams.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.dingtalk; +package org.ballcat.dingtalk; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.hccake.extend.dingtalk.message.DingTalkActionCardMessage; +import org.ballcat.dingtalk.message.DingTalkActionCardMessage; import lombok.Data; import lombok.Getter; import lombok.Setter; diff --git a/dingtalk/ballcat-dingtalk/src/main/java/com/hccake/extend/dingtalk/DingTalkResponse.java b/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/DingTalkResponse.java similarity index 98% rename from dingtalk/ballcat-dingtalk/src/main/java/com/hccake/extend/dingtalk/DingTalkResponse.java rename to dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/DingTalkResponse.java index 584fe53e4..04f12e987 100644 --- a/dingtalk/ballcat-dingtalk/src/main/java/com/hccake/extend/dingtalk/DingTalkResponse.java +++ b/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/DingTalkResponse.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.dingtalk; +package org.ballcat.dingtalk; import cn.hutool.core.convert.Convert; import com.fasterxml.jackson.core.exc.StreamReadException; diff --git a/dingtalk/ballcat-dingtalk/src/main/java/com/hccake/extend/dingtalk/DingTalkSender.java b/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/DingTalkSender.java similarity index 97% rename from dingtalk/ballcat-dingtalk/src/main/java/com/hccake/extend/dingtalk/DingTalkSender.java rename to dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/DingTalkSender.java index 81d4cf47e..2935813d2 100644 --- a/dingtalk/ballcat-dingtalk/src/main/java/com/hccake/extend/dingtalk/DingTalkSender.java +++ b/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/DingTalkSender.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.dingtalk; +package org.ballcat.dingtalk; import cn.hutool.core.codec.Base64; import cn.hutool.core.text.CharSequenceUtil; -import com.hccake.extend.dingtalk.message.DingTalkMessage; +import org.ballcat.dingtalk.message.DingTalkMessage; import com.sun.nio.sctp.IllegalReceiveException; import lombok.Getter; import lombok.Setter; diff --git a/dingtalk/ballcat-dingtalk/src/main/java/com/hccake/extend/dingtalk/enums/ActionBtnOrientationEnum.java b/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/enums/ActionBtnOrientationEnum.java similarity index 96% rename from dingtalk/ballcat-dingtalk/src/main/java/com/hccake/extend/dingtalk/enums/ActionBtnOrientationEnum.java rename to dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/enums/ActionBtnOrientationEnum.java index c9cdd9842..ef014b8c7 100644 --- a/dingtalk/ballcat-dingtalk/src/main/java/com/hccake/extend/dingtalk/enums/ActionBtnOrientationEnum.java +++ b/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/enums/ActionBtnOrientationEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.dingtalk.enums; +package org.ballcat.dingtalk.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/dingtalk/ballcat-dingtalk/src/main/java/com/hccake/extend/dingtalk/enums/MessageTypeEnum.java b/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/enums/MessageTypeEnum.java similarity index 96% rename from dingtalk/ballcat-dingtalk/src/main/java/com/hccake/extend/dingtalk/enums/MessageTypeEnum.java rename to dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/enums/MessageTypeEnum.java index 9068a15dc..7a3f5acbc 100644 --- a/dingtalk/ballcat-dingtalk/src/main/java/com/hccake/extend/dingtalk/enums/MessageTypeEnum.java +++ b/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/enums/MessageTypeEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.dingtalk.enums; +package org.ballcat.dingtalk.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/dingtalk/ballcat-dingtalk/src/main/java/com/hccake/extend/dingtalk/message/AbstractDingTalkMessage.java b/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/message/AbstractDingTalkMessage.java similarity index 91% rename from dingtalk/ballcat-dingtalk/src/main/java/com/hccake/extend/dingtalk/message/AbstractDingTalkMessage.java rename to dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/message/AbstractDingTalkMessage.java index d7aa03ebd..f9b6511ae 100644 --- a/dingtalk/ballcat-dingtalk/src/main/java/com/hccake/extend/dingtalk/message/AbstractDingTalkMessage.java +++ b/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/message/AbstractDingTalkMessage.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.dingtalk.message; +package org.ballcat.dingtalk.message; -import com.hccake.extend.dingtalk.DingTalkParams; -import com.hccake.extend.dingtalk.enums.MessageTypeEnum; +import org.ballcat.dingtalk.DingTalkParams; +import org.ballcat.dingtalk.enums.MessageTypeEnum; import java.util.HashSet; import java.util.Set; diff --git a/dingtalk/ballcat-dingtalk/src/main/java/com/hccake/extend/dingtalk/message/DingTalkActionCardMessage.java b/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/message/DingTalkActionCardMessage.java similarity index 89% rename from dingtalk/ballcat-dingtalk/src/main/java/com/hccake/extend/dingtalk/message/DingTalkActionCardMessage.java rename to dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/message/DingTalkActionCardMessage.java index ee949599e..511d5e61f 100644 --- a/dingtalk/ballcat-dingtalk/src/main/java/com/hccake/extend/dingtalk/message/DingTalkActionCardMessage.java +++ b/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/message/DingTalkActionCardMessage.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.dingtalk.message; +package org.ballcat.dingtalk.message; -import com.hccake.ballcat.common.markdown.MarkdownBuilder; -import com.hccake.extend.dingtalk.DingTalkParams; -import com.hccake.extend.dingtalk.enums.ActionBtnOrientationEnum; -import com.hccake.extend.dingtalk.enums.MessageTypeEnum; +import org.ballcat.common.markdown.MarkdownBuilder; +import org.ballcat.dingtalk.DingTalkParams; +import org.ballcat.dingtalk.enums.ActionBtnOrientationEnum; +import org.ballcat.dingtalk.enums.MessageTypeEnum; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; diff --git a/dingtalk/ballcat-dingtalk/src/main/java/com/hccake/extend/dingtalk/message/DingTalkLinkMessage.java b/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/message/DingTalkLinkMessage.java similarity index 89% rename from dingtalk/ballcat-dingtalk/src/main/java/com/hccake/extend/dingtalk/message/DingTalkLinkMessage.java rename to dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/message/DingTalkLinkMessage.java index cdceec920..2ae0a5cdc 100644 --- a/dingtalk/ballcat-dingtalk/src/main/java/com/hccake/extend/dingtalk/message/DingTalkLinkMessage.java +++ b/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/message/DingTalkLinkMessage.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.dingtalk.message; +package org.ballcat.dingtalk.message; -import com.hccake.extend.dingtalk.DingTalkParams; -import com.hccake.extend.dingtalk.enums.MessageTypeEnum; +import org.ballcat.dingtalk.DingTalkParams; +import org.ballcat.dingtalk.enums.MessageTypeEnum; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; diff --git a/dingtalk/ballcat-dingtalk/src/main/java/com/hccake/extend/dingtalk/message/DingTalkMarkDownMessage.java b/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/message/DingTalkMarkDownMessage.java similarity index 85% rename from dingtalk/ballcat-dingtalk/src/main/java/com/hccake/extend/dingtalk/message/DingTalkMarkDownMessage.java rename to dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/message/DingTalkMarkDownMessage.java index 8c9725ecb..1d7052eef 100644 --- a/dingtalk/ballcat-dingtalk/src/main/java/com/hccake/extend/dingtalk/message/DingTalkMarkDownMessage.java +++ b/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/message/DingTalkMarkDownMessage.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.dingtalk.message; +package org.ballcat.dingtalk.message; -import com.hccake.ballcat.common.markdown.MarkdownBuilder; -import com.hccake.extend.dingtalk.DingTalkParams; -import com.hccake.extend.dingtalk.enums.MessageTypeEnum; +import org.ballcat.common.markdown.MarkdownBuilder; +import org.ballcat.dingtalk.DingTalkParams; +import org.ballcat.dingtalk.enums.MessageTypeEnum; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; diff --git a/dingtalk/ballcat-dingtalk/src/main/java/com/hccake/extend/dingtalk/message/DingTalkMessage.java b/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/message/DingTalkMessage.java similarity index 94% rename from dingtalk/ballcat-dingtalk/src/main/java/com/hccake/extend/dingtalk/message/DingTalkMessage.java rename to dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/message/DingTalkMessage.java index 2579451e6..983c4c87b 100644 --- a/dingtalk/ballcat-dingtalk/src/main/java/com/hccake/extend/dingtalk/message/DingTalkMessage.java +++ b/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/message/DingTalkMessage.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.dingtalk.message; +package org.ballcat.dingtalk.message; /** * @author lingting 2020/6/11 21:58 diff --git a/dingtalk/ballcat-dingtalk/src/main/java/com/hccake/extend/dingtalk/message/DingTalkTextMessage.java b/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/message/DingTalkTextMessage.java similarity index 88% rename from dingtalk/ballcat-dingtalk/src/main/java/com/hccake/extend/dingtalk/message/DingTalkTextMessage.java rename to dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/message/DingTalkTextMessage.java index c3966b9c1..3adab3c32 100644 --- a/dingtalk/ballcat-dingtalk/src/main/java/com/hccake/extend/dingtalk/message/DingTalkTextMessage.java +++ b/dingtalk/ballcat-dingtalk/src/main/java/org/ballcat/dingtalk/message/DingTalkTextMessage.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.dingtalk.message; +package org.ballcat.dingtalk.message; -import com.hccake.extend.dingtalk.DingTalkParams; -import com.hccake.extend.dingtalk.enums.MessageTypeEnum; +import org.ballcat.dingtalk.DingTalkParams; +import org.ballcat.dingtalk.enums.MessageTypeEnum; import lombok.Getter; import lombok.Setter; import lombok.experimental.Accessors; diff --git a/dingtalk/ballcat-dingtalk/src/test/java/com/hccake/extend/dingtalk/DingTalkTest.java b/dingtalk/ballcat-dingtalk/src/test/java/org/ballcat/dingtalk/DingTalkTest.java similarity index 93% rename from dingtalk/ballcat-dingtalk/src/test/java/com/hccake/extend/dingtalk/DingTalkTest.java rename to dingtalk/ballcat-dingtalk/src/test/java/org/ballcat/dingtalk/DingTalkTest.java index e660de763..1a36644ea 100644 --- a/dingtalk/ballcat-dingtalk/src/test/java/com/hccake/extend/dingtalk/DingTalkTest.java +++ b/dingtalk/ballcat-dingtalk/src/test/java/org/ballcat/dingtalk/DingTalkTest.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.dingtalk; +package org.ballcat.dingtalk; -import com.hccake.extend.dingtalk.message.DingTalkTextMessage; +import org.ballcat.dingtalk.message.DingTalkTextMessage; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/dingtalk/ballcat-spring-boot-starter-dingtalk/src/main/java/com/hccake/starter/dingtalk/DingTalkAutoConfiguration.java b/dingtalk/ballcat-spring-boot-starter-dingtalk/src/main/java/org/ballcat/autoconfigure/dingtalk/DingTalkAutoConfiguration.java similarity index 94% rename from dingtalk/ballcat-spring-boot-starter-dingtalk/src/main/java/com/hccake/starter/dingtalk/DingTalkAutoConfiguration.java rename to dingtalk/ballcat-spring-boot-starter-dingtalk/src/main/java/org/ballcat/autoconfigure/dingtalk/DingTalkAutoConfiguration.java index 10d659dca..175c9e015 100644 --- a/dingtalk/ballcat-spring-boot-starter-dingtalk/src/main/java/com/hccake/starter/dingtalk/DingTalkAutoConfiguration.java +++ b/dingtalk/ballcat-spring-boot-starter-dingtalk/src/main/java/org/ballcat/autoconfigure/dingtalk/DingTalkAutoConfiguration.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.dingtalk; +package org.ballcat.autoconfigure.dingtalk; -import com.hccake.extend.dingtalk.DingTalkSender; +import org.ballcat.dingtalk.DingTalkSender; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.autoconfigure.AutoConfiguration; diff --git a/dingtalk/ballcat-spring-boot-starter-dingtalk/src/main/java/com/hccake/starter/dingtalk/DingTalkProperties.java b/dingtalk/ballcat-spring-boot-starter-dingtalk/src/main/java/org/ballcat/autoconfigure/dingtalk/DingTalkProperties.java similarity index 95% rename from dingtalk/ballcat-spring-boot-starter-dingtalk/src/main/java/com/hccake/starter/dingtalk/DingTalkProperties.java rename to dingtalk/ballcat-spring-boot-starter-dingtalk/src/main/java/org/ballcat/autoconfigure/dingtalk/DingTalkProperties.java index 017d202a3..0bade28c0 100644 --- a/dingtalk/ballcat-spring-boot-starter-dingtalk/src/main/java/com/hccake/starter/dingtalk/DingTalkProperties.java +++ b/dingtalk/ballcat-spring-boot-starter-dingtalk/src/main/java/org/ballcat/autoconfigure/dingtalk/DingTalkProperties.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.dingtalk; +package org.ballcat.autoconfigure.dingtalk; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/dingtalk/ballcat-spring-boot-starter-dingtalk/src/main/resources/META-INF/spring.factories b/dingtalk/ballcat-spring-boot-starter-dingtalk/src/main/resources/META-INF/spring.factories index c7c2b3b66..1e0deeb43 100644 --- a/dingtalk/ballcat-spring-boot-starter-dingtalk/src/main/resources/META-INF/spring.factories +++ b/dingtalk/ballcat-spring-boot-starter-dingtalk/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.hccake.starter.dingtalk.DingTalkAutoConfiguration \ No newline at end of file + org.ballcat.autoconfigure.dingtalk.DingTalkAutoConfiguration \ No newline at end of file diff --git a/dingtalk/ballcat-spring-boot-starter-dingtalk/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/dingtalk/ballcat-spring-boot-starter-dingtalk/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index ef260e8c1..e0c612668 100644 --- a/dingtalk/ballcat-spring-boot-starter-dingtalk/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/dingtalk/ballcat-spring-boot-starter-dingtalk/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.hccake.starter.dingtalk.DingTalkAutoConfiguration \ No newline at end of file +org.ballcat.autoconfigure.dingtalk.DingTalkAutoConfiguration \ No newline at end of file diff --git a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/ExcelHandlerConfiguration.java b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/ExcelHandlerConfiguration.java similarity index 83% rename from excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/ExcelHandlerConfiguration.java rename to excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/ExcelHandlerConfiguration.java index 53322406e..6f1fcf58d 100644 --- a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/ExcelHandlerConfiguration.java +++ b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/ExcelHandlerConfiguration.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.common.excel; +package org.ballcat.easyexcel; import com.alibaba.excel.converters.Converter; -import com.hccake.common.excel.aop.ResponseExcelReturnValueHandler; -import com.hccake.common.excel.config.ExcelConfigProperties; -import com.hccake.common.excel.enhance.DefaultWriterBuilderEnhancer; -import com.hccake.common.excel.enhance.WriterBuilderEnhancer; -import com.hccake.common.excel.handler.ManySheetWriteHandler; -import com.hccake.common.excel.handler.SheetWriteHandler; -import com.hccake.common.excel.handler.SingleSheetWriteHandler; -import com.hccake.common.excel.head.I18nHeaderCellWriteHandler; +import org.ballcat.easyexcel.aop.ResponseExcelReturnValueHandler; +import org.ballcat.easyexcel.config.ExcelConfigProperties; +import org.ballcat.easyexcel.enhance.DefaultWriterBuilderEnhancer; +import org.ballcat.easyexcel.enhance.WriterBuilderEnhancer; +import org.ballcat.easyexcel.handler.ManySheetWriteHandler; +import org.ballcat.easyexcel.handler.SheetWriteHandler; +import org.ballcat.easyexcel.handler.SingleSheetWriteHandler; +import org.ballcat.easyexcel.head.I18nHeaderCellWriteHandler; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.ObjectProvider; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; diff --git a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/ResponseExcelAutoConfiguration.java b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/ResponseExcelAutoConfiguration.java similarity index 88% rename from excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/ResponseExcelAutoConfiguration.java rename to excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/ResponseExcelAutoConfiguration.java index 23b4f15a6..663139137 100644 --- a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/ResponseExcelAutoConfiguration.java +++ b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/ResponseExcelAutoConfiguration.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.common.excel; +package org.ballcat.easyexcel; -import com.hccake.common.excel.aop.DynamicNameAspect; -import com.hccake.common.excel.aop.RequestExcelArgumentResolver; -import com.hccake.common.excel.aop.ResponseExcelReturnValueHandler; -import com.hccake.common.excel.config.ExcelConfigProperties; -import com.hccake.common.excel.head.EmptyHeadGenerator; -import com.hccake.common.excel.processor.NameProcessor; -import com.hccake.common.excel.processor.NameSpelExpressionProcessor; +import org.ballcat.easyexcel.aop.DynamicNameAspect; +import org.ballcat.easyexcel.aop.RequestExcelArgumentResolver; +import org.ballcat.easyexcel.aop.ResponseExcelReturnValueHandler; +import org.ballcat.easyexcel.config.ExcelConfigProperties; +import org.ballcat.easyexcel.head.EmptyHeadGenerator; +import org.ballcat.easyexcel.processor.NameProcessor; +import org.ballcat.easyexcel.processor.NameSpelExpressionProcessor; import lombok.RequiredArgsConstructor; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; diff --git a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/annotation/RequestExcel.java b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/annotation/RequestExcel.java similarity index 90% rename from excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/annotation/RequestExcel.java rename to excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/annotation/RequestExcel.java index d37e947ea..20a2cd93f 100644 --- a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/annotation/RequestExcel.java +++ b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/annotation/RequestExcel.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.common.excel.annotation; +package org.ballcat.easyexcel.annotation; import com.alibaba.excel.read.builder.AbstractExcelReaderParameterBuilder; -import com.hccake.common.excel.handler.DefaultAnalysisEventListener; -import com.hccake.common.excel.handler.ListAnalysisEventListener; +import org.ballcat.easyexcel.handler.DefaultAnalysisEventListener; +import org.ballcat.easyexcel.handler.ListAnalysisEventListener; import java.lang.annotation.*; diff --git a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/annotation/ResponseExcel.java b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/annotation/ResponseExcel.java similarity index 95% rename from excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/annotation/ResponseExcel.java rename to excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/annotation/ResponseExcel.java index 0b875e7ab..59fde8e38 100644 --- a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/annotation/ResponseExcel.java +++ b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/annotation/ResponseExcel.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.common.excel.annotation; +package org.ballcat.easyexcel.annotation; import com.alibaba.excel.converters.Converter; import com.alibaba.excel.support.ExcelTypeEnum; import com.alibaba.excel.write.handler.WriteHandler; -import com.hccake.common.excel.head.HeadGenerator; +import org.ballcat.easyexcel.head.HeadGenerator; import java.lang.annotation.*; diff --git a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/annotation/Sheet.java b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/annotation/Sheet.java similarity index 92% rename from excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/annotation/Sheet.java rename to excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/annotation/Sheet.java index 2d8da9249..d21e3bdf8 100644 --- a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/annotation/Sheet.java +++ b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/annotation/Sheet.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.common.excel.annotation; +package org.ballcat.easyexcel.annotation; -import com.hccake.common.excel.head.HeadGenerator; +import org.ballcat.easyexcel.head.HeadGenerator; import java.lang.annotation.*; diff --git a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/aop/DynamicNameAspect.java b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/aop/DynamicNameAspect.java similarity index 92% rename from excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/aop/DynamicNameAspect.java rename to excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/aop/DynamicNameAspect.java index c659a42a3..84065c6e8 100644 --- a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/aop/DynamicNameAspect.java +++ b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/aop/DynamicNameAspect.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.common.excel.aop; +package org.ballcat.easyexcel.aop; -import com.hccake.common.excel.annotation.ResponseExcel; -import com.hccake.common.excel.processor.NameProcessor; +import org.ballcat.easyexcel.annotation.ResponseExcel; +import org.ballcat.easyexcel.processor.NameProcessor; import lombok.RequiredArgsConstructor; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.annotation.Aspect; diff --git a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/aop/RequestExcelArgumentResolver.java b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/aop/RequestExcelArgumentResolver.java similarity index 93% rename from excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/aop/RequestExcelArgumentResolver.java rename to excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/aop/RequestExcelArgumentResolver.java index c5f6cd7e2..2f29e1618 100644 --- a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/aop/RequestExcelArgumentResolver.java +++ b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/aop/RequestExcelArgumentResolver.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.common.excel.aop; +package org.ballcat.easyexcel.aop; import com.alibaba.excel.EasyExcel; -import com.hccake.common.excel.annotation.RequestExcel; -import com.hccake.common.excel.converters.LocalDateStringConverter; -import com.hccake.common.excel.converters.LocalDateTimeStringConverter; -import com.hccake.common.excel.handler.ListAnalysisEventListener; +import org.ballcat.easyexcel.annotation.RequestExcel; +import org.ballcat.easyexcel.converters.LocalDateStringConverter; +import org.ballcat.easyexcel.converters.LocalDateTimeStringConverter; +import org.ballcat.easyexcel.handler.ListAnalysisEventListener; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; diff --git a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/aop/ResponseExcelReturnValueHandler.java b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/aop/ResponseExcelReturnValueHandler.java similarity index 94% rename from excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/aop/ResponseExcelReturnValueHandler.java rename to excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/aop/ResponseExcelReturnValueHandler.java index e1021e8e8..fa7c25173 100644 --- a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/aop/ResponseExcelReturnValueHandler.java +++ b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/aop/ResponseExcelReturnValueHandler.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.common.excel.aop; +package org.ballcat.easyexcel.aop; -import com.hccake.common.excel.annotation.ResponseExcel; -import com.hccake.common.excel.handler.SheetWriteHandler; +import org.ballcat.easyexcel.annotation.ResponseExcel; +import org.ballcat.easyexcel.handler.SheetWriteHandler; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.core.MethodParameter; diff --git a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/config/ExcelConfigProperties.java b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/config/ExcelConfigProperties.java similarity index 96% rename from excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/config/ExcelConfigProperties.java rename to excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/config/ExcelConfigProperties.java index 06d6c9394..90ee64ef6 100644 --- a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/config/ExcelConfigProperties.java +++ b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/config/ExcelConfigProperties.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.common.excel.config; +package org.ballcat.easyexcel.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/converters/LocalDateStringConverter.java b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/converters/LocalDateStringConverter.java similarity index 98% rename from excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/converters/LocalDateStringConverter.java rename to excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/converters/LocalDateStringConverter.java index 0be219e29..105d9890f 100644 --- a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/converters/LocalDateStringConverter.java +++ b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/converters/LocalDateStringConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.common.excel.converters; +package org.ballcat.easyexcel.converters; import com.alibaba.excel.converters.Converter; import com.alibaba.excel.enums.CellDataTypeEnum; diff --git a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/converters/LocalDateTimeStringConverter.java b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/converters/LocalDateTimeStringConverter.java similarity index 98% rename from excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/converters/LocalDateTimeStringConverter.java rename to excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/converters/LocalDateTimeStringConverter.java index 27f935c57..49cb6f718 100644 --- a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/converters/LocalDateTimeStringConverter.java +++ b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/converters/LocalDateTimeStringConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.common.excel.converters; +package org.ballcat.easyexcel.converters; import com.alibaba.excel.converters.Converter; import com.alibaba.excel.enums.CellDataTypeEnum; diff --git a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/domain/ErrorMessage.java b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/domain/ErrorMessage.java similarity index 96% rename from excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/domain/ErrorMessage.java rename to excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/domain/ErrorMessage.java index 5c4e86155..8c48bad6e 100644 --- a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/domain/ErrorMessage.java +++ b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/domain/ErrorMessage.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.common.excel.domain; +package org.ballcat.easyexcel.domain; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/domain/SheetBuildProperties.java b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/domain/SheetBuildProperties.java similarity index 91% rename from excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/domain/SheetBuildProperties.java rename to excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/domain/SheetBuildProperties.java index 16dec6703..f21629aeb 100644 --- a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/domain/SheetBuildProperties.java +++ b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/domain/SheetBuildProperties.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.common.excel.domain; +package org.ballcat.easyexcel.domain; -import com.hccake.common.excel.annotation.Sheet; -import com.hccake.common.excel.head.HeadGenerator; +import org.ballcat.easyexcel.annotation.Sheet; +import org.ballcat.easyexcel.head.HeadGenerator; import lombok.Data; /** diff --git a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/enhance/DefaultWriterBuilderEnhancer.java b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/enhance/DefaultWriterBuilderEnhancer.java similarity index 93% rename from excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/enhance/DefaultWriterBuilderEnhancer.java rename to excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/enhance/DefaultWriterBuilderEnhancer.java index 05e547825..9d9a9104c 100644 --- a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/enhance/DefaultWriterBuilderEnhancer.java +++ b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/enhance/DefaultWriterBuilderEnhancer.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.common.excel.enhance; +package org.ballcat.easyexcel.enhance; import com.alibaba.excel.write.builder.ExcelWriterBuilder; import com.alibaba.excel.write.builder.ExcelWriterSheetBuilder; -import com.hccake.common.excel.annotation.ResponseExcel; -import com.hccake.common.excel.head.HeadGenerator; +import org.ballcat.easyexcel.annotation.ResponseExcel; +import org.ballcat.easyexcel.head.HeadGenerator; import javax.servlet.http.HttpServletResponse; diff --git a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/enhance/WriterBuilderEnhancer.java b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/enhance/WriterBuilderEnhancer.java similarity index 92% rename from excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/enhance/WriterBuilderEnhancer.java rename to excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/enhance/WriterBuilderEnhancer.java index c6c4b6f0b..4ae6037d4 100644 --- a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/enhance/WriterBuilderEnhancer.java +++ b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/enhance/WriterBuilderEnhancer.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.common.excel.enhance; +package org.ballcat.easyexcel.enhance; import com.alibaba.excel.write.builder.ExcelWriterBuilder; import com.alibaba.excel.write.builder.ExcelWriterSheetBuilder; -import com.hccake.common.excel.annotation.ResponseExcel; -import com.hccake.common.excel.head.HeadGenerator; +import org.ballcat.easyexcel.annotation.ResponseExcel; +import org.ballcat.easyexcel.head.HeadGenerator; import javax.servlet.http.HttpServletResponse; diff --git a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/handler/AbstractSheetWriteHandler.java b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/handler/AbstractSheetWriteHandler.java similarity index 93% rename from excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/handler/AbstractSheetWriteHandler.java rename to excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/handler/AbstractSheetWriteHandler.java index 080e4f273..112b8c02d 100644 --- a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/handler/AbstractSheetWriteHandler.java +++ b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/handler/AbstractSheetWriteHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.common.excel.handler; +package org.ballcat.easyexcel.handler; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.ExcelWriter; @@ -22,18 +22,18 @@ import com.alibaba.excel.write.builder.ExcelWriterSheetBuilder; import com.alibaba.excel.write.handler.WriteHandler; import com.alibaba.excel.write.metadata.WriteSheet; -import com.hccake.common.excel.annotation.ResponseExcel; -import com.hccake.common.excel.aop.DynamicNameAspect; -import com.hccake.common.excel.config.ExcelConfigProperties; -import com.hccake.common.excel.converters.LocalDateStringConverter; -import com.hccake.common.excel.converters.LocalDateTimeStringConverter; - -import com.hccake.common.excel.domain.SheetBuildProperties; -import com.hccake.common.excel.enhance.WriterBuilderEnhancer; -import com.hccake.common.excel.head.HeadGenerator; -import com.hccake.common.excel.head.HeadMeta; -import com.hccake.common.excel.head.I18nHeaderCellWriteHandler; -import com.hccake.common.excel.kit.ExcelException; +import org.ballcat.easyexcel.annotation.ResponseExcel; +import org.ballcat.easyexcel.aop.DynamicNameAspect; +import org.ballcat.easyexcel.config.ExcelConfigProperties; +import org.ballcat.easyexcel.converters.LocalDateStringConverter; +import org.ballcat.easyexcel.converters.LocalDateTimeStringConverter; + +import org.ballcat.easyexcel.domain.SheetBuildProperties; +import org.ballcat.easyexcel.enhance.WriterBuilderEnhancer; +import org.ballcat.easyexcel.head.HeadGenerator; +import org.ballcat.easyexcel.head.HeadMeta; +import org.ballcat.easyexcel.head.I18nHeaderCellWriteHandler; +import org.ballcat.easyexcel.kit.ExcelException; import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.Setter; diff --git a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/handler/DefaultAnalysisEventListener.java b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/handler/DefaultAnalysisEventListener.java similarity index 93% rename from excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/handler/DefaultAnalysisEventListener.java rename to excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/handler/DefaultAnalysisEventListener.java index b6c3f4f24..4e0be6206 100644 --- a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/handler/DefaultAnalysisEventListener.java +++ b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/handler/DefaultAnalysisEventListener.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.common.excel.handler; +package org.ballcat.easyexcel.handler; import com.alibaba.excel.context.AnalysisContext; -import com.hccake.common.excel.kit.Validators; -import com.hccake.common.excel.domain.ErrorMessage; +import org.ballcat.easyexcel.kit.Validators; +import org.ballcat.easyexcel.domain.ErrorMessage; import lombok.Setter; import lombok.extern.slf4j.Slf4j; diff --git a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/handler/ListAnalysisEventListener.java b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/handler/ListAnalysisEventListener.java similarity index 91% rename from excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/handler/ListAnalysisEventListener.java rename to excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/handler/ListAnalysisEventListener.java index 9068deea9..0dbe16f3f 100644 --- a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/handler/ListAnalysisEventListener.java +++ b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/handler/ListAnalysisEventListener.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.common.excel.handler; +package org.ballcat.easyexcel.handler; import com.alibaba.excel.event.AnalysisEventListener; -import com.hccake.common.excel.domain.ErrorMessage; +import org.ballcat.easyexcel.domain.ErrorMessage; import java.util.List; diff --git a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/handler/ManySheetWriteHandler.java b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/handler/ManySheetWriteHandler.java similarity index 90% rename from excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/handler/ManySheetWriteHandler.java rename to excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/handler/ManySheetWriteHandler.java index fd7a9ac8e..d892daca1 100644 --- a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/handler/ManySheetWriteHandler.java +++ b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/handler/ManySheetWriteHandler.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.common.excel.handler; +package org.ballcat.easyexcel.handler; import com.alibaba.excel.ExcelWriter; import com.alibaba.excel.converters.Converter; import com.alibaba.excel.write.metadata.WriteSheet; -import com.hccake.common.excel.annotation.ResponseExcel; -import com.hccake.common.excel.annotation.Sheet; -import com.hccake.common.excel.config.ExcelConfigProperties; -import com.hccake.common.excel.domain.SheetBuildProperties; -import com.hccake.common.excel.enhance.WriterBuilderEnhancer; -import com.hccake.common.excel.kit.ExcelException; +import org.ballcat.easyexcel.annotation.ResponseExcel; +import org.ballcat.easyexcel.annotation.Sheet; +import org.ballcat.easyexcel.config.ExcelConfigProperties; +import org.ballcat.easyexcel.domain.SheetBuildProperties; +import org.ballcat.easyexcel.enhance.WriterBuilderEnhancer; +import org.ballcat.easyexcel.kit.ExcelException; import org.springframework.beans.factory.ObjectProvider; import javax.servlet.http.HttpServletResponse; diff --git a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/handler/SheetWriteHandler.java b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/handler/SheetWriteHandler.java similarity index 93% rename from excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/handler/SheetWriteHandler.java rename to excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/handler/SheetWriteHandler.java index 853c28cfb..29f6a560c 100644 --- a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/handler/SheetWriteHandler.java +++ b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/handler/SheetWriteHandler.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.common.excel.handler; +package org.ballcat.easyexcel.handler; -import com.hccake.common.excel.annotation.ResponseExcel; +import org.ballcat.easyexcel.annotation.ResponseExcel; import javax.servlet.http.HttpServletResponse; diff --git a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/handler/SingleSheetWriteHandler.java b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/handler/SingleSheetWriteHandler.java similarity index 87% rename from excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/handler/SingleSheetWriteHandler.java rename to excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/handler/SingleSheetWriteHandler.java index 9b480c699..12086d8d9 100644 --- a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/handler/SingleSheetWriteHandler.java +++ b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/handler/SingleSheetWriteHandler.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.common.excel.handler; +package org.ballcat.easyexcel.handler; import com.alibaba.excel.ExcelWriter; import com.alibaba.excel.converters.Converter; import com.alibaba.excel.write.metadata.WriteSheet; -import com.hccake.common.excel.annotation.ResponseExcel; -import com.hccake.common.excel.annotation.Sheet; -import com.hccake.common.excel.config.ExcelConfigProperties; -import com.hccake.common.excel.domain.SheetBuildProperties; -import com.hccake.common.excel.enhance.WriterBuilderEnhancer; -import com.hccake.common.excel.kit.ExcelException; +import org.ballcat.easyexcel.annotation.ResponseExcel; +import org.ballcat.easyexcel.annotation.Sheet; +import org.ballcat.easyexcel.config.ExcelConfigProperties; +import org.ballcat.easyexcel.domain.SheetBuildProperties; +import org.ballcat.easyexcel.enhance.WriterBuilderEnhancer; +import org.ballcat.easyexcel.kit.ExcelException; import org.springframework.beans.factory.ObjectProvider; import javax.servlet.http.HttpServletResponse; diff --git a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/head/EmptyHeadGenerator.java b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/head/EmptyHeadGenerator.java similarity index 95% rename from excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/head/EmptyHeadGenerator.java rename to excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/head/EmptyHeadGenerator.java index 06bc8dcd8..00bc89d87 100644 --- a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/head/EmptyHeadGenerator.java +++ b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/head/EmptyHeadGenerator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.common.excel.head; +package org.ballcat.easyexcel.head; /** * 空的 excel 头生成器，用来忽略 excel 头生成 diff --git a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/head/HeadGenerator.java b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/head/HeadGenerator.java similarity index 96% rename from excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/head/HeadGenerator.java rename to excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/head/HeadGenerator.java index ef8c3318f..9ee8d72ab 100644 --- a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/head/HeadGenerator.java +++ b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/head/HeadGenerator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.common.excel.head; +package org.ballcat.easyexcel.head; /** * Excel头生成器，用于自定义生成头部信息 diff --git a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/head/HeadMeta.java b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/head/HeadMeta.java similarity index 96% rename from excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/head/HeadMeta.java rename to excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/head/HeadMeta.java index 685f47fca..a5ff29296 100644 --- a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/head/HeadMeta.java +++ b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/head/HeadMeta.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.common.excel.head; +package org.ballcat.easyexcel.head; import lombok.Data; diff --git a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/head/I18nHeaderCellWriteHandler.java b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/head/I18nHeaderCellWriteHandler.java similarity index 98% rename from excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/head/I18nHeaderCellWriteHandler.java rename to excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/head/I18nHeaderCellWriteHandler.java index b5262fed9..db944435e 100644 --- a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/head/I18nHeaderCellWriteHandler.java +++ b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/head/I18nHeaderCellWriteHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.common.excel.head; +package org.ballcat.easyexcel.head; import com.alibaba.excel.metadata.Head; import com.alibaba.excel.write.handler.CellWriteHandler; diff --git a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/kit/ExcelException.java b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/kit/ExcelException.java similarity index 95% rename from excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/kit/ExcelException.java rename to excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/kit/ExcelException.java index 97c570971..c7882df6b 100644 --- a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/kit/ExcelException.java +++ b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/kit/ExcelException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.common.excel.kit; +package org.ballcat.easyexcel.kit; /** * @author lengleng 2020/3/31 diff --git a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/kit/Validators.java b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/kit/Validators.java similarity index 97% rename from excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/kit/Validators.java rename to excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/kit/Validators.java index 988cbbe00..bd070ccf0 100644 --- a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/kit/Validators.java +++ b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/kit/Validators.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.common.excel.kit; +package org.ballcat.easyexcel.kit; import javax.validation.*; import java.util.Set; diff --git a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/processor/NameProcessor.java b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/processor/NameProcessor.java similarity index 95% rename from excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/processor/NameProcessor.java rename to excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/processor/NameProcessor.java index c863905fb..a4ae58788 100644 --- a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/processor/NameProcessor.java +++ b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/processor/NameProcessor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.common.excel.processor; +package org.ballcat.easyexcel.processor; import java.lang.reflect.Method; diff --git a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/processor/NameSpelExpressionProcessor.java b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/processor/NameSpelExpressionProcessor.java similarity index 97% rename from excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/processor/NameSpelExpressionProcessor.java rename to excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/processor/NameSpelExpressionProcessor.java index 4c6e4d81d..44aad28e8 100644 --- a/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/com/hccake/common/excel/processor/NameSpelExpressionProcessor.java +++ b/excel/ballcat-spring-boot-starter-easyexcel/src/main/java/org/ballcat/easyexcel/processor/NameSpelExpressionProcessor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.common.excel.processor; +package org.ballcat.easyexcel.processor; import org.springframework.context.expression.MethodBasedEvaluationContext; import org.springframework.core.DefaultParameterNameDiscoverer; diff --git a/excel/ballcat-spring-boot-starter-easyexcel/src/main/resources/META-INF/spring.factories b/excel/ballcat-spring-boot-starter-easyexcel/src/main/resources/META-INF/spring.factories index cc4369072..901ee7d2e 100644 --- a/excel/ballcat-spring-boot-starter-easyexcel/src/main/resources/META-INF/spring.factories +++ b/excel/ballcat-spring-boot-starter-easyexcel/src/main/resources/META-INF/spring.factories @@ -1,3 +1,3 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.hccake.common.excel.ResponseExcelAutoConfiguration + org.ballcat.easyexcel.ResponseExcelAutoConfiguration diff --git a/excel/ballcat-spring-boot-starter-easyexcel/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/excel/ballcat-spring-boot-starter-easyexcel/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 817ee55c0..3bc7f4283 100644 --- a/excel/ballcat-spring-boot-starter-easyexcel/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/excel/ballcat-spring-boot-starter-easyexcel/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.hccake.common.excel.ResponseExcelAutoConfiguration \ No newline at end of file +org.ballcat.easyexcel.ResponseExcelAutoConfiguration \ No newline at end of file diff --git a/excel/ballcat-spring-boot-starter-easyexcel/src/test/java/hccake/ballcat/excel/application/DemoData.java b/excel/ballcat-spring-boot-starter-easyexcel/src/test/java/org/ballcat/easyexcel/application/DemoData.java similarity index 94% rename from excel/ballcat-spring-boot-starter-easyexcel/src/test/java/hccake/ballcat/excel/application/DemoData.java rename to excel/ballcat-spring-boot-starter-easyexcel/src/test/java/org/ballcat/easyexcel/application/DemoData.java index 8ea3b534b..d4183667f 100644 --- a/excel/ballcat-spring-boot-starter-easyexcel/src/test/java/hccake/ballcat/excel/application/DemoData.java +++ b/excel/ballcat-spring-boot-starter-easyexcel/src/test/java/org/ballcat/easyexcel/application/DemoData.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package hccake.ballcat.excel.application; +package org.ballcat.easyexcel.application; import lombok.Data; diff --git a/excel/ballcat-spring-boot-starter-easyexcel/src/test/java/hccake/ballcat/excel/application/ExcelExportTestController.java b/excel/ballcat-spring-boot-starter-easyexcel/src/test/java/org/ballcat/easyexcel/application/ExcelExportTestController.java similarity index 89% rename from excel/ballcat-spring-boot-starter-easyexcel/src/test/java/hccake/ballcat/excel/application/ExcelExportTestController.java rename to excel/ballcat-spring-boot-starter-easyexcel/src/test/java/org/ballcat/easyexcel/application/ExcelExportTestController.java index 037f67316..67e498a12 100644 --- a/excel/ballcat-spring-boot-starter-easyexcel/src/test/java/hccake/ballcat/excel/application/ExcelExportTestController.java +++ b/excel/ballcat-spring-boot-starter-easyexcel/src/test/java/org/ballcat/easyexcel/application/ExcelExportTestController.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package hccake.ballcat.excel.application; +package org.ballcat.easyexcel.application; -import com.hccake.common.excel.annotation.ResponseExcel; -import com.hccake.common.excel.annotation.Sheet; -import com.hccake.common.excel.head.EmptyHeadGenerator; +import org.ballcat.easyexcel.annotation.ResponseExcel; +import org.ballcat.easyexcel.annotation.Sheet; +import org.ballcat.easyexcel.head.EmptyHeadGenerator; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/excel/ballcat-spring-boot-starter-easyexcel/src/test/java/hccake/ballcat/excel/application/ExcelFillTestController.java b/excel/ballcat-spring-boot-starter-easyexcel/src/test/java/org/ballcat/easyexcel/application/ExcelFillTestController.java similarity index 93% rename from excel/ballcat-spring-boot-starter-easyexcel/src/test/java/hccake/ballcat/excel/application/ExcelFillTestController.java rename to excel/ballcat-spring-boot-starter-easyexcel/src/test/java/org/ballcat/easyexcel/application/ExcelFillTestController.java index 6795875c1..895705adc 100644 --- a/excel/ballcat-spring-boot-starter-easyexcel/src/test/java/hccake/ballcat/excel/application/ExcelFillTestController.java +++ b/excel/ballcat-spring-boot-starter-easyexcel/src/test/java/org/ballcat/easyexcel/application/ExcelFillTestController.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package hccake.ballcat.excel.application; +package org.ballcat.easyexcel.application; -import com.hccake.common.excel.annotation.ResponseExcel; +import org.ballcat.easyexcel.annotation.ResponseExcel; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/excel/ballcat-spring-boot-starter-easyexcel/src/test/java/hccake/ballcat/excel/application/ExcelImportTestController.java b/excel/ballcat-spring-boot-starter-easyexcel/src/test/java/org/ballcat/easyexcel/application/ExcelImportTestController.java similarity index 91% rename from excel/ballcat-spring-boot-starter-easyexcel/src/test/java/hccake/ballcat/excel/application/ExcelImportTestController.java rename to excel/ballcat-spring-boot-starter-easyexcel/src/test/java/org/ballcat/easyexcel/application/ExcelImportTestController.java index dceed46bc..951620347 100644 --- a/excel/ballcat-spring-boot-starter-easyexcel/src/test/java/hccake/ballcat/excel/application/ExcelImportTestController.java +++ b/excel/ballcat-spring-boot-starter-easyexcel/src/test/java/org/ballcat/easyexcel/application/ExcelImportTestController.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package hccake.ballcat.excel.application; +package org.ballcat.easyexcel.application; -import com.hccake.common.excel.annotation.RequestExcel; +import org.ballcat.easyexcel.annotation.RequestExcel; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/excel/ballcat-spring-boot-starter-easyexcel/src/test/java/hccake/ballcat/excel/application/ExcelTestApplication.java b/excel/ballcat-spring-boot-starter-easyexcel/src/test/java/org/ballcat/easyexcel/application/ExcelTestApplication.java similarity index 95% rename from excel/ballcat-spring-boot-starter-easyexcel/src/test/java/hccake/ballcat/excel/application/ExcelTestApplication.java rename to excel/ballcat-spring-boot-starter-easyexcel/src/test/java/org/ballcat/easyexcel/application/ExcelTestApplication.java index 31f9db59a..2ba64dc90 100644 --- a/excel/ballcat-spring-boot-starter-easyexcel/src/test/java/hccake/ballcat/excel/application/ExcelTestApplication.java +++ b/excel/ballcat-spring-boot-starter-easyexcel/src/test/java/org/ballcat/easyexcel/application/ExcelTestApplication.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package hccake.ballcat.excel.application; +package org.ballcat.easyexcel.application; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/excel/ballcat-spring-boot-starter-easyexcel/src/test/java/hccake/ballcat/excel/test/ExcelExportTest.java b/excel/ballcat-spring-boot-starter-easyexcel/src/test/java/org/ballcat/easyexcel/test/ExcelExportTest.java similarity index 90% rename from excel/ballcat-spring-boot-starter-easyexcel/src/test/java/hccake/ballcat/excel/test/ExcelExportTest.java rename to excel/ballcat-spring-boot-starter-easyexcel/src/test/java/org/ballcat/easyexcel/test/ExcelExportTest.java index 6746655f3..4fc1c182b 100644 --- a/excel/ballcat-spring-boot-starter-easyexcel/src/test/java/hccake/ballcat/excel/test/ExcelExportTest.java +++ b/excel/ballcat-spring-boot-starter-easyexcel/src/test/java/org/ballcat/easyexcel/test/ExcelExportTest.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package hccake.ballcat.excel.test; +package org.ballcat.easyexcel.test; import com.alibaba.excel.EasyExcel; -import com.hccake.common.excel.ResponseExcelAutoConfiguration; -import com.hccake.common.excel.handler.DefaultAnalysisEventListener; -import hccake.ballcat.excel.application.DemoData; -import hccake.ballcat.excel.application.ExcelExportTestController; -import hccake.ballcat.excel.application.ExcelTestApplication; +import org.ballcat.easyexcel.ResponseExcelAutoConfiguration; +import org.ballcat.easyexcel.application.DemoData; +import org.ballcat.easyexcel.application.ExcelExportTestController; +import org.ballcat.easyexcel.application.ExcelTestApplication; +import org.ballcat.easyexcel.handler.DefaultAnalysisEventListener; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/excel/ballcat-spring-boot-starter-easyexcel/src/test/java/hccake/ballcat/excel/test/ExcelFillTest.java b/excel/ballcat-spring-boot-starter-easyexcel/src/test/java/org/ballcat/easyexcel/test/ExcelFillTest.java similarity index 87% rename from excel/ballcat-spring-boot-starter-easyexcel/src/test/java/hccake/ballcat/excel/test/ExcelFillTest.java rename to excel/ballcat-spring-boot-starter-easyexcel/src/test/java/org/ballcat/easyexcel/test/ExcelFillTest.java index 70eef508e..9e9d70638 100644 --- a/excel/ballcat-spring-boot-starter-easyexcel/src/test/java/hccake/ballcat/excel/test/ExcelFillTest.java +++ b/excel/ballcat-spring-boot-starter-easyexcel/src/test/java/org/ballcat/easyexcel/test/ExcelFillTest.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package hccake.ballcat.excel.test; +package org.ballcat.easyexcel.test; import com.alibaba.excel.EasyExcel; -import com.hccake.common.excel.ResponseExcelAutoConfiguration; -import com.hccake.common.excel.handler.DefaultAnalysisEventListener; -import hccake.ballcat.excel.application.DemoData; -import hccake.ballcat.excel.application.ExcelFillTestController; -import hccake.ballcat.excel.application.ExcelTestApplication; +import org.ballcat.easyexcel.ResponseExcelAutoConfiguration; +import org.ballcat.easyexcel.application.DemoData; +import org.ballcat.easyexcel.application.ExcelFillTestController; +import org.ballcat.easyexcel.application.ExcelTestApplication; +import org.ballcat.easyexcel.handler.DefaultAnalysisEventListener; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/excel/ballcat-spring-boot-starter-easyexcel/src/test/java/hccake/ballcat/excel/test/ExcelImportTest.java b/excel/ballcat-spring-boot-starter-easyexcel/src/test/java/org/ballcat/easyexcel/test/ExcelImportTest.java similarity index 95% rename from excel/ballcat-spring-boot-starter-easyexcel/src/test/java/hccake/ballcat/excel/test/ExcelImportTest.java rename to excel/ballcat-spring-boot-starter-easyexcel/src/test/java/org/ballcat/easyexcel/test/ExcelImportTest.java index cf3d5fe71..86fdacf77 100644 --- a/excel/ballcat-spring-boot-starter-easyexcel/src/test/java/hccake/ballcat/excel/test/ExcelImportTest.java +++ b/excel/ballcat-spring-boot-starter-easyexcel/src/test/java/org/ballcat/easyexcel/test/ExcelImportTest.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package hccake.ballcat.excel.test; +package org.ballcat.easyexcel.test; import com.alibaba.excel.EasyExcel; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import hccake.ballcat.excel.application.DemoData; -import hccake.ballcat.excel.application.ExcelTestApplication; +import org.ballcat.easyexcel.application.DemoData; +import org.ballcat.easyexcel.application.ExcelTestApplication; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/file/ballcat-spring-boot-starter-file/src/main/java/com/hccake/starter/file/FileAutoConfiguration.java b/file/ballcat-spring-boot-starter-file/src/main/java/org/ballcat/file/FileAutoConfiguration.java similarity index 81% rename from file/ballcat-spring-boot-starter-file/src/main/java/com/hccake/starter/file/FileAutoConfiguration.java rename to file/ballcat-spring-boot-starter-file/src/main/java/org/ballcat/file/FileAutoConfiguration.java index 6626be693..3119dc82f 100644 --- a/file/ballcat-spring-boot-starter-file/src/main/java/com/hccake/starter/file/FileAutoConfiguration.java +++ b/file/ballcat-spring-boot-starter-file/src/main/java/org/ballcat/file/FileAutoConfiguration.java @@ -13,12 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.file; +package org.ballcat.file; -import com.hccake.starter.file.FileProperties.LocalProperties; -import com.hccake.starter.file.core.FileClient; -import com.hccake.starter.file.ftp.FtpFileClient; -import com.hccake.starter.file.local.LocalFileClient; +import org.ballcat.file.core.FileClient; +import org.ballcat.file.ftp.FtpFileClient; +import org.ballcat.file.local.LocalFileClient; import lombok.AllArgsConstructor; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; @@ -47,8 +46,8 @@ public FileClient ballcatFileFtpClient(FileProperties properties) { @Bean @ConditionalOnMissingBean(FileClient.class) public FileClient ballcatFileLocalClient(FileProperties properties) throws IOException { - LocalProperties localProperties = properties == null || properties.getLocal() == null ? new LocalProperties() - : properties.getLocal(); + FileProperties.LocalProperties localProperties = properties == null || properties.getLocal() == null + ? new FileProperties.LocalProperties() : properties.getLocal(); return new LocalFileClient(localProperties); } diff --git a/file/ballcat-spring-boot-starter-file/src/main/java/com/hccake/starter/file/FileProperties.java b/file/ballcat-spring-boot-starter-file/src/main/java/org/ballcat/file/FileProperties.java similarity index 95% rename from file/ballcat-spring-boot-starter-file/src/main/java/com/hccake/starter/file/FileProperties.java rename to file/ballcat-spring-boot-starter-file/src/main/java/org/ballcat/file/FileProperties.java index ef3522932..6c24d5ce7 100644 --- a/file/ballcat-spring-boot-starter-file/src/main/java/com/hccake/starter/file/FileProperties.java +++ b/file/ballcat-spring-boot-starter-file/src/main/java/org/ballcat/file/FileProperties.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.file; +package org.ballcat.file; -import com.hccake.starter.file.ftp.FtpMode; +import org.ballcat.file.ftp.FtpMode; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/file/ballcat-spring-boot-starter-file/src/main/java/com/hccake/starter/file/core/AbstractFileClient.java b/file/ballcat-spring-boot-starter-file/src/main/java/org/ballcat/file/core/AbstractFileClient.java similarity index 96% rename from file/ballcat-spring-boot-starter-file/src/main/java/com/hccake/starter/file/core/AbstractFileClient.java rename to file/ballcat-spring-boot-starter-file/src/main/java/org/ballcat/file/core/AbstractFileClient.java index 6d2d066dc..bcb8ca3f6 100644 --- a/file/ballcat-spring-boot-starter-file/src/main/java/com/hccake/starter/file/core/AbstractFileClient.java +++ b/file/ballcat-spring-boot-starter-file/src/main/java/org/ballcat/file/core/AbstractFileClient.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.file.core; +package org.ballcat.file.core; /** * @author 疯狂的狮子Li 2022-04-24 diff --git a/file/ballcat-spring-boot-starter-file/src/main/java/com/hccake/starter/file/core/FileClient.java b/file/ballcat-spring-boot-starter-file/src/main/java/org/ballcat/file/core/FileClient.java similarity index 97% rename from file/ballcat-spring-boot-starter-file/src/main/java/com/hccake/starter/file/core/FileClient.java rename to file/ballcat-spring-boot-starter-file/src/main/java/org/ballcat/file/core/FileClient.java index 19748f365..f1ffadd2a 100644 --- a/file/ballcat-spring-boot-starter-file/src/main/java/com/hccake/starter/file/core/FileClient.java +++ b/file/ballcat-spring-boot-starter-file/src/main/java/org/ballcat/file/core/FileClient.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.file.core; +package org.ballcat.file.core; import java.io.File; import java.io.IOException; diff --git a/file/ballcat-spring-boot-starter-file/src/main/java/com/hccake/starter/file/exception/FileException.java b/file/ballcat-spring-boot-starter-file/src/main/java/org/ballcat/file/exception/FileException.java similarity index 95% rename from file/ballcat-spring-boot-starter-file/src/main/java/com/hccake/starter/file/exception/FileException.java rename to file/ballcat-spring-boot-starter-file/src/main/java/org/ballcat/file/exception/FileException.java index dc41f48a5..86a27782c 100644 --- a/file/ballcat-spring-boot-starter-file/src/main/java/com/hccake/starter/file/exception/FileException.java +++ b/file/ballcat-spring-boot-starter-file/src/main/java/org/ballcat/file/exception/FileException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.file.exception; +package org.ballcat.file.exception; import java.io.IOException; diff --git a/file/ballcat-spring-boot-starter-file/src/main/java/com/hccake/starter/file/ftp/FtpFileClient.java b/file/ballcat-spring-boot-starter-file/src/main/java/org/ballcat/file/ftp/FtpFileClient.java similarity index 94% rename from file/ballcat-spring-boot-starter-file/src/main/java/com/hccake/starter/file/ftp/FtpFileClient.java rename to file/ballcat-spring-boot-starter-file/src/main/java/org/ballcat/file/ftp/FtpFileClient.java index 3f5f5de6b..0e91b0bf4 100644 --- a/file/ballcat-spring-boot-starter-file/src/main/java/com/hccake/starter/file/ftp/FtpFileClient.java +++ b/file/ballcat-spring-boot-starter-file/src/main/java/org/ballcat/file/ftp/FtpFileClient.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.file.ftp; +package org.ballcat.file.ftp; import cn.hutool.core.io.FileUtil; import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.extra.ftp.Ftp; import cn.hutool.extra.ftp.FtpConfig; -import com.hccake.starter.file.FileProperties.FtpProperties; -import com.hccake.starter.file.core.AbstractFileClient; -import com.hccake.starter.file.exception.FileException; +import org.ballcat.file.FileProperties.FtpProperties; +import org.ballcat.file.core.AbstractFileClient; +import org.ballcat.file.exception.FileException; import org.springframework.util.StringUtils; import java.io.File; diff --git a/file/ballcat-spring-boot-starter-file/src/main/java/com/hccake/starter/file/ftp/FtpMode.java b/file/ballcat-spring-boot-starter-file/src/main/java/org/ballcat/file/ftp/FtpMode.java similarity index 95% rename from file/ballcat-spring-boot-starter-file/src/main/java/com/hccake/starter/file/ftp/FtpMode.java rename to file/ballcat-spring-boot-starter-file/src/main/java/org/ballcat/file/ftp/FtpMode.java index a3e7fbd6e..d329e0c4b 100644 --- a/file/ballcat-spring-boot-starter-file/src/main/java/com/hccake/starter/file/ftp/FtpMode.java +++ b/file/ballcat-spring-boot-starter-file/src/main/java/org/ballcat/file/ftp/FtpMode.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.file.ftp; +package org.ballcat.file.ftp; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/file/ballcat-spring-boot-starter-file/src/main/java/com/hccake/starter/file/local/LocalFileClient.java b/file/ballcat-spring-boot-starter-file/src/main/java/org/ballcat/file/local/LocalFileClient.java similarity index 91% rename from file/ballcat-spring-boot-starter-file/src/main/java/com/hccake/starter/file/local/LocalFileClient.java rename to file/ballcat-spring-boot-starter-file/src/main/java/org/ballcat/file/local/LocalFileClient.java index b7428d0e0..0582d238d 100644 --- a/file/ballcat-spring-boot-starter-file/src/main/java/com/hccake/starter/file/local/LocalFileClient.java +++ b/file/ballcat-spring-boot-starter-file/src/main/java/org/ballcat/file/local/LocalFileClient.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.file.local; +package org.ballcat.file.local; import cn.hutool.core.io.FileUtil; -import com.hccake.ballcat.common.util.StreamUtils; -import com.hccake.starter.file.core.AbstractFileClient; -import com.hccake.starter.file.exception.FileException; -import com.hccake.starter.file.FileProperties.LocalProperties; +import org.ballcat.common.util.StreamUtils; +import org.ballcat.file.core.AbstractFileClient; +import org.ballcat.file.exception.FileException; +import org.ballcat.file.FileProperties.LocalProperties; import org.springframework.util.StringUtils; import java.io.File; diff --git a/file/ballcat-spring-boot-starter-file/src/main/resources/META-INF/spring.factories b/file/ballcat-spring-boot-starter-file/src/main/resources/META-INF/spring.factories index 13f98c74a..6d75b28a5 100644 --- a/file/ballcat-spring-boot-starter-file/src/main/resources/META-INF/spring.factories +++ b/file/ballcat-spring-boot-starter-file/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.hccake.starter.file.FileAutoConfiguration \ No newline at end of file + org.ballcat.file.FileAutoConfiguration \ No newline at end of file diff --git a/file/ballcat-spring-boot-starter-file/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/file/ballcat-spring-boot-starter-file/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 4557439b3..66cadf2cf 100644 --- a/file/ballcat-spring-boot-starter-file/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/file/ballcat-spring-boot-starter-file/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.hccake.starter.file.FileAutoConfiguration \ No newline at end of file +org.ballcat.file.FileAutoConfiguration \ No newline at end of file diff --git a/file/ballcat-spring-boot-starter-file/src/test/java/com/hccake/starter/file/FtpFileClientTest.java b/file/ballcat-spring-boot-starter-file/src/test/java/org/ballcat/file/FtpFileClientTest.java similarity index 94% rename from file/ballcat-spring-boot-starter-file/src/test/java/com/hccake/starter/file/FtpFileClientTest.java rename to file/ballcat-spring-boot-starter-file/src/test/java/org/ballcat/file/FtpFileClientTest.java index c2bcb4899..df40d726f 100644 --- a/file/ballcat-spring-boot-starter-file/src/test/java/com/hccake/starter/file/FtpFileClientTest.java +++ b/file/ballcat-spring-boot-starter-file/src/test/java/org/ballcat/file/FtpFileClientTest.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.file; +package org.ballcat.file; import cn.hutool.extra.ftp.SimpleFtpServer; -import com.hccake.ballcat.common.util.StreamUtils; -import com.hccake.starter.file.FileProperties.FtpProperties; -import com.hccake.starter.file.ftp.FtpFileClient; +import org.ballcat.common.util.StreamUtils; +import org.ballcat.file.FileProperties.FtpProperties; +import org.ballcat.file.ftp.FtpFileClient; import org.apache.ftpserver.ftplet.Authority; import org.apache.ftpserver.usermanager.impl.BaseUser; import org.apache.ftpserver.usermanager.impl.WritePermission; diff --git a/file/ballcat-spring-boot-starter-file/src/test/java/com/hccake/starter/file/LocalFileClientTest.java b/file/ballcat-spring-boot-starter-file/src/test/java/org/ballcat/file/LocalFileClientTest.java similarity index 94% rename from file/ballcat-spring-boot-starter-file/src/test/java/com/hccake/starter/file/LocalFileClientTest.java rename to file/ballcat-spring-boot-starter-file/src/test/java/org/ballcat/file/LocalFileClientTest.java index d3948657a..5760424f4 100644 --- a/file/ballcat-spring-boot-starter-file/src/test/java/com/hccake/starter/file/LocalFileClientTest.java +++ b/file/ballcat-spring-boot-starter-file/src/test/java/org/ballcat/file/LocalFileClientTest.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.file; +package org.ballcat.file; -import com.hccake.ballcat.common.util.StreamUtils; -import com.hccake.starter.file.local.LocalFileClient; +import org.ballcat.common.util.StreamUtils; +import org.ballcat.file.local.LocalFileClient; import org.junit.jupiter.api.*; import java.io.File; diff --git a/grpc/ballcat-spring-boot-starter-grpc/src/main/java/com/hccake/starter/grpc/GrpcClient.java b/grpc/ballcat-spring-boot-starter-grpc/src/main/java/org/ballcat/grpc/GrpcClient.java similarity index 94% rename from grpc/ballcat-spring-boot-starter-grpc/src/main/java/com/hccake/starter/grpc/GrpcClient.java rename to grpc/ballcat-spring-boot-starter-grpc/src/main/java/org/ballcat/grpc/GrpcClient.java index e4ebf0762..afa152876 100644 --- a/grpc/ballcat-spring-boot-starter-grpc/src/main/java/com/hccake/starter/grpc/GrpcClient.java +++ b/grpc/ballcat-spring-boot-starter-grpc/src/main/java/org/ballcat/grpc/GrpcClient.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.grpc; +package org.ballcat.grpc; import io.grpc.ManagedChannel; import io.grpc.stub.AbstractAsyncStub; import io.grpc.stub.AbstractBlockingStub; import io.grpc.stub.AbstractFutureStub; -import com.hccake.starter.grpc.properties.GrpcClientProperties; +import org.ballcat.grpc.properties.GrpcClientProperties; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/grpc/ballcat-spring-boot-starter-grpc/src/main/java/com/hccake/starter/grpc/GrpcClientChannel.java b/grpc/ballcat-spring-boot-starter-grpc/src/main/java/org/ballcat/grpc/GrpcClientChannel.java similarity index 96% rename from grpc/ballcat-spring-boot-starter-grpc/src/main/java/com/hccake/starter/grpc/GrpcClientChannel.java rename to grpc/ballcat-spring-boot-starter-grpc/src/main/java/org/ballcat/grpc/GrpcClientChannel.java index c8512f44b..6ba3cbc57 100644 --- a/grpc/ballcat-spring-boot-starter-grpc/src/main/java/com/hccake/starter/grpc/GrpcClientChannel.java +++ b/grpc/ballcat-spring-boot-starter-grpc/src/main/java/org/ballcat/grpc/GrpcClientChannel.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.grpc; +package org.ballcat.grpc; import io.grpc.Channel; import io.grpc.ManagedChannel; @@ -21,7 +21,7 @@ import io.grpc.stub.AbstractAsyncStub; import io.grpc.stub.AbstractBlockingStub; import io.grpc.stub.AbstractFutureStub; -import com.hccake.starter.grpc.properties.GrpcClientProperties; +import org.ballcat.grpc.properties.GrpcClientProperties; import org.springframework.beans.factory.DisposableBean; import java.util.concurrent.TimeUnit; diff --git a/grpc/ballcat-spring-boot-starter-grpc/src/main/java/com/hccake/starter/grpc/GrpcServer.java b/grpc/ballcat-spring-boot-starter-grpc/src/main/java/org/ballcat/grpc/GrpcServer.java similarity index 91% rename from grpc/ballcat-spring-boot-starter-grpc/src/main/java/com/hccake/starter/grpc/GrpcServer.java rename to grpc/ballcat-spring-boot-starter-grpc/src/main/java/org/ballcat/grpc/GrpcServer.java index 31b33d90a..40c1233d4 100644 --- a/grpc/ballcat-spring-boot-starter-grpc/src/main/java/com/hccake/starter/grpc/GrpcServer.java +++ b/grpc/ballcat-spring-boot-starter-grpc/src/main/java/org/ballcat/grpc/GrpcServer.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.grpc; +package org.ballcat.grpc; -import com.hccake.ballcat.common.core.compose.ContextComponent; -import com.hccake.ballcat.common.thread.ThreadPool; +import org.ballcat.common.core.compose.ContextComponent; +import org.ballcat.common.thread.ThreadPool; import io.grpc.Server; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; diff --git a/grpc/ballcat-spring-boot-starter-grpc/src/main/java/com/hccake/starter/grpc/annotation/EnableGrpcServer.java b/grpc/ballcat-spring-boot-starter-grpc/src/main/java/org/ballcat/grpc/annotation/EnableGrpcServer.java similarity index 88% rename from grpc/ballcat-spring-boot-starter-grpc/src/main/java/com/hccake/starter/grpc/annotation/EnableGrpcServer.java rename to grpc/ballcat-spring-boot-starter-grpc/src/main/java/org/ballcat/grpc/annotation/EnableGrpcServer.java index ce6b8875b..e2205f2b1 100644 --- a/grpc/ballcat-spring-boot-starter-grpc/src/main/java/com/hccake/starter/grpc/annotation/EnableGrpcServer.java +++ b/grpc/ballcat-spring-boot-starter-grpc/src/main/java/org/ballcat/grpc/annotation/EnableGrpcServer.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.grpc.annotation; +package org.ballcat.grpc.annotation; -import com.hccake.starter.grpc.configuration.GrpcServerConfiguration; +import org.ballcat.grpc.configuration.GrpcServerConfiguration; import org.springframework.context.annotation.Import; import java.lang.annotation.*; diff --git a/grpc/ballcat-spring-boot-starter-grpc/src/main/java/com/hccake/starter/grpc/configuration/GrpcClientAutoConfiguration.java b/grpc/ballcat-spring-boot-starter-grpc/src/main/java/org/ballcat/grpc/configuration/GrpcClientAutoConfiguration.java similarity index 88% rename from grpc/ballcat-spring-boot-starter-grpc/src/main/java/com/hccake/starter/grpc/configuration/GrpcClientAutoConfiguration.java rename to grpc/ballcat-spring-boot-starter-grpc/src/main/java/org/ballcat/grpc/configuration/GrpcClientAutoConfiguration.java index cbc7682ee..39003e62b 100644 --- a/grpc/ballcat-spring-boot-starter-grpc/src/main/java/com/hccake/starter/grpc/configuration/GrpcClientAutoConfiguration.java +++ b/grpc/ballcat-spring-boot-starter-grpc/src/main/java/org/ballcat/grpc/configuration/GrpcClientAutoConfiguration.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.grpc.configuration; +package org.ballcat.grpc.configuration; -import com.hccake.starter.grpc.GrpcClientChannel; -import com.hccake.starter.grpc.interceptor.TraceIdInterceptor; -import com.hccake.starter.grpc.properties.GrpcClientProperties; +import org.ballcat.grpc.GrpcClientChannel; +import org.ballcat.grpc.interceptor.TraceIdInterceptor; +import org.ballcat.grpc.properties.GrpcClientProperties; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/grpc/ballcat-spring-boot-starter-grpc/src/main/java/com/hccake/starter/grpc/configuration/GrpcServerConfiguration.java b/grpc/ballcat-spring-boot-starter-grpc/src/main/java/org/ballcat/grpc/configuration/GrpcServerConfiguration.java similarity index 93% rename from grpc/ballcat-spring-boot-starter-grpc/src/main/java/com/hccake/starter/grpc/configuration/GrpcServerConfiguration.java rename to grpc/ballcat-spring-boot-starter-grpc/src/main/java/org/ballcat/grpc/configuration/GrpcServerConfiguration.java index 98f703e76..774dccb39 100644 --- a/grpc/ballcat-spring-boot-starter-grpc/src/main/java/com/hccake/starter/grpc/configuration/GrpcServerConfiguration.java +++ b/grpc/ballcat-spring-boot-starter-grpc/src/main/java/org/ballcat/grpc/configuration/GrpcServerConfiguration.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.grpc.configuration; +package org.ballcat.grpc.configuration; import io.grpc.BindableService; import io.grpc.ServerBuilder; import io.grpc.ServerInterceptor; -import com.hccake.starter.grpc.GrpcServer; -import com.hccake.starter.grpc.properties.GrpcServerProperties; +import org.ballcat.grpc.GrpcServer; +import org.ballcat.grpc.properties.GrpcServerProperties; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; diff --git a/grpc/ballcat-spring-boot-starter-grpc/src/main/java/com/hccake/starter/grpc/constant/GrpcConstants.java b/grpc/ballcat-spring-boot-starter-grpc/src/main/java/org/ballcat/grpc/constant/GrpcConstants.java similarity index 95% rename from grpc/ballcat-spring-boot-starter-grpc/src/main/java/com/hccake/starter/grpc/constant/GrpcConstants.java rename to grpc/ballcat-spring-boot-starter-grpc/src/main/java/org/ballcat/grpc/constant/GrpcConstants.java index 4d8da0fc6..59417e54b 100644 --- a/grpc/ballcat-spring-boot-starter-grpc/src/main/java/com/hccake/starter/grpc/constant/GrpcConstants.java +++ b/grpc/ballcat-spring-boot-starter-grpc/src/main/java/org/ballcat/grpc/constant/GrpcConstants.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.grpc.constant; +package org.ballcat.grpc.constant; import lombok.experimental.UtilityClass; import org.springframework.core.Ordered; diff --git a/grpc/ballcat-spring-boot-starter-grpc/src/main/java/com/hccake/starter/grpc/enums/GrpcLogType.java b/grpc/ballcat-spring-boot-starter-grpc/src/main/java/org/ballcat/grpc/enums/GrpcLogType.java similarity index 95% rename from grpc/ballcat-spring-boot-starter-grpc/src/main/java/com/hccake/starter/grpc/enums/GrpcLogType.java rename to grpc/ballcat-spring-boot-starter-grpc/src/main/java/org/ballcat/grpc/enums/GrpcLogType.java index 960ee3b9f..fad6fe822 100644 --- a/grpc/ballcat-spring-boot-starter-grpc/src/main/java/com/hccake/starter/grpc/enums/GrpcLogType.java +++ b/grpc/ballcat-spring-boot-starter-grpc/src/main/java/org/ballcat/grpc/enums/GrpcLogType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.grpc.enums; +package org.ballcat.grpc.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/grpc/ballcat-spring-boot-starter-grpc/src/main/java/com/hccake/starter/grpc/interceptor/CrossInterceptor.java b/grpc/ballcat-spring-boot-starter-grpc/src/main/java/org/ballcat/grpc/interceptor/CrossInterceptor.java similarity index 93% rename from grpc/ballcat-spring-boot-starter-grpc/src/main/java/com/hccake/starter/grpc/interceptor/CrossInterceptor.java rename to grpc/ballcat-spring-boot-starter-grpc/src/main/java/org/ballcat/grpc/interceptor/CrossInterceptor.java index 046010508..507221f82 100644 --- a/grpc/ballcat-spring-boot-starter-grpc/src/main/java/com/hccake/starter/grpc/interceptor/CrossInterceptor.java +++ b/grpc/ballcat-spring-boot-starter-grpc/src/main/java/org/ballcat/grpc/interceptor/CrossInterceptor.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.grpc.interceptor; +package org.ballcat.grpc.interceptor; import io.grpc.*; -import com.hccake.starter.grpc.constant.GrpcConstants; +import org.ballcat.grpc.constant.GrpcConstants; import lombok.extern.slf4j.Slf4j; import org.springframework.core.annotation.Order; diff --git a/grpc/ballcat-spring-boot-starter-grpc/src/main/java/com/hccake/starter/grpc/interceptor/LogInterceptor.java b/grpc/ballcat-spring-boot-starter-grpc/src/main/java/org/ballcat/grpc/interceptor/LogInterceptor.java similarity index 92% rename from grpc/ballcat-spring-boot-starter-grpc/src/main/java/com/hccake/starter/grpc/interceptor/LogInterceptor.java rename to grpc/ballcat-spring-boot-starter-grpc/src/main/java/org/ballcat/grpc/interceptor/LogInterceptor.java index c54342614..b9964a6d2 100644 --- a/grpc/ballcat-spring-boot-starter-grpc/src/main/java/com/hccake/starter/grpc/interceptor/LogInterceptor.java +++ b/grpc/ballcat-spring-boot-starter-grpc/src/main/java/org/ballcat/grpc/interceptor/LogInterceptor.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.grpc.interceptor; +package org.ballcat.grpc.interceptor; import cn.hutool.core.convert.Convert; -import com.hccake.ballcat.common.system.StopWatch; +import org.ballcat.common.system.StopWatch; import io.grpc.*; -import com.hccake.starter.grpc.enums.GrpcLogType; -import com.hccake.starter.grpc.log.GrpcLog; -import com.hccake.starter.grpc.log.GrpcLogHandler; +import org.ballcat.grpc.enums.GrpcLogType; +import org.ballcat.grpc.log.GrpcLog; +import org.ballcat.grpc.log.GrpcLogHandler; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.core.annotation.Order; diff --git a/grpc/ballcat-spring-boot-starter-grpc/src/main/java/com/hccake/starter/grpc/interceptor/TraceIdInterceptor.java b/grpc/ballcat-spring-boot-starter-grpc/src/main/java/org/ballcat/grpc/interceptor/TraceIdInterceptor.java similarity index 94% rename from grpc/ballcat-spring-boot-starter-grpc/src/main/java/com/hccake/starter/grpc/interceptor/TraceIdInterceptor.java rename to grpc/ballcat-spring-boot-starter-grpc/src/main/java/org/ballcat/grpc/interceptor/TraceIdInterceptor.java index 2f50e692f..371913b83 100644 --- a/grpc/ballcat-spring-boot-starter-grpc/src/main/java/com/hccake/starter/grpc/interceptor/TraceIdInterceptor.java +++ b/grpc/ballcat-spring-boot-starter-grpc/src/main/java/org/ballcat/grpc/interceptor/TraceIdInterceptor.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.grpc.interceptor; +package org.ballcat.grpc.interceptor; import cn.hutool.core.util.IdUtil; -import com.hccake.starter.grpc.constant.GrpcConstants; +import org.ballcat.grpc.constant.GrpcConstants; import io.grpc.Metadata; import io.grpc.ServerCall; import io.grpc.ServerCallHandler; diff --git a/grpc/ballcat-spring-boot-starter-grpc/src/main/java/com/hccake/starter/grpc/log/DefaultGrpcLogHandler.java b/grpc/ballcat-spring-boot-starter-grpc/src/main/java/org/ballcat/grpc/log/DefaultGrpcLogHandler.java similarity index 93% rename from grpc/ballcat-spring-boot-starter-grpc/src/main/java/com/hccake/starter/grpc/log/DefaultGrpcLogHandler.java rename to grpc/ballcat-spring-boot-starter-grpc/src/main/java/org/ballcat/grpc/log/DefaultGrpcLogHandler.java index a8890170a..435c54dfc 100644 --- a/grpc/ballcat-spring-boot-starter-grpc/src/main/java/com/hccake/starter/grpc/log/DefaultGrpcLogHandler.java +++ b/grpc/ballcat-spring-boot-starter-grpc/src/main/java/org/ballcat/grpc/log/DefaultGrpcLogHandler.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.grpc.log; +package org.ballcat.grpc.log; -import com.hccake.starter.grpc.enums.GrpcLogType; +import org.ballcat.grpc.enums.GrpcLogType; import lombok.extern.slf4j.Slf4j; /** diff --git a/grpc/ballcat-spring-boot-starter-grpc/src/main/java/com/hccake/starter/grpc/log/GrpcLog.java b/grpc/ballcat-spring-boot-starter-grpc/src/main/java/org/ballcat/grpc/log/GrpcLog.java similarity index 92% rename from grpc/ballcat-spring-boot-starter-grpc/src/main/java/com/hccake/starter/grpc/log/GrpcLog.java rename to grpc/ballcat-spring-boot-starter-grpc/src/main/java/org/ballcat/grpc/log/GrpcLog.java index a44353056..51e7ce77f 100644 --- a/grpc/ballcat-spring-boot-starter-grpc/src/main/java/com/hccake/starter/grpc/log/GrpcLog.java +++ b/grpc/ballcat-spring-boot-starter-grpc/src/main/java/org/ballcat/grpc/log/GrpcLog.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.grpc.log; +package org.ballcat.grpc.log; -import com.hccake.starter.grpc.enums.GrpcLogType; +import org.ballcat.grpc.enums.GrpcLogType; import lombok.Data; /** diff --git a/grpc/ballcat-spring-boot-starter-grpc/src/main/java/com/hccake/starter/grpc/log/GrpcLogHandler.java b/grpc/ballcat-spring-boot-starter-grpc/src/main/java/org/ballcat/grpc/log/GrpcLogHandler.java similarity index 95% rename from grpc/ballcat-spring-boot-starter-grpc/src/main/java/com/hccake/starter/grpc/log/GrpcLogHandler.java rename to grpc/ballcat-spring-boot-starter-grpc/src/main/java/org/ballcat/grpc/log/GrpcLogHandler.java index aa70763b6..02621553b 100644 --- a/grpc/ballcat-spring-boot-starter-grpc/src/main/java/com/hccake/starter/grpc/log/GrpcLogHandler.java +++ b/grpc/ballcat-spring-boot-starter-grpc/src/main/java/org/ballcat/grpc/log/GrpcLogHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.grpc.log; +package org.ballcat.grpc.log; /** * @author lingting 2023-04-24 19:40 diff --git a/grpc/ballcat-spring-boot-starter-grpc/src/main/java/com/hccake/starter/grpc/properties/GrpcClientProperties.java b/grpc/ballcat-spring-boot-starter-grpc/src/main/java/org/ballcat/grpc/properties/GrpcClientProperties.java similarity index 96% rename from grpc/ballcat-spring-boot-starter-grpc/src/main/java/com/hccake/starter/grpc/properties/GrpcClientProperties.java rename to grpc/ballcat-spring-boot-starter-grpc/src/main/java/org/ballcat/grpc/properties/GrpcClientProperties.java index 551223f64..d3e829519 100644 --- a/grpc/ballcat-spring-boot-starter-grpc/src/main/java/com/hccake/starter/grpc/properties/GrpcClientProperties.java +++ b/grpc/ballcat-spring-boot-starter-grpc/src/main/java/org/ballcat/grpc/properties/GrpcClientProperties.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.grpc.properties; +package org.ballcat.grpc.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/grpc/ballcat-spring-boot-starter-grpc/src/main/java/com/hccake/starter/grpc/properties/GrpcServerProperties.java b/grpc/ballcat-spring-boot-starter-grpc/src/main/java/org/ballcat/grpc/properties/GrpcServerProperties.java similarity index 96% rename from grpc/ballcat-spring-boot-starter-grpc/src/main/java/com/hccake/starter/grpc/properties/GrpcServerProperties.java rename to grpc/ballcat-spring-boot-starter-grpc/src/main/java/org/ballcat/grpc/properties/GrpcServerProperties.java index 366d4b1d2..dcb666894 100644 --- a/grpc/ballcat-spring-boot-starter-grpc/src/main/java/com/hccake/starter/grpc/properties/GrpcServerProperties.java +++ b/grpc/ballcat-spring-boot-starter-grpc/src/main/java/org/ballcat/grpc/properties/GrpcServerProperties.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.grpc.properties; +package org.ballcat.grpc.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/grpc/ballcat-spring-boot-starter-grpc/src/main/resources/META-INF/spring.factories b/grpc/ballcat-spring-boot-starter-grpc/src/main/resources/META-INF/spring.factories index 375deb8e8..4801232ed 100644 --- a/grpc/ballcat-spring-boot-starter-grpc/src/main/resources/META-INF/spring.factories +++ b/grpc/ballcat-spring-boot-starter-grpc/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.hccake.starter.grpc.configuration.GrpcClientAutoConfiguration \ No newline at end of file + org.ballcat.grpc.configuration.GrpcClientAutoConfiguration \ No newline at end of file diff --git a/grpc/ballcat-spring-boot-starter-grpc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/grpc/ballcat-spring-boot-starter-grpc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index ec845ca90..0fd57a318 100644 --- a/grpc/ballcat-spring-boot-starter-grpc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/grpc/ballcat-spring-boot-starter-grpc/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.hccake.starter.grpc.configuration.GrpcClientAutoConfiguration \ No newline at end of file +org.ballcat.grpc.configuration.GrpcClientAutoConfiguration \ No newline at end of file diff --git a/i18n/ballcat-i18n/src/main/java/com/hccake/ballcat/common/i18n/DynamicMessageSource.java b/i18n/ballcat-i18n/src/main/java/org/ballcat/i18n/DynamicMessageSource.java similarity index 97% rename from i18n/ballcat-i18n/src/main/java/com/hccake/ballcat/common/i18n/DynamicMessageSource.java rename to i18n/ballcat-i18n/src/main/java/org/ballcat/i18n/DynamicMessageSource.java index 8073555e0..62825a45d 100644 --- a/i18n/ballcat-i18n/src/main/java/com/hccake/ballcat/common/i18n/DynamicMessageSource.java +++ b/i18n/ballcat-i18n/src/main/java/org/ballcat/i18n/DynamicMessageSource.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.i18n; +package org.ballcat.i18n; import lombok.RequiredArgsConstructor; import org.springframework.context.support.AbstractMessageSource; diff --git a/i18n/ballcat-i18n/src/main/java/com/hccake/ballcat/common/i18n/I18nClass.java b/i18n/ballcat-i18n/src/main/java/org/ballcat/i18n/I18nClass.java similarity index 95% rename from i18n/ballcat-i18n/src/main/java/com/hccake/ballcat/common/i18n/I18nClass.java rename to i18n/ballcat-i18n/src/main/java/org/ballcat/i18n/I18nClass.java index f6a47057c..97340ef7b 100644 --- a/i18n/ballcat-i18n/src/main/java/com/hccake/ballcat/common/i18n/I18nClass.java +++ b/i18n/ballcat-i18n/src/main/java/org/ballcat/i18n/I18nClass.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.i18n; +package org.ballcat.i18n; import java.lang.annotation.*; diff --git a/i18n/ballcat-i18n/src/main/java/com/hccake/ballcat/common/i18n/I18nField.java b/i18n/ballcat-i18n/src/main/java/org/ballcat/i18n/I18nField.java similarity index 97% rename from i18n/ballcat-i18n/src/main/java/com/hccake/ballcat/common/i18n/I18nField.java rename to i18n/ballcat-i18n/src/main/java/org/ballcat/i18n/I18nField.java index 27b8b8389..5b5ef2403 100644 --- a/i18n/ballcat-i18n/src/main/java/com/hccake/ballcat/common/i18n/I18nField.java +++ b/i18n/ballcat-i18n/src/main/java/org/ballcat/i18n/I18nField.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.i18n; +package org.ballcat.i18n; import org.springframework.core.annotation.AliasFor; diff --git a/i18n/ballcat-i18n/src/main/java/com/hccake/ballcat/common/i18n/I18nIgnore.java b/i18n/ballcat-i18n/src/main/java/org/ballcat/i18n/I18nIgnore.java similarity index 95% rename from i18n/ballcat-i18n/src/main/java/com/hccake/ballcat/common/i18n/I18nIgnore.java rename to i18n/ballcat-i18n/src/main/java/org/ballcat/i18n/I18nIgnore.java index 1947c9de6..af7ccf776 100644 --- a/i18n/ballcat-i18n/src/main/java/com/hccake/ballcat/common/i18n/I18nIgnore.java +++ b/i18n/ballcat-i18n/src/main/java/org/ballcat/i18n/I18nIgnore.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.i18n; +package org.ballcat.i18n; import java.lang.annotation.*; diff --git a/i18n/ballcat-i18n/src/main/java/com/hccake/ballcat/common/i18n/I18nMessage.java b/i18n/ballcat-i18n/src/main/java/org/ballcat/i18n/I18nMessage.java similarity index 97% rename from i18n/ballcat-i18n/src/main/java/com/hccake/ballcat/common/i18n/I18nMessage.java rename to i18n/ballcat-i18n/src/main/java/org/ballcat/i18n/I18nMessage.java index a3a8a9941..8b5e399b2 100644 --- a/i18n/ballcat-i18n/src/main/java/com/hccake/ballcat/common/i18n/I18nMessage.java +++ b/i18n/ballcat-i18n/src/main/java/org/ballcat/i18n/I18nMessage.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.i18n; +package org.ballcat.i18n; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/i18n/ballcat-i18n/src/main/java/com/hccake/ballcat/common/i18n/I18nMessageCreateEvent.java b/i18n/ballcat-i18n/src/main/java/org/ballcat/i18n/I18nMessageCreateEvent.java similarity index 96% rename from i18n/ballcat-i18n/src/main/java/com/hccake/ballcat/common/i18n/I18nMessageCreateEvent.java rename to i18n/ballcat-i18n/src/main/java/org/ballcat/i18n/I18nMessageCreateEvent.java index e649b5cf8..561bdda89 100644 --- a/i18n/ballcat-i18n/src/main/java/com/hccake/ballcat/common/i18n/I18nMessageCreateEvent.java +++ b/i18n/ballcat-i18n/src/main/java/org/ballcat/i18n/I18nMessageCreateEvent.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.i18n; +package org.ballcat.i18n; import org.springframework.context.ApplicationEvent; diff --git a/i18n/ballcat-i18n/src/main/java/com/hccake/ballcat/common/i18n/I18nMessageProvider.java b/i18n/ballcat-i18n/src/main/java/org/ballcat/i18n/I18nMessageProvider.java similarity index 96% rename from i18n/ballcat-i18n/src/main/java/com/hccake/ballcat/common/i18n/I18nMessageProvider.java rename to i18n/ballcat-i18n/src/main/java/org/ballcat/i18n/I18nMessageProvider.java index fd6a09913..33384d747 100644 --- a/i18n/ballcat-i18n/src/main/java/com/hccake/ballcat/common/i18n/I18nMessageProvider.java +++ b/i18n/ballcat-i18n/src/main/java/org/ballcat/i18n/I18nMessageProvider.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.i18n; +package org.ballcat.i18n; import java.util.Locale; diff --git a/i18n/ballcat-i18n/src/main/java/com/hccake/ballcat/common/i18n/I18nOptions.java b/i18n/ballcat-i18n/src/main/java/org/ballcat/i18n/I18nOptions.java similarity index 96% rename from i18n/ballcat-i18n/src/main/java/com/hccake/ballcat/common/i18n/I18nOptions.java rename to i18n/ballcat-i18n/src/main/java/org/ballcat/i18n/I18nOptions.java index cfd1690a7..6ac580e92 100644 --- a/i18n/ballcat-i18n/src/main/java/com/hccake/ballcat/common/i18n/I18nOptions.java +++ b/i18n/ballcat-i18n/src/main/java/org/ballcat/i18n/I18nOptions.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.i18n; +package org.ballcat.i18n; import lombok.Data; diff --git a/i18n/ballcat-i18n/src/main/java/com/hccake/ballcat/common/i18n/I18nResponseAdvice.java b/i18n/ballcat-i18n/src/main/java/org/ballcat/i18n/I18nResponseAdvice.java similarity index 99% rename from i18n/ballcat-i18n/src/main/java/com/hccake/ballcat/common/i18n/I18nResponseAdvice.java rename to i18n/ballcat-i18n/src/main/java/org/ballcat/i18n/I18nResponseAdvice.java index 6940a1862..81af7feb3 100644 --- a/i18n/ballcat-i18n/src/main/java/com/hccake/ballcat/common/i18n/I18nResponseAdvice.java +++ b/i18n/ballcat-i18n/src/main/java/org/ballcat/i18n/I18nResponseAdvice.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.i18n; +package org.ballcat.i18n; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.Assert; diff --git a/i18n/ballcat-i18n/src/main/java/com/hccake/ballcat/common/i18n/MessageSourceHierarchicalChanger.java b/i18n/ballcat-i18n/src/main/java/org/ballcat/i18n/MessageSourceHierarchicalChanger.java similarity index 98% rename from i18n/ballcat-i18n/src/main/java/com/hccake/ballcat/common/i18n/MessageSourceHierarchicalChanger.java rename to i18n/ballcat-i18n/src/main/java/org/ballcat/i18n/MessageSourceHierarchicalChanger.java index 983a4c798..8413629bb 100644 --- a/i18n/ballcat-i18n/src/main/java/com/hccake/ballcat/common/i18n/MessageSourceHierarchicalChanger.java +++ b/i18n/ballcat-i18n/src/main/java/org/ballcat/i18n/MessageSourceHierarchicalChanger.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.i18n; +package org.ballcat.i18n; import org.springframework.context.HierarchicalMessageSource; import org.springframework.context.MessageSource; diff --git a/i18n/ballcat-i18n/src/main/java/com/hccake/ballcat/common/i18n/WildcardReloadableResourceBundleMessageSource.java b/i18n/ballcat-i18n/src/main/java/org/ballcat/i18n/WildcardReloadableResourceBundleMessageSource.java similarity index 98% rename from i18n/ballcat-i18n/src/main/java/com/hccake/ballcat/common/i18n/WildcardReloadableResourceBundleMessageSource.java rename to i18n/ballcat-i18n/src/main/java/org/ballcat/i18n/WildcardReloadableResourceBundleMessageSource.java index 5b64be000..b190e5e46 100644 --- a/i18n/ballcat-i18n/src/main/java/com/hccake/ballcat/common/i18n/WildcardReloadableResourceBundleMessageSource.java +++ b/i18n/ballcat-i18n/src/main/java/org/ballcat/i18n/WildcardReloadableResourceBundleMessageSource.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.i18n; +package org.ballcat.i18n; import lombok.extern.slf4j.Slf4j; import org.springframework.context.support.ReloadableResourceBundleMessageSource; diff --git a/i18n/ballcat-i18n/src/test/java/com/hccake/ballcat/common/i18n/DefautlI18nMessageProvider.java b/i18n/ballcat-i18n/src/test/java/org/ballcat/i18n/DefautlI18nMessageProvider.java similarity index 97% rename from i18n/ballcat-i18n/src/test/java/com/hccake/ballcat/common/i18n/DefautlI18nMessageProvider.java rename to i18n/ballcat-i18n/src/test/java/org/ballcat/i18n/DefautlI18nMessageProvider.java index ca073b136..c93821058 100644 --- a/i18n/ballcat-i18n/src/test/java/com/hccake/ballcat/common/i18n/DefautlI18nMessageProvider.java +++ b/i18n/ballcat-i18n/src/test/java/org/ballcat/i18n/DefautlI18nMessageProvider.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.i18n; +package org.ballcat.i18n; import java.util.Locale; import java.util.Map; diff --git a/i18n/ballcat-spring-boot-starter-i18n/src/main/java/com/hccake/ballcat/autoconfigure/i18n/CustomMessageSourceAutoConfiguration.java b/i18n/ballcat-spring-boot-starter-i18n/src/main/java/org/ballcat/autoconfigure/i18n/CustomMessageSourceAutoConfiguration.java similarity index 97% rename from i18n/ballcat-spring-boot-starter-i18n/src/main/java/com/hccake/ballcat/autoconfigure/i18n/CustomMessageSourceAutoConfiguration.java rename to i18n/ballcat-spring-boot-starter-i18n/src/main/java/org/ballcat/autoconfigure/i18n/CustomMessageSourceAutoConfiguration.java index c0e917482..176c39535 100644 --- a/i18n/ballcat-spring-boot-starter-i18n/src/main/java/com/hccake/ballcat/autoconfigure/i18n/CustomMessageSourceAutoConfiguration.java +++ b/i18n/ballcat-spring-boot-starter-i18n/src/main/java/org/ballcat/autoconfigure/i18n/CustomMessageSourceAutoConfiguration.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.autoconfigure.i18n; +package org.ballcat.autoconfigure.i18n; -import com.hccake.ballcat.common.i18n.WildcardReloadableResourceBundleMessageSource; +import org.ballcat.i18n.WildcardReloadableResourceBundleMessageSource; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureOrder; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; diff --git a/i18n/ballcat-spring-boot-starter-i18n/src/main/java/com/hccake/ballcat/autoconfigure/i18n/I18nAutoConfiguration.java b/i18n/ballcat-spring-boot-starter-i18n/src/main/java/org/ballcat/autoconfigure/i18n/I18nAutoConfiguration.java similarity index 92% rename from i18n/ballcat-spring-boot-starter-i18n/src/main/java/com/hccake/ballcat/autoconfigure/i18n/I18nAutoConfiguration.java rename to i18n/ballcat-spring-boot-starter-i18n/src/main/java/org/ballcat/autoconfigure/i18n/I18nAutoConfiguration.java index 872b2f458..6caca9c27 100644 --- a/i18n/ballcat-spring-boot-starter-i18n/src/main/java/com/hccake/ballcat/autoconfigure/i18n/I18nAutoConfiguration.java +++ b/i18n/ballcat-spring-boot-starter-i18n/src/main/java/org/ballcat/autoconfigure/i18n/I18nAutoConfiguration.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.autoconfigure.i18n; +package org.ballcat.autoconfigure.i18n; -import com.hccake.ballcat.common.i18n.I18nResponseAdvice; +import org.ballcat.i18n.I18nResponseAdvice; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; diff --git a/i18n/ballcat-spring-boot-starter-i18n/src/main/java/com/hccake/ballcat/autoconfigure/i18n/I18nMessageSourceAutoConfiguration.java b/i18n/ballcat-spring-boot-starter-i18n/src/main/java/org/ballcat/autoconfigure/i18n/I18nMessageSourceAutoConfiguration.java similarity index 90% rename from i18n/ballcat-spring-boot-starter-i18n/src/main/java/com/hccake/ballcat/autoconfigure/i18n/I18nMessageSourceAutoConfiguration.java rename to i18n/ballcat-spring-boot-starter-i18n/src/main/java/org/ballcat/autoconfigure/i18n/I18nMessageSourceAutoConfiguration.java index 006bf20e5..7664098f4 100644 --- a/i18n/ballcat-spring-boot-starter-i18n/src/main/java/com/hccake/ballcat/autoconfigure/i18n/I18nMessageSourceAutoConfiguration.java +++ b/i18n/ballcat-spring-boot-starter-i18n/src/main/java/org/ballcat/autoconfigure/i18n/I18nMessageSourceAutoConfiguration.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.autoconfigure.i18n; +package org.ballcat.autoconfigure.i18n; -import com.hccake.ballcat.common.i18n.DynamicMessageSource; -import com.hccake.ballcat.common.i18n.I18nMessageProvider; -import com.hccake.ballcat.common.i18n.MessageSourceHierarchicalChanger; +import org.ballcat.i18n.DynamicMessageSource; +import org.ballcat.i18n.I18nMessageProvider; +import org.ballcat.i18n.MessageSourceHierarchicalChanger; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; diff --git a/i18n/ballcat-spring-boot-starter-i18n/src/main/java/com/hccake/ballcat/autoconfigure/i18n/I18nProperties.java b/i18n/ballcat-spring-boot-starter-i18n/src/main/java/org/ballcat/autoconfigure/i18n/I18nProperties.java similarity index 89% rename from i18n/ballcat-spring-boot-starter-i18n/src/main/java/com/hccake/ballcat/autoconfigure/i18n/I18nProperties.java rename to i18n/ballcat-spring-boot-starter-i18n/src/main/java/org/ballcat/autoconfigure/i18n/I18nProperties.java index fdf997fda..2e7eddfb9 100644 --- a/i18n/ballcat-spring-boot-starter-i18n/src/main/java/com/hccake/ballcat/autoconfigure/i18n/I18nProperties.java +++ b/i18n/ballcat-spring-boot-starter-i18n/src/main/java/org/ballcat/autoconfigure/i18n/I18nProperties.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.autoconfigure.i18n; +package org.ballcat.autoconfigure.i18n; -import com.hccake.ballcat.common.i18n.I18nOptions; +import org.ballcat.i18n.I18nOptions; import org.springframework.boot.context.properties.ConfigurationProperties; /** diff --git a/i18n/ballcat-spring-boot-starter-i18n/src/main/java/com/hccake/ballcat/autoconfigure/i18n/I18nValidationConfiguration.java b/i18n/ballcat-spring-boot-starter-i18n/src/main/java/org/ballcat/autoconfigure/i18n/I18nValidationConfiguration.java similarity index 95% rename from i18n/ballcat-spring-boot-starter-i18n/src/main/java/com/hccake/ballcat/autoconfigure/i18n/I18nValidationConfiguration.java rename to i18n/ballcat-spring-boot-starter-i18n/src/main/java/org/ballcat/autoconfigure/i18n/I18nValidationConfiguration.java index 6ce0c81da..d8dad5f68 100644 --- a/i18n/ballcat-spring-boot-starter-i18n/src/main/java/com/hccake/ballcat/autoconfigure/i18n/I18nValidationConfiguration.java +++ b/i18n/ballcat-spring-boot-starter-i18n/src/main/java/org/ballcat/autoconfigure/i18n/I18nValidationConfiguration.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.autoconfigure.i18n; +package org.ballcat.autoconfigure.i18n; -import com.hccake.ballcat.common.core.validation.EmptyCurlyToDefaultMessageInterpolator; +import org.ballcat.common.core.validation.EmptyCurlyToDefaultMessageInterpolator; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigureOrder; diff --git a/i18n/ballcat-spring-boot-starter-i18n/src/main/resources/META-INF/spring.factories b/i18n/ballcat-spring-boot-starter-i18n/src/main/resources/META-INF/spring.factories index 041e58d8a..26f662c5d 100644 --- a/i18n/ballcat-spring-boot-starter-i18n/src/main/resources/META-INF/spring.factories +++ b/i18n/ballcat-spring-boot-starter-i18n/src/main/resources/META-INF/spring.factories @@ -1,7 +1,7 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.hccake.ballcat.autoconfigure.i18n.CustomMessageSourceAutoConfiguration,\ - com.hccake.ballcat.autoconfigure.i18n.I18nMessageSourceAutoConfiguration,\ - com.hccake.ballcat.autoconfigure.i18n.I18nValidationConfiguration,\ - com.hccake.ballcat.autoconfigure.i18n.I18nAutoConfiguration + org.ballcat.autoconfigure.i18n.CustomMessageSourceAutoConfiguration,\ + org.ballcat.autoconfigure.i18n.I18nMessageSourceAutoConfiguration,\ + org.ballcat.autoconfigure.i18n.I18nValidationConfiguration,\ + org.ballcat.autoconfigure.i18n.I18nAutoConfiguration diff --git a/i18n/ballcat-spring-boot-starter-i18n/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/i18n/ballcat-spring-boot-starter-i18n/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index a6cba5b8c..7ce74d1f4 100644 --- a/i18n/ballcat-spring-boot-starter-i18n/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/i18n/ballcat-spring-boot-starter-i18n/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,4 +1,4 @@ -com.hccake.ballcat.autoconfigure.i18n.CustomMessageSourceAutoConfiguration -com.hccake.ballcat.autoconfigure.i18n.I18nMessageSourceAutoConfiguration -com.hccake.ballcat.autoconfigure.i18n.I18nValidationConfiguration -com.hccake.ballcat.autoconfigure.i18n.I18nAutoConfiguration \ No newline at end of file +org.ballcat.autoconfigure.i18n.CustomMessageSourceAutoConfiguration +org.ballcat.autoconfigure.i18n.I18nMessageSourceAutoConfiguration +org.ballcat.autoconfigure.i18n.I18nValidationConfiguration +org.ballcat.autoconfigure.i18n.I18nAutoConfiguration \ No newline at end of file diff --git a/idempotent/ballcat-idempotent/src/main/java/com/hccake/ballcat/common/idempotent/IdempotentAspect.java b/idempotent/ballcat-idempotent/src/main/java/org/ballcat/idempotent/IdempotentAspect.java similarity index 83% rename from idempotent/ballcat-idempotent/src/main/java/com/hccake/ballcat/common/idempotent/IdempotentAspect.java rename to idempotent/ballcat-idempotent/src/main/java/org/ballcat/idempotent/IdempotentAspect.java index 08a8f0d77..78af7b6c5 100644 --- a/idempotent/ballcat-idempotent/src/main/java/com/hccake/ballcat/common/idempotent/IdempotentAspect.java +++ b/idempotent/ballcat-idempotent/src/main/java/org/ballcat/idempotent/IdempotentAspect.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.idempotent; +package org.ballcat.idempotent; import cn.hutool.core.lang.Assert; -import com.hccake.ballcat.common.idempotent.annotation.Idempotent; -import com.hccake.ballcat.common.idempotent.exception.IdempotentException; -import com.hccake.ballcat.common.idempotent.key.generator.IdempotentKeyGenerator; -import com.hccake.ballcat.common.idempotent.key.store.IdempotentKeyStore; -import com.hccake.ballcat.common.model.result.BaseResultCode; +import org.ballcat.idempotent.annotation.Idempotent; +import org.ballcat.idempotent.exception.IdempotentException; +import org.ballcat.idempotent.key.generator.IdempotentKeyGenerator; +import org.ballcat.idempotent.key.store.IdempotentKeyStore; +import org.ballcat.common.model.result.BaseResultCode; import lombok.RequiredArgsConstructor; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; diff --git a/idempotent/ballcat-idempotent/src/main/java/com/hccake/ballcat/common/idempotent/annotation/Idempotent.java b/idempotent/ballcat-idempotent/src/main/java/org/ballcat/idempotent/annotation/Idempotent.java similarity index 97% rename from idempotent/ballcat-idempotent/src/main/java/com/hccake/ballcat/common/idempotent/annotation/Idempotent.java rename to idempotent/ballcat-idempotent/src/main/java/org/ballcat/idempotent/annotation/Idempotent.java index 73ddac81b..13ce1f256 100644 --- a/idempotent/ballcat-idempotent/src/main/java/com/hccake/ballcat/common/idempotent/annotation/Idempotent.java +++ b/idempotent/ballcat-idempotent/src/main/java/org/ballcat/idempotent/annotation/Idempotent.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.idempotent.annotation; +package org.ballcat.idempotent.annotation; import java.lang.annotation.*; import java.util.concurrent.TimeUnit; diff --git a/idempotent/ballcat-idempotent/src/main/java/com/hccake/ballcat/common/idempotent/exception/IdempotentException.java b/idempotent/ballcat-idempotent/src/main/java/org/ballcat/idempotent/exception/IdempotentException.java similarity index 87% rename from idempotent/ballcat-idempotent/src/main/java/com/hccake/ballcat/common/idempotent/exception/IdempotentException.java rename to idempotent/ballcat-idempotent/src/main/java/org/ballcat/idempotent/exception/IdempotentException.java index 4b7eeb40b..e515b1a6d 100644 --- a/idempotent/ballcat-idempotent/src/main/java/com/hccake/ballcat/common/idempotent/exception/IdempotentException.java +++ b/idempotent/ballcat-idempotent/src/main/java/org/ballcat/idempotent/exception/IdempotentException.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.idempotent.exception; +package org.ballcat.idempotent.exception; -import com.hccake.ballcat.common.core.exception.BusinessException; +import org.ballcat.common.core.exception.BusinessException; import lombok.EqualsAndHashCode; /** diff --git a/idempotent/ballcat-idempotent/src/main/java/com/hccake/ballcat/common/idempotent/key/generator/DefaultIdempotentKeyGenerator.java b/idempotent/ballcat-idempotent/src/main/java/org/ballcat/idempotent/key/generator/DefaultIdempotentKeyGenerator.java similarity index 93% rename from idempotent/ballcat-idempotent/src/main/java/com/hccake/ballcat/common/idempotent/key/generator/DefaultIdempotentKeyGenerator.java rename to idempotent/ballcat-idempotent/src/main/java/org/ballcat/idempotent/key/generator/DefaultIdempotentKeyGenerator.java index 914610796..867533b6d 100644 --- a/idempotent/ballcat-idempotent/src/main/java/com/hccake/ballcat/common/idempotent/key/generator/DefaultIdempotentKeyGenerator.java +++ b/idempotent/ballcat-idempotent/src/main/java/org/ballcat/idempotent/key/generator/DefaultIdempotentKeyGenerator.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.idempotent.key.generator; +package org.ballcat.idempotent.key.generator; -import com.hccake.ballcat.common.idempotent.annotation.Idempotent; -import com.hccake.ballcat.common.util.SpelUtils; +import org.ballcat.idempotent.annotation.Idempotent; +import org.ballcat.common.util.SpelUtils; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.reflect.MethodSignature; import org.springframework.expression.spel.support.StandardEvaluationContext; diff --git a/idempotent/ballcat-idempotent/src/main/java/com/hccake/ballcat/common/idempotent/key/generator/IdempotentKeyGenerator.java b/idempotent/ballcat-idempotent/src/main/java/org/ballcat/idempotent/key/generator/IdempotentKeyGenerator.java similarity index 89% rename from idempotent/ballcat-idempotent/src/main/java/com/hccake/ballcat/common/idempotent/key/generator/IdempotentKeyGenerator.java rename to idempotent/ballcat-idempotent/src/main/java/org/ballcat/idempotent/key/generator/IdempotentKeyGenerator.java index 190121716..58a406cb9 100644 --- a/idempotent/ballcat-idempotent/src/main/java/com/hccake/ballcat/common/idempotent/key/generator/IdempotentKeyGenerator.java +++ b/idempotent/ballcat-idempotent/src/main/java/org/ballcat/idempotent/key/generator/IdempotentKeyGenerator.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.idempotent.key.generator; +package org.ballcat.idempotent.key.generator; -import com.hccake.ballcat.common.idempotent.annotation.Idempotent; +import org.ballcat.idempotent.annotation.Idempotent; import org.aspectj.lang.JoinPoint; import org.springframework.lang.NonNull; diff --git a/idempotent/ballcat-idempotent/src/main/java/com/hccake/ballcat/common/idempotent/key/store/IdempotentKeyStore.java b/idempotent/ballcat-idempotent/src/main/java/org/ballcat/idempotent/key/store/IdempotentKeyStore.java similarity index 95% rename from idempotent/ballcat-idempotent/src/main/java/com/hccake/ballcat/common/idempotent/key/store/IdempotentKeyStore.java rename to idempotent/ballcat-idempotent/src/main/java/org/ballcat/idempotent/key/store/IdempotentKeyStore.java index 40beff462..728aa2af6 100644 --- a/idempotent/ballcat-idempotent/src/main/java/com/hccake/ballcat/common/idempotent/key/store/IdempotentKeyStore.java +++ b/idempotent/ballcat-idempotent/src/main/java/org/ballcat/idempotent/key/store/IdempotentKeyStore.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.idempotent.key.store; +package org.ballcat.idempotent.key.store; import java.util.concurrent.TimeUnit; diff --git a/idempotent/ballcat-idempotent/src/main/java/com/hccake/ballcat/common/idempotent/key/store/InMemoryIdempotentKeyStore.java b/idempotent/ballcat-idempotent/src/main/java/org/ballcat/idempotent/key/store/InMemoryIdempotentKeyStore.java similarity index 96% rename from idempotent/ballcat-idempotent/src/main/java/com/hccake/ballcat/common/idempotent/key/store/InMemoryIdempotentKeyStore.java rename to idempotent/ballcat-idempotent/src/main/java/org/ballcat/idempotent/key/store/InMemoryIdempotentKeyStore.java index 56ed4ec51..f8649a59f 100644 --- a/idempotent/ballcat-idempotent/src/main/java/com/hccake/ballcat/common/idempotent/key/store/InMemoryIdempotentKeyStore.java +++ b/idempotent/ballcat-idempotent/src/main/java/org/ballcat/idempotent/key/store/InMemoryIdempotentKeyStore.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.idempotent.key.store; +package org.ballcat.idempotent.key.store; import cn.hutool.cache.CacheUtil; import cn.hutool.cache.impl.TimedCache; diff --git a/idempotent/ballcat-idempotent/src/main/java/com/hccake/ballcat/common/idempotent/key/store/RedisIdempotentKeyStore.java b/idempotent/ballcat-idempotent/src/main/java/org/ballcat/idempotent/key/store/RedisIdempotentKeyStore.java similarity index 96% rename from idempotent/ballcat-idempotent/src/main/java/com/hccake/ballcat/common/idempotent/key/store/RedisIdempotentKeyStore.java rename to idempotent/ballcat-idempotent/src/main/java/org/ballcat/idempotent/key/store/RedisIdempotentKeyStore.java index fa48ee9fc..c6661ecf3 100644 --- a/idempotent/ballcat-idempotent/src/main/java/com/hccake/ballcat/common/idempotent/key/store/RedisIdempotentKeyStore.java +++ b/idempotent/ballcat-idempotent/src/main/java/org/ballcat/idempotent/key/store/RedisIdempotentKeyStore.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.idempotent.key.store; +package org.ballcat.idempotent.key.store; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; diff --git a/idempotent/ballcat-idempotent/src/test/java/com/hccake/ballcat/common/idempotent/test/IdempotentController.java b/idempotent/ballcat-idempotent/src/test/java/org/ballcat/idempotent/test/IdempotentController.java similarity index 89% rename from idempotent/ballcat-idempotent/src/test/java/com/hccake/ballcat/common/idempotent/test/IdempotentController.java rename to idempotent/ballcat-idempotent/src/test/java/org/ballcat/idempotent/test/IdempotentController.java index cb4f68fbc..aa60f9e8f 100644 --- a/idempotent/ballcat-idempotent/src/test/java/com/hccake/ballcat/common/idempotent/test/IdempotentController.java +++ b/idempotent/ballcat-idempotent/src/test/java/org/ballcat/idempotent/test/IdempotentController.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.idempotent.test; +package org.ballcat.idempotent.test; -import com.hccake.ballcat.common.idempotent.annotation.Idempotent; +import org.ballcat.idempotent.annotation.Idempotent; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/idempotent/ballcat-idempotent/src/test/java/com/hccake/ballcat/common/idempotent/test/IdempotentMethods.java b/idempotent/ballcat-idempotent/src/test/java/org/ballcat/idempotent/test/IdempotentMethods.java similarity index 94% rename from idempotent/ballcat-idempotent/src/test/java/com/hccake/ballcat/common/idempotent/test/IdempotentMethods.java rename to idempotent/ballcat-idempotent/src/test/java/org/ballcat/idempotent/test/IdempotentMethods.java index b84d5ad95..9c3b1fbd6 100644 --- a/idempotent/ballcat-idempotent/src/test/java/com/hccake/ballcat/common/idempotent/test/IdempotentMethods.java +++ b/idempotent/ballcat-idempotent/src/test/java/org/ballcat/idempotent/test/IdempotentMethods.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.idempotent.test; +package org.ballcat.idempotent.test; -import com.hccake.ballcat.common.idempotent.annotation.Idempotent; +import org.ballcat.idempotent.annotation.Idempotent; import lombok.extern.slf4j.Slf4j; /** diff --git a/idempotent/ballcat-idempotent/src/test/java/com/hccake/ballcat/common/idempotent/test/IdempotentTestConfiguration.java b/idempotent/ballcat-idempotent/src/test/java/org/ballcat/idempotent/test/IdempotentTestConfiguration.java similarity index 79% rename from idempotent/ballcat-idempotent/src/test/java/com/hccake/ballcat/common/idempotent/test/IdempotentTestConfiguration.java rename to idempotent/ballcat-idempotent/src/test/java/org/ballcat/idempotent/test/IdempotentTestConfiguration.java index d64300a13..edcaa15ef 100644 --- a/idempotent/ballcat-idempotent/src/test/java/com/hccake/ballcat/common/idempotent/test/IdempotentTestConfiguration.java +++ b/idempotent/ballcat-idempotent/src/test/java/org/ballcat/idempotent/test/IdempotentTestConfiguration.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.idempotent.test; +package org.ballcat.idempotent.test; -import com.hccake.ballcat.common.idempotent.IdempotentAspect; -import com.hccake.ballcat.common.idempotent.key.generator.DefaultIdempotentKeyGenerator; -import com.hccake.ballcat.common.idempotent.key.generator.IdempotentKeyGenerator; -import com.hccake.ballcat.common.idempotent.key.store.IdempotentKeyStore; +import org.ballcat.idempotent.IdempotentAspect; +import org.ballcat.idempotent.key.generator.DefaultIdempotentKeyGenerator; +import org.ballcat.idempotent.key.generator.IdempotentKeyGenerator; +import org.ballcat.idempotent.key.store.IdempotentKeyStore; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; diff --git a/idempotent/ballcat-idempotent/src/test/java/com/hccake/ballcat/common/idempotent/test/InMemoryIdempotentTest.java b/idempotent/ballcat-idempotent/src/test/java/org/ballcat/idempotent/test/InMemoryIdempotentTest.java similarity index 94% rename from idempotent/ballcat-idempotent/src/test/java/com/hccake/ballcat/common/idempotent/test/InMemoryIdempotentTest.java rename to idempotent/ballcat-idempotent/src/test/java/org/ballcat/idempotent/test/InMemoryIdempotentTest.java index 3c53fd35c..be7b2f640 100644 --- a/idempotent/ballcat-idempotent/src/test/java/com/hccake/ballcat/common/idempotent/test/InMemoryIdempotentTest.java +++ b/idempotent/ballcat-idempotent/src/test/java/org/ballcat/idempotent/test/InMemoryIdempotentTest.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.idempotent.test; +package org.ballcat.idempotent.test; -import com.hccake.ballcat.common.idempotent.exception.IdempotentException; -import com.hccake.ballcat.common.idempotent.key.store.InMemoryIdempotentKeyStore; +import org.ballcat.idempotent.exception.IdempotentException; +import org.ballcat.idempotent.key.store.InMemoryIdempotentKeyStore; import lombok.extern.slf4j.Slf4j; import org.awaitility.Awaitility; import org.junit.jupiter.api.Assertions; diff --git a/idempotent/ballcat-idempotent/src/test/java/com/hccake/ballcat/common/idempotent/test/TestException.java b/idempotent/ballcat-idempotent/src/test/java/org/ballcat/idempotent/test/TestException.java similarity index 93% rename from idempotent/ballcat-idempotent/src/test/java/com/hccake/ballcat/common/idempotent/test/TestException.java rename to idempotent/ballcat-idempotent/src/test/java/org/ballcat/idempotent/test/TestException.java index a31ce727d..ec61969e8 100644 --- a/idempotent/ballcat-idempotent/src/test/java/com/hccake/ballcat/common/idempotent/test/TestException.java +++ b/idempotent/ballcat-idempotent/src/test/java/org/ballcat/idempotent/test/TestException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.idempotent.test; +package org.ballcat.idempotent.test; /** * @author hccake diff --git a/idempotent/ballcat-idempotent/src/test/java/com/hccake/ballcat/common/idempotent/test/WebIdempotentTest.java b/idempotent/ballcat-idempotent/src/test/java/org/ballcat/idempotent/test/WebIdempotentTest.java similarity index 93% rename from idempotent/ballcat-idempotent/src/test/java/com/hccake/ballcat/common/idempotent/test/WebIdempotentTest.java rename to idempotent/ballcat-idempotent/src/test/java/org/ballcat/idempotent/test/WebIdempotentTest.java index de8d836ed..726fc6bf6 100644 --- a/idempotent/ballcat-idempotent/src/test/java/com/hccake/ballcat/common/idempotent/test/WebIdempotentTest.java +++ b/idempotent/ballcat-idempotent/src/test/java/org/ballcat/idempotent/test/WebIdempotentTest.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.idempotent.test; +package org.ballcat.idempotent.test; -import com.hccake.ballcat.common.idempotent.exception.IdempotentException; -import com.hccake.ballcat.common.idempotent.key.store.InMemoryIdempotentKeyStore; +import org.ballcat.idempotent.exception.IdempotentException; +import org.ballcat.idempotent.key.store.InMemoryIdempotentKeyStore; import lombok.extern.slf4j.Slf4j; import org.awaitility.Awaitility; import org.junit.jupiter.api.Assertions; diff --git a/idempotent/ballcat-spring-boot-starter-idempotent/src/main/java/com/hccake/ballcat/autoconfigure/idempotent/IdempotentAutoConfiguration.java b/idempotent/ballcat-spring-boot-starter-idempotent/src/main/java/org/ballcat/autoconfigure/idempotent/IdempotentAutoConfiguration.java similarity index 80% rename from idempotent/ballcat-spring-boot-starter-idempotent/src/main/java/com/hccake/ballcat/autoconfigure/idempotent/IdempotentAutoConfiguration.java rename to idempotent/ballcat-spring-boot-starter-idempotent/src/main/java/org/ballcat/autoconfigure/idempotent/IdempotentAutoConfiguration.java index c2987288e..96b1bd7af 100644 --- a/idempotent/ballcat-spring-boot-starter-idempotent/src/main/java/com/hccake/ballcat/autoconfigure/idempotent/IdempotentAutoConfiguration.java +++ b/idempotent/ballcat-spring-boot-starter-idempotent/src/main/java/org/ballcat/autoconfigure/idempotent/IdempotentAutoConfiguration.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.autoconfigure.idempotent; +package org.ballcat.autoconfigure.idempotent; -import com.hccake.ballcat.common.idempotent.IdempotentAspect; -import com.hccake.ballcat.common.idempotent.key.generator.DefaultIdempotentKeyGenerator; -import com.hccake.ballcat.common.idempotent.key.generator.IdempotentKeyGenerator; -import com.hccake.ballcat.common.idempotent.key.store.IdempotentKeyStore; -import com.hccake.ballcat.common.idempotent.key.store.InMemoryIdempotentKeyStore; -import com.hccake.ballcat.common.idempotent.key.store.RedisIdempotentKeyStore; +import org.ballcat.idempotent.IdempotentAspect; +import org.ballcat.idempotent.key.generator.DefaultIdempotentKeyGenerator; +import org.ballcat.idempotent.key.generator.IdempotentKeyGenerator; +import org.ballcat.idempotent.key.store.IdempotentKeyStore; +import org.ballcat.idempotent.key.store.InMemoryIdempotentKeyStore; +import org.ballcat.idempotent.key.store.RedisIdempotentKeyStore; import lombok.RequiredArgsConstructor; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; diff --git a/idempotent/ballcat-spring-boot-starter-idempotent/src/main/java/com/hccake/ballcat/autoconfigure/idempotent/IdempotentProperties.java b/idempotent/ballcat-spring-boot-starter-idempotent/src/main/java/org/ballcat/autoconfigure/idempotent/IdempotentProperties.java similarity index 95% rename from idempotent/ballcat-spring-boot-starter-idempotent/src/main/java/com/hccake/ballcat/autoconfigure/idempotent/IdempotentProperties.java rename to idempotent/ballcat-spring-boot-starter-idempotent/src/main/java/org/ballcat/autoconfigure/idempotent/IdempotentProperties.java index ff1de5e3b..0fdb67647 100644 --- a/idempotent/ballcat-spring-boot-starter-idempotent/src/main/java/com/hccake/ballcat/autoconfigure/idempotent/IdempotentProperties.java +++ b/idempotent/ballcat-spring-boot-starter-idempotent/src/main/java/org/ballcat/autoconfigure/idempotent/IdempotentProperties.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.autoconfigure.idempotent; +package org.ballcat.autoconfigure.idempotent; import lombok.Getter; import lombok.Setter; diff --git a/idempotent/ballcat-spring-boot-starter-idempotent/src/main/resources/META-INF/spring.factories b/idempotent/ballcat-spring-boot-starter-idempotent/src/main/resources/META-INF/spring.factories index 6c3926c19..60df43e09 100644 --- a/idempotent/ballcat-spring-boot-starter-idempotent/src/main/resources/META-INF/spring.factories +++ b/idempotent/ballcat-spring-boot-starter-idempotent/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.hccake.ballcat.autoconfigure.idempotent.IdempotentAutoConfiguration \ No newline at end of file + org.ballcat.autoconfigure.idempotent.IdempotentAutoConfiguration \ No newline at end of file diff --git a/idempotent/ballcat-spring-boot-starter-idempotent/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/idempotent/ballcat-spring-boot-starter-idempotent/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 1762f3d80..0cafaaaf3 100644 --- a/idempotent/ballcat-spring-boot-starter-idempotent/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/idempotent/ballcat-spring-boot-starter-idempotent/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.hccake.ballcat.autoconfigure.idempotent.IdempotentAutoConfiguration \ No newline at end of file +org.ballcat.autoconfigure.idempotent.IdempotentAutoConfiguration \ No newline at end of file diff --git a/idempotent/ballcat-spring-boot-starter-idempotent/src/test/java/com/hccake/ballcat/autoconfigure/idempotent/IdempotentTest.java b/idempotent/ballcat-spring-boot-starter-idempotent/src/test/java/org/ballcat/autoconfigure/idempotent/IdempotentTest.java similarity index 85% rename from idempotent/ballcat-spring-boot-starter-idempotent/src/test/java/com/hccake/ballcat/autoconfigure/idempotent/IdempotentTest.java rename to idempotent/ballcat-spring-boot-starter-idempotent/src/test/java/org/ballcat/autoconfigure/idempotent/IdempotentTest.java index 3e10de16d..4d572b4ac 100644 --- a/idempotent/ballcat-spring-boot-starter-idempotent/src/test/java/com/hccake/ballcat/autoconfigure/idempotent/IdempotentTest.java +++ b/idempotent/ballcat-spring-boot-starter-idempotent/src/test/java/org/ballcat/autoconfigure/idempotent/IdempotentTest.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.autoconfigure.idempotent; +package org.ballcat.autoconfigure.idempotent; -import com.hccake.ballcat.common.idempotent.key.store.IdempotentKeyStore; -import com.hccake.ballcat.common.idempotent.key.store.InMemoryIdempotentKeyStore; +import org.ballcat.idempotent.key.store.IdempotentKeyStore; +import org.ballcat.idempotent.key.store.InMemoryIdempotentKeyStore; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/ip/ballcat-spring-boot-starter-ip2region/src/main/java/com/hccake/ballcat/starter/ip2region/config/Ip2regionAutoConfiguration.java b/ip/ballcat-spring-boot-starter-ip2region/src/main/java/org/ballcat/autoconfigure/ip2region/Ip2regionAutoConfiguration.java similarity index 77% rename from ip/ballcat-spring-boot-starter-ip2region/src/main/java/com/hccake/ballcat/starter/ip2region/config/Ip2regionAutoConfiguration.java rename to ip/ballcat-spring-boot-starter-ip2region/src/main/java/org/ballcat/autoconfigure/ip2region/Ip2regionAutoConfiguration.java index 51248e1c4..6df1b6241 100644 --- a/ip/ballcat-spring-boot-starter-ip2region/src/main/java/com/hccake/ballcat/starter/ip2region/config/Ip2regionAutoConfiguration.java +++ b/ip/ballcat-spring-boot-starter-ip2region/src/main/java/org/ballcat/autoconfigure/ip2region/Ip2regionAutoConfiguration.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.starter.ip2region.config; +package org.ballcat.autoconfigure.ip2region; -import com.hccake.ballcat.starter.ip2region.core.CacheType; -import com.hccake.ballcat.starter.ip2region.exception.Ip2regionException; -import com.hccake.ballcat.starter.ip2region.searcher.CacheVectorIndexIp2regionSearcher; -import com.hccake.ballcat.starter.ip2region.searcher.CacheXdbFileIp2regionSearcher; -import com.hccake.ballcat.starter.ip2region.searcher.Ip2regionSearcher; -import com.hccake.ballcat.starter.ip2region.searcher.NoneCacheIp2regionSearcher; +import org.ballcat.ip2region.core.CacheType; +import org.ballcat.ip2region.exception.Ip2regionException; +import org.ballcat.ip2region.searcher.CacheVectorIndexIp2regionSearcher; +import org.ballcat.ip2region.searcher.CacheXdbFileIp2regionSearcher; +import org.ballcat.ip2region.searcher.Ip2regionSearcher; +import org.ballcat.ip2region.searcher.NoneCacheIp2regionSearcher; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; diff --git a/ip/ballcat-spring-boot-starter-ip2region/src/main/java/com/hccake/ballcat/starter/ip2region/config/Ip2regionProperties.java b/ip/ballcat-spring-boot-starter-ip2region/src/main/java/org/ballcat/autoconfigure/ip2region/Ip2regionProperties.java similarity index 91% rename from ip/ballcat-spring-boot-starter-ip2region/src/main/java/com/hccake/ballcat/starter/ip2region/config/Ip2regionProperties.java rename to ip/ballcat-spring-boot-starter-ip2region/src/main/java/org/ballcat/autoconfigure/ip2region/Ip2regionProperties.java index bbf6bf856..79df9ef11 100644 --- a/ip/ballcat-spring-boot-starter-ip2region/src/main/java/com/hccake/ballcat/starter/ip2region/config/Ip2regionProperties.java +++ b/ip/ballcat-spring-boot-starter-ip2region/src/main/java/org/ballcat/autoconfigure/ip2region/Ip2regionProperties.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.starter.ip2region.config; +package org.ballcat.autoconfigure.ip2region; -import com.hccake.ballcat.starter.ip2region.core.CacheType; +import org.ballcat.ip2region.core.CacheType; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/ip/ballcat-spring-boot-starter-ip2region/src/main/java/com/hccake/ballcat/starter/ip2region/core/CacheType.java b/ip/ballcat-spring-boot-starter-ip2region/src/main/java/org/ballcat/ip2region/core/CacheType.java similarity index 96% rename from ip/ballcat-spring-boot-starter-ip2region/src/main/java/com/hccake/ballcat/starter/ip2region/core/CacheType.java rename to ip/ballcat-spring-boot-starter-ip2region/src/main/java/org/ballcat/ip2region/core/CacheType.java index 040c789a4..0d32aab34 100644 --- a/ip/ballcat-spring-boot-starter-ip2region/src/main/java/com/hccake/ballcat/starter/ip2region/core/CacheType.java +++ b/ip/ballcat-spring-boot-starter-ip2region/src/main/java/org/ballcat/ip2region/core/CacheType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.starter.ip2region.core; +package org.ballcat.ip2region.core; /** * 搜索服务实现 diff --git a/ip/ballcat-spring-boot-starter-ip2region/src/main/java/com/hccake/ballcat/starter/ip2region/core/IpInfo.java b/ip/ballcat-spring-boot-starter-ip2region/src/main/java/org/ballcat/ip2region/core/IpInfo.java similarity index 98% rename from ip/ballcat-spring-boot-starter-ip2region/src/main/java/com/hccake/ballcat/starter/ip2region/core/IpInfo.java rename to ip/ballcat-spring-boot-starter-ip2region/src/main/java/org/ballcat/ip2region/core/IpInfo.java index 164eae90b..e42a049f3 100644 --- a/ip/ballcat-spring-boot-starter-ip2region/src/main/java/com/hccake/ballcat/starter/ip2region/core/IpInfo.java +++ b/ip/ballcat-spring-boot-starter-ip2region/src/main/java/org/ballcat/ip2region/core/IpInfo.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.starter.ip2region.core; +package org.ballcat.ip2region.core; import lombok.Data; import org.springframework.util.StringUtils; diff --git a/ip/ballcat-spring-boot-starter-ip2region/src/main/java/com/hccake/ballcat/starter/ip2region/exception/Ip2regionException.java b/ip/ballcat-spring-boot-starter-ip2region/src/main/java/org/ballcat/ip2region/exception/Ip2regionException.java similarity index 93% rename from ip/ballcat-spring-boot-starter-ip2region/src/main/java/com/hccake/ballcat/starter/ip2region/exception/Ip2regionException.java rename to ip/ballcat-spring-boot-starter-ip2region/src/main/java/org/ballcat/ip2region/exception/Ip2regionException.java index 80020b4fc..07856cbd5 100644 --- a/ip/ballcat-spring-boot-starter-ip2region/src/main/java/com/hccake/ballcat/starter/ip2region/exception/Ip2regionException.java +++ b/ip/ballcat-spring-boot-starter-ip2region/src/main/java/org/ballcat/ip2region/exception/Ip2regionException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.starter.ip2region.exception; +package org.ballcat.ip2region.exception; /** * Ip2region异常 diff --git a/ip/ballcat-spring-boot-starter-ip2region/src/main/java/com/hccake/ballcat/starter/ip2region/searcher/CacheVectorIndexIp2regionSearcher.java b/ip/ballcat-spring-boot-starter-ip2region/src/main/java/org/ballcat/ip2region/searcher/CacheVectorIndexIp2regionSearcher.java similarity index 93% rename from ip/ballcat-spring-boot-starter-ip2region/src/main/java/com/hccake/ballcat/starter/ip2region/searcher/CacheVectorIndexIp2regionSearcher.java rename to ip/ballcat-spring-boot-starter-ip2region/src/main/java/org/ballcat/ip2region/searcher/CacheVectorIndexIp2regionSearcher.java index e4175d83b..bac41982f 100644 --- a/ip/ballcat-spring-boot-starter-ip2region/src/main/java/com/hccake/ballcat/starter/ip2region/searcher/CacheVectorIndexIp2regionSearcher.java +++ b/ip/ballcat-spring-boot-starter-ip2region/src/main/java/org/ballcat/ip2region/searcher/CacheVectorIndexIp2regionSearcher.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.starter.ip2region.searcher; +package org.ballcat.ip2region.searcher; -import com.hccake.ballcat.starter.ip2region.config.Ip2regionProperties; +import org.ballcat.autoconfigure.ip2region.Ip2regionProperties; import org.lionsoul.ip2region.xdb.Searcher; import org.springframework.core.io.Resource; import org.springframework.core.io.ResourceLoader; diff --git a/ip/ballcat-spring-boot-starter-ip2region/src/main/java/com/hccake/ballcat/starter/ip2region/searcher/CacheXdbFileIp2regionSearcher.java b/ip/ballcat-spring-boot-starter-ip2region/src/main/java/org/ballcat/ip2region/searcher/CacheXdbFileIp2regionSearcher.java similarity index 93% rename from ip/ballcat-spring-boot-starter-ip2region/src/main/java/com/hccake/ballcat/starter/ip2region/searcher/CacheXdbFileIp2regionSearcher.java rename to ip/ballcat-spring-boot-starter-ip2region/src/main/java/org/ballcat/ip2region/searcher/CacheXdbFileIp2regionSearcher.java index 0b730bc2f..3c60874e1 100644 --- a/ip/ballcat-spring-boot-starter-ip2region/src/main/java/com/hccake/ballcat/starter/ip2region/searcher/CacheXdbFileIp2regionSearcher.java +++ b/ip/ballcat-spring-boot-starter-ip2region/src/main/java/org/ballcat/ip2region/searcher/CacheXdbFileIp2regionSearcher.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.starter.ip2region.searcher; +package org.ballcat.ip2region.searcher; -import com.hccake.ballcat.starter.ip2region.config.Ip2regionProperties; +import org.ballcat.autoconfigure.ip2region.Ip2regionProperties; import org.lionsoul.ip2region.xdb.Searcher; import org.springframework.core.io.Resource; import org.springframework.core.io.ResourceLoader; diff --git a/ip/ballcat-spring-boot-starter-ip2region/src/main/java/com/hccake/ballcat/starter/ip2region/searcher/Ip2regionSearcher.java b/ip/ballcat-spring-boot-starter-ip2region/src/main/java/org/ballcat/ip2region/searcher/Ip2regionSearcher.java similarity index 91% rename from ip/ballcat-spring-boot-starter-ip2region/src/main/java/com/hccake/ballcat/starter/ip2region/searcher/Ip2regionSearcher.java rename to ip/ballcat-spring-boot-starter-ip2region/src/main/java/org/ballcat/ip2region/searcher/Ip2regionSearcher.java index 70296d071..a450d27df 100644 --- a/ip/ballcat-spring-boot-starter-ip2region/src/main/java/com/hccake/ballcat/starter/ip2region/searcher/Ip2regionSearcher.java +++ b/ip/ballcat-spring-boot-starter-ip2region/src/main/java/org/ballcat/ip2region/searcher/Ip2regionSearcher.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.starter.ip2region.searcher; +package org.ballcat.ip2region.searcher; -import com.hccake.ballcat.starter.ip2region.core.IpInfo; +import org.ballcat.ip2region.core.IpInfo; import org.springframework.lang.Nullable; /** diff --git a/ip/ballcat-spring-boot-starter-ip2region/src/main/java/com/hccake/ballcat/starter/ip2region/searcher/Ip2regionSearcherTemplate.java b/ip/ballcat-spring-boot-starter-ip2region/src/main/java/org/ballcat/ip2region/searcher/Ip2regionSearcherTemplate.java similarity index 89% rename from ip/ballcat-spring-boot-starter-ip2region/src/main/java/com/hccake/ballcat/starter/ip2region/searcher/Ip2regionSearcherTemplate.java rename to ip/ballcat-spring-boot-starter-ip2region/src/main/java/org/ballcat/ip2region/searcher/Ip2regionSearcherTemplate.java index d852127ff..7b150638f 100644 --- a/ip/ballcat-spring-boot-starter-ip2region/src/main/java/com/hccake/ballcat/starter/ip2region/searcher/Ip2regionSearcherTemplate.java +++ b/ip/ballcat-spring-boot-starter-ip2region/src/main/java/org/ballcat/ip2region/searcher/Ip2regionSearcherTemplate.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.starter.ip2region.searcher; +package org.ballcat.ip2region.searcher; -import com.hccake.ballcat.starter.ip2region.config.Ip2regionProperties; -import com.hccake.ballcat.starter.ip2region.core.IpInfo; -import com.hccake.ballcat.starter.ip2region.util.IpInfoUtils; +import org.ballcat.autoconfigure.ip2region.Ip2regionProperties; +import org.ballcat.ip2region.core.IpInfo; +import org.ballcat.ip2region.util.IpInfoUtils; import lombok.RequiredArgsConstructor; import lombok.SneakyThrows; import org.lionsoul.ip2region.xdb.Searcher; diff --git a/ip/ballcat-spring-boot-starter-ip2region/src/main/java/com/hccake/ballcat/starter/ip2region/searcher/NoneCacheIp2regionSearcher.java b/ip/ballcat-spring-boot-starter-ip2region/src/main/java/org/ballcat/ip2region/searcher/NoneCacheIp2regionSearcher.java similarity index 91% rename from ip/ballcat-spring-boot-starter-ip2region/src/main/java/com/hccake/ballcat/starter/ip2region/searcher/NoneCacheIp2regionSearcher.java rename to ip/ballcat-spring-boot-starter-ip2region/src/main/java/org/ballcat/ip2region/searcher/NoneCacheIp2regionSearcher.java index 82aaa99fb..6dd067079 100644 --- a/ip/ballcat-spring-boot-starter-ip2region/src/main/java/com/hccake/ballcat/starter/ip2region/searcher/NoneCacheIp2regionSearcher.java +++ b/ip/ballcat-spring-boot-starter-ip2region/src/main/java/org/ballcat/ip2region/searcher/NoneCacheIp2regionSearcher.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.starter.ip2region.searcher; +package org.ballcat.ip2region.searcher; -import com.hccake.ballcat.starter.ip2region.config.Ip2regionProperties; +import org.ballcat.autoconfigure.ip2region.Ip2regionProperties; import org.lionsoul.ip2region.xdb.Searcher; import org.springframework.core.io.Resource; import org.springframework.core.io.ResourceLoader; diff --git a/ip/ballcat-spring-boot-starter-ip2region/src/main/java/com/hccake/ballcat/starter/ip2region/util/IpInfoUtils.java b/ip/ballcat-spring-boot-starter-ip2region/src/main/java/org/ballcat/ip2region/util/IpInfoUtils.java similarity index 95% rename from ip/ballcat-spring-boot-starter-ip2region/src/main/java/com/hccake/ballcat/starter/ip2region/util/IpInfoUtils.java rename to ip/ballcat-spring-boot-starter-ip2region/src/main/java/org/ballcat/ip2region/util/IpInfoUtils.java index a96026bde..ed727d695 100644 --- a/ip/ballcat-spring-boot-starter-ip2region/src/main/java/com/hccake/ballcat/starter/ip2region/util/IpInfoUtils.java +++ b/ip/ballcat-spring-boot-starter-ip2region/src/main/java/org/ballcat/ip2region/util/IpInfoUtils.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.starter.ip2region.util; +package org.ballcat.ip2region.util; -import com.hccake.ballcat.starter.ip2region.core.IpInfo; +import org.ballcat.ip2region.core.IpInfo; import org.springframework.lang.Nullable; import java.util.Arrays; diff --git a/ip/ballcat-spring-boot-starter-ip2region/src/main/resources/META-INF/spring.factories b/ip/ballcat-spring-boot-starter-ip2region/src/main/resources/META-INF/spring.factories index 20624bd66..1361dfb29 100644 --- a/ip/ballcat-spring-boot-starter-ip2region/src/main/resources/META-INF/spring.factories +++ b/ip/ballcat-spring-boot-starter-ip2region/src/main/resources/META-INF/spring.factories @@ -1,4 +1,4 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.hccake.ballcat.starter.ip2region.config.Ip2regionAutoConfiguration + org.ballcat.autoconfigure.ip2region.Ip2regionAutoConfiguration diff --git a/ip/ballcat-spring-boot-starter-ip2region/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ip/ballcat-spring-boot-starter-ip2region/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 1e6b91224..4fd0eb370 100644 --- a/ip/ballcat-spring-boot-starter-ip2region/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/ip/ballcat-spring-boot-starter-ip2region/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.hccake.ballcat.starter.ip2region.config.Ip2regionAutoConfiguration \ No newline at end of file +org.ballcat.autoconfigure.ip2region.Ip2regionAutoConfiguration \ No newline at end of file diff --git a/ip/ballcat-spring-boot-starter-ip2region/src/test/java/com/hccake/ballcat/starter/ip2region/searcher/IndexCacheIp2RegionSearcherTest.java b/ip/ballcat-spring-boot-starter-ip2region/src/test/java/org/ballcat/ip2region/searcher/IndexCacheIp2RegionSearcherTest.java similarity index 94% rename from ip/ballcat-spring-boot-starter-ip2region/src/test/java/com/hccake/ballcat/starter/ip2region/searcher/IndexCacheIp2RegionSearcherTest.java rename to ip/ballcat-spring-boot-starter-ip2region/src/test/java/org/ballcat/ip2region/searcher/IndexCacheIp2RegionSearcherTest.java index f7c57b651..8f3b64f69 100644 --- a/ip/ballcat-spring-boot-starter-ip2region/src/test/java/com/hccake/ballcat/starter/ip2region/searcher/IndexCacheIp2RegionSearcherTest.java +++ b/ip/ballcat-spring-boot-starter-ip2region/src/test/java/org/ballcat/ip2region/searcher/IndexCacheIp2RegionSearcherTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.starter.ip2region.searcher; +package org.ballcat.ip2region.searcher; import org.junit.jupiter.api.Test; import org.springframework.test.context.ActiveProfiles; diff --git a/ip/ballcat-spring-boot-starter-ip2region/src/test/java/com/hccake/ballcat/starter/ip2region/searcher/Ip2regionSearcherTest.java b/ip/ballcat-spring-boot-starter-ip2region/src/test/java/org/ballcat/ip2region/searcher/Ip2regionSearcherTest.java similarity index 93% rename from ip/ballcat-spring-boot-starter-ip2region/src/test/java/com/hccake/ballcat/starter/ip2region/searcher/Ip2regionSearcherTest.java rename to ip/ballcat-spring-boot-starter-ip2region/src/test/java/org/ballcat/ip2region/searcher/Ip2regionSearcherTest.java index 94412b2b0..1eb833cd2 100644 --- a/ip/ballcat-spring-boot-starter-ip2region/src/test/java/com/hccake/ballcat/starter/ip2region/searcher/Ip2regionSearcherTest.java +++ b/ip/ballcat-spring-boot-starter-ip2region/src/test/java/org/ballcat/ip2region/searcher/Ip2regionSearcherTest.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.starter.ip2region.searcher; +package org.ballcat.ip2region.searcher; -import com.hccake.ballcat.starter.ip2region.config.Ip2regionAutoConfiguration; -import com.hccake.ballcat.starter.ip2region.core.IpInfo; +import org.ballcat.autoconfigure.ip2region.Ip2regionAutoConfiguration; +import org.ballcat.ip2region.core.IpInfo; import org.junit.jupiter.api.Assertions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; diff --git a/ip/ballcat-spring-boot-starter-ip2region/src/test/java/com/hccake/ballcat/starter/ip2region/searcher/NoneCacheIp2RegionSearcherTest.java b/ip/ballcat-spring-boot-starter-ip2region/src/test/java/org/ballcat/ip2region/searcher/NoneCacheIp2RegionSearcherTest.java similarity index 94% rename from ip/ballcat-spring-boot-starter-ip2region/src/test/java/com/hccake/ballcat/starter/ip2region/searcher/NoneCacheIp2RegionSearcherTest.java rename to ip/ballcat-spring-boot-starter-ip2region/src/test/java/org/ballcat/ip2region/searcher/NoneCacheIp2RegionSearcherTest.java index fc05dfc1a..95d5cd674 100644 --- a/ip/ballcat-spring-boot-starter-ip2region/src/test/java/com/hccake/ballcat/starter/ip2region/searcher/NoneCacheIp2RegionSearcherTest.java +++ b/ip/ballcat-spring-boot-starter-ip2region/src/test/java/org/ballcat/ip2region/searcher/NoneCacheIp2RegionSearcherTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.starter.ip2region.searcher; +package org.ballcat.ip2region.searcher; import org.junit.jupiter.api.Test; diff --git a/ip/ballcat-spring-boot-starter-ip2region/src/test/java/com/hccake/ballcat/starter/ip2region/searcher/XdbCacheIp2RegionSearcherTest.java b/ip/ballcat-spring-boot-starter-ip2region/src/test/java/org/ballcat/ip2region/searcher/XdbCacheIp2RegionSearcherTest.java similarity index 94% rename from ip/ballcat-spring-boot-starter-ip2region/src/test/java/com/hccake/ballcat/starter/ip2region/searcher/XdbCacheIp2RegionSearcherTest.java rename to ip/ballcat-spring-boot-starter-ip2region/src/test/java/org/ballcat/ip2region/searcher/XdbCacheIp2RegionSearcherTest.java index 9ecbff65d..268c3ed96 100644 --- a/ip/ballcat-spring-boot-starter-ip2region/src/test/java/com/hccake/ballcat/starter/ip2region/searcher/XdbCacheIp2RegionSearcherTest.java +++ b/ip/ballcat-spring-boot-starter-ip2region/src/test/java/org/ballcat/ip2region/searcher/XdbCacheIp2RegionSearcherTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.starter.ip2region.searcher; +package org.ballcat.ip2region.searcher; import org.junit.jupiter.api.Test; import org.springframework.test.context.ActiveProfiles; diff --git a/job/ballcat-spring-boot-starter-job/src/main/java/com/hccake/ballcat/common/job/XxlJobAutoConfiguration.java b/job/ballcat-spring-boot-starter-job/src/main/java/org/ballcat/autoconfigure/xxljob/XxlJobAutoConfiguration.java similarity index 95% rename from job/ballcat-spring-boot-starter-job/src/main/java/com/hccake/ballcat/common/job/XxlJobAutoConfiguration.java rename to job/ballcat-spring-boot-starter-job/src/main/java/org/ballcat/autoconfigure/xxljob/XxlJobAutoConfiguration.java index 6d4f38a41..7cc4f2ef3 100644 --- a/job/ballcat-spring-boot-starter-job/src/main/java/com/hccake/ballcat/common/job/XxlJobAutoConfiguration.java +++ b/job/ballcat-spring-boot-starter-job/src/main/java/org/ballcat/autoconfigure/xxljob/XxlJobAutoConfiguration.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.job; +package org.ballcat.autoconfigure.xxljob; -import com.hccake.ballcat.common.job.properties.XxlExecutorProperties; -import com.hccake.ballcat.common.job.properties.XxlJobProperties; +import org.ballcat.autoconfigure.xxljob.properties.XxlExecutorProperties; +import org.ballcat.autoconfigure.xxljob.properties.XxlJobProperties; import com.xxl.job.core.executor.impl.XxlJobSpringExecutor; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/job/ballcat-spring-boot-starter-job/src/main/java/com/hccake/ballcat/common/job/properties/XxlAdminProperties.java b/job/ballcat-spring-boot-starter-job/src/main/java/org/ballcat/autoconfigure/xxljob/properties/XxlAdminProperties.java similarity index 95% rename from job/ballcat-spring-boot-starter-job/src/main/java/com/hccake/ballcat/common/job/properties/XxlAdminProperties.java rename to job/ballcat-spring-boot-starter-job/src/main/java/org/ballcat/autoconfigure/xxljob/properties/XxlAdminProperties.java index 785ff4747..d71926537 100644 --- a/job/ballcat-spring-boot-starter-job/src/main/java/com/hccake/ballcat/common/job/properties/XxlAdminProperties.java +++ b/job/ballcat-spring-boot-starter-job/src/main/java/org/ballcat/autoconfigure/xxljob/properties/XxlAdminProperties.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.job.properties; +package org.ballcat.autoconfigure.xxljob.properties; import lombok.Data; diff --git a/job/ballcat-spring-boot-starter-job/src/main/java/com/hccake/ballcat/common/job/properties/XxlExecutorProperties.java b/job/ballcat-spring-boot-starter-job/src/main/java/org/ballcat/autoconfigure/xxljob/properties/XxlExecutorProperties.java similarity index 97% rename from job/ballcat-spring-boot-starter-job/src/main/java/com/hccake/ballcat/common/job/properties/XxlExecutorProperties.java rename to job/ballcat-spring-boot-starter-job/src/main/java/org/ballcat/autoconfigure/xxljob/properties/XxlExecutorProperties.java index 8d78ebd5c..caf8170c3 100644 --- a/job/ballcat-spring-boot-starter-job/src/main/java/com/hccake/ballcat/common/job/properties/XxlExecutorProperties.java +++ b/job/ballcat-spring-boot-starter-job/src/main/java/org/ballcat/autoconfigure/xxljob/properties/XxlExecutorProperties.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.job.properties; +package org.ballcat.autoconfigure.xxljob.properties; import lombok.Data; diff --git a/job/ballcat-spring-boot-starter-job/src/main/java/com/hccake/ballcat/common/job/properties/XxlJobProperties.java b/job/ballcat-spring-boot-starter-job/src/main/java/org/ballcat/autoconfigure/xxljob/properties/XxlJobProperties.java similarity index 96% rename from job/ballcat-spring-boot-starter-job/src/main/java/com/hccake/ballcat/common/job/properties/XxlJobProperties.java rename to job/ballcat-spring-boot-starter-job/src/main/java/org/ballcat/autoconfigure/xxljob/properties/XxlJobProperties.java index d14ef6587..a36cdb1f9 100644 --- a/job/ballcat-spring-boot-starter-job/src/main/java/com/hccake/ballcat/common/job/properties/XxlJobProperties.java +++ b/job/ballcat-spring-boot-starter-job/src/main/java/org/ballcat/autoconfigure/xxljob/properties/XxlJobProperties.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.job.properties; +package org.ballcat.autoconfigure.xxljob.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/job/ballcat-spring-boot-starter-job/src/main/resources/META-INF/spring.factories b/job/ballcat-spring-boot-starter-job/src/main/resources/META-INF/spring.factories index 3b85bd28e..00a1cc3d4 100644 --- a/job/ballcat-spring-boot-starter-job/src/main/resources/META-INF/spring.factories +++ b/job/ballcat-spring-boot-starter-job/src/main/resources/META-INF/spring.factories @@ -1,4 +1,4 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.hccake.ballcat.common.job.XxlJobAutoConfiguration + org.ballcat.autoconfigure.xxljob.XxlJobAutoConfiguration diff --git a/job/ballcat-spring-boot-starter-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/job/ballcat-spring-boot-starter-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 464eae55a..68ea18847 100644 --- a/job/ballcat-spring-boot-starter-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/job/ballcat-spring-boot-starter-job/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.hccake.ballcat.common.job.XxlJobAutoConfiguration \ No newline at end of file +org.ballcat.autoconfigure.xxljob.XxlJobAutoConfiguration \ No newline at end of file diff --git a/kafka/ballcat-kafka-stream/src/main/java/com/hccake/extend/kafka/stream/KafkaStreamBuilder.java b/kafka/ballcat-kafka-stream/src/main/java/org/ballcat/kafka/stream/KafkaStreamBuilder.java similarity index 99% rename from kafka/ballcat-kafka-stream/src/main/java/com/hccake/extend/kafka/stream/KafkaStreamBuilder.java rename to kafka/ballcat-kafka-stream/src/main/java/org/ballcat/kafka/stream/KafkaStreamBuilder.java index d4cdbec16..ce4ecb272 100644 --- a/kafka/ballcat-kafka-stream/src/main/java/com/hccake/extend/kafka/stream/KafkaStreamBuilder.java +++ b/kafka/ballcat-kafka-stream/src/main/java/org/ballcat/kafka/stream/KafkaStreamBuilder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.kafka.stream; +package org.ballcat.kafka.stream; import cn.hutool.core.collection.ListUtil; import cn.hutool.core.text.CharSequenceUtil; diff --git a/kafka/ballcat-kafka-stream/src/main/java/com/hccake/extend/kafka/stream/core/AbstractProcessor.java b/kafka/ballcat-kafka-stream/src/main/java/org/ballcat/kafka/stream/core/AbstractProcessor.java similarity index 96% rename from kafka/ballcat-kafka-stream/src/main/java/com/hccake/extend/kafka/stream/core/AbstractProcessor.java rename to kafka/ballcat-kafka-stream/src/main/java/org/ballcat/kafka/stream/core/AbstractProcessor.java index 03cc83d5c..b10bc1363 100644 --- a/kafka/ballcat-kafka-stream/src/main/java/com/hccake/extend/kafka/stream/core/AbstractProcessor.java +++ b/kafka/ballcat-kafka-stream/src/main/java/org/ballcat/kafka/stream/core/AbstractProcessor.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.kafka.stream.core; +package org.ballcat.kafka.stream.core; import cn.hutool.core.convert.Convert; import com.fasterxml.jackson.databind.ObjectMapper; -import com.hccake.extend.kafka.stream.util.ProcessorContextUtil; +import org.ballcat.kafka.stream.util.ProcessorContextUtil; import java.time.Duration; import lombok.Getter; import lombok.extern.slf4j.Slf4j; diff --git a/kafka/ballcat-kafka-stream/src/main/java/com/hccake/extend/kafka/stream/core/AbstractPunctuator.java b/kafka/ballcat-kafka-stream/src/main/java/org/ballcat/kafka/stream/core/AbstractPunctuator.java similarity index 95% rename from kafka/ballcat-kafka-stream/src/main/java/com/hccake/extend/kafka/stream/core/AbstractPunctuator.java rename to kafka/ballcat-kafka-stream/src/main/java/org/ballcat/kafka/stream/core/AbstractPunctuator.java index 2ba315fb8..49a4612ae 100644 --- a/kafka/ballcat-kafka-stream/src/main/java/com/hccake/extend/kafka/stream/core/AbstractPunctuator.java +++ b/kafka/ballcat-kafka-stream/src/main/java/org/ballcat/kafka/stream/core/AbstractPunctuator.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.kafka.stream.core; +package org.ballcat.kafka.stream.core; import cn.hutool.core.date.TimeInterval; -import com.hccake.extend.kafka.stream.util.ProcessorContextUtil; +import org.ballcat.kafka.stream.util.ProcessorContextUtil; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.streams.processor.ProcessorContext; diff --git a/kafka/ballcat-kafka-stream/src/main/java/com/hccake/extend/kafka/stream/core/Kafka.java b/kafka/ballcat-kafka-stream/src/main/java/org/ballcat/kafka/stream/core/Kafka.java similarity index 91% rename from kafka/ballcat-kafka-stream/src/main/java/com/hccake/extend/kafka/stream/core/Kafka.java rename to kafka/ballcat-kafka-stream/src/main/java/org/ballcat/kafka/stream/core/Kafka.java index c52a7274d..641155ae1 100644 --- a/kafka/ballcat-kafka-stream/src/main/java/com/hccake/extend/kafka/stream/core/Kafka.java +++ b/kafka/ballcat-kafka-stream/src/main/java/org/ballcat/kafka/stream/core/Kafka.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.kafka.stream.core; +package org.ballcat.kafka.stream.core; -import com.hccake.extend.kafka.stream.store.KafkaKeyValueStore; +import org.ballcat.kafka.stream.store.KafkaKeyValueStore; import org.apache.kafka.streams.processor.ProcessorContext; import org.apache.kafka.streams.state.KeyValueStore; diff --git a/kafka/ballcat-kafka-stream/src/main/java/com/hccake/extend/kafka/stream/exception/NotAllowedException.java b/kafka/ballcat-kafka-stream/src/main/java/org/ballcat/kafka/stream/exception/NotAllowedException.java similarity index 93% rename from kafka/ballcat-kafka-stream/src/main/java/com/hccake/extend/kafka/stream/exception/NotAllowedException.java rename to kafka/ballcat-kafka-stream/src/main/java/org/ballcat/kafka/stream/exception/NotAllowedException.java index 22b026bc3..a8d9dcd79 100644 --- a/kafka/ballcat-kafka-stream/src/main/java/com/hccake/extend/kafka/stream/exception/NotAllowedException.java +++ b/kafka/ballcat-kafka-stream/src/main/java/org/ballcat/kafka/stream/exception/NotAllowedException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.kafka.stream.exception; +package org.ballcat.kafka.stream.exception; /** * @author lingting diff --git a/kafka/ballcat-kafka-stream/src/main/java/com/hccake/extend/kafka/stream/extend/AbstractKeyValueStorePunctuator.java b/kafka/ballcat-kafka-stream/src/main/java/org/ballcat/kafka/stream/extend/AbstractKeyValueStorePunctuator.java similarity index 88% rename from kafka/ballcat-kafka-stream/src/main/java/com/hccake/extend/kafka/stream/extend/AbstractKeyValueStorePunctuator.java rename to kafka/ballcat-kafka-stream/src/main/java/org/ballcat/kafka/stream/extend/AbstractKeyValueStorePunctuator.java index 730d52c41..e524d7feb 100644 --- a/kafka/ballcat-kafka-stream/src/main/java/com/hccake/extend/kafka/stream/extend/AbstractKeyValueStorePunctuator.java +++ b/kafka/ballcat-kafka-stream/src/main/java/org/ballcat/kafka/stream/extend/AbstractKeyValueStorePunctuator.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.kafka.stream.extend; +package org.ballcat.kafka.stream.extend; import com.fasterxml.jackson.databind.ObjectMapper; -import com.hccake.extend.kafka.stream.core.AbstractPunctuator; -import com.hccake.extend.kafka.stream.exception.NotAllowedException; -import com.hccake.extend.kafka.stream.store.KafkaKeyValueStore; +import org.ballcat.kafka.stream.core.AbstractPunctuator; +import org.ballcat.kafka.stream.exception.NotAllowedException; +import org.ballcat.kafka.stream.store.KafkaKeyValueStore; import lombok.Getter; import lombok.extern.slf4j.Slf4j; import org.apache.kafka.streams.KeyValue; @@ -52,8 +52,7 @@ public abstract class AbstractKeyValueStorePunctuator extends AbstractP */ @Override public AbstractKeyValueStorePunctuator init(ProcessorContext context) { - throw new NotAllowedException( - "继承自 com.hccake.extend.kafka.stream.extend.AbstractKeyValueStorePunctuator 的类禁止使用当前方法进行初始化!"); + throw new NotAllowedException("继承自 " + AbstractKeyValueStorePunctuator.class.getName() + " 的类禁止使用当前方法进行初始化!"); } public AbstractKeyValueStorePunctuator init(ProcessorContext context, String storeName, diff --git a/kafka/ballcat-kafka-stream/src/main/java/com/hccake/extend/kafka/stream/extend/AbstractStringStringStorePunctuator.java b/kafka/ballcat-kafka-stream/src/main/java/org/ballcat/kafka/stream/extend/AbstractStringStringStorePunctuator.java similarity index 94% rename from kafka/ballcat-kafka-stream/src/main/java/com/hccake/extend/kafka/stream/extend/AbstractStringStringStorePunctuator.java rename to kafka/ballcat-kafka-stream/src/main/java/org/ballcat/kafka/stream/extend/AbstractStringStringStorePunctuator.java index caada9cb4..e2310d08a 100644 --- a/kafka/ballcat-kafka-stream/src/main/java/com/hccake/extend/kafka/stream/extend/AbstractStringStringStorePunctuator.java +++ b/kafka/ballcat-kafka-stream/src/main/java/org/ballcat/kafka/stream/extend/AbstractStringStringStorePunctuator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.kafka.stream.extend; +package org.ballcat.kafka.stream.extend; import lombok.extern.slf4j.Slf4j; diff --git a/kafka/ballcat-kafka-stream/src/main/java/com/hccake/extend/kafka/stream/store/KafkaKeyValueStore.java b/kafka/ballcat-kafka-stream/src/main/java/org/ballcat/kafka/stream/store/KafkaKeyValueStore.java similarity index 98% rename from kafka/ballcat-kafka-stream/src/main/java/com/hccake/extend/kafka/stream/store/KafkaKeyValueStore.java rename to kafka/ballcat-kafka-stream/src/main/java/org/ballcat/kafka/stream/store/KafkaKeyValueStore.java index 2d88b587b..23a6fa2df 100644 --- a/kafka/ballcat-kafka-stream/src/main/java/com/hccake/extend/kafka/stream/store/KafkaKeyValueStore.java +++ b/kafka/ballcat-kafka-stream/src/main/java/org/ballcat/kafka/stream/store/KafkaKeyValueStore.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.kafka.stream.store; +package org.ballcat.kafka.stream.store; import cn.hutool.core.util.IdUtil; import org.apache.kafka.streams.KeyValue; diff --git a/kafka/ballcat-kafka-stream/src/main/java/com/hccake/extend/kafka/stream/store/KafkaWindow.java b/kafka/ballcat-kafka-stream/src/main/java/org/ballcat/kafka/stream/store/KafkaWindow.java similarity index 97% rename from kafka/ballcat-kafka-stream/src/main/java/com/hccake/extend/kafka/stream/store/KafkaWindow.java rename to kafka/ballcat-kafka-stream/src/main/java/org/ballcat/kafka/stream/store/KafkaWindow.java index 9dc41eff5..249615f87 100644 --- a/kafka/ballcat-kafka-stream/src/main/java/com/hccake/extend/kafka/stream/store/KafkaWindow.java +++ b/kafka/ballcat-kafka-stream/src/main/java/org/ballcat/kafka/stream/store/KafkaWindow.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.kafka.stream.store; +package org.ballcat.kafka.stream.store; import cn.hutool.core.text.CharSequenceUtil; diff --git a/kafka/ballcat-kafka-stream/src/main/java/com/hccake/extend/kafka/stream/util/ProcessorContextUtil.java b/kafka/ballcat-kafka-stream/src/main/java/org/ballcat/kafka/stream/util/ProcessorContextUtil.java similarity index 96% rename from kafka/ballcat-kafka-stream/src/main/java/com/hccake/extend/kafka/stream/util/ProcessorContextUtil.java rename to kafka/ballcat-kafka-stream/src/main/java/org/ballcat/kafka/stream/util/ProcessorContextUtil.java index 6af19fde6..72c63fc1f 100644 --- a/kafka/ballcat-kafka-stream/src/main/java/com/hccake/extend/kafka/stream/util/ProcessorContextUtil.java +++ b/kafka/ballcat-kafka-stream/src/main/java/org/ballcat/kafka/stream/util/ProcessorContextUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.kafka.stream.util; +package org.ballcat.kafka.stream.util; import org.apache.kafka.streams.processor.ProcessorContext; import org.apache.kafka.streams.processor.internals.ProcessorContextImpl; diff --git a/kafka/ballcat-kafka/src/main/java/com/hccake/extend/kafka/KafkaConstants.java b/kafka/ballcat-kafka/src/main/java/org/ballcat/kafka/KafkaConstants.java similarity index 96% rename from kafka/ballcat-kafka/src/main/java/com/hccake/extend/kafka/KafkaConstants.java rename to kafka/ballcat-kafka/src/main/java/org/ballcat/kafka/KafkaConstants.java index f7c384729..190d432e2 100644 --- a/kafka/ballcat-kafka/src/main/java/com/hccake/extend/kafka/KafkaConstants.java +++ b/kafka/ballcat-kafka/src/main/java/org/ballcat/kafka/KafkaConstants.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.kafka; +package org.ballcat.kafka; /** * @author lingting 2020/6/19 16:48 diff --git a/kafka/ballcat-kafka/src/main/java/com/hccake/extend/kafka/KafkaConsumerBuilder.java b/kafka/ballcat-kafka/src/main/java/org/ballcat/kafka/KafkaConsumerBuilder.java similarity index 97% rename from kafka/ballcat-kafka/src/main/java/com/hccake/extend/kafka/KafkaConsumerBuilder.java rename to kafka/ballcat-kafka/src/main/java/org/ballcat/kafka/KafkaConsumerBuilder.java index f948fb7b9..45e724c17 100644 --- a/kafka/ballcat-kafka/src/main/java/com/hccake/extend/kafka/KafkaConsumerBuilder.java +++ b/kafka/ballcat-kafka/src/main/java/org/ballcat/kafka/KafkaConsumerBuilder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.kafka; +package org.ballcat.kafka; import cn.hutool.core.collection.ListUtil; import cn.hutool.core.text.CharSequenceUtil; @@ -29,7 +29,7 @@ import java.util.Set; import java.util.function.Function; -import static com.hccake.extend.kafka.KafkaConstants.BOOTSTRAP_SERVERS_DELIMITER; +import static org.ballcat.kafka.KafkaConstants.BOOTSTRAP_SERVERS_DELIMITER; /** * 消费者 具体的配置请参考 {@link ConsumerConfig} 这里只提供一些常用配置 diff --git a/kafka/ballcat-kafka/src/main/java/com/hccake/extend/kafka/KafkaExtendProducer.java b/kafka/ballcat-kafka/src/main/java/org/ballcat/kafka/KafkaExtendProducer.java similarity index 99% rename from kafka/ballcat-kafka/src/main/java/com/hccake/extend/kafka/KafkaExtendProducer.java rename to kafka/ballcat-kafka/src/main/java/org/ballcat/kafka/KafkaExtendProducer.java index 0df1dfe3e..ee2900228 100644 --- a/kafka/ballcat-kafka/src/main/java/com/hccake/extend/kafka/KafkaExtendProducer.java +++ b/kafka/ballcat-kafka/src/main/java/org/ballcat/kafka/KafkaExtendProducer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.kafka; +package org.ballcat.kafka; import java.util.concurrent.Future; import lombok.Getter; diff --git a/kafka/ballcat-kafka/src/main/java/com/hccake/extend/kafka/KafkaProducerBuilder.java b/kafka/ballcat-kafka/src/main/java/org/ballcat/kafka/KafkaProducerBuilder.java similarity index 96% rename from kafka/ballcat-kafka/src/main/java/com/hccake/extend/kafka/KafkaProducerBuilder.java rename to kafka/ballcat-kafka/src/main/java/org/ballcat/kafka/KafkaProducerBuilder.java index 4060618f4..6804977f6 100644 --- a/kafka/ballcat-kafka/src/main/java/com/hccake/extend/kafka/KafkaProducerBuilder.java +++ b/kafka/ballcat-kafka/src/main/java/org/ballcat/kafka/KafkaProducerBuilder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.kafka; +package org.ballcat.kafka; import cn.hutool.core.collection.ListUtil; import cn.hutool.core.text.CharSequenceUtil; @@ -25,7 +25,7 @@ import java.util.*; import java.util.function.Function; -import static com.hccake.extend.kafka.KafkaConstants.BOOTSTRAP_SERVERS_DELIMITER; +import static org.ballcat.kafka.KafkaConstants.BOOTSTRAP_SERVERS_DELIMITER; /** * 生产者 具体的配置请参考 {@link ProducerConfig} 这里只提供一些常用配置 diff --git a/kafka/ballcat-spring-boot-starter-kafka/src/main/java/com/hccake/starter/kafka/KafkaAutoConfiguration.java b/kafka/ballcat-spring-boot-starter-kafka/src/main/java/org/ballcat/autoconfigure/kafka/KafkaAutoConfiguration.java similarity index 91% rename from kafka/ballcat-spring-boot-starter-kafka/src/main/java/com/hccake/starter/kafka/KafkaAutoConfiguration.java rename to kafka/ballcat-spring-boot-starter-kafka/src/main/java/org/ballcat/autoconfigure/kafka/KafkaAutoConfiguration.java index ee9a89a77..41ca678be 100644 --- a/kafka/ballcat-spring-boot-starter-kafka/src/main/java/com/hccake/starter/kafka/KafkaAutoConfiguration.java +++ b/kafka/ballcat-spring-boot-starter-kafka/src/main/java/org/ballcat/autoconfigure/kafka/KafkaAutoConfiguration.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.kafka; +package org.ballcat.autoconfigure.kafka; -import com.hccake.extend.kafka.KafkaConsumerBuilder; -import com.hccake.extend.kafka.KafkaExtendProducer; -import com.hccake.extend.kafka.KafkaProducerBuilder; +import org.ballcat.kafka.KafkaConsumerBuilder; +import org.ballcat.kafka.KafkaExtendProducer; +import org.ballcat.kafka.KafkaProducerBuilder; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; diff --git a/kafka/ballcat-spring-boot-starter-kafka/src/main/java/com/hccake/starter/kafka/KafkaProperties.java b/kafka/ballcat-spring-boot-starter-kafka/src/main/java/org/ballcat/autoconfigure/kafka/KafkaProperties.java similarity index 98% rename from kafka/ballcat-spring-boot-starter-kafka/src/main/java/com/hccake/starter/kafka/KafkaProperties.java rename to kafka/ballcat-spring-boot-starter-kafka/src/main/java/org/ballcat/autoconfigure/kafka/KafkaProperties.java index ebeeb704a..661e75790 100644 --- a/kafka/ballcat-spring-boot-starter-kafka/src/main/java/com/hccake/starter/kafka/KafkaProperties.java +++ b/kafka/ballcat-spring-boot-starter-kafka/src/main/java/org/ballcat/autoconfigure/kafka/KafkaProperties.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.kafka; +package org.ballcat.autoconfigure.kafka; import cn.hutool.core.text.CharSequenceUtil; import lombok.Data; diff --git a/kafka/ballcat-spring-boot-starter-kafka/src/main/resources/META-INF/spring.factories b/kafka/ballcat-spring-boot-starter-kafka/src/main/resources/META-INF/spring.factories index d8602416a..071faabd0 100644 --- a/kafka/ballcat-spring-boot-starter-kafka/src/main/resources/META-INF/spring.factories +++ b/kafka/ballcat-spring-boot-starter-kafka/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.hccake.starter.kafka.KafkaAutoConfiguration \ No newline at end of file + org.ballcat.autoconfigure.kafka.KafkaAutoConfiguration \ No newline at end of file diff --git a/kafka/ballcat-spring-boot-starter-kafka/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/kafka/ballcat-spring-boot-starter-kafka/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 88c0fe835..69ababe17 100644 --- a/kafka/ballcat-spring-boot-starter-kafka/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/kafka/ballcat-spring-boot-starter-kafka/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.hccake.starter.kafka.KafkaAutoConfiguration \ No newline at end of file +org.ballcat.autoconfigure.kafka.KafkaAutoConfiguration \ No newline at end of file diff --git a/log/ballcat-log/src/main/java/com/hccake/ballcat/common/log/access/filter/AccessLogFilter.java b/log/ballcat-log/src/main/java/org/ballcat/log/access/filter/AccessLogFilter.java similarity index 93% rename from log/ballcat-log/src/main/java/com/hccake/ballcat/common/log/access/filter/AccessLogFilter.java rename to log/ballcat-log/src/main/java/org/ballcat/log/access/filter/AccessLogFilter.java index 40c546eda..ec079b84f 100644 --- a/log/ballcat-log/src/main/java/com/hccake/ballcat/common/log/access/filter/AccessLogFilter.java +++ b/log/ballcat-log/src/main/java/org/ballcat/log/access/filter/AccessLogFilter.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.log.access.filter; +package org.ballcat.log.access.filter; -import com.hccake.ballcat.common.core.constant.MDCConstants; -import com.hccake.ballcat.common.core.request.wrapper.RepeatBodyRequestWrapper; -import com.hccake.ballcat.common.log.access.handler.AccessLogHandler; -import com.hccake.ballcat.common.log.util.LogUtils; +import org.ballcat.common.core.constant.MDCConstants; +import org.ballcat.common.core.request.wrapper.RepeatBodyRequestWrapper; +import org.ballcat.log.access.handler.AccessLogHandler; +import org.ballcat.log.util.LogUtils; import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.StringUtils; import org.slf4j.MDC; diff --git a/log/ballcat-log/src/main/java/com/hccake/ballcat/common/log/access/handler/AccessLogHandler.java b/log/ballcat-log/src/main/java/org/ballcat/log/access/handler/AccessLogHandler.java similarity index 96% rename from log/ballcat-log/src/main/java/com/hccake/ballcat/common/log/access/handler/AccessLogHandler.java rename to log/ballcat-log/src/main/java/org/ballcat/log/access/handler/AccessLogHandler.java index da988da67..5be91c13c 100644 --- a/log/ballcat-log/src/main/java/com/hccake/ballcat/common/log/access/handler/AccessLogHandler.java +++ b/log/ballcat-log/src/main/java/org/ballcat/log/access/handler/AccessLogHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.log.access.handler; +package org.ballcat.log.access.handler; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/log/ballcat-log/src/main/java/com/hccake/ballcat/common/log/operation/annotation/CreateOperationLogging.java b/log/ballcat-log/src/main/java/org/ballcat/log/operation/annotation/CreateOperationLogging.java similarity index 92% rename from log/ballcat-log/src/main/java/com/hccake/ballcat/common/log/operation/annotation/CreateOperationLogging.java rename to log/ballcat-log/src/main/java/org/ballcat/log/operation/annotation/CreateOperationLogging.java index 3339f1b42..ded3aba41 100644 --- a/log/ballcat-log/src/main/java/com/hccake/ballcat/common/log/operation/annotation/CreateOperationLogging.java +++ b/log/ballcat-log/src/main/java/org/ballcat/log/operation/annotation/CreateOperationLogging.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.log.operation.annotation; +package org.ballcat.log.operation.annotation; -import com.hccake.ballcat.common.log.operation.enums.OperationTypes; +import org.ballcat.log.operation.enums.OperationTypes; import org.springframework.core.annotation.AliasFor; import java.lang.annotation.Documented; diff --git a/log/ballcat-log/src/main/java/com/hccake/ballcat/common/log/operation/annotation/DeleteOperationLogging.java b/log/ballcat-log/src/main/java/org/ballcat/log/operation/annotation/DeleteOperationLogging.java similarity index 92% rename from log/ballcat-log/src/main/java/com/hccake/ballcat/common/log/operation/annotation/DeleteOperationLogging.java rename to log/ballcat-log/src/main/java/org/ballcat/log/operation/annotation/DeleteOperationLogging.java index 0da2a4b00..985e74dfa 100644 --- a/log/ballcat-log/src/main/java/com/hccake/ballcat/common/log/operation/annotation/DeleteOperationLogging.java +++ b/log/ballcat-log/src/main/java/org/ballcat/log/operation/annotation/DeleteOperationLogging.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.log.operation.annotation; +package org.ballcat.log.operation.annotation; -import com.hccake.ballcat.common.log.operation.enums.OperationTypes; +import org.ballcat.log.operation.enums.OperationTypes; import org.springframework.core.annotation.AliasFor; import java.lang.annotation.Documented; diff --git a/log/ballcat-log/src/main/java/com/hccake/ballcat/common/log/operation/annotation/OperationLogging.java b/log/ballcat-log/src/main/java/org/ballcat/log/operation/annotation/OperationLogging.java similarity index 95% rename from log/ballcat-log/src/main/java/com/hccake/ballcat/common/log/operation/annotation/OperationLogging.java rename to log/ballcat-log/src/main/java/org/ballcat/log/operation/annotation/OperationLogging.java index 74b0d4646..0d0b1c3c8 100644 --- a/log/ballcat-log/src/main/java/com/hccake/ballcat/common/log/operation/annotation/OperationLogging.java +++ b/log/ballcat-log/src/main/java/org/ballcat/log/operation/annotation/OperationLogging.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.log.operation.annotation; +package org.ballcat.log.operation.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/log/ballcat-log/src/main/java/com/hccake/ballcat/common/log/operation/annotation/ReadOperationLogging.java b/log/ballcat-log/src/main/java/org/ballcat/log/operation/annotation/ReadOperationLogging.java similarity index 92% rename from log/ballcat-log/src/main/java/com/hccake/ballcat/common/log/operation/annotation/ReadOperationLogging.java rename to log/ballcat-log/src/main/java/org/ballcat/log/operation/annotation/ReadOperationLogging.java index dbe9fc6d4..b30d20e0e 100644 --- a/log/ballcat-log/src/main/java/com/hccake/ballcat/common/log/operation/annotation/ReadOperationLogging.java +++ b/log/ballcat-log/src/main/java/org/ballcat/log/operation/annotation/ReadOperationLogging.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.log.operation.annotation; +package org.ballcat.log.operation.annotation; -import com.hccake.ballcat.common.log.operation.enums.OperationTypes; +import org.ballcat.log.operation.enums.OperationTypes; import org.springframework.core.annotation.AliasFor; import java.lang.annotation.Documented; diff --git a/log/ballcat-log/src/main/java/com/hccake/ballcat/common/log/operation/annotation/UpdateOperationLogging.java b/log/ballcat-log/src/main/java/org/ballcat/log/operation/annotation/UpdateOperationLogging.java similarity index 92% rename from log/ballcat-log/src/main/java/com/hccake/ballcat/common/log/operation/annotation/UpdateOperationLogging.java rename to log/ballcat-log/src/main/java/org/ballcat/log/operation/annotation/UpdateOperationLogging.java index dfdcc5212..6ab633872 100644 --- a/log/ballcat-log/src/main/java/com/hccake/ballcat/common/log/operation/annotation/UpdateOperationLogging.java +++ b/log/ballcat-log/src/main/java/org/ballcat/log/operation/annotation/UpdateOperationLogging.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.log.operation.annotation; +package org.ballcat.log.operation.annotation; -import com.hccake.ballcat.common.log.operation.enums.OperationTypes; +import org.ballcat.log.operation.enums.OperationTypes; import org.springframework.core.annotation.AliasFor; import java.lang.annotation.Documented; diff --git a/log/ballcat-log/src/main/java/com/hccake/ballcat/common/log/operation/aspect/OperationLogAspect.java b/log/ballcat-log/src/main/java/org/ballcat/log/operation/aspect/OperationLogAspect.java similarity index 87% rename from log/ballcat-log/src/main/java/com/hccake/ballcat/common/log/operation/aspect/OperationLogAspect.java rename to log/ballcat-log/src/main/java/org/ballcat/log/operation/aspect/OperationLogAspect.java index e64a1768d..251972221 100644 --- a/log/ballcat-log/src/main/java/com/hccake/ballcat/common/log/operation/aspect/OperationLogAspect.java +++ b/log/ballcat-log/src/main/java/org/ballcat/log/operation/aspect/OperationLogAspect.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.log.operation.aspect; +package org.ballcat.log.operation.aspect; -import com.hccake.ballcat.common.log.operation.annotation.OperationLogging; -import com.hccake.ballcat.common.log.operation.handler.OperationLogHandler; +import org.ballcat.log.operation.annotation.OperationLogging; +import org.ballcat.log.operation.handler.OperationLogHandler; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; @@ -40,8 +40,8 @@ public class OperationLogAspect { private final OperationLogHandler operationLogHandler; - @Around("execution(@(@com.hccake.ballcat.common.log.operation.annotation.OperationLogging *) * *(..)) " - + "|| @annotation(com.hccake.ballcat.common.log.operation.annotation.OperationLogging)") + @Around("execution(@(@org.ballcat.log.operation.annotation.OperationLogging *) * *(..)) " + + "|| @annotation(org.ballcat.log.operation.annotation.OperationLogging)") public Object around(ProceedingJoinPoint joinPoint) throws Throwable { // 开始时间 long startTime = System.currentTimeMillis(); diff --git a/log/ballcat-log/src/main/java/com/hccake/ballcat/common/log/operation/enums/LogStatusEnum.java b/log/ballcat-log/src/main/java/org/ballcat/log/operation/enums/LogStatusEnum.java similarity index 94% rename from log/ballcat-log/src/main/java/com/hccake/ballcat/common/log/operation/enums/LogStatusEnum.java rename to log/ballcat-log/src/main/java/org/ballcat/log/operation/enums/LogStatusEnum.java index 3201ef9c9..c3c114268 100644 --- a/log/ballcat-log/src/main/java/com/hccake/ballcat/common/log/operation/enums/LogStatusEnum.java +++ b/log/ballcat-log/src/main/java/org/ballcat/log/operation/enums/LogStatusEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.log.operation.enums; +package org.ballcat.log.operation.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/log/ballcat-log/src/main/java/com/hccake/ballcat/common/log/operation/enums/OperationTypes.java b/log/ballcat-log/src/main/java/org/ballcat/log/operation/enums/OperationTypes.java similarity index 95% rename from log/ballcat-log/src/main/java/com/hccake/ballcat/common/log/operation/enums/OperationTypes.java rename to log/ballcat-log/src/main/java/org/ballcat/log/operation/enums/OperationTypes.java index c8e1a8090..1936c1cbf 100644 --- a/log/ballcat-log/src/main/java/com/hccake/ballcat/common/log/operation/enums/OperationTypes.java +++ b/log/ballcat-log/src/main/java/org/ballcat/log/operation/enums/OperationTypes.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.log.operation.enums; +package org.ballcat.log.operation.enums; /** * 操作类型的接口，用户可以继承此接口以便自定义类型 diff --git a/log/ballcat-log/src/main/java/com/hccake/ballcat/common/log/operation/handler/AbstractOperationLogHandler.java b/log/ballcat-log/src/main/java/org/ballcat/log/operation/handler/AbstractOperationLogHandler.java similarity index 96% rename from log/ballcat-log/src/main/java/com/hccake/ballcat/common/log/operation/handler/AbstractOperationLogHandler.java rename to log/ballcat-log/src/main/java/org/ballcat/log/operation/handler/AbstractOperationLogHandler.java index 30fc2715c..747106eb1 100644 --- a/log/ballcat-log/src/main/java/com/hccake/ballcat/common/log/operation/handler/AbstractOperationLogHandler.java +++ b/log/ballcat-log/src/main/java/org/ballcat/log/operation/handler/AbstractOperationLogHandler.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.log.operation.handler; +package org.ballcat.log.operation.handler; import cn.hutool.core.collection.ListUtil; import cn.hutool.core.util.ArrayUtil; -import com.hccake.ballcat.common.util.JsonUtils; +import org.ballcat.common.util.JsonUtils; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.Signature; diff --git a/log/ballcat-log/src/main/java/com/hccake/ballcat/common/log/operation/handler/OperationLogHandler.java b/log/ballcat-log/src/main/java/org/ballcat/log/operation/handler/OperationLogHandler.java similarity index 93% rename from log/ballcat-log/src/main/java/com/hccake/ballcat/common/log/operation/handler/OperationLogHandler.java rename to log/ballcat-log/src/main/java/org/ballcat/log/operation/handler/OperationLogHandler.java index d99c1ad39..b0b5e5858 100644 --- a/log/ballcat-log/src/main/java/com/hccake/ballcat/common/log/operation/handler/OperationLogHandler.java +++ b/log/ballcat-log/src/main/java/org/ballcat/log/operation/handler/OperationLogHandler.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.log.operation.handler; +package org.ballcat.log.operation.handler; -import com.hccake.ballcat.common.log.operation.annotation.OperationLogging; +import org.ballcat.log.operation.annotation.OperationLogging; import org.aspectj.lang.ProceedingJoinPoint; /** diff --git a/log/ballcat-log/src/main/java/com/hccake/ballcat/common/log/util/LogUtils.java b/log/ballcat-log/src/main/java/org/ballcat/log/util/LogUtils.java similarity index 98% rename from log/ballcat-log/src/main/java/com/hccake/ballcat/common/log/util/LogUtils.java rename to log/ballcat-log/src/main/java/org/ballcat/log/util/LogUtils.java index 1555e7d8a..90760047c 100644 --- a/log/ballcat-log/src/main/java/com/hccake/ballcat/common/log/util/LogUtils.java +++ b/log/ballcat-log/src/main/java/org/ballcat/log/util/LogUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.log.util; +package org.ballcat.log.util; import lombok.experimental.UtilityClass; import lombok.extern.slf4j.Slf4j; diff --git a/log/ballcat-spring-boot-starter-log/src/main/java/com/hccake/ballcat/autoconfigure/log/AccessLogAutoConfiguration.java b/log/ballcat-spring-boot-starter-log/src/main/java/org/ballcat/autoconfigure/log/AccessLogAutoConfiguration.java similarity index 88% rename from log/ballcat-spring-boot-starter-log/src/main/java/com/hccake/ballcat/autoconfigure/log/AccessLogAutoConfiguration.java rename to log/ballcat-spring-boot-starter-log/src/main/java/org/ballcat/autoconfigure/log/AccessLogAutoConfiguration.java index 310904132..a65490960 100644 --- a/log/ballcat-spring-boot-starter-log/src/main/java/com/hccake/ballcat/autoconfigure/log/AccessLogAutoConfiguration.java +++ b/log/ballcat-spring-boot-starter-log/src/main/java/org/ballcat/autoconfigure/log/AccessLogAutoConfiguration.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.autoconfigure.log; +package org.ballcat.autoconfigure.log; -import com.hccake.ballcat.autoconfigure.log.properties.AccessLogProperties; -import com.hccake.ballcat.common.log.access.filter.AccessLogFilter; -import com.hccake.ballcat.common.log.access.handler.AccessLogHandler; +import org.ballcat.autoconfigure.log.properties.AccessLogProperties; +import org.ballcat.log.access.filter.AccessLogFilter; +import org.ballcat.log.access.handler.AccessLogHandler; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; diff --git a/log/ballcat-spring-boot-starter-log/src/main/java/com/hccake/ballcat/autoconfigure/log/OperationLogAutoConfiguration.java b/log/ballcat-spring-boot-starter-log/src/main/java/org/ballcat/autoconfigure/log/OperationLogAutoConfiguration.java similarity index 84% rename from log/ballcat-spring-boot-starter-log/src/main/java/com/hccake/ballcat/autoconfigure/log/OperationLogAutoConfiguration.java rename to log/ballcat-spring-boot-starter-log/src/main/java/org/ballcat/autoconfigure/log/OperationLogAutoConfiguration.java index 20453ca15..c108e6d89 100644 --- a/log/ballcat-spring-boot-starter-log/src/main/java/com/hccake/ballcat/autoconfigure/log/OperationLogAutoConfiguration.java +++ b/log/ballcat-spring-boot-starter-log/src/main/java/org/ballcat/autoconfigure/log/OperationLogAutoConfiguration.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.autoconfigure.log; +package org.ballcat.autoconfigure.log; -import com.hccake.ballcat.autoconfigure.log.properties.OperationLogProperties; -import com.hccake.ballcat.common.log.operation.aspect.OperationLogAspect; -import com.hccake.ballcat.common.log.operation.handler.OperationLogHandler; +import org.ballcat.autoconfigure.log.properties.OperationLogProperties; +import org.ballcat.log.operation.aspect.OperationLogAspect; +import org.ballcat.log.operation.handler.OperationLogHandler; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; diff --git a/log/ballcat-spring-boot-starter-log/src/main/java/com/hccake/ballcat/autoconfigure/log/properties/AccessLogProperties.java b/log/ballcat-spring-boot-starter-log/src/main/java/org/ballcat/autoconfigure/log/properties/AccessLogProperties.java similarity index 96% rename from log/ballcat-spring-boot-starter-log/src/main/java/com/hccake/ballcat/autoconfigure/log/properties/AccessLogProperties.java rename to log/ballcat-spring-boot-starter-log/src/main/java/org/ballcat/autoconfigure/log/properties/AccessLogProperties.java index ce9d50fb7..0a264bb0d 100644 --- a/log/ballcat-spring-boot-starter-log/src/main/java/com/hccake/ballcat/autoconfigure/log/properties/AccessLogProperties.java +++ b/log/ballcat-spring-boot-starter-log/src/main/java/org/ballcat/autoconfigure/log/properties/AccessLogProperties.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.autoconfigure.log.properties; +package org.ballcat.autoconfigure.log.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/log/ballcat-spring-boot-starter-log/src/main/java/com/hccake/ballcat/autoconfigure/log/properties/OperationLogProperties.java b/log/ballcat-spring-boot-starter-log/src/main/java/org/ballcat/autoconfigure/log/properties/OperationLogProperties.java similarity index 94% rename from log/ballcat-spring-boot-starter-log/src/main/java/com/hccake/ballcat/autoconfigure/log/properties/OperationLogProperties.java rename to log/ballcat-spring-boot-starter-log/src/main/java/org/ballcat/autoconfigure/log/properties/OperationLogProperties.java index 30abf439f..3be7567b0 100644 --- a/log/ballcat-spring-boot-starter-log/src/main/java/com/hccake/ballcat/autoconfigure/log/properties/OperationLogProperties.java +++ b/log/ballcat-spring-boot-starter-log/src/main/java/org/ballcat/autoconfigure/log/properties/OperationLogProperties.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.autoconfigure.log.properties; +package org.ballcat.autoconfigure.log.properties; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/log/ballcat-spring-boot-starter-log/src/main/resources/META-INF/spring.factories b/log/ballcat-spring-boot-starter-log/src/main/resources/META-INF/spring.factories index ac0068cb8..d4f2b91a2 100644 --- a/log/ballcat-spring-boot-starter-log/src/main/resources/META-INF/spring.factories +++ b/log/ballcat-spring-boot-starter-log/src/main/resources/META-INF/spring.factories @@ -1,3 +1,3 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.hccake.ballcat.autoconfigure.log.AccessLogAutoConfiguration,\ - com.hccake.ballcat.autoconfigure.log.OperationLogAutoConfiguration + org.ballcat.autoconfigure.log.AccessLogAutoConfiguration,\ + org.ballcat.autoconfigure.log.OperationLogAutoConfiguration diff --git a/log/ballcat-spring-boot-starter-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/log/ballcat-spring-boot-starter-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 811c86160..9ea29f050 100644 --- a/log/ballcat-spring-boot-starter-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/log/ballcat-spring-boot-starter-log/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,2 +1,2 @@ -com.hccake.ballcat.autoconfigure.log.AccessLogAutoConfiguration -com.hccake.ballcat.autoconfigure.log.OperationLogAutoConfiguration \ No newline at end of file +org.ballcat.autoconfigure.log.AccessLogAutoConfiguration +org.ballcat.autoconfigure.log.OperationLogAutoConfiguration \ No newline at end of file diff --git a/mail/ballcat-spring-boot-starter-mail/src/main/java/com/hccake/ballcat/common/mail/MailAutoConfiguration.java b/mail/ballcat-spring-boot-starter-mail/src/main/java/org/ballcat/mail/MailAutoConfiguration.java similarity index 90% rename from mail/ballcat-spring-boot-starter-mail/src/main/java/com/hccake/ballcat/common/mail/MailAutoConfiguration.java rename to mail/ballcat-spring-boot-starter-mail/src/main/java/org/ballcat/mail/MailAutoConfiguration.java index 3beccf850..672433836 100644 --- a/mail/ballcat-spring-boot-starter-mail/src/main/java/com/hccake/ballcat/common/mail/MailAutoConfiguration.java +++ b/mail/ballcat-spring-boot-starter-mail/src/main/java/org/ballcat/mail/MailAutoConfiguration.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.mail; +package org.ballcat.mail; -import com.hccake.ballcat.common.mail.sender.MailSender; -import com.hccake.ballcat.common.mail.sender.MailSenderImpl; +import org.ballcat.mail.sender.MailSender; +import org.ballcat.mail.sender.MailSenderImpl; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/mail/ballcat-spring-boot-starter-mail/src/main/java/com/hccake/ballcat/common/mail/event/MailSendEvent.java b/mail/ballcat-spring-boot-starter-mail/src/main/java/org/ballcat/mail/event/MailSendEvent.java similarity index 89% rename from mail/ballcat-spring-boot-starter-mail/src/main/java/com/hccake/ballcat/common/mail/event/MailSendEvent.java rename to mail/ballcat-spring-boot-starter-mail/src/main/java/org/ballcat/mail/event/MailSendEvent.java index 4a8ace121..673f1bcc0 100644 --- a/mail/ballcat-spring-boot-starter-mail/src/main/java/com/hccake/ballcat/common/mail/event/MailSendEvent.java +++ b/mail/ballcat-spring-boot-starter-mail/src/main/java/org/ballcat/mail/event/MailSendEvent.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.mail.event; +package org.ballcat.mail.event; -import com.hccake.ballcat.common.mail.model.MailSendInfo; +import org.ballcat.mail.model.MailSendInfo; import lombok.ToString; import org.springframework.context.ApplicationEvent; diff --git a/mail/ballcat-spring-boot-starter-mail/src/main/java/com/hccake/ballcat/common/mail/model/MailDetails.java b/mail/ballcat-spring-boot-starter-mail/src/main/java/org/ballcat/mail/model/MailDetails.java similarity index 96% rename from mail/ballcat-spring-boot-starter-mail/src/main/java/com/hccake/ballcat/common/mail/model/MailDetails.java rename to mail/ballcat-spring-boot-starter-mail/src/main/java/org/ballcat/mail/model/MailDetails.java index 54181c139..9706e4c5c 100644 --- a/mail/ballcat-spring-boot-starter-mail/src/main/java/com/hccake/ballcat/common/mail/model/MailDetails.java +++ b/mail/ballcat-spring-boot-starter-mail/src/main/java/org/ballcat/mail/model/MailDetails.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.mail.model; +package org.ballcat.mail.model; import lombok.Data; diff --git a/mail/ballcat-spring-boot-starter-mail/src/main/java/com/hccake/ballcat/common/mail/model/MailSendInfo.java b/mail/ballcat-spring-boot-starter-mail/src/main/java/org/ballcat/mail/model/MailSendInfo.java similarity index 97% rename from mail/ballcat-spring-boot-starter-mail/src/main/java/com/hccake/ballcat/common/mail/model/MailSendInfo.java rename to mail/ballcat-spring-boot-starter-mail/src/main/java/org/ballcat/mail/model/MailSendInfo.java index d0c3a79ae..88ce384eb 100644 --- a/mail/ballcat-spring-boot-starter-mail/src/main/java/com/hccake/ballcat/common/mail/model/MailSendInfo.java +++ b/mail/ballcat-spring-boot-starter-mail/src/main/java/org/ballcat/mail/model/MailSendInfo.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.mail.model; +package org.ballcat.mail.model; import java.time.LocalDateTime; diff --git a/mail/ballcat-spring-boot-starter-mail/src/main/java/com/hccake/ballcat/common/mail/sender/MailSender.java b/mail/ballcat-spring-boot-starter-mail/src/main/java/org/ballcat/mail/sender/MailSender.java similarity index 95% rename from mail/ballcat-spring-boot-starter-mail/src/main/java/com/hccake/ballcat/common/mail/sender/MailSender.java rename to mail/ballcat-spring-boot-starter-mail/src/main/java/org/ballcat/mail/sender/MailSender.java index 59ac3752c..c66ced67e 100644 --- a/mail/ballcat-spring-boot-starter-mail/src/main/java/com/hccake/ballcat/common/mail/sender/MailSender.java +++ b/mail/ballcat-spring-boot-starter-mail/src/main/java/org/ballcat/mail/sender/MailSender.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.mail.sender; +package org.ballcat.mail.sender; -import com.hccake.ballcat.common.mail.model.MailDetails; -import com.hccake.ballcat.common.mail.model.MailSendInfo; +import org.ballcat.mail.model.MailDetails; +import org.ballcat.mail.model.MailSendInfo; import org.springframework.mail.MailSendException; import org.springframework.util.StringUtils; diff --git a/mail/ballcat-spring-boot-starter-mail/src/main/java/com/hccake/ballcat/common/mail/sender/MailSenderImpl.java b/mail/ballcat-spring-boot-starter-mail/src/main/java/org/ballcat/mail/sender/MailSenderImpl.java similarity index 93% rename from mail/ballcat-spring-boot-starter-mail/src/main/java/com/hccake/ballcat/common/mail/sender/MailSenderImpl.java rename to mail/ballcat-spring-boot-starter-mail/src/main/java/org/ballcat/mail/sender/MailSenderImpl.java index 1e6707771..10b9d1dbf 100644 --- a/mail/ballcat-spring-boot-starter-mail/src/main/java/com/hccake/ballcat/common/mail/sender/MailSenderImpl.java +++ b/mail/ballcat-spring-boot-starter-mail/src/main/java/org/ballcat/mail/sender/MailSenderImpl.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.mail.sender; +package org.ballcat.mail.sender; -import com.hccake.ballcat.common.mail.event.MailSendEvent; -import com.hccake.ballcat.common.mail.model.MailDetails; -import com.hccake.ballcat.common.mail.model.MailSendInfo; +import org.ballcat.mail.event.MailSendEvent; +import org.ballcat.mail.model.MailDetails; +import org.ballcat.mail.model.MailSendInfo; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; diff --git a/mail/ballcat-spring-boot-starter-mail/src/main/resources/META-INF/spring.factories b/mail/ballcat-spring-boot-starter-mail/src/main/resources/META-INF/spring.factories index 1f5f72942..0c9fd06ef 100644 --- a/mail/ballcat-spring-boot-starter-mail/src/main/resources/META-INF/spring.factories +++ b/mail/ballcat-spring-boot-starter-mail/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.hccake.ballcat.common.mail.MailAutoConfiguration + org.ballcat.mail.MailAutoConfiguration diff --git a/mail/ballcat-spring-boot-starter-mail/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/mail/ballcat-spring-boot-starter-mail/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 326b3b3eb..162863ebe 100644 --- a/mail/ballcat-spring-boot-starter-mail/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/mail/ballcat-spring-boot-starter-mail/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.hccake.ballcat.common.mail.MailAutoConfiguration \ No newline at end of file +org.ballcat.mail.MailAutoConfiguration \ No newline at end of file diff --git a/mybatis-plus/ballcat-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/alias/TableAlias.java b/mybatis-plus/ballcat-mybatis-plus/src/main/java/org/ballcat/mybatisplus/alias/TableAlias.java similarity index 89% rename from mybatis-plus/ballcat-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/alias/TableAlias.java rename to mybatis-plus/ballcat-mybatis-plus/src/main/java/org/ballcat/mybatisplus/alias/TableAlias.java index 518cbf005..4ef870ba1 100644 --- a/mybatis-plus/ballcat-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/alias/TableAlias.java +++ b/mybatis-plus/ballcat-mybatis-plus/src/main/java/org/ballcat/mybatisplus/alias/TableAlias.java @@ -13,9 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.mybatis.plus.alias; +package org.ballcat.mybatisplus.alias; + +import org.ballcat.mybatisplus.conditions.query.LambdaAliasQueryWrapperX; -import com.hccake.extend.mybatis.plus.conditions.query.LambdaAliasQueryWrapperX; import java.lang.annotation.*; /** diff --git a/mybatis-plus/ballcat-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/alias/TableAliasHelper.java b/mybatis-plus/ballcat-mybatis-plus/src/main/java/org/ballcat/mybatisplus/alias/TableAliasHelper.java similarity index 98% rename from mybatis-plus/ballcat-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/alias/TableAliasHelper.java rename to mybatis-plus/ballcat-mybatis-plus/src/main/java/org/ballcat/mybatisplus/alias/TableAliasHelper.java index 8cdfce317..51aabd89e 100644 --- a/mybatis-plus/ballcat-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/alias/TableAliasHelper.java +++ b/mybatis-plus/ballcat-mybatis-plus/src/main/java/org/ballcat/mybatisplus/alias/TableAliasHelper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.mybatis.plus.alias; +package org.ballcat.mybatisplus.alias; import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.baomidou.mybatisplus.core.metadata.TableInfoHelper; diff --git a/mybatis-plus/ballcat-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/alias/TableAliasNotFoundException.java b/mybatis-plus/ballcat-mybatis-plus/src/main/java/org/ballcat/mybatisplus/alias/TableAliasNotFoundException.java similarity index 95% rename from mybatis-plus/ballcat-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/alias/TableAliasNotFoundException.java rename to mybatis-plus/ballcat-mybatis-plus/src/main/java/org/ballcat/mybatisplus/alias/TableAliasNotFoundException.java index 3aa22408f..e61f2a24f 100644 --- a/mybatis-plus/ballcat-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/alias/TableAliasNotFoundException.java +++ b/mybatis-plus/ballcat-mybatis-plus/src/main/java/org/ballcat/mybatisplus/alias/TableAliasNotFoundException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.mybatis.plus.alias; +package org.ballcat.mybatisplus.alias; /** * TableAlias 注解没有找到时抛出的异常 diff --git a/mybatis-plus/ballcat-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/conditions/query/ColumnFunction.java b/mybatis-plus/ballcat-mybatis-plus/src/main/java/org/ballcat/mybatisplus/conditions/query/ColumnFunction.java similarity index 94% rename from mybatis-plus/ballcat-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/conditions/query/ColumnFunction.java rename to mybatis-plus/ballcat-mybatis-plus/src/main/java/org/ballcat/mybatisplus/conditions/query/ColumnFunction.java index 26afde918..9253a9a4a 100644 --- a/mybatis-plus/ballcat-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/conditions/query/ColumnFunction.java +++ b/mybatis-plus/ballcat-mybatis-plus/src/main/java/org/ballcat/mybatisplus/conditions/query/ColumnFunction.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.mybatis.plus.conditions.query; +package org.ballcat.mybatisplus.conditions.query; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; diff --git a/mybatis-plus/ballcat-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/conditions/query/LambdaAliasQueryWrapperX.java b/mybatis-plus/ballcat-mybatis-plus/src/main/java/org/ballcat/mybatisplus/conditions/query/LambdaAliasQueryWrapperX.java similarity index 95% rename from mybatis-plus/ballcat-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/conditions/query/LambdaAliasQueryWrapperX.java rename to mybatis-plus/ballcat-mybatis-plus/src/main/java/org/ballcat/mybatisplus/conditions/query/LambdaAliasQueryWrapperX.java index 597634d33..b12b9df98 100644 --- a/mybatis-plus/ballcat-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/conditions/query/LambdaAliasQueryWrapperX.java +++ b/mybatis-plus/ballcat-mybatis-plus/src/main/java/org/ballcat/mybatisplus/conditions/query/LambdaAliasQueryWrapperX.java @@ -13,12 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.mybatis.plus.conditions.query; +package org.ballcat.mybatisplus.conditions.query; import com.baomidou.mybatisplus.core.conditions.SharedString; import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments; import com.baomidou.mybatisplus.core.toolkit.support.SFunction; -import com.hccake.extend.mybatis.plus.alias.TableAliasHelper; +import org.ballcat.mybatisplus.alias.TableAliasHelper; +import org.ballcat.mybatisplus.alias.TableAlias; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; @@ -27,7 +28,7 @@ * 生成可携带表别名的查询条件 当前实体必须被配置表列名注解 * * @author Hccake 2021/1/14 - * @see com.hccake.extend.mybatis.plus.alias.TableAlias + * @see TableAlias */ public class LambdaAliasQueryWrapperX extends LambdaQueryWrapperX { diff --git a/mybatis-plus/ballcat-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/conditions/query/LambdaQueryWrapperX.java b/mybatis-plus/ballcat-mybatis-plus/src/main/java/org/ballcat/mybatisplus/conditions/query/LambdaQueryWrapperX.java similarity index 99% rename from mybatis-plus/ballcat-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/conditions/query/LambdaQueryWrapperX.java rename to mybatis-plus/ballcat-mybatis-plus/src/main/java/org/ballcat/mybatisplus/conditions/query/LambdaQueryWrapperX.java index 76d2e606e..636b21e06 100644 --- a/mybatis-plus/ballcat-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/conditions/query/LambdaQueryWrapperX.java +++ b/mybatis-plus/ballcat-mybatis-plus/src/main/java/org/ballcat/mybatisplus/conditions/query/LambdaQueryWrapperX.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.mybatis.plus.conditions.query; +package org.ballcat.mybatisplus.conditions.query; import com.baomidou.mybatisplus.core.conditions.AbstractLambdaWrapper; import com.baomidou.mybatisplus.core.conditions.SharedString; diff --git a/mybatis-plus/ballcat-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/injector/CustomSqlInjector.java b/mybatis-plus/ballcat-mybatis-plus/src/main/java/org/ballcat/mybatisplus/injector/CustomSqlInjector.java similarity index 96% rename from mybatis-plus/ballcat-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/injector/CustomSqlInjector.java rename to mybatis-plus/ballcat-mybatis-plus/src/main/java/org/ballcat/mybatisplus/injector/CustomSqlInjector.java index 1bc60fe87..080e81c28 100644 --- a/mybatis-plus/ballcat-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/injector/CustomSqlInjector.java +++ b/mybatis-plus/ballcat-mybatis-plus/src/main/java/org/ballcat/mybatisplus/injector/CustomSqlInjector.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.mybatis.plus.injector; +package org.ballcat.mybatisplus.injector; import com.baomidou.mybatisplus.core.injector.AbstractMethod; import com.baomidou.mybatisplus.core.injector.DefaultSqlInjector; diff --git a/mybatis-plus/ballcat-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/mapper/ExtendMapper.java b/mybatis-plus/ballcat-mybatis-plus/src/main/java/org/ballcat/mybatisplus/mapper/ExtendMapper.java similarity index 90% rename from mybatis-plus/ballcat-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/mapper/ExtendMapper.java rename to mybatis-plus/ballcat-mybatis-plus/src/main/java/org/ballcat/mybatisplus/mapper/ExtendMapper.java index 5e38688f2..8a02dd1ba 100644 --- a/mybatis-plus/ballcat-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/mapper/ExtendMapper.java +++ b/mybatis-plus/ballcat-mybatis-plus/src/main/java/org/ballcat/mybatisplus/mapper/ExtendMapper.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.mybatis.plus.mapper; +package org.ballcat.mybatisplus.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.injector.methods.InsertBatchSomeColumn; -import com.hccake.ballcat.common.model.domain.PageParam; -import com.hccake.extend.mybatis.plus.toolkit.PageUtil; +import org.ballcat.common.model.domain.PageParam; +import org.ballcat.mybatisplus.toolkit.PageUtil; import org.apache.ibatis.annotations.Param; import java.util.Collection; diff --git a/mybatis-plus/ballcat-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/methods/BaseInsertBatch.java b/mybatis-plus/ballcat-mybatis-plus/src/main/java/org/ballcat/mybatisplus/methods/BaseInsertBatch.java similarity index 98% rename from mybatis-plus/ballcat-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/methods/BaseInsertBatch.java rename to mybatis-plus/ballcat-mybatis-plus/src/main/java/org/ballcat/mybatisplus/methods/BaseInsertBatch.java index 35dfc8f30..03c81b112 100644 --- a/mybatis-plus/ballcat-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/methods/BaseInsertBatch.java +++ b/mybatis-plus/ballcat-mybatis-plus/src/main/java/org/ballcat/mybatisplus/methods/BaseInsertBatch.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.mybatis.plus.methods; +package org.ballcat.mybatisplus.methods; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.core.injector.AbstractMethod; diff --git a/mybatis-plus/ballcat-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/methods/InsertBatchSomeColumnByCollection.java b/mybatis-plus/ballcat-mybatis-plus/src/main/java/org/ballcat/mybatisplus/methods/InsertBatchSomeColumnByCollection.java similarity index 98% rename from mybatis-plus/ballcat-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/methods/InsertBatchSomeColumnByCollection.java rename to mybatis-plus/ballcat-mybatis-plus/src/main/java/org/ballcat/mybatisplus/methods/InsertBatchSomeColumnByCollection.java index 3c024d84f..618ac7b40 100644 --- a/mybatis-plus/ballcat-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/methods/InsertBatchSomeColumnByCollection.java +++ b/mybatis-plus/ballcat-mybatis-plus/src/main/java/org/ballcat/mybatisplus/methods/InsertBatchSomeColumnByCollection.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.mybatis.plus.methods; +package org.ballcat.mybatisplus.methods; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.core.enums.SqlMethod; diff --git a/mybatis-plus/ballcat-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/methods/InsertIgnoreByBatch.java b/mybatis-plus/ballcat-mybatis-plus/src/main/java/org/ballcat/mybatisplus/methods/InsertIgnoreByBatch.java similarity index 95% rename from mybatis-plus/ballcat-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/methods/InsertIgnoreByBatch.java rename to mybatis-plus/ballcat-mybatis-plus/src/main/java/org/ballcat/mybatisplus/methods/InsertIgnoreByBatch.java index eafc0a465..bf81a90a7 100644 --- a/mybatis-plus/ballcat-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/methods/InsertIgnoreByBatch.java +++ b/mybatis-plus/ballcat-mybatis-plus/src/main/java/org/ballcat/mybatisplus/methods/InsertIgnoreByBatch.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.mybatis.plus.methods; +package org.ballcat.mybatisplus.methods; /** * @author lingting 2020/5/27 11:47 diff --git a/mybatis-plus/ballcat-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/methods/InsertOrUpdateByBatch.java b/mybatis-plus/ballcat-mybatis-plus/src/main/java/org/ballcat/mybatisplus/methods/InsertOrUpdateByBatch.java similarity index 97% rename from mybatis-plus/ballcat-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/methods/InsertOrUpdateByBatch.java rename to mybatis-plus/ballcat-mybatis-plus/src/main/java/org/ballcat/mybatisplus/methods/InsertOrUpdateByBatch.java index a509d0478..6aa74c0b5 100644 --- a/mybatis-plus/ballcat-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/methods/InsertOrUpdateByBatch.java +++ b/mybatis-plus/ballcat-mybatis-plus/src/main/java/org/ballcat/mybatisplus/methods/InsertOrUpdateByBatch.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.mybatis.plus.methods; +package org.ballcat.mybatisplus.methods; import com.baomidou.mybatisplus.core.metadata.TableFieldInfo; import com.baomidou.mybatisplus.core.metadata.TableInfo; diff --git a/mybatis-plus/ballcat-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/methods/InsertOrUpdateFieldByBatch.java b/mybatis-plus/ballcat-mybatis-plus/src/main/java/org/ballcat/mybatisplus/methods/InsertOrUpdateFieldByBatch.java similarity index 97% rename from mybatis-plus/ballcat-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/methods/InsertOrUpdateFieldByBatch.java rename to mybatis-plus/ballcat-mybatis-plus/src/main/java/org/ballcat/mybatisplus/methods/InsertOrUpdateFieldByBatch.java index 409265ed4..a1b88b59c 100644 --- a/mybatis-plus/ballcat-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/methods/InsertOrUpdateFieldByBatch.java +++ b/mybatis-plus/ballcat-mybatis-plus/src/main/java/org/ballcat/mybatisplus/methods/InsertOrUpdateFieldByBatch.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.mybatis.plus.methods; +package org.ballcat.mybatisplus.methods; import com.baomidou.mybatisplus.core.metadata.TableInfo; diff --git a/mybatis-plus/ballcat-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/service/ExtendService.java b/mybatis-plus/ballcat-mybatis-plus/src/main/java/org/ballcat/mybatisplus/service/ExtendService.java similarity index 99% rename from mybatis-plus/ballcat-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/service/ExtendService.java rename to mybatis-plus/ballcat-mybatis-plus/src/main/java/org/ballcat/mybatisplus/service/ExtendService.java index 450f2da24..9dab8c066 100644 --- a/mybatis-plus/ballcat-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/service/ExtendService.java +++ b/mybatis-plus/ballcat-mybatis-plus/src/main/java/org/ballcat/mybatisplus/service/ExtendService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.mybatis.plus.service; +package org.ballcat.mybatisplus.service; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; diff --git a/mybatis-plus/ballcat-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/service/impl/ExtendServiceImpl.java b/mybatis-plus/ballcat-mybatis-plus/src/main/java/org/ballcat/mybatisplus/service/impl/ExtendServiceImpl.java similarity index 98% rename from mybatis-plus/ballcat-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/service/impl/ExtendServiceImpl.java rename to mybatis-plus/ballcat-mybatis-plus/src/main/java/org/ballcat/mybatisplus/service/impl/ExtendServiceImpl.java index 3e99f4f98..2a658c813 100644 --- a/mybatis-plus/ballcat-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/service/impl/ExtendServiceImpl.java +++ b/mybatis-plus/ballcat-mybatis-plus/src/main/java/org/ballcat/mybatisplus/service/impl/ExtendServiceImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.mybatis.plus.service.impl; +package org.ballcat.mybatisplus.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; @@ -26,8 +26,8 @@ import com.baomidou.mybatisplus.core.toolkit.ReflectionKit; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; -import com.hccake.extend.mybatis.plus.mapper.ExtendMapper; -import com.hccake.extend.mybatis.plus.service.ExtendService; +import org.ballcat.mybatisplus.mapper.ExtendMapper; +import org.ballcat.mybatisplus.service.ExtendService; import org.apache.ibatis.binding.MapperMethod; import org.apache.ibatis.logging.Log; import org.apache.ibatis.logging.LogFactory; diff --git a/mybatis-plus/ballcat-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/toolkit/PageUtil.java b/mybatis-plus/ballcat-mybatis-plus/src/main/java/org/ballcat/mybatisplus/toolkit/PageUtil.java similarity index 93% rename from mybatis-plus/ballcat-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/toolkit/PageUtil.java rename to mybatis-plus/ballcat-mybatis-plus/src/main/java/org/ballcat/mybatisplus/toolkit/PageUtil.java index 47470bf1e..b617baa97 100644 --- a/mybatis-plus/ballcat-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/toolkit/PageUtil.java +++ b/mybatis-plus/ballcat-mybatis-plus/src/main/java/org/ballcat/mybatisplus/toolkit/PageUtil.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.mybatis.plus.toolkit; +package org.ballcat.mybatisplus.toolkit; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.OrderItem; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.hccake.ballcat.common.model.domain.PageParam; +import org.ballcat.common.model.domain.PageParam; import java.util.List; diff --git a/mybatis-plus/ballcat-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/toolkit/WrappersX.java b/mybatis-plus/ballcat-mybatis-plus/src/main/java/org/ballcat/mybatisplus/toolkit/WrappersX.java similarity index 93% rename from mybatis-plus/ballcat-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/toolkit/WrappersX.java rename to mybatis-plus/ballcat-mybatis-plus/src/main/java/org/ballcat/mybatisplus/toolkit/WrappersX.java index 1fe9fbfd1..f530323c0 100644 --- a/mybatis-plus/ballcat-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/toolkit/WrappersX.java +++ b/mybatis-plus/ballcat-mybatis-plus/src/main/java/org/ballcat/mybatisplus/toolkit/WrappersX.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.mybatis.plus.toolkit; +package org.ballcat.mybatisplus.toolkit; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.hccake.extend.mybatis.plus.conditions.query.LambdaAliasQueryWrapperX; -import com.hccake.extend.mybatis.plus.conditions.query.LambdaQueryWrapperX; +import org.ballcat.mybatisplus.conditions.query.LambdaAliasQueryWrapperX; +import org.ballcat.mybatisplus.conditions.query.LambdaQueryWrapperX; /** * @author Hccake 2021/1/14 diff --git a/mybatis-plus/ballcat-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/type/EnumNameTypeHandler.java b/mybatis-plus/ballcat-mybatis-plus/src/main/java/org/ballcat/mybatisplus/type/EnumNameTypeHandler.java similarity index 98% rename from mybatis-plus/ballcat-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/type/EnumNameTypeHandler.java rename to mybatis-plus/ballcat-mybatis-plus/src/main/java/org/ballcat/mybatisplus/type/EnumNameTypeHandler.java index 96f30fc93..5856cbbcd 100644 --- a/mybatis-plus/ballcat-mybatis-plus/src/main/java/com/hccake/extend/mybatis/plus/type/EnumNameTypeHandler.java +++ b/mybatis-plus/ballcat-mybatis-plus/src/main/java/org/ballcat/mybatisplus/type/EnumNameTypeHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.mybatis.plus.type; +package org.ballcat.mybatisplus.type; import com.baomidou.mybatisplus.annotation.IEnum; import org.apache.ibatis.type.BaseTypeHandler; diff --git a/mybatis-plus/ballcat-mybatis-plus/src/test/java/com/ballcat/extend/mybatis/plus/Demo.java b/mybatis-plus/ballcat-mybatis-plus/src/test/java/org/ballcat/mybatisplus/Demo.java similarity index 89% rename from mybatis-plus/ballcat-mybatis-plus/src/test/java/com/ballcat/extend/mybatis/plus/Demo.java rename to mybatis-plus/ballcat-mybatis-plus/src/test/java/org/ballcat/mybatisplus/Demo.java index 785fae1b4..3604bccba 100644 --- a/mybatis-plus/ballcat-mybatis-plus/src/test/java/com/ballcat/extend/mybatis/plus/Demo.java +++ b/mybatis-plus/ballcat-mybatis-plus/src/test/java/org/ballcat/mybatisplus/Demo.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ballcat.extend.mybatis.plus; +package org.ballcat.mybatisplus; import com.baomidou.mybatisplus.annotation.TableName; -import com.hccake.extend.mybatis.plus.alias.TableAlias; +import org.ballcat.mybatisplus.alias.TableAlias; import lombok.Data; /** diff --git a/mybatis-plus/ballcat-mybatis-plus/src/test/java/com/ballcat/extend/mybatis/plus/LambdaAliasQueryXTest.java b/mybatis-plus/ballcat-mybatis-plus/src/test/java/org/ballcat/mybatisplus/LambdaAliasQueryXTest.java similarity index 90% rename from mybatis-plus/ballcat-mybatis-plus/src/test/java/com/ballcat/extend/mybatis/plus/LambdaAliasQueryXTest.java rename to mybatis-plus/ballcat-mybatis-plus/src/test/java/org/ballcat/mybatisplus/LambdaAliasQueryXTest.java index f29ee9789..7aeb9a6ef 100644 --- a/mybatis-plus/ballcat-mybatis-plus/src/test/java/com/ballcat/extend/mybatis/plus/LambdaAliasQueryXTest.java +++ b/mybatis-plus/ballcat-mybatis-plus/src/test/java/org/ballcat/mybatisplus/LambdaAliasQueryXTest.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ballcat.extend.mybatis.plus; +package org.ballcat.mybatisplus; import com.baomidou.mybatisplus.core.MybatisConfiguration; import com.baomidou.mybatisplus.core.metadata.TableInfoHelper; -import com.hccake.extend.mybatis.plus.conditions.query.LambdaQueryWrapperX; -import com.hccake.extend.mybatis.plus.conditions.query.ColumnFunction; -import com.hccake.extend.mybatis.plus.toolkit.WrappersX; +import org.ballcat.mybatisplus.conditions.query.LambdaQueryWrapperX; +import org.ballcat.mybatisplus.conditions.query.ColumnFunction; +import org.ballcat.mybatisplus.toolkit.WrappersX; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.builder.MapperBuilderAssistant; import org.junit.jupiter.api.Assertions; diff --git a/ntp/ballcat-ntp/src/main/java/com/hccake/ballcat/extend/ntp/Ntp.java b/ntp/ballcat-ntp/src/main/java/org/ballcat/ntp/Ntp.java similarity index 97% rename from ntp/ballcat-ntp/src/main/java/com/hccake/ballcat/extend/ntp/Ntp.java rename to ntp/ballcat-ntp/src/main/java/org/ballcat/ntp/Ntp.java index b9fa2c15b..dcf577f5d 100644 --- a/ntp/ballcat-ntp/src/main/java/com/hccake/ballcat/extend/ntp/Ntp.java +++ b/ntp/ballcat-ntp/src/main/java/org/ballcat/ntp/Ntp.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.extend.ntp; +package org.ballcat.ntp; import lombok.extern.slf4j.Slf4j; import org.apache.commons.net.ntp.NTPUDPClient; diff --git a/ntp/ballcat-ntp/src/main/java/com/hccake/ballcat/extend/ntp/NtpCn.java b/ntp/ballcat-ntp/src/main/java/org/ballcat/ntp/NtpCn.java similarity index 97% rename from ntp/ballcat-ntp/src/main/java/com/hccake/ballcat/extend/ntp/NtpCn.java rename to ntp/ballcat-ntp/src/main/java/org/ballcat/ntp/NtpCn.java index 761a9ddb3..11d3a6b8d 100644 --- a/ntp/ballcat-ntp/src/main/java/com/hccake/ballcat/extend/ntp/NtpCn.java +++ b/ntp/ballcat-ntp/src/main/java/org/ballcat/ntp/NtpCn.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.extend.ntp; +package org.ballcat.ntp; import lombok.experimental.UtilityClass; diff --git a/ntp/ballcat-ntp/src/main/java/com/hccake/ballcat/extend/ntp/NtpException.java b/ntp/ballcat-ntp/src/main/java/org/ballcat/ntp/NtpException.java similarity index 95% rename from ntp/ballcat-ntp/src/main/java/com/hccake/ballcat/extend/ntp/NtpException.java rename to ntp/ballcat-ntp/src/main/java/org/ballcat/ntp/NtpException.java index dc9963a29..de7f9e7cc 100644 --- a/ntp/ballcat-ntp/src/main/java/com/hccake/ballcat/extend/ntp/NtpException.java +++ b/ntp/ballcat-ntp/src/main/java/org/ballcat/ntp/NtpException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.extend.ntp; +package org.ballcat.ntp; /** * @author lingting 2022/11/24 10:13 diff --git a/ntp/ballcat-ntp/src/test/java/com/hccake/ballcat/extend/ntp/NtpTest.java b/ntp/ballcat-ntp/src/test/java/org/ballcat/ntp/NtpTest.java similarity index 96% rename from ntp/ballcat-ntp/src/test/java/com/hccake/ballcat/extend/ntp/NtpTest.java rename to ntp/ballcat-ntp/src/test/java/org/ballcat/ntp/NtpTest.java index 551503f09..990579cee 100644 --- a/ntp/ballcat-ntp/src/test/java/com/hccake/ballcat/extend/ntp/NtpTest.java +++ b/ntp/ballcat-ntp/src/test/java/org/ballcat/ntp/NtpTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.extend.ntp; +package org.ballcat.ntp; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/openapi/ballcat-spring-boot-starter-openapi/src/main/java/com/hccake/ballcat/extend/openapi/OpenApiAutoConfiguration.java b/openapi/ballcat-spring-boot-starter-openapi/src/main/java/org/ballcat/autoconfigure/openapi/OpenApiAutoConfiguration.java similarity index 94% rename from openapi/ballcat-spring-boot-starter-openapi/src/main/java/com/hccake/ballcat/extend/openapi/OpenApiAutoConfiguration.java rename to openapi/ballcat-spring-boot-starter-openapi/src/main/java/org/ballcat/autoconfigure/openapi/OpenApiAutoConfiguration.java index a8c2f88fe..dc038c7b3 100644 --- a/openapi/ballcat-spring-boot-starter-openapi/src/main/java/com/hccake/ballcat/extend/openapi/OpenApiAutoConfiguration.java +++ b/openapi/ballcat-spring-boot-starter-openapi/src/main/java/org/ballcat/autoconfigure/openapi/OpenApiAutoConfiguration.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.extend.openapi; +package org.ballcat.autoconfigure.openapi; -import com.hccake.ballcat.common.model.domain.PageableConstants; -import com.hccake.ballcat.autoconfigure.web.pageable.PageableProperties; -import com.hccake.ballcat.common.model.domain.PageParam; -import com.hccake.ballcat.extend.openapi.pageable.PageParamOpenAPIConverter; -import com.hccake.ballcat.extend.openapi.pageable.PageableRequestClassCreator; +import org.ballcat.common.model.domain.PageableConstants; +import org.ballcat.autoconfigure.web.pageable.PageableProperties; +import org.ballcat.common.model.domain.PageParam; +import org.ballcat.openapi.pageable.PageParamOpenAPIConverter; +import org.ballcat.openapi.pageable.PageableRequestClassCreator; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.info.Info; import lombok.RequiredArgsConstructor; diff --git a/openapi/ballcat-spring-boot-starter-openapi/src/main/java/com/hccake/ballcat/extend/openapi/OpenApiProperties.java b/openapi/ballcat-spring-boot-starter-openapi/src/main/java/org/ballcat/autoconfigure/openapi/OpenApiProperties.java similarity index 99% rename from openapi/ballcat-spring-boot-starter-openapi/src/main/java/com/hccake/ballcat/extend/openapi/OpenApiProperties.java rename to openapi/ballcat-spring-boot-starter-openapi/src/main/java/org/ballcat/autoconfigure/openapi/OpenApiProperties.java index 8be14d09e..f19d2685c 100644 --- a/openapi/ballcat-spring-boot-starter-openapi/src/main/java/com/hccake/ballcat/extend/openapi/OpenApiProperties.java +++ b/openapi/ballcat-spring-boot-starter-openapi/src/main/java/org/ballcat/autoconfigure/openapi/OpenApiProperties.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.extend.openapi; +package org.ballcat.autoconfigure.openapi; import cn.hutool.core.collection.ListUtil; import io.swagger.v3.oas.models.Components; diff --git a/openapi/ballcat-spring-boot-starter-openapi/src/main/java/com/hccake/ballcat/extend/openapi/SwaggerEnabledStatusReplaceEnvironmentPostProcessor.java b/openapi/ballcat-spring-boot-starter-openapi/src/main/java/org/ballcat/autoconfigure/openapi/SwaggerEnabledStatusReplaceEnvironmentPostProcessor.java similarity index 98% rename from openapi/ballcat-spring-boot-starter-openapi/src/main/java/com/hccake/ballcat/extend/openapi/SwaggerEnabledStatusReplaceEnvironmentPostProcessor.java rename to openapi/ballcat-spring-boot-starter-openapi/src/main/java/org/ballcat/autoconfigure/openapi/SwaggerEnabledStatusReplaceEnvironmentPostProcessor.java index 54bbe3659..5ec276316 100644 --- a/openapi/ballcat-spring-boot-starter-openapi/src/main/java/com/hccake/ballcat/extend/openapi/SwaggerEnabledStatusReplaceEnvironmentPostProcessor.java +++ b/openapi/ballcat-spring-boot-starter-openapi/src/main/java/org/ballcat/autoconfigure/openapi/SwaggerEnabledStatusReplaceEnvironmentPostProcessor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.extend.openapi; +package org.ballcat.autoconfigure.openapi; import org.springdoc.core.Constants; import org.springframework.boot.SpringApplication; diff --git a/openapi/ballcat-spring-boot-starter-openapi/src/main/java/com/hccake/ballcat/extend/openapi/pageable/ByteClassLoader.java b/openapi/ballcat-spring-boot-starter-openapi/src/main/java/org/ballcat/openapi/pageable/ByteClassLoader.java similarity index 94% rename from openapi/ballcat-spring-boot-starter-openapi/src/main/java/com/hccake/ballcat/extend/openapi/pageable/ByteClassLoader.java rename to openapi/ballcat-spring-boot-starter-openapi/src/main/java/org/ballcat/openapi/pageable/ByteClassLoader.java index 827de950e..e29b754ad 100644 --- a/openapi/ballcat-spring-boot-starter-openapi/src/main/java/com/hccake/ballcat/extend/openapi/pageable/ByteClassLoader.java +++ b/openapi/ballcat-spring-boot-starter-openapi/src/main/java/org/ballcat/openapi/pageable/ByteClassLoader.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.extend.openapi.pageable; +package org.ballcat.openapi.pageable; /** * 通过内存的字节数组直接加载 class diff --git a/openapi/ballcat-spring-boot-starter-openapi/src/main/java/com/hccake/ballcat/extend/openapi/pageable/PageParamOpenAPIConverter.java b/openapi/ballcat-spring-boot-starter-openapi/src/main/java/org/ballcat/openapi/pageable/PageParamOpenAPIConverter.java similarity index 90% rename from openapi/ballcat-spring-boot-starter-openapi/src/main/java/com/hccake/ballcat/extend/openapi/pageable/PageParamOpenAPIConverter.java rename to openapi/ballcat-spring-boot-starter-openapi/src/main/java/org/ballcat/openapi/pageable/PageParamOpenAPIConverter.java index 4a2b13546..2a453082d 100644 --- a/openapi/ballcat-spring-boot-starter-openapi/src/main/java/com/hccake/ballcat/extend/openapi/pageable/PageParamOpenAPIConverter.java +++ b/openapi/ballcat-spring-boot-starter-openapi/src/main/java/org/ballcat/openapi/pageable/PageParamOpenAPIConverter.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.extend.openapi.pageable; +package org.ballcat.openapi.pageable; import com.fasterxml.jackson.databind.JavaType; -import com.hccake.ballcat.common.model.domain.PageParam; +import org.ballcat.common.model.domain.PageParam; import io.swagger.v3.core.converter.AnnotatedType; import io.swagger.v3.core.converter.ModelConverter; import io.swagger.v3.core.converter.ModelConverterContext; @@ -36,7 +36,7 @@ public class PageParamOpenAPIConverter implements ModelConverter { /** * The constant PAGEABLE_TO_REPLACE. */ - private static final String PAGE_PARAM_TO_REPLACE = "com.hccake.ballcat.common.model.domain.PageParam"; + private static final String PAGE_PARAM_TO_REPLACE = PageParam.class.getName(); /** * The constant PAGE_PARAM. @@ -80,4 +80,8 @@ public Schema resolve(AnnotatedType type, ModelConverterContext context, Iterato return (chain.hasNext()) ? chain.next().resolve(type, context, chain) : null; } + public static void main(String[] args) { + System.out.printf(PageParam.class.getName()); + } + } \ No newline at end of file diff --git a/openapi/ballcat-spring-boot-starter-openapi/src/main/java/com/hccake/ballcat/extend/openapi/pageable/PageableRequest.java b/openapi/ballcat-spring-boot-starter-openapi/src/main/java/org/ballcat/openapi/pageable/PageableRequest.java similarity index 92% rename from openapi/ballcat-spring-boot-starter-openapi/src/main/java/com/hccake/ballcat/extend/openapi/pageable/PageableRequest.java rename to openapi/ballcat-spring-boot-starter-openapi/src/main/java/org/ballcat/openapi/pageable/PageableRequest.java index 965d4e2cb..e89d501bc 100644 --- a/openapi/ballcat-spring-boot-starter-openapi/src/main/java/com/hccake/ballcat/extend/openapi/pageable/PageableRequest.java +++ b/openapi/ballcat-spring-boot-starter-openapi/src/main/java/org/ballcat/openapi/pageable/PageableRequest.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.extend.openapi.pageable; +package org.ballcat.openapi.pageable; -import com.hccake.ballcat.common.model.domain.PageParam; -import com.hccake.ballcat.common.model.domain.PageableConstants; +import org.ballcat.common.model.domain.PageParam; +import org.ballcat.common.model.domain.PageableConstants; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.media.ArraySchema; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/openapi/ballcat-spring-boot-starter-openapi/src/main/java/com/hccake/ballcat/extend/openapi/pageable/PageableRequestClassCreator.java b/openapi/ballcat-spring-boot-starter-openapi/src/main/java/org/ballcat/openapi/pageable/PageableRequestClassCreator.java similarity index 98% rename from openapi/ballcat-spring-boot-starter-openapi/src/main/java/com/hccake/ballcat/extend/openapi/pageable/PageableRequestClassCreator.java rename to openapi/ballcat-spring-boot-starter-openapi/src/main/java/org/ballcat/openapi/pageable/PageableRequestClassCreator.java index 8b95f255d..6d99c28de 100644 --- a/openapi/ballcat-spring-boot-starter-openapi/src/main/java/com/hccake/ballcat/extend/openapi/pageable/PageableRequestClassCreator.java +++ b/openapi/ballcat-spring-boot-starter-openapi/src/main/java/org/ballcat/openapi/pageable/PageableRequestClassCreator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.extend.openapi.pageable; +package org.ballcat.openapi.pageable; import cn.hutool.core.text.CharSequenceUtil; import org.springframework.asm.ClassReader; diff --git a/openapi/ballcat-spring-boot-starter-openapi/src/main/resources/META-INF/spring.factories b/openapi/ballcat-spring-boot-starter-openapi/src/main/resources/META-INF/spring.factories index 107ec2627..1a382da84 100644 --- a/openapi/ballcat-spring-boot-starter-openapi/src/main/resources/META-INF/spring.factories +++ b/openapi/ballcat-spring-boot-starter-openapi/src/main/resources/META-INF/spring.factories @@ -1,6 +1,6 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.hccake.ballcat.extend.openapi.OpenApiAutoConfiguration + org.ballcat.autoconfigure.openapi.OpenApiAutoConfiguration # Environment Post Processor org.springframework.boot.env.EnvironmentPostProcessor=\ - com.hccake.ballcat.extend.openapi.SwaggerEnabledStatusReplaceEnvironmentPostProcessor \ No newline at end of file + org.ballcat.autoconfigure.openapi.SwaggerEnabledStatusReplaceEnvironmentPostProcessor \ No newline at end of file diff --git a/openapi/ballcat-spring-boot-starter-openapi/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/openapi/ballcat-spring-boot-starter-openapi/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 6515db561..38cd877b9 100644 --- a/openapi/ballcat-spring-boot-starter-openapi/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/openapi/ballcat-spring-boot-starter-openapi/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.hccake.ballcat.extend.openapi.OpenApiAutoConfiguration \ No newline at end of file +org.ballcat.autoconfigure.openapi.OpenApiAutoConfiguration \ No newline at end of file diff --git a/openapi/ballcat-spring-boot-starter-openapi/src/main/resources/META-INF/spring/org.springframework.boot.env.EnvironmentPostProcessor.imports b/openapi/ballcat-spring-boot-starter-openapi/src/main/resources/META-INF/spring/org.springframework.boot.env.EnvironmentPostProcessor.imports index 1675455c4..26857191b 100644 --- a/openapi/ballcat-spring-boot-starter-openapi/src/main/resources/META-INF/spring/org.springframework.boot.env.EnvironmentPostProcessor.imports +++ b/openapi/ballcat-spring-boot-starter-openapi/src/main/resources/META-INF/spring/org.springframework.boot.env.EnvironmentPostProcessor.imports @@ -1 +1 @@ -com.hccake.ballcat.extend.openapi.SwaggerEnabledStatusReplaceEnvironmentPostProcessor \ No newline at end of file +org.ballcat.autoconfigure.openapi.SwaggerEnabledStatusReplaceEnvironmentPostProcessor \ No newline at end of file diff --git a/oss/ballcat-spring-boot-starter-oss/src/main/java/com/hccake/ballcat/common/oss/DefaultOssTemplate.java b/oss/ballcat-spring-boot-starter-oss/src/main/java/org/ballcat/oss/DefaultOssTemplate.java similarity index 99% rename from oss/ballcat-spring-boot-starter-oss/src/main/java/com/hccake/ballcat/common/oss/DefaultOssTemplate.java rename to oss/ballcat-spring-boot-starter-oss/src/main/java/org/ballcat/oss/DefaultOssTemplate.java index fe3b59539..880378363 100644 --- a/oss/ballcat-spring-boot-starter-oss/src/main/java/com/hccake/ballcat/common/oss/DefaultOssTemplate.java +++ b/oss/ballcat-spring-boot-starter-oss/src/main/java/org/ballcat/oss/DefaultOssTemplate.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.oss; +package org.ballcat.oss; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/oss/ballcat-spring-boot-starter-oss/src/main/java/com/hccake/ballcat/common/oss/ObjectWithGlobalKeyPrefixOssTemplate.java b/oss/ballcat-spring-boot-starter-oss/src/main/java/org/ballcat/oss/ObjectWithGlobalKeyPrefixOssTemplate.java similarity index 99% rename from oss/ballcat-spring-boot-starter-oss/src/main/java/com/hccake/ballcat/common/oss/ObjectWithGlobalKeyPrefixOssTemplate.java rename to oss/ballcat-spring-boot-starter-oss/src/main/java/org/ballcat/oss/ObjectWithGlobalKeyPrefixOssTemplate.java index af9f6ff72..cd06ba5bb 100644 --- a/oss/ballcat-spring-boot-starter-oss/src/main/java/com/hccake/ballcat/common/oss/ObjectWithGlobalKeyPrefixOssTemplate.java +++ b/oss/ballcat-spring-boot-starter-oss/src/main/java/org/ballcat/oss/ObjectWithGlobalKeyPrefixOssTemplate.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.oss; +package org.ballcat.oss; -import com.hccake.ballcat.common.oss.prefix.ObjectKeyPrefixConverter; +import org.ballcat.oss.prefix.ObjectKeyPrefixConverter; import lombok.Getter; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; diff --git a/oss/ballcat-spring-boot-starter-oss/src/main/java/com/hccake/ballcat/common/oss/OssAutoConfiguration.java b/oss/ballcat-spring-boot-starter-oss/src/main/java/org/ballcat/oss/OssAutoConfiguration.java similarity index 96% rename from oss/ballcat-spring-boot-starter-oss/src/main/java/com/hccake/ballcat/common/oss/OssAutoConfiguration.java rename to oss/ballcat-spring-boot-starter-oss/src/main/java/org/ballcat/oss/OssAutoConfiguration.java index fbc9418e5..ae800cca6 100644 --- a/oss/ballcat-spring-boot-starter-oss/src/main/java/com/hccake/ballcat/common/oss/OssAutoConfiguration.java +++ b/oss/ballcat-spring-boot-starter-oss/src/main/java/org/ballcat/oss/OssAutoConfiguration.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.oss; +package org.ballcat.oss; -import com.hccake.ballcat.common.oss.prefix.DefaultObjectKeyPrefixConverter; -import com.hccake.ballcat.common.oss.prefix.ObjectKeyPrefixConverter; +import org.ballcat.oss.prefix.DefaultObjectKeyPrefixConverter; +import org.ballcat.oss.prefix.ObjectKeyPrefixConverter; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/oss/ballcat-spring-boot-starter-oss/src/main/java/com/hccake/ballcat/common/oss/OssClient.java b/oss/ballcat-spring-boot-starter-oss/src/main/java/org/ballcat/oss/OssClient.java similarity index 96% rename from oss/ballcat-spring-boot-starter-oss/src/main/java/com/hccake/ballcat/common/oss/OssClient.java rename to oss/ballcat-spring-boot-starter-oss/src/main/java/org/ballcat/oss/OssClient.java index 83450c367..4f639eda8 100644 --- a/oss/ballcat-spring-boot-starter-oss/src/main/java/com/hccake/ballcat/common/oss/OssClient.java +++ b/oss/ballcat-spring-boot-starter-oss/src/main/java/org/ballcat/oss/OssClient.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.oss; +package org.ballcat.oss; -import com.hccake.ballcat.common.oss.prefix.ObjectKeyPrefixConverter; +import org.ballcat.oss.prefix.ObjectKeyPrefixConverter; import lombok.RequiredArgsConstructor; import software.amazon.awssdk.core.sync.RequestBody; import software.amazon.awssdk.services.s3.model.ObjectCannedACL; diff --git a/oss/ballcat-spring-boot-starter-oss/src/main/java/com/hccake/ballcat/common/oss/OssConstants.java b/oss/ballcat-spring-boot-starter-oss/src/main/java/org/ballcat/oss/OssConstants.java similarity index 95% rename from oss/ballcat-spring-boot-starter-oss/src/main/java/com/hccake/ballcat/common/oss/OssConstants.java rename to oss/ballcat-spring-boot-starter-oss/src/main/java/org/ballcat/oss/OssConstants.java index 39e7e008b..f2aad116c 100644 --- a/oss/ballcat-spring-boot-starter-oss/src/main/java/com/hccake/ballcat/common/oss/OssConstants.java +++ b/oss/ballcat-spring-boot-starter-oss/src/main/java/org/ballcat/oss/OssConstants.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.oss; +package org.ballcat.oss; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/oss/ballcat-spring-boot-starter-oss/src/main/java/com/hccake/ballcat/common/oss/OssProperties.java b/oss/ballcat-spring-boot-starter-oss/src/main/java/org/ballcat/oss/OssProperties.java similarity index 99% rename from oss/ballcat-spring-boot-starter-oss/src/main/java/com/hccake/ballcat/common/oss/OssProperties.java rename to oss/ballcat-spring-boot-starter-oss/src/main/java/org/ballcat/oss/OssProperties.java index 558f219ee..3048199c0 100644 --- a/oss/ballcat-spring-boot-starter-oss/src/main/java/com/hccake/ballcat/common/oss/OssProperties.java +++ b/oss/ballcat-spring-boot-starter-oss/src/main/java/org/ballcat/oss/OssProperties.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.oss; +package org.ballcat.oss; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/oss/ballcat-spring-boot-starter-oss/src/main/java/com/hccake/ballcat/common/oss/OssTemplate.java b/oss/ballcat-spring-boot-starter-oss/src/main/java/org/ballcat/oss/OssTemplate.java similarity index 99% rename from oss/ballcat-spring-boot-starter-oss/src/main/java/com/hccake/ballcat/common/oss/OssTemplate.java rename to oss/ballcat-spring-boot-starter-oss/src/main/java/org/ballcat/oss/OssTemplate.java index 37f865070..8e49cfa72 100644 --- a/oss/ballcat-spring-boot-starter-oss/src/main/java/com/hccake/ballcat/common/oss/OssTemplate.java +++ b/oss/ballcat-spring-boot-starter-oss/src/main/java/org/ballcat/oss/OssTemplate.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.oss; +package org.ballcat.oss; import org.springframework.lang.NonNull; import software.amazon.awssdk.awscore.exception.AwsServiceException; diff --git a/oss/ballcat-spring-boot-starter-oss/src/main/java/com/hccake/ballcat/common/oss/prefix/DefaultObjectKeyPrefixConverter.java b/oss/ballcat-spring-boot-starter-oss/src/main/java/org/ballcat/oss/prefix/DefaultObjectKeyPrefixConverter.java similarity index 96% rename from oss/ballcat-spring-boot-starter-oss/src/main/java/com/hccake/ballcat/common/oss/prefix/DefaultObjectKeyPrefixConverter.java rename to oss/ballcat-spring-boot-starter-oss/src/main/java/org/ballcat/oss/prefix/DefaultObjectKeyPrefixConverter.java index 5e65dbb68..d35f742fc 100644 --- a/oss/ballcat-spring-boot-starter-oss/src/main/java/com/hccake/ballcat/common/oss/prefix/DefaultObjectKeyPrefixConverter.java +++ b/oss/ballcat-spring-boot-starter-oss/src/main/java/org/ballcat/oss/prefix/DefaultObjectKeyPrefixConverter.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.oss.prefix; +package org.ballcat.oss.prefix; -import com.hccake.ballcat.common.oss.OssConstants; -import com.hccake.ballcat.common.oss.OssProperties; +import org.ballcat.oss.OssConstants; +import org.ballcat.oss.OssProperties; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.InitializingBean; diff --git a/oss/ballcat-spring-boot-starter-oss/src/main/java/com/hccake/ballcat/common/oss/prefix/ObjectKeyPrefixConverter.java b/oss/ballcat-spring-boot-starter-oss/src/main/java/org/ballcat/oss/prefix/ObjectKeyPrefixConverter.java similarity index 96% rename from oss/ballcat-spring-boot-starter-oss/src/main/java/com/hccake/ballcat/common/oss/prefix/ObjectKeyPrefixConverter.java rename to oss/ballcat-spring-boot-starter-oss/src/main/java/org/ballcat/oss/prefix/ObjectKeyPrefixConverter.java index 4e456c4dc..d0a83c0cd 100644 --- a/oss/ballcat-spring-boot-starter-oss/src/main/java/com/hccake/ballcat/common/oss/prefix/ObjectKeyPrefixConverter.java +++ b/oss/ballcat-spring-boot-starter-oss/src/main/java/org/ballcat/oss/prefix/ObjectKeyPrefixConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.oss.prefix; +package org.ballcat.oss.prefix; /** * 存储对象 key前缀生成器 diff --git a/oss/ballcat-spring-boot-starter-oss/src/main/resources/META-INF/spring.factories b/oss/ballcat-spring-boot-starter-oss/src/main/resources/META-INF/spring.factories index 954d42a2b..b84e7fd6d 100644 --- a/oss/ballcat-spring-boot-starter-oss/src/main/resources/META-INF/spring.factories +++ b/oss/ballcat-spring-boot-starter-oss/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.hccake.ballcat.common.oss.OssAutoConfiguration \ No newline at end of file + org.ballcat.oss.OssAutoConfiguration \ No newline at end of file diff --git a/oss/ballcat-spring-boot-starter-oss/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/oss/ballcat-spring-boot-starter-oss/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 0d2c9abb8..b4d8b7e7b 100644 --- a/oss/ballcat-spring-boot-starter-oss/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/oss/ballcat-spring-boot-starter-oss/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.hccake.ballcat.common.oss.OssAutoConfiguration \ No newline at end of file +org.ballcat.oss.OssAutoConfiguration \ No newline at end of file diff --git a/oss/ballcat-spring-boot-starter-oss/src/test/java/com/ballcat/startes/oss/test/AbstractOssTemplateTest.java b/oss/ballcat-spring-boot-starter-oss/src/test/java/org/ballcat/oss/AbstractOssTemplateTest.java similarity index 84% rename from oss/ballcat-spring-boot-starter-oss/src/test/java/com/ballcat/startes/oss/test/AbstractOssTemplateTest.java rename to oss/ballcat-spring-boot-starter-oss/src/test/java/org/ballcat/oss/AbstractOssTemplateTest.java index 0d3fd7a1e..919dc530e 100644 --- a/oss/ballcat-spring-boot-starter-oss/src/test/java/com/ballcat/startes/oss/test/AbstractOssTemplateTest.java +++ b/oss/ballcat-spring-boot-starter-oss/src/test/java/org/ballcat/oss/AbstractOssTemplateTest.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ballcat.startes.oss.test; +package org.ballcat.oss; -import com.hccake.ballcat.common.oss.OssAutoConfiguration; -import com.hccake.ballcat.common.oss.OssTemplate; -import com.hccake.ballcat.common.oss.prefix.ObjectKeyPrefixConverter; +import org.ballcat.oss.OssAutoConfiguration; +import org.ballcat.oss.OssTemplate; +import org.ballcat.oss.prefix.ObjectKeyPrefixConverter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; diff --git a/oss/ballcat-spring-boot-starter-oss/src/test/java/com/ballcat/startes/oss/test/MinioOssTemplateTest.java b/oss/ballcat-spring-boot-starter-oss/src/test/java/org/ballcat/oss/MinioOssTemplateTest.java similarity index 96% rename from oss/ballcat-spring-boot-starter-oss/src/test/java/com/ballcat/startes/oss/test/MinioOssTemplateTest.java rename to oss/ballcat-spring-boot-starter-oss/src/test/java/org/ballcat/oss/MinioOssTemplateTest.java index 84c5ba3e2..235c0d33f 100644 --- a/oss/ballcat-spring-boot-starter-oss/src/test/java/com/ballcat/startes/oss/test/MinioOssTemplateTest.java +++ b/oss/ballcat-spring-boot-starter-oss/src/test/java/org/ballcat/oss/MinioOssTemplateTest.java @@ -13,10 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.ballcat.startes.oss.test; +package org.ballcat.oss; -import com.hccake.ballcat.common.oss.DefaultOssTemplate; -import com.hccake.ballcat.common.oss.ObjectWithGlobalKeyPrefixOssTemplate; import lombok.RequiredArgsConstructor; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/pay/ballcat-pay-ali/src/main/java/com/hccake/extend/pay/ali/AliPay.java b/pay/ballcat-pay-ali/src/main/java/org/ballcat/pay/ali/AliPay.java similarity index 98% rename from pay/ballcat-pay-ali/src/main/java/com/hccake/extend/pay/ali/AliPay.java rename to pay/ballcat-pay-ali/src/main/java/org/ballcat/pay/ali/AliPay.java index 317de89a8..4e74ae3fc 100644 --- a/pay/ballcat-pay-ali/src/main/java/com/hccake/extend/pay/ali/AliPay.java +++ b/pay/ballcat-pay-ali/src/main/java/org/ballcat/pay/ali/AliPay.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.pay.ali; +package org.ballcat.pay.ali; import com.alipay.api.AlipayApiException; import com.alipay.api.AlipayClient; @@ -36,14 +36,14 @@ import com.alipay.api.response.AlipayTradePrecreateResponse; import com.alipay.api.response.AlipayTradeRefundResponse; import com.alipay.api.response.AlipayTradeWapPayResponse; -import com.hccake.extend.pay.ali.constants.AliPayConstant; -import com.hccake.extend.pay.ali.domain.AliPayQuery; +import org.ballcat.pay.ali.constants.AliPayConstant; +import org.ballcat.pay.ali.domain.AliPayQuery; import lombok.Data; import java.math.BigDecimal; import java.util.Map; -import static com.hccake.extend.pay.ali.constants.AliPayConstant.FIELD_FUND_BILL_LIST; +import static org.ballcat.pay.ali.constants.AliPayConstant.FIELD_FUND_BILL_LIST; /** * api文档. diff --git a/pay/ballcat-pay-ali/src/main/java/com/hccake/extend/pay/ali/constants/AliPayConstant.java b/pay/ballcat-pay-ali/src/main/java/org/ballcat/pay/ali/constants/AliPayConstant.java similarity index 96% rename from pay/ballcat-pay-ali/src/main/java/com/hccake/extend/pay/ali/constants/AliPayConstant.java rename to pay/ballcat-pay-ali/src/main/java/org/ballcat/pay/ali/constants/AliPayConstant.java index 44bbff791..08f22467e 100644 --- a/pay/ballcat-pay-ali/src/main/java/com/hccake/extend/pay/ali/constants/AliPayConstant.java +++ b/pay/ballcat-pay-ali/src/main/java/org/ballcat/pay/ali/constants/AliPayConstant.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.pay.ali.constants; +package org.ballcat.pay.ali.constants; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/pay/ballcat-pay-ali/src/main/java/com/hccake/extend/pay/ali/domain/AliAppPay.java b/pay/ballcat-pay-ali/src/main/java/org/ballcat/pay/ali/domain/AliAppPay.java similarity index 90% rename from pay/ballcat-pay-ali/src/main/java/com/hccake/extend/pay/ali/domain/AliAppPay.java rename to pay/ballcat-pay-ali/src/main/java/org/ballcat/pay/ali/domain/AliAppPay.java index ae479e3c2..f63297fc0 100644 --- a/pay/ballcat-pay-ali/src/main/java/com/hccake/extend/pay/ali/domain/AliAppPay.java +++ b/pay/ballcat-pay-ali/src/main/java/org/ballcat/pay/ali/domain/AliAppPay.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.pay.ali.domain; +package org.ballcat.pay.ali.domain; import com.alipay.api.response.AlipayTradeAppPayResponse; import lombok.AccessLevel; @@ -37,7 +37,7 @@ public class AliAppPay { * 构建 app 拉起支付宝支付所需的参数 * @param appId app id * @param response app pay 接口返回值 - * @return com.hccake.extend.pay.ali.domain.AliAppPay + * @return {@link AliAppPay} */ public static AliAppPay of(String appId, AlipayTradeAppPayResponse response) { return of(appId, response.getBody()); @@ -47,7 +47,7 @@ public static AliAppPay of(String appId, AlipayTradeAppPayResponse response) { * 构建 app 拉起支付宝支付所需的参数 * @param appId app id * @param body app pay 接口返回值中 body 字段内容 - * @return com.hccake.extend.pay.ali.domain.AliAppPay + * @return {@link AliAppPay} */ public static AliAppPay of(String appId, String body) { AliAppPay pay = new AliAppPay(); diff --git a/pay/ballcat-pay-ali/src/main/java/com/hccake/extend/pay/ali/domain/AliPayCallback.java b/pay/ballcat-pay-ali/src/main/java/org/ballcat/pay/ali/domain/AliPayCallback.java similarity index 82% rename from pay/ballcat-pay-ali/src/main/java/com/hccake/extend/pay/ali/domain/AliPayCallback.java rename to pay/ballcat-pay-ali/src/main/java/org/ballcat/pay/ali/domain/AliPayCallback.java index 5d69ba4f7..3e94b9f5b 100644 --- a/pay/ballcat-pay-ali/src/main/java/com/hccake/extend/pay/ali/domain/AliPayCallback.java +++ b/pay/ballcat-pay-ali/src/main/java/org/ballcat/pay/ali/domain/AliPayCallback.java @@ -13,26 +13,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.pay.ali.domain; +package org.ballcat.pay.ali.domain; import com.alipay.api.AlipayApiException; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.databind.PropertyNamingStrategies; import com.fasterxml.jackson.databind.annotation.JsonNaming; -import com.hccake.ballcat.common.util.JsonUtils; -import com.hccake.extend.pay.ali.AliPay; -import com.hccake.extend.pay.ali.enums.TradeStatus; +import org.ballcat.common.util.JsonUtils; +import org.ballcat.pay.ali.AliPay; +import org.ballcat.pay.ali.enums.TradeStatus; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; +import org.ballcat.pay.ali.constants.AliPayConstant; import java.math.BigDecimal; import java.util.HashMap; import java.util.List; import java.util.Map; -import static com.hccake.extend.pay.ali.constants.AliPayConstant.FIELD_FUND_BILL_LIST; - /** * @author lingting 2021/1/26 13:31 */ @@ -45,14 +44,14 @@ public class AliPayCallback { /** * 解析回调参数 * @param callbackParams 所有回调参数 - * @return com.hccake.extend.pay.ali.domain.AliPayCallback + * @return 阿里支付回调信息 */ public static AliPayCallback of(Map callbackParams) { Map map = new HashMap<>(callbackParams); - String fundBillListStr = callbackParams.get(FIELD_FUND_BILL_LIST).replace(""", "\""); - map.put(FIELD_FUND_BILL_LIST, JsonUtils.toObj(fundBillListStr, List.class)); + String fundBillListStr = callbackParams.get(AliPayConstant.FIELD_FUND_BILL_LIST).replace(""", "\""); + map.put(AliPayConstant.FIELD_FUND_BILL_LIST, JsonUtils.toObj(fundBillListStr, List.class)); // 覆盖原值 - callbackParams.put(FIELD_FUND_BILL_LIST, fundBillListStr); + callbackParams.put(AliPayConstant.FIELD_FUND_BILL_LIST, fundBillListStr); return JsonUtils.toObj(JsonUtils.toJson(map), AliPayCallback.class).setRaw(callbackParams); } diff --git a/pay/ballcat-pay-ali/src/main/java/com/hccake/extend/pay/ali/domain/AliPayQuery.java b/pay/ballcat-pay-ali/src/main/java/org/ballcat/pay/ali/domain/AliPayQuery.java similarity index 91% rename from pay/ballcat-pay-ali/src/main/java/com/hccake/extend/pay/ali/domain/AliPayQuery.java rename to pay/ballcat-pay-ali/src/main/java/org/ballcat/pay/ali/domain/AliPayQuery.java index 07af8a3ca..9f923f928 100644 --- a/pay/ballcat-pay-ali/src/main/java/com/hccake/extend/pay/ali/domain/AliPayQuery.java +++ b/pay/ballcat-pay-ali/src/main/java/org/ballcat/pay/ali/domain/AliPayQuery.java @@ -13,21 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.pay.ali.domain; +package org.ballcat.pay.ali.domain; import cn.hutool.core.text.CharSequenceUtil; import com.alipay.api.response.AlipayTradeQueryResponse; -import com.hccake.extend.pay.ali.enums.TradeStatus; +import org.ballcat.pay.ali.enums.TradeStatus; import lombok.AccessLevel; import lombok.Getter; import lombok.Setter; import lombok.ToString; import lombok.experimental.Accessors; +import org.ballcat.pay.ali.constants.AliPayConstant; import java.math.BigDecimal; -import static com.hccake.extend.pay.ali.constants.AliPayConstant.CODE_SUCCESS; - /** * 简化查询结果 * @@ -45,7 +44,7 @@ public static AliPayQuery of(AlipayTradeQueryResponse raw) { return query; } // 状态处理 - if (CODE_SUCCESS.equals(raw.getCode())) { + if (AliPayConstant.CODE_SUCCESS.equals(raw.getCode())) { // 成功 query.setTradeStatus(TradeStatus.of(raw.getTradeStatus())); } diff --git a/pay/ballcat-pay-ali/src/main/java/com/hccake/extend/pay/ali/enums/TradeStatus.java b/pay/ballcat-pay-ali/src/main/java/org/ballcat/pay/ali/enums/TradeStatus.java similarity index 97% rename from pay/ballcat-pay-ali/src/main/java/com/hccake/extend/pay/ali/enums/TradeStatus.java rename to pay/ballcat-pay-ali/src/main/java/org/ballcat/pay/ali/enums/TradeStatus.java index eb312fcd0..60cbc37d3 100644 --- a/pay/ballcat-pay-ali/src/main/java/com/hccake/extend/pay/ali/enums/TradeStatus.java +++ b/pay/ballcat-pay-ali/src/main/java/org/ballcat/pay/ali/enums/TradeStatus.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.pay.ali.enums; +package org.ballcat.pay.ali.enums; import cn.hutool.core.text.CharSequenceUtil; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/pay/ballcat-pay-virtual/src/main/java/com/hccake/extend/pay/viratual/AbstractVerifyThread.java b/pay/ballcat-pay-virtual/src/main/java/org/ballcat/pay/viratual/AbstractVerifyThread.java similarity index 95% rename from pay/ballcat-pay-virtual/src/main/java/com/hccake/extend/pay/viratual/AbstractVerifyThread.java rename to pay/ballcat-pay-virtual/src/main/java/org/ballcat/pay/viratual/AbstractVerifyThread.java index b240a2944..3e4ee74de 100644 --- a/pay/ballcat-pay-virtual/src/main/java/com/hccake/extend/pay/viratual/AbstractVerifyThread.java +++ b/pay/ballcat-pay-virtual/src/main/java/org/ballcat/pay/viratual/AbstractVerifyThread.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.pay.viratual; +package org.ballcat.pay.viratual; -import com.hccake.ballcat.common.redis.thread.AbstractRedisThread; +import org.ballcat.redis.thread.AbstractRedisThread; import java.util.List; import java.util.Optional; import javax.validation.constraints.NotNull; diff --git a/pay/ballcat-pay-virtual/src/main/java/com/hccake/extend/pay/viratual/VerifyObj.java b/pay/ballcat-pay-virtual/src/main/java/org/ballcat/pay/viratual/VerifyObj.java similarity index 95% rename from pay/ballcat-pay-virtual/src/main/java/com/hccake/extend/pay/viratual/VerifyObj.java rename to pay/ballcat-pay-virtual/src/main/java/org/ballcat/pay/viratual/VerifyObj.java index d4bad95ed..7113cc793 100644 --- a/pay/ballcat-pay-virtual/src/main/java/com/hccake/extend/pay/viratual/VerifyObj.java +++ b/pay/ballcat-pay-virtual/src/main/java/org/ballcat/pay/viratual/VerifyObj.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.pay.viratual; +package org.ballcat.pay.viratual; /** * 线程处理对象需要实现此类 diff --git a/pay/ballcat-pay-wx/src/main/java/com/hccake/extend/pay/wx/WxPay.java b/pay/ballcat-pay-wx/src/main/java/org/ballcat/pay/wx/WxPay.java similarity index 88% rename from pay/ballcat-pay-wx/src/main/java/com/hccake/extend/pay/wx/WxPay.java rename to pay/ballcat-pay-wx/src/main/java/org/ballcat/pay/wx/WxPay.java index a9c08eca1..fb235c6cd 100644 --- a/pay/ballcat-pay-wx/src/main/java/com/hccake/extend/pay/wx/WxPay.java +++ b/pay/ballcat-pay-wx/src/main/java/org/ballcat/pay/wx/WxPay.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.pay.wx; +package org.ballcat.pay.wx; import cn.hutool.core.lang.Assert; import cn.hutool.core.text.CharSequenceUtil; -import com.hccake.extend.pay.wx.constants.WxPayConstant; -import com.hccake.extend.pay.wx.domain.DefaultWxDomain; -import com.hccake.extend.pay.wx.domain.WxDomain; -import com.hccake.extend.pay.wx.enums.RequestSuffix; -import com.hccake.extend.pay.wx.enums.SignType; -import com.hccake.extend.pay.wx.enums.TradeType; -import com.hccake.extend.pay.wx.response.WxPayCallback; -import com.hccake.extend.pay.wx.response.WxPayOrderQueryResponse; -import com.hccake.extend.pay.wx.response.WxPayResponse; -import com.hccake.extend.pay.wx.utils.WxPayUtil; +import org.ballcat.pay.wx.constants.WxPayConstant; +import org.ballcat.pay.wx.domain.DefaultWxDomain; +import org.ballcat.pay.wx.domain.WxDomain; +import org.ballcat.pay.wx.enums.RequestSuffix; +import org.ballcat.pay.wx.enums.SignType; +import org.ballcat.pay.wx.enums.TradeType; +import org.ballcat.pay.wx.response.WxPayCallback; +import org.ballcat.pay.wx.response.WxPayOrderQueryResponse; +import org.ballcat.pay.wx.response.WxPayResponse; +import org.ballcat.pay.wx.utils.WxPayUtil; import lombok.Data; import java.math.BigDecimal; @@ -34,8 +34,6 @@ import java.util.HashMap; import java.util.Map; -import static com.hccake.extend.pay.wx.constants.WxPayConstant.HUNDRED; - /** * @author lingting 2021/1/26 15:54 */ @@ -167,7 +165,7 @@ public Map pay(String sn, BigDecimal amount, String ip, String b * 查询订单 * @param sn 平台订单号 * @param wxSn 微信订单号 - * @return com.hccake.extend.pay.wx.response.WxPayOrderQueryResponse + * @return 微信订单查询结果 */ public WxPayOrderQueryResponse query(String sn, String wxSn) { Assert.isFalse(CharSequenceUtil.isBlank(sn) && CharSequenceUtil.isBlank(wxSn), "参数 sn 和 wxSn 不能同时为空!"); @@ -204,7 +202,7 @@ public Map request(Map params, RequestSuffix rs) * @return java.lang.String */ public String yuanToFen(BigDecimal amount) { - return amount.multiply(HUNDRED).setScale(2, RoundingMode.UP).toBigInteger().toString(); + return amount.multiply(WxPayConstant.HUNDRED).setScale(2, RoundingMode.UP).toBigInteger().toString(); } /** diff --git a/pay/ballcat-pay-wx/src/main/java/com/hccake/extend/pay/wx/constants/WxPayConstant.java b/pay/ballcat-pay-wx/src/main/java/org/ballcat/pay/wx/constants/WxPayConstant.java similarity index 97% rename from pay/ballcat-pay-wx/src/main/java/com/hccake/extend/pay/wx/constants/WxPayConstant.java rename to pay/ballcat-pay-wx/src/main/java/org/ballcat/pay/wx/constants/WxPayConstant.java index 695c5c5cf..31674ddc0 100644 --- a/pay/ballcat-pay-wx/src/main/java/com/hccake/extend/pay/wx/constants/WxPayConstant.java +++ b/pay/ballcat-pay-wx/src/main/java/org/ballcat/pay/wx/constants/WxPayConstant.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.pay.wx.constants; +package org.ballcat.pay.wx.constants; import java.math.BigDecimal; diff --git a/pay/ballcat-pay-wx/src/main/java/com/hccake/extend/pay/wx/domain/DefaultWxDomain.java b/pay/ballcat-pay-wx/src/main/java/org/ballcat/pay/wx/domain/DefaultWxDomain.java similarity index 93% rename from pay/ballcat-pay-wx/src/main/java/com/hccake/extend/pay/wx/domain/DefaultWxDomain.java rename to pay/ballcat-pay-wx/src/main/java/org/ballcat/pay/wx/domain/DefaultWxDomain.java index c44cd45a8..bddd3fe73 100644 --- a/pay/ballcat-pay-wx/src/main/java/com/hccake/extend/pay/wx/domain/DefaultWxDomain.java +++ b/pay/ballcat-pay-wx/src/main/java/org/ballcat/pay/wx/domain/DefaultWxDomain.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.pay.wx.domain; +package org.ballcat.pay.wx.domain; import cn.hutool.http.HttpRequest; -import com.hccake.extend.pay.wx.enums.RequestSuffix; -import com.hccake.extend.pay.wx.utils.WxPayUtil; +import org.ballcat.pay.wx.enums.RequestSuffix; +import org.ballcat.pay.wx.utils.WxPayUtil; import lombok.SneakyThrows; import javax.xml.parsers.ParserConfigurationException; diff --git a/pay/ballcat-pay-wx/src/main/java/com/hccake/extend/pay/wx/domain/WxDomain.java b/pay/ballcat-pay-wx/src/main/java/org/ballcat/pay/wx/domain/WxDomain.java similarity index 86% rename from pay/ballcat-pay-wx/src/main/java/com/hccake/extend/pay/wx/domain/WxDomain.java rename to pay/ballcat-pay-wx/src/main/java/org/ballcat/pay/wx/domain/WxDomain.java index 9ca0c6441..fa2e2574a 100644 --- a/pay/ballcat-pay-wx/src/main/java/com/hccake/extend/pay/wx/domain/WxDomain.java +++ b/pay/ballcat-pay-wx/src/main/java/org/ballcat/pay/wx/domain/WxDomain.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.pay.wx.domain; +package org.ballcat.pay.wx.domain; -import com.hccake.extend.pay.wx.WxPay; -import com.hccake.extend.pay.wx.constants.WxPayConstant; -import com.hccake.extend.pay.wx.enums.RequestSuffix; -import com.hccake.extend.pay.wx.enums.SignType; -import com.hccake.extend.pay.wx.response.WxPayResponse; -import com.hccake.extend.pay.wx.utils.WxPayUtil; +import org.ballcat.pay.wx.WxPay; +import org.ballcat.pay.wx.constants.WxPayConstant; +import org.ballcat.pay.wx.enums.RequestSuffix; +import org.ballcat.pay.wx.enums.SignType; +import org.ballcat.pay.wx.response.WxPayResponse; +import org.ballcat.pay.wx.utils.WxPayUtil; import lombok.SneakyThrows; import org.slf4j.LoggerFactory; import org.xml.sax.SAXException; @@ -81,7 +81,7 @@ default Map request(Map params, RequestSuffix rs * * 获取沙箱环境密钥 * @param wxPay 支付信息 - * @return com.hccake.extend.pay.wx.response.WxPayResponse + * @return 微信支付响应信息 */ default WxPayResponse sandbox(WxPay wxPay) { HashMap map = new HashMap<>(); diff --git a/pay/ballcat-pay-wx/src/main/java/com/hccake/extend/pay/wx/enums/RequestSuffix.java b/pay/ballcat-pay-wx/src/main/java/org/ballcat/pay/wx/enums/RequestSuffix.java similarity index 96% rename from pay/ballcat-pay-wx/src/main/java/com/hccake/extend/pay/wx/enums/RequestSuffix.java rename to pay/ballcat-pay-wx/src/main/java/org/ballcat/pay/wx/enums/RequestSuffix.java index 4f393eb2f..1cc22d1c8 100644 --- a/pay/ballcat-pay-wx/src/main/java/com/hccake/extend/pay/wx/enums/RequestSuffix.java +++ b/pay/ballcat-pay-wx/src/main/java/org/ballcat/pay/wx/enums/RequestSuffix.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.pay.wx.enums; +package org.ballcat.pay.wx.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/pay/ballcat-pay-wx/src/main/java/com/hccake/extend/pay/wx/enums/ResponseCode.java b/pay/ballcat-pay-wx/src/main/java/org/ballcat/pay/wx/enums/ResponseCode.java similarity index 96% rename from pay/ballcat-pay-wx/src/main/java/com/hccake/extend/pay/wx/enums/ResponseCode.java rename to pay/ballcat-pay-wx/src/main/java/org/ballcat/pay/wx/enums/ResponseCode.java index c7a65f4f5..5f9644a38 100644 --- a/pay/ballcat-pay-wx/src/main/java/com/hccake/extend/pay/wx/enums/ResponseCode.java +++ b/pay/ballcat-pay-wx/src/main/java/org/ballcat/pay/wx/enums/ResponseCode.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.pay.wx.enums; +package org.ballcat.pay.wx.enums; import com.fasterxml.jackson.annotation.JsonCreator; import lombok.AllArgsConstructor; diff --git a/pay/ballcat-pay-wx/src/main/java/com/hccake/extend/pay/wx/enums/SignType.java b/pay/ballcat-pay-wx/src/main/java/org/ballcat/pay/wx/enums/SignType.java similarity index 96% rename from pay/ballcat-pay-wx/src/main/java/com/hccake/extend/pay/wx/enums/SignType.java rename to pay/ballcat-pay-wx/src/main/java/org/ballcat/pay/wx/enums/SignType.java index 35853a007..eaae0664a 100644 --- a/pay/ballcat-pay-wx/src/main/java/com/hccake/extend/pay/wx/enums/SignType.java +++ b/pay/ballcat-pay-wx/src/main/java/org/ballcat/pay/wx/enums/SignType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.pay.wx.enums; +package org.ballcat.pay.wx.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/pay/ballcat-pay-wx/src/main/java/com/hccake/extend/pay/wx/enums/TradeState.java b/pay/ballcat-pay-wx/src/main/java/org/ballcat/pay/wx/enums/TradeState.java similarity index 97% rename from pay/ballcat-pay-wx/src/main/java/com/hccake/extend/pay/wx/enums/TradeState.java rename to pay/ballcat-pay-wx/src/main/java/org/ballcat/pay/wx/enums/TradeState.java index 0e7726993..0d50a8f95 100644 --- a/pay/ballcat-pay-wx/src/main/java/com/hccake/extend/pay/wx/enums/TradeState.java +++ b/pay/ballcat-pay-wx/src/main/java/org/ballcat/pay/wx/enums/TradeState.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.pay.wx.enums; +package org.ballcat.pay.wx.enums; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/pay/ballcat-pay-wx/src/main/java/com/hccake/extend/pay/wx/enums/TradeType.java b/pay/ballcat-pay-wx/src/main/java/org/ballcat/pay/wx/enums/TradeType.java similarity index 95% rename from pay/ballcat-pay-wx/src/main/java/com/hccake/extend/pay/wx/enums/TradeType.java rename to pay/ballcat-pay-wx/src/main/java/org/ballcat/pay/wx/enums/TradeType.java index 9448dd75e..ac02c5c48 100644 --- a/pay/ballcat-pay-wx/src/main/java/com/hccake/extend/pay/wx/enums/TradeType.java +++ b/pay/ballcat-pay-wx/src/main/java/org/ballcat/pay/wx/enums/TradeType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.pay.wx.enums; +package org.ballcat.pay.wx.enums; /** * 微信支付类型 diff --git a/pay/ballcat-pay-wx/src/main/java/com/hccake/extend/pay/wx/response/WxPayCallback.java b/pay/ballcat-pay-wx/src/main/java/org/ballcat/pay/wx/response/WxPayCallback.java similarity index 89% rename from pay/ballcat-pay-wx/src/main/java/com/hccake/extend/pay/wx/response/WxPayCallback.java rename to pay/ballcat-pay-wx/src/main/java/org/ballcat/pay/wx/response/WxPayCallback.java index f161177ff..f65b2b1db 100644 --- a/pay/ballcat-pay-wx/src/main/java/com/hccake/extend/pay/wx/response/WxPayCallback.java +++ b/pay/ballcat-pay-wx/src/main/java/org/ballcat/pay/wx/response/WxPayCallback.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.pay.wx.response; +package org.ballcat.pay.wx.response; import com.fasterxml.jackson.databind.PropertyNamingStrategies; import com.fasterxml.jackson.databind.annotation.JsonNaming; -import com.hccake.ballcat.common.util.JsonUtils; -import com.hccake.extend.pay.wx.WxPay; -import com.hccake.extend.pay.wx.enums.ResponseCode; -import com.hccake.extend.pay.wx.enums.TradeType; +import org.ballcat.common.util.JsonUtils; +import org.ballcat.pay.wx.WxPay; +import org.ballcat.pay.wx.enums.ResponseCode; +import org.ballcat.pay.wx.enums.TradeType; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; diff --git a/pay/ballcat-pay-wx/src/main/java/com/hccake/extend/pay/wx/response/WxPayOrderQueryResponse.java b/pay/ballcat-pay-wx/src/main/java/org/ballcat/pay/wx/response/WxPayOrderQueryResponse.java similarity index 91% rename from pay/ballcat-pay-wx/src/main/java/com/hccake/extend/pay/wx/response/WxPayOrderQueryResponse.java rename to pay/ballcat-pay-wx/src/main/java/org/ballcat/pay/wx/response/WxPayOrderQueryResponse.java index ca19b1464..c179835a0 100644 --- a/pay/ballcat-pay-wx/src/main/java/com/hccake/extend/pay/wx/response/WxPayOrderQueryResponse.java +++ b/pay/ballcat-pay-wx/src/main/java/org/ballcat/pay/wx/response/WxPayOrderQueryResponse.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.pay.wx.response; +package org.ballcat.pay.wx.response; import com.fasterxml.jackson.annotation.JsonProperty; -import com.hccake.ballcat.common.util.JsonUtils; -import com.hccake.extend.pay.wx.enums.ResponseCode; -import com.hccake.extend.pay.wx.enums.TradeState; -import com.hccake.extend.pay.wx.enums.TradeType; +import org.ballcat.common.util.JsonUtils; +import org.ballcat.pay.wx.enums.ResponseCode; +import org.ballcat.pay.wx.enums.TradeState; +import org.ballcat.pay.wx.enums.TradeType; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; diff --git a/pay/ballcat-pay-wx/src/main/java/com/hccake/extend/pay/wx/response/WxPayResponse.java b/pay/ballcat-pay-wx/src/main/java/org/ballcat/pay/wx/response/WxPayResponse.java similarity index 94% rename from pay/ballcat-pay-wx/src/main/java/com/hccake/extend/pay/wx/response/WxPayResponse.java rename to pay/ballcat-pay-wx/src/main/java/org/ballcat/pay/wx/response/WxPayResponse.java index 37f688637..595c7994d 100644 --- a/pay/ballcat-pay-wx/src/main/java/com/hccake/extend/pay/wx/response/WxPayResponse.java +++ b/pay/ballcat-pay-wx/src/main/java/org/ballcat/pay/wx/response/WxPayResponse.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.pay.wx.response; +package org.ballcat.pay.wx.response; import com.fasterxml.jackson.annotation.JsonProperty; -import com.hccake.ballcat.common.util.JsonUtils; -import com.hccake.extend.pay.wx.enums.ResponseCode; -import com.hccake.extend.pay.wx.enums.TradeType; +import org.ballcat.common.util.JsonUtils; +import org.ballcat.pay.wx.enums.ResponseCode; +import org.ballcat.pay.wx.enums.TradeType; import lombok.Data; import lombok.experimental.Accessors; diff --git a/pay/ballcat-pay-wx/src/main/java/com/hccake/extend/pay/wx/utils/WxPayUtil.java b/pay/ballcat-pay-wx/src/main/java/org/ballcat/pay/wx/utils/WxPayUtil.java similarity index 97% rename from pay/ballcat-pay-wx/src/main/java/com/hccake/extend/pay/wx/utils/WxPayUtil.java rename to pay/ballcat-pay-wx/src/main/java/org/ballcat/pay/wx/utils/WxPayUtil.java index 0be5bd04b..cc85b38ef 100644 --- a/pay/ballcat-pay-wx/src/main/java/com/hccake/extend/pay/wx/utils/WxPayUtil.java +++ b/pay/ballcat-pay-wx/src/main/java/org/ballcat/pay/wx/utils/WxPayUtil.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.pay.wx.utils; +package org.ballcat.pay.wx.utils; import cn.hutool.core.lang.Assert; import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.util.RandomUtil; -import com.hccake.extend.pay.wx.constants.WxPayConstant; -import com.hccake.extend.pay.wx.enums.SignType; +import org.ballcat.pay.wx.constants.WxPayConstant; +import org.ballcat.pay.wx.enums.SignType; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.w3c.dom.Document; diff --git a/pay/ballcat-spring-boot-starter-pay/src/main/java/com/hccake/starter/pay/ali/AliPayAutoConfiguration.java b/pay/ballcat-spring-boot-starter-pay/src/main/java/org/ballcat/autoconfigure/pay/ali/AliPayAutoConfiguration.java similarity index 93% rename from pay/ballcat-spring-boot-starter-pay/src/main/java/com/hccake/starter/pay/ali/AliPayAutoConfiguration.java rename to pay/ballcat-spring-boot-starter-pay/src/main/java/org/ballcat/autoconfigure/pay/ali/AliPayAutoConfiguration.java index 476fe6696..852b4d879 100644 --- a/pay/ballcat-spring-boot-starter-pay/src/main/java/com/hccake/starter/pay/ali/AliPayAutoConfiguration.java +++ b/pay/ballcat-spring-boot-starter-pay/src/main/java/org/ballcat/autoconfigure/pay/ali/AliPayAutoConfiguration.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.pay.ali; +package org.ballcat.autoconfigure.pay.ali; -import com.hccake.extend.pay.ali.AliPay; -import com.hccake.extend.pay.ali.constants.AliPayConstant; +import org.ballcat.pay.ali.AliPay; +import org.ballcat.pay.ali.constants.AliPayConstant; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; diff --git a/pay/ballcat-spring-boot-starter-pay/src/main/java/com/hccake/starter/pay/ali/AliPayProperties.java b/pay/ballcat-spring-boot-starter-pay/src/main/java/org/ballcat/autoconfigure/pay/ali/AliPayProperties.java similarity index 97% rename from pay/ballcat-spring-boot-starter-pay/src/main/java/com/hccake/starter/pay/ali/AliPayProperties.java rename to pay/ballcat-spring-boot-starter-pay/src/main/java/org/ballcat/autoconfigure/pay/ali/AliPayProperties.java index 804c6dd90..68d636a78 100644 --- a/pay/ballcat-spring-boot-starter-pay/src/main/java/com/hccake/starter/pay/ali/AliPayProperties.java +++ b/pay/ballcat-spring-boot-starter-pay/src/main/java/org/ballcat/autoconfigure/pay/ali/AliPayProperties.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.pay.ali; +package org.ballcat.autoconfigure.pay.ali; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/pay/ballcat-spring-boot-starter-pay/src/main/java/com/hccake/starter/pay/virtual/BitcoinProperties.java b/pay/ballcat-spring-boot-starter-pay/src/main/java/org/ballcat/autoconfigure/pay/virtual/BitcoinProperties.java similarity index 95% rename from pay/ballcat-spring-boot-starter-pay/src/main/java/com/hccake/starter/pay/virtual/BitcoinProperties.java rename to pay/ballcat-spring-boot-starter-pay/src/main/java/org/ballcat/autoconfigure/pay/virtual/BitcoinProperties.java index b8cd89f20..e8492c2a7 100644 --- a/pay/ballcat-spring-boot-starter-pay/src/main/java/com/hccake/starter/pay/virtual/BitcoinProperties.java +++ b/pay/ballcat-spring-boot-starter-pay/src/main/java/org/ballcat/autoconfigure/pay/virtual/BitcoinProperties.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.pay.virtual; +package org.ballcat.autoconfigure.pay.virtual; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/pay/ballcat-spring-boot-starter-pay/src/main/java/com/hccake/starter/pay/virtual/EtherscanProperties.java b/pay/ballcat-spring-boot-starter-pay/src/main/java/org/ballcat/autoconfigure/pay/virtual/EtherscanProperties.java similarity index 96% rename from pay/ballcat-spring-boot-starter-pay/src/main/java/com/hccake/starter/pay/virtual/EtherscanProperties.java rename to pay/ballcat-spring-boot-starter-pay/src/main/java/org/ballcat/autoconfigure/pay/virtual/EtherscanProperties.java index 5a42fc266..e5ccc9705 100644 --- a/pay/ballcat-spring-boot-starter-pay/src/main/java/com/hccake/starter/pay/virtual/EtherscanProperties.java +++ b/pay/ballcat-spring-boot-starter-pay/src/main/java/org/ballcat/autoconfigure/pay/virtual/EtherscanProperties.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.pay.virtual; +package org.ballcat.autoconfigure.pay.virtual; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/pay/ballcat-spring-boot-starter-pay/src/main/java/com/hccake/starter/pay/virtual/TronscanProperties.java b/pay/ballcat-spring-boot-starter-pay/src/main/java/org/ballcat/autoconfigure/pay/virtual/TronscanProperties.java similarity index 95% rename from pay/ballcat-spring-boot-starter-pay/src/main/java/com/hccake/starter/pay/virtual/TronscanProperties.java rename to pay/ballcat-spring-boot-starter-pay/src/main/java/org/ballcat/autoconfigure/pay/virtual/TronscanProperties.java index 50a265810..986a3645c 100644 --- a/pay/ballcat-spring-boot-starter-pay/src/main/java/com/hccake/starter/pay/virtual/TronscanProperties.java +++ b/pay/ballcat-spring-boot-starter-pay/src/main/java/org/ballcat/autoconfigure/pay/virtual/TronscanProperties.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.pay.virtual; +package org.ballcat.autoconfigure.pay.virtual; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/pay/ballcat-spring-boot-starter-pay/src/main/java/com/hccake/starter/pay/virtual/VirtualPayAutoConfiguration.java b/pay/ballcat-spring-boot-starter-pay/src/main/java/org/ballcat/autoconfigure/pay/virtual/VirtualPayAutoConfiguration.java similarity index 98% rename from pay/ballcat-spring-boot-starter-pay/src/main/java/com/hccake/starter/pay/virtual/VirtualPayAutoConfiguration.java rename to pay/ballcat-spring-boot-starter-pay/src/main/java/org/ballcat/autoconfigure/pay/virtual/VirtualPayAutoConfiguration.java index 026e8d0fa..134058582 100644 --- a/pay/ballcat-spring-boot-starter-pay/src/main/java/com/hccake/starter/pay/virtual/VirtualPayAutoConfiguration.java +++ b/pay/ballcat-spring-boot-starter-pay/src/main/java/org/ballcat/autoconfigure/pay/virtual/VirtualPayAutoConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.pay.virtual; +package org.ballcat.autoconfigure.pay.virtual; import live.lingting.virtual.currency.bitcoin.BitcoinServiceImpl; import live.lingting.virtual.currency.core.Contract; diff --git a/pay/ballcat-spring-boot-starter-pay/src/main/java/com/hccake/starter/pay/wx/WxPayAutoConfiguration.java b/pay/ballcat-spring-boot-starter-pay/src/main/java/org/ballcat/autoconfigure/pay/wx/WxPayAutoConfiguration.java similarity index 95% rename from pay/ballcat-spring-boot-starter-pay/src/main/java/com/hccake/starter/pay/wx/WxPayAutoConfiguration.java rename to pay/ballcat-spring-boot-starter-pay/src/main/java/org/ballcat/autoconfigure/pay/wx/WxPayAutoConfiguration.java index d863a7fb5..68cc1364c 100644 --- a/pay/ballcat-spring-boot-starter-pay/src/main/java/com/hccake/starter/pay/wx/WxPayAutoConfiguration.java +++ b/pay/ballcat-spring-boot-starter-pay/src/main/java/org/ballcat/autoconfigure/pay/wx/WxPayAutoConfiguration.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.pay.wx; +package org.ballcat.autoconfigure.pay.wx; -import com.hccake.extend.pay.wx.WxPay; +import org.ballcat.pay.wx.WxPay; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; diff --git a/pay/ballcat-spring-boot-starter-pay/src/main/java/com/hccake/starter/pay/wx/WxPayProperties.java b/pay/ballcat-spring-boot-starter-pay/src/main/java/org/ballcat/autoconfigure/pay/wx/WxPayProperties.java similarity index 96% rename from pay/ballcat-spring-boot-starter-pay/src/main/java/com/hccake/starter/pay/wx/WxPayProperties.java rename to pay/ballcat-spring-boot-starter-pay/src/main/java/org/ballcat/autoconfigure/pay/wx/WxPayProperties.java index e4e9202d2..a33ba9cf7 100644 --- a/pay/ballcat-spring-boot-starter-pay/src/main/java/com/hccake/starter/pay/wx/WxPayProperties.java +++ b/pay/ballcat-spring-boot-starter-pay/src/main/java/org/ballcat/autoconfigure/pay/wx/WxPayProperties.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.pay.wx; +package org.ballcat.autoconfigure.pay.wx; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/pay/ballcat-spring-boot-starter-pay/src/main/resources/META-INF/spring.factories b/pay/ballcat-spring-boot-starter-pay/src/main/resources/META-INF/spring.factories index b7d46a45c..d144ca835 100644 --- a/pay/ballcat-spring-boot-starter-pay/src/main/resources/META-INF/spring.factories +++ b/pay/ballcat-spring-boot-starter-pay/src/main/resources/META-INF/spring.factories @@ -1,4 +1,4 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.hccake.starter.pay.virtual.VirtualPayAutoConfiguration,\ - com.hccake.starter.pay.ali.AliPayAutoConfiguration,\ - com.hccake.starter.pay.wx.WxPayAutoConfiguration \ No newline at end of file + org.ballcat.autoconfigure.pay.virtual.VirtualPayAutoConfiguration,\ + org.ballcat.autoconfigure.pay.ali.AliPayAutoConfiguration,\ + org.ballcat.autoconfigure.pay.wx.WxPayAutoConfiguration \ No newline at end of file diff --git a/pay/ballcat-spring-boot-starter-pay/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/pay/ballcat-spring-boot-starter-pay/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 08a396d69..9c25ee76b 100644 --- a/pay/ballcat-spring-boot-starter-pay/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/pay/ballcat-spring-boot-starter-pay/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,3 +1,3 @@ -com.hccake.starter.pay.virtual.VirtualPayAutoConfiguration -com.hccake.starter.pay.ali.AliPayAutoConfiguration -com.hccake.starter.pay.wx.WxPayAutoConfiguration \ No newline at end of file +org.ballcat.autoconfigure.pay.virtual.VirtualPayAutoConfiguration +org.ballcat.autoconfigure.pay.ali.AliPayAutoConfiguration +org.ballcat.autoconfigure.pay.wx.WxPayAutoConfiguration \ No newline at end of file diff --git a/redis/ballcat-redis-module/src/main/java/com/hccake/extend/redis/moudle/AbstractRedisModuleHelper.java b/redis/ballcat-redis-module/src/main/java/org/ballcat/redis/moudle/AbstractRedisModuleHelper.java similarity index 98% rename from redis/ballcat-redis-module/src/main/java/com/hccake/extend/redis/moudle/AbstractRedisModuleHelper.java rename to redis/ballcat-redis-module/src/main/java/org/ballcat/redis/moudle/AbstractRedisModuleHelper.java index 41d651234..ab1d47992 100644 --- a/redis/ballcat-redis-module/src/main/java/com/hccake/extend/redis/moudle/AbstractRedisModuleHelper.java +++ b/redis/ballcat-redis-module/src/main/java/org/ballcat/redis/moudle/AbstractRedisModuleHelper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.redis.moudle; +package org.ballcat.redis.moudle; import io.lettuce.core.RedisFuture; import io.lettuce.core.codec.ByteArrayCodec; diff --git a/redis/ballcat-redis-module/src/main/java/com/hccake/extend/redis/moudle/bloom/BloomInsertKeywordEnum.java b/redis/ballcat-redis-module/src/main/java/org/ballcat/redis/moudle/bloom/BloomInsertKeywordEnum.java similarity index 95% rename from redis/ballcat-redis-module/src/main/java/com/hccake/extend/redis/moudle/bloom/BloomInsertKeywordEnum.java rename to redis/ballcat-redis-module/src/main/java/org/ballcat/redis/moudle/bloom/BloomInsertKeywordEnum.java index 9effef034..b5f95e884 100644 --- a/redis/ballcat-redis-module/src/main/java/com/hccake/extend/redis/moudle/bloom/BloomInsertKeywordEnum.java +++ b/redis/ballcat-redis-module/src/main/java/org/ballcat/redis/moudle/bloom/BloomInsertKeywordEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.redis.moudle.bloom; +package org.ballcat.redis.moudle.bloom; /** * redisBloom 中 BF.INSERT 命令的附属参数 Keyword diff --git a/redis/ballcat-redis-module/src/main/java/com/hccake/extend/redis/moudle/bloom/BloomInsertOptions.java b/redis/ballcat-redis-module/src/main/java/org/ballcat/redis/moudle/bloom/BloomInsertOptions.java similarity index 98% rename from redis/ballcat-redis-module/src/main/java/com/hccake/extend/redis/moudle/bloom/BloomInsertOptions.java rename to redis/ballcat-redis-module/src/main/java/org/ballcat/redis/moudle/bloom/BloomInsertOptions.java index 61646fd41..615c6328a 100644 --- a/redis/ballcat-redis-module/src/main/java/com/hccake/extend/redis/moudle/bloom/BloomInsertOptions.java +++ b/redis/ballcat-redis-module/src/main/java/org/ballcat/redis/moudle/bloom/BloomInsertOptions.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.redis.moudle.bloom; +package org.ballcat.redis.moudle.bloom; import java.util.ArrayList; import java.util.Collection; diff --git a/redis/ballcat-redis-module/src/main/java/com/hccake/extend/redis/moudle/bloom/BloomRedisModuleHelper.java b/redis/ballcat-redis-module/src/main/java/org/ballcat/redis/moudle/bloom/BloomRedisModuleHelper.java similarity index 98% rename from redis/ballcat-redis-module/src/main/java/com/hccake/extend/redis/moudle/bloom/BloomRedisModuleHelper.java rename to redis/ballcat-redis-module/src/main/java/org/ballcat/redis/moudle/bloom/BloomRedisModuleHelper.java index aab46e1ba..6252c6a68 100644 --- a/redis/ballcat-redis-module/src/main/java/com/hccake/extend/redis/moudle/bloom/BloomRedisModuleHelper.java +++ b/redis/ballcat-redis-module/src/main/java/org/ballcat/redis/moudle/bloom/BloomRedisModuleHelper.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.redis.moudle.bloom; +package org.ballcat.redis.moudle.bloom; -import com.hccake.extend.redis.moudle.AbstractRedisModuleHelper; +import org.ballcat.redis.moudle.AbstractRedisModuleHelper; import io.lettuce.core.output.ArrayOutput; import io.lettuce.core.output.BooleanListOutput; import io.lettuce.core.output.BooleanOutput; diff --git a/redis/ballcat-redis-module/src/test/java/com/hccake/extend/redis/module/BloomRedisModuleHelperConfig.java b/redis/ballcat-redis-module/src/test/java/org/ballcat/redis/module/BloomRedisModuleHelperConfig.java similarity index 86% rename from redis/ballcat-redis-module/src/test/java/com/hccake/extend/redis/module/BloomRedisModuleHelperConfig.java rename to redis/ballcat-redis-module/src/test/java/org/ballcat/redis/module/BloomRedisModuleHelperConfig.java index 835b3ff31..39b38554c 100644 --- a/redis/ballcat-redis-module/src/test/java/com/hccake/extend/redis/module/BloomRedisModuleHelperConfig.java +++ b/redis/ballcat-redis-module/src/test/java/org/ballcat/redis/module/BloomRedisModuleHelperConfig.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.redis.module; +package org.ballcat.redis.module; -import com.hccake.ballcat.common.redis.prefix.IRedisPrefixConverter; -import com.hccake.ballcat.common.redis.serialize.PrefixStringRedisSerializer; -import com.hccake.extend.redis.moudle.bloom.BloomRedisModuleHelper; +import org.ballcat.redis.prefix.IRedisPrefixConverter; +import org.ballcat.redis.serialize.PrefixStringRedisSerializer; +import org.ballcat.redis.moudle.bloom.BloomRedisModuleHelper; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/redis/ballcat-redis-module/src/test/java/com/hccake/extend/redis/module/RedisBloomDemoApplicationTests.java b/redis/ballcat-redis-module/src/test/java/org/ballcat/redis/module/RedisBloomDemoApplicationTests.java similarity index 91% rename from redis/ballcat-redis-module/src/test/java/com/hccake/extend/redis/module/RedisBloomDemoApplicationTests.java rename to redis/ballcat-redis-module/src/test/java/org/ballcat/redis/module/RedisBloomDemoApplicationTests.java index ed5be288c..47557a3c7 100644 --- a/redis/ballcat-redis-module/src/test/java/com/hccake/extend/redis/module/RedisBloomDemoApplicationTests.java +++ b/redis/ballcat-redis-module/src/test/java/org/ballcat/redis/module/RedisBloomDemoApplicationTests.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.extend.redis.module; +package org.ballcat.redis.module; -import com.hccake.ballcat.common.redis.prefix.IRedisPrefixConverter; -import com.hccake.ballcat.common.redis.prefix.impl.DefaultRedisPrefixConverter; -import com.hccake.ballcat.common.redis.serialize.PrefixStringRedisSerializer; -import com.hccake.extend.redis.moudle.bloom.BloomInsertOptions; -import com.hccake.extend.redis.moudle.bloom.BloomRedisModuleHelper; +import org.ballcat.redis.prefix.IRedisPrefixConverter; +import org.ballcat.redis.prefix.impl.DefaultRedisPrefixConverter; +import org.ballcat.redis.serialize.PrefixStringRedisSerializer; +import org.ballcat.redis.moudle.bloom.BloomInsertOptions; +import org.ballcat.redis.moudle.bloom.BloomRedisModuleHelper; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/RedisHelper.java b/redis/ballcat-redis/src/main/java/org/ballcat/redis/RedisHelper.java similarity index 99% rename from redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/RedisHelper.java rename to redis/ballcat-redis/src/main/java/org/ballcat/redis/RedisHelper.java index 3841c3b7b..27c0a182a 100644 --- a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/RedisHelper.java +++ b/redis/ballcat-redis/src/main/java/org/ballcat/redis/RedisHelper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.redis; +package org.ballcat.redis; import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Range; diff --git a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/config/CacheProperties.java b/redis/ballcat-redis/src/main/java/org/ballcat/redis/config/CacheProperties.java similarity index 97% rename from redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/config/CacheProperties.java rename to redis/ballcat-redis/src/main/java/org/ballcat/redis/config/CacheProperties.java index b6bfba0d4..58fc639d0 100644 --- a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/config/CacheProperties.java +++ b/redis/ballcat-redis/src/main/java/org/ballcat/redis/config/CacheProperties.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.redis.config; +package org.ballcat.redis.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/config/CachePropertiesHolder.java b/redis/ballcat-redis/src/main/java/org/ballcat/redis/config/CachePropertiesHolder.java similarity index 97% rename from redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/config/CachePropertiesHolder.java rename to redis/ballcat-redis/src/main/java/org/ballcat/redis/config/CachePropertiesHolder.java index 770ace6c5..1714db341 100644 --- a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/config/CachePropertiesHolder.java +++ b/redis/ballcat-redis/src/main/java/org/ballcat/redis/config/CachePropertiesHolder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.redis.config; +package org.ballcat.redis.config; /** * 缓存配置持有者，方便静态获取配置信息 diff --git a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/config/KeyEventConfig.java b/redis/ballcat-redis/src/main/java/org/ballcat/redis/config/KeyEventConfig.java similarity index 94% rename from redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/config/KeyEventConfig.java rename to redis/ballcat-redis/src/main/java/org/ballcat/redis/config/KeyEventConfig.java index 9a3888f20..6092e73ed 100644 --- a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/config/KeyEventConfig.java +++ b/redis/ballcat-redis/src/main/java/org/ballcat/redis/config/KeyEventConfig.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.redis.config; +package org.ballcat.redis.config; import lombok.Getter; import lombok.Setter; diff --git a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/core/CacheStringAspect.java b/redis/ballcat-redis/src/main/java/org/ballcat/redis/core/CacheStringAspect.java similarity index 90% rename from redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/core/CacheStringAspect.java rename to redis/ballcat-redis/src/main/java/org/ballcat/redis/core/CacheStringAspect.java index 97c747c7f..efcd2171c 100644 --- a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/core/CacheStringAspect.java +++ b/redis/ballcat-redis/src/main/java/org/ballcat/redis/core/CacheStringAspect.java @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.redis.core; - -import com.hccake.ballcat.common.redis.RedisHelper; -import com.hccake.ballcat.common.redis.config.CachePropertiesHolder; -import com.hccake.ballcat.common.redis.core.annotation.CacheDel; -import com.hccake.ballcat.common.redis.core.annotation.CacheDels; -import com.hccake.ballcat.common.redis.core.annotation.CachePut; -import com.hccake.ballcat.common.redis.core.annotation.Cached; -import com.hccake.ballcat.common.redis.lock.DistributedLock; -import com.hccake.ballcat.common.redis.operation.CacheDelOps; -import com.hccake.ballcat.common.redis.operation.CacheDelsOps; -import com.hccake.ballcat.common.redis.operation.CachePutOps; -import com.hccake.ballcat.common.redis.operation.CachedOps; -import com.hccake.ballcat.common.redis.operation.function.VoidMethod; -import com.hccake.ballcat.common.redis.serialize.CacheSerializer; +package org.ballcat.redis.core; + +import org.ballcat.redis.RedisHelper; +import org.ballcat.redis.config.CachePropertiesHolder; +import org.ballcat.redis.core.annotation.CacheDel; +import org.ballcat.redis.core.annotation.CacheDels; +import org.ballcat.redis.core.annotation.CachePut; +import org.ballcat.redis.core.annotation.Cached; +import org.ballcat.redis.lock.DistributedLock; +import org.ballcat.redis.operation.CacheDelOps; +import org.ballcat.redis.operation.CacheDelsOps; +import org.ballcat.redis.operation.CachePutOps; +import org.ballcat.redis.operation.CachedOps; +import org.ballcat.redis.operation.function.VoidMethod; +import org.ballcat.redis.serialize.CacheSerializer; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; @@ -70,7 +70,7 @@ public CacheStringAspect(StringRedisTemplate redisTemplate, CacheSerializer cach this.cacheSerializer = cacheSerializer; } - @Pointcut("execution(@(@com.hccake.ballcat.common.redis.core.annotation.MetaCacheAnnotation *) * *(..))") + @Pointcut("execution(@(@org.ballcat.redis.core.annotation.MetaCacheAnnotation *) * *(..))") public void pointCut() { // do nothing } diff --git a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/core/KeyGenerator.java b/redis/ballcat-redis/src/main/java/org/ballcat/redis/core/KeyGenerator.java similarity index 94% rename from redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/core/KeyGenerator.java rename to redis/ballcat-redis/src/main/java/org/ballcat/redis/core/KeyGenerator.java index 729096eb2..154bcdf45 100644 --- a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/core/KeyGenerator.java +++ b/redis/ballcat-redis/src/main/java/org/ballcat/redis/core/KeyGenerator.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.redis.core; +package org.ballcat.redis.core; import cn.hutool.core.lang.Assert; -import com.hccake.ballcat.common.redis.config.CachePropertiesHolder; -import com.hccake.ballcat.common.util.SpelUtils; +import org.ballcat.redis.config.CachePropertiesHolder; +import org.ballcat.common.util.SpelUtils; import org.springframework.expression.spel.support.StandardEvaluationContext; import org.springframework.util.StringUtils; diff --git a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/core/annotation/CacheDel.java b/redis/ballcat-redis/src/main/java/org/ballcat/redis/core/annotation/CacheDel.java similarity index 96% rename from redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/core/annotation/CacheDel.java rename to redis/ballcat-redis/src/main/java/org/ballcat/redis/core/annotation/CacheDel.java index 35cc4e359..17b90cf21 100644 --- a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/core/annotation/CacheDel.java +++ b/redis/ballcat-redis/src/main/java/org/ballcat/redis/core/annotation/CacheDel.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.redis.core.annotation; +package org.ballcat.redis.core.annotation; import java.lang.annotation.*; diff --git a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/core/annotation/CacheDels.java b/redis/ballcat-redis/src/main/java/org/ballcat/redis/core/annotation/CacheDels.java similarity index 93% rename from redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/core/annotation/CacheDels.java rename to redis/ballcat-redis/src/main/java/org/ballcat/redis/core/annotation/CacheDels.java index f5fbf5296..cce3826e2 100644 --- a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/core/annotation/CacheDels.java +++ b/redis/ballcat-redis/src/main/java/org/ballcat/redis/core/annotation/CacheDels.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.redis.core.annotation; +package org.ballcat.redis.core.annotation; import java.lang.annotation.*; diff --git a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/core/annotation/CachePut.java b/redis/ballcat-redis/src/main/java/org/ballcat/redis/core/annotation/CachePut.java similarity index 96% rename from redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/core/annotation/CachePut.java rename to redis/ballcat-redis/src/main/java/org/ballcat/redis/core/annotation/CachePut.java index 6bf8bf9f7..ebf311c4d 100644 --- a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/core/annotation/CachePut.java +++ b/redis/ballcat-redis/src/main/java/org/ballcat/redis/core/annotation/CachePut.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.redis.core.annotation; +package org.ballcat.redis.core.annotation; import java.lang.annotation.*; import java.util.concurrent.TimeUnit; diff --git a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/core/annotation/Cached.java b/redis/ballcat-redis/src/main/java/org/ballcat/redis/core/annotation/Cached.java similarity index 96% rename from redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/core/annotation/Cached.java rename to redis/ballcat-redis/src/main/java/org/ballcat/redis/core/annotation/Cached.java index 1ac57007b..2ed7b3a26 100644 --- a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/core/annotation/Cached.java +++ b/redis/ballcat-redis/src/main/java/org/ballcat/redis/core/annotation/Cached.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.redis.core.annotation; +package org.ballcat.redis.core.annotation; import java.lang.annotation.*; import java.util.concurrent.TimeUnit; diff --git a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/core/annotation/MetaCacheAnnotation.java b/redis/ballcat-redis/src/main/java/org/ballcat/redis/core/annotation/MetaCacheAnnotation.java similarity index 93% rename from redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/core/annotation/MetaCacheAnnotation.java rename to redis/ballcat-redis/src/main/java/org/ballcat/redis/core/annotation/MetaCacheAnnotation.java index ca8972681..33d0a43ba 100644 --- a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/core/annotation/MetaCacheAnnotation.java +++ b/redis/ballcat-redis/src/main/java/org/ballcat/redis/core/annotation/MetaCacheAnnotation.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.redis.core.annotation; +package org.ballcat.redis.core.annotation; import java.lang.annotation.*; diff --git a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/listener/AbstractDeletedKeyEventMessageListener.java b/redis/ballcat-redis/src/main/java/org/ballcat/redis/keyevent/listener/AbstractDeletedKeyEventMessageListener.java similarity index 96% rename from redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/listener/AbstractDeletedKeyEventMessageListener.java rename to redis/ballcat-redis/src/main/java/org/ballcat/redis/keyevent/listener/AbstractDeletedKeyEventMessageListener.java index e16801e42..dd17fbaf2 100644 --- a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/listener/AbstractDeletedKeyEventMessageListener.java +++ b/redis/ballcat-redis/src/main/java/org/ballcat/redis/keyevent/listener/AbstractDeletedKeyEventMessageListener.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.redis.keyevent.listener; +package org.ballcat.redis.keyevent.listener; import org.springframework.data.redis.connection.MessageListener; import org.springframework.data.redis.listener.PatternTopic; diff --git a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/listener/AbstractExpiredKeyEventMessageListener.java b/redis/ballcat-redis/src/main/java/org/ballcat/redis/keyevent/listener/AbstractExpiredKeyEventMessageListener.java similarity index 96% rename from redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/listener/AbstractExpiredKeyEventMessageListener.java rename to redis/ballcat-redis/src/main/java/org/ballcat/redis/keyevent/listener/AbstractExpiredKeyEventMessageListener.java index 1e3dbf144..259bf961f 100644 --- a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/listener/AbstractExpiredKeyEventMessageListener.java +++ b/redis/ballcat-redis/src/main/java/org/ballcat/redis/keyevent/listener/AbstractExpiredKeyEventMessageListener.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.redis.keyevent.listener; +package org.ballcat.redis.keyevent.listener; import org.springframework.data.redis.connection.MessageListener; import org.springframework.data.redis.listener.KeyExpirationEventMessageListener; diff --git a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/listener/AbstractKeySpaceEventMessageListener.java b/redis/ballcat-redis/src/main/java/org/ballcat/redis/keyevent/listener/AbstractKeySpaceEventMessageListener.java similarity index 98% rename from redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/listener/AbstractKeySpaceEventMessageListener.java rename to redis/ballcat-redis/src/main/java/org/ballcat/redis/keyevent/listener/AbstractKeySpaceEventMessageListener.java index 13c86ddaa..537ffc405 100644 --- a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/listener/AbstractKeySpaceEventMessageListener.java +++ b/redis/ballcat-redis/src/main/java/org/ballcat/redis/keyevent/listener/AbstractKeySpaceEventMessageListener.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.redis.keyevent.listener; +package org.ballcat.redis.keyevent.listener; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisherAware; diff --git a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/listener/AbstractSetKeyEventMessageListener.java b/redis/ballcat-redis/src/main/java/org/ballcat/redis/keyevent/listener/AbstractSetKeyEventMessageListener.java similarity index 96% rename from redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/listener/AbstractSetKeyEventMessageListener.java rename to redis/ballcat-redis/src/main/java/org/ballcat/redis/keyevent/listener/AbstractSetKeyEventMessageListener.java index 312f60583..321031041 100644 --- a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/listener/AbstractSetKeyEventMessageListener.java +++ b/redis/ballcat-redis/src/main/java/org/ballcat/redis/keyevent/listener/AbstractSetKeyEventMessageListener.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.redis.keyevent.listener; +package org.ballcat.redis.keyevent.listener; import org.springframework.data.redis.connection.MessageListener; import org.springframework.data.redis.listener.PatternTopic; diff --git a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/listener/DefaultDeletedKeyEventMessageListener.java b/redis/ballcat-redis/src/main/java/org/ballcat/redis/keyevent/listener/DefaultDeletedKeyEventMessageListener.java similarity index 94% rename from redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/listener/DefaultDeletedKeyEventMessageListener.java rename to redis/ballcat-redis/src/main/java/org/ballcat/redis/keyevent/listener/DefaultDeletedKeyEventMessageListener.java index d9ffdc664..dc6acc52f 100644 --- a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/listener/DefaultDeletedKeyEventMessageListener.java +++ b/redis/ballcat-redis/src/main/java/org/ballcat/redis/keyevent/listener/DefaultDeletedKeyEventMessageListener.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.redis.keyevent.listener; +package org.ballcat.redis.keyevent.listener; -import com.hccake.ballcat.common.redis.keyevent.template.KeyDeletedEventMessageTemplate; +import org.ballcat.redis.keyevent.template.KeyDeletedEventMessageTemplate; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.ObjectProvider; import org.springframework.data.redis.connection.Message; diff --git a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/listener/DefaultExpiredKeyEventMessageListener.java b/redis/ballcat-redis/src/main/java/org/ballcat/redis/keyevent/listener/DefaultExpiredKeyEventMessageListener.java similarity index 94% rename from redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/listener/DefaultExpiredKeyEventMessageListener.java rename to redis/ballcat-redis/src/main/java/org/ballcat/redis/keyevent/listener/DefaultExpiredKeyEventMessageListener.java index c8349877c..f08338fb3 100644 --- a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/listener/DefaultExpiredKeyEventMessageListener.java +++ b/redis/ballcat-redis/src/main/java/org/ballcat/redis/keyevent/listener/DefaultExpiredKeyEventMessageListener.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.redis.keyevent.listener; +package org.ballcat.redis.keyevent.listener; -import com.hccake.ballcat.common.redis.keyevent.template.KeyExpiredEventMessageTemplate; +import org.ballcat.redis.keyevent.template.KeyExpiredEventMessageTemplate; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.ObjectProvider; import org.springframework.data.redis.connection.Message; diff --git a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/listener/DefaultSetKeyEventMessageListener.java b/redis/ballcat-redis/src/main/java/org/ballcat/redis/keyevent/listener/DefaultSetKeyEventMessageListener.java similarity index 94% rename from redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/listener/DefaultSetKeyEventMessageListener.java rename to redis/ballcat-redis/src/main/java/org/ballcat/redis/keyevent/listener/DefaultSetKeyEventMessageListener.java index e39c4fd4e..4856c70cf 100644 --- a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/listener/DefaultSetKeyEventMessageListener.java +++ b/redis/ballcat-redis/src/main/java/org/ballcat/redis/keyevent/listener/DefaultSetKeyEventMessageListener.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.redis.keyevent.listener; +package org.ballcat.redis.keyevent.listener; -import com.hccake.ballcat.common.redis.keyevent.template.KeySetEventMessageTemplate; +import org.ballcat.redis.keyevent.template.KeySetEventMessageTemplate; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.ObjectProvider; import org.springframework.data.redis.connection.Message; diff --git a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/package-info.java b/redis/ballcat-redis/src/main/java/org/ballcat/redis/keyevent/package-info.java similarity index 93% rename from redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/package-info.java rename to redis/ballcat-redis/src/main/java/org/ballcat/redis/keyevent/package-info.java index ab563e3b9..b4d30ff17 100644 --- a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/package-info.java +++ b/redis/ballcat-redis/src/main/java/org/ballcat/redis/keyevent/package-info.java @@ -16,4 +16,4 @@ /** * 对redis key 新增/修改/删除/过期事件监听的封装 */ -package com.hccake.ballcat.common.redis.keyevent; \ No newline at end of file +package org.ballcat.redis.keyevent; \ No newline at end of file diff --git a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/template/KeyDeletedEventMessageTemplate.java b/redis/ballcat-redis/src/main/java/org/ballcat/redis/keyevent/template/KeyDeletedEventMessageTemplate.java similarity index 93% rename from redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/template/KeyDeletedEventMessageTemplate.java rename to redis/ballcat-redis/src/main/java/org/ballcat/redis/keyevent/template/KeyDeletedEventMessageTemplate.java index 2956b6576..d8f1aa157 100644 --- a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/template/KeyDeletedEventMessageTemplate.java +++ b/redis/ballcat-redis/src/main/java/org/ballcat/redis/keyevent/template/KeyDeletedEventMessageTemplate.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.redis.keyevent.template; +package org.ballcat.redis.keyevent.template; /** * key event message for redis key deleted event diff --git a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/template/KeyEventMessageTemplate.java b/redis/ballcat-redis/src/main/java/org/ballcat/redis/keyevent/template/KeyEventMessageTemplate.java similarity index 95% rename from redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/template/KeyEventMessageTemplate.java rename to redis/ballcat-redis/src/main/java/org/ballcat/redis/keyevent/template/KeyEventMessageTemplate.java index d21810ec8..4e6e5380f 100644 --- a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/template/KeyEventMessageTemplate.java +++ b/redis/ballcat-redis/src/main/java/org/ballcat/redis/keyevent/template/KeyEventMessageTemplate.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.redis.keyevent.template; +package org.ballcat.redis.keyevent.template; import org.springframework.lang.Nullable; diff --git a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/template/KeyExpiredEventMessageTemplate.java b/redis/ballcat-redis/src/main/java/org/ballcat/redis/keyevent/template/KeyExpiredEventMessageTemplate.java similarity index 93% rename from redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/template/KeyExpiredEventMessageTemplate.java rename to redis/ballcat-redis/src/main/java/org/ballcat/redis/keyevent/template/KeyExpiredEventMessageTemplate.java index e64e735cb..6600bc140 100644 --- a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/template/KeyExpiredEventMessageTemplate.java +++ b/redis/ballcat-redis/src/main/java/org/ballcat/redis/keyevent/template/KeyExpiredEventMessageTemplate.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.redis.keyevent.template; +package org.ballcat.redis.keyevent.template; /** * key event message for redis key expired event diff --git a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/template/KeySetEventMessageTemplate.java b/redis/ballcat-redis/src/main/java/org/ballcat/redis/keyevent/template/KeySetEventMessageTemplate.java similarity index 93% rename from redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/template/KeySetEventMessageTemplate.java rename to redis/ballcat-redis/src/main/java/org/ballcat/redis/keyevent/template/KeySetEventMessageTemplate.java index 43540a697..8a9c18f95 100644 --- a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/keyevent/template/KeySetEventMessageTemplate.java +++ b/redis/ballcat-redis/src/main/java/org/ballcat/redis/keyevent/template/KeySetEventMessageTemplate.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.redis.keyevent.template; +package org.ballcat.redis.keyevent.template; /** * key event message for redis set key event diff --git a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/listener/AbstractMessageEventListener.java b/redis/ballcat-redis/src/main/java/org/ballcat/redis/listener/AbstractMessageEventListener.java similarity index 95% rename from redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/listener/AbstractMessageEventListener.java rename to redis/ballcat-redis/src/main/java/org/ballcat/redis/listener/AbstractMessageEventListener.java index 71f91fcff..e4db9279e 100644 --- a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/listener/AbstractMessageEventListener.java +++ b/redis/ballcat-redis/src/main/java/org/ballcat/redis/listener/AbstractMessageEventListener.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.redis.listener; +package org.ballcat.redis.listener; -import com.hccake.ballcat.common.util.JsonUtils; +import org.ballcat.common.util.JsonUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.connection.Message; import org.springframework.data.redis.core.StringRedisTemplate; diff --git a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/listener/MessageEventListener.java b/redis/ballcat-redis/src/main/java/org/ballcat/redis/listener/MessageEventListener.java similarity index 94% rename from redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/listener/MessageEventListener.java rename to redis/ballcat-redis/src/main/java/org/ballcat/redis/listener/MessageEventListener.java index 1e6ae7284..aecb73868 100644 --- a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/listener/MessageEventListener.java +++ b/redis/ballcat-redis/src/main/java/org/ballcat/redis/listener/MessageEventListener.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.redis.listener; +package org.ballcat.redis.listener; import org.springframework.data.redis.connection.MessageListener; import org.springframework.data.redis.listener.Topic; diff --git a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/lock/Action.java b/redis/ballcat-redis/src/main/java/org/ballcat/redis/lock/Action.java similarity index 90% rename from redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/lock/Action.java rename to redis/ballcat-redis/src/main/java/org/ballcat/redis/lock/Action.java index 367d024da..786a708e7 100644 --- a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/lock/Action.java +++ b/redis/ballcat-redis/src/main/java/org/ballcat/redis/lock/Action.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.redis.lock; +package org.ballcat.redis.lock; -import com.hccake.ballcat.common.redis.config.CachePropertiesHolder; -import com.hccake.ballcat.common.redis.lock.function.ThrowingExecutor; +import org.ballcat.redis.config.CachePropertiesHolder; +import org.ballcat.redis.lock.function.ThrowingExecutor; import java.util.concurrent.TimeUnit; diff --git a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/lock/CacheLock.java b/redis/ballcat-redis/src/main/java/org/ballcat/redis/lock/CacheLock.java similarity index 94% rename from redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/lock/CacheLock.java rename to redis/ballcat-redis/src/main/java/org/ballcat/redis/lock/CacheLock.java index 3454cc004..c64a30203 100644 --- a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/lock/CacheLock.java +++ b/redis/ballcat-redis/src/main/java/org/ballcat/redis/lock/CacheLock.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.redis.lock; +package org.ballcat.redis.lock; -import com.hccake.ballcat.common.redis.RedisHelper; -import com.hccake.ballcat.common.redis.config.CachePropertiesHolder; +import org.ballcat.redis.RedisHelper; +import org.ballcat.redis.config.CachePropertiesHolder; import lombok.extern.slf4j.Slf4j; import org.springframework.data.redis.core.script.DefaultRedisScript; diff --git a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/lock/DistributedLock.java b/redis/ballcat-redis/src/main/java/org/ballcat/redis/lock/DistributedLock.java similarity index 94% rename from redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/lock/DistributedLock.java rename to redis/ballcat-redis/src/main/java/org/ballcat/redis/lock/DistributedLock.java index 36da05024..836025a6b 100644 --- a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/lock/DistributedLock.java +++ b/redis/ballcat-redis/src/main/java/org/ballcat/redis/lock/DistributedLock.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.redis.lock; +package org.ballcat.redis.lock; -import com.hccake.ballcat.common.redis.lock.function.ExceptionHandler; -import com.hccake.ballcat.common.redis.lock.function.ThrowingExecutor; +import org.ballcat.redis.lock.function.ExceptionHandler; +import org.ballcat.redis.lock.function.ThrowingExecutor; import org.springframework.util.Assert; import java.util.UUID; diff --git a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/lock/StateHandler.java b/redis/ballcat-redis/src/main/java/org/ballcat/redis/lock/StateHandler.java similarity index 92% rename from redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/lock/StateHandler.java rename to redis/ballcat-redis/src/main/java/org/ballcat/redis/lock/StateHandler.java index 4ff6189b8..6a6cdc4fd 100644 --- a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/lock/StateHandler.java +++ b/redis/ballcat-redis/src/main/java/org/ballcat/redis/lock/StateHandler.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.redis.lock; +package org.ballcat.redis.lock; -import com.hccake.ballcat.common.redis.lock.function.ExceptionHandler; +import org.ballcat.redis.lock.function.ExceptionHandler; import java.util.function.Supplier; import java.util.function.UnaryOperator; diff --git a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/lock/function/ExceptionHandler.java b/redis/ballcat-redis/src/main/java/org/ballcat/redis/lock/function/ExceptionHandler.java similarity index 94% rename from redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/lock/function/ExceptionHandler.java rename to redis/ballcat-redis/src/main/java/org/ballcat/redis/lock/function/ExceptionHandler.java index 649200760..be69ad76b 100644 --- a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/lock/function/ExceptionHandler.java +++ b/redis/ballcat-redis/src/main/java/org/ballcat/redis/lock/function/ExceptionHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.redis.lock.function; +package org.ballcat.redis.lock.function; /** * 异常处理器，可在处理完异常后再次抛出异常 diff --git a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/lock/function/ThrowingExecutor.java b/redis/ballcat-redis/src/main/java/org/ballcat/redis/lock/function/ThrowingExecutor.java similarity index 94% rename from redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/lock/function/ThrowingExecutor.java rename to redis/ballcat-redis/src/main/java/org/ballcat/redis/lock/function/ThrowingExecutor.java index 413a9ddd5..d3b2c51e9 100644 --- a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/lock/function/ThrowingExecutor.java +++ b/redis/ballcat-redis/src/main/java/org/ballcat/redis/lock/function/ThrowingExecutor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.redis.lock.function; +package org.ballcat.redis.lock.function; /** * 允许抛出异常的执行器 diff --git a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/operation/AbstractCacheOps.java b/redis/ballcat-redis/src/main/java/org/ballcat/redis/operation/AbstractCacheOps.java similarity index 91% rename from redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/operation/AbstractCacheOps.java rename to redis/ballcat-redis/src/main/java/org/ballcat/redis/operation/AbstractCacheOps.java index 03deeeca1..7bc9ce98a 100644 --- a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/operation/AbstractCacheOps.java +++ b/redis/ballcat-redis/src/main/java/org/ballcat/redis/operation/AbstractCacheOps.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.redis.operation; +package org.ballcat.redis.operation; -import com.hccake.ballcat.common.redis.config.CachePropertiesHolder; +import org.ballcat.redis.config.CachePropertiesHolder; import org.aspectj.lang.ProceedingJoinPoint; /** diff --git a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/operation/CacheDelOps.java b/redis/ballcat-redis/src/main/java/org/ballcat/redis/operation/CacheDelOps.java similarity index 89% rename from redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/operation/CacheDelOps.java rename to redis/ballcat-redis/src/main/java/org/ballcat/redis/operation/CacheDelOps.java index 905fbb4a9..35e528be0 100644 --- a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/operation/CacheDelOps.java +++ b/redis/ballcat-redis/src/main/java/org/ballcat/redis/operation/CacheDelOps.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.redis.operation; +package org.ballcat.redis.operation; -import com.hccake.ballcat.common.redis.operation.function.VoidMethod; +import org.ballcat.redis.operation.function.VoidMethod; import org.aspectj.lang.ProceedingJoinPoint; /** diff --git a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/operation/CacheDelsOps.java b/redis/ballcat-redis/src/main/java/org/ballcat/redis/operation/CacheDelsOps.java similarity index 89% rename from redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/operation/CacheDelsOps.java rename to redis/ballcat-redis/src/main/java/org/ballcat/redis/operation/CacheDelsOps.java index 5152176ec..41fbf068c 100644 --- a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/operation/CacheDelsOps.java +++ b/redis/ballcat-redis/src/main/java/org/ballcat/redis/operation/CacheDelsOps.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.redis.operation; +package org.ballcat.redis.operation; -import com.hccake.ballcat.common.redis.operation.function.VoidMethod; +import org.ballcat.redis.operation.function.VoidMethod; import org.aspectj.lang.ProceedingJoinPoint; /** diff --git a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/operation/CachePutOps.java b/redis/ballcat-redis/src/main/java/org/ballcat/redis/operation/CachePutOps.java similarity index 95% rename from redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/operation/CachePutOps.java rename to redis/ballcat-redis/src/main/java/org/ballcat/redis/operation/CachePutOps.java index a4ef4ae49..19e61ca8e 100644 --- a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/operation/CachePutOps.java +++ b/redis/ballcat-redis/src/main/java/org/ballcat/redis/operation/CachePutOps.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.redis.operation; +package org.ballcat.redis.operation; import org.aspectj.lang.ProceedingJoinPoint; diff --git a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/operation/CachedOps.java b/redis/ballcat-redis/src/main/java/org/ballcat/redis/operation/CachedOps.java similarity index 97% rename from redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/operation/CachedOps.java rename to redis/ballcat-redis/src/main/java/org/ballcat/redis/operation/CachedOps.java index 23ea0b763..aaec2225a 100644 --- a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/operation/CachedOps.java +++ b/redis/ballcat-redis/src/main/java/org/ballcat/redis/operation/CachedOps.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.redis.operation; +package org.ballcat.redis.operation; import org.aspectj.lang.ProceedingJoinPoint; diff --git a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/operation/function/ResultMethod.java b/redis/ballcat-redis/src/main/java/org/ballcat/redis/operation/function/ResultMethod.java similarity index 92% rename from redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/operation/function/ResultMethod.java rename to redis/ballcat-redis/src/main/java/org/ballcat/redis/operation/function/ResultMethod.java index 72d6b3584..ddfb5d1e9 100644 --- a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/operation/function/ResultMethod.java +++ b/redis/ballcat-redis/src/main/java/org/ballcat/redis/operation/function/ResultMethod.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.redis.operation.function; +package org.ballcat.redis.operation.function; /** * @author Hccake 2019/9/2 20:22 diff --git a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/operation/function/VoidMethod.java b/redis/ballcat-redis/src/main/java/org/ballcat/redis/operation/function/VoidMethod.java similarity index 92% rename from redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/operation/function/VoidMethod.java rename to redis/ballcat-redis/src/main/java/org/ballcat/redis/operation/function/VoidMethod.java index a44307404..8ddc47a69 100644 --- a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/operation/function/VoidMethod.java +++ b/redis/ballcat-redis/src/main/java/org/ballcat/redis/operation/function/VoidMethod.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.redis.operation.function; +package org.ballcat.redis.operation.function; /** * @author Hccake 2019/9/2 20:15 diff --git a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/prefix/IRedisPrefixConverter.java b/redis/ballcat-redis/src/main/java/org/ballcat/redis/prefix/IRedisPrefixConverter.java similarity index 98% rename from redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/prefix/IRedisPrefixConverter.java rename to redis/ballcat-redis/src/main/java/org/ballcat/redis/prefix/IRedisPrefixConverter.java index b5d482c35..c564f736e 100644 --- a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/prefix/IRedisPrefixConverter.java +++ b/redis/ballcat-redis/src/main/java/org/ballcat/redis/prefix/IRedisPrefixConverter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.redis.prefix; +package org.ballcat.redis.prefix; import cn.hutool.core.text.CharSequenceUtil; import org.slf4j.Logger; diff --git a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/prefix/impl/DefaultRedisPrefixConverter.java b/redis/ballcat-redis/src/main/java/org/ballcat/redis/prefix/impl/DefaultRedisPrefixConverter.java similarity index 89% rename from redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/prefix/impl/DefaultRedisPrefixConverter.java rename to redis/ballcat-redis/src/main/java/org/ballcat/redis/prefix/impl/DefaultRedisPrefixConverter.java index b0a04252e..1edcf0574 100644 --- a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/prefix/impl/DefaultRedisPrefixConverter.java +++ b/redis/ballcat-redis/src/main/java/org/ballcat/redis/prefix/impl/DefaultRedisPrefixConverter.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.redis.prefix.impl; +package org.ballcat.redis.prefix.impl; -import com.hccake.ballcat.common.redis.prefix.IRedisPrefixConverter; +import org.ballcat.redis.prefix.IRedisPrefixConverter; /** * redis key前缀默认转换器 diff --git a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/serialize/CacheSerializer.java b/redis/ballcat-redis/src/main/java/org/ballcat/redis/serialize/CacheSerializer.java similarity index 97% rename from redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/serialize/CacheSerializer.java rename to redis/ballcat-redis/src/main/java/org/ballcat/redis/serialize/CacheSerializer.java index 168d51e57..df5aceb02 100644 --- a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/serialize/CacheSerializer.java +++ b/redis/ballcat-redis/src/main/java/org/ballcat/redis/serialize/CacheSerializer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.redis.serialize; +package org.ballcat.redis.serialize; import com.fasterxml.jackson.databind.JavaType; import com.fasterxml.jackson.databind.type.TypeFactory; diff --git a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/serialize/JacksonSerializer.java b/redis/ballcat-redis/src/main/java/org/ballcat/redis/serialize/JacksonSerializer.java similarity index 96% rename from redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/serialize/JacksonSerializer.java rename to redis/ballcat-redis/src/main/java/org/ballcat/redis/serialize/JacksonSerializer.java index b1fdae81b..2dc9b2f92 100644 --- a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/serialize/JacksonSerializer.java +++ b/redis/ballcat-redis/src/main/java/org/ballcat/redis/serialize/JacksonSerializer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.redis.serialize; +package org.ballcat.redis.serialize; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.RequiredArgsConstructor; diff --git a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/serialize/PrefixJdkRedisSerializer.java b/redis/ballcat-redis/src/main/java/org/ballcat/redis/serialize/PrefixJdkRedisSerializer.java similarity index 92% rename from redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/serialize/PrefixJdkRedisSerializer.java rename to redis/ballcat-redis/src/main/java/org/ballcat/redis/serialize/PrefixJdkRedisSerializer.java index 85494af0e..cd41ff569 100644 --- a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/serialize/PrefixJdkRedisSerializer.java +++ b/redis/ballcat-redis/src/main/java/org/ballcat/redis/serialize/PrefixJdkRedisSerializer.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.redis.serialize; +package org.ballcat.redis.serialize; -import com.hccake.ballcat.common.redis.prefix.IRedisPrefixConverter; +import org.ballcat.redis.prefix.IRedisPrefixConverter; import lombok.extern.slf4j.Slf4j; import org.springframework.data.redis.serializer.JdkSerializationRedisSerializer; diff --git a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/serialize/PrefixStringRedisSerializer.java b/redis/ballcat-redis/src/main/java/org/ballcat/redis/serialize/PrefixStringRedisSerializer.java similarity index 92% rename from redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/serialize/PrefixStringRedisSerializer.java rename to redis/ballcat-redis/src/main/java/org/ballcat/redis/serialize/PrefixStringRedisSerializer.java index a76ea0cf0..3bbd0b4cd 100644 --- a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/serialize/PrefixStringRedisSerializer.java +++ b/redis/ballcat-redis/src/main/java/org/ballcat/redis/serialize/PrefixStringRedisSerializer.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.redis.serialize; +package org.ballcat.redis.serialize; -import com.hccake.ballcat.common.redis.prefix.IRedisPrefixConverter; +import org.ballcat.redis.prefix.IRedisPrefixConverter; import lombok.extern.slf4j.Slf4j; import org.springframework.data.redis.serializer.StringRedisSerializer; diff --git a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/thread/AbstractRedisThread.java b/redis/ballcat-redis/src/main/java/org/ballcat/redis/thread/AbstractRedisThread.java similarity index 94% rename from redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/thread/AbstractRedisThread.java rename to redis/ballcat-redis/src/main/java/org/ballcat/redis/thread/AbstractRedisThread.java index 4fd264e6a..bbbaea154 100644 --- a/redis/ballcat-redis/src/main/java/com/hccake/ballcat/common/redis/thread/AbstractRedisThread.java +++ b/redis/ballcat-redis/src/main/java/org/ballcat/redis/thread/AbstractRedisThread.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.redis.thread; +package org.ballcat.redis.thread; import cn.hutool.core.text.CharSequenceUtil; -import com.hccake.ballcat.common.core.thread.AbstractQueueThread; -import com.hccake.ballcat.common.redis.RedisHelper; -import com.hccake.ballcat.common.util.JsonUtils; +import org.ballcat.common.core.thread.AbstractQueueThread; +import org.ballcat.redis.RedisHelper; +import org.ballcat.common.util.JsonUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.lang.Nullable; diff --git a/redis/ballcat-redis/src/test/java/com/hccake/ballcat/common/redis/test/DistributeLockTest.java b/redis/ballcat-redis/src/test/java/org/ballcat/redis/DistributeLockTest.java similarity index 91% rename from redis/ballcat-redis/src/test/java/com/hccake/ballcat/common/redis/test/DistributeLockTest.java rename to redis/ballcat-redis/src/test/java/org/ballcat/redis/DistributeLockTest.java index 04137c380..9faed4e0e 100644 --- a/redis/ballcat-redis/src/test/java/com/hccake/ballcat/common/redis/test/DistributeLockTest.java +++ b/redis/ballcat-redis/src/test/java/org/ballcat/redis/DistributeLockTest.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.redis.test; +package org.ballcat.redis; -import com.hccake.ballcat.common.redis.lock.DistributedLock; +import org.ballcat.redis.lock.DistributedLock; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; @@ -25,7 +25,7 @@ /** * @author huyuanzhi 2021/11/16 */ -@SpringJUnitConfig(RedisConfiguration.class) +@SpringJUnitConfig(TestRedisConfiguration.class) class DistributeLockTest { String lockKey = "ballcat"; diff --git a/redis/ballcat-redis/src/test/java/com/hccake/ballcat/common/redis/test/RedisConfiguration.java b/redis/ballcat-redis/src/test/java/org/ballcat/redis/TestRedisConfiguration.java similarity index 84% rename from redis/ballcat-redis/src/test/java/com/hccake/ballcat/common/redis/test/RedisConfiguration.java rename to redis/ballcat-redis/src/test/java/org/ballcat/redis/TestRedisConfiguration.java index bb95396a7..d5da8629f 100644 --- a/redis/ballcat-redis/src/test/java/com/hccake/ballcat/common/redis/test/RedisConfiguration.java +++ b/redis/ballcat-redis/src/test/java/org/ballcat/redis/TestRedisConfiguration.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.redis.test; +package org.ballcat.redis; -import com.hccake.ballcat.common.redis.RedisHelper; -import com.hccake.ballcat.common.redis.config.CacheProperties; -import com.hccake.ballcat.common.redis.config.CachePropertiesHolder; -import com.hccake.ballcat.common.redis.prefix.IRedisPrefixConverter; -import com.hccake.ballcat.common.redis.prefix.impl.DefaultRedisPrefixConverter; -import com.hccake.ballcat.common.redis.serialize.PrefixStringRedisSerializer; +import org.ballcat.redis.RedisHelper; +import org.ballcat.redis.config.CacheProperties; +import org.ballcat.redis.config.CachePropertiesHolder; +import org.ballcat.redis.prefix.IRedisPrefixConverter; +import org.ballcat.redis.prefix.impl.DefaultRedisPrefixConverter; +import org.ballcat.redis.serialize.PrefixStringRedisSerializer; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -35,7 +35,7 @@ */ @Configuration @EnableConfigurationProperties(CacheProperties.class) -public class RedisConfiguration { +public class TestRedisConfiguration { private static final String host = "localhost"; diff --git a/redis/ballcat-spring-boot-starter-redis/src/main/java/com/hccake/ballcat/autoconfigure/redis/AddMessageEventListenerToContainer.java b/redis/ballcat-spring-boot-starter-redis/src/main/java/org/ballcat/autoconfigure/redis/AddMessageEventListenerToContainer.java similarity index 92% rename from redis/ballcat-spring-boot-starter-redis/src/main/java/com/hccake/ballcat/autoconfigure/redis/AddMessageEventListenerToContainer.java rename to redis/ballcat-spring-boot-starter-redis/src/main/java/org/ballcat/autoconfigure/redis/AddMessageEventListenerToContainer.java index ee6f0f7d0..0aa8e8973 100644 --- a/redis/ballcat-spring-boot-starter-redis/src/main/java/com/hccake/ballcat/autoconfigure/redis/AddMessageEventListenerToContainer.java +++ b/redis/ballcat-spring-boot-starter-redis/src/main/java/org/ballcat/autoconfigure/redis/AddMessageEventListenerToContainer.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.autoconfigure.redis; +package org.ballcat.autoconfigure.redis; -import com.hccake.ballcat.common.redis.listener.MessageEventListener; +import org.ballcat.redis.listener.MessageEventListener; import lombok.RequiredArgsConstructor; import org.springframework.data.redis.listener.RedisMessageListenerContainer; diff --git a/redis/ballcat-spring-boot-starter-redis/src/main/java/com/hccake/ballcat/autoconfigure/redis/BallcatRedisAutoConfiguration.java b/redis/ballcat-spring-boot-starter-redis/src/main/java/org/ballcat/autoconfigure/redis/BallcatRedisAutoConfiguration.java similarity index 85% rename from redis/ballcat-spring-boot-starter-redis/src/main/java/com/hccake/ballcat/autoconfigure/redis/BallcatRedisAutoConfiguration.java rename to redis/ballcat-spring-boot-starter-redis/src/main/java/org/ballcat/autoconfigure/redis/BallcatRedisAutoConfiguration.java index 6d292ae2d..875916bdd 100644 --- a/redis/ballcat-spring-boot-starter-redis/src/main/java/com/hccake/ballcat/autoconfigure/redis/BallcatRedisAutoConfiguration.java +++ b/redis/ballcat-spring-boot-starter-redis/src/main/java/org/ballcat/autoconfigure/redis/BallcatRedisAutoConfiguration.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.autoconfigure.redis; +package org.ballcat.autoconfigure.redis; import com.fasterxml.jackson.databind.ObjectMapper; -import com.hccake.ballcat.common.redis.RedisHelper; -import com.hccake.ballcat.common.redis.config.CacheProperties; -import com.hccake.ballcat.common.redis.config.CachePropertiesHolder; -import com.hccake.ballcat.common.redis.core.CacheStringAspect; -import com.hccake.ballcat.common.redis.prefix.IRedisPrefixConverter; -import com.hccake.ballcat.common.redis.prefix.impl.DefaultRedisPrefixConverter; -import com.hccake.ballcat.common.redis.serialize.CacheSerializer; -import com.hccake.ballcat.common.redis.serialize.JacksonSerializer; -import com.hccake.ballcat.common.redis.serialize.PrefixJdkRedisSerializer; -import com.hccake.ballcat.common.redis.serialize.PrefixStringRedisSerializer; +import org.ballcat.redis.RedisHelper; +import org.ballcat.redis.config.CacheProperties; +import org.ballcat.redis.config.CachePropertiesHolder; +import org.ballcat.redis.core.CacheStringAspect; +import org.ballcat.redis.prefix.IRedisPrefixConverter; +import org.ballcat.redis.prefix.impl.DefaultRedisPrefixConverter; +import org.ballcat.redis.serialize.CacheSerializer; +import org.ballcat.redis.serialize.JacksonSerializer; +import org.ballcat.redis.serialize.PrefixJdkRedisSerializer; +import org.ballcat.redis.serialize.PrefixStringRedisSerializer; import lombok.RequiredArgsConstructor; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; diff --git a/redis/ballcat-spring-boot-starter-redis/src/main/java/com/hccake/ballcat/autoconfigure/redis/MessageEventListenerAutoConfiguration.java b/redis/ballcat-spring-boot-starter-redis/src/main/java/org/ballcat/autoconfigure/redis/MessageEventListenerAutoConfiguration.java similarity index 93% rename from redis/ballcat-spring-boot-starter-redis/src/main/java/com/hccake/ballcat/autoconfigure/redis/MessageEventListenerAutoConfiguration.java rename to redis/ballcat-spring-boot-starter-redis/src/main/java/org/ballcat/autoconfigure/redis/MessageEventListenerAutoConfiguration.java index ef62571ee..fb27d6a1e 100644 --- a/redis/ballcat-spring-boot-starter-redis/src/main/java/com/hccake/ballcat/autoconfigure/redis/MessageEventListenerAutoConfiguration.java +++ b/redis/ballcat-spring-boot-starter-redis/src/main/java/org/ballcat/autoconfigure/redis/MessageEventListenerAutoConfiguration.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.autoconfigure.redis; +package org.ballcat.autoconfigure.redis; -import com.hccake.ballcat.common.redis.listener.MessageEventListener; +import org.ballcat.redis.listener.MessageEventListener; import lombok.RequiredArgsConstructor; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; diff --git a/redis/ballcat-spring-boot-starter-redis/src/main/java/com/hccake/ballcat/autoconfigure/redis/RedisKeyEventAutoConfiguration.java b/redis/ballcat-spring-boot-starter-redis/src/main/java/org/ballcat/autoconfigure/redis/RedisKeyEventAutoConfiguration.java similarity index 92% rename from redis/ballcat-spring-boot-starter-redis/src/main/java/com/hccake/ballcat/autoconfigure/redis/RedisKeyEventAutoConfiguration.java rename to redis/ballcat-spring-boot-starter-redis/src/main/java/org/ballcat/autoconfigure/redis/RedisKeyEventAutoConfiguration.java index a2cfb091a..2aef12b6f 100644 --- a/redis/ballcat-spring-boot-starter-redis/src/main/java/com/hccake/ballcat/autoconfigure/redis/RedisKeyEventAutoConfiguration.java +++ b/redis/ballcat-spring-boot-starter-redis/src/main/java/org/ballcat/autoconfigure/redis/RedisKeyEventAutoConfiguration.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.autoconfigure.redis; +package org.ballcat.autoconfigure.redis; -import com.hccake.ballcat.common.redis.config.CacheProperties; -import com.hccake.ballcat.common.redis.keyevent.listener.*; -import com.hccake.ballcat.common.redis.keyevent.template.KeyDeletedEventMessageTemplate; -import com.hccake.ballcat.common.redis.keyevent.template.KeyExpiredEventMessageTemplate; -import com.hccake.ballcat.common.redis.keyevent.template.KeySetEventMessageTemplate; +import org.ballcat.redis.config.CacheProperties; +import org.ballcat.redis.keyevent.listener.*; +import org.ballcat.redis.keyevent.template.KeyDeletedEventMessageTemplate; +import org.ballcat.redis.keyevent.template.KeyExpiredEventMessageTemplate; +import org.ballcat.redis.keyevent.template.KeySetEventMessageTemplate; import org.springframework.beans.factory.ObjectProvider; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.autoconfigure.AutoConfiguration; diff --git a/redis/ballcat-spring-boot-starter-redis/src/main/resources/META-INF/spring.factories b/redis/ballcat-spring-boot-starter-redis/src/main/resources/META-INF/spring.factories index ad8188af9..9f0867be4 100644 --- a/redis/ballcat-spring-boot-starter-redis/src/main/resources/META-INF/spring.factories +++ b/redis/ballcat-spring-boot-starter-redis/src/main/resources/META-INF/spring.factories @@ -1,4 +1,4 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.hccake.ballcat.autoconfigure.redis.BallcatRedisAutoConfiguration,\ - com.hccake.ballcat.autoconfigure.redis.MessageEventListenerAutoConfiguration,\ - com.hccake.ballcat.autoconfigure.redis.RedisKeyEventAutoConfiguration \ No newline at end of file + org.ballcat.autoconfigure.redis.BallcatRedisAutoConfiguration,\ + org.ballcat.autoconfigure.redis.MessageEventListenerAutoConfiguration,\ + org.ballcat.autoconfigure.redis.RedisKeyEventAutoConfiguration \ No newline at end of file diff --git a/redis/ballcat-spring-boot-starter-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/redis/ballcat-spring-boot-starter-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 3816f5e42..d8b84ac22 100644 --- a/redis/ballcat-spring-boot-starter-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/redis/ballcat-spring-boot-starter-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,3 +1,3 @@ -com.hccake.ballcat.autoconfigure.redis.BallcatRedisAutoConfiguration -com.hccake.ballcat.autoconfigure.redis.MessageEventListenerAutoConfiguration -com.hccake.ballcat.autoconfigure.redis.RedisKeyEventAutoConfiguration \ No newline at end of file +org.ballcat.autoconfigure.redis.BallcatRedisAutoConfiguration +org.ballcat.autoconfigure.redis.MessageEventListenerAutoConfiguration +org.ballcat.autoconfigure.redis.RedisKeyEventAutoConfiguration \ No newline at end of file diff --git a/security/ballcat-spring-security-oauth2-authorization-server/src/main/java/org/ballcat/springsecurity/oauth2/server/authorization/autoconfigure/OAuth2AuthorizationServerAutoConfiguration.java b/security/ballcat-spring-security-oauth2-authorization-server/src/main/java/org/ballcat/springsecurity/oauth2/server/authorization/autoconfigure/OAuth2AuthorizationServerAutoConfiguration.java index 042f8b83e..548d6ef35 100644 --- a/security/ballcat-spring-security-oauth2-authorization-server/src/main/java/org/ballcat/springsecurity/oauth2/server/authorization/autoconfigure/OAuth2AuthorizationServerAutoConfiguration.java +++ b/security/ballcat-spring-security-oauth2-authorization-server/src/main/java/org/ballcat/springsecurity/oauth2/server/authorization/autoconfigure/OAuth2AuthorizationServerAutoConfiguration.java @@ -17,12 +17,12 @@ import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.ObjectMapper; -import com.hccake.ballcat.common.security.authentication.OAuth2UserAuthenticationToken; -import com.hccake.ballcat.common.security.jackson2.LongMixin; -import com.hccake.ballcat.common.security.jackson2.OAuth2UserAuthenticationTokenMixin; -import com.hccake.ballcat.common.security.jackson2.UserMixin; -import com.hccake.ballcat.common.security.userdetails.User; -import com.hccake.ballcat.common.security.util.PasswordUtils; +import org.ballcat.security.oauth2.authentication.OAuth2UserAuthenticationToken; +import org.ballcat.security.oauth2.jackson2.LongMixin; +import org.ballcat.security.oauth2.jackson2.OAuth2UserAuthenticationTokenMixin; +import org.ballcat.security.oauth2.jackson2.UserMixin; +import org.ballcat.security.oauth2.userdetails.User; +import org.ballcat.security.oauth2.util.PasswordUtils; import lombok.RequiredArgsConstructor; import org.ballcat.springsecurity.oauth2.server.authorization.OAuth2AuthorizationObjectMapperCustomizer; import org.ballcat.springsecurity.oauth2.server.authorization.config.BallcatOAuth2AuthorizationServerSecurityFilterChainBuilder; diff --git a/security/ballcat-spring-security-oauth2-authorization-server/src/main/java/org/ballcat/springsecurity/oauth2/server/authorization/token/BallcatOAuth2TokenCustomizer.java b/security/ballcat-spring-security-oauth2-authorization-server/src/main/java/org/ballcat/springsecurity/oauth2/server/authorization/token/BallcatOAuth2TokenCustomizer.java index a519b5267..8d83f6d72 100644 --- a/security/ballcat-spring-security-oauth2-authorization-server/src/main/java/org/ballcat/springsecurity/oauth2/server/authorization/token/BallcatOAuth2TokenCustomizer.java +++ b/security/ballcat-spring-security-oauth2-authorization-server/src/main/java/org/ballcat/springsecurity/oauth2/server/authorization/token/BallcatOAuth2TokenCustomizer.java @@ -15,9 +15,9 @@ */ package org.ballcat.springsecurity.oauth2.server.authorization.token; -import com.hccake.ballcat.common.security.constant.TokenAttributeNameConstants; -import com.hccake.ballcat.common.security.constant.UserInfoFiledNameConstants; -import com.hccake.ballcat.common.security.userdetails.User; +import org.ballcat.security.oauth2.constant.TokenAttributeNameConstants; +import org.ballcat.security.oauth2.constant.UserInfoFiledNameConstants; +import org.ballcat.security.oauth2.userdetails.User; import org.springframework.security.core.Authentication; import org.springframework.security.oauth2.server.authorization.authentication.OAuth2ClientAuthenticationToken; import org.springframework.security.oauth2.server.authorization.token.OAuth2TokenClaimsContext; diff --git a/security/ballcat-spring-security-oauth2-authorization-server/src/main/java/org/ballcat/springsecurity/oauth2/server/authorization/web/filter/LoginCaptchaFilter.java b/security/ballcat-spring-security-oauth2-authorization-server/src/main/java/org/ballcat/springsecurity/oauth2/server/authorization/web/filter/LoginCaptchaFilter.java index 45d620094..281df7717 100644 --- a/security/ballcat-spring-security-oauth2-authorization-server/src/main/java/org/ballcat/springsecurity/oauth2/server/authorization/web/filter/LoginCaptchaFilter.java +++ b/security/ballcat-spring-security-oauth2-authorization-server/src/main/java/org/ballcat/springsecurity/oauth2/server/authorization/web/filter/LoginCaptchaFilter.java @@ -16,10 +16,10 @@ package org.ballcat.springsecurity.oauth2.server.authorization.web.filter; import cn.hutool.core.text.CharSequenceUtil; -import com.hccake.ballcat.common.model.result.R; -import com.hccake.ballcat.common.model.result.SystemResultCode; -import com.hccake.ballcat.common.security.ScopeNames; -import com.hccake.ballcat.common.util.JsonUtils; +import org.ballcat.common.model.result.R; +import org.ballcat.common.model.result.SystemResultCode; +import org.ballcat.security.oauth2.ScopeNames; +import org.ballcat.common.util.JsonUtils; import lombok.RequiredArgsConstructor; import org.ballcat.security.captcha.CaptchaValidateResult; import org.ballcat.security.captcha.CaptchaValidator; diff --git a/security/ballcat-spring-security-oauth2-authorization-server/src/main/java/org/ballcat/springsecurity/oauth2/server/authorization/web/filter/LoginPasswordDecoderFilter.java b/security/ballcat-spring-security-oauth2-authorization-server/src/main/java/org/ballcat/springsecurity/oauth2/server/authorization/web/filter/LoginPasswordDecoderFilter.java index 14bee9eb1..a25edeac9 100644 --- a/security/ballcat-spring-security-oauth2-authorization-server/src/main/java/org/ballcat/springsecurity/oauth2/server/authorization/web/filter/LoginPasswordDecoderFilter.java +++ b/security/ballcat-spring-security-oauth2-authorization-server/src/main/java/org/ballcat/springsecurity/oauth2/server/authorization/web/filter/LoginPasswordDecoderFilter.java @@ -15,12 +15,12 @@ */ package org.ballcat.springsecurity.oauth2.server.authorization.web.filter; -import com.hccake.ballcat.common.core.request.wrapper.ModifyParamMapRequestWrapper; -import com.hccake.ballcat.common.model.result.R; -import com.hccake.ballcat.common.model.result.SystemResultCode; -import com.hccake.ballcat.common.security.ScopeNames; -import com.hccake.ballcat.common.security.util.PasswordUtils; -import com.hccake.ballcat.common.util.JsonUtils; +import org.ballcat.common.core.request.wrapper.ModifyParamMapRequestWrapper; +import org.ballcat.common.model.result.R; +import org.ballcat.common.model.result.SystemResultCode; +import org.ballcat.security.oauth2.ScopeNames; +import org.ballcat.security.oauth2.util.PasswordUtils; +import org.ballcat.common.util.JsonUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; diff --git a/security/ballcat-spring-security-oauth2-authorization-server/src/test/java/org/ballcat/springsecurity/oauth2/server/authorization/TestOAuth2Authorizations.java b/security/ballcat-spring-security-oauth2-authorization-server/src/test/java/org/ballcat/springsecurity/oauth2/server/authorization/TestOAuth2Authorizations.java index 5bab6f5d3..7b31abe9f 100644 --- a/security/ballcat-spring-security-oauth2-authorization-server/src/test/java/org/ballcat/springsecurity/oauth2/server/authorization/TestOAuth2Authorizations.java +++ b/security/ballcat-spring-security-oauth2-authorization-server/src/test/java/org/ballcat/springsecurity/oauth2/server/authorization/TestOAuth2Authorizations.java @@ -15,7 +15,7 @@ */ package org.ballcat.springsecurity.oauth2.server.authorization; -import com.hccake.ballcat.common.security.userdetails.User; +import org.ballcat.security.oauth2.userdetails.User; import org.ballcat.springsecurity.oauth2.server.authorization.client.TestRegisteredClients; import org.ballcat.springsecurity.oauth2.server.authorization.user.TestUsers; import org.springframework.security.authentication.TestingAuthenticationToken; diff --git a/security/ballcat-spring-security-oauth2-authorization-server/src/test/java/org/ballcat/springsecurity/oauth2/server/authorization/authentication/OAuth2ResourceOwnerPasswordAuthenticationProviderTests.java b/security/ballcat-spring-security-oauth2-authorization-server/src/test/java/org/ballcat/springsecurity/oauth2/server/authorization/authentication/OAuth2ResourceOwnerPasswordAuthenticationProviderTests.java index c1ebe0e66..a37a5b495 100644 --- a/security/ballcat-spring-security-oauth2-authorization-server/src/test/java/org/ballcat/springsecurity/oauth2/server/authorization/authentication/OAuth2ResourceOwnerPasswordAuthenticationProviderTests.java +++ b/security/ballcat-spring-security-oauth2-authorization-server/src/test/java/org/ballcat/springsecurity/oauth2/server/authorization/authentication/OAuth2ResourceOwnerPasswordAuthenticationProviderTests.java @@ -15,7 +15,7 @@ */ package org.ballcat.springsecurity.oauth2.server.authorization.authentication; -import com.hccake.ballcat.common.security.userdetails.User; +import org.ballcat.security.oauth2.userdetails.User; import org.ballcat.springsecurity.oauth2.server.authorization.client.TestRegisteredClients; import org.ballcat.springsecurity.oauth2.server.authorization.context.TestAuthorizationServerContext; import org.ballcat.springsecurity.oauth2.server.authorization.user.TestUsers; diff --git a/security/ballcat-spring-security-oauth2-authorization-server/src/test/java/org/ballcat/springsecurity/oauth2/server/authorization/token/BallcatOAuth2TokenCustomizerTests.java b/security/ballcat-spring-security-oauth2-authorization-server/src/test/java/org/ballcat/springsecurity/oauth2/server/authorization/token/BallcatOAuth2TokenCustomizerTests.java index dfe318ee8..947daa9ff 100644 --- a/security/ballcat-spring-security-oauth2-authorization-server/src/test/java/org/ballcat/springsecurity/oauth2/server/authorization/token/BallcatOAuth2TokenCustomizerTests.java +++ b/security/ballcat-spring-security-oauth2-authorization-server/src/test/java/org/ballcat/springsecurity/oauth2/server/authorization/token/BallcatOAuth2TokenCustomizerTests.java @@ -15,9 +15,9 @@ */ package org.ballcat.springsecurity.oauth2.server.authorization.token; -import com.hccake.ballcat.common.security.constant.TokenAttributeNameConstants; -import com.hccake.ballcat.common.security.constant.UserInfoFiledNameConstants; -import com.hccake.ballcat.common.security.userdetails.User; +import org.ballcat.security.oauth2.constant.TokenAttributeNameConstants; +import org.ballcat.security.oauth2.constant.UserInfoFiledNameConstants; +import org.ballcat.security.oauth2.userdetails.User; import org.ballcat.springsecurity.oauth2.server.authorization.authentication.OAuth2ResourceOwnerPasswordAuthenticationToken; import org.ballcat.springsecurity.oauth2.server.authorization.client.TestRegisteredClients; import org.ballcat.springsecurity.oauth2.server.authorization.context.TestAuthorizationServerContext; diff --git a/security/ballcat-spring-security-oauth2-authorization-server/src/test/java/org/ballcat/springsecurity/oauth2/server/authorization/user/TestUsers.java b/security/ballcat-spring-security-oauth2-authorization-server/src/test/java/org/ballcat/springsecurity/oauth2/server/authorization/user/TestUsers.java index 1570f38c2..e91356e65 100644 --- a/security/ballcat-spring-security-oauth2-authorization-server/src/test/java/org/ballcat/springsecurity/oauth2/server/authorization/user/TestUsers.java +++ b/security/ballcat-spring-security-oauth2-authorization-server/src/test/java/org/ballcat/springsecurity/oauth2/server/authorization/user/TestUsers.java @@ -15,8 +15,8 @@ */ package org.ballcat.springsecurity.oauth2.server.authorization.user; -import com.hccake.ballcat.common.security.constant.UserAttributeNameConstants; -import com.hccake.ballcat.common.security.userdetails.User; +import org.ballcat.security.oauth2.constant.UserAttributeNameConstants; +import org.ballcat.security.oauth2.userdetails.User; import org.springframework.security.core.authority.SimpleGrantedAuthority; import java.util.Collection; diff --git a/security/ballcat-spring-security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/ScopeNames.java b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/ScopeNames.java similarity index 95% rename from security/ballcat-spring-security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/ScopeNames.java rename to security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/ScopeNames.java index 7f4032b10..e26dbbda1 100644 --- a/security/ballcat-spring-security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/ScopeNames.java +++ b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/ScopeNames.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.security; +package org.ballcat.security.oauth2; /** * @author hccake diff --git a/security/ballcat-spring-security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/authentication/OAuth2UserAuthenticationToken.java b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/authentication/OAuth2UserAuthenticationToken.java similarity index 96% rename from security/ballcat-spring-security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/authentication/OAuth2UserAuthenticationToken.java rename to security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/authentication/OAuth2UserAuthenticationToken.java index 40b1bb460..eef03a31c 100644 --- a/security/ballcat-spring-security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/authentication/OAuth2UserAuthenticationToken.java +++ b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/authentication/OAuth2UserAuthenticationToken.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.security.authentication; +package org.ballcat.security.oauth2.authentication; import lombok.EqualsAndHashCode; import org.springframework.security.authentication.AbstractAuthenticationToken; diff --git a/security/ballcat-spring-security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/component/CustomPermissionEvaluator.java b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/component/CustomPermissionEvaluator.java similarity index 96% rename from security/ballcat-spring-security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/component/CustomPermissionEvaluator.java rename to security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/component/CustomPermissionEvaluator.java index 9beacf531..172709fbb 100644 --- a/security/ballcat-spring-security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/component/CustomPermissionEvaluator.java +++ b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/component/CustomPermissionEvaluator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.security.component; +package org.ballcat.security.oauth2.component; import cn.hutool.core.text.CharSequenceUtil; import lombok.extern.slf4j.Slf4j; diff --git a/security/ballcat-spring-security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/constant/TokenAttributeNameConstants.java b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/constant/TokenAttributeNameConstants.java similarity index 94% rename from security/ballcat-spring-security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/constant/TokenAttributeNameConstants.java rename to security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/constant/TokenAttributeNameConstants.java index 927236a41..309741306 100644 --- a/security/ballcat-spring-security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/constant/TokenAttributeNameConstants.java +++ b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/constant/TokenAttributeNameConstants.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.security.constant; +package org.ballcat.security.oauth2.constant; /** * @author hccake diff --git a/security/ballcat-spring-security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/constant/UserAttributeNameConstants.java b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/constant/UserAttributeNameConstants.java similarity index 95% rename from security/ballcat-spring-security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/constant/UserAttributeNameConstants.java rename to security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/constant/UserAttributeNameConstants.java index 82070f236..f4eff56a7 100644 --- a/security/ballcat-spring-security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/constant/UserAttributeNameConstants.java +++ b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/constant/UserAttributeNameConstants.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.security.constant; +package org.ballcat.security.oauth2.constant; /** * @author hccake diff --git a/security/ballcat-spring-security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/constant/UserInfoFiledNameConstants.java b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/constant/UserInfoFiledNameConstants.java similarity index 96% rename from security/ballcat-spring-security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/constant/UserInfoFiledNameConstants.java rename to security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/constant/UserInfoFiledNameConstants.java index eec8bdf76..5e5558ed5 100644 --- a/security/ballcat-spring-security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/constant/UserInfoFiledNameConstants.java +++ b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/constant/UserInfoFiledNameConstants.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.security.constant; +package org.ballcat.security.oauth2.constant; /** * @author hccake diff --git a/security/ballcat-spring-security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/jackson2/LongMixin.java b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/jackson2/LongMixin.java similarity index 94% rename from security/ballcat-spring-security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/jackson2/LongMixin.java rename to security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/jackson2/LongMixin.java index 344d61f3e..0cecaf4d0 100644 --- a/security/ballcat-spring-security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/jackson2/LongMixin.java +++ b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/jackson2/LongMixin.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.security.jackson2; +package org.ballcat.security.oauth2.jackson2; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/security/ballcat-spring-security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/jackson2/OAuth2UserAuthenticationTokenDeserializer.java b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/jackson2/OAuth2UserAuthenticationTokenDeserializer.java similarity index 93% rename from security/ballcat-spring-security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/jackson2/OAuth2UserAuthenticationTokenDeserializer.java rename to security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/jackson2/OAuth2UserAuthenticationTokenDeserializer.java index 5b46f373c..60434add9 100644 --- a/security/ballcat-spring-security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/jackson2/OAuth2UserAuthenticationTokenDeserializer.java +++ b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/jackson2/OAuth2UserAuthenticationTokenDeserializer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.security.jackson2; +package org.ballcat.security.oauth2.jackson2; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; @@ -22,8 +22,8 @@ import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.hccake.ballcat.common.security.authentication.OAuth2UserAuthenticationToken; -import com.hccake.ballcat.common.security.userdetails.User; +import org.ballcat.security.oauth2.authentication.OAuth2UserAuthenticationToken; +import org.ballcat.security.oauth2.userdetails.User; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; diff --git a/security/ballcat-spring-security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/jackson2/OAuth2UserAuthenticationTokenMixin.java b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/jackson2/OAuth2UserAuthenticationTokenMixin.java similarity index 96% rename from security/ballcat-spring-security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/jackson2/OAuth2UserAuthenticationTokenMixin.java rename to security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/jackson2/OAuth2UserAuthenticationTokenMixin.java index 32869965a..2f75f52d6 100644 --- a/security/ballcat-spring-security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/jackson2/OAuth2UserAuthenticationTokenMixin.java +++ b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/jackson2/OAuth2UserAuthenticationTokenMixin.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.security.jackson2; +package org.ballcat.security.oauth2.jackson2; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/security/ballcat-spring-security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/jackson2/UserDeserializer.java b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/jackson2/UserDeserializer.java similarity index 97% rename from security/ballcat-spring-security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/jackson2/UserDeserializer.java rename to security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/jackson2/UserDeserializer.java index 015870418..a94125e44 100644 --- a/security/ballcat-spring-security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/jackson2/UserDeserializer.java +++ b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/jackson2/UserDeserializer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.security.jackson2; +package org.ballcat.security.oauth2.jackson2; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; @@ -23,7 +23,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.MissingNode; -import com.hccake.ballcat.common.security.userdetails.User; +import org.ballcat.security.oauth2.userdetails.User; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; diff --git a/security/ballcat-spring-security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/jackson2/UserMixin.java b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/jackson2/UserMixin.java similarity index 95% rename from security/ballcat-spring-security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/jackson2/UserMixin.java rename to security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/jackson2/UserMixin.java index dedd789dd..79c8ff8df 100644 --- a/security/ballcat-spring-security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/jackson2/UserMixin.java +++ b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/jackson2/UserMixin.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.security.jackson2; +package org.ballcat.security.oauth2.jackson2; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/security/ballcat-spring-security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/userdetails/ClientPrincipal.java b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/userdetails/ClientPrincipal.java similarity index 97% rename from security/ballcat-spring-security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/userdetails/ClientPrincipal.java rename to security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/userdetails/ClientPrincipal.java index bc09d6624..62f1c58fd 100644 --- a/security/ballcat-spring-security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/userdetails/ClientPrincipal.java +++ b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/userdetails/ClientPrincipal.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.security.userdetails; +package org.ballcat.security.oauth2.userdetails; import org.springframework.lang.NonNull; import org.springframework.security.core.GrantedAuthority; diff --git a/security/ballcat-spring-security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/userdetails/User.java b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/userdetails/User.java similarity index 97% rename from security/ballcat-spring-security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/userdetails/User.java rename to security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/userdetails/User.java index 78629a0f8..63a3a9459 100644 --- a/security/ballcat-spring-security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/userdetails/User.java +++ b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/userdetails/User.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.security.userdetails; +package org.ballcat.security.oauth2.userdetails; import lombok.Builder; import lombok.Getter; diff --git a/security/ballcat-spring-security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/util/PasswordUtils.java b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/util/PasswordUtils.java similarity index 98% rename from security/ballcat-spring-security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/util/PasswordUtils.java rename to security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/util/PasswordUtils.java index 20000407b..8b8b0f7a6 100644 --- a/security/ballcat-spring-security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/util/PasswordUtils.java +++ b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/util/PasswordUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.security.util; +package org.ballcat.security.oauth2.util; import cn.hutool.core.codec.Base64; import cn.hutool.crypto.Mode; diff --git a/security/ballcat-spring-security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/util/SecurityUtils.java b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/util/SecurityUtils.java similarity index 91% rename from security/ballcat-spring-security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/util/SecurityUtils.java rename to security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/util/SecurityUtils.java index 58c99e503..5fe0fbfe4 100644 --- a/security/ballcat-spring-security-oauth2-core/src/main/java/com/hccake/ballcat/common/security/util/SecurityUtils.java +++ b/security/ballcat-spring-security-oauth2-core/src/main/java/org/ballcat/security/oauth2/util/SecurityUtils.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.security.util; +package org.ballcat.security.oauth2.util; -import com.hccake.ballcat.common.security.userdetails.ClientPrincipal; -import com.hccake.ballcat.common.security.userdetails.User; +import org.ballcat.security.oauth2.userdetails.ClientPrincipal; +import org.ballcat.security.oauth2.userdetails.User; import lombok.experimental.UtilityClass; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; diff --git a/security/ballcat-spring-security-oauth2-core/src/test/java/com/hccake/ballcat/common/security/test/PasswordTest.java b/security/ballcat-spring-security-oauth2-core/src/test/java/org/ballcat/security/oauth2/test/PasswordTest.java similarity index 94% rename from security/ballcat-spring-security-oauth2-core/src/test/java/com/hccake/ballcat/common/security/test/PasswordTest.java rename to security/ballcat-spring-security-oauth2-core/src/test/java/org/ballcat/security/oauth2/test/PasswordTest.java index 77cb61695..9a8f85534 100644 --- a/security/ballcat-spring-security-oauth2-core/src/test/java/com/hccake/ballcat/common/security/test/PasswordTest.java +++ b/security/ballcat-spring-security-oauth2-core/src/test/java/org/ballcat/security/oauth2/test/PasswordTest.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.security.test; +package org.ballcat.security.oauth2.test; -import com.hccake.ballcat.common.security.util.PasswordUtils; +import org.ballcat.security.oauth2.util.PasswordUtils; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.security.crypto.password.PasswordEncoder; diff --git a/security/ballcat-spring-security-oauth2-resource-server/src/main/java/org/ballcat/springsecurity/oauth2/server/resource/OAuth2ResourceServerAutoConfiguration.java b/security/ballcat-spring-security-oauth2-resource-server/src/main/java/org/ballcat/springsecurity/oauth2/server/resource/OAuth2ResourceServerAutoConfiguration.java index cae71bd0d..946df1b41 100644 --- a/security/ballcat-spring-security-oauth2-resource-server/src/main/java/org/ballcat/springsecurity/oauth2/server/resource/OAuth2ResourceServerAutoConfiguration.java +++ b/security/ballcat-spring-security-oauth2-resource-server/src/main/java/org/ballcat/springsecurity/oauth2/server/resource/OAuth2ResourceServerAutoConfiguration.java @@ -15,7 +15,7 @@ */ package org.ballcat.springsecurity.oauth2.server.resource; -import com.hccake.ballcat.common.security.component.CustomPermissionEvaluator; +import org.ballcat.security.oauth2.component.CustomPermissionEvaluator; import org.ballcat.springsecurity.oauth2.server.resource.configurer.BallcatOauth2ResourceServerSecurityFilterChainBuilder; import org.ballcat.springsecurity.oauth2.server.resource.configurer.OAuth2ResourceServerConfigurerCustomizer; import org.ballcat.springsecurity.oauth2.server.resource.configurer.OAuth2ResourceServerExtensionConfigurer; diff --git a/security/ballcat-spring-security-oauth2-resource-server/src/main/java/org/ballcat/springsecurity/oauth2/server/resource/introspection/BallcatRemoteOpaqueTokenIntrospector.java b/security/ballcat-spring-security-oauth2-resource-server/src/main/java/org/ballcat/springsecurity/oauth2/server/resource/introspection/BallcatRemoteOpaqueTokenIntrospector.java index b98cf36ce..e3c461dce 100644 --- a/security/ballcat-spring-security-oauth2-resource-server/src/main/java/org/ballcat/springsecurity/oauth2/server/resource/introspection/BallcatRemoteOpaqueTokenIntrospector.java +++ b/security/ballcat-spring-security-oauth2-resource-server/src/main/java/org/ballcat/springsecurity/oauth2/server/resource/introspection/BallcatRemoteOpaqueTokenIntrospector.java @@ -16,11 +16,11 @@ package org.ballcat.springsecurity.oauth2.server.resource.introspection; import cn.hutool.core.collection.CollUtil; -import com.hccake.ballcat.common.security.constant.TokenAttributeNameConstants; -import com.hccake.ballcat.common.security.constant.UserAttributeNameConstants; -import com.hccake.ballcat.common.security.constant.UserInfoFiledNameConstants; -import com.hccake.ballcat.common.security.userdetails.ClientPrincipal; -import com.hccake.ballcat.common.security.userdetails.User; +import org.ballcat.security.oauth2.constant.TokenAttributeNameConstants; +import org.ballcat.security.oauth2.constant.UserAttributeNameConstants; +import org.ballcat.security.oauth2.constant.UserInfoFiledNameConstants; +import org.ballcat.security.oauth2.userdetails.ClientPrincipal; +import org.ballcat.security.oauth2.userdetails.User; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.core.ParameterizedTypeReference; @@ -51,7 +51,7 @@ /** * copy from {@link SpringOpaqueTokenIntrospector}，重写了 OAuth2AuthenticatedPrincipal - * 的构建，保持项目内统一使用 {@link com.hccake.ballcat.common.security.userdetails.User} + * 的构建，保持项目内统一使用 {@link User} * * A Spring implementation of {@link OpaqueTokenIntrospector} that verifies and * introspects a token using the configured diff --git a/security/ballcat-spring-security-oauth2-resource-server/src/main/java/org/ballcat/springsecurity/oauth2/server/resource/introspection/SpringAuthorizationServerSharedStoredOpaqueTokenIntrospector.java b/security/ballcat-spring-security-oauth2-resource-server/src/main/java/org/ballcat/springsecurity/oauth2/server/resource/introspection/SpringAuthorizationServerSharedStoredOpaqueTokenIntrospector.java index 5382bc89e..e925c1151 100644 --- a/security/ballcat-spring-security-oauth2-resource-server/src/main/java/org/ballcat/springsecurity/oauth2/server/resource/introspection/SpringAuthorizationServerSharedStoredOpaqueTokenIntrospector.java +++ b/security/ballcat-spring-security-oauth2-resource-server/src/main/java/org/ballcat/springsecurity/oauth2/server/resource/introspection/SpringAuthorizationServerSharedStoredOpaqueTokenIntrospector.java @@ -16,7 +16,7 @@ package org.ballcat.springsecurity.oauth2.server.resource.introspection; import cn.hutool.core.collection.CollUtil; -import com.hccake.ballcat.common.security.userdetails.ClientPrincipal; +import org.ballcat.security.oauth2.userdetails.ClientPrincipal; import lombok.extern.slf4j.Slf4j; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.GrantedAuthority; diff --git a/security/ballcat-spring-security-oauth2-resource-server/src/main/java/org/ballcat/springsecurity/oauth2/server/resource/web/CustomAuthenticationEntryPoint.java b/security/ballcat-spring-security-oauth2-resource-server/src/main/java/org/ballcat/springsecurity/oauth2/server/resource/web/CustomAuthenticationEntryPoint.java index 03485d86c..a3b9fa705 100644 --- a/security/ballcat-spring-security-oauth2-resource-server/src/main/java/org/ballcat/springsecurity/oauth2/server/resource/web/CustomAuthenticationEntryPoint.java +++ b/security/ballcat-spring-security-oauth2-resource-server/src/main/java/org/ballcat/springsecurity/oauth2/server/resource/web/CustomAuthenticationEntryPoint.java @@ -15,15 +15,14 @@ */ package org.ballcat.springsecurity.oauth2.server.resource.web; -import com.hccake.ballcat.common.model.result.R; -import com.hccake.ballcat.common.model.result.SystemResultCode; -import com.hccake.ballcat.common.util.JsonUtils; +import org.ballcat.common.model.result.R; +import org.ballcat.common.model.result.SystemResultCode; +import org.ballcat.common.util.JsonUtils; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.AuthenticationEntryPoint; -import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; diff --git a/sms/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/SmsAutoConfiguration.java b/sms/ballcat-spring-boot-starter-sms/src/main/java/org/ballcat/sms/SmsAutoConfiguration.java similarity index 89% rename from sms/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/SmsAutoConfiguration.java rename to sms/ballcat-spring-boot-starter-sms/src/main/java/org/ballcat/sms/SmsAutoConfiguration.java index 86b7e7b13..1026338bc 100644 --- a/sms/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/SmsAutoConfiguration.java +++ b/sms/ballcat-spring-boot-starter-sms/src/main/java/org/ballcat/sms/SmsAutoConfiguration.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.sms; +package org.ballcat.sms; import com.fasterxml.jackson.databind.ObjectMapper; -import com.hccake.starter.sms.impl.AliyunSenderImpl; -import com.hccake.starter.sms.impl.TencentSenderImpl; -import com.hccake.starter.sms.impl.TianYiHongSenderImpl; -import com.hccake.starter.sms.properties.SmsProperties; +import org.ballcat.sms.impl.AliyunSenderImpl; +import org.ballcat.sms.impl.TencentSenderImpl; +import org.ballcat.sms.impl.TianYiHongSenderImpl; +import org.ballcat.sms.properties.SmsProperties; import lombok.RequiredArgsConstructor; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; diff --git a/sms/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/SmsSender.java b/sms/ballcat-spring-boot-starter-sms/src/main/java/org/ballcat/sms/SmsSender.java similarity index 96% rename from sms/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/SmsSender.java rename to sms/ballcat-spring-boot-starter-sms/src/main/java/org/ballcat/sms/SmsSender.java index 1450bc1d7..99822f8e1 100644 --- a/sms/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/SmsSender.java +++ b/sms/ballcat-spring-boot-starter-sms/src/main/java/org/ballcat/sms/SmsSender.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.sms; +package org.ballcat.sms; /** * 短信发送 接口类 diff --git a/sms/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/SmsSenderParams.java b/sms/ballcat-spring-boot-starter-sms/src/main/java/org/ballcat/sms/SmsSenderParams.java similarity index 95% rename from sms/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/SmsSenderParams.java rename to sms/ballcat-spring-boot-starter-sms/src/main/java/org/ballcat/sms/SmsSenderParams.java index 4543b9b8e..5942ce529 100644 --- a/sms/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/SmsSenderParams.java +++ b/sms/ballcat-spring-boot-starter-sms/src/main/java/org/ballcat/sms/SmsSenderParams.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.sms; +package org.ballcat.sms; -import com.hccake.starter.sms.properties.extra.Tencent; +import org.ballcat.sms.properties.extra.Tencent; import lombok.Getter; import lombok.Setter; import lombok.ToString; diff --git a/sms/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/SmsSenderResult.java b/sms/ballcat-spring-boot-starter-sms/src/main/java/org/ballcat/sms/SmsSenderResult.java similarity index 92% rename from sms/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/SmsSenderResult.java rename to sms/ballcat-spring-boot-starter-sms/src/main/java/org/ballcat/sms/SmsSenderResult.java index c5602cb5e..bfd3d68b7 100644 --- a/sms/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/SmsSenderResult.java +++ b/sms/ballcat-spring-boot-starter-sms/src/main/java/org/ballcat/sms/SmsSenderResult.java @@ -13,12 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.sms; +package org.ballcat.sms; import cn.hutool.core.convert.Convert; -import com.hccake.ballcat.common.util.JsonUtils; -import com.hccake.ballcat.common.util.json.TypeReference; -import com.hccake.starter.sms.enums.TypeEnum; +import org.ballcat.sms.constant.SmsConstants; +import org.ballcat.sms.enums.TypeEnum; +import org.ballcat.common.util.JsonUtils; +import org.ballcat.common.util.json.TypeReference; import lombok.Getter; import lombok.experimental.Accessors; @@ -48,7 +49,7 @@ public class SmsSenderResult { /** * 短信平台 * - * @see com.hccake.starter.sms.constant.SmsConstants + * @see SmsConstants */ protected String platform; @@ -87,7 +88,7 @@ private SmsSenderResult() { * @param phoneNumbers 目标手机号 * @param id 异常id * @param e 异常信息 - * @return com.hccake.starter.sms.domain.SendResult + * @return 短信发送结果 */ public static SmsSenderResult generateException(TypeEnum platform, Set phoneNumbers, String id, Throwable e) { diff --git a/sms/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/constant/SmsConstants.java b/sms/ballcat-spring-boot-starter-sms/src/main/java/org/ballcat/sms/constant/SmsConstants.java similarity index 95% rename from sms/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/constant/SmsConstants.java rename to sms/ballcat-spring-boot-starter-sms/src/main/java/org/ballcat/sms/constant/SmsConstants.java index c33c9f659..bb9ba125e 100644 --- a/sms/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/constant/SmsConstants.java +++ b/sms/ballcat-spring-boot-starter-sms/src/main/java/org/ballcat/sms/constant/SmsConstants.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.sms.constant; +package org.ballcat.sms.constant; /** * @author lingting 2020/4/26 11:28 diff --git a/sms/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/constant/SmsSendConstants.java b/sms/ballcat-spring-boot-starter-sms/src/main/java/org/ballcat/sms/constant/SmsSendConstants.java similarity index 96% rename from sms/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/constant/SmsSendConstants.java rename to sms/ballcat-spring-boot-starter-sms/src/main/java/org/ballcat/sms/constant/SmsSendConstants.java index c505c4738..dccb3038f 100644 --- a/sms/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/constant/SmsSendConstants.java +++ b/sms/ballcat-spring-boot-starter-sms/src/main/java/org/ballcat/sms/constant/SmsSendConstants.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.sms.constant; +package org.ballcat.sms.constant; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/sms/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/enums/TypeEnum.java b/sms/ballcat-spring-boot-starter-sms/src/main/java/org/ballcat/sms/enums/TypeEnum.java similarity index 95% rename from sms/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/enums/TypeEnum.java rename to sms/ballcat-spring-boot-starter-sms/src/main/java/org/ballcat/sms/enums/TypeEnum.java index 31b2621f6..ffbde406a 100644 --- a/sms/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/enums/TypeEnum.java +++ b/sms/ballcat-spring-boot-starter-sms/src/main/java/org/ballcat/sms/enums/TypeEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.sms.enums; +package org.ballcat.sms.enums; /** * @author lingting 2020-08-30 22:20 diff --git a/sms/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/exception/SmsException.java b/sms/ballcat-spring-boot-starter-sms/src/main/java/org/ballcat/sms/exception/SmsException.java similarity index 95% rename from sms/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/exception/SmsException.java rename to sms/ballcat-spring-boot-starter-sms/src/main/java/org/ballcat/sms/exception/SmsException.java index 1b0562e78..2c64615a8 100644 --- a/sms/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/exception/SmsException.java +++ b/sms/ballcat-spring-boot-starter-sms/src/main/java/org/ballcat/sms/exception/SmsException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.sms.exception; +package org.ballcat.sms.exception; /** * @author lingting 2020/4/26 10:16 diff --git a/sms/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/impl/AliyunSenderImpl.java b/sms/ballcat-spring-boot-starter-sms/src/main/java/org/ballcat/sms/impl/AliyunSenderImpl.java similarity index 88% rename from sms/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/impl/AliyunSenderImpl.java rename to sms/ballcat-spring-boot-starter-sms/src/main/java/org/ballcat/sms/impl/AliyunSenderImpl.java index b426926ab..c170a0c90 100644 --- a/sms/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/impl/AliyunSenderImpl.java +++ b/sms/ballcat-spring-boot-starter-sms/src/main/java/org/ballcat/sms/impl/AliyunSenderImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.sms.impl; +package org.ballcat.sms.impl; import cn.hutool.core.collection.CollUtil; import com.aliyun.dysmsapi20170525.Client; @@ -21,12 +21,12 @@ import com.aliyun.dysmsapi20170525.models.SendSmsResponse; import com.aliyun.teaopenapi.models.Config; import com.fasterxml.jackson.databind.ObjectMapper; -import com.hccake.starter.sms.SmsSender; -import com.hccake.starter.sms.SmsSenderParams; -import com.hccake.starter.sms.SmsSenderResult; -import com.hccake.starter.sms.enums.TypeEnum; -import com.hccake.starter.sms.properties.SmsProperties; -import com.hccake.starter.sms.properties.extra.Aliyun; +import org.ballcat.sms.SmsSender; +import org.ballcat.sms.SmsSenderParams; +import org.ballcat.sms.SmsSenderResult; +import org.ballcat.sms.enums.TypeEnum; +import org.ballcat.sms.properties.SmsProperties; +import org.ballcat.sms.properties.extra.Aliyun; import lombok.SneakyThrows; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/sms/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/impl/BaseServiceImpl.java b/sms/ballcat-spring-boot-starter-sms/src/main/java/org/ballcat/sms/impl/BaseServiceImpl.java similarity index 89% rename from sms/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/impl/BaseServiceImpl.java rename to sms/ballcat-spring-boot-starter-sms/src/main/java/org/ballcat/sms/impl/BaseServiceImpl.java index 9dbb0db47..8ce256a92 100644 --- a/sms/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/impl/BaseServiceImpl.java +++ b/sms/ballcat-spring-boot-starter-sms/src/main/java/org/ballcat/sms/impl/BaseServiceImpl.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.sms.impl; +package org.ballcat.sms.impl; import cn.hutool.core.util.StrUtil; -import com.hccake.starter.sms.SmsSenderResult; -import com.hccake.starter.sms.enums.TypeEnum; +import org.ballcat.sms.SmsSenderResult; +import org.ballcat.sms.enums.TypeEnum; import java.util.Set; import lombok.extern.slf4j.Slf4j; diff --git a/sms/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/impl/TencentSenderImpl.java b/sms/ballcat-spring-boot-starter-sms/src/main/java/org/ballcat/sms/impl/TencentSenderImpl.java similarity index 90% rename from sms/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/impl/TencentSenderImpl.java rename to sms/ballcat-spring-boot-starter-sms/src/main/java/org/ballcat/sms/impl/TencentSenderImpl.java index 518bb6d08..d07139d1e 100644 --- a/sms/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/impl/TencentSenderImpl.java +++ b/sms/ballcat-spring-boot-starter-sms/src/main/java/org/ballcat/sms/impl/TencentSenderImpl.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.sms.impl; +package org.ballcat.sms.impl; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.hccake.starter.sms.SmsSender; -import com.hccake.starter.sms.SmsSenderParams; -import com.hccake.starter.sms.SmsSenderResult; -import com.hccake.starter.sms.enums.TypeEnum; -import com.hccake.starter.sms.properties.SmsProperties; -import com.hccake.starter.sms.properties.extra.Tencent; +import org.ballcat.sms.SmsSender; +import org.ballcat.sms.SmsSenderParams; +import org.ballcat.sms.SmsSenderResult; +import org.ballcat.sms.enums.TypeEnum; +import org.ballcat.sms.properties.SmsProperties; +import org.ballcat.sms.properties.extra.Tencent; import com.tencentcloudapi.common.Credential; import com.tencentcloudapi.common.exception.TencentCloudSDKException; import com.tencentcloudapi.common.profile.ClientProfile; diff --git a/sms/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/impl/TianYiHongSenderImpl.java b/sms/ballcat-spring-boot-starter-sms/src/main/java/org/ballcat/sms/impl/TianYiHongSenderImpl.java similarity index 86% rename from sms/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/impl/TianYiHongSenderImpl.java rename to sms/ballcat-spring-boot-starter-sms/src/main/java/org/ballcat/sms/impl/TianYiHongSenderImpl.java index 44aa57152..0b7c2d704 100644 --- a/sms/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/impl/TianYiHongSenderImpl.java +++ b/sms/ballcat-spring-boot-starter-sms/src/main/java/org/ballcat/sms/impl/TianYiHongSenderImpl.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.sms.impl; +package org.ballcat.sms.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.net.URLEncodeUtil; import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.crypto.digest.MD5; import cn.hutool.http.HttpRequest; -import com.hccake.starter.sms.SmsSender; -import com.hccake.starter.sms.SmsSenderParams; -import com.hccake.starter.sms.SmsSenderResult; -import com.hccake.starter.sms.enums.TypeEnum; -import com.hccake.starter.sms.properties.SmsProperties; -import com.hccake.starter.sms.properties.extra.Account; -import com.hccake.starter.sms.properties.extra.TianYiHong; +import org.ballcat.sms.SmsSender; +import org.ballcat.sms.SmsSenderParams; +import org.ballcat.sms.SmsSenderResult; +import org.ballcat.sms.enums.TypeEnum; +import org.ballcat.sms.properties.SmsProperties; +import org.ballcat.sms.properties.extra.Account; +import org.ballcat.sms.properties.extra.TianYiHong; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import java.time.LocalDateTime; diff --git a/sms/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/properties/SmsProperties.java b/sms/ballcat-spring-boot-starter-sms/src/main/java/org/ballcat/sms/properties/SmsProperties.java similarity index 83% rename from sms/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/properties/SmsProperties.java rename to sms/ballcat-spring-boot-starter-sms/src/main/java/org/ballcat/sms/properties/SmsProperties.java index 16418688d..e77346053 100644 --- a/sms/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/properties/SmsProperties.java +++ b/sms/ballcat-spring-boot-starter-sms/src/main/java/org/ballcat/sms/properties/SmsProperties.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.sms.properties; +package org.ballcat.sms.properties; -import com.hccake.starter.sms.enums.TypeEnum; -import com.hccake.starter.sms.properties.extra.Account; -import com.hccake.starter.sms.properties.extra.Aliyun; -import com.hccake.starter.sms.properties.extra.Tencent; -import com.hccake.starter.sms.properties.extra.TianYiHong; +import org.ballcat.sms.enums.TypeEnum; +import org.ballcat.sms.properties.extra.Account; +import org.ballcat.sms.properties.extra.Aliyun; +import org.ballcat.sms.properties.extra.Tencent; +import org.ballcat.sms.properties.extra.TianYiHong; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.NestedConfigurationProperty; diff --git a/sms/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/properties/extra/Account.java b/sms/ballcat-spring-boot-starter-sms/src/main/java/org/ballcat/sms/properties/extra/Account.java similarity index 94% rename from sms/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/properties/extra/Account.java rename to sms/ballcat-spring-boot-starter-sms/src/main/java/org/ballcat/sms/properties/extra/Account.java index f9639acc7..c6ede9efa 100644 --- a/sms/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/properties/extra/Account.java +++ b/sms/ballcat-spring-boot-starter-sms/src/main/java/org/ballcat/sms/properties/extra/Account.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.sms.properties.extra; +package org.ballcat.sms.properties.extra; import lombok.Data; diff --git a/sms/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/properties/extra/Aliyun.java b/sms/ballcat-spring-boot-starter-sms/src/main/java/org/ballcat/sms/properties/extra/Aliyun.java similarity index 95% rename from sms/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/properties/extra/Aliyun.java rename to sms/ballcat-spring-boot-starter-sms/src/main/java/org/ballcat/sms/properties/extra/Aliyun.java index 09a72c4fe..e3d1bbd49 100644 --- a/sms/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/properties/extra/Aliyun.java +++ b/sms/ballcat-spring-boot-starter-sms/src/main/java/org/ballcat/sms/properties/extra/Aliyun.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.sms.properties.extra; +package org.ballcat.sms.properties.extra; import lombok.Data; diff --git a/sms/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/properties/extra/Tencent.java b/sms/ballcat-spring-boot-starter-sms/src/main/java/org/ballcat/sms/properties/extra/Tencent.java similarity index 95% rename from sms/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/properties/extra/Tencent.java rename to sms/ballcat-spring-boot-starter-sms/src/main/java/org/ballcat/sms/properties/extra/Tencent.java index 581606a73..bf22babb3 100644 --- a/sms/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/properties/extra/Tencent.java +++ b/sms/ballcat-spring-boot-starter-sms/src/main/java/org/ballcat/sms/properties/extra/Tencent.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.sms.properties.extra; +package org.ballcat.sms.properties.extra; import lombok.Data; diff --git a/sms/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/properties/extra/TianYiHong.java b/sms/ballcat-spring-boot-starter-sms/src/main/java/org/ballcat/sms/properties/extra/TianYiHong.java similarity index 95% rename from sms/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/properties/extra/TianYiHong.java rename to sms/ballcat-spring-boot-starter-sms/src/main/java/org/ballcat/sms/properties/extra/TianYiHong.java index 9c049b078..ba3625815 100644 --- a/sms/ballcat-spring-boot-starter-sms/src/main/java/com/hccake/starter/sms/properties/extra/TianYiHong.java +++ b/sms/ballcat-spring-boot-starter-sms/src/main/java/org/ballcat/sms/properties/extra/TianYiHong.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.starter.sms.properties.extra; +package org.ballcat.sms.properties.extra; import java.util.List; import lombok.Data; diff --git a/sms/ballcat-spring-boot-starter-sms/src/main/resources/META-INF/spring.factories b/sms/ballcat-spring-boot-starter-sms/src/main/resources/META-INF/spring.factories index 58468235b..fee5347ad 100644 --- a/sms/ballcat-spring-boot-starter-sms/src/main/resources/META-INF/spring.factories +++ b/sms/ballcat-spring-boot-starter-sms/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.hccake.starter.sms.SmsAutoConfiguration \ No newline at end of file + org.ballcat.sms.SmsAutoConfiguration \ No newline at end of file diff --git a/sms/ballcat-spring-boot-starter-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/sms/ballcat-spring-boot-starter-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 8ed0e861d..d3bae3cb0 100644 --- a/sms/ballcat-spring-boot-starter-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/sms/ballcat-spring-boot-starter-sms/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.hccake.starter.sms.SmsAutoConfiguration \ No newline at end of file +org.ballcat.sms.SmsAutoConfiguration \ No newline at end of file diff --git a/tesseract/ballcat-tesseract/src/main/java/com/hccake/ballcat/extend/tesseract/Tesseract.java b/tesseract/ballcat-tesseract/src/main/java/org/ballcat/tesseract/Tesseract.java similarity index 86% rename from tesseract/ballcat-tesseract/src/main/java/com/hccake/ballcat/extend/tesseract/Tesseract.java rename to tesseract/ballcat-tesseract/src/main/java/org/ballcat/tesseract/Tesseract.java index 82c4eb763..ec06272e1 100644 --- a/tesseract/ballcat-tesseract/src/main/java/com/hccake/ballcat/extend/tesseract/Tesseract.java +++ b/tesseract/ballcat-tesseract/src/main/java/org/ballcat/tesseract/Tesseract.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.extend.tesseract; +package org.ballcat.tesseract; -import com.hccake.ballcat.extend.tesseract.enums.TesseractLang; +import org.ballcat.tesseract.enums.TesseractLang; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.RequiredArgsConstructor; @@ -67,7 +67,7 @@ public List run(Consumer build *

* toString. *

- * @param image a {@link com.hccake.ballcat.extend.tesseract.TesseractImage} object. + * @param image a {@link TesseractImage} object. * @return a {@link java.util.List} object. */ public List toString(TesseractImage image) { @@ -78,7 +78,7 @@ public List toString(TesseractImage image) { *

* toString. *

- * @param image a {@link com.hccake.ballcat.extend.tesseract.TesseractImage} object. + * @param image a {@link TesseractImage} object. * @param lang a {@link java.lang.String} object. * @return a {@link java.util.List} object. */ @@ -90,7 +90,7 @@ public List toString(TesseractImage image, String lang) { *

* toBoxes. *

- * @param image a {@link com.hccake.ballcat.extend.tesseract.TesseractImage} object. + * @param image a {@link TesseractImage} object. * @return a {@link java.util.List} object. */ public List toBoxes(TesseractImage image) { @@ -101,7 +101,7 @@ public List toBoxes(TesseractImage image) { *

* toBoxes. *

- * @param image a {@link com.hccake.ballcat.extend.tesseract.TesseractImage} object. + * @param image a {@link TesseractImage} object. * @param lang a {@link java.lang.String} object. * @return a {@link java.util.List} object. */ diff --git a/tesseract/ballcat-tesseract/src/main/java/com/hccake/ballcat/extend/tesseract/TesseractBox.java b/tesseract/ballcat-tesseract/src/main/java/org/ballcat/tesseract/TesseractBox.java similarity index 94% rename from tesseract/ballcat-tesseract/src/main/java/com/hccake/ballcat/extend/tesseract/TesseractBox.java rename to tesseract/ballcat-tesseract/src/main/java/org/ballcat/tesseract/TesseractBox.java index f40cd6b5f..ddc0fabbb 100644 --- a/tesseract/ballcat-tesseract/src/main/java/com/hccake/ballcat/extend/tesseract/TesseractBox.java +++ b/tesseract/ballcat-tesseract/src/main/java/org/ballcat/tesseract/TesseractBox.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.extend.tesseract; +package org.ballcat.tesseract; import lombok.EqualsAndHashCode; import lombok.Getter; @@ -67,7 +67,7 @@ public class TesseractBox implements Serializable { * of. *

* @param lines a {@link java.util.List} object. - * @param image a {@link com.hccake.ballcat.extend.tesseract.TesseractImage} object. + * @param image a {@link TesseractImage} object. * @return a {@link java.util.List} object. */ public static List of(List lines, TesseractImage image) { diff --git a/tesseract/ballcat-tesseract/src/main/java/com/hccake/ballcat/extend/tesseract/TesseractCommand.java b/tesseract/ballcat-tesseract/src/main/java/org/ballcat/tesseract/TesseractCommand.java similarity index 96% rename from tesseract/ballcat-tesseract/src/main/java/com/hccake/ballcat/extend/tesseract/TesseractCommand.java rename to tesseract/ballcat-tesseract/src/main/java/org/ballcat/tesseract/TesseractCommand.java index de33c7ad2..c45fce252 100644 --- a/tesseract/ballcat-tesseract/src/main/java/com/hccake/ballcat/extend/tesseract/TesseractCommand.java +++ b/tesseract/ballcat-tesseract/src/main/java/org/ballcat/tesseract/TesseractCommand.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.extend.tesseract; +package org.ballcat.tesseract; -import com.hccake.ballcat.extend.tesseract.exception.OcrException; +import org.ballcat.tesseract.exception.OcrException; import lombok.Builder; import lombok.Getter; diff --git a/tesseract/ballcat-tesseract/src/main/java/com/hccake/ballcat/extend/tesseract/TesseractImage.java b/tesseract/ballcat-tesseract/src/main/java/org/ballcat/tesseract/TesseractImage.java similarity index 98% rename from tesseract/ballcat-tesseract/src/main/java/com/hccake/ballcat/extend/tesseract/TesseractImage.java rename to tesseract/ballcat-tesseract/src/main/java/org/ballcat/tesseract/TesseractImage.java index 6e9b22ad7..ff791975e 100644 --- a/tesseract/ballcat-tesseract/src/main/java/com/hccake/ballcat/extend/tesseract/TesseractImage.java +++ b/tesseract/ballcat-tesseract/src/main/java/org/ballcat/tesseract/TesseractImage.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.extend.tesseract; +package org.ballcat.tesseract; import lombok.Getter; diff --git a/tesseract/ballcat-tesseract/src/main/java/com/hccake/ballcat/extend/tesseract/enums/TesseractLang.java b/tesseract/ballcat-tesseract/src/main/java/org/ballcat/tesseract/enums/TesseractLang.java similarity index 94% rename from tesseract/ballcat-tesseract/src/main/java/com/hccake/ballcat/extend/tesseract/enums/TesseractLang.java rename to tesseract/ballcat-tesseract/src/main/java/org/ballcat/tesseract/enums/TesseractLang.java index 5815c210c..201720f40 100644 --- a/tesseract/ballcat-tesseract/src/main/java/com/hccake/ballcat/extend/tesseract/enums/TesseractLang.java +++ b/tesseract/ballcat-tesseract/src/main/java/org/ballcat/tesseract/enums/TesseractLang.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.extend.tesseract.enums; +package org.ballcat.tesseract.enums; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/tesseract/ballcat-tesseract/src/main/java/com/hccake/ballcat/extend/tesseract/exception/OcrException.java b/tesseract/ballcat-tesseract/src/main/java/org/ballcat/tesseract/exception/OcrException.java similarity index 95% rename from tesseract/ballcat-tesseract/src/main/java/com/hccake/ballcat/extend/tesseract/exception/OcrException.java rename to tesseract/ballcat-tesseract/src/main/java/org/ballcat/tesseract/exception/OcrException.java index d1a40ee1e..ee53043b6 100644 --- a/tesseract/ballcat-tesseract/src/main/java/com/hccake/ballcat/extend/tesseract/exception/OcrException.java +++ b/tesseract/ballcat-tesseract/src/main/java/org/ballcat/tesseract/exception/OcrException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.extend.tesseract.exception; +package org.ballcat.tesseract.exception; /** *

diff --git a/tesseract/ballcat-tesseract/src/test/java/com/hccake/ballcat/extend/tesseract/TesseractCommandTest.java b/tesseract/ballcat-tesseract/src/test/java/org/ballcat/tesseract/TesseractCommandTest.java similarity index 94% rename from tesseract/ballcat-tesseract/src/test/java/com/hccake/ballcat/extend/tesseract/TesseractCommandTest.java rename to tesseract/ballcat-tesseract/src/test/java/org/ballcat/tesseract/TesseractCommandTest.java index 5242d4c71..b5cc5e325 100644 --- a/tesseract/ballcat-tesseract/src/test/java/com/hccake/ballcat/extend/tesseract/TesseractCommandTest.java +++ b/tesseract/ballcat-tesseract/src/test/java/org/ballcat/tesseract/TesseractCommandTest.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.extend.tesseract; +package org.ballcat.tesseract; -import com.hccake.ballcat.extend.tesseract.enums.TesseractLang; +import org.ballcat.tesseract.enums.TesseractLang; import java.io.IOException; import java.util.List; import org.junit.jupiter.api.Assertions; diff --git a/tesseract/ballcat-tesseract/src/test/java/com/hccake/ballcat/extend/tesseract/TesseractImageTest.java b/tesseract/ballcat-tesseract/src/test/java/org/ballcat/tesseract/TesseractImageTest.java similarity index 97% rename from tesseract/ballcat-tesseract/src/test/java/com/hccake/ballcat/extend/tesseract/TesseractImageTest.java rename to tesseract/ballcat-tesseract/src/test/java/org/ballcat/tesseract/TesseractImageTest.java index a3d2d83cb..105201fc0 100644 --- a/tesseract/ballcat-tesseract/src/test/java/com/hccake/ballcat/extend/tesseract/TesseractImageTest.java +++ b/tesseract/ballcat-tesseract/src/test/java/org/ballcat/tesseract/TesseractImageTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.extend.tesseract; +package org.ballcat.tesseract; import lombok.SneakyThrows; import org.junit.jupiter.api.Assertions; diff --git a/tesseract/ballcat-tesseract/src/test/java/com/hccake/ballcat/extend/tesseract/TesseractTest.java b/tesseract/ballcat-tesseract/src/test/java/org/ballcat/tesseract/TesseractTest.java similarity index 96% rename from tesseract/ballcat-tesseract/src/test/java/com/hccake/ballcat/extend/tesseract/TesseractTest.java rename to tesseract/ballcat-tesseract/src/test/java/org/ballcat/tesseract/TesseractTest.java index 2b1023df6..8b3d6f756 100644 --- a/tesseract/ballcat-tesseract/src/test/java/com/hccake/ballcat/extend/tesseract/TesseractTest.java +++ b/tesseract/ballcat-tesseract/src/test/java/org/ballcat/tesseract/TesseractTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.extend.tesseract; +package org.ballcat.tesseract; import java.io.IOException; import java.util.List; diff --git a/web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/actuate/ActuatorSecurityAutoConfiguration.java b/web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/actuate/ActuatorSecurityAutoConfiguration.java similarity index 98% rename from web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/actuate/ActuatorSecurityAutoConfiguration.java rename to web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/actuate/ActuatorSecurityAutoConfiguration.java index 24650008f..50511bb95 100644 --- a/web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/actuate/ActuatorSecurityAutoConfiguration.java +++ b/web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/actuate/ActuatorSecurityAutoConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.autoconfigure.web.actuate; +package org.ballcat.autoconfigure.web.actuate; import cn.hutool.core.text.CharSequenceUtil; import lombok.RequiredArgsConstructor; diff --git a/web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/actuate/ActuatorSecurityFilter.java b/web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/actuate/ActuatorSecurityFilter.java similarity index 92% rename from web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/actuate/ActuatorSecurityFilter.java rename to web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/actuate/ActuatorSecurityFilter.java index 70572a284..bde784079 100644 --- a/web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/actuate/ActuatorSecurityFilter.java +++ b/web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/actuate/ActuatorSecurityFilter.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.autoconfigure.web.actuate; +package org.ballcat.autoconfigure.web.actuate; import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.crypto.SecureUtil; -import com.hccake.ballcat.common.core.constant.HeaderConstants; -import com.hccake.ballcat.common.model.result.R; -import com.hccake.ballcat.common.model.result.SystemResultCode; -import com.hccake.ballcat.common.util.JsonUtils; +import org.ballcat.common.core.constant.HeaderConstants; +import org.ballcat.common.model.result.R; +import org.ballcat.common.model.result.SystemResultCode; +import org.ballcat.common.util.JsonUtils; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.web.filter.OncePerRequestFilter; diff --git a/web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/actuate/ActuatorSecurityProperties.java b/web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/actuate/ActuatorSecurityProperties.java similarity index 95% rename from web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/actuate/ActuatorSecurityProperties.java rename to web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/actuate/ActuatorSecurityProperties.java index 5021b6ab0..f6508f344 100644 --- a/web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/actuate/ActuatorSecurityProperties.java +++ b/web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/actuate/ActuatorSecurityProperties.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.autoconfigure.web.actuate; +package org.ballcat.autoconfigure.web.actuate; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/event/ApplicationContextInitialized.java b/web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/event/ApplicationContextInitialized.java similarity index 93% rename from web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/event/ApplicationContextInitialized.java rename to web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/event/ApplicationContextInitialized.java index b7b67f337..8d57cdc32 100644 --- a/web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/event/ApplicationContextInitialized.java +++ b/web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/event/ApplicationContextInitialized.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.autoconfigure.web.event; +package org.ballcat.autoconfigure.web.event; -import com.hccake.ballcat.common.util.SpringUtils; +import org.ballcat.common.util.SpringUtils; import org.springframework.boot.context.event.ApplicationContextInitializedEvent; import org.springframework.context.ApplicationListener; diff --git a/web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/event/EnvironmentPost.java b/web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/event/EnvironmentPost.java similarity index 92% rename from web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/event/EnvironmentPost.java rename to web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/event/EnvironmentPost.java index ffdfa96d2..bb3073e79 100644 --- a/web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/event/EnvironmentPost.java +++ b/web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/event/EnvironmentPost.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.autoconfigure.web.event; +package org.ballcat.autoconfigure.web.event; -import com.hccake.ballcat.common.util.EnvironmentUtils; +import org.ballcat.common.util.EnvironmentUtils; import org.springframework.boot.SpringApplication; import org.springframework.boot.env.EnvironmentPostProcessor; import org.springframework.core.Ordered; diff --git a/web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/exception/ExceptionAutoConfiguration.java b/web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/exception/ExceptionAutoConfiguration.java similarity index 86% rename from web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/exception/ExceptionAutoConfiguration.java rename to web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/exception/ExceptionAutoConfiguration.java index 56d8bd4b3..7c25007a6 100644 --- a/web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/exception/ExceptionAutoConfiguration.java +++ b/web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/exception/ExceptionAutoConfiguration.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.autoconfigure.web.exception; +package org.ballcat.autoconfigure.web.exception; -import com.hccake.ballcat.autoconfigure.web.exception.handler.DefaultGlobalExceptionHandler; -import com.hccake.ballcat.autoconfigure.web.exception.handler.DingTalkGlobalExceptionHandler; -import com.hccake.ballcat.autoconfigure.web.exception.handler.MailGlobalExceptionHandler; -import com.hccake.ballcat.autoconfigure.web.exception.handler.MultiGlobalExceptionHandler; -import com.hccake.ballcat.autoconfigure.web.exception.resolver.GlobalHandlerExceptionResolver; -import com.hccake.ballcat.autoconfigure.web.exception.resolver.SecurityHandlerExceptionResolver; -import com.hccake.ballcat.common.core.exception.handler.GlobalExceptionHandler; -import com.hccake.ballcat.common.mail.sender.MailSender; -import com.hccake.extend.dingtalk.DingTalkSender; import lombok.RequiredArgsConstructor; +import org.ballcat.autoconfigure.web.exception.handler.DefaultGlobalExceptionHandler; +import org.ballcat.autoconfigure.web.exception.handler.DingTalkGlobalExceptionHandler; +import org.ballcat.autoconfigure.web.exception.handler.MailGlobalExceptionHandler; +import org.ballcat.autoconfigure.web.exception.handler.MultiGlobalExceptionHandler; +import org.ballcat.autoconfigure.web.exception.resolver.GlobalHandlerExceptionResolver; +import org.ballcat.autoconfigure.web.exception.resolver.SecurityHandlerExceptionResolver; +import org.ballcat.common.core.exception.handler.GlobalExceptionHandler; +import org.ballcat.dingtalk.DingTalkSender; +import org.ballcat.mail.sender.MailSender; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; diff --git a/web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/exception/ExceptionHandleProperties.java b/web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/exception/ExceptionHandleProperties.java similarity index 94% rename from web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/exception/ExceptionHandleProperties.java rename to web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/exception/ExceptionHandleProperties.java index d891a5710..3a08d9087 100644 --- a/web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/exception/ExceptionHandleProperties.java +++ b/web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/exception/ExceptionHandleProperties.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.autoconfigure.web.exception; +package org.ballcat.autoconfigure.web.exception; -import com.hccake.ballcat.autoconfigure.web.exception.enums.ExceptionHandleTypeEnum; +import org.ballcat.autoconfigure.web.exception.enums.ExceptionHandleTypeEnum; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Configuration; diff --git a/web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/exception/domain/ExceptionMessage.java b/web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/exception/domain/ExceptionMessage.java similarity index 96% rename from web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/exception/domain/ExceptionMessage.java rename to web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/exception/domain/ExceptionMessage.java index c2f3b392a..8b4086033 100644 --- a/web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/exception/domain/ExceptionMessage.java +++ b/web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/exception/domain/ExceptionMessage.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.autoconfigure.web.exception.domain; +package org.ballcat.autoconfigure.web.exception.domain; import lombok.Getter; import lombok.Setter; diff --git a/web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/exception/domain/ExceptionNoticeResponse.java b/web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/exception/domain/ExceptionNoticeResponse.java similarity index 93% rename from web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/exception/domain/ExceptionNoticeResponse.java rename to web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/exception/domain/ExceptionNoticeResponse.java index 320dbee88..f8fcef299 100644 --- a/web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/exception/domain/ExceptionNoticeResponse.java +++ b/web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/exception/domain/ExceptionNoticeResponse.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.autoconfigure.web.exception.domain; +package org.ballcat.autoconfigure.web.exception.domain; import lombok.Getter; import lombok.Setter; diff --git a/web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/exception/enums/ExceptionHandleTypeEnum.java b/web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/exception/enums/ExceptionHandleTypeEnum.java similarity index 92% rename from web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/exception/enums/ExceptionHandleTypeEnum.java rename to web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/exception/enums/ExceptionHandleTypeEnum.java index 70bf240ca..08195ede4 100644 --- a/web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/exception/enums/ExceptionHandleTypeEnum.java +++ b/web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/exception/enums/ExceptionHandleTypeEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.autoconfigure.web.exception.enums; +package org.ballcat.autoconfigure.web.exception.enums; import lombok.AllArgsConstructor; import lombok.Getter; @@ -30,7 +30,7 @@ public enum ExceptionHandleTypeEnum { /** * 异常处理通知类型 说明 */ - NONE("不通知"), DING_TALK("通过钉钉通知"), MAIL("邮件通知"),; + NONE("不通知"), DING_TALK("通过钉钉通知"), MAIL("邮件通知"); private final String text; diff --git a/web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/exception/handler/AbstractNoticeGlobalExceptionHandler.java b/web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/exception/handler/AbstractNoticeGlobalExceptionHandler.java similarity index 92% rename from web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/exception/handler/AbstractNoticeGlobalExceptionHandler.java rename to web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/exception/handler/AbstractNoticeGlobalExceptionHandler.java index fc6643e39..865cbe39d 100644 --- a/web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/exception/handler/AbstractNoticeGlobalExceptionHandler.java +++ b/web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/exception/handler/AbstractNoticeGlobalExceptionHandler.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.autoconfigure.web.exception.handler; +package org.ballcat.autoconfigure.web.exception.handler; import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.TimeInterval; import cn.hutool.core.exceptions.ExceptionUtil; -import com.hccake.ballcat.autoconfigure.web.exception.ExceptionHandleProperties; -import com.hccake.ballcat.autoconfigure.web.exception.domain.ExceptionMessage; -import com.hccake.ballcat.autoconfigure.web.exception.domain.ExceptionNoticeResponse; -import com.hccake.ballcat.common.core.exception.handler.GlobalExceptionHandler; -import com.hccake.ballcat.common.core.util.WebUtils; +import org.ballcat.autoconfigure.web.exception.ExceptionHandleProperties; +import org.ballcat.autoconfigure.web.exception.domain.ExceptionMessage; +import org.ballcat.autoconfigure.web.exception.domain.ExceptionNoticeResponse; +import org.ballcat.common.core.exception.handler.GlobalExceptionHandler; +import org.ballcat.common.core.util.WebUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.InitializingBean; diff --git a/web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/exception/handler/DefaultGlobalExceptionHandler.java b/web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/exception/handler/DefaultGlobalExceptionHandler.java similarity index 86% rename from web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/exception/handler/DefaultGlobalExceptionHandler.java rename to web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/exception/handler/DefaultGlobalExceptionHandler.java index 6783190d9..0a1aad63c 100644 --- a/web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/exception/handler/DefaultGlobalExceptionHandler.java +++ b/web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/exception/handler/DefaultGlobalExceptionHandler.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.autoconfigure.web.exception.handler; +package org.ballcat.autoconfigure.web.exception.handler; -import com.hccake.ballcat.common.core.exception.handler.GlobalExceptionHandler; +import org.ballcat.common.core.exception.handler.GlobalExceptionHandler; /** * 默认的异常日志处理类 diff --git a/web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/exception/handler/DingTalkGlobalExceptionHandler.java b/web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/exception/handler/DingTalkGlobalExceptionHandler.java similarity index 74% rename from web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/exception/handler/DingTalkGlobalExceptionHandler.java rename to web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/exception/handler/DingTalkGlobalExceptionHandler.java index 68781fc33..0f8579ed4 100644 --- a/web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/exception/handler/DingTalkGlobalExceptionHandler.java +++ b/web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/exception/handler/DingTalkGlobalExceptionHandler.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.autoconfigure.web.exception.handler; +package org.ballcat.autoconfigure.web.exception.handler; -import com.hccake.ballcat.autoconfigure.web.exception.ExceptionHandleProperties; -import com.hccake.ballcat.autoconfigure.web.exception.domain.ExceptionMessage; -import com.hccake.ballcat.autoconfigure.web.exception.domain.ExceptionNoticeResponse; -import com.hccake.extend.dingtalk.DingTalkResponse; -import com.hccake.extend.dingtalk.DingTalkSender; -import com.hccake.extend.dingtalk.message.DingTalkTextMessage; +import org.ballcat.autoconfigure.web.exception.ExceptionHandleProperties; +import org.ballcat.autoconfigure.web.exception.domain.ExceptionMessage; +import org.ballcat.autoconfigure.web.exception.domain.ExceptionNoticeResponse; +import org.ballcat.dingtalk.DingTalkResponse; +import org.ballcat.dingtalk.DingTalkSender; +import org.ballcat.dingtalk.message.DingTalkTextMessage; import lombok.extern.slf4j.Slf4j; /** diff --git a/web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/exception/handler/MailGlobalExceptionHandler.java b/web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/exception/handler/MailGlobalExceptionHandler.java similarity index 77% rename from web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/exception/handler/MailGlobalExceptionHandler.java rename to web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/exception/handler/MailGlobalExceptionHandler.java index e0e8fba85..5f4f2c3e9 100644 --- a/web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/exception/handler/MailGlobalExceptionHandler.java +++ b/web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/exception/handler/MailGlobalExceptionHandler.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.autoconfigure.web.exception.handler; +package org.ballcat.autoconfigure.web.exception.handler; -import com.hccake.ballcat.autoconfigure.web.exception.ExceptionHandleProperties; -import com.hccake.ballcat.autoconfigure.web.exception.domain.ExceptionMessage; -import com.hccake.ballcat.autoconfigure.web.exception.domain.ExceptionNoticeResponse; -import com.hccake.ballcat.common.mail.model.MailSendInfo; -import com.hccake.ballcat.common.mail.sender.MailSender; +import org.ballcat.autoconfigure.web.exception.ExceptionHandleProperties; +import org.ballcat.autoconfigure.web.exception.domain.ExceptionMessage; +import org.ballcat.autoconfigure.web.exception.domain.ExceptionNoticeResponse; +import org.ballcat.mail.model.MailSendInfo; +import org.ballcat.mail.sender.MailSender; import lombok.extern.slf4j.Slf4j; /** diff --git a/web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/exception/handler/MultiGlobalExceptionHandler.java b/web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/exception/handler/MultiGlobalExceptionHandler.java similarity index 86% rename from web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/exception/handler/MultiGlobalExceptionHandler.java rename to web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/exception/handler/MultiGlobalExceptionHandler.java index b6d1eb071..c0bfbb0c3 100644 --- a/web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/exception/handler/MultiGlobalExceptionHandler.java +++ b/web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/exception/handler/MultiGlobalExceptionHandler.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.autoconfigure.web.exception.handler; +package org.ballcat.autoconfigure.web.exception.handler; -import com.hccake.ballcat.autoconfigure.web.exception.ExceptionHandleProperties; -import com.hccake.ballcat.autoconfigure.web.exception.domain.ExceptionMessage; -import com.hccake.ballcat.autoconfigure.web.exception.domain.ExceptionNoticeResponse; -import com.hccake.ballcat.common.mail.sender.MailSender; -import com.hccake.extend.dingtalk.DingTalkSender; -import com.hccake.extend.dingtalk.message.DingTalkTextMessage; +import org.ballcat.autoconfigure.web.exception.ExceptionHandleProperties; +import org.ballcat.autoconfigure.web.exception.domain.ExceptionMessage; +import org.ballcat.autoconfigure.web.exception.domain.ExceptionNoticeResponse; +import org.ballcat.mail.sender.MailSender; +import org.ballcat.dingtalk.DingTalkSender; +import org.ballcat.dingtalk.message.DingTalkTextMessage; import lombok.extern.slf4j.Slf4j; import org.springframework.util.CollectionUtils; diff --git a/web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/exception/resolver/GlobalHandlerExceptionResolver.java b/web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/exception/resolver/GlobalHandlerExceptionResolver.java similarity index 94% rename from web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/exception/resolver/GlobalHandlerExceptionResolver.java rename to web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/exception/resolver/GlobalHandlerExceptionResolver.java index 411cd3907..f2435522a 100644 --- a/web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/exception/resolver/GlobalHandlerExceptionResolver.java +++ b/web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/exception/resolver/GlobalHandlerExceptionResolver.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.autoconfigure.web.exception.resolver; +package org.ballcat.autoconfigure.web.exception.resolver; -import com.hccake.ballcat.common.core.constant.GlobalConstants; -import com.hccake.ballcat.common.core.exception.BusinessException; -import com.hccake.ballcat.common.core.exception.handler.GlobalExceptionHandler; -import com.hccake.ballcat.common.model.result.R; -import com.hccake.ballcat.common.model.result.SystemResultCode; +import org.ballcat.common.core.constant.GlobalConstants; +import org.ballcat.common.core.exception.BusinessException; +import org.ballcat.common.core.exception.handler.GlobalExceptionHandler; +import org.ballcat.common.model.result.R; +import org.ballcat.common.model.result.SystemResultCode; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; diff --git a/web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/exception/resolver/SecurityHandlerExceptionResolver.java b/web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/exception/resolver/SecurityHandlerExceptionResolver.java similarity index 87% rename from web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/exception/resolver/SecurityHandlerExceptionResolver.java rename to web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/exception/resolver/SecurityHandlerExceptionResolver.java index beb7c8515..0f2bc8177 100644 --- a/web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/exception/resolver/SecurityHandlerExceptionResolver.java +++ b/web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/exception/resolver/SecurityHandlerExceptionResolver.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.autoconfigure.web.exception.resolver; +package org.ballcat.autoconfigure.web.exception.resolver; -import com.hccake.ballcat.common.core.exception.handler.GlobalExceptionHandler; -import com.hccake.ballcat.common.model.result.R; -import com.hccake.ballcat.common.model.result.SystemResultCode; +import org.ballcat.common.core.exception.handler.GlobalExceptionHandler; +import org.ballcat.common.model.result.R; +import org.ballcat.common.model.result.SystemResultCode; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.core.annotation.Order; diff --git a/web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/jackson/CustomJacksonAutoConfiguration.java b/web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/jackson/CustomJacksonAutoConfiguration.java similarity index 88% rename from web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/jackson/CustomJacksonAutoConfiguration.java rename to web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/jackson/CustomJacksonAutoConfiguration.java index 825bb4dd9..371331e1e 100644 --- a/web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/jackson/CustomJacksonAutoConfiguration.java +++ b/web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/jackson/CustomJacksonAutoConfiguration.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.autoconfigure.web.jackson; +package org.ballcat.autoconfigure.web.jackson; import com.fasterxml.jackson.core.json.JsonReadFeature; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; -import com.hccake.ballcat.common.core.jackson.CustomJavaTimeModule; -import com.hccake.ballcat.common.core.jackson.NullSerializerProvider; -import com.hccake.ballcat.common.desensitize.json.DesensitizeStrategy; -import com.hccake.ballcat.common.desensitize.json.JsonDesensitizeModule; -import com.hccake.ballcat.common.desensitize.json.JsonDesensitizeSerializerModifier; -import com.hccake.ballcat.common.util.json.JacksonJsonToolAdapter; +import org.ballcat.common.core.jackson.CustomJavaTimeModule; +import org.ballcat.common.core.jackson.NullSerializerProvider; +import org.ballcat.desensitize.json.DesensitizeStrategy; +import org.ballcat.desensitize.json.JsonDesensitizeModule; +import org.ballcat.desensitize.json.JsonDesensitizeSerializerModifier; +import org.ballcat.common.util.json.JacksonJsonToolAdapter; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; diff --git a/web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/pageable/DefaultPageParamArgumentResolver.java b/web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/pageable/DefaultPageParamArgumentResolver.java similarity index 95% rename from web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/pageable/DefaultPageParamArgumentResolver.java rename to web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/pageable/DefaultPageParamArgumentResolver.java index dfa1d479c..ad93a91b8 100644 --- a/web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/pageable/DefaultPageParamArgumentResolver.java +++ b/web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/pageable/DefaultPageParamArgumentResolver.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.autoconfigure.web.pageable; +package org.ballcat.autoconfigure.web.pageable; -import com.hccake.ballcat.common.model.domain.PageParam; +import org.ballcat.common.model.domain.PageParam; import lombok.extern.slf4j.Slf4j; import org.springframework.core.MethodParameter; import org.springframework.lang.NonNull; diff --git a/web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/pageable/PageParamArgumentResolver.java b/web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/pageable/PageParamArgumentResolver.java similarity index 94% rename from web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/pageable/PageParamArgumentResolver.java rename to web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/pageable/PageParamArgumentResolver.java index 219599323..63398b37a 100644 --- a/web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/pageable/PageParamArgumentResolver.java +++ b/web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/pageable/PageParamArgumentResolver.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.autoconfigure.web.pageable; +package org.ballcat.autoconfigure.web.pageable; -import com.hccake.ballcat.common.model.domain.PageParam; +import org.ballcat.common.model.domain.PageParam; import org.springframework.core.MethodParameter; import org.springframework.lang.NonNull; import org.springframework.lang.Nullable; diff --git a/web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/pageable/PageParamArgumentResolverSupport.java b/web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/pageable/PageParamArgumentResolverSupport.java similarity index 97% rename from web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/pageable/PageParamArgumentResolverSupport.java rename to web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/pageable/PageParamArgumentResolverSupport.java index 0e434e972..94082bf91 100644 --- a/web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/pageable/PageParamArgumentResolverSupport.java +++ b/web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/pageable/PageParamArgumentResolverSupport.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.autoconfigure.web.pageable; +package org.ballcat.autoconfigure.web.pageable; import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.text.StrPool; import cn.hutool.core.util.ArrayUtil; -import com.hccake.ballcat.common.model.domain.PageParam; +import org.ballcat.common.model.domain.PageParam; import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; @@ -39,7 +39,7 @@ import java.util.List; import java.util.Map; -import static com.hccake.ballcat.common.model.domain.PageableConstants.*; +import static org.ballcat.common.model.domain.PageableConstants.*; /** * @author hccake diff --git a/web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/pageable/PageableProperties.java b/web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/pageable/PageableProperties.java similarity index 90% rename from web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/pageable/PageableProperties.java rename to web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/pageable/PageableProperties.java index 58615a2e5..a42f48bcc 100644 --- a/web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/pageable/PageableProperties.java +++ b/web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/pageable/PageableProperties.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.autoconfigure.web.pageable; +package org.ballcat.autoconfigure.web.pageable; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; -import static com.hccake.ballcat.common.model.domain.PageableConstants.*; +import static org.ballcat.common.model.domain.PageableConstants.*; /** * @author hccake diff --git a/web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/servlet/WebMvcAutoConfiguration.java b/web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/servlet/WebMvcAutoConfiguration.java similarity index 87% rename from web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/servlet/WebMvcAutoConfiguration.java rename to web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/servlet/WebMvcAutoConfiguration.java index 052302be5..e3675c426 100644 --- a/web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/servlet/WebMvcAutoConfiguration.java +++ b/web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/servlet/WebMvcAutoConfiguration.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.autoconfigure.web.servlet; +package org.ballcat.autoconfigure.web.servlet; import cn.hutool.core.util.IdUtil; -import com.hccake.ballcat.autoconfigure.web.pageable.DefaultPageParamArgumentResolver; -import com.hccake.ballcat.autoconfigure.web.pageable.PageParamArgumentResolver; -import com.hccake.ballcat.autoconfigure.web.pageable.PageableProperties; -import com.hccake.ballcat.autoconfigure.web.trace.TraceIdGenerator; -import com.hccake.ballcat.autoconfigure.web.trace.TraceIdFilter; +import org.ballcat.autoconfigure.web.pageable.DefaultPageParamArgumentResolver; +import org.ballcat.autoconfigure.web.pageable.PageParamArgumentResolver; +import org.ballcat.autoconfigure.web.pageable.PageableProperties; +import org.ballcat.autoconfigure.web.trace.TraceIdGenerator; +import org.ballcat.autoconfigure.web.trace.TraceIdFilter; import lombok.RequiredArgsConstructor; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; diff --git a/web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/servlet/WebProperties.java b/web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/servlet/WebProperties.java similarity index 94% rename from web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/servlet/WebProperties.java rename to web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/servlet/WebProperties.java index 3f86bd09b..585cbad65 100644 --- a/web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/servlet/WebProperties.java +++ b/web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/servlet/WebProperties.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.autoconfigure.web.servlet; +package org.ballcat.autoconfigure.web.servlet; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/trace/TraceIdFilter.java b/web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/trace/TraceIdFilter.java similarity index 94% rename from web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/trace/TraceIdFilter.java rename to web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/trace/TraceIdFilter.java index dd712442a..47f5f5da8 100644 --- a/web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/trace/TraceIdFilter.java +++ b/web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/trace/TraceIdFilter.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.autoconfigure.web.trace; +package org.ballcat.autoconfigure.web.trace; -import com.hccake.ballcat.common.core.constant.MDCConstants; +import org.ballcat.common.core.constant.MDCConstants; import lombok.RequiredArgsConstructor; import org.slf4j.MDC; import org.springframework.web.filter.OncePerRequestFilter; diff --git a/web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/trace/TraceIdGenerator.java b/web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/trace/TraceIdGenerator.java similarity index 93% rename from web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/trace/TraceIdGenerator.java rename to web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/trace/TraceIdGenerator.java index 764da622e..b88cff13d 100644 --- a/web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/trace/TraceIdGenerator.java +++ b/web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/trace/TraceIdGenerator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.autoconfigure.web.trace; +package org.ballcat.autoconfigure.web.trace; /** * TraceId 转换器 diff --git a/web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/validation/BallcatValidationAutoConfiguration.java b/web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/validation/BallcatValidationAutoConfiguration.java similarity index 94% rename from web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/validation/BallcatValidationAutoConfiguration.java rename to web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/validation/BallcatValidationAutoConfiguration.java index 59bc12a48..a82f2c75b 100644 --- a/web/ballcat-spring-boot-starter-web/src/main/java/com/hccake/ballcat/autoconfigure/web/validation/BallcatValidationAutoConfiguration.java +++ b/web/ballcat-spring-boot-starter-web/src/main/java/org/ballcat/autoconfigure/web/validation/BallcatValidationAutoConfiguration.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.autoconfigure.web.validation; +package org.ballcat.autoconfigure.web.validation; -import com.hccake.ballcat.common.core.validation.EmptyCurlyToDefaultMessageInterpolator; +import org.ballcat.common.core.validation.EmptyCurlyToDefaultMessageInterpolator; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; diff --git a/web/ballcat-spring-boot-starter-web/src/main/resources/META-INF/spring.factories b/web/ballcat-spring-boot-starter-web/src/main/resources/META-INF/spring.factories index bf36eb06d..3778e7357 100644 --- a/web/ballcat-spring-boot-starter-web/src/main/resources/META-INF/spring.factories +++ b/web/ballcat-spring-boot-starter-web/src/main/resources/META-INF/spring.factories @@ -1,10 +1,10 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.hccake.ballcat.autoconfigure.web.actuate.ActuatorSecurityAutoConfiguration,\ - com.hccake.ballcat.autoconfigure.web.jackson.CustomJacksonAutoConfiguration,\ - com.hccake.ballcat.autoconfigure.web.exception.ExceptionAutoConfiguration,\ - com.hccake.ballcat.autoconfigure.web.servlet.WebMvcAutoConfiguration,\ - com.hccake.ballcat.autoconfigure.web.validation.BallcatValidationAutoConfiguration + org.ballcat.autoconfigure.web.actuate.ActuatorSecurityAutoConfiguration,\ + org.ballcat.autoconfigure.web.jackson.CustomJacksonAutoConfiguration,\ + org.ballcat.autoconfigure.web.exception.ExceptionAutoConfiguration,\ + org.ballcat.autoconfigure.web.servlet.WebMvcAutoConfiguration,\ + org.ballcat.autoconfigure.web.validation.BallcatValidationAutoConfiguration org.springframework.context.ApplicationListener=\ - com.hccake.ballcat.autoconfigure.web.event.ApplicationContextInitialized \ No newline at end of file + org.ballcat.autoconfigure.web.event.ApplicationContextInitialized \ No newline at end of file diff --git a/web/ballcat-spring-boot-starter-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/web/ballcat-spring-boot-starter-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index a30249d45..f212d27c2 100644 --- a/web/ballcat-spring-boot-starter-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/web/ballcat-spring-boot-starter-web/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,5 +1,5 @@ -com.hccake.ballcat.autoconfigure.web.actuate.ActuatorSecurityAutoConfiguration -com.hccake.ballcat.autoconfigure.web.jackson.CustomJacksonAutoConfiguration -com.hccake.ballcat.autoconfigure.web.exception.ExceptionAutoConfiguration -com.hccake.ballcat.autoconfigure.web.servlet.WebMvcAutoConfiguration -com.hccake.ballcat.autoconfigure.web.validation.BallcatValidationAutoConfiguration \ No newline at end of file +org.ballcat.autoconfigure.web.actuate.ActuatorSecurityAutoConfiguration +org.ballcat.autoconfigure.web.jackson.CustomJacksonAutoConfiguration +org.ballcat.autoconfigure.web.exception.ExceptionAutoConfiguration +org.ballcat.autoconfigure.web.servlet.WebMvcAutoConfiguration +org.ballcat.autoconfigure.web.validation.BallcatValidationAutoConfiguration \ No newline at end of file diff --git a/websocket/ballcat-spring-boot-starter-websocket/src/main/java/com/hccake/ballcat/autoconfigure/websocket/MessageDistributorTypeConstants.java b/websocket/ballcat-spring-boot-starter-websocket/src/main/java/org/ballcat/autoconfigure/websocket/MessageDistributorTypeConstants.java similarity index 95% rename from websocket/ballcat-spring-boot-starter-websocket/src/main/java/com/hccake/ballcat/autoconfigure/websocket/MessageDistributorTypeConstants.java rename to websocket/ballcat-spring-boot-starter-websocket/src/main/java/org/ballcat/autoconfigure/websocket/MessageDistributorTypeConstants.java index 5851e43b8..9515a7b0b 100644 --- a/websocket/ballcat-spring-boot-starter-websocket/src/main/java/com/hccake/ballcat/autoconfigure/websocket/MessageDistributorTypeConstants.java +++ b/websocket/ballcat-spring-boot-starter-websocket/src/main/java/org/ballcat/autoconfigure/websocket/MessageDistributorTypeConstants.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.autoconfigure.websocket; +package org.ballcat.autoconfigure.websocket; /** * websocket 消息分发器类型常量类 diff --git a/websocket/ballcat-spring-boot-starter-websocket/src/main/java/com/hccake/ballcat/autoconfigure/websocket/SockJsServiceConfigurer.java b/websocket/ballcat-spring-boot-starter-websocket/src/main/java/org/ballcat/autoconfigure/websocket/SockJsServiceConfigurer.java similarity index 94% rename from websocket/ballcat-spring-boot-starter-websocket/src/main/java/com/hccake/ballcat/autoconfigure/websocket/SockJsServiceConfigurer.java rename to websocket/ballcat-spring-boot-starter-websocket/src/main/java/org/ballcat/autoconfigure/websocket/SockJsServiceConfigurer.java index 176f6892e..61d96ff2d 100644 --- a/websocket/ballcat-spring-boot-starter-websocket/src/main/java/com/hccake/ballcat/autoconfigure/websocket/SockJsServiceConfigurer.java +++ b/websocket/ballcat-spring-boot-starter-websocket/src/main/java/org/ballcat/autoconfigure/websocket/SockJsServiceConfigurer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.autoconfigure.websocket; +package org.ballcat.autoconfigure.websocket; import org.springframework.web.socket.config.annotation.SockJsServiceRegistration; diff --git a/websocket/ballcat-spring-boot-starter-websocket/src/main/java/com/hccake/ballcat/autoconfigure/websocket/WebSocketAutoConfiguration.java b/websocket/ballcat-spring-boot-starter-websocket/src/main/java/org/ballcat/autoconfigure/websocket/WebSocketAutoConfiguration.java similarity index 84% rename from websocket/ballcat-spring-boot-starter-websocket/src/main/java/com/hccake/ballcat/autoconfigure/websocket/WebSocketAutoConfiguration.java rename to websocket/ballcat-spring-boot-starter-websocket/src/main/java/org/ballcat/autoconfigure/websocket/WebSocketAutoConfiguration.java index f0164322e..a0ea34dad 100644 --- a/websocket/ballcat-spring-boot-starter-websocket/src/main/java/com/hccake/ballcat/autoconfigure/websocket/WebSocketAutoConfiguration.java +++ b/websocket/ballcat-spring-boot-starter-websocket/src/main/java/org/ballcat/autoconfigure/websocket/WebSocketAutoConfiguration.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.autoconfigure.websocket; +package org.ballcat.autoconfigure.websocket; -import com.hccake.ballcat.autoconfigure.websocket.config.LocalMessageDistributorConfig; -import com.hccake.ballcat.autoconfigure.websocket.config.RocketMqMessageDistributorConfig; -import com.hccake.ballcat.autoconfigure.websocket.config.RedisMessageDistributorConfig; -import com.hccake.ballcat.autoconfigure.websocket.config.WebSocketHandlerConfig; -import com.hccake.ballcat.common.websocket.handler.JsonMessageHandler; -import com.hccake.ballcat.common.websocket.handler.PingJsonMessageHandler; -import com.hccake.ballcat.common.websocket.holder.JsonMessageHandlerInitializer; -import com.hccake.ballcat.common.websocket.message.JsonWebSocketMessage; +import org.ballcat.autoconfigure.websocket.config.LocalMessageDistributorConfig; +import org.ballcat.autoconfigure.websocket.config.RocketMqMessageDistributorConfig; +import org.ballcat.autoconfigure.websocket.config.RedisMessageDistributorConfig; +import org.ballcat.autoconfigure.websocket.config.WebSocketHandlerConfig; +import org.ballcat.websocket.handler.JsonMessageHandler; +import org.ballcat.websocket.handler.PingJsonMessageHandler; +import org.ballcat.websocket.holder.JsonMessageHandlerInitializer; +import org.ballcat.websocket.message.JsonWebSocketMessage; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfiguration; diff --git a/websocket/ballcat-spring-boot-starter-websocket/src/main/java/com/hccake/ballcat/autoconfigure/websocket/WebSocketProperties.java b/websocket/ballcat-spring-boot-starter-websocket/src/main/java/org/ballcat/autoconfigure/websocket/WebSocketProperties.java similarity index 94% rename from websocket/ballcat-spring-boot-starter-websocket/src/main/java/com/hccake/ballcat/autoconfigure/websocket/WebSocketProperties.java rename to websocket/ballcat-spring-boot-starter-websocket/src/main/java/org/ballcat/autoconfigure/websocket/WebSocketProperties.java index 322e84293..c0770eb28 100644 --- a/websocket/ballcat-spring-boot-starter-websocket/src/main/java/com/hccake/ballcat/autoconfigure/websocket/WebSocketProperties.java +++ b/websocket/ballcat-spring-boot-starter-websocket/src/main/java/org/ballcat/autoconfigure/websocket/WebSocketProperties.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.autoconfigure.websocket; +package org.ballcat.autoconfigure.websocket; -import com.hccake.ballcat.common.websocket.handler.ConcurrentWebSocketSessionOptions; +import org.ballcat.websocket.handler.ConcurrentWebSocketSessionOptions; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.NestedConfigurationProperty; diff --git a/websocket/ballcat-spring-boot-starter-websocket/src/main/java/com/hccake/ballcat/autoconfigure/websocket/config/LocalMessageDistributorConfig.java b/websocket/ballcat-spring-boot-starter-websocket/src/main/java/org/ballcat/autoconfigure/websocket/config/LocalMessageDistributorConfig.java similarity index 78% rename from websocket/ballcat-spring-boot-starter-websocket/src/main/java/com/hccake/ballcat/autoconfigure/websocket/config/LocalMessageDistributorConfig.java rename to websocket/ballcat-spring-boot-starter-websocket/src/main/java/org/ballcat/autoconfigure/websocket/config/LocalMessageDistributorConfig.java index db2a2c027..0c0197e1b 100644 --- a/websocket/ballcat-spring-boot-starter-websocket/src/main/java/com/hccake/ballcat/autoconfigure/websocket/config/LocalMessageDistributorConfig.java +++ b/websocket/ballcat-spring-boot-starter-websocket/src/main/java/org/ballcat/autoconfigure/websocket/config/LocalMessageDistributorConfig.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.autoconfigure.websocket.config; +package org.ballcat.autoconfigure.websocket.config; -import com.hccake.ballcat.autoconfigure.websocket.MessageDistributorTypeConstants; -import com.hccake.ballcat.autoconfigure.websocket.WebSocketProperties; -import com.hccake.ballcat.common.websocket.distribute.LocalMessageDistributor; -import com.hccake.ballcat.common.websocket.distribute.MessageDistributor; -import com.hccake.ballcat.common.websocket.session.WebSocketSessionStore; +import org.ballcat.autoconfigure.websocket.MessageDistributorTypeConstants; +import org.ballcat.autoconfigure.websocket.WebSocketProperties; +import org.ballcat.websocket.distribute.LocalMessageDistributor; +import org.ballcat.websocket.distribute.MessageDistributor; +import org.ballcat.websocket.session.WebSocketSessionStore; import lombok.RequiredArgsConstructor; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/websocket/ballcat-spring-boot-starter-websocket/src/main/java/com/hccake/ballcat/autoconfigure/websocket/config/RedisMessageDistributorConfig.java b/websocket/ballcat-spring-boot-starter-websocket/src/main/java/org/ballcat/autoconfigure/websocket/config/RedisMessageDistributorConfig.java similarity index 83% rename from websocket/ballcat-spring-boot-starter-websocket/src/main/java/com/hccake/ballcat/autoconfigure/websocket/config/RedisMessageDistributorConfig.java rename to websocket/ballcat-spring-boot-starter-websocket/src/main/java/org/ballcat/autoconfigure/websocket/config/RedisMessageDistributorConfig.java index 76da7565b..71684f70c 100644 --- a/websocket/ballcat-spring-boot-starter-websocket/src/main/java/com/hccake/ballcat/autoconfigure/websocket/config/RedisMessageDistributorConfig.java +++ b/websocket/ballcat-spring-boot-starter-websocket/src/main/java/org/ballcat/autoconfigure/websocket/config/RedisMessageDistributorConfig.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.autoconfigure.websocket.config; +package org.ballcat.autoconfigure.websocket.config; -import com.hccake.ballcat.autoconfigure.websocket.MessageDistributorTypeConstants; -import com.hccake.ballcat.autoconfigure.websocket.WebSocketProperties; -import com.hccake.ballcat.common.websocket.distribute.MessageDistributor; -import com.hccake.ballcat.common.websocket.distribute.RedisMessageDistributor; -import com.hccake.ballcat.common.websocket.distribute.RedisMessageListenerInitializer; -import com.hccake.ballcat.common.websocket.session.WebSocketSessionStore; +import org.ballcat.autoconfigure.websocket.MessageDistributorTypeConstants; +import org.ballcat.autoconfigure.websocket.WebSocketProperties; +import org.ballcat.websocket.distribute.MessageDistributor; +import org.ballcat.websocket.distribute.RedisMessageDistributor; +import org.ballcat.websocket.distribute.RedisMessageListenerInitializer; +import org.ballcat.websocket.session.WebSocketSessionStore; import lombok.RequiredArgsConstructor; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; diff --git a/websocket/ballcat-spring-boot-starter-websocket/src/main/java/com/hccake/ballcat/autoconfigure/websocket/config/RocketMqMessageDistributorConfig.java b/websocket/ballcat-spring-boot-starter-websocket/src/main/java/org/ballcat/autoconfigure/websocket/config/RocketMqMessageDistributorConfig.java similarity index 78% rename from websocket/ballcat-spring-boot-starter-websocket/src/main/java/com/hccake/ballcat/autoconfigure/websocket/config/RocketMqMessageDistributorConfig.java rename to websocket/ballcat-spring-boot-starter-websocket/src/main/java/org/ballcat/autoconfigure/websocket/config/RocketMqMessageDistributorConfig.java index d2432ccdd..bccc2b9f1 100644 --- a/websocket/ballcat-spring-boot-starter-websocket/src/main/java/com/hccake/ballcat/autoconfigure/websocket/config/RocketMqMessageDistributorConfig.java +++ b/websocket/ballcat-spring-boot-starter-websocket/src/main/java/org/ballcat/autoconfigure/websocket/config/RocketMqMessageDistributorConfig.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.autoconfigure.websocket.config; +package org.ballcat.autoconfigure.websocket.config; -import com.hccake.ballcat.autoconfigure.websocket.MessageDistributorTypeConstants; -import com.hccake.ballcat.autoconfigure.websocket.WebSocketProperties; -import com.hccake.ballcat.common.websocket.distribute.MessageDistributor; -import com.hccake.ballcat.common.websocket.distribute.RocketmqMessageDistributor; -import com.hccake.ballcat.common.websocket.session.WebSocketSessionStore; +import org.ballcat.autoconfigure.websocket.MessageDistributorTypeConstants; +import org.ballcat.autoconfigure.websocket.WebSocketProperties; +import org.ballcat.websocket.distribute.MessageDistributor; +import org.ballcat.websocket.distribute.RocketmqMessageDistributor; +import org.ballcat.websocket.session.WebSocketSessionStore; import lombok.RequiredArgsConstructor; import org.apache.rocketmq.spring.core.RocketMQTemplate; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; diff --git a/websocket/ballcat-spring-boot-starter-websocket/src/main/java/com/hccake/ballcat/autoconfigure/websocket/config/WebSocketHandlerConfig.java b/websocket/ballcat-spring-boot-starter-websocket/src/main/java/org/ballcat/autoconfigure/websocket/config/WebSocketHandlerConfig.java similarity index 76% rename from websocket/ballcat-spring-boot-starter-websocket/src/main/java/com/hccake/ballcat/autoconfigure/websocket/config/WebSocketHandlerConfig.java rename to websocket/ballcat-spring-boot-starter-websocket/src/main/java/org/ballcat/autoconfigure/websocket/config/WebSocketHandlerConfig.java index c3fbf5265..ef1a53283 100644 --- a/websocket/ballcat-spring-boot-starter-websocket/src/main/java/com/hccake/ballcat/autoconfigure/websocket/config/WebSocketHandlerConfig.java +++ b/websocket/ballcat-spring-boot-starter-websocket/src/main/java/org/ballcat/autoconfigure/websocket/config/WebSocketHandlerConfig.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.autoconfigure.websocket.config; +package org.ballcat.autoconfigure.websocket.config; -import com.hccake.ballcat.autoconfigure.websocket.WebSocketProperties; -import com.hccake.ballcat.common.websocket.handler.CustomWebSocketHandler; -import com.hccake.ballcat.common.websocket.handler.PlanTextMessageHandler; -import com.hccake.ballcat.common.websocket.session.DefaultWebSocketSessionStore; -import com.hccake.ballcat.common.websocket.session.MapSessionWebSocketHandlerDecorator; -import com.hccake.ballcat.common.websocket.session.SessionKeyGenerator; -import com.hccake.ballcat.common.websocket.session.WebSocketSessionStore; +import org.ballcat.autoconfigure.websocket.WebSocketProperties; +import org.ballcat.websocket.handler.CustomWebSocketHandler; +import org.ballcat.websocket.handler.PlanTextMessageHandler; +import org.ballcat.websocket.session.DefaultWebSocketSessionStore; +import org.ballcat.websocket.session.MapSessionWebSocketHandlerDecorator; +import org.ballcat.websocket.session.SessionKeyGenerator; +import org.ballcat.websocket.session.WebSocketSessionStore; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; diff --git a/websocket/ballcat-spring-boot-starter-websocket/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/websocket/ballcat-spring-boot-starter-websocket/src/main/resources/META-INF/additional-spring-configuration-metadata.json index ced24d98e..a06df3873 100644 --- a/websocket/ballcat-spring-boot-starter-websocket/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/websocket/ballcat-spring-boot-starter-websocket/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -3,28 +3,28 @@ { "name": "ballcat.websocket.concurrent.buffer-size-limit", "type": "java.lang.Integer", - "sourceType": "com.hccake.ballcat.common.websocket.handler.ConcurrentWebSocketSessionOptions", + "sourceType": "org.ballcat.websocket.handler.ConcurrentWebSocketSessionOptions", "description": "发送消息缓冲上限 (byte)", "defaultValue": 102400 }, { "name": "ballcat.websocket.concurrent.enable", "type": "java.lang.Boolean", - "sourceType": "com.hccake.ballcat.common.websocket.handler.ConcurrentWebSocketSessionOptions", + "sourceType": "org.ballcat.websocket.handler.ConcurrentWebSocketSessionOptions", "description": "是否在多线程环境下进行发送", "defaultValue": false }, { "name": "ballcat.websocket.concurrent.overflow-strategy", "type": "org.springframework.web.socket.handler.ConcurrentWebSocketSessionDecorator$OverflowStrategy", - "sourceType": "com.hccake.ballcat.common.websocket.handler.ConcurrentWebSocketSessionOptions", + "sourceType": "org.ballcat.websocket.handler.ConcurrentWebSocketSessionOptions", "description": "缓冲区溢出时的执行策略", "defaultValue": "org.springframework.web.socket.handler.ConcurrentWebSocketSessionDecorator.OverflowStrategy.TERMINATE" }, { "name": "ballcat.websocket.concurrent.send-time-limit", "type": "java.lang.Integer", - "sourceType": "com.hccake.ballcat.common.websocket.handler.ConcurrentWebSocketSessionOptions", + "sourceType": "org.ballcat.websocket.handler.ConcurrentWebSocketSessionOptions", "description": "发送时间的限制（ms）", "defaultValue": 5000 } diff --git a/websocket/ballcat-spring-boot-starter-websocket/src/main/resources/META-INF/spring.factories b/websocket/ballcat-spring-boot-starter-websocket/src/main/resources/META-INF/spring.factories index 5cc898425..227bd7895 100644 --- a/websocket/ballcat-spring-boot-starter-websocket/src/main/resources/META-INF/spring.factories +++ b/websocket/ballcat-spring-boot-starter-websocket/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.hccake.ballcat.autoconfigure.websocket.WebSocketAutoConfiguration \ No newline at end of file + org.ballcat.autoconfigure.websocket.WebSocketAutoConfiguration \ No newline at end of file diff --git a/websocket/ballcat-spring-boot-starter-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/websocket/ballcat-spring-boot-starter-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index eeca7d3f0..492610b78 100644 --- a/websocket/ballcat-spring-boot-starter-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/websocket/ballcat-spring-boot-starter-websocket/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.hccake.ballcat.autoconfigure.websocket.WebSocketAutoConfiguration \ No newline at end of file +org.ballcat.autoconfigure.websocket.WebSocketAutoConfiguration \ No newline at end of file diff --git a/websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/WebSocketMessageSender.java b/websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/WebSocketMessageSender.java similarity index 90% rename from websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/WebSocketMessageSender.java rename to websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/WebSocketMessageSender.java index 77fe26b9a..b184806df 100644 --- a/websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/WebSocketMessageSender.java +++ b/websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/WebSocketMessageSender.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.websocket; +package org.ballcat.websocket; -import com.hccake.ballcat.common.util.JsonUtils; -import com.hccake.ballcat.common.websocket.message.JsonWebSocketMessage; +import org.ballcat.common.util.JsonUtils; +import org.ballcat.websocket.message.JsonWebSocketMessage; import lombok.extern.slf4j.Slf4j; import org.springframework.web.socket.TextMessage; import org.springframework.web.socket.WebSocketSession; diff --git a/websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/distribute/AbstractMessageDistributor.java b/websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/distribute/AbstractMessageDistributor.java similarity index 92% rename from websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/distribute/AbstractMessageDistributor.java rename to websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/distribute/AbstractMessageDistributor.java index 5c609c9be..ca5edae01 100644 --- a/websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/distribute/AbstractMessageDistributor.java +++ b/websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/distribute/AbstractMessageDistributor.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.websocket.distribute; +package org.ballcat.websocket.distribute; import cn.hutool.core.collection.CollUtil; -import com.hccake.ballcat.common.websocket.WebSocketMessageSender; -import com.hccake.ballcat.common.websocket.session.WebSocketSessionStore; +import org.ballcat.websocket.WebSocketMessageSender; +import org.ballcat.websocket.session.WebSocketSessionStore; import lombok.extern.slf4j.Slf4j; import org.springframework.web.socket.WebSocketSession; diff --git a/websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/distribute/LocalMessageDistributor.java b/websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/distribute/LocalMessageDistributor.java similarity index 88% rename from websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/distribute/LocalMessageDistributor.java rename to websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/distribute/LocalMessageDistributor.java index b74ba2dc8..061f3c7e2 100644 --- a/websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/distribute/LocalMessageDistributor.java +++ b/websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/distribute/LocalMessageDistributor.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.websocket.distribute; +package org.ballcat.websocket.distribute; -import com.hccake.ballcat.common.websocket.session.WebSocketSessionStore; +import org.ballcat.websocket.session.WebSocketSessionStore; /** * 本地消息分发，直接进行发送 diff --git a/websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/distribute/MessageDO.java b/websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/distribute/MessageDO.java similarity index 95% rename from websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/distribute/MessageDO.java rename to websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/distribute/MessageDO.java index 47278fb72..4339644af 100644 --- a/websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/distribute/MessageDO.java +++ b/websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/distribute/MessageDO.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.websocket.distribute; +package org.ballcat.websocket.distribute; import lombok.Data; import lombok.experimental.Accessors; diff --git a/websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/distribute/MessageDistributor.java b/websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/distribute/MessageDistributor.java similarity index 93% rename from websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/distribute/MessageDistributor.java rename to websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/distribute/MessageDistributor.java index 21ef29255..b55e18aae 100644 --- a/websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/distribute/MessageDistributor.java +++ b/websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/distribute/MessageDistributor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.websocket.distribute; +package org.ballcat.websocket.distribute; /** * 消息分发器 diff --git a/websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/distribute/RedisMessageDistributor.java b/websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/distribute/RedisMessageDistributor.java similarity index 92% rename from websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/distribute/RedisMessageDistributor.java rename to websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/distribute/RedisMessageDistributor.java index f35b5dcd3..297c7f94a 100644 --- a/websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/distribute/RedisMessageDistributor.java +++ b/websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/distribute/RedisMessageDistributor.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.websocket.distribute; +package org.ballcat.websocket.distribute; -import com.hccake.ballcat.common.util.JsonUtils; -import com.hccake.ballcat.common.websocket.session.WebSocketSessionStore; +import org.ballcat.common.util.JsonUtils; +import org.ballcat.websocket.session.WebSocketSessionStore; import lombok.extern.slf4j.Slf4j; import org.springframework.data.redis.connection.Message; import org.springframework.data.redis.connection.MessageListener; diff --git a/websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/distribute/RedisMessageListenerInitializer.java b/websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/distribute/RedisMessageListenerInitializer.java similarity index 95% rename from websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/distribute/RedisMessageListenerInitializer.java rename to websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/distribute/RedisMessageListenerInitializer.java index 9cd6e2f6e..704adaf52 100644 --- a/websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/distribute/RedisMessageListenerInitializer.java +++ b/websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/distribute/RedisMessageListenerInitializer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.websocket.distribute; +package org.ballcat.websocket.distribute; import lombok.RequiredArgsConstructor; import org.springframework.data.redis.listener.PatternTopic; diff --git a/websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/distribute/RocketmqMessageDistributor.java b/websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/distribute/RocketmqMessageDistributor.java similarity index 92% rename from websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/distribute/RocketmqMessageDistributor.java rename to websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/distribute/RocketmqMessageDistributor.java index ab9f8a8d7..658111d24 100644 --- a/websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/distribute/RocketmqMessageDistributor.java +++ b/websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/distribute/RocketmqMessageDistributor.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.websocket.distribute; +package org.ballcat.websocket.distribute; -import com.hccake.ballcat.common.util.JsonUtils; -import com.hccake.ballcat.common.websocket.exception.ErrorJsonMessageException; -import com.hccake.ballcat.common.websocket.session.WebSocketSessionStore; +import org.ballcat.common.util.JsonUtils; +import org.ballcat.websocket.exception.ErrorJsonMessageException; +import org.ballcat.websocket.session.WebSocketSessionStore; import lombok.extern.slf4j.Slf4j; import org.apache.rocketmq.client.producer.SendResult; import org.apache.rocketmq.common.message.MessageExt; diff --git a/websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/exception/ErrorJsonMessageException.java b/websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/exception/ErrorJsonMessageException.java similarity index 93% rename from websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/exception/ErrorJsonMessageException.java rename to websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/exception/ErrorJsonMessageException.java index e5e6581aa..c3856f96e 100644 --- a/websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/exception/ErrorJsonMessageException.java +++ b/websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/exception/ErrorJsonMessageException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.websocket.exception; +package org.ballcat.websocket.exception; /** * 错误的 json 消息 diff --git a/websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/handler/ConcurrentWebSocketSessionOptions.java b/websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/handler/ConcurrentWebSocketSessionOptions.java similarity index 96% rename from websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/handler/ConcurrentWebSocketSessionOptions.java rename to websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/handler/ConcurrentWebSocketSessionOptions.java index a5d391714..5770218a8 100644 --- a/websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/handler/ConcurrentWebSocketSessionOptions.java +++ b/websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/handler/ConcurrentWebSocketSessionOptions.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.websocket.handler; +package org.ballcat.websocket.handler; import lombok.Data; import org.springframework.web.socket.handler.ConcurrentWebSocketSessionDecorator; diff --git a/websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/handler/CustomWebSocketHandler.java b/websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/handler/CustomWebSocketHandler.java similarity index 93% rename from websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/handler/CustomWebSocketHandler.java rename to websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/handler/CustomWebSocketHandler.java index b1a2c68ad..c032b2bea 100644 --- a/websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/handler/CustomWebSocketHandler.java +++ b/websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/handler/CustomWebSocketHandler.java @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.websocket.handler; +package org.ballcat.websocket.handler; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.json.JsonReadFeature; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.hccake.ballcat.common.websocket.exception.ErrorJsonMessageException; -import com.hccake.ballcat.common.websocket.holder.JsonMessageHandlerHolder; -import com.hccake.ballcat.common.websocket.message.JsonWebSocketMessage; +import org.ballcat.websocket.exception.ErrorJsonMessageException; +import org.ballcat.websocket.holder.JsonMessageHandlerHolder; +import org.ballcat.websocket.message.JsonWebSocketMessage; import lombok.extern.slf4j.Slf4j; import org.springframework.web.socket.TextMessage; import org.springframework.web.socket.WebSocketSession; diff --git a/websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/handler/JsonMessageHandler.java b/websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/handler/JsonMessageHandler.java similarity index 90% rename from websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/handler/JsonMessageHandler.java rename to websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/handler/JsonMessageHandler.java index 3b938bf36..744f53729 100644 --- a/websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/handler/JsonMessageHandler.java +++ b/websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/handler/JsonMessageHandler.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.websocket.handler; +package org.ballcat.websocket.handler; -import com.hccake.ballcat.common.websocket.message.JsonWebSocketMessage; +import org.ballcat.websocket.message.JsonWebSocketMessage; import org.springframework.web.socket.WebSocketSession; /** diff --git a/websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/handler/PingJsonMessageHandler.java b/websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/handler/PingJsonMessageHandler.java similarity index 75% rename from websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/handler/PingJsonMessageHandler.java rename to websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/handler/PingJsonMessageHandler.java index f6f10de37..5678c2729 100644 --- a/websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/handler/PingJsonMessageHandler.java +++ b/websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/handler/PingJsonMessageHandler.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.websocket.handler; +package org.ballcat.websocket.handler; -import com.hccake.ballcat.common.websocket.WebSocketMessageSender; -import com.hccake.ballcat.common.websocket.message.JsonWebSocketMessage; -import com.hccake.ballcat.common.websocket.message.PingJsonWebSocketMessage; -import com.hccake.ballcat.common.websocket.message.PongJsonWebSocketMessage; -import com.hccake.ballcat.common.websocket.message.WebSocketMessageTypeEnum; +import org.ballcat.websocket.WebSocketMessageSender; +import org.ballcat.websocket.message.JsonWebSocketMessage; +import org.ballcat.websocket.message.PingJsonWebSocketMessage; +import org.ballcat.websocket.message.PongJsonWebSocketMessage; +import org.ballcat.websocket.message.WebSocketMessageTypeEnum; import org.springframework.web.socket.WebSocketSession; /** diff --git a/websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/handler/PlanTextMessageHandler.java b/websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/handler/PlanTextMessageHandler.java similarity index 89% rename from websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/handler/PlanTextMessageHandler.java rename to websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/handler/PlanTextMessageHandler.java index 9bed21165..6602fbe74 100644 --- a/websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/handler/PlanTextMessageHandler.java +++ b/websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/handler/PlanTextMessageHandler.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.websocket.handler; +package org.ballcat.websocket.handler; -import com.hccake.ballcat.common.websocket.message.JsonWebSocketMessage; +import org.ballcat.websocket.message.JsonWebSocketMessage; import org.springframework.web.socket.WebSocketSession; /** diff --git a/websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/holder/JsonMessageHandlerHolder.java b/websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/holder/JsonMessageHandlerHolder.java similarity index 86% rename from websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/holder/JsonMessageHandlerHolder.java rename to websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/holder/JsonMessageHandlerHolder.java index c325e515b..eeda72797 100644 --- a/websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/holder/JsonMessageHandlerHolder.java +++ b/websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/holder/JsonMessageHandlerHolder.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.websocket.holder; +package org.ballcat.websocket.holder; -import com.hccake.ballcat.common.websocket.handler.JsonMessageHandler; -import com.hccake.ballcat.common.websocket.message.JsonWebSocketMessage; +import org.ballcat.websocket.handler.JsonMessageHandler; +import org.ballcat.websocket.message.JsonWebSocketMessage; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/holder/JsonMessageHandlerInitializer.java b/websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/holder/JsonMessageHandlerInitializer.java similarity index 87% rename from websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/holder/JsonMessageHandlerInitializer.java rename to websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/holder/JsonMessageHandlerInitializer.java index 16124b6ec..79074cb2d 100644 --- a/websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/holder/JsonMessageHandlerInitializer.java +++ b/websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/holder/JsonMessageHandlerInitializer.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.websocket.holder; +package org.ballcat.websocket.holder; -import com.hccake.ballcat.common.websocket.handler.JsonMessageHandler; -import com.hccake.ballcat.common.websocket.message.JsonWebSocketMessage; +import org.ballcat.websocket.handler.JsonMessageHandler; +import org.ballcat.websocket.message.JsonWebSocketMessage; import lombok.RequiredArgsConstructor; import javax.annotation.PostConstruct; diff --git a/websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/message/JsonWebSocketMessage.java b/websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/message/JsonWebSocketMessage.java similarity index 95% rename from websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/message/JsonWebSocketMessage.java rename to websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/message/JsonWebSocketMessage.java index 0c6d160cb..ec3e25802 100644 --- a/websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/message/JsonWebSocketMessage.java +++ b/websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/message/JsonWebSocketMessage.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.websocket.message; +package org.ballcat.websocket.message; /** *

diff --git a/websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/message/PingJsonWebSocketMessage.java b/websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/message/PingJsonWebSocketMessage.java similarity index 93% rename from websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/message/PingJsonWebSocketMessage.java rename to websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/message/PingJsonWebSocketMessage.java index 64da17dfa..73663e6e7 100644 --- a/websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/message/PingJsonWebSocketMessage.java +++ b/websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/message/PingJsonWebSocketMessage.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.websocket.message; +package org.ballcat.websocket.message; /** * @author Hccake 2021/1/4 diff --git a/websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/message/PongJsonWebSocketMessage.java b/websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/message/PongJsonWebSocketMessage.java similarity index 93% rename from websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/message/PongJsonWebSocketMessage.java rename to websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/message/PongJsonWebSocketMessage.java index b99cfedd6..9caf26ea0 100644 --- a/websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/message/PongJsonWebSocketMessage.java +++ b/websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/message/PongJsonWebSocketMessage.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.websocket.message; +package org.ballcat.websocket.message; /** * @author Hccake 2021/1/4 diff --git a/websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/message/WebSocketMessageTypeEnum.java b/websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/message/WebSocketMessageTypeEnum.java similarity index 94% rename from websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/message/WebSocketMessageTypeEnum.java rename to websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/message/WebSocketMessageTypeEnum.java index 8d67e6e8c..081531547 100644 --- a/websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/message/WebSocketMessageTypeEnum.java +++ b/websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/message/WebSocketMessageTypeEnum.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.websocket.message; +package org.ballcat.websocket.message; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/session/DefaultWebSocketSessionStore.java b/websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/session/DefaultWebSocketSessionStore.java similarity index 98% rename from websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/session/DefaultWebSocketSessionStore.java rename to websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/session/DefaultWebSocketSessionStore.java index 0fb6850f2..8a601489d 100644 --- a/websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/session/DefaultWebSocketSessionStore.java +++ b/websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/session/DefaultWebSocketSessionStore.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.websocket.session; +package org.ballcat.websocket.session; import lombok.extern.slf4j.Slf4j; import org.springframework.web.socket.WebSocketSession; diff --git a/websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/session/MapSessionWebSocketHandlerDecorator.java b/websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/session/MapSessionWebSocketHandlerDecorator.java similarity index 93% rename from websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/session/MapSessionWebSocketHandlerDecorator.java rename to websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/session/MapSessionWebSocketHandlerDecorator.java index 9c79ddc59..1d08c9794 100644 --- a/websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/session/MapSessionWebSocketHandlerDecorator.java +++ b/websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/session/MapSessionWebSocketHandlerDecorator.java @@ -13,17 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.websocket.session; +package org.ballcat.websocket.session; -import com.hccake.ballcat.common.websocket.handler.ConcurrentWebSocketSessionOptions; +import org.ballcat.websocket.handler.ConcurrentWebSocketSessionOptions; import org.springframework.web.socket.CloseStatus; import org.springframework.web.socket.WebSocketHandler; import org.springframework.web.socket.WebSocketSession; import org.springframework.web.socket.handler.ConcurrentWebSocketSessionDecorator; import org.springframework.web.socket.handler.WebSocketHandlerDecorator; -import java.io.IOException; - /** * WebSocketHandler 装饰器，该装饰器主要用于在开启和关闭连接时，进行session的映射存储与释放 * diff --git a/websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/session/SessionKeyGenerator.java b/websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/session/SessionKeyGenerator.java similarity index 94% rename from websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/session/SessionKeyGenerator.java rename to websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/session/SessionKeyGenerator.java index b765d2ad5..7d165c73a 100644 --- a/websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/session/SessionKeyGenerator.java +++ b/websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/session/SessionKeyGenerator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.websocket.session; +package org.ballcat.websocket.session; import org.springframework.web.socket.WebSocketSession; diff --git a/websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/session/WebSocketSessionStore.java b/websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/session/WebSocketSessionStore.java similarity index 96% rename from websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/session/WebSocketSessionStore.java rename to websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/session/WebSocketSessionStore.java index 63b8d44f4..9716de8f5 100644 --- a/websocket/ballcat-websocket/src/main/java/com/hccake/ballcat/common/websocket/session/WebSocketSessionStore.java +++ b/websocket/ballcat-websocket/src/main/java/org/ballcat/websocket/session/WebSocketSessionStore.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.websocket.session; +package org.ballcat.websocket.session; import org.springframework.web.socket.WebSocketSession; diff --git a/xss/ballcat-spring-boot-starter-xss/src/main/java/com/hccake/ballcat/common/xss/XssAutoConfiguration.java b/xss/ballcat-spring-boot-starter-xss/src/main/java/org/ballcat/xss/XssAutoConfiguration.java similarity index 89% rename from xss/ballcat-spring-boot-starter-xss/src/main/java/com/hccake/ballcat/common/xss/XssAutoConfiguration.java rename to xss/ballcat-spring-boot-starter-xss/src/main/java/org/ballcat/xss/XssAutoConfiguration.java index 3404b04ca..6ae817356 100644 --- a/xss/ballcat-spring-boot-starter-xss/src/main/java/com/hccake/ballcat/common/xss/XssAutoConfiguration.java +++ b/xss/ballcat-spring-boot-starter-xss/src/main/java/org/ballcat/xss/XssAutoConfiguration.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.xss; +package org.ballcat.xss; import com.fasterxml.jackson.databind.ObjectMapper; -import com.hccake.ballcat.common.xss.cleaner.JsoupXssCleaner; -import com.hccake.ballcat.common.xss.cleaner.XssCleaner; -import com.hccake.ballcat.common.xss.config.XssProperties; -import com.hccake.ballcat.common.xss.core.XssFilter; -import com.hccake.ballcat.common.xss.core.XssStringJsonDeserializer; +import org.ballcat.xss.cleaner.JsoupXssCleaner; +import org.ballcat.xss.cleaner.XssCleaner; +import org.ballcat.xss.config.XssProperties; +import org.ballcat.xss.core.XssFilter; +import org.ballcat.xss.core.XssStringJsonDeserializer; import lombok.extern.slf4j.Slf4j; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; diff --git a/xss/ballcat-spring-boot-starter-xss/src/main/java/com/hccake/ballcat/common/xss/cleaner/JsoupXssCleaner.java b/xss/ballcat-spring-boot-starter-xss/src/main/java/org/ballcat/xss/cleaner/JsoupXssCleaner.java similarity index 98% rename from xss/ballcat-spring-boot-starter-xss/src/main/java/com/hccake/ballcat/common/xss/cleaner/JsoupXssCleaner.java rename to xss/ballcat-spring-boot-starter-xss/src/main/java/org/ballcat/xss/cleaner/JsoupXssCleaner.java index 33926c839..95677b1df 100644 --- a/xss/ballcat-spring-boot-starter-xss/src/main/java/com/hccake/ballcat/common/xss/cleaner/JsoupXssCleaner.java +++ b/xss/ballcat-spring-boot-starter-xss/src/main/java/org/ballcat/xss/cleaner/JsoupXssCleaner.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.xss.cleaner; +package org.ballcat.xss.cleaner; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; diff --git a/xss/ballcat-spring-boot-starter-xss/src/main/java/com/hccake/ballcat/common/xss/cleaner/XssCleaner.java b/xss/ballcat-spring-boot-starter-xss/src/main/java/org/ballcat/xss/cleaner/XssCleaner.java similarity index 94% rename from xss/ballcat-spring-boot-starter-xss/src/main/java/com/hccake/ballcat/common/xss/cleaner/XssCleaner.java rename to xss/ballcat-spring-boot-starter-xss/src/main/java/org/ballcat/xss/cleaner/XssCleaner.java index e92392f97..e2a01e9f7 100644 --- a/xss/ballcat-spring-boot-starter-xss/src/main/java/com/hccake/ballcat/common/xss/cleaner/XssCleaner.java +++ b/xss/ballcat-spring-boot-starter-xss/src/main/java/org/ballcat/xss/cleaner/XssCleaner.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.xss.cleaner; +package org.ballcat.xss.cleaner; /** * 对 html 文本中的有 Xss 风险的数据进行清理 diff --git a/xss/ballcat-spring-boot-starter-xss/src/main/java/com/hccake/ballcat/common/xss/config/XssProperties.java b/xss/ballcat-spring-boot-starter-xss/src/main/java/org/ballcat/xss/config/XssProperties.java similarity index 97% rename from xss/ballcat-spring-boot-starter-xss/src/main/java/com/hccake/ballcat/common/xss/config/XssProperties.java rename to xss/ballcat-spring-boot-starter-xss/src/main/java/org/ballcat/xss/config/XssProperties.java index b2fedfc98..84275ec44 100644 --- a/xss/ballcat-spring-boot-starter-xss/src/main/java/com/hccake/ballcat/common/xss/config/XssProperties.java +++ b/xss/ballcat-spring-boot-starter-xss/src/main/java/org/ballcat/xss/config/XssProperties.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.xss.config; +package org.ballcat.xss.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/xss/ballcat-spring-boot-starter-xss/src/main/java/com/hccake/ballcat/common/xss/core/XssFilter.java b/xss/ballcat-spring-boot-starter-xss/src/main/java/org/ballcat/xss/core/XssFilter.java similarity index 94% rename from xss/ballcat-spring-boot-starter-xss/src/main/java/com/hccake/ballcat/common/xss/core/XssFilter.java rename to xss/ballcat-spring-boot-starter-xss/src/main/java/org/ballcat/xss/core/XssFilter.java index 000d558c1..25011c143 100644 --- a/xss/ballcat-spring-boot-starter-xss/src/main/java/com/hccake/ballcat/common/xss/core/XssFilter.java +++ b/xss/ballcat-spring-boot-starter-xss/src/main/java/org/ballcat/xss/core/XssFilter.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.xss.core; +package org.ballcat.xss.core; import cn.hutool.core.text.CharSequenceUtil; -import com.hccake.ballcat.common.xss.cleaner.XssCleaner; -import com.hccake.ballcat.common.xss.config.XssProperties; +import org.ballcat.xss.cleaner.XssCleaner; +import org.ballcat.xss.config.XssProperties; import lombok.RequiredArgsConstructor; import org.springframework.util.AntPathMatcher; import org.springframework.web.filter.OncePerRequestFilter; diff --git a/xss/ballcat-spring-boot-starter-xss/src/main/java/com/hccake/ballcat/common/xss/core/XssRequestWrapper.java b/xss/ballcat-spring-boot-starter-xss/src/main/java/org/ballcat/xss/core/XssRequestWrapper.java similarity index 96% rename from xss/ballcat-spring-boot-starter-xss/src/main/java/com/hccake/ballcat/common/xss/core/XssRequestWrapper.java rename to xss/ballcat-spring-boot-starter-xss/src/main/java/org/ballcat/xss/core/XssRequestWrapper.java index 41c88c8c9..6f8c6856f 100644 --- a/xss/ballcat-spring-boot-starter-xss/src/main/java/com/hccake/ballcat/common/xss/core/XssRequestWrapper.java +++ b/xss/ballcat-spring-boot-starter-xss/src/main/java/org/ballcat/xss/core/XssRequestWrapper.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.xss.core; +package org.ballcat.xss.core; -import com.hccake.ballcat.common.xss.cleaner.XssCleaner; +import org.ballcat.xss.cleaner.XssCleaner; import lombok.extern.slf4j.Slf4j; import javax.servlet.http.HttpServletRequest; diff --git a/xss/ballcat-spring-boot-starter-xss/src/main/java/com/hccake/ballcat/common/xss/core/XssStateHolder.java b/xss/ballcat-spring-boot-starter-xss/src/main/java/org/ballcat/xss/core/XssStateHolder.java similarity index 96% rename from xss/ballcat-spring-boot-starter-xss/src/main/java/com/hccake/ballcat/common/xss/core/XssStateHolder.java rename to xss/ballcat-spring-boot-starter-xss/src/main/java/org/ballcat/xss/core/XssStateHolder.java index 0bd579706..d32ac53c5 100644 --- a/xss/ballcat-spring-boot-starter-xss/src/main/java/com/hccake/ballcat/common/xss/core/XssStateHolder.java +++ b/xss/ballcat-spring-boot-starter-xss/src/main/java/org/ballcat/xss/core/XssStateHolder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.xss.core; +package org.ballcat.xss.core; /** * Xss状态持有者 diff --git a/xss/ballcat-spring-boot-starter-xss/src/main/java/com/hccake/ballcat/common/xss/core/XssStringJsonDeserializer.java b/xss/ballcat-spring-boot-starter-xss/src/main/java/org/ballcat/xss/core/XssStringJsonDeserializer.java similarity index 96% rename from xss/ballcat-spring-boot-starter-xss/src/main/java/com/hccake/ballcat/common/xss/core/XssStringJsonDeserializer.java rename to xss/ballcat-spring-boot-starter-xss/src/main/java/org/ballcat/xss/core/XssStringJsonDeserializer.java index 9dd5a310a..829d16962 100644 --- a/xss/ballcat-spring-boot-starter-xss/src/main/java/com/hccake/ballcat/common/xss/core/XssStringJsonDeserializer.java +++ b/xss/ballcat-spring-boot-starter-xss/src/main/java/org/ballcat/xss/core/XssStringJsonDeserializer.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.xss.core; +package org.ballcat.xss.core; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.deser.std.StringDeserializer; -import com.hccake.ballcat.common.xss.cleaner.XssCleaner; +import org.ballcat.xss.cleaner.XssCleaner; import lombok.extern.slf4j.Slf4j; import java.io.IOException; diff --git a/xss/ballcat-spring-boot-starter-xss/src/main/java/com/hccake/ballcat/common/xss/core/XssStringJsonSerializer.java b/xss/ballcat-spring-boot-starter-xss/src/main/java/org/ballcat/xss/core/XssStringJsonSerializer.java similarity index 93% rename from xss/ballcat-spring-boot-starter-xss/src/main/java/com/hccake/ballcat/common/xss/core/XssStringJsonSerializer.java rename to xss/ballcat-spring-boot-starter-xss/src/main/java/org/ballcat/xss/core/XssStringJsonSerializer.java index 5db8011a2..a5fd76bf8 100644 --- a/xss/ballcat-spring-boot-starter-xss/src/main/java/com/hccake/ballcat/common/xss/core/XssStringJsonSerializer.java +++ b/xss/ballcat-spring-boot-starter-xss/src/main/java/org/ballcat/xss/core/XssStringJsonSerializer.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.hccake.ballcat.common.xss.core; +package org.ballcat.xss.core; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; -import com.hccake.ballcat.common.xss.cleaner.XssCleaner; +import org.ballcat.xss.cleaner.XssCleaner; import java.io.IOException; diff --git a/xss/ballcat-spring-boot-starter-xss/src/main/resources/META-INF/spring.factories b/xss/ballcat-spring-boot-starter-xss/src/main/resources/META-INF/spring.factories index a1f29d1e9..a6974f117 100644 --- a/xss/ballcat-spring-boot-starter-xss/src/main/resources/META-INF/spring.factories +++ b/xss/ballcat-spring-boot-starter-xss/src/main/resources/META-INF/spring.factories @@ -1,3 +1,3 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.hccake.ballcat.common.xss.XssAutoConfiguration + org.ballcat.xss.XssAutoConfiguration diff --git a/xss/ballcat-spring-boot-starter-xss/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/xss/ballcat-spring-boot-starter-xss/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 4edff74cf..d2e39ae7d 100644 --- a/xss/ballcat-spring-boot-starter-xss/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/xss/ballcat-spring-boot-starter-xss/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1 @@ -com.hccake.ballcat.common.xss.XssAutoConfiguration \ No newline at end of file +org.ballcat.xss.XssAutoConfiguration \ No newline at end of file