From fd9ea8ccc52bfab3dcbd4c872b30afe33f73b8c0 Mon Sep 17 00:00:00 2001 From: guoyuanlu Date: Tue, 29 Oct 2024 17:25:45 +0800 Subject: [PATCH 1/3] update --- eden-components/eden-dependencies/pom.xml | 54 ++++---- .../pom.xml | 2 +- .../org/ylzl/eden/common/cache/Cache.java | 0 .../org/ylzl/eden/common/cache/CacheType.java | 0 .../org/ylzl/eden/common/cache/L1Cache.java | 0 .../org/ylzl/eden/common/cache/L2Cache.java | 0 .../cache/builder/AbstractCacheBuilder.java | 0 .../cache/builder/AsyncCacheBuilder.java | 0 .../common/cache/builder/CacheBuilder.java | 0 .../cache/composite/CompositeCache.java | 0 .../composite/CompositeCacheBuilder.java | 0 .../eden/common/cache/config/CacheConfig.java | 0 .../common/cache/config/package-info.java | 0 .../exception/TryLockFailedException.java | 0 .../exception/ValueRetrievalException.java | 0 .../common/cache/exception/package-info.java | 0 .../cache/extension/CacheLoadingStrategy.java | 0 .../common/cache/extension/package-info.java | 0 .../ylzl/eden/common/cache/hotkey/HotKey.java | 0 .../eden/common/cache/hotkey/HotKeyType.java | 0 .../common/cache/hotkey/package-info.java | 0 .../consistency/kafka/package-info.java | 0 .../integration/consistency/package-info.java | 0 .../consistency/redis/package-info.java | 0 .../consistency/rocketmq/package-info.java | 0 .../cache/integration/hotkey/jd/JdHotKey.java | 0 .../integration/hotkey/jd/JdHotKeyClient.java | 0 .../integration/hotkey/jd/package-info.java | 0 .../integration/hotkey/package-info.java | 0 .../ApolloSentinelHotKeyDataSource.java | 0 .../EtcdSentinelHotKeyDataSource.java | 0 .../NacosSentinelHotKeyDataSource.java | 0 .../hotkey/sentinel/SentinelHotKey.java | 0 .../hotkey/sentinel/SentinelHotKeyClient.java | 0 .../sentinel/SentinelHotKeyDataSource.java | 0 .../ZookeeperSentinelHotKeyDataSource.java | 0 .../hotkey/sentinel/package-info.java | 0 .../l1cache/caffeine/CaffeineCache.java | 0 .../caffeine/CaffeineCacheBuilder.java | 0 .../l1cache/caffeine/package-info.java | 0 .../integration/l1cache/guava/GuavaCache.java | 0 .../l1cache/guava/GuavaCacheBuilder.java | 0 .../l1cache/guava/package-info.java | 0 .../integration/l1cache/package-info.java | 0 .../l2cache/dragonfly/package-info.java | 0 .../integration/l2cache/package-info.java | 0 .../integration/l2cache/redis/RedisCache.java | 0 .../l2cache/redis/RedisCacheBuilder.java | 0 .../l2cache/redis/package-info.java | 0 .../cache/l1cache/AsyncL1CacheLoader.java | 0 .../l1cache/AsyncL1CacheRemovalListener.java | 0 .../InternalL1CacheRemovalListener.java | 0 .../common/cache/l1cache/L1CacheLoader.java | 0 .../cache/l1cache/L1CacheRemovalCause.java | 0 .../cache/l1cache/L1CacheRemovalListener.java | 0 .../common/cache/l1cache/package-info.java | 0 .../cache/l2cache/CacheSyncListener.java | 0 .../common/cache/l2cache/CacheSyncType.java | 0 .../cache/l2cache/CacheSynchronizer.java | 0 .../cache/l2cache/model/CacheMessage.java | 0 .../common/cache/l2cache/package-info.java | 0 .../ylzl/eden/common/cache/package-info.java | 0 .../cache/support/AbstractAdaptingCache.java | 0 .../cache/support/spring/DynamicCache.java | 0 .../support/spring/DynamicCacheManager.java | 0 .../common/cache/support/value/NullValue.java | 0 .../cache/support/value/package-info.java | 0 ...zl.eden.dynamic.cache.builder.CacheBuilder | 0 .../org.ylzl.eden.dynamic.cache.hotkey.HotKey | 0 ...n.hotkey.sentinel.SentinelHotKeyDataSource | 0 ...namic.cache.l1cache.L1CacheRemovalListener | 0 ...zl.eden.extension.strategy.LoadingStrategy | 0 .../src/test/java}/.gitkeep | 0 .../src/test/resources/.gitkeep | 0 .../pom.xml | 2 +- .../ylzl/eden/common/excel/ExcelExporter.java | 0 .../ylzl/eden/common/excel/ExcelImporter.java | 0 .../org/ylzl/eden/common/excel/ExcelLine.java | 0 .../ylzl/eden/common/excel/ExcelReader.java | 0 .../org/ylzl/eden/common/excel/ExcelType.java | 0 .../ylzl/eden/common/excel/ExcelWriter.java | 0 .../eden/common/excel/aop/package-info.java | 0 .../builder/AbstractExcelReaderBuilder.java | 0 .../builder/AbstractExcelWriterBuilder.java | 0 .../excel/builder/ExcelReaderBuilder.java | 0 .../excel/builder/ExcelWriterBuilder.java | 0 .../common/excel/builder/package-info.java | 0 .../eden/common/excel/config/ExcelConfig.java | 0 .../common/excel/config/package-info.java | 0 .../common/excel/exception/package-info.java | 0 .../excel/exporter/ExcelExportHandler.java | 0 .../common/excel/exporter/package-info.java | 0 .../excel/extension/ExcelLoadingStrategy.java | 0 .../common/excel/extension/package-info.java | 0 .../excel/importer/ExcelImportHandler.java | 0 .../common/excel/importer/package-info.java | 0 .../easyexcel/EasyExcelReader.java | 0 .../easyexcel/EasyExcelReaderBuilder.java | 0 .../easyexcel/EasyExcelWriter.java | 0 .../easyexcel/EasyExcelWriterBuilder.java | 0 .../converter/LocalDateConverter.java | 0 .../converter/LocalDateTimeConverter.java | 0 .../easyexcel/converter/SexConverter.java | 0 .../easyexcel/i18n/I18nCellWriteHandler.java | 0 .../integration/easyexcel/package-info.java | 0 .../integration/easypoi/package-info.java | 0 .../excel/integration/package-info.java | 0 .../common/excel/model/ValidationErrors.java | 0 .../ylzl/eden/common/excel/package-info.java | 0 .../excel/reader/ExcelReadListener.java | 0 .../reader/PersistenceExcelReadListener.java | 0 .../common/excel/reader/package-info.java | 0 .../common/excel/support/ExcelHelper.java | 0 .../common/excel/support/package-info.java | 0 .../writer/AbstractExcelWriteHandler.java | 0 .../excel/writer/ExcelWriteHandler.java | 0 .../common/excel/writer/ExcelWriteMeta.java | 0 .../common/excel/writer/package-info.java | 0 .../eden/common/excel/writer/sheet/Sheet.java | 0 .../common/excel/writer/sheet/SheetHead.java | 0 .../writer/sheet/SheetHeadGenerator.java | 0 .../excel/writer/sheet/package-info.java | 0 ...en.common.excel.builder.ExcelReaderBuilder | 0 ...en.common.excel.builder.ExcelWriterBuilder | 0 ...zl.eden.extension.strategy.LoadingStrategy | 0 .../eden/common/excel/ExcelReaderTest.groovy | 0 .../eden/common/excel/ExcelWriterTest.groovy | 0 .../org/ylzl/eden/common/excel/TestCase.java | 0 .../src/test/resources/test/test-case.xlsx | Bin .../pom.xml | 2 +- .../ylzl/eden/common/mail/MailTemplate.java | 0 .../org/ylzl/eden/common/mail/MailType.java | 0 .../mail/exception/MailServerException.java | 0 .../exception/MailServerTimeoutException.java | 0 .../mail/exception/SendMailException.java | 0 .../common/mail/exception/package-info.java | 0 .../javamail/JavaMailTemplate.java | 0 .../integration/javamail/package-info.java | 0 .../common/mail/integration/package-info.java | 0 .../org/ylzl/eden/common/mail/model/Mail.java | 0 .../model/multi/MultiSendMailRequest.java | 0 .../model/multi/MultiSendMailResponse.java | 0 .../eden/common/mail/model/package-info.java | 0 .../model/single/SingleSendMailRequest.java | 0 .../model/single/SingleSendMailResponse.java | 0 .../ylzl/eden/common/mail/package-info.java | 0 .../src/main/resources}/.gitkeep | 0 .../src/test/java}/.gitkeep | 0 .../src/test}/resources/.gitkeep | 0 .../pom.xml | 2 +- .../eden/common/mq/MessageQueueConsumer.java | 0 .../eden/common/mq/MessageQueueListener.java | 0 .../eden/common/mq/MessageQueueProvider.java | 0 .../ylzl/eden/common/mq/MessageQueueType.java | 0 .../common/mq/consumer/Acknowledgement.java | 0 .../eden/common/mq/consumer/ConsumeMode.java | 0 .../mq/consumer/MessageConsumeException.java | 0 .../mq/consumer/MessageConsumeMode.java | 0 .../eden/common/mq/consumer/MessageModel.java | 0 .../mq/consumer/MessageSelectorType.java | 0 .../mq/integration/kafka/KafkaConsumer.java | 0 .../mq/integration/kafka/KafkaProvider.java | 0 .../mq/integration/kafka/package-info.java | 0 .../rocketmq/RocketMQConsumer.java | 0 .../rocketmq/RocketMQProvider.java | 0 .../rocketmq/config/RocketMQConfig.java | 0 .../mq/integration/rocketmq/package-info.java | 0 .../ylzl/eden/common/mq/model/Message.java | 0 .../org/ylzl/eden/common/mq/package-info.java | 0 .../mq/producer/MessageSendCallback.java | 0 .../mq/producer/MessageSendException.java | 0 .../common/mq/producer/MessageSendResult.java | 0 .../src/main/resources}/.gitkeep | 0 .../src/test/java}/.gitkeep | 0 .../src/test}/resources/.gitkeep | 0 .../pom.xml | 2 +- .../eden/common/security/Authentication.java | 0 .../common/security/GrantedAuthority.java | 0 .../common/security/aop/package-info.java | 0 .../common/security/builder/package-info.java | 0 .../exception/InvalidPasswordException.java | 0 .../exception/UserNotActivatedException.java | 0 .../exception/UserNotFoundException.java | 0 .../security/homologous/package-info.java | 0 .../security/integration/package-info.java | 0 .../common/security/model/package-info.java | 0 .../eden/common/security/package-info.java | 0 .../src/main/resources}/.gitkeep | 0 .../src/test/java}/.gitkeep | 0 .../src/test}/resources/.gitkeep | 0 .../pom.xml | 2 +- .../org/ylzl/eden/common/sms/SmsTemplate.java | 0 .../org/ylzl/eden/common/sms/SmsType.java | 0 .../sms/exception/SendSmsException.java | 0 .../sms/exception/SmsServerException.java | 0 .../exception/SmsServerTimeoutException.java | 0 .../org/ylzl/eden/common/sms/model/Sms.java | 0 .../sms/model/batch/BatchSendSmsRequest.java | 0 .../sms/model/batch/BatchSendSmsResponse.java | 0 .../sms/model/multi/MultiSendSmsRequest.java | 0 .../sms/model/multi/MultiSendSmsResponse.java | 0 .../model/single/SingleSendSmsRequest.java | 0 .../model/single/SingleSendSmsResponse.java | 0 .../template/SendTemplateSmsRequest.java | 0 .../template/SendTemplateSmsResponse.java | 0 .../ylzl/eden/common/sms/package-info.java | 0 .../src/main/resources}/.gitkeep | 0 .../src/test/java}/.gitkeep | 0 .../src/test}/resources/.gitkeep | 0 .../differ/objectdiffer/package-info.java | 1 - .../integration/differ/package-info.java | 17 --- .../masker/fastjson/package-info.java | 17 --- .../masker/fastjson2/package-info.java | 17 --- .../masker/jackson/package-info.java | 17 --- .../integration/masker/package-info.java | 17 --- .../auditor/integration/package-info.java | 17 --- .../auditor/support/DataMaskerStrategy.java | 51 -------- .../org.ylzl.eden.data.auditor.DataMasker | 11 -- ...den.data.auditor.builder.DataDifferBuilder | 2 - ...den.data.auditor.builder.DataMaskerBuilder | 3 - ...ing.framework.json.fastjson.FastjsonFilter | 1 - ...g.framework.json.fastjson2.Fastjson2Filter | 1 - .../pom.xml | 6 +- .../org/ylzl/eden/data}/differ/Change.java | 2 +- .../ylzl/eden/data}/differ/ChangeType.java | 2 +- .../ylzl/eden/data/differ}/DataDiffer.java | 4 +- .../java/org/ylzl/eden/data}/differ/Diff.java | 2 +- .../builder/AbstractDataDifferBuilder.java | 4 +- .../differ}/builder/DataDifferBuilder.java | 6 +- .../data/differ/builder}/package-info.java | 2 +- .../data/differ}/config/DataDifferConfig.java | 2 +- .../data/differ}/config/package-info.java | 2 +- .../extension/DataDifferLoadingStrategy.java} | 8 +- .../data/differ/extension}/package-info.java | 2 +- .../integration}/javers/JaversDataDiffer.java | 10 +- .../javers/JaversDataDifferBuilder.java | 6 +- .../objectdiffer/ObjectDifferDataDiffer.java | 6 +- .../ObjectDifferDataDifferBuilder.java | 6 +- .../objectdiffer/package-info.java | 1 + .../differ/integration}/package-info.java | 2 +- .../ylzl/eden/data/differ}/package-info.java | 2 +- .../differ}/support/DataDifferHelper.java | 6 +- ...eden.data.differ.builder.DataDifferBuilder | 2 + ...zl.eden.extension.strategy.LoadingStrategy | 2 +- .../eden/data/differ}/DataDifferTest.groovy | 4 +- .../org/ylzl/eden/data/differ}/TestCase.java | 3 +- .../ylzl/eden/data/differ}/package-info.java | 2 +- .../src/test/resources}/.gitkeep | 0 .../eden-data-duplicate/pom.xml | 104 ++++++++++++++++ .../eden/data/duplicate}/DuplicateFilter.java | 2 +- .../AbstractDuplicateFilterBuilder.java | 10 +- .../builder/DuplicateFilterBuilder.java | 8 +- .../config/DuplicateFilterConfig.java} | 4 +- .../data/duplicate}/config/package-info.java | 2 +- .../DuplicateFilterLoadingStrategy.java | 40 ++++++ .../duplicate/extension/package-info.java | 17 +++ .../integration}/bloom/BloomFilter.java | 4 +- .../bloom/BloomFilterBuilder.java | 8 +- .../integration/bloom/package-info.java | 17 +++ .../integration}/cuckoo/CuckooFilter.java | 4 +- .../cuckoo/CuckooFilterBuilder.java | 8 +- .../integration/cuckoo/package-info.java | 17 +++ .../duplicate/integration/package-info.java | 17 +++ .../eden/data/duplicate/package-info.java | 17 +++ ...data.filter.builder.SensitiveFilterBuilder | 0 ...zl.eden.extension.strategy.LoadingStrategy | 17 +++ .../duplicate}/SensitiveFilterTest.groovy | 10 +- .../eden/data/duplicate/package-info.java | 17 +++ .../src/test/resources/.gitkeep | 0 .../builder/AbstractMaskingFilterBuilder.java | 51 -------- .../filter/builder/MaskingFilterBuilder.java | 46 ------- .../data/filter/duplicate/package-info.java | 17 --- .../data/filter/extension/package-info.java | 17 --- .../duplicate/bloom/package-info.java | 17 --- .../duplicate/cuckoo/package-info.java | 17 --- .../integration/duplicate/package-info.java | 17 --- .../integration/masking/package-info.java | 17 --- .../sensitive/ahocorasick/package-info.java | 17 --- .../integration/sensitive/package-info.java | 17 --- .../data/filter/masking/package-info.java | 17 --- .../data/filter/sensitive/package-info.java | 17 --- .../filter/support/MaskingFilterHelper.java | 62 ---------- ...n.data.filter.builder.MaskingFilterBuilder | 1 - ...ng.log4j.core.config.plugins.PluginManager | 1 - .../pom.xml | 45 ++++--- .../ylzl/eden/data/masker}/DataMasker.java | 10 +- .../eden/data}/masker/DataMaskerManager.java | 3 +- .../org/ylzl/eden/data/masker/Masking.java} | 4 +- .../builder/AbstractDataMaskerBuilder.java | 6 +- .../masker}/builder/DataMaskerBuilder.java | 6 +- .../data/masker/builder}/package-info.java | 2 +- .../data/masker/config/DataMaskerConfig.java} | 30 ++++- .../eden/data/masker/config/package-info.java | 17 +++ .../extension/DataMaskerLoadingStrategy.java} | 26 ++-- .../data/masker/extension/package-info.java | 17 +++ .../charsscan/CharsScanDataMasker.java} | 8 +- .../CharsScanDataMaskerBuilder.java} | 14 +-- .../fastjson/FastjsonDataMaskerBuilder.java | 6 +- .../FastjsonDataMaskingValueFilter.java | 12 +- .../FastjsonValueFilterException.java | 2 +- .../integration/fastjson/package-info.java | 17 +++ .../fastjson2/Fastjson2DataMaskerBuilder.java | 6 +- .../Fastjson2DataMaskingValueFilter.java | 12 +- .../Fastjson2ValueFilterException.java | 2 +- .../integration/fastjson2/package-info.java | 17 +++ .../jackson/JacksonDataMaskerBuilder.java | 6 +- ...ksonDataMaskingBeanSerializerModifier.java | 10 +- .../JacksonDataMaskingJsonSerializer.java | 14 +-- .../jackson/JacksonDataMaskingModule.java | 2 +- .../integration/jackson/package-info.java | 17 +++ .../log4j2/DataMaskerStringLayout.java} | 59 ++++----- .../data/masker/integration/package-info.java | 17 +++ .../ylzl/eden/data/masker}/package-info.java | 2 +- .../data}/masker/spi/AddressDataMasker.java | 12 +- .../data}/masker/spi/BankCardDataMasker.java | 12 +- .../masker/spi/CarLicenseDataMasker.java | 12 +- .../masker/spi/ChineseNameDataMasker.java | 12 +- .../data}/masker/spi/EmailDataMasker.java | 12 +- .../data}/masker/spi/IdCardDataMasker.java | 12 +- .../masker/spi/MobilePhoneDataMasker.java | 12 +- .../data}/masker/spi/MoneyDataMasker.java | 10 +- .../data}/masker/spi/PasswordDataMasker.java | 10 +- .../data}/masker/spi/TelephoneDataMasker.java | 12 +- .../data}/masker/spi/UsernameDataMasker.java | 12 +- .../masker}/support/DataMaskerHelper.java | 24 +++- .../masker/support/DataMaskerStrategy.java} | 6 +- .../org.ylzl.eden.data.masker.DataMasker | 11 ++ ...eden.data.masker.builder.DataMaskerBuilder | 4 + ...ing.framework.json.fastjson.FastjsonFilter | 1 + ...g.framework.json.fastjson2.Fastjson2Filter | 1 + ...ng.log4j.core.config.plugins.PluginManager | 1 + ...zl.eden.extension.strategy.LoadingStrategy | 2 +- .../eden/data/masker}/DataMaskerTest.groovy | 7 +- .../data/masker}/DataMaskerBenchmark.java | 2 +- .../org/ylzl/eden/data/masker/TestCase.java} | 35 ++++-- .../ylzl/eden/data/masker}/package-info.java | 2 +- .../src/test/resources}/.gitkeep | 0 .../event/auditor/differ/package-info.java | 17 --- .../eden-sensitive-word/pom.xml | 117 ++++++++++++++++++ .../ylzl/eden/data/sensitive}/Sensitive.java | 4 +- .../eden/data}/sensitive/SensitiveWord.java | 2 +- .../data/sensitive/SensitiveWordFilter.java} | 5 +- .../data}/sensitive/SensitiveWordLoader.java | 2 +- .../sensitive/SensitiveWordStrategy.java | 2 +- .../AbstractSensitiveWordFilterBuilder.java} | 16 +-- .../builder/SensitiveWordFilterBuilder.java} | 16 +-- .../config/SensitiveWordConfig.java} | 4 +- .../data/sensitive/config/package-info.java | 17 +++ .../SensitiveWordLoadingStrategy.java} | 6 +- .../sensitive/extension/package-info.java | 17 +++ .../AhoCorasickSensitiveWordFilter.java} | 8 +- ...hoCorasickSensitiveWordFilterBuilder.java} | 14 +-- .../integration/ahocorasick/package-info.java | 17 +++ .../sensitive/integration/package-info.java | 1 + .../eden/data/sensitive/package-info.java | 17 +++ .../support/SensitiveWordFilterHelper.java} | 18 +-- .../web/SensitiveWordRequestBodyAdvice.java} | 18 +-- ...nsitive.builder.SensitiveWordFilterBuilder | 1 + ...zl.eden.extension.strategy.LoadingStrategy | 17 +++ .../sensitive/SensitiveWordFilterTest.groovy | 71 +++++++++++ .../eden/data/sensitive/package-info.java | 17 +++ .../src/test/resources/.gitkeep | 0 eden-components/eden-solutions/pom.xml | 17 +-- .../eden-cat-spring-boot-starter/pom.xml | 2 +- .../pom.xml | 6 +- .../DynamicCacheAutoConfiguration.java | 0 .../JdHotKeyAutoConfiguration.java | 0 .../SentinelHotKeyAutoConfiguration.java | 0 .../boot/autoconfigure/package-info.java | 0 .../spring/boot/env/CacheProperties.java | 0 .../cache/spring/boot/env/package-info.java | 0 .../cache/spring/boot/package-info.java | 0 .../main/resources/META-INF/spring.factories | 0 .../src/test/java/.gitkeep | 0 .../src/test/resources/.gitkeep | 0 .../pom.xml | 6 +- .../JavaMailAutoConfiguration.java | 0 .../autoconfigure/MailAutoConfiguration.java | 0 .../mail/spring/boot/env/MailProperties.java | 0 .../mail/spring/boot/support/MailHelper.java | 0 .../main/resources/META-INF/spring.factories | 0 .../src/test/java/.gitkeep | 0 .../src/test/resources/.gitkeep | 0 .../pom.xml | 6 +- .../KafkaMessageQueueAutoConfiguration.java | 0 .../MessageQueueAutoConfiguration.java | 0 ...RocketMQMessageQueueAutoConfiguration.java | 0 .../condition/ConditionalOnMessageQueue.java | 0 .../condition/OnMessageQueueCondition.java | 0 .../boot/env/MessageQueueProperties.java | 0 .../boot/env/RocketMQConsumerProperties.java | 0 .../boot/env/RocketMQProducerProperties.java | 0 .../boot/env/convertor/RocketMQConvertor.java | 0 .../boot/support/MessageQueueHelper.java | 0 .../main/resources/META-INF/spring.factories | 0 .../src/test/java/.gitkeep | 0 .../src/test/resources/.gitkeep | 0 .../pom.xml | 6 +- .../autoconfigure/SmsAutoConfiguration.java | 0 .../sms/spring/boot/env/SmsProperties.java | 0 .../sms/spring/boot/support/SmsHelper.java | 0 .../main/resources/META-INF/spring.factories | 0 .../src/test/java/.gitkeep | 3 + .../src/test/resources/.gitkeep | 3 + .../pom.xml | 2 +- .../eden-rocketmq-spring-boot-starter/pom.xml | 2 +- .../admin/AutoRegisterXxlJobExecutor.java | 12 +- .../eden-spring-boot-starters/pom.xml | 8 +- .../dubbo/spring/cloud/local/LocalFilter.java | 28 +++++ .../spring/cloud/local/LocalLoadBalance.java | 37 ++++++ .../dubbo/org.apache.dubbo.rpc.Filter | 1 + .../org.apache.dubbo.rpc.cluster.loadbalance | 1 + .../cat/integration/web/HttpCatFilter.java | 2 +- 413 files changed, 1221 insertions(+), 944 deletions(-) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/pom.xml (98%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/Cache.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/CacheType.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/L1Cache.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/L2Cache.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/builder/AbstractCacheBuilder.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/builder/AsyncCacheBuilder.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/builder/CacheBuilder.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/composite/CompositeCache.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/composite/CompositeCacheBuilder.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/config/CacheConfig.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/config/package-info.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/exception/TryLockFailedException.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/exception/ValueRetrievalException.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/exception/package-info.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/extension/CacheLoadingStrategy.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/extension/package-info.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/hotkey/HotKey.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/hotkey/HotKeyType.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/hotkey/package-info.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/integration/consistency/kafka/package-info.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/integration/consistency/package-info.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/integration/consistency/redis/package-info.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/integration/consistency/rocketmq/package-info.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/jd/JdHotKey.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/jd/JdHotKeyClient.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/jd/package-info.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/package-info.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/sentinel/ApolloSentinelHotKeyDataSource.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/sentinel/EtcdSentinelHotKeyDataSource.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/sentinel/NacosSentinelHotKeyDataSource.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/sentinel/SentinelHotKey.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/sentinel/SentinelHotKeyClient.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/sentinel/SentinelHotKeyDataSource.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/sentinel/ZookeeperSentinelHotKeyDataSource.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/sentinel/package-info.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/integration/l1cache/caffeine/CaffeineCache.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/integration/l1cache/caffeine/CaffeineCacheBuilder.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/integration/l1cache/caffeine/package-info.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/integration/l1cache/guava/GuavaCache.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/integration/l1cache/guava/GuavaCacheBuilder.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/integration/l1cache/guava/package-info.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/integration/l1cache/package-info.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/integration/l2cache/dragonfly/package-info.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/integration/l2cache/package-info.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/integration/l2cache/redis/RedisCache.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/integration/l2cache/redis/RedisCacheBuilder.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/integration/l2cache/redis/package-info.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/l1cache/AsyncL1CacheLoader.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/l1cache/AsyncL1CacheRemovalListener.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/l1cache/InternalL1CacheRemovalListener.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/l1cache/L1CacheLoader.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/l1cache/L1CacheRemovalCause.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/l1cache/L1CacheRemovalListener.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/l1cache/package-info.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/l2cache/CacheSyncListener.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/l2cache/CacheSyncType.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/l2cache/CacheSynchronizer.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/l2cache/model/CacheMessage.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/l2cache/package-info.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/package-info.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/support/AbstractAdaptingCache.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/support/spring/DynamicCache.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/support/spring/DynamicCacheManager.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/support/value/NullValue.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/java/org/ylzl/eden/common/cache/support/value/package-info.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/resources/META-INF/cache/org.ylzl.eden.dynamic.cache.builder.CacheBuilder (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/resources/META-INF/cache/org.ylzl.eden.dynamic.cache.hotkey.HotKey (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/resources/META-INF/cache/org.ylzl.eden.dynamic.cache.integration.hotkey.sentinel.SentinelHotKeyDataSource (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/resources/META-INF/cache/org.ylzl.eden.dynamic.cache.l1cache.L1CacheRemovalListener (100%) rename eden-components/eden-solutions/{eden-dynamic-cache => eden-common-cache}/src/main/resources/META-INF/services/org.ylzl.eden.extension.strategy.LoadingStrategy (100%) rename eden-components/eden-solutions/{eden-data-auditor/src/test/resources => eden-common-cache/src/test/java}/.gitkeep (100%) rename eden-components/eden-solutions/{eden-data-filter => eden-common-cache}/src/test/resources/.gitkeep (100%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/pom.xml (98%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/src/main/java/org/ylzl/eden/common/excel/ExcelExporter.java (100%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/src/main/java/org/ylzl/eden/common/excel/ExcelImporter.java (100%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/src/main/java/org/ylzl/eden/common/excel/ExcelLine.java (100%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/src/main/java/org/ylzl/eden/common/excel/ExcelReader.java (100%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/src/main/java/org/ylzl/eden/common/excel/ExcelType.java (100%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/src/main/java/org/ylzl/eden/common/excel/ExcelWriter.java (100%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/src/main/java/org/ylzl/eden/common/excel/aop/package-info.java (100%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/src/main/java/org/ylzl/eden/common/excel/builder/AbstractExcelReaderBuilder.java (100%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/src/main/java/org/ylzl/eden/common/excel/builder/AbstractExcelWriterBuilder.java (100%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/src/main/java/org/ylzl/eden/common/excel/builder/ExcelReaderBuilder.java (100%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/src/main/java/org/ylzl/eden/common/excel/builder/ExcelWriterBuilder.java (100%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/src/main/java/org/ylzl/eden/common/excel/builder/package-info.java (100%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/src/main/java/org/ylzl/eden/common/excel/config/ExcelConfig.java (100%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/src/main/java/org/ylzl/eden/common/excel/config/package-info.java (100%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/src/main/java/org/ylzl/eden/common/excel/exception/package-info.java (100%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/src/main/java/org/ylzl/eden/common/excel/exporter/ExcelExportHandler.java (100%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/src/main/java/org/ylzl/eden/common/excel/exporter/package-info.java (100%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/src/main/java/org/ylzl/eden/common/excel/extension/ExcelLoadingStrategy.java (100%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/src/main/java/org/ylzl/eden/common/excel/extension/package-info.java (100%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/src/main/java/org/ylzl/eden/common/excel/importer/ExcelImportHandler.java (100%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/src/main/java/org/ylzl/eden/common/excel/importer/package-info.java (100%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/src/main/java/org/ylzl/eden/common/excel/integration/easyexcel/EasyExcelReader.java (100%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/src/main/java/org/ylzl/eden/common/excel/integration/easyexcel/EasyExcelReaderBuilder.java (100%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/src/main/java/org/ylzl/eden/common/excel/integration/easyexcel/EasyExcelWriter.java (100%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/src/main/java/org/ylzl/eden/common/excel/integration/easyexcel/EasyExcelWriterBuilder.java (100%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/src/main/java/org/ylzl/eden/common/excel/integration/easyexcel/converter/LocalDateConverter.java (100%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/src/main/java/org/ylzl/eden/common/excel/integration/easyexcel/converter/LocalDateTimeConverter.java (100%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/src/main/java/org/ylzl/eden/common/excel/integration/easyexcel/converter/SexConverter.java (100%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/src/main/java/org/ylzl/eden/common/excel/integration/easyexcel/i18n/I18nCellWriteHandler.java (100%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/src/main/java/org/ylzl/eden/common/excel/integration/easyexcel/package-info.java (100%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/src/main/java/org/ylzl/eden/common/excel/integration/easypoi/package-info.java (100%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/src/main/java/org/ylzl/eden/common/excel/integration/package-info.java (100%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/src/main/java/org/ylzl/eden/common/excel/model/ValidationErrors.java (100%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/src/main/java/org/ylzl/eden/common/excel/package-info.java (100%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/src/main/java/org/ylzl/eden/common/excel/reader/ExcelReadListener.java (100%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/src/main/java/org/ylzl/eden/common/excel/reader/PersistenceExcelReadListener.java (100%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/src/main/java/org/ylzl/eden/common/excel/reader/package-info.java (100%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/src/main/java/org/ylzl/eden/common/excel/support/ExcelHelper.java (100%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/src/main/java/org/ylzl/eden/common/excel/support/package-info.java (100%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/src/main/java/org/ylzl/eden/common/excel/writer/AbstractExcelWriteHandler.java (100%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/src/main/java/org/ylzl/eden/common/excel/writer/ExcelWriteHandler.java (100%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/src/main/java/org/ylzl/eden/common/excel/writer/ExcelWriteMeta.java (100%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/src/main/java/org/ylzl/eden/common/excel/writer/package-info.java (100%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/src/main/java/org/ylzl/eden/common/excel/writer/sheet/Sheet.java (100%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/src/main/java/org/ylzl/eden/common/excel/writer/sheet/SheetHead.java (100%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/src/main/java/org/ylzl/eden/common/excel/writer/sheet/SheetHeadGenerator.java (100%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/src/main/java/org/ylzl/eden/common/excel/writer/sheet/package-info.java (100%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/src/main/resources/META-INF/excel/org.ylzl.eden.common.excel.builder.ExcelReaderBuilder (100%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/src/main/resources/META-INF/excel/org.ylzl.eden.common.excel.builder.ExcelWriterBuilder (100%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/src/main/resources/META-INF/services/org.ylzl.eden.extension.strategy.LoadingStrategy (100%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/src/test/groovy/org/ylzl/eden/common/excel/ExcelReaderTest.groovy (100%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/src/test/groovy/org/ylzl/eden/common/excel/ExcelWriterTest.groovy (100%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/src/test/java/org/ylzl/eden/common/excel/TestCase.java (100%) rename eden-components/eden-solutions/{eden-dynamic-excel => eden-common-excel}/src/test/resources/test/test-case.xlsx (100%) rename eden-components/eden-solutions/{eden-dynamic-mail => eden-common-mail}/pom.xml (97%) rename eden-components/eden-solutions/{eden-dynamic-mail => eden-common-mail}/src/main/java/org/ylzl/eden/common/mail/MailTemplate.java (100%) rename eden-components/eden-solutions/{eden-dynamic-mail => eden-common-mail}/src/main/java/org/ylzl/eden/common/mail/MailType.java (100%) rename eden-components/eden-solutions/{eden-dynamic-mail => eden-common-mail}/src/main/java/org/ylzl/eden/common/mail/exception/MailServerException.java (100%) rename eden-components/eden-solutions/{eden-dynamic-mail => eden-common-mail}/src/main/java/org/ylzl/eden/common/mail/exception/MailServerTimeoutException.java (100%) rename eden-components/eden-solutions/{eden-dynamic-mail => eden-common-mail}/src/main/java/org/ylzl/eden/common/mail/exception/SendMailException.java (100%) rename eden-components/eden-solutions/{eden-dynamic-mail => eden-common-mail}/src/main/java/org/ylzl/eden/common/mail/exception/package-info.java (100%) rename eden-components/eden-solutions/{eden-dynamic-mail => eden-common-mail}/src/main/java/org/ylzl/eden/common/mail/integration/javamail/JavaMailTemplate.java (100%) rename eden-components/eden-solutions/{eden-dynamic-mail => eden-common-mail}/src/main/java/org/ylzl/eden/common/mail/integration/javamail/package-info.java (100%) rename eden-components/eden-solutions/{eden-dynamic-mail => eden-common-mail}/src/main/java/org/ylzl/eden/common/mail/integration/package-info.java (100%) rename eden-components/eden-solutions/{eden-dynamic-mail => eden-common-mail}/src/main/java/org/ylzl/eden/common/mail/model/Mail.java (100%) rename eden-components/eden-solutions/{eden-dynamic-mail => eden-common-mail}/src/main/java/org/ylzl/eden/common/mail/model/multi/MultiSendMailRequest.java (100%) rename eden-components/eden-solutions/{eden-dynamic-mail => eden-common-mail}/src/main/java/org/ylzl/eden/common/mail/model/multi/MultiSendMailResponse.java (100%) rename eden-components/eden-solutions/{eden-dynamic-mail => eden-common-mail}/src/main/java/org/ylzl/eden/common/mail/model/package-info.java (100%) rename eden-components/eden-solutions/{eden-dynamic-mail => eden-common-mail}/src/main/java/org/ylzl/eden/common/mail/model/single/SingleSendMailRequest.java (100%) rename eden-components/eden-solutions/{eden-dynamic-mail => eden-common-mail}/src/main/java/org/ylzl/eden/common/mail/model/single/SingleSendMailResponse.java (100%) rename eden-components/eden-solutions/{eden-dynamic-mail => eden-common-mail}/src/main/java/org/ylzl/eden/common/mail/package-info.java (100%) rename eden-components/eden-solutions/{eden-dynamic-cache/src/test/java => eden-common-mail/src/main/resources}/.gitkeep (100%) rename eden-components/eden-solutions/{eden-dynamic-cache/src/test/resources => eden-common-mail/src/test/java}/.gitkeep (100%) rename eden-components/eden-solutions/{eden-dynamic-mail/src/main => eden-common-mail/src/test}/resources/.gitkeep (100%) rename eden-components/eden-solutions/{eden-dynamic-mq => eden-common-mq}/pom.xml (98%) rename eden-components/eden-solutions/{eden-dynamic-mq => eden-common-mq}/src/main/java/org/ylzl/eden/common/mq/MessageQueueConsumer.java (100%) rename eden-components/eden-solutions/{eden-dynamic-mq => eden-common-mq}/src/main/java/org/ylzl/eden/common/mq/MessageQueueListener.java (100%) rename eden-components/eden-solutions/{eden-dynamic-mq => eden-common-mq}/src/main/java/org/ylzl/eden/common/mq/MessageQueueProvider.java (100%) rename eden-components/eden-solutions/{eden-dynamic-mq => eden-common-mq}/src/main/java/org/ylzl/eden/common/mq/MessageQueueType.java (100%) rename eden-components/eden-solutions/{eden-dynamic-mq => eden-common-mq}/src/main/java/org/ylzl/eden/common/mq/consumer/Acknowledgement.java (100%) rename eden-components/eden-solutions/{eden-dynamic-mq => eden-common-mq}/src/main/java/org/ylzl/eden/common/mq/consumer/ConsumeMode.java (100%) rename eden-components/eden-solutions/{eden-dynamic-mq => eden-common-mq}/src/main/java/org/ylzl/eden/common/mq/consumer/MessageConsumeException.java (100%) rename eden-components/eden-solutions/{eden-dynamic-mq => eden-common-mq}/src/main/java/org/ylzl/eden/common/mq/consumer/MessageConsumeMode.java (100%) rename eden-components/eden-solutions/{eden-dynamic-mq => eden-common-mq}/src/main/java/org/ylzl/eden/common/mq/consumer/MessageModel.java (100%) rename eden-components/eden-solutions/{eden-dynamic-mq => eden-common-mq}/src/main/java/org/ylzl/eden/common/mq/consumer/MessageSelectorType.java (100%) rename eden-components/eden-solutions/{eden-dynamic-mq => eden-common-mq}/src/main/java/org/ylzl/eden/common/mq/integration/kafka/KafkaConsumer.java (100%) rename eden-components/eden-solutions/{eden-dynamic-mq => eden-common-mq}/src/main/java/org/ylzl/eden/common/mq/integration/kafka/KafkaProvider.java (100%) rename eden-components/eden-solutions/{eden-dynamic-mq => eden-common-mq}/src/main/java/org/ylzl/eden/common/mq/integration/kafka/package-info.java (100%) rename eden-components/eden-solutions/{eden-dynamic-mq => eden-common-mq}/src/main/java/org/ylzl/eden/common/mq/integration/rocketmq/RocketMQConsumer.java (100%) rename eden-components/eden-solutions/{eden-dynamic-mq => eden-common-mq}/src/main/java/org/ylzl/eden/common/mq/integration/rocketmq/RocketMQProvider.java (100%) rename eden-components/eden-solutions/{eden-dynamic-mq => eden-common-mq}/src/main/java/org/ylzl/eden/common/mq/integration/rocketmq/config/RocketMQConfig.java (100%) rename eden-components/eden-solutions/{eden-dynamic-mq => eden-common-mq}/src/main/java/org/ylzl/eden/common/mq/integration/rocketmq/package-info.java (100%) rename eden-components/eden-solutions/{eden-dynamic-mq => eden-common-mq}/src/main/java/org/ylzl/eden/common/mq/model/Message.java (100%) rename eden-components/eden-solutions/{eden-dynamic-mq => eden-common-mq}/src/main/java/org/ylzl/eden/common/mq/package-info.java (100%) rename eden-components/eden-solutions/{eden-dynamic-mq => eden-common-mq}/src/main/java/org/ylzl/eden/common/mq/producer/MessageSendCallback.java (100%) rename eden-components/eden-solutions/{eden-dynamic-mq => eden-common-mq}/src/main/java/org/ylzl/eden/common/mq/producer/MessageSendException.java (100%) rename eden-components/eden-solutions/{eden-dynamic-mq => eden-common-mq}/src/main/java/org/ylzl/eden/common/mq/producer/MessageSendResult.java (100%) rename eden-components/eden-solutions/{eden-dynamic-mail/src/test/java => eden-common-mq/src/main/resources}/.gitkeep (100%) rename eden-components/eden-solutions/{eden-dynamic-mail/src/test/resources => eden-common-mq/src/test/java}/.gitkeep (100%) rename eden-components/eden-solutions/{eden-dynamic-mq/src/main => eden-common-mq/src/test}/resources/.gitkeep (100%) rename eden-components/eden-solutions/{eden-dynamic-security => eden-common-security}/pom.xml (97%) rename eden-components/eden-solutions/{eden-dynamic-security => eden-common-security}/src/main/java/org/ylzl/eden/common/security/Authentication.java (100%) rename eden-components/eden-solutions/{eden-dynamic-security => eden-common-security}/src/main/java/org/ylzl/eden/common/security/GrantedAuthority.java (100%) rename eden-components/eden-solutions/{eden-dynamic-security => eden-common-security}/src/main/java/org/ylzl/eden/common/security/aop/package-info.java (100%) rename eden-components/eden-solutions/{eden-dynamic-security => eden-common-security}/src/main/java/org/ylzl/eden/common/security/builder/package-info.java (100%) rename eden-components/eden-solutions/{eden-dynamic-security => eden-common-security}/src/main/java/org/ylzl/eden/common/security/exception/InvalidPasswordException.java (100%) rename eden-components/eden-solutions/{eden-dynamic-security => eden-common-security}/src/main/java/org/ylzl/eden/common/security/exception/UserNotActivatedException.java (100%) rename eden-components/eden-solutions/{eden-dynamic-security => eden-common-security}/src/main/java/org/ylzl/eden/common/security/exception/UserNotFoundException.java (100%) rename eden-components/eden-solutions/{eden-dynamic-security => eden-common-security}/src/main/java/org/ylzl/eden/common/security/homologous/package-info.java (100%) rename eden-components/eden-solutions/{eden-dynamic-security => eden-common-security}/src/main/java/org/ylzl/eden/common/security/integration/package-info.java (100%) rename eden-components/eden-solutions/{eden-dynamic-security => eden-common-security}/src/main/java/org/ylzl/eden/common/security/model/package-info.java (100%) rename eden-components/eden-solutions/{eden-dynamic-security => eden-common-security}/src/main/java/org/ylzl/eden/common/security/package-info.java (100%) rename eden-components/eden-solutions/{eden-dynamic-mq/src/test/java => eden-common-security/src/main/resources}/.gitkeep (100%) rename eden-components/eden-solutions/{eden-dynamic-mq/src/test/resources => eden-common-security/src/test/java}/.gitkeep (100%) rename eden-components/eden-solutions/{eden-dynamic-security/src/main => eden-common-security/src/test}/resources/.gitkeep (100%) rename eden-components/eden-solutions/{eden-dynamic-sms => eden-common-sms}/pom.xml (97%) rename eden-components/eden-solutions/{eden-dynamic-sms => eden-common-sms}/src/main/java/org/ylzl/eden/common/sms/SmsTemplate.java (100%) rename eden-components/eden-solutions/{eden-dynamic-sms => eden-common-sms}/src/main/java/org/ylzl/eden/common/sms/SmsType.java (100%) rename eden-components/eden-solutions/{eden-dynamic-sms => eden-common-sms}/src/main/java/org/ylzl/eden/common/sms/exception/SendSmsException.java (100%) rename eden-components/eden-solutions/{eden-dynamic-sms => eden-common-sms}/src/main/java/org/ylzl/eden/common/sms/exception/SmsServerException.java (100%) rename eden-components/eden-solutions/{eden-dynamic-sms => eden-common-sms}/src/main/java/org/ylzl/eden/common/sms/exception/SmsServerTimeoutException.java (100%) rename eden-components/eden-solutions/{eden-dynamic-sms => eden-common-sms}/src/main/java/org/ylzl/eden/common/sms/model/Sms.java (100%) rename eden-components/eden-solutions/{eden-dynamic-sms => eden-common-sms}/src/main/java/org/ylzl/eden/common/sms/model/batch/BatchSendSmsRequest.java (100%) rename eden-components/eden-solutions/{eden-dynamic-sms => eden-common-sms}/src/main/java/org/ylzl/eden/common/sms/model/batch/BatchSendSmsResponse.java (100%) rename eden-components/eden-solutions/{eden-dynamic-sms => eden-common-sms}/src/main/java/org/ylzl/eden/common/sms/model/multi/MultiSendSmsRequest.java (100%) rename eden-components/eden-solutions/{eden-dynamic-sms => eden-common-sms}/src/main/java/org/ylzl/eden/common/sms/model/multi/MultiSendSmsResponse.java (100%) rename eden-components/eden-solutions/{eden-dynamic-sms => eden-common-sms}/src/main/java/org/ylzl/eden/common/sms/model/single/SingleSendSmsRequest.java (100%) rename eden-components/eden-solutions/{eden-dynamic-sms => eden-common-sms}/src/main/java/org/ylzl/eden/common/sms/model/single/SingleSendSmsResponse.java (100%) rename eden-components/eden-solutions/{eden-dynamic-sms => eden-common-sms}/src/main/java/org/ylzl/eden/common/sms/model/template/SendTemplateSmsRequest.java (100%) rename eden-components/eden-solutions/{eden-dynamic-sms => eden-common-sms}/src/main/java/org/ylzl/eden/common/sms/model/template/SendTemplateSmsResponse.java (100%) rename eden-components/eden-solutions/{eden-dynamic-sms => eden-common-sms}/src/main/java/org/ylzl/eden/common/sms/package-info.java (100%) rename eden-components/eden-solutions/{eden-dynamic-security/src/test/java => eden-common-sms/src/main/resources}/.gitkeep (100%) rename eden-components/eden-solutions/{eden-dynamic-security/src/test/resources => eden-common-sms/src/test/java}/.gitkeep (100%) rename eden-components/eden-solutions/{eden-dynamic-sms/src/main => eden-common-sms/src/test}/resources/.gitkeep (100%) delete mode 100644 eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/differ/objectdiffer/package-info.java delete mode 100644 eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/differ/package-info.java delete mode 100644 eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker/fastjson/package-info.java delete mode 100644 eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker/fastjson2/package-info.java delete mode 100644 eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker/jackson/package-info.java delete mode 100644 eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker/package-info.java delete mode 100644 eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/package-info.java delete mode 100644 eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/support/DataMaskerStrategy.java delete mode 100644 eden-components/eden-solutions/eden-data-auditor/src/main/resources/META-INF/data-auditor/org.ylzl.eden.data.auditor.DataMasker delete mode 100644 eden-components/eden-solutions/eden-data-auditor/src/main/resources/META-INF/data-auditor/org.ylzl.eden.data.auditor.builder.DataDifferBuilder delete mode 100644 eden-components/eden-solutions/eden-data-auditor/src/main/resources/META-INF/data-auditor/org.ylzl.eden.data.auditor.builder.DataMaskerBuilder delete mode 100644 eden-components/eden-solutions/eden-data-auditor/src/main/resources/META-INF/internal/org.ylzl.eden.spring.framework.json.fastjson.FastjsonFilter delete mode 100644 eden-components/eden-solutions/eden-data-auditor/src/main/resources/META-INF/internal/org.ylzl.eden.spring.framework.json.fastjson2.Fastjson2Filter rename eden-components/eden-solutions/{eden-data-auditor => eden-data-differ}/pom.xml (96%) rename eden-components/eden-solutions/{eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor => eden-data-differ/src/main/java/org/ylzl/eden/data}/differ/Change.java (96%) rename eden-components/eden-solutions/{eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor => eden-data-differ/src/main/java/org/ylzl/eden/data}/differ/ChangeType.java (94%) rename eden-components/eden-solutions/{eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor => eden-data-differ/src/main/java/org/ylzl/eden/data/differ}/DataDiffer.java (94%) rename eden-components/eden-solutions/{eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor => eden-data-differ/src/main/java/org/ylzl/eden/data}/differ/Diff.java (96%) rename eden-components/eden-solutions/{eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor => eden-data-differ/src/main/java/org/ylzl/eden/data/differ}/builder/AbstractDataDifferBuilder.java (92%) rename eden-components/eden-solutions/{eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor => eden-data-differ/src/main/java/org/ylzl/eden/data/differ}/builder/DataDifferBuilder.java (87%) rename eden-components/eden-solutions/{eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/differ => eden-data-differ/src/main/java/org/ylzl/eden/data/differ/builder}/package-info.java (93%) rename eden-components/eden-solutions/{eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor => eden-data-differ/src/main/java/org/ylzl/eden/data/differ}/config/DataDifferConfig.java (97%) rename eden-components/eden-solutions/{eden-data-filter/src/main/java/org/ylzl/eden/data/filter => eden-data-differ/src/main/java/org/ylzl/eden/data/differ}/config/package-info.java (93%) rename eden-components/eden-solutions/{eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/extension/DataAuditorLoadingStrategy.java => eden-data-differ/src/main/java/org/ylzl/eden/data/differ/extension/DataDifferLoadingStrategy.java} (80%) rename eden-components/eden-solutions/{eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/builder => eden-data-differ/src/main/java/org/ylzl/eden/data/differ/extension}/package-info.java (93%) rename eden-components/eden-solutions/{eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/differ => eden-data-differ/src/main/java/org/ylzl/eden/data/differ/integration}/javers/JaversDataDiffer.java (92%) rename eden-components/eden-solutions/{eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/differ => eden-data-differ/src/main/java/org/ylzl/eden/data/differ/integration}/javers/JaversDataDifferBuilder.java (87%) rename eden-components/eden-solutions/{eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/differ => eden-data-differ/src/main/java/org/ylzl/eden/data/differ/integration}/objectdiffer/ObjectDifferDataDiffer.java (93%) rename eden-components/eden-solutions/{eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/differ => eden-data-differ/src/main/java/org/ylzl/eden/data/differ/integration}/objectdiffer/ObjectDifferDataDifferBuilder.java (86%) create mode 100644 eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/integration/objectdiffer/package-info.java rename eden-components/eden-solutions/{eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/extension => eden-data-differ/src/main/java/org/ylzl/eden/data/differ/integration}/package-info.java (92%) rename eden-components/eden-solutions/{eden-data-filter/src/test/java/org/ylzl/eden/data/filter => eden-data-differ/src/main/java/org/ylzl/eden/data/differ}/package-info.java (94%) rename eden-components/eden-solutions/{eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor => eden-data-differ/src/main/java/org/ylzl/eden/data/differ}/support/DataDifferHelper.java (89%) create mode 100644 eden-components/eden-solutions/eden-data-differ/src/main/resources/META-INF/data-differ/org.ylzl.eden.data.differ.builder.DataDifferBuilder rename eden-components/eden-solutions/{eden-data-filter => eden-data-differ}/src/main/resources/META-INF/services/org.ylzl.eden.extension.strategy.LoadingStrategy (90%) rename eden-components/eden-solutions/{eden-data-auditor/src/test/groovy/org/ylzl/eden/data/auditor => eden-data-differ/src/test/groovy/org/ylzl/eden/data/differ}/DataDifferTest.groovy (94%) rename eden-components/eden-solutions/{eden-data-auditor/src/test/java/org/ylzl/eden/data/auditor => eden-data-differ/src/test/java/org/ylzl/eden/data/differ}/TestCase.java (93%) rename eden-components/eden-solutions/{eden-data-filter/src/main/java/org/ylzl/eden/data/filter => eden-data-differ/src/test/java/org/ylzl/eden/data/differ}/package-info.java (94%) rename eden-components/eden-solutions/{eden-dynamic-sms/src/test/java => eden-data-differ/src/test/resources}/.gitkeep (100%) create mode 100644 eden-components/eden-solutions/eden-data-duplicate/pom.xml rename eden-components/eden-solutions/{eden-data-filter/src/main/java/org/ylzl/eden/data/filter => eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate}/DuplicateFilter.java (96%) rename eden-components/eden-solutions/{eden-data-filter/src/main/java/org/ylzl/eden/data/filter => eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate}/builder/AbstractDuplicateFilterBuilder.java (79%) rename eden-components/eden-solutions/{eden-data-filter/src/main/java/org/ylzl/eden/data/filter => eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate}/builder/DuplicateFilterBuilder.java (82%) rename eden-components/eden-solutions/{eden-data-filter/src/main/java/org/ylzl/eden/data/filter/config/DuplicateConfig.java => eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/config/DuplicateFilterConfig.java} (93%) rename eden-components/eden-solutions/{eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor => eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate}/config/package-info.java (93%) create mode 100644 eden-components/eden-solutions/eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/extension/DuplicateFilterLoadingStrategy.java create mode 100644 eden-components/eden-solutions/eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/extension/package-info.java rename eden-components/eden-solutions/{eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/duplicate => eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/integration}/bloom/BloomFilter.java (91%) rename eden-components/eden-solutions/{eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/duplicate => eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/integration}/bloom/BloomFilterBuilder.java (79%) create mode 100644 eden-components/eden-solutions/eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/integration/bloom/package-info.java rename eden-components/eden-solutions/{eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/duplicate => eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/integration}/cuckoo/CuckooFilter.java (90%) rename eden-components/eden-solutions/{eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/duplicate => eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/integration}/cuckoo/CuckooFilterBuilder.java (79%) create mode 100644 eden-components/eden-solutions/eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/integration/cuckoo/package-info.java create mode 100644 eden-components/eden-solutions/eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/integration/package-info.java create mode 100644 eden-components/eden-solutions/eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/package-info.java rename eden-components/eden-solutions/{eden-data-filter/src/main/resources/META-INF/data-filter => eden-data-duplicate/src/main/resources/META-INF/data-duplicate}/org.ylzl.eden.data.filter.builder.SensitiveFilterBuilder (100%) create mode 100644 eden-components/eden-solutions/eden-data-duplicate/src/main/resources/META-INF/services/org.ylzl.eden.extension.strategy.LoadingStrategy rename eden-components/eden-solutions/{eden-data-filter/src/test/groovy/org/ylzl/eden/data/filter => eden-data-duplicate/src/test/groovy/org/ylzl/eden/data/duplicate}/SensitiveFilterTest.groovy (88%) create mode 100644 eden-components/eden-solutions/eden-data-duplicate/src/test/java/org/ylzl/eden/data/duplicate/package-info.java rename eden-components/eden-solutions/{eden-dynamic-sms => eden-data-duplicate}/src/test/resources/.gitkeep (100%) delete mode 100644 eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/builder/AbstractMaskingFilterBuilder.java delete mode 100644 eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/builder/MaskingFilterBuilder.java delete mode 100644 eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/duplicate/package-info.java delete mode 100644 eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/extension/package-info.java delete mode 100644 eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/duplicate/bloom/package-info.java delete mode 100644 eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/duplicate/cuckoo/package-info.java delete mode 100644 eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/duplicate/package-info.java delete mode 100644 eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/masking/package-info.java delete mode 100644 eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/sensitive/ahocorasick/package-info.java delete mode 100644 eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/sensitive/package-info.java delete mode 100644 eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/masking/package-info.java delete mode 100644 eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/sensitive/package-info.java delete mode 100644 eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/support/MaskingFilterHelper.java delete mode 100644 eden-components/eden-solutions/eden-data-filter/src/main/resources/META-INF/data-filter/org.ylzl.eden.data.filter.builder.MaskingFilterBuilder delete mode 100644 eden-components/eden-solutions/eden-data-filter/src/main/resources/log4j2.plugins/org.apache.logging.log4j.core.config.plugins.PluginManager rename eden-components/eden-solutions/{eden-data-filter => eden-data-masker}/pom.xml (85%) rename eden-components/eden-solutions/{eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor => eden-data-masker/src/main/java/org/ylzl/eden/data/masker}/DataMasker.java (85%) rename eden-components/eden-solutions/{eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor => eden-data-masker/src/main/java/org/ylzl/eden/data}/masker/DataMaskerManager.java (96%) rename eden-components/eden-solutions/{eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/masker/DataMasking.java => eden-data-masker/src/main/java/org/ylzl/eden/data/masker/Masking.java} (92%) rename eden-components/eden-solutions/{eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor => eden-data-masker/src/main/java/org/ylzl/eden/data/masker}/builder/AbstractDataMaskerBuilder.java (92%) rename eden-components/eden-solutions/{eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor => eden-data-masker/src/main/java/org/ylzl/eden/data/masker}/builder/DataMaskerBuilder.java (89%) rename eden-components/eden-solutions/{eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/masker => eden-data-masker/src/main/java/org/ylzl/eden/data/masker/builder}/package-info.java (93%) rename eden-components/eden-solutions/{eden-data-filter/src/main/java/org/ylzl/eden/data/filter/config/MaskingConfig.java => eden-data-masker/src/main/java/org/ylzl/eden/data/masker/config/DataMaskerConfig.java} (64%) create mode 100644 eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/config/package-info.java rename eden-components/eden-solutions/{eden-data-filter/src/main/java/org/ylzl/eden/data/filter/MaskingFilter.java => eden-data-masker/src/main/java/org/ylzl/eden/data/masker/extension/DataMaskerLoadingStrategy.java} (64%) create mode 100644 eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/extension/package-info.java rename eden-components/eden-solutions/{eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/masking/charsscan/CharsScanFilter.java => eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/charsscan/CharsScanDataMasker.java} (83%) rename eden-components/eden-solutions/{eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/masking/charsscan/CharsScanFilterBuilder.java => eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/charsscan/CharsScanDataMaskerBuilder.java} (77%) rename eden-components/eden-solutions/{eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker => eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration}/fastjson/FastjsonDataMaskerBuilder.java (84%) rename eden-components/eden-solutions/{eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker => eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration}/fastjson/FastjsonDataMaskingValueFilter.java (80%) rename eden-components/eden-solutions/{eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker => eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration}/fastjson/FastjsonValueFilterException.java (93%) create mode 100644 eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/fastjson/package-info.java rename eden-components/eden-solutions/{eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker => eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration}/fastjson2/Fastjson2DataMaskerBuilder.java (84%) rename eden-components/eden-solutions/{eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker => eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration}/fastjson2/Fastjson2DataMaskingValueFilter.java (80%) rename eden-components/eden-solutions/{eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker => eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration}/fastjson2/Fastjson2ValueFilterException.java (93%) create mode 100644 eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/fastjson2/package-info.java rename eden-components/eden-solutions/{eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker => eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration}/jackson/JacksonDataMaskerBuilder.java (85%) rename eden-components/eden-solutions/{eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker => eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration}/jackson/JacksonDataMaskingBeanSerializerModifier.java (85%) rename eden-components/eden-solutions/{eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker => eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration}/jackson/JacksonDataMaskingJsonSerializer.java (78%) rename eden-components/eden-solutions/{eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker => eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration}/jackson/JacksonDataMaskingModule.java (96%) create mode 100644 eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/jackson/package-info.java rename eden-components/eden-solutions/{eden-data-filter/src/main/java/org/ylzl/eden/data/filter/masking/log4j2/MaskingStringLayout.java => eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/log4j2/DataMaskerStringLayout.java} (57%) create mode 100644 eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/package-info.java rename eden-components/eden-solutions/{eden-data-auditor/src/test/java/org/ylzl/eden/data/auditor => eden-data-masker/src/main/java/org/ylzl/eden/data/masker}/package-info.java (94%) rename eden-components/eden-solutions/{eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor => eden-data-masker/src/main/java/org/ylzl/eden/data}/masker/spi/AddressDataMasker.java (77%) rename eden-components/eden-solutions/{eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor => eden-data-masker/src/main/java/org/ylzl/eden/data}/masker/spi/BankCardDataMasker.java (78%) rename eden-components/eden-solutions/{eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor => eden-data-masker/src/main/java/org/ylzl/eden/data}/masker/spi/CarLicenseDataMasker.java (77%) rename eden-components/eden-solutions/{eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor => eden-data-masker/src/main/java/org/ylzl/eden/data}/masker/spi/ChineseNameDataMasker.java (78%) rename eden-components/eden-solutions/{eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor => eden-data-masker/src/main/java/org/ylzl/eden/data}/masker/spi/EmailDataMasker.java (77%) rename eden-components/eden-solutions/{eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor => eden-data-masker/src/main/java/org/ylzl/eden/data}/masker/spi/IdCardDataMasker.java (77%) rename eden-components/eden-solutions/{eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor => eden-data-masker/src/main/java/org/ylzl/eden/data}/masker/spi/MobilePhoneDataMasker.java (77%) rename eden-components/eden-solutions/{eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor => eden-data-masker/src/main/java/org/ylzl/eden/data}/masker/spi/MoneyDataMasker.java (82%) rename eden-components/eden-solutions/{eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor => eden-data-masker/src/main/java/org/ylzl/eden/data}/masker/spi/PasswordDataMasker.java (82%) rename eden-components/eden-solutions/{eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor => eden-data-masker/src/main/java/org/ylzl/eden/data}/masker/spi/TelephoneDataMasker.java (77%) rename eden-components/eden-solutions/{eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor => eden-data-masker/src/main/java/org/ylzl/eden/data}/masker/spi/UsernameDataMasker.java (77%) rename eden-components/eden-solutions/{eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor => eden-data-masker/src/main/java/org/ylzl/eden/data/masker}/support/DataMaskerHelper.java (70%) rename eden-components/eden-solutions/{eden-data-filter/src/main/java/org/ylzl/eden/data/filter/masking/MaskingStrategy.java => eden-data-masker/src/main/java/org/ylzl/eden/data/masker/support/DataMaskerStrategy.java} (83%) create mode 100644 eden-components/eden-solutions/eden-data-masker/src/main/resources/META-INF/data-masker/org.ylzl.eden.data.masker.DataMasker create mode 100644 eden-components/eden-solutions/eden-data-masker/src/main/resources/META-INF/data-masker/org.ylzl.eden.data.masker.builder.DataMaskerBuilder create mode 100644 eden-components/eden-solutions/eden-data-masker/src/main/resources/META-INF/internal/org.ylzl.eden.spring.framework.json.fastjson.FastjsonFilter create mode 100644 eden-components/eden-solutions/eden-data-masker/src/main/resources/META-INF/internal/org.ylzl.eden.spring.framework.json.fastjson2.Fastjson2Filter create mode 100644 eden-components/eden-solutions/eden-data-masker/src/main/resources/META-INF/log4j2.plugins/org.apache.logging.log4j.core.config.plugins.PluginManager rename eden-components/eden-solutions/{eden-data-auditor => eden-data-masker}/src/main/resources/META-INF/services/org.ylzl.eden.extension.strategy.LoadingStrategy (90%) rename eden-components/eden-solutions/{eden-data-auditor/src/test/groovy/org/ylzl/eden/data/auditor => eden-data-masker/src/test/groovy/org/ylzl/eden/data/masker}/DataMaskerTest.groovy (91%) rename eden-components/eden-solutions/{eden-data-auditor/src/test/java/org/ylzl/eden/data/auditor => eden-data-masker/src/test/java/org/ylzl/eden/data/masker}/DataMaskerBenchmark.java (98%) rename eden-components/eden-solutions/{eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/config/DataMaskerConfig.java => eden-data-masker/src/test/java/org/ylzl/eden/data/masker/TestCase.java} (56%) rename eden-components/eden-solutions/{eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor => eden-data-masker/src/test/java/org/ylzl/eden/data/masker}/package-info.java (94%) rename eden-components/{eden-spring-boot-starters/eden-dynamic-cache-spring-boot-starter/src/test/java => eden-solutions/eden-data-masker/src/test/resources}/.gitkeep (100%) delete mode 100644 eden-components/eden-solutions/eden-event-auditor/src/main/java/org/ylzl/eden/event/auditor/differ/package-info.java create mode 100644 eden-components/eden-solutions/eden-sensitive-word/pom.xml rename eden-components/eden-solutions/{eden-data-filter/src/main/java/org/ylzl/eden/data/filter => eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive}/Sensitive.java (91%) rename eden-components/eden-solutions/{eden-data-filter/src/main/java/org/ylzl/eden/data/filter => eden-sensitive-word/src/main/java/org/ylzl/eden/data}/sensitive/SensitiveWord.java (95%) rename eden-components/eden-solutions/{eden-data-filter/src/main/java/org/ylzl/eden/data/filter/SensitiveFilter.java => eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/SensitiveWordFilter.java} (92%) rename eden-components/eden-solutions/{eden-data-filter/src/main/java/org/ylzl/eden/data/filter => eden-sensitive-word/src/main/java/org/ylzl/eden/data}/sensitive/SensitiveWordLoader.java (96%) rename eden-components/eden-solutions/{eden-data-filter/src/main/java/org/ylzl/eden/data/filter => eden-sensitive-word/src/main/java/org/ylzl/eden/data}/sensitive/SensitiveWordStrategy.java (94%) rename eden-components/eden-solutions/{eden-data-filter/src/main/java/org/ylzl/eden/data/filter/builder/AbstractSensitiveFilterBuilder.java => eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/builder/AbstractSensitiveWordFilterBuilder.java} (72%) rename eden-components/eden-solutions/{eden-data-filter/src/main/java/org/ylzl/eden/data/filter/builder/SensitiveFilterBuilder.java => eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/builder/SensitiveWordFilterBuilder.java} (71%) rename eden-components/eden-solutions/{eden-data-filter/src/main/java/org/ylzl/eden/data/filter/config/SensitiveConfig.java => eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/config/SensitiveWordConfig.java} (93%) create mode 100644 eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/config/package-info.java rename eden-components/eden-solutions/{eden-data-filter/src/main/java/org/ylzl/eden/data/filter/extension/DataFilterLoadingStrategy.java => eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/extension/SensitiveWordLoadingStrategy.java} (83%) create mode 100644 eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/extension/package-info.java rename eden-components/eden-solutions/{eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/sensitive/ahocorasick/AhoCorasickSensitiveFilter.java => eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/integration/ahocorasick/AhoCorasickSensitiveWordFilter.java} (88%) rename eden-components/eden-solutions/{eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/sensitive/ahocorasick/AhoCorasickSensitiveFilterBuilder.java => eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/integration/ahocorasick/AhoCorasickSensitiveWordFilterBuilder.java} (70%) create mode 100644 eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/integration/ahocorasick/package-info.java create mode 100644 eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/integration/package-info.java create mode 100644 eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/package-info.java rename eden-components/eden-solutions/{eden-data-filter/src/main/java/org/ylzl/eden/data/filter/support/SensitiveFilterHelper.java => eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/support/SensitiveWordFilterHelper.java} (64%) rename eden-components/eden-solutions/{eden-data-filter/src/main/java/org/ylzl/eden/data/filter/sensitive/web/SensitiveRequestBodyAdvice.java => eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/web/SensitiveWordRequestBodyAdvice.java} (85%) create mode 100644 eden-components/eden-solutions/eden-sensitive-word/src/main/resources/META-INF/data-sensitive/org.ylzl.eden.data.sensitive.builder.SensitiveWordFilterBuilder create mode 100644 eden-components/eden-solutions/eden-sensitive-word/src/main/resources/META-INF/services/org.ylzl.eden.extension.strategy.LoadingStrategy create mode 100644 eden-components/eden-solutions/eden-sensitive-word/src/test/groovy/org/ylzl/eden/data/sensitive/SensitiveWordFilterTest.groovy create mode 100644 eden-components/eden-solutions/eden-sensitive-word/src/test/java/org/ylzl/eden/data/sensitive/package-info.java rename eden-components/{eden-spring-boot-starters/eden-dynamic-cache-spring-boot-starter => eden-solutions/eden-sensitive-word}/src/test/resources/.gitkeep (100%) rename eden-components/eden-spring-boot-starters/{eden-dynamic-cache-spring-boot-starter => eden-common-cache-spring-boot-starter}/pom.xml (90%) rename eden-components/eden-spring-boot-starters/{eden-dynamic-cache-spring-boot-starter => eden-common-cache-spring-boot-starter}/src/main/java/org/ylzl/eden/common/cache/spring/boot/autoconfigure/DynamicCacheAutoConfiguration.java (100%) rename eden-components/eden-spring-boot-starters/{eden-dynamic-cache-spring-boot-starter => eden-common-cache-spring-boot-starter}/src/main/java/org/ylzl/eden/common/cache/spring/boot/autoconfigure/JdHotKeyAutoConfiguration.java (100%) rename eden-components/eden-spring-boot-starters/{eden-dynamic-cache-spring-boot-starter => eden-common-cache-spring-boot-starter}/src/main/java/org/ylzl/eden/common/cache/spring/boot/autoconfigure/SentinelHotKeyAutoConfiguration.java (100%) rename eden-components/eden-spring-boot-starters/{eden-dynamic-cache-spring-boot-starter => eden-common-cache-spring-boot-starter}/src/main/java/org/ylzl/eden/common/cache/spring/boot/autoconfigure/package-info.java (100%) rename eden-components/eden-spring-boot-starters/{eden-dynamic-cache-spring-boot-starter => eden-common-cache-spring-boot-starter}/src/main/java/org/ylzl/eden/common/cache/spring/boot/env/CacheProperties.java (100%) rename eden-components/eden-spring-boot-starters/{eden-dynamic-cache-spring-boot-starter => eden-common-cache-spring-boot-starter}/src/main/java/org/ylzl/eden/common/cache/spring/boot/env/package-info.java (100%) rename eden-components/eden-spring-boot-starters/{eden-dynamic-cache-spring-boot-starter => eden-common-cache-spring-boot-starter}/src/main/java/org/ylzl/eden/common/cache/spring/boot/package-info.java (100%) rename eden-components/eden-spring-boot-starters/{eden-dynamic-cache-spring-boot-starter => eden-common-cache-spring-boot-starter}/src/main/resources/META-INF/spring.factories (100%) rename eden-components/eden-spring-boot-starters/{eden-dynamic-mail-spring-boot-starter => eden-common-cache-spring-boot-starter}/src/test/java/.gitkeep (100%) rename eden-components/eden-spring-boot-starters/{eden-dynamic-mail-spring-boot-starter => eden-common-cache-spring-boot-starter}/src/test/resources/.gitkeep (100%) rename eden-components/eden-spring-boot-starters/{eden-dynamic-mail-spring-boot-starter => eden-common-mail-spring-boot-starter}/pom.xml (90%) rename eden-components/eden-spring-boot-starters/{eden-dynamic-mail-spring-boot-starter => eden-common-mail-spring-boot-starter}/src/main/java/org/ylzl/eden/common/mail/spring/boot/autoconfigure/JavaMailAutoConfiguration.java (100%) rename eden-components/eden-spring-boot-starters/{eden-dynamic-mail-spring-boot-starter => eden-common-mail-spring-boot-starter}/src/main/java/org/ylzl/eden/common/mail/spring/boot/autoconfigure/MailAutoConfiguration.java (100%) rename eden-components/eden-spring-boot-starters/{eden-dynamic-mail-spring-boot-starter => eden-common-mail-spring-boot-starter}/src/main/java/org/ylzl/eden/common/mail/spring/boot/env/MailProperties.java (100%) rename eden-components/eden-spring-boot-starters/{eden-dynamic-mail-spring-boot-starter => eden-common-mail-spring-boot-starter}/src/main/java/org/ylzl/eden/common/mail/spring/boot/support/MailHelper.java (100%) rename eden-components/eden-spring-boot-starters/{eden-dynamic-mail-spring-boot-starter => eden-common-mail-spring-boot-starter}/src/main/resources/META-INF/spring.factories (100%) rename eden-components/eden-spring-boot-starters/{eden-dynamic-mq-spring-boot-starter => eden-common-mail-spring-boot-starter}/src/test/java/.gitkeep (100%) rename eden-components/eden-spring-boot-starters/{eden-dynamic-mq-spring-boot-starter => eden-common-mail-spring-boot-starter}/src/test/resources/.gitkeep (100%) rename eden-components/eden-spring-boot-starters/{eden-dynamic-mq-spring-boot-starter => eden-common-mq-spring-boot-starter}/pom.xml (91%) rename eden-components/eden-spring-boot-starters/{eden-dynamic-mq-spring-boot-starter => eden-common-mq-spring-boot-starter}/src/main/java/org/ylzl/eden/common/mq/spring/boot/autoconfigure/KafkaMessageQueueAutoConfiguration.java (100%) rename eden-components/eden-spring-boot-starters/{eden-dynamic-mq-spring-boot-starter => eden-common-mq-spring-boot-starter}/src/main/java/org/ylzl/eden/common/mq/spring/boot/autoconfigure/MessageQueueAutoConfiguration.java (100%) rename eden-components/eden-spring-boot-starters/{eden-dynamic-mq-spring-boot-starter => eden-common-mq-spring-boot-starter}/src/main/java/org/ylzl/eden/common/mq/spring/boot/autoconfigure/RocketMQMessageQueueAutoConfiguration.java (100%) rename eden-components/eden-spring-boot-starters/{eden-dynamic-mq-spring-boot-starter => eden-common-mq-spring-boot-starter}/src/main/java/org/ylzl/eden/common/mq/spring/boot/autoconfigure/condition/ConditionalOnMessageQueue.java (100%) rename eden-components/eden-spring-boot-starters/{eden-dynamic-mq-spring-boot-starter => eden-common-mq-spring-boot-starter}/src/main/java/org/ylzl/eden/common/mq/spring/boot/autoconfigure/condition/OnMessageQueueCondition.java (100%) rename eden-components/eden-spring-boot-starters/{eden-dynamic-mq-spring-boot-starter => eden-common-mq-spring-boot-starter}/src/main/java/org/ylzl/eden/common/mq/spring/boot/env/MessageQueueProperties.java (100%) rename eden-components/eden-spring-boot-starters/{eden-dynamic-mq-spring-boot-starter => eden-common-mq-spring-boot-starter}/src/main/java/org/ylzl/eden/common/mq/spring/boot/env/RocketMQConsumerProperties.java (100%) rename eden-components/eden-spring-boot-starters/{eden-dynamic-mq-spring-boot-starter => eden-common-mq-spring-boot-starter}/src/main/java/org/ylzl/eden/common/mq/spring/boot/env/RocketMQProducerProperties.java (100%) rename eden-components/eden-spring-boot-starters/{eden-dynamic-mq-spring-boot-starter => eden-common-mq-spring-boot-starter}/src/main/java/org/ylzl/eden/common/mq/spring/boot/env/convertor/RocketMQConvertor.java (100%) rename eden-components/eden-spring-boot-starters/{eden-dynamic-mq-spring-boot-starter => eden-common-mq-spring-boot-starter}/src/main/java/org/ylzl/eden/common/mq/spring/boot/support/MessageQueueHelper.java (100%) rename eden-components/eden-spring-boot-starters/{eden-dynamic-mq-spring-boot-starter => eden-common-mq-spring-boot-starter}/src/main/resources/META-INF/spring.factories (100%) rename eden-components/eden-spring-boot-starters/{eden-dynamic-sms-spring-boot-starter => eden-common-mq-spring-boot-starter}/src/test/java/.gitkeep (100%) rename eden-components/eden-spring-boot-starters/{eden-dynamic-sms-spring-boot-starter => eden-common-mq-spring-boot-starter}/src/test/resources/.gitkeep (100%) rename eden-components/eden-spring-boot-starters/{eden-dynamic-sms-spring-boot-starter => eden-common-sms-spring-boot-starter}/pom.xml (90%) rename eden-components/eden-spring-boot-starters/{eden-dynamic-sms-spring-boot-starter => eden-common-sms-spring-boot-starter}/src/main/java/org/ylzl/eden/common/sms/spring/boot/autoconfigure/SmsAutoConfiguration.java (100%) rename eden-components/eden-spring-boot-starters/{eden-dynamic-sms-spring-boot-starter => eden-common-sms-spring-boot-starter}/src/main/java/org/ylzl/eden/common/sms/spring/boot/env/SmsProperties.java (100%) rename eden-components/eden-spring-boot-starters/{eden-dynamic-sms-spring-boot-starter => eden-common-sms-spring-boot-starter}/src/main/java/org/ylzl/eden/common/sms/spring/boot/support/SmsHelper.java (100%) rename eden-components/eden-spring-boot-starters/{eden-dynamic-sms-spring-boot-starter => eden-common-sms-spring-boot-starter}/src/main/resources/META-INF/spring.factories (100%) create mode 100644 eden-components/eden-spring-boot-starters/eden-common-sms-spring-boot-starter/src/test/java/.gitkeep create mode 100644 eden-components/eden-spring-boot-starters/eden-common-sms-spring-boot-starter/src/test/resources/.gitkeep create mode 100644 eden-components/eden-spring-cloud-starters/eden-dubbo-spring-cloud-starter/src/main/java/org/ylzl/eden/dubbo/spring/cloud/local/LocalFilter.java create mode 100644 eden-components/eden-spring-cloud-starters/eden-dubbo-spring-cloud-starter/src/main/java/org/ylzl/eden/dubbo/spring/cloud/local/LocalLoadBalance.java create mode 100644 eden-components/eden-spring-cloud-starters/eden-dubbo-spring-cloud-starter/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter create mode 100644 eden-components/eden-spring-cloud-starters/eden-dubbo-spring-cloud-starter/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.cluster.loadbalance diff --git a/eden-components/eden-dependencies/pom.xml b/eden-components/eden-dependencies/pom.xml index 8ebbd6a11..614cdb9fd 100644 --- a/eden-components/eden-dependencies/pom.xml +++ b/eden-components/eden-dependencies/pom.xml @@ -383,62 +383,62 @@ io.github.shiyindaxiaojie - eden-consistency-task + eden-common-cache 0.0.1-SNAPSHOT io.github.shiyindaxiaojie - eden-data-auditor + eden-common-excel 0.0.1-SNAPSHOT io.github.shiyindaxiaojie - eden-data-crypto + eden-common-mail 0.0.1-SNAPSHOT io.github.shiyindaxiaojie - eden-data-filter + eden-common-mq 0.0.1-SNAPSHOT io.github.shiyindaxiaojie - eden-distributed-lock + eden-common-security 0.0.1-SNAPSHOT io.github.shiyindaxiaojie - eden-distributed-uid + eden-common-sms 0.0.1-SNAPSHOT io.github.shiyindaxiaojie - eden-dynamic-cache + eden-consistency-task 0.0.1-SNAPSHOT io.github.shiyindaxiaojie - eden-dynamic-excel + eden-data-differ 0.0.1-SNAPSHOT io.github.shiyindaxiaojie - eden-dynamic-mail + eden-data-crypto 0.0.1-SNAPSHOT io.github.shiyindaxiaojie - eden-dynamic-mq + eden-sensitive-word 0.0.1-SNAPSHOT io.github.shiyindaxiaojie - eden-dynamic-security + eden-distributed-lock 0.0.1-SNAPSHOT io.github.shiyindaxiaojie - eden-dynamic-sms + eden-distributed-uid 0.0.1-SNAPSHOT @@ -468,11 +468,6 @@ eden-arthas-spring-boot-starter 0.0.1-SNAPSHOT - - io.github.shiyindaxiaojie - eden-data-filter-spring-boot-starter - 0.0.1-SNAPSHOT - io.github.shiyindaxiaojie eden-canel-spring-boot-starter @@ -485,57 +480,52 @@ io.github.shiyindaxiaojie - eden-consistency-task-spring-boot-starter + eden-common-cache-spring-boot-starter 0.0.1-SNAPSHOT io.github.shiyindaxiaojie - eden-curator-spring-boot-starter - 0.0.1-SNAPSHOT - - - io.github.shiyindaxiaojie - eden-distributed-lock-spring-boot-starter + eden-common-excel-spring-boot-starter 0.0.1-SNAPSHOT io.github.shiyindaxiaojie - eden-distributed-uid-spring-boot-starter + eden-common-mail-spring-boot-starter 0.0.1-SNAPSHOT io.github.shiyindaxiaojie - eden-druid-spring-boot-starter + eden-common-mq-spring-boot-starter 0.0.1-SNAPSHOT io.github.shiyindaxiaojie - eden-dynamic-cache-spring-boot-starter + eden-common-security-spring-boot-starter 0.0.1-SNAPSHOT io.github.shiyindaxiaojie - eden-dynamic-excel-spring-boot-starter + eden-common-sms-spring-boot-starter 0.0.1-SNAPSHOT io.github.shiyindaxiaojie - eden-dynamic-mail-spring-boot-starter + eden-curator-spring-boot-starter 0.0.1-SNAPSHOT io.github.shiyindaxiaojie - eden-dynamic-mq-spring-boot-starter + eden-distributed-lock-spring-boot-starter 0.0.1-SNAPSHOT io.github.shiyindaxiaojie - eden-dynamic-security-spring-boot-starter + eden-distributed-uid-spring-boot-starter 0.0.1-SNAPSHOT io.github.shiyindaxiaojie - eden-dynamic-sms-spring-boot-starter + eden-druid-spring-boot-starter 0.0.1-SNAPSHOT diff --git a/eden-components/eden-solutions/eden-dynamic-cache/pom.xml b/eden-components/eden-solutions/eden-common-cache/pom.xml similarity index 98% rename from eden-components/eden-solutions/eden-dynamic-cache/pom.xml rename to eden-components/eden-solutions/eden-common-cache/pom.xml index de14a6f4b..5669c5660 100644 --- a/eden-components/eden-solutions/eden-dynamic-cache/pom.xml +++ b/eden-components/eden-solutions/eden-common-cache/pom.xml @@ -26,7 +26,7 @@ 0.0.1-SNAPSHOT ../pom.xml - eden-dynamic-cache + eden-common-cache jar eden-dynamic-cache 通用缓存组件 diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/Cache.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/Cache.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/Cache.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/Cache.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/CacheType.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/CacheType.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/CacheType.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/CacheType.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/L1Cache.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/L1Cache.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/L1Cache.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/L1Cache.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/L2Cache.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/L2Cache.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/L2Cache.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/L2Cache.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/builder/AbstractCacheBuilder.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/builder/AbstractCacheBuilder.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/builder/AbstractCacheBuilder.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/builder/AbstractCacheBuilder.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/builder/AsyncCacheBuilder.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/builder/AsyncCacheBuilder.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/builder/AsyncCacheBuilder.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/builder/AsyncCacheBuilder.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/builder/CacheBuilder.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/builder/CacheBuilder.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/builder/CacheBuilder.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/builder/CacheBuilder.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/composite/CompositeCache.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/composite/CompositeCache.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/composite/CompositeCache.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/composite/CompositeCache.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/composite/CompositeCacheBuilder.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/composite/CompositeCacheBuilder.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/composite/CompositeCacheBuilder.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/composite/CompositeCacheBuilder.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/config/CacheConfig.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/config/CacheConfig.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/config/CacheConfig.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/config/CacheConfig.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/config/package-info.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/config/package-info.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/config/package-info.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/config/package-info.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/exception/TryLockFailedException.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/exception/TryLockFailedException.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/exception/TryLockFailedException.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/exception/TryLockFailedException.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/exception/ValueRetrievalException.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/exception/ValueRetrievalException.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/exception/ValueRetrievalException.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/exception/ValueRetrievalException.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/exception/package-info.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/exception/package-info.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/exception/package-info.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/exception/package-info.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/extension/CacheLoadingStrategy.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/extension/CacheLoadingStrategy.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/extension/CacheLoadingStrategy.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/extension/CacheLoadingStrategy.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/extension/package-info.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/extension/package-info.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/extension/package-info.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/extension/package-info.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/hotkey/HotKey.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/hotkey/HotKey.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/hotkey/HotKey.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/hotkey/HotKey.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/hotkey/HotKeyType.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/hotkey/HotKeyType.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/hotkey/HotKeyType.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/hotkey/HotKeyType.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/hotkey/package-info.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/hotkey/package-info.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/hotkey/package-info.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/hotkey/package-info.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/consistency/kafka/package-info.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/consistency/kafka/package-info.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/consistency/kafka/package-info.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/consistency/kafka/package-info.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/consistency/package-info.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/consistency/package-info.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/consistency/package-info.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/consistency/package-info.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/consistency/redis/package-info.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/consistency/redis/package-info.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/consistency/redis/package-info.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/consistency/redis/package-info.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/consistency/rocketmq/package-info.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/consistency/rocketmq/package-info.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/consistency/rocketmq/package-info.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/consistency/rocketmq/package-info.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/jd/JdHotKey.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/jd/JdHotKey.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/jd/JdHotKey.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/jd/JdHotKey.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/jd/JdHotKeyClient.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/jd/JdHotKeyClient.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/jd/JdHotKeyClient.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/jd/JdHotKeyClient.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/jd/package-info.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/jd/package-info.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/jd/package-info.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/jd/package-info.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/package-info.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/package-info.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/package-info.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/package-info.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/sentinel/ApolloSentinelHotKeyDataSource.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/sentinel/ApolloSentinelHotKeyDataSource.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/sentinel/ApolloSentinelHotKeyDataSource.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/sentinel/ApolloSentinelHotKeyDataSource.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/sentinel/EtcdSentinelHotKeyDataSource.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/sentinel/EtcdSentinelHotKeyDataSource.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/sentinel/EtcdSentinelHotKeyDataSource.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/sentinel/EtcdSentinelHotKeyDataSource.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/sentinel/NacosSentinelHotKeyDataSource.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/sentinel/NacosSentinelHotKeyDataSource.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/sentinel/NacosSentinelHotKeyDataSource.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/sentinel/NacosSentinelHotKeyDataSource.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/sentinel/SentinelHotKey.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/sentinel/SentinelHotKey.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/sentinel/SentinelHotKey.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/sentinel/SentinelHotKey.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/sentinel/SentinelHotKeyClient.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/sentinel/SentinelHotKeyClient.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/sentinel/SentinelHotKeyClient.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/sentinel/SentinelHotKeyClient.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/sentinel/SentinelHotKeyDataSource.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/sentinel/SentinelHotKeyDataSource.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/sentinel/SentinelHotKeyDataSource.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/sentinel/SentinelHotKeyDataSource.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/sentinel/ZookeeperSentinelHotKeyDataSource.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/sentinel/ZookeeperSentinelHotKeyDataSource.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/sentinel/ZookeeperSentinelHotKeyDataSource.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/sentinel/ZookeeperSentinelHotKeyDataSource.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/sentinel/package-info.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/sentinel/package-info.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/sentinel/package-info.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/hotkey/sentinel/package-info.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/l1cache/caffeine/CaffeineCache.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/l1cache/caffeine/CaffeineCache.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/l1cache/caffeine/CaffeineCache.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/l1cache/caffeine/CaffeineCache.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/l1cache/caffeine/CaffeineCacheBuilder.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/l1cache/caffeine/CaffeineCacheBuilder.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/l1cache/caffeine/CaffeineCacheBuilder.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/l1cache/caffeine/CaffeineCacheBuilder.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/l1cache/caffeine/package-info.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/l1cache/caffeine/package-info.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/l1cache/caffeine/package-info.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/l1cache/caffeine/package-info.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/l1cache/guava/GuavaCache.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/l1cache/guava/GuavaCache.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/l1cache/guava/GuavaCache.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/l1cache/guava/GuavaCache.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/l1cache/guava/GuavaCacheBuilder.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/l1cache/guava/GuavaCacheBuilder.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/l1cache/guava/GuavaCacheBuilder.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/l1cache/guava/GuavaCacheBuilder.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/l1cache/guava/package-info.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/l1cache/guava/package-info.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/l1cache/guava/package-info.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/l1cache/guava/package-info.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/l1cache/package-info.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/l1cache/package-info.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/l1cache/package-info.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/l1cache/package-info.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/l2cache/dragonfly/package-info.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/l2cache/dragonfly/package-info.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/l2cache/dragonfly/package-info.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/l2cache/dragonfly/package-info.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/l2cache/package-info.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/l2cache/package-info.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/l2cache/package-info.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/l2cache/package-info.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/l2cache/redis/RedisCache.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/l2cache/redis/RedisCache.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/l2cache/redis/RedisCache.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/l2cache/redis/RedisCache.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/l2cache/redis/RedisCacheBuilder.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/l2cache/redis/RedisCacheBuilder.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/l2cache/redis/RedisCacheBuilder.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/l2cache/redis/RedisCacheBuilder.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/l2cache/redis/package-info.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/l2cache/redis/package-info.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/integration/l2cache/redis/package-info.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/integration/l2cache/redis/package-info.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/l1cache/AsyncL1CacheLoader.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/l1cache/AsyncL1CacheLoader.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/l1cache/AsyncL1CacheLoader.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/l1cache/AsyncL1CacheLoader.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/l1cache/AsyncL1CacheRemovalListener.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/l1cache/AsyncL1CacheRemovalListener.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/l1cache/AsyncL1CacheRemovalListener.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/l1cache/AsyncL1CacheRemovalListener.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/l1cache/InternalL1CacheRemovalListener.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/l1cache/InternalL1CacheRemovalListener.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/l1cache/InternalL1CacheRemovalListener.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/l1cache/InternalL1CacheRemovalListener.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/l1cache/L1CacheLoader.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/l1cache/L1CacheLoader.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/l1cache/L1CacheLoader.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/l1cache/L1CacheLoader.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/l1cache/L1CacheRemovalCause.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/l1cache/L1CacheRemovalCause.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/l1cache/L1CacheRemovalCause.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/l1cache/L1CacheRemovalCause.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/l1cache/L1CacheRemovalListener.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/l1cache/L1CacheRemovalListener.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/l1cache/L1CacheRemovalListener.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/l1cache/L1CacheRemovalListener.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/l1cache/package-info.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/l1cache/package-info.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/l1cache/package-info.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/l1cache/package-info.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/l2cache/CacheSyncListener.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/l2cache/CacheSyncListener.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/l2cache/CacheSyncListener.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/l2cache/CacheSyncListener.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/l2cache/CacheSyncType.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/l2cache/CacheSyncType.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/l2cache/CacheSyncType.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/l2cache/CacheSyncType.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/l2cache/CacheSynchronizer.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/l2cache/CacheSynchronizer.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/l2cache/CacheSynchronizer.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/l2cache/CacheSynchronizer.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/l2cache/model/CacheMessage.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/l2cache/model/CacheMessage.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/l2cache/model/CacheMessage.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/l2cache/model/CacheMessage.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/l2cache/package-info.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/l2cache/package-info.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/l2cache/package-info.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/l2cache/package-info.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/package-info.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/package-info.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/package-info.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/package-info.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/support/AbstractAdaptingCache.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/support/AbstractAdaptingCache.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/support/AbstractAdaptingCache.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/support/AbstractAdaptingCache.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/support/spring/DynamicCache.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/support/spring/DynamicCache.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/support/spring/DynamicCache.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/support/spring/DynamicCache.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/support/spring/DynamicCacheManager.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/support/spring/DynamicCacheManager.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/support/spring/DynamicCacheManager.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/support/spring/DynamicCacheManager.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/support/value/NullValue.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/support/value/NullValue.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/support/value/NullValue.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/support/value/NullValue.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/support/value/package-info.java b/eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/support/value/package-info.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/java/org/ylzl/eden/common/cache/support/value/package-info.java rename to eden-components/eden-solutions/eden-common-cache/src/main/java/org/ylzl/eden/common/cache/support/value/package-info.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/resources/META-INF/cache/org.ylzl.eden.dynamic.cache.builder.CacheBuilder b/eden-components/eden-solutions/eden-common-cache/src/main/resources/META-INF/cache/org.ylzl.eden.dynamic.cache.builder.CacheBuilder similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/resources/META-INF/cache/org.ylzl.eden.dynamic.cache.builder.CacheBuilder rename to eden-components/eden-solutions/eden-common-cache/src/main/resources/META-INF/cache/org.ylzl.eden.dynamic.cache.builder.CacheBuilder diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/resources/META-INF/cache/org.ylzl.eden.dynamic.cache.hotkey.HotKey b/eden-components/eden-solutions/eden-common-cache/src/main/resources/META-INF/cache/org.ylzl.eden.dynamic.cache.hotkey.HotKey similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/resources/META-INF/cache/org.ylzl.eden.dynamic.cache.hotkey.HotKey rename to eden-components/eden-solutions/eden-common-cache/src/main/resources/META-INF/cache/org.ylzl.eden.dynamic.cache.hotkey.HotKey diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/resources/META-INF/cache/org.ylzl.eden.dynamic.cache.integration.hotkey.sentinel.SentinelHotKeyDataSource b/eden-components/eden-solutions/eden-common-cache/src/main/resources/META-INF/cache/org.ylzl.eden.dynamic.cache.integration.hotkey.sentinel.SentinelHotKeyDataSource similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/resources/META-INF/cache/org.ylzl.eden.dynamic.cache.integration.hotkey.sentinel.SentinelHotKeyDataSource rename to eden-components/eden-solutions/eden-common-cache/src/main/resources/META-INF/cache/org.ylzl.eden.dynamic.cache.integration.hotkey.sentinel.SentinelHotKeyDataSource diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/resources/META-INF/cache/org.ylzl.eden.dynamic.cache.l1cache.L1CacheRemovalListener b/eden-components/eden-solutions/eden-common-cache/src/main/resources/META-INF/cache/org.ylzl.eden.dynamic.cache.l1cache.L1CacheRemovalListener similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/resources/META-INF/cache/org.ylzl.eden.dynamic.cache.l1cache.L1CacheRemovalListener rename to eden-components/eden-solutions/eden-common-cache/src/main/resources/META-INF/cache/org.ylzl.eden.dynamic.cache.l1cache.L1CacheRemovalListener diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/main/resources/META-INF/services/org.ylzl.eden.extension.strategy.LoadingStrategy b/eden-components/eden-solutions/eden-common-cache/src/main/resources/META-INF/services/org.ylzl.eden.extension.strategy.LoadingStrategy similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/main/resources/META-INF/services/org.ylzl.eden.extension.strategy.LoadingStrategy rename to eden-components/eden-solutions/eden-common-cache/src/main/resources/META-INF/services/org.ylzl.eden.extension.strategy.LoadingStrategy diff --git a/eden-components/eden-solutions/eden-data-auditor/src/test/resources/.gitkeep b/eden-components/eden-solutions/eden-common-cache/src/test/java/.gitkeep similarity index 100% rename from eden-components/eden-solutions/eden-data-auditor/src/test/resources/.gitkeep rename to eden-components/eden-solutions/eden-common-cache/src/test/java/.gitkeep diff --git a/eden-components/eden-solutions/eden-data-filter/src/test/resources/.gitkeep b/eden-components/eden-solutions/eden-common-cache/src/test/resources/.gitkeep similarity index 100% rename from eden-components/eden-solutions/eden-data-filter/src/test/resources/.gitkeep rename to eden-components/eden-solutions/eden-common-cache/src/test/resources/.gitkeep diff --git a/eden-components/eden-solutions/eden-dynamic-excel/pom.xml b/eden-components/eden-solutions/eden-common-excel/pom.xml similarity index 98% rename from eden-components/eden-solutions/eden-dynamic-excel/pom.xml rename to eden-components/eden-solutions/eden-common-excel/pom.xml index e9d210d15..ba82d7841 100644 --- a/eden-components/eden-solutions/eden-dynamic-excel/pom.xml +++ b/eden-components/eden-solutions/eden-common-excel/pom.xml @@ -26,7 +26,7 @@ 0.0.1-SNAPSHOT ../pom.xml - eden-dynamic-excel + eden-common-excel jar eden-dynamic-excel 通用Excel组件 diff --git a/eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/ExcelExporter.java b/eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/ExcelExporter.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/ExcelExporter.java rename to eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/ExcelExporter.java diff --git a/eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/ExcelImporter.java b/eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/ExcelImporter.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/ExcelImporter.java rename to eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/ExcelImporter.java diff --git a/eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/ExcelLine.java b/eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/ExcelLine.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/ExcelLine.java rename to eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/ExcelLine.java diff --git a/eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/ExcelReader.java b/eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/ExcelReader.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/ExcelReader.java rename to eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/ExcelReader.java diff --git a/eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/ExcelType.java b/eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/ExcelType.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/ExcelType.java rename to eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/ExcelType.java diff --git a/eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/ExcelWriter.java b/eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/ExcelWriter.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/ExcelWriter.java rename to eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/ExcelWriter.java diff --git a/eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/aop/package-info.java b/eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/aop/package-info.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/aop/package-info.java rename to eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/aop/package-info.java diff --git a/eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/builder/AbstractExcelReaderBuilder.java b/eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/builder/AbstractExcelReaderBuilder.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/builder/AbstractExcelReaderBuilder.java rename to eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/builder/AbstractExcelReaderBuilder.java diff --git a/eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/builder/AbstractExcelWriterBuilder.java b/eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/builder/AbstractExcelWriterBuilder.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/builder/AbstractExcelWriterBuilder.java rename to eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/builder/AbstractExcelWriterBuilder.java diff --git a/eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/builder/ExcelReaderBuilder.java b/eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/builder/ExcelReaderBuilder.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/builder/ExcelReaderBuilder.java rename to eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/builder/ExcelReaderBuilder.java diff --git a/eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/builder/ExcelWriterBuilder.java b/eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/builder/ExcelWriterBuilder.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/builder/ExcelWriterBuilder.java rename to eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/builder/ExcelWriterBuilder.java diff --git a/eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/builder/package-info.java b/eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/builder/package-info.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/builder/package-info.java rename to eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/builder/package-info.java diff --git a/eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/config/ExcelConfig.java b/eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/config/ExcelConfig.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/config/ExcelConfig.java rename to eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/config/ExcelConfig.java diff --git a/eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/config/package-info.java b/eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/config/package-info.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/config/package-info.java rename to eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/config/package-info.java diff --git a/eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/exception/package-info.java b/eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/exception/package-info.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/exception/package-info.java rename to eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/exception/package-info.java diff --git a/eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/exporter/ExcelExportHandler.java b/eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/exporter/ExcelExportHandler.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/exporter/ExcelExportHandler.java rename to eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/exporter/ExcelExportHandler.java diff --git a/eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/exporter/package-info.java b/eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/exporter/package-info.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/exporter/package-info.java rename to eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/exporter/package-info.java diff --git a/eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/extension/ExcelLoadingStrategy.java b/eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/extension/ExcelLoadingStrategy.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/extension/ExcelLoadingStrategy.java rename to eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/extension/ExcelLoadingStrategy.java diff --git a/eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/extension/package-info.java b/eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/extension/package-info.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/extension/package-info.java rename to eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/extension/package-info.java diff --git a/eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/importer/ExcelImportHandler.java b/eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/importer/ExcelImportHandler.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/importer/ExcelImportHandler.java rename to eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/importer/ExcelImportHandler.java diff --git a/eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/importer/package-info.java b/eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/importer/package-info.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/importer/package-info.java rename to eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/importer/package-info.java diff --git a/eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/integration/easyexcel/EasyExcelReader.java b/eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/integration/easyexcel/EasyExcelReader.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/integration/easyexcel/EasyExcelReader.java rename to eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/integration/easyexcel/EasyExcelReader.java diff --git a/eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/integration/easyexcel/EasyExcelReaderBuilder.java b/eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/integration/easyexcel/EasyExcelReaderBuilder.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/integration/easyexcel/EasyExcelReaderBuilder.java rename to eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/integration/easyexcel/EasyExcelReaderBuilder.java diff --git a/eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/integration/easyexcel/EasyExcelWriter.java b/eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/integration/easyexcel/EasyExcelWriter.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/integration/easyexcel/EasyExcelWriter.java rename to eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/integration/easyexcel/EasyExcelWriter.java diff --git a/eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/integration/easyexcel/EasyExcelWriterBuilder.java b/eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/integration/easyexcel/EasyExcelWriterBuilder.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/integration/easyexcel/EasyExcelWriterBuilder.java rename to eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/integration/easyexcel/EasyExcelWriterBuilder.java diff --git a/eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/integration/easyexcel/converter/LocalDateConverter.java b/eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/integration/easyexcel/converter/LocalDateConverter.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/integration/easyexcel/converter/LocalDateConverter.java rename to eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/integration/easyexcel/converter/LocalDateConverter.java diff --git a/eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/integration/easyexcel/converter/LocalDateTimeConverter.java b/eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/integration/easyexcel/converter/LocalDateTimeConverter.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/integration/easyexcel/converter/LocalDateTimeConverter.java rename to eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/integration/easyexcel/converter/LocalDateTimeConverter.java diff --git a/eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/integration/easyexcel/converter/SexConverter.java b/eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/integration/easyexcel/converter/SexConverter.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/integration/easyexcel/converter/SexConverter.java rename to eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/integration/easyexcel/converter/SexConverter.java diff --git a/eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/integration/easyexcel/i18n/I18nCellWriteHandler.java b/eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/integration/easyexcel/i18n/I18nCellWriteHandler.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/integration/easyexcel/i18n/I18nCellWriteHandler.java rename to eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/integration/easyexcel/i18n/I18nCellWriteHandler.java diff --git a/eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/integration/easyexcel/package-info.java b/eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/integration/easyexcel/package-info.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/integration/easyexcel/package-info.java rename to eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/integration/easyexcel/package-info.java diff --git a/eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/integration/easypoi/package-info.java b/eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/integration/easypoi/package-info.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/integration/easypoi/package-info.java rename to eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/integration/easypoi/package-info.java diff --git a/eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/integration/package-info.java b/eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/integration/package-info.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/integration/package-info.java rename to eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/integration/package-info.java diff --git a/eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/model/ValidationErrors.java b/eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/model/ValidationErrors.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/model/ValidationErrors.java rename to eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/model/ValidationErrors.java diff --git a/eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/package-info.java b/eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/package-info.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/package-info.java rename to eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/package-info.java diff --git a/eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/reader/ExcelReadListener.java b/eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/reader/ExcelReadListener.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/reader/ExcelReadListener.java rename to eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/reader/ExcelReadListener.java diff --git a/eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/reader/PersistenceExcelReadListener.java b/eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/reader/PersistenceExcelReadListener.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/reader/PersistenceExcelReadListener.java rename to eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/reader/PersistenceExcelReadListener.java diff --git a/eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/reader/package-info.java b/eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/reader/package-info.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/reader/package-info.java rename to eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/reader/package-info.java diff --git a/eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/support/ExcelHelper.java b/eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/support/ExcelHelper.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/support/ExcelHelper.java rename to eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/support/ExcelHelper.java diff --git a/eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/support/package-info.java b/eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/support/package-info.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/support/package-info.java rename to eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/support/package-info.java diff --git a/eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/writer/AbstractExcelWriteHandler.java b/eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/writer/AbstractExcelWriteHandler.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/writer/AbstractExcelWriteHandler.java rename to eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/writer/AbstractExcelWriteHandler.java diff --git a/eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/writer/ExcelWriteHandler.java b/eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/writer/ExcelWriteHandler.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/writer/ExcelWriteHandler.java rename to eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/writer/ExcelWriteHandler.java diff --git a/eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/writer/ExcelWriteMeta.java b/eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/writer/ExcelWriteMeta.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/writer/ExcelWriteMeta.java rename to eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/writer/ExcelWriteMeta.java diff --git a/eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/writer/package-info.java b/eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/writer/package-info.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/writer/package-info.java rename to eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/writer/package-info.java diff --git a/eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/writer/sheet/Sheet.java b/eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/writer/sheet/Sheet.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/writer/sheet/Sheet.java rename to eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/writer/sheet/Sheet.java diff --git a/eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/writer/sheet/SheetHead.java b/eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/writer/sheet/SheetHead.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/writer/sheet/SheetHead.java rename to eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/writer/sheet/SheetHead.java diff --git a/eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/writer/sheet/SheetHeadGenerator.java b/eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/writer/sheet/SheetHeadGenerator.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/writer/sheet/SheetHeadGenerator.java rename to eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/writer/sheet/SheetHeadGenerator.java diff --git a/eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/writer/sheet/package-info.java b/eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/writer/sheet/package-info.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-excel/src/main/java/org/ylzl/eden/common/excel/writer/sheet/package-info.java rename to eden-components/eden-solutions/eden-common-excel/src/main/java/org/ylzl/eden/common/excel/writer/sheet/package-info.java diff --git a/eden-components/eden-solutions/eden-dynamic-excel/src/main/resources/META-INF/excel/org.ylzl.eden.common.excel.builder.ExcelReaderBuilder b/eden-components/eden-solutions/eden-common-excel/src/main/resources/META-INF/excel/org.ylzl.eden.common.excel.builder.ExcelReaderBuilder similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-excel/src/main/resources/META-INF/excel/org.ylzl.eden.common.excel.builder.ExcelReaderBuilder rename to eden-components/eden-solutions/eden-common-excel/src/main/resources/META-INF/excel/org.ylzl.eden.common.excel.builder.ExcelReaderBuilder diff --git a/eden-components/eden-solutions/eden-dynamic-excel/src/main/resources/META-INF/excel/org.ylzl.eden.common.excel.builder.ExcelWriterBuilder b/eden-components/eden-solutions/eden-common-excel/src/main/resources/META-INF/excel/org.ylzl.eden.common.excel.builder.ExcelWriterBuilder similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-excel/src/main/resources/META-INF/excel/org.ylzl.eden.common.excel.builder.ExcelWriterBuilder rename to eden-components/eden-solutions/eden-common-excel/src/main/resources/META-INF/excel/org.ylzl.eden.common.excel.builder.ExcelWriterBuilder diff --git a/eden-components/eden-solutions/eden-dynamic-excel/src/main/resources/META-INF/services/org.ylzl.eden.extension.strategy.LoadingStrategy b/eden-components/eden-solutions/eden-common-excel/src/main/resources/META-INF/services/org.ylzl.eden.extension.strategy.LoadingStrategy similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-excel/src/main/resources/META-INF/services/org.ylzl.eden.extension.strategy.LoadingStrategy rename to eden-components/eden-solutions/eden-common-excel/src/main/resources/META-INF/services/org.ylzl.eden.extension.strategy.LoadingStrategy diff --git a/eden-components/eden-solutions/eden-dynamic-excel/src/test/groovy/org/ylzl/eden/common/excel/ExcelReaderTest.groovy b/eden-components/eden-solutions/eden-common-excel/src/test/groovy/org/ylzl/eden/common/excel/ExcelReaderTest.groovy similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-excel/src/test/groovy/org/ylzl/eden/common/excel/ExcelReaderTest.groovy rename to eden-components/eden-solutions/eden-common-excel/src/test/groovy/org/ylzl/eden/common/excel/ExcelReaderTest.groovy diff --git a/eden-components/eden-solutions/eden-dynamic-excel/src/test/groovy/org/ylzl/eden/common/excel/ExcelWriterTest.groovy b/eden-components/eden-solutions/eden-common-excel/src/test/groovy/org/ylzl/eden/common/excel/ExcelWriterTest.groovy similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-excel/src/test/groovy/org/ylzl/eden/common/excel/ExcelWriterTest.groovy rename to eden-components/eden-solutions/eden-common-excel/src/test/groovy/org/ylzl/eden/common/excel/ExcelWriterTest.groovy diff --git a/eden-components/eden-solutions/eden-dynamic-excel/src/test/java/org/ylzl/eden/common/excel/TestCase.java b/eden-components/eden-solutions/eden-common-excel/src/test/java/org/ylzl/eden/common/excel/TestCase.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-excel/src/test/java/org/ylzl/eden/common/excel/TestCase.java rename to eden-components/eden-solutions/eden-common-excel/src/test/java/org/ylzl/eden/common/excel/TestCase.java diff --git a/eden-components/eden-solutions/eden-dynamic-excel/src/test/resources/test/test-case.xlsx b/eden-components/eden-solutions/eden-common-excel/src/test/resources/test/test-case.xlsx similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-excel/src/test/resources/test/test-case.xlsx rename to eden-components/eden-solutions/eden-common-excel/src/test/resources/test/test-case.xlsx diff --git a/eden-components/eden-solutions/eden-dynamic-mail/pom.xml b/eden-components/eden-solutions/eden-common-mail/pom.xml similarity index 97% rename from eden-components/eden-solutions/eden-dynamic-mail/pom.xml rename to eden-components/eden-solutions/eden-common-mail/pom.xml index 0f9f8771f..44e394573 100644 --- a/eden-components/eden-solutions/eden-dynamic-mail/pom.xml +++ b/eden-components/eden-solutions/eden-common-mail/pom.xml @@ -26,7 +26,7 @@ 0.0.1-SNAPSHOT ../pom.xml - eden-dynamic-mail + eden-common-mail jar eden-dynamic-mail 通用邮件组件 diff --git a/eden-components/eden-solutions/eden-dynamic-mail/src/main/java/org/ylzl/eden/common/mail/MailTemplate.java b/eden-components/eden-solutions/eden-common-mail/src/main/java/org/ylzl/eden/common/mail/MailTemplate.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-mail/src/main/java/org/ylzl/eden/common/mail/MailTemplate.java rename to eden-components/eden-solutions/eden-common-mail/src/main/java/org/ylzl/eden/common/mail/MailTemplate.java diff --git a/eden-components/eden-solutions/eden-dynamic-mail/src/main/java/org/ylzl/eden/common/mail/MailType.java b/eden-components/eden-solutions/eden-common-mail/src/main/java/org/ylzl/eden/common/mail/MailType.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-mail/src/main/java/org/ylzl/eden/common/mail/MailType.java rename to eden-components/eden-solutions/eden-common-mail/src/main/java/org/ylzl/eden/common/mail/MailType.java diff --git a/eden-components/eden-solutions/eden-dynamic-mail/src/main/java/org/ylzl/eden/common/mail/exception/MailServerException.java b/eden-components/eden-solutions/eden-common-mail/src/main/java/org/ylzl/eden/common/mail/exception/MailServerException.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-mail/src/main/java/org/ylzl/eden/common/mail/exception/MailServerException.java rename to eden-components/eden-solutions/eden-common-mail/src/main/java/org/ylzl/eden/common/mail/exception/MailServerException.java diff --git a/eden-components/eden-solutions/eden-dynamic-mail/src/main/java/org/ylzl/eden/common/mail/exception/MailServerTimeoutException.java b/eden-components/eden-solutions/eden-common-mail/src/main/java/org/ylzl/eden/common/mail/exception/MailServerTimeoutException.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-mail/src/main/java/org/ylzl/eden/common/mail/exception/MailServerTimeoutException.java rename to eden-components/eden-solutions/eden-common-mail/src/main/java/org/ylzl/eden/common/mail/exception/MailServerTimeoutException.java diff --git a/eden-components/eden-solutions/eden-dynamic-mail/src/main/java/org/ylzl/eden/common/mail/exception/SendMailException.java b/eden-components/eden-solutions/eden-common-mail/src/main/java/org/ylzl/eden/common/mail/exception/SendMailException.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-mail/src/main/java/org/ylzl/eden/common/mail/exception/SendMailException.java rename to eden-components/eden-solutions/eden-common-mail/src/main/java/org/ylzl/eden/common/mail/exception/SendMailException.java diff --git a/eden-components/eden-solutions/eden-dynamic-mail/src/main/java/org/ylzl/eden/common/mail/exception/package-info.java b/eden-components/eden-solutions/eden-common-mail/src/main/java/org/ylzl/eden/common/mail/exception/package-info.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-mail/src/main/java/org/ylzl/eden/common/mail/exception/package-info.java rename to eden-components/eden-solutions/eden-common-mail/src/main/java/org/ylzl/eden/common/mail/exception/package-info.java diff --git a/eden-components/eden-solutions/eden-dynamic-mail/src/main/java/org/ylzl/eden/common/mail/integration/javamail/JavaMailTemplate.java b/eden-components/eden-solutions/eden-common-mail/src/main/java/org/ylzl/eden/common/mail/integration/javamail/JavaMailTemplate.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-mail/src/main/java/org/ylzl/eden/common/mail/integration/javamail/JavaMailTemplate.java rename to eden-components/eden-solutions/eden-common-mail/src/main/java/org/ylzl/eden/common/mail/integration/javamail/JavaMailTemplate.java diff --git a/eden-components/eden-solutions/eden-dynamic-mail/src/main/java/org/ylzl/eden/common/mail/integration/javamail/package-info.java b/eden-components/eden-solutions/eden-common-mail/src/main/java/org/ylzl/eden/common/mail/integration/javamail/package-info.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-mail/src/main/java/org/ylzl/eden/common/mail/integration/javamail/package-info.java rename to eden-components/eden-solutions/eden-common-mail/src/main/java/org/ylzl/eden/common/mail/integration/javamail/package-info.java diff --git a/eden-components/eden-solutions/eden-dynamic-mail/src/main/java/org/ylzl/eden/common/mail/integration/package-info.java b/eden-components/eden-solutions/eden-common-mail/src/main/java/org/ylzl/eden/common/mail/integration/package-info.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-mail/src/main/java/org/ylzl/eden/common/mail/integration/package-info.java rename to eden-components/eden-solutions/eden-common-mail/src/main/java/org/ylzl/eden/common/mail/integration/package-info.java diff --git a/eden-components/eden-solutions/eden-dynamic-mail/src/main/java/org/ylzl/eden/common/mail/model/Mail.java b/eden-components/eden-solutions/eden-common-mail/src/main/java/org/ylzl/eden/common/mail/model/Mail.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-mail/src/main/java/org/ylzl/eden/common/mail/model/Mail.java rename to eden-components/eden-solutions/eden-common-mail/src/main/java/org/ylzl/eden/common/mail/model/Mail.java diff --git a/eden-components/eden-solutions/eden-dynamic-mail/src/main/java/org/ylzl/eden/common/mail/model/multi/MultiSendMailRequest.java b/eden-components/eden-solutions/eden-common-mail/src/main/java/org/ylzl/eden/common/mail/model/multi/MultiSendMailRequest.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-mail/src/main/java/org/ylzl/eden/common/mail/model/multi/MultiSendMailRequest.java rename to eden-components/eden-solutions/eden-common-mail/src/main/java/org/ylzl/eden/common/mail/model/multi/MultiSendMailRequest.java diff --git a/eden-components/eden-solutions/eden-dynamic-mail/src/main/java/org/ylzl/eden/common/mail/model/multi/MultiSendMailResponse.java b/eden-components/eden-solutions/eden-common-mail/src/main/java/org/ylzl/eden/common/mail/model/multi/MultiSendMailResponse.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-mail/src/main/java/org/ylzl/eden/common/mail/model/multi/MultiSendMailResponse.java rename to eden-components/eden-solutions/eden-common-mail/src/main/java/org/ylzl/eden/common/mail/model/multi/MultiSendMailResponse.java diff --git a/eden-components/eden-solutions/eden-dynamic-mail/src/main/java/org/ylzl/eden/common/mail/model/package-info.java b/eden-components/eden-solutions/eden-common-mail/src/main/java/org/ylzl/eden/common/mail/model/package-info.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-mail/src/main/java/org/ylzl/eden/common/mail/model/package-info.java rename to eden-components/eden-solutions/eden-common-mail/src/main/java/org/ylzl/eden/common/mail/model/package-info.java diff --git a/eden-components/eden-solutions/eden-dynamic-mail/src/main/java/org/ylzl/eden/common/mail/model/single/SingleSendMailRequest.java b/eden-components/eden-solutions/eden-common-mail/src/main/java/org/ylzl/eden/common/mail/model/single/SingleSendMailRequest.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-mail/src/main/java/org/ylzl/eden/common/mail/model/single/SingleSendMailRequest.java rename to eden-components/eden-solutions/eden-common-mail/src/main/java/org/ylzl/eden/common/mail/model/single/SingleSendMailRequest.java diff --git a/eden-components/eden-solutions/eden-dynamic-mail/src/main/java/org/ylzl/eden/common/mail/model/single/SingleSendMailResponse.java b/eden-components/eden-solutions/eden-common-mail/src/main/java/org/ylzl/eden/common/mail/model/single/SingleSendMailResponse.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-mail/src/main/java/org/ylzl/eden/common/mail/model/single/SingleSendMailResponse.java rename to eden-components/eden-solutions/eden-common-mail/src/main/java/org/ylzl/eden/common/mail/model/single/SingleSendMailResponse.java diff --git a/eden-components/eden-solutions/eden-dynamic-mail/src/main/java/org/ylzl/eden/common/mail/package-info.java b/eden-components/eden-solutions/eden-common-mail/src/main/java/org/ylzl/eden/common/mail/package-info.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-mail/src/main/java/org/ylzl/eden/common/mail/package-info.java rename to eden-components/eden-solutions/eden-common-mail/src/main/java/org/ylzl/eden/common/mail/package-info.java diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/test/java/.gitkeep b/eden-components/eden-solutions/eden-common-mail/src/main/resources/.gitkeep similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/test/java/.gitkeep rename to eden-components/eden-solutions/eden-common-mail/src/main/resources/.gitkeep diff --git a/eden-components/eden-solutions/eden-dynamic-cache/src/test/resources/.gitkeep b/eden-components/eden-solutions/eden-common-mail/src/test/java/.gitkeep similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-cache/src/test/resources/.gitkeep rename to eden-components/eden-solutions/eden-common-mail/src/test/java/.gitkeep diff --git a/eden-components/eden-solutions/eden-dynamic-mail/src/main/resources/.gitkeep b/eden-components/eden-solutions/eden-common-mail/src/test/resources/.gitkeep similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-mail/src/main/resources/.gitkeep rename to eden-components/eden-solutions/eden-common-mail/src/test/resources/.gitkeep diff --git a/eden-components/eden-solutions/eden-dynamic-mq/pom.xml b/eden-components/eden-solutions/eden-common-mq/pom.xml similarity index 98% rename from eden-components/eden-solutions/eden-dynamic-mq/pom.xml rename to eden-components/eden-solutions/eden-common-mq/pom.xml index 888e1674b..f94ecd1fe 100644 --- a/eden-components/eden-solutions/eden-dynamic-mq/pom.xml +++ b/eden-components/eden-solutions/eden-common-mq/pom.xml @@ -26,7 +26,7 @@ 0.0.1-SNAPSHOT ../pom.xml - eden-dynamic-mq + eden-common-mq jar eden-dynamic-mq 通用消息队列组件 diff --git a/eden-components/eden-solutions/eden-dynamic-mq/src/main/java/org/ylzl/eden/common/mq/MessageQueueConsumer.java b/eden-components/eden-solutions/eden-common-mq/src/main/java/org/ylzl/eden/common/mq/MessageQueueConsumer.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-mq/src/main/java/org/ylzl/eden/common/mq/MessageQueueConsumer.java rename to eden-components/eden-solutions/eden-common-mq/src/main/java/org/ylzl/eden/common/mq/MessageQueueConsumer.java diff --git a/eden-components/eden-solutions/eden-dynamic-mq/src/main/java/org/ylzl/eden/common/mq/MessageQueueListener.java b/eden-components/eden-solutions/eden-common-mq/src/main/java/org/ylzl/eden/common/mq/MessageQueueListener.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-mq/src/main/java/org/ylzl/eden/common/mq/MessageQueueListener.java rename to eden-components/eden-solutions/eden-common-mq/src/main/java/org/ylzl/eden/common/mq/MessageQueueListener.java diff --git a/eden-components/eden-solutions/eden-dynamic-mq/src/main/java/org/ylzl/eden/common/mq/MessageQueueProvider.java b/eden-components/eden-solutions/eden-common-mq/src/main/java/org/ylzl/eden/common/mq/MessageQueueProvider.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-mq/src/main/java/org/ylzl/eden/common/mq/MessageQueueProvider.java rename to eden-components/eden-solutions/eden-common-mq/src/main/java/org/ylzl/eden/common/mq/MessageQueueProvider.java diff --git a/eden-components/eden-solutions/eden-dynamic-mq/src/main/java/org/ylzl/eden/common/mq/MessageQueueType.java b/eden-components/eden-solutions/eden-common-mq/src/main/java/org/ylzl/eden/common/mq/MessageQueueType.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-mq/src/main/java/org/ylzl/eden/common/mq/MessageQueueType.java rename to eden-components/eden-solutions/eden-common-mq/src/main/java/org/ylzl/eden/common/mq/MessageQueueType.java diff --git a/eden-components/eden-solutions/eden-dynamic-mq/src/main/java/org/ylzl/eden/common/mq/consumer/Acknowledgement.java b/eden-components/eden-solutions/eden-common-mq/src/main/java/org/ylzl/eden/common/mq/consumer/Acknowledgement.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-mq/src/main/java/org/ylzl/eden/common/mq/consumer/Acknowledgement.java rename to eden-components/eden-solutions/eden-common-mq/src/main/java/org/ylzl/eden/common/mq/consumer/Acknowledgement.java diff --git a/eden-components/eden-solutions/eden-dynamic-mq/src/main/java/org/ylzl/eden/common/mq/consumer/ConsumeMode.java b/eden-components/eden-solutions/eden-common-mq/src/main/java/org/ylzl/eden/common/mq/consumer/ConsumeMode.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-mq/src/main/java/org/ylzl/eden/common/mq/consumer/ConsumeMode.java rename to eden-components/eden-solutions/eden-common-mq/src/main/java/org/ylzl/eden/common/mq/consumer/ConsumeMode.java diff --git a/eden-components/eden-solutions/eden-dynamic-mq/src/main/java/org/ylzl/eden/common/mq/consumer/MessageConsumeException.java b/eden-components/eden-solutions/eden-common-mq/src/main/java/org/ylzl/eden/common/mq/consumer/MessageConsumeException.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-mq/src/main/java/org/ylzl/eden/common/mq/consumer/MessageConsumeException.java rename to eden-components/eden-solutions/eden-common-mq/src/main/java/org/ylzl/eden/common/mq/consumer/MessageConsumeException.java diff --git a/eden-components/eden-solutions/eden-dynamic-mq/src/main/java/org/ylzl/eden/common/mq/consumer/MessageConsumeMode.java b/eden-components/eden-solutions/eden-common-mq/src/main/java/org/ylzl/eden/common/mq/consumer/MessageConsumeMode.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-mq/src/main/java/org/ylzl/eden/common/mq/consumer/MessageConsumeMode.java rename to eden-components/eden-solutions/eden-common-mq/src/main/java/org/ylzl/eden/common/mq/consumer/MessageConsumeMode.java diff --git a/eden-components/eden-solutions/eden-dynamic-mq/src/main/java/org/ylzl/eden/common/mq/consumer/MessageModel.java b/eden-components/eden-solutions/eden-common-mq/src/main/java/org/ylzl/eden/common/mq/consumer/MessageModel.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-mq/src/main/java/org/ylzl/eden/common/mq/consumer/MessageModel.java rename to eden-components/eden-solutions/eden-common-mq/src/main/java/org/ylzl/eden/common/mq/consumer/MessageModel.java diff --git a/eden-components/eden-solutions/eden-dynamic-mq/src/main/java/org/ylzl/eden/common/mq/consumer/MessageSelectorType.java b/eden-components/eden-solutions/eden-common-mq/src/main/java/org/ylzl/eden/common/mq/consumer/MessageSelectorType.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-mq/src/main/java/org/ylzl/eden/common/mq/consumer/MessageSelectorType.java rename to eden-components/eden-solutions/eden-common-mq/src/main/java/org/ylzl/eden/common/mq/consumer/MessageSelectorType.java diff --git a/eden-components/eden-solutions/eden-dynamic-mq/src/main/java/org/ylzl/eden/common/mq/integration/kafka/KafkaConsumer.java b/eden-components/eden-solutions/eden-common-mq/src/main/java/org/ylzl/eden/common/mq/integration/kafka/KafkaConsumer.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-mq/src/main/java/org/ylzl/eden/common/mq/integration/kafka/KafkaConsumer.java rename to eden-components/eden-solutions/eden-common-mq/src/main/java/org/ylzl/eden/common/mq/integration/kafka/KafkaConsumer.java diff --git a/eden-components/eden-solutions/eden-dynamic-mq/src/main/java/org/ylzl/eden/common/mq/integration/kafka/KafkaProvider.java b/eden-components/eden-solutions/eden-common-mq/src/main/java/org/ylzl/eden/common/mq/integration/kafka/KafkaProvider.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-mq/src/main/java/org/ylzl/eden/common/mq/integration/kafka/KafkaProvider.java rename to eden-components/eden-solutions/eden-common-mq/src/main/java/org/ylzl/eden/common/mq/integration/kafka/KafkaProvider.java diff --git a/eden-components/eden-solutions/eden-dynamic-mq/src/main/java/org/ylzl/eden/common/mq/integration/kafka/package-info.java b/eden-components/eden-solutions/eden-common-mq/src/main/java/org/ylzl/eden/common/mq/integration/kafka/package-info.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-mq/src/main/java/org/ylzl/eden/common/mq/integration/kafka/package-info.java rename to eden-components/eden-solutions/eden-common-mq/src/main/java/org/ylzl/eden/common/mq/integration/kafka/package-info.java diff --git a/eden-components/eden-solutions/eden-dynamic-mq/src/main/java/org/ylzl/eden/common/mq/integration/rocketmq/RocketMQConsumer.java b/eden-components/eden-solutions/eden-common-mq/src/main/java/org/ylzl/eden/common/mq/integration/rocketmq/RocketMQConsumer.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-mq/src/main/java/org/ylzl/eden/common/mq/integration/rocketmq/RocketMQConsumer.java rename to eden-components/eden-solutions/eden-common-mq/src/main/java/org/ylzl/eden/common/mq/integration/rocketmq/RocketMQConsumer.java diff --git a/eden-components/eden-solutions/eden-dynamic-mq/src/main/java/org/ylzl/eden/common/mq/integration/rocketmq/RocketMQProvider.java b/eden-components/eden-solutions/eden-common-mq/src/main/java/org/ylzl/eden/common/mq/integration/rocketmq/RocketMQProvider.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-mq/src/main/java/org/ylzl/eden/common/mq/integration/rocketmq/RocketMQProvider.java rename to eden-components/eden-solutions/eden-common-mq/src/main/java/org/ylzl/eden/common/mq/integration/rocketmq/RocketMQProvider.java diff --git a/eden-components/eden-solutions/eden-dynamic-mq/src/main/java/org/ylzl/eden/common/mq/integration/rocketmq/config/RocketMQConfig.java b/eden-components/eden-solutions/eden-common-mq/src/main/java/org/ylzl/eden/common/mq/integration/rocketmq/config/RocketMQConfig.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-mq/src/main/java/org/ylzl/eden/common/mq/integration/rocketmq/config/RocketMQConfig.java rename to eden-components/eden-solutions/eden-common-mq/src/main/java/org/ylzl/eden/common/mq/integration/rocketmq/config/RocketMQConfig.java diff --git a/eden-components/eden-solutions/eden-dynamic-mq/src/main/java/org/ylzl/eden/common/mq/integration/rocketmq/package-info.java b/eden-components/eden-solutions/eden-common-mq/src/main/java/org/ylzl/eden/common/mq/integration/rocketmq/package-info.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-mq/src/main/java/org/ylzl/eden/common/mq/integration/rocketmq/package-info.java rename to eden-components/eden-solutions/eden-common-mq/src/main/java/org/ylzl/eden/common/mq/integration/rocketmq/package-info.java diff --git a/eden-components/eden-solutions/eden-dynamic-mq/src/main/java/org/ylzl/eden/common/mq/model/Message.java b/eden-components/eden-solutions/eden-common-mq/src/main/java/org/ylzl/eden/common/mq/model/Message.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-mq/src/main/java/org/ylzl/eden/common/mq/model/Message.java rename to eden-components/eden-solutions/eden-common-mq/src/main/java/org/ylzl/eden/common/mq/model/Message.java diff --git a/eden-components/eden-solutions/eden-dynamic-mq/src/main/java/org/ylzl/eden/common/mq/package-info.java b/eden-components/eden-solutions/eden-common-mq/src/main/java/org/ylzl/eden/common/mq/package-info.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-mq/src/main/java/org/ylzl/eden/common/mq/package-info.java rename to eden-components/eden-solutions/eden-common-mq/src/main/java/org/ylzl/eden/common/mq/package-info.java diff --git a/eden-components/eden-solutions/eden-dynamic-mq/src/main/java/org/ylzl/eden/common/mq/producer/MessageSendCallback.java b/eden-components/eden-solutions/eden-common-mq/src/main/java/org/ylzl/eden/common/mq/producer/MessageSendCallback.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-mq/src/main/java/org/ylzl/eden/common/mq/producer/MessageSendCallback.java rename to eden-components/eden-solutions/eden-common-mq/src/main/java/org/ylzl/eden/common/mq/producer/MessageSendCallback.java diff --git a/eden-components/eden-solutions/eden-dynamic-mq/src/main/java/org/ylzl/eden/common/mq/producer/MessageSendException.java b/eden-components/eden-solutions/eden-common-mq/src/main/java/org/ylzl/eden/common/mq/producer/MessageSendException.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-mq/src/main/java/org/ylzl/eden/common/mq/producer/MessageSendException.java rename to eden-components/eden-solutions/eden-common-mq/src/main/java/org/ylzl/eden/common/mq/producer/MessageSendException.java diff --git a/eden-components/eden-solutions/eden-dynamic-mq/src/main/java/org/ylzl/eden/common/mq/producer/MessageSendResult.java b/eden-components/eden-solutions/eden-common-mq/src/main/java/org/ylzl/eden/common/mq/producer/MessageSendResult.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-mq/src/main/java/org/ylzl/eden/common/mq/producer/MessageSendResult.java rename to eden-components/eden-solutions/eden-common-mq/src/main/java/org/ylzl/eden/common/mq/producer/MessageSendResult.java diff --git a/eden-components/eden-solutions/eden-dynamic-mail/src/test/java/.gitkeep b/eden-components/eden-solutions/eden-common-mq/src/main/resources/.gitkeep similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-mail/src/test/java/.gitkeep rename to eden-components/eden-solutions/eden-common-mq/src/main/resources/.gitkeep diff --git a/eden-components/eden-solutions/eden-dynamic-mail/src/test/resources/.gitkeep b/eden-components/eden-solutions/eden-common-mq/src/test/java/.gitkeep similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-mail/src/test/resources/.gitkeep rename to eden-components/eden-solutions/eden-common-mq/src/test/java/.gitkeep diff --git a/eden-components/eden-solutions/eden-dynamic-mq/src/main/resources/.gitkeep b/eden-components/eden-solutions/eden-common-mq/src/test/resources/.gitkeep similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-mq/src/main/resources/.gitkeep rename to eden-components/eden-solutions/eden-common-mq/src/test/resources/.gitkeep diff --git a/eden-components/eden-solutions/eden-dynamic-security/pom.xml b/eden-components/eden-solutions/eden-common-security/pom.xml similarity index 97% rename from eden-components/eden-solutions/eden-dynamic-security/pom.xml rename to eden-components/eden-solutions/eden-common-security/pom.xml index 4617e89ae..aeb4c1e81 100644 --- a/eden-components/eden-solutions/eden-dynamic-security/pom.xml +++ b/eden-components/eden-solutions/eden-common-security/pom.xml @@ -26,7 +26,7 @@ 0.0.1-SNAPSHOT ../pom.xml - eden-dynamic-security + eden-common-security jar eden-dynamic-security 通用认证授权组件 diff --git a/eden-components/eden-solutions/eden-dynamic-security/src/main/java/org/ylzl/eden/common/security/Authentication.java b/eden-components/eden-solutions/eden-common-security/src/main/java/org/ylzl/eden/common/security/Authentication.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-security/src/main/java/org/ylzl/eden/common/security/Authentication.java rename to eden-components/eden-solutions/eden-common-security/src/main/java/org/ylzl/eden/common/security/Authentication.java diff --git a/eden-components/eden-solutions/eden-dynamic-security/src/main/java/org/ylzl/eden/common/security/GrantedAuthority.java b/eden-components/eden-solutions/eden-common-security/src/main/java/org/ylzl/eden/common/security/GrantedAuthority.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-security/src/main/java/org/ylzl/eden/common/security/GrantedAuthority.java rename to eden-components/eden-solutions/eden-common-security/src/main/java/org/ylzl/eden/common/security/GrantedAuthority.java diff --git a/eden-components/eden-solutions/eden-dynamic-security/src/main/java/org/ylzl/eden/common/security/aop/package-info.java b/eden-components/eden-solutions/eden-common-security/src/main/java/org/ylzl/eden/common/security/aop/package-info.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-security/src/main/java/org/ylzl/eden/common/security/aop/package-info.java rename to eden-components/eden-solutions/eden-common-security/src/main/java/org/ylzl/eden/common/security/aop/package-info.java diff --git a/eden-components/eden-solutions/eden-dynamic-security/src/main/java/org/ylzl/eden/common/security/builder/package-info.java b/eden-components/eden-solutions/eden-common-security/src/main/java/org/ylzl/eden/common/security/builder/package-info.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-security/src/main/java/org/ylzl/eden/common/security/builder/package-info.java rename to eden-components/eden-solutions/eden-common-security/src/main/java/org/ylzl/eden/common/security/builder/package-info.java diff --git a/eden-components/eden-solutions/eden-dynamic-security/src/main/java/org/ylzl/eden/common/security/exception/InvalidPasswordException.java b/eden-components/eden-solutions/eden-common-security/src/main/java/org/ylzl/eden/common/security/exception/InvalidPasswordException.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-security/src/main/java/org/ylzl/eden/common/security/exception/InvalidPasswordException.java rename to eden-components/eden-solutions/eden-common-security/src/main/java/org/ylzl/eden/common/security/exception/InvalidPasswordException.java diff --git a/eden-components/eden-solutions/eden-dynamic-security/src/main/java/org/ylzl/eden/common/security/exception/UserNotActivatedException.java b/eden-components/eden-solutions/eden-common-security/src/main/java/org/ylzl/eden/common/security/exception/UserNotActivatedException.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-security/src/main/java/org/ylzl/eden/common/security/exception/UserNotActivatedException.java rename to eden-components/eden-solutions/eden-common-security/src/main/java/org/ylzl/eden/common/security/exception/UserNotActivatedException.java diff --git a/eden-components/eden-solutions/eden-dynamic-security/src/main/java/org/ylzl/eden/common/security/exception/UserNotFoundException.java b/eden-components/eden-solutions/eden-common-security/src/main/java/org/ylzl/eden/common/security/exception/UserNotFoundException.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-security/src/main/java/org/ylzl/eden/common/security/exception/UserNotFoundException.java rename to eden-components/eden-solutions/eden-common-security/src/main/java/org/ylzl/eden/common/security/exception/UserNotFoundException.java diff --git a/eden-components/eden-solutions/eden-dynamic-security/src/main/java/org/ylzl/eden/common/security/homologous/package-info.java b/eden-components/eden-solutions/eden-common-security/src/main/java/org/ylzl/eden/common/security/homologous/package-info.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-security/src/main/java/org/ylzl/eden/common/security/homologous/package-info.java rename to eden-components/eden-solutions/eden-common-security/src/main/java/org/ylzl/eden/common/security/homologous/package-info.java diff --git a/eden-components/eden-solutions/eden-dynamic-security/src/main/java/org/ylzl/eden/common/security/integration/package-info.java b/eden-components/eden-solutions/eden-common-security/src/main/java/org/ylzl/eden/common/security/integration/package-info.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-security/src/main/java/org/ylzl/eden/common/security/integration/package-info.java rename to eden-components/eden-solutions/eden-common-security/src/main/java/org/ylzl/eden/common/security/integration/package-info.java diff --git a/eden-components/eden-solutions/eden-dynamic-security/src/main/java/org/ylzl/eden/common/security/model/package-info.java b/eden-components/eden-solutions/eden-common-security/src/main/java/org/ylzl/eden/common/security/model/package-info.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-security/src/main/java/org/ylzl/eden/common/security/model/package-info.java rename to eden-components/eden-solutions/eden-common-security/src/main/java/org/ylzl/eden/common/security/model/package-info.java diff --git a/eden-components/eden-solutions/eden-dynamic-security/src/main/java/org/ylzl/eden/common/security/package-info.java b/eden-components/eden-solutions/eden-common-security/src/main/java/org/ylzl/eden/common/security/package-info.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-security/src/main/java/org/ylzl/eden/common/security/package-info.java rename to eden-components/eden-solutions/eden-common-security/src/main/java/org/ylzl/eden/common/security/package-info.java diff --git a/eden-components/eden-solutions/eden-dynamic-mq/src/test/java/.gitkeep b/eden-components/eden-solutions/eden-common-security/src/main/resources/.gitkeep similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-mq/src/test/java/.gitkeep rename to eden-components/eden-solutions/eden-common-security/src/main/resources/.gitkeep diff --git a/eden-components/eden-solutions/eden-dynamic-mq/src/test/resources/.gitkeep b/eden-components/eden-solutions/eden-common-security/src/test/java/.gitkeep similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-mq/src/test/resources/.gitkeep rename to eden-components/eden-solutions/eden-common-security/src/test/java/.gitkeep diff --git a/eden-components/eden-solutions/eden-dynamic-security/src/main/resources/.gitkeep b/eden-components/eden-solutions/eden-common-security/src/test/resources/.gitkeep similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-security/src/main/resources/.gitkeep rename to eden-components/eden-solutions/eden-common-security/src/test/resources/.gitkeep diff --git a/eden-components/eden-solutions/eden-dynamic-sms/pom.xml b/eden-components/eden-solutions/eden-common-sms/pom.xml similarity index 97% rename from eden-components/eden-solutions/eden-dynamic-sms/pom.xml rename to eden-components/eden-solutions/eden-common-sms/pom.xml index c6b913da4..3042da39c 100644 --- a/eden-components/eden-solutions/eden-dynamic-sms/pom.xml +++ b/eden-components/eden-solutions/eden-common-sms/pom.xml @@ -26,7 +26,7 @@ 0.0.1-SNAPSHOT ../pom.xml - eden-dynamic-sms + eden-common-sms jar eden-dynamic-sms 通用短信组件 diff --git a/eden-components/eden-solutions/eden-dynamic-sms/src/main/java/org/ylzl/eden/common/sms/SmsTemplate.java b/eden-components/eden-solutions/eden-common-sms/src/main/java/org/ylzl/eden/common/sms/SmsTemplate.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-sms/src/main/java/org/ylzl/eden/common/sms/SmsTemplate.java rename to eden-components/eden-solutions/eden-common-sms/src/main/java/org/ylzl/eden/common/sms/SmsTemplate.java diff --git a/eden-components/eden-solutions/eden-dynamic-sms/src/main/java/org/ylzl/eden/common/sms/SmsType.java b/eden-components/eden-solutions/eden-common-sms/src/main/java/org/ylzl/eden/common/sms/SmsType.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-sms/src/main/java/org/ylzl/eden/common/sms/SmsType.java rename to eden-components/eden-solutions/eden-common-sms/src/main/java/org/ylzl/eden/common/sms/SmsType.java diff --git a/eden-components/eden-solutions/eden-dynamic-sms/src/main/java/org/ylzl/eden/common/sms/exception/SendSmsException.java b/eden-components/eden-solutions/eden-common-sms/src/main/java/org/ylzl/eden/common/sms/exception/SendSmsException.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-sms/src/main/java/org/ylzl/eden/common/sms/exception/SendSmsException.java rename to eden-components/eden-solutions/eden-common-sms/src/main/java/org/ylzl/eden/common/sms/exception/SendSmsException.java diff --git a/eden-components/eden-solutions/eden-dynamic-sms/src/main/java/org/ylzl/eden/common/sms/exception/SmsServerException.java b/eden-components/eden-solutions/eden-common-sms/src/main/java/org/ylzl/eden/common/sms/exception/SmsServerException.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-sms/src/main/java/org/ylzl/eden/common/sms/exception/SmsServerException.java rename to eden-components/eden-solutions/eden-common-sms/src/main/java/org/ylzl/eden/common/sms/exception/SmsServerException.java diff --git a/eden-components/eden-solutions/eden-dynamic-sms/src/main/java/org/ylzl/eden/common/sms/exception/SmsServerTimeoutException.java b/eden-components/eden-solutions/eden-common-sms/src/main/java/org/ylzl/eden/common/sms/exception/SmsServerTimeoutException.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-sms/src/main/java/org/ylzl/eden/common/sms/exception/SmsServerTimeoutException.java rename to eden-components/eden-solutions/eden-common-sms/src/main/java/org/ylzl/eden/common/sms/exception/SmsServerTimeoutException.java diff --git a/eden-components/eden-solutions/eden-dynamic-sms/src/main/java/org/ylzl/eden/common/sms/model/Sms.java b/eden-components/eden-solutions/eden-common-sms/src/main/java/org/ylzl/eden/common/sms/model/Sms.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-sms/src/main/java/org/ylzl/eden/common/sms/model/Sms.java rename to eden-components/eden-solutions/eden-common-sms/src/main/java/org/ylzl/eden/common/sms/model/Sms.java diff --git a/eden-components/eden-solutions/eden-dynamic-sms/src/main/java/org/ylzl/eden/common/sms/model/batch/BatchSendSmsRequest.java b/eden-components/eden-solutions/eden-common-sms/src/main/java/org/ylzl/eden/common/sms/model/batch/BatchSendSmsRequest.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-sms/src/main/java/org/ylzl/eden/common/sms/model/batch/BatchSendSmsRequest.java rename to eden-components/eden-solutions/eden-common-sms/src/main/java/org/ylzl/eden/common/sms/model/batch/BatchSendSmsRequest.java diff --git a/eden-components/eden-solutions/eden-dynamic-sms/src/main/java/org/ylzl/eden/common/sms/model/batch/BatchSendSmsResponse.java b/eden-components/eden-solutions/eden-common-sms/src/main/java/org/ylzl/eden/common/sms/model/batch/BatchSendSmsResponse.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-sms/src/main/java/org/ylzl/eden/common/sms/model/batch/BatchSendSmsResponse.java rename to eden-components/eden-solutions/eden-common-sms/src/main/java/org/ylzl/eden/common/sms/model/batch/BatchSendSmsResponse.java diff --git a/eden-components/eden-solutions/eden-dynamic-sms/src/main/java/org/ylzl/eden/common/sms/model/multi/MultiSendSmsRequest.java b/eden-components/eden-solutions/eden-common-sms/src/main/java/org/ylzl/eden/common/sms/model/multi/MultiSendSmsRequest.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-sms/src/main/java/org/ylzl/eden/common/sms/model/multi/MultiSendSmsRequest.java rename to eden-components/eden-solutions/eden-common-sms/src/main/java/org/ylzl/eden/common/sms/model/multi/MultiSendSmsRequest.java diff --git a/eden-components/eden-solutions/eden-dynamic-sms/src/main/java/org/ylzl/eden/common/sms/model/multi/MultiSendSmsResponse.java b/eden-components/eden-solutions/eden-common-sms/src/main/java/org/ylzl/eden/common/sms/model/multi/MultiSendSmsResponse.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-sms/src/main/java/org/ylzl/eden/common/sms/model/multi/MultiSendSmsResponse.java rename to eden-components/eden-solutions/eden-common-sms/src/main/java/org/ylzl/eden/common/sms/model/multi/MultiSendSmsResponse.java diff --git a/eden-components/eden-solutions/eden-dynamic-sms/src/main/java/org/ylzl/eden/common/sms/model/single/SingleSendSmsRequest.java b/eden-components/eden-solutions/eden-common-sms/src/main/java/org/ylzl/eden/common/sms/model/single/SingleSendSmsRequest.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-sms/src/main/java/org/ylzl/eden/common/sms/model/single/SingleSendSmsRequest.java rename to eden-components/eden-solutions/eden-common-sms/src/main/java/org/ylzl/eden/common/sms/model/single/SingleSendSmsRequest.java diff --git a/eden-components/eden-solutions/eden-dynamic-sms/src/main/java/org/ylzl/eden/common/sms/model/single/SingleSendSmsResponse.java b/eden-components/eden-solutions/eden-common-sms/src/main/java/org/ylzl/eden/common/sms/model/single/SingleSendSmsResponse.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-sms/src/main/java/org/ylzl/eden/common/sms/model/single/SingleSendSmsResponse.java rename to eden-components/eden-solutions/eden-common-sms/src/main/java/org/ylzl/eden/common/sms/model/single/SingleSendSmsResponse.java diff --git a/eden-components/eden-solutions/eden-dynamic-sms/src/main/java/org/ylzl/eden/common/sms/model/template/SendTemplateSmsRequest.java b/eden-components/eden-solutions/eden-common-sms/src/main/java/org/ylzl/eden/common/sms/model/template/SendTemplateSmsRequest.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-sms/src/main/java/org/ylzl/eden/common/sms/model/template/SendTemplateSmsRequest.java rename to eden-components/eden-solutions/eden-common-sms/src/main/java/org/ylzl/eden/common/sms/model/template/SendTemplateSmsRequest.java diff --git a/eden-components/eden-solutions/eden-dynamic-sms/src/main/java/org/ylzl/eden/common/sms/model/template/SendTemplateSmsResponse.java b/eden-components/eden-solutions/eden-common-sms/src/main/java/org/ylzl/eden/common/sms/model/template/SendTemplateSmsResponse.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-sms/src/main/java/org/ylzl/eden/common/sms/model/template/SendTemplateSmsResponse.java rename to eden-components/eden-solutions/eden-common-sms/src/main/java/org/ylzl/eden/common/sms/model/template/SendTemplateSmsResponse.java diff --git a/eden-components/eden-solutions/eden-dynamic-sms/src/main/java/org/ylzl/eden/common/sms/package-info.java b/eden-components/eden-solutions/eden-common-sms/src/main/java/org/ylzl/eden/common/sms/package-info.java similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-sms/src/main/java/org/ylzl/eden/common/sms/package-info.java rename to eden-components/eden-solutions/eden-common-sms/src/main/java/org/ylzl/eden/common/sms/package-info.java diff --git a/eden-components/eden-solutions/eden-dynamic-security/src/test/java/.gitkeep b/eden-components/eden-solutions/eden-common-sms/src/main/resources/.gitkeep similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-security/src/test/java/.gitkeep rename to eden-components/eden-solutions/eden-common-sms/src/main/resources/.gitkeep diff --git a/eden-components/eden-solutions/eden-dynamic-security/src/test/resources/.gitkeep b/eden-components/eden-solutions/eden-common-sms/src/test/java/.gitkeep similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-security/src/test/resources/.gitkeep rename to eden-components/eden-solutions/eden-common-sms/src/test/java/.gitkeep diff --git a/eden-components/eden-solutions/eden-dynamic-sms/src/main/resources/.gitkeep b/eden-components/eden-solutions/eden-common-sms/src/test/resources/.gitkeep similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-sms/src/main/resources/.gitkeep rename to eden-components/eden-solutions/eden-common-sms/src/test/resources/.gitkeep diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/differ/objectdiffer/package-info.java b/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/differ/objectdiffer/package-info.java deleted file mode 100644 index dd37f790e..000000000 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/differ/objectdiffer/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package org.ylzl.eden.data.auditor.integration.differ.objectdiffer; diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/differ/package-info.java b/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/differ/package-info.java deleted file mode 100644 index de06cf7ad..000000000 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/differ/package-info.java +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright 2012-2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.ylzl.eden.data.auditor.integration.differ; diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker/fastjson/package-info.java b/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker/fastjson/package-info.java deleted file mode 100644 index b0bf8f003..000000000 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker/fastjson/package-info.java +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright 2012-2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.ylzl.eden.data.auditor.integration.masker.fastjson; diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker/fastjson2/package-info.java b/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker/fastjson2/package-info.java deleted file mode 100644 index f2798d527..000000000 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker/fastjson2/package-info.java +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright 2012-2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.ylzl.eden.data.auditor.integration.masker.fastjson2; diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker/jackson/package-info.java b/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker/jackson/package-info.java deleted file mode 100644 index b30c819fd..000000000 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker/jackson/package-info.java +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright 2012-2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.ylzl.eden.data.auditor.integration.masker.jackson; diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker/package-info.java b/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker/package-info.java deleted file mode 100644 index eddc2cb75..000000000 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker/package-info.java +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright 2012-2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.ylzl.eden.data.auditor.integration.masker; diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/package-info.java b/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/package-info.java deleted file mode 100644 index 7c561978b..000000000 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/package-info.java +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright 2012-2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.ylzl.eden.data.auditor.integration; diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/support/DataMaskerStrategy.java b/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/support/DataMaskerStrategy.java deleted file mode 100644 index 381ccd21d..000000000 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/support/DataMaskerStrategy.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright 2012-2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.ylzl.eden.data.auditor.support; - -import lombok.experimental.UtilityClass; - -/** - * 数据脱敏内置策略 - * - * @author gyl - * @since 2.4.x - */ -@UtilityClass -public class DataMaskerStrategy { - - public static final String ADDRESS = "address"; - - public static final String BANK_CARD = "bank-card"; - - public static final String CAR_LICENSE = "car-license"; - - public static final String CHINESE_NAME = "chinese-name"; - - public static final String EMAIL = "email"; - - public static final String ID_CARD = "id-card"; - - public static final String MOBILE_PHONE = "mobile-phone"; - - public static final String MONEY = "money"; - - public static final String PASSWORD = "password"; - - public static final String TELEPHONE = "telephone"; - - public static final String USERNAME = "username"; -} diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/resources/META-INF/data-auditor/org.ylzl.eden.data.auditor.DataMasker b/eden-components/eden-solutions/eden-data-auditor/src/main/resources/META-INF/data-auditor/org.ylzl.eden.data.auditor.DataMasker deleted file mode 100644 index af406c1ab..000000000 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/resources/META-INF/data-auditor/org.ylzl.eden.data.auditor.DataMasker +++ /dev/null @@ -1,11 +0,0 @@ -address=org.ylzl.eden.data.auditor.masker.spi.AddressDataMasker -bank-card=org.ylzl.eden.data.auditor.masker.spi.BankCardDataMasker -car-license=org.ylzl.eden.data.auditor.masker.spi.CarLicenseDataMasker -chinese-name=org.ylzl.eden.data.auditor.masker.spi.ChineseNameDataMasker -email=org.ylzl.eden.data.auditor.masker.spi.EmailDataMasker -id-card=org.ylzl.eden.data.auditor.masker.spi.IdCardDataMasker -mobile-phone=org.ylzl.eden.data.auditor.masker.spi.MobilePhoneDataMasker -money=org.ylzl.eden.data.auditor.masker.spi.MoneyDataMasker -password=org.ylzl.eden.data.auditor.masker.spi.PasswordDataMasker -telephone=org.ylzl.eden.data.auditor.masker.spi.TelephoneDataMasker -username=org.ylzl.eden.data.auditor.masker.spi.UsernameDataMasker diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/resources/META-INF/data-auditor/org.ylzl.eden.data.auditor.builder.DataDifferBuilder b/eden-components/eden-solutions/eden-data-auditor/src/main/resources/META-INF/data-auditor/org.ylzl.eden.data.auditor.builder.DataDifferBuilder deleted file mode 100644 index 060645f41..000000000 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/resources/META-INF/data-auditor/org.ylzl.eden.data.auditor.builder.DataDifferBuilder +++ /dev/null @@ -1,2 +0,0 @@ -javers=org.ylzl.eden.data.auditor.integration.differ.javers.JaversDataDifferBuilder -object-differ=org.ylzl.eden.data.auditor.integration.differ.objectdiffer.ObjectDifferDataDifferBuilder diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/resources/META-INF/data-auditor/org.ylzl.eden.data.auditor.builder.DataMaskerBuilder b/eden-components/eden-solutions/eden-data-auditor/src/main/resources/META-INF/data-auditor/org.ylzl.eden.data.auditor.builder.DataMaskerBuilder deleted file mode 100644 index 72952f3ac..000000000 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/resources/META-INF/data-auditor/org.ylzl.eden.data.auditor.builder.DataMaskerBuilder +++ /dev/null @@ -1,3 +0,0 @@ -jackson=org.ylzl.eden.data.auditor.integration.masker.jackson.JacksonDataMaskerBuilder -fastjson=org.ylzl.eden.data.auditor.integration.masker.fastjson.FastjsonDataMaskerBuilder -fastjson2=org.ylzl.eden.data.auditor.integration.masker.fastjson2.Fastjson2DataMaskerBuilder diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/resources/META-INF/internal/org.ylzl.eden.spring.framework.json.fastjson.FastjsonFilter b/eden-components/eden-solutions/eden-data-auditor/src/main/resources/META-INF/internal/org.ylzl.eden.spring.framework.json.fastjson.FastjsonFilter deleted file mode 100644 index c0f0d8a6e..000000000 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/resources/META-INF/internal/org.ylzl.eden.spring.framework.json.fastjson.FastjsonFilter +++ /dev/null @@ -1 +0,0 @@ -value-filter=org.ylzl.eden.data.auditor.integration.masker.fastjson.FastjsonDataMaskingValueFilter diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/resources/META-INF/internal/org.ylzl.eden.spring.framework.json.fastjson2.Fastjson2Filter b/eden-components/eden-solutions/eden-data-auditor/src/main/resources/META-INF/internal/org.ylzl.eden.spring.framework.json.fastjson2.Fastjson2Filter deleted file mode 100644 index 50fb3604c..000000000 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/resources/META-INF/internal/org.ylzl.eden.spring.framework.json.fastjson2.Fastjson2Filter +++ /dev/null @@ -1 +0,0 @@ -value-filter=org.ylzl.eden.data.auditor.integration.masker.fastjson2.Fastjson2DataMaskingValueFilter diff --git a/eden-components/eden-solutions/eden-data-auditor/pom.xml b/eden-components/eden-solutions/eden-data-differ/pom.xml similarity index 96% rename from eden-components/eden-solutions/eden-data-auditor/pom.xml rename to eden-components/eden-solutions/eden-data-differ/pom.xml index c0a492fc1..0bb60b864 100644 --- a/eden-components/eden-solutions/eden-data-auditor/pom.xml +++ b/eden-components/eden-solutions/eden-data-differ/pom.xml @@ -26,10 +26,10 @@ 0.0.1-SNAPSHOT ../pom.xml - eden-data-auditor + eden-data-differ jar - eden-audit-data - 审计数据组件 + eden-audit-differ + 数据对比组件 diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/differ/Change.java b/eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/Change.java similarity index 96% rename from eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/differ/Change.java rename to eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/Change.java index a46987a80..69bd70585 100644 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/differ/Change.java +++ b/eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/Change.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ylzl.eden.data.auditor.differ; +package org.ylzl.eden.data.differ; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/differ/ChangeType.java b/eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/ChangeType.java similarity index 94% rename from eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/differ/ChangeType.java rename to eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/ChangeType.java index 675e1a1f8..e2b6ea6fc 100644 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/differ/ChangeType.java +++ b/eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/ChangeType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ylzl.eden.data.auditor.differ; +package org.ylzl.eden.data.differ; /** * 变更类型 diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/DataDiffer.java b/eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/DataDiffer.java similarity index 94% rename from eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/DataDiffer.java rename to eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/DataDiffer.java index 594044c49..a8f99f907 100644 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/DataDiffer.java +++ b/eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/DataDiffer.java @@ -14,9 +14,7 @@ * limitations under the License. */ -package org.ylzl.eden.data.auditor; - -import org.ylzl.eden.data.auditor.differ.Diff; +package org.ylzl.eden.data.differ; import java.util.Collection; diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/differ/Diff.java b/eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/Diff.java similarity index 96% rename from eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/differ/Diff.java rename to eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/Diff.java index c71341734..a214f5c07 100644 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/differ/Diff.java +++ b/eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/Diff.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ylzl.eden.data.auditor.differ; +package org.ylzl.eden.data.differ; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/builder/AbstractDataDifferBuilder.java b/eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/builder/AbstractDataDifferBuilder.java similarity index 92% rename from eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/builder/AbstractDataDifferBuilder.java rename to eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/builder/AbstractDataDifferBuilder.java index 72cc05df3..f9332c568 100644 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/builder/AbstractDataDifferBuilder.java +++ b/eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/builder/AbstractDataDifferBuilder.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.ylzl.eden.data.auditor.builder; +package org.ylzl.eden.data.differ.builder; -import org.ylzl.eden.data.auditor.config.DataDifferConfig; +import org.ylzl.eden.data.differ.config.DataDifferConfig; /** * 数据比对构建器抽象 diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/builder/DataDifferBuilder.java b/eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/builder/DataDifferBuilder.java similarity index 87% rename from eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/builder/DataDifferBuilder.java rename to eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/builder/DataDifferBuilder.java index d8566518c..a4164b42d 100644 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/builder/DataDifferBuilder.java +++ b/eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/builder/DataDifferBuilder.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.ylzl.eden.data.auditor.builder; +package org.ylzl.eden.data.differ.builder; -import org.ylzl.eden.data.auditor.DataDiffer; -import org.ylzl.eden.data.auditor.config.DataDifferConfig; +import org.ylzl.eden.data.differ.DataDiffer; +import org.ylzl.eden.data.differ.config.DataDifferConfig; import org.ylzl.eden.extension.SPI; /** diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/differ/package-info.java b/eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/builder/package-info.java similarity index 93% rename from eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/differ/package-info.java rename to eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/builder/package-info.java index 0f3f12341..5e124723c 100644 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/differ/package-info.java +++ b/eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/builder/package-info.java @@ -14,4 +14,4 @@ * limitations under the License. */ -package org.ylzl.eden.data.auditor.differ; +package org.ylzl.eden.data.differ.builder; diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/config/DataDifferConfig.java b/eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/config/DataDifferConfig.java similarity index 97% rename from eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/config/DataDifferConfig.java rename to eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/config/DataDifferConfig.java index edd92996d..eb0a3d72a 100644 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/config/DataDifferConfig.java +++ b/eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/config/DataDifferConfig.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ylzl.eden.data.auditor.config; +package org.ylzl.eden.data.differ.config; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/config/package-info.java b/eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/config/package-info.java similarity index 93% rename from eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/config/package-info.java rename to eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/config/package-info.java index ecce83bd7..3ce2aa874 100644 --- a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/config/package-info.java +++ b/eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/config/package-info.java @@ -14,4 +14,4 @@ * limitations under the License. */ -package org.ylzl.eden.data.filter.config; +package org.ylzl.eden.data.differ.config; diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/extension/DataAuditorLoadingStrategy.java b/eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/extension/DataDifferLoadingStrategy.java similarity index 80% rename from eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/extension/DataAuditorLoadingStrategy.java rename to eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/extension/DataDifferLoadingStrategy.java index 0fbaa0215..1489791c8 100644 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/extension/DataAuditorLoadingStrategy.java +++ b/eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/extension/DataDifferLoadingStrategy.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package org.ylzl.eden.data.auditor.extension; +package org.ylzl.eden.data.differ.extension; import org.ylzl.eden.extension.strategy.LoadingStrategy; /** - * 数据审计扩展点加载策略 + * 数据比对扩展点加载策略 * * @author gyl * @since 2.4.13 */ -public class DataAuditorLoadingStrategy implements LoadingStrategy { +public class DataDifferLoadingStrategy implements LoadingStrategy { - public static final String META_INF = "META-INF/data-auditor/"; + public static final String META_INF = "META-INF/data-differ/"; @Override public String directory() { diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/builder/package-info.java b/eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/extension/package-info.java similarity index 93% rename from eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/builder/package-info.java rename to eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/extension/package-info.java index ed8505a49..098b71849 100644 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/builder/package-info.java +++ b/eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/extension/package-info.java @@ -14,4 +14,4 @@ * limitations under the License. */ -package org.ylzl.eden.data.auditor.builder; +package org.ylzl.eden.data.differ.extension; diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/differ/javers/JaversDataDiffer.java b/eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/integration/javers/JaversDataDiffer.java similarity index 92% rename from eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/differ/javers/JaversDataDiffer.java rename to eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/integration/javers/JaversDataDiffer.java index 0d393e1ba..293fb989c 100644 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/differ/javers/JaversDataDiffer.java +++ b/eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/integration/javers/JaversDataDiffer.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.ylzl.eden.data.auditor.integration.differ.javers; +package org.ylzl.eden.data.differ.integration.javers; import lombok.Getter; import lombok.RequiredArgsConstructor; import org.javers.core.Javers; import org.ylzl.eden.commons.collections.CollectionUtils; -import org.ylzl.eden.data.auditor.DataDiffer; -import org.ylzl.eden.data.auditor.differ.Change; -import org.ylzl.eden.data.auditor.differ.ChangeType; -import org.ylzl.eden.data.auditor.differ.Diff; +import org.ylzl.eden.data.differ.DataDiffer; +import org.ylzl.eden.data.differ.Change; +import org.ylzl.eden.data.differ.ChangeType; +import org.ylzl.eden.data.differ.Diff; import java.util.Collection; diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/differ/javers/JaversDataDifferBuilder.java b/eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/integration/javers/JaversDataDifferBuilder.java similarity index 87% rename from eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/differ/javers/JaversDataDifferBuilder.java rename to eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/integration/javers/JaversDataDifferBuilder.java index e7224036f..f4b86b25e 100644 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/differ/javers/JaversDataDifferBuilder.java +++ b/eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/integration/javers/JaversDataDifferBuilder.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.ylzl.eden.data.auditor.integration.differ.javers; +package org.ylzl.eden.data.differ.integration.javers; import org.javers.core.Javers; import org.javers.core.JaversBuilder; -import org.ylzl.eden.data.auditor.DataDiffer; -import org.ylzl.eden.data.auditor.builder.AbstractDataDifferBuilder; +import org.ylzl.eden.data.differ.DataDiffer; +import org.ylzl.eden.data.differ.builder.AbstractDataDifferBuilder; /** * Javers 数据比对构建器 diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/differ/objectdiffer/ObjectDifferDataDiffer.java b/eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/integration/objectdiffer/ObjectDifferDataDiffer.java similarity index 93% rename from eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/differ/objectdiffer/ObjectDifferDataDiffer.java rename to eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/integration/objectdiffer/ObjectDifferDataDiffer.java index a147d81fc..ff62ed701 100644 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/differ/objectdiffer/ObjectDifferDataDiffer.java +++ b/eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/integration/objectdiffer/ObjectDifferDataDiffer.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.ylzl.eden.data.auditor.integration.differ.objectdiffer; +package org.ylzl.eden.data.differ.integration.objectdiffer; import de.danielbechler.diff.ObjectDiffer; import de.danielbechler.diff.node.DiffNode; import lombok.Getter; import lombok.RequiredArgsConstructor; -import org.ylzl.eden.data.auditor.DataDiffer; -import org.ylzl.eden.data.auditor.differ.Diff; +import org.ylzl.eden.data.differ.DataDiffer; +import org.ylzl.eden.data.differ.Diff; import java.util.Collection; diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/differ/objectdiffer/ObjectDifferDataDifferBuilder.java b/eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/integration/objectdiffer/ObjectDifferDataDifferBuilder.java similarity index 86% rename from eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/differ/objectdiffer/ObjectDifferDataDifferBuilder.java rename to eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/integration/objectdiffer/ObjectDifferDataDifferBuilder.java index 78a8db0d9..e42543237 100644 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/differ/objectdiffer/ObjectDifferDataDifferBuilder.java +++ b/eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/integration/objectdiffer/ObjectDifferDataDifferBuilder.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.ylzl.eden.data.auditor.integration.differ.objectdiffer; +package org.ylzl.eden.data.differ.integration.objectdiffer; import de.danielbechler.diff.ObjectDiffer; import de.danielbechler.diff.ObjectDifferBuilder; -import org.ylzl.eden.data.auditor.DataDiffer; -import org.ylzl.eden.data.auditor.builder.AbstractDataDifferBuilder; +import org.ylzl.eden.data.differ.DataDiffer; +import org.ylzl.eden.data.differ.builder.AbstractDataDifferBuilder; /** * JavaObjectDiff 数据比对构建器 diff --git a/eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/integration/objectdiffer/package-info.java b/eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/integration/objectdiffer/package-info.java new file mode 100644 index 000000000..2fe8e4045 --- /dev/null +++ b/eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/integration/objectdiffer/package-info.java @@ -0,0 +1 @@ +package org.ylzl.eden.data.differ.integration.objectdiffer; diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/extension/package-info.java b/eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/integration/package-info.java similarity index 92% rename from eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/extension/package-info.java rename to eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/integration/package-info.java index 206da053a..4af97beb8 100644 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/extension/package-info.java +++ b/eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/integration/package-info.java @@ -14,4 +14,4 @@ * limitations under the License. */ -package org.ylzl.eden.data.auditor.extension; +package org.ylzl.eden.data.differ.integration; diff --git a/eden-components/eden-solutions/eden-data-filter/src/test/java/org/ylzl/eden/data/filter/package-info.java b/eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/package-info.java similarity index 94% rename from eden-components/eden-solutions/eden-data-filter/src/test/java/org/ylzl/eden/data/filter/package-info.java rename to eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/package-info.java index f17f80163..cebe986fc 100644 --- a/eden-components/eden-solutions/eden-data-filter/src/test/java/org/ylzl/eden/data/filter/package-info.java +++ b/eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/package-info.java @@ -14,4 +14,4 @@ * limitations under the License. */ -package org.ylzl.eden.data.filter; +package org.ylzl.eden.data.differ; diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/support/DataDifferHelper.java b/eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/support/DataDifferHelper.java similarity index 89% rename from eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/support/DataDifferHelper.java rename to eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/support/DataDifferHelper.java index 94824c4b5..185991966 100644 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/support/DataDifferHelper.java +++ b/eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/support/DataDifferHelper.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.ylzl.eden.data.auditor.support; +package org.ylzl.eden.data.differ.support; -import org.ylzl.eden.data.auditor.DataDiffer; -import org.ylzl.eden.data.auditor.builder.DataDifferBuilder; +import org.ylzl.eden.data.differ.DataDiffer; +import org.ylzl.eden.data.differ.builder.DataDifferBuilder; import org.ylzl.eden.extension.ExtensionLoader; /** diff --git a/eden-components/eden-solutions/eden-data-differ/src/main/resources/META-INF/data-differ/org.ylzl.eden.data.differ.builder.DataDifferBuilder b/eden-components/eden-solutions/eden-data-differ/src/main/resources/META-INF/data-differ/org.ylzl.eden.data.differ.builder.DataDifferBuilder new file mode 100644 index 000000000..cfd09dabe --- /dev/null +++ b/eden-components/eden-solutions/eden-data-differ/src/main/resources/META-INF/data-differ/org.ylzl.eden.data.differ.builder.DataDifferBuilder @@ -0,0 +1,2 @@ +javers=org.ylzl.eden.data.differ.integration.javers.JaversDataDifferBuilder +object-differ=org.ylzl.eden.data.differ.integration.objectdiffer.ObjectDifferDataDifferBuilder diff --git a/eden-components/eden-solutions/eden-data-filter/src/main/resources/META-INF/services/org.ylzl.eden.extension.strategy.LoadingStrategy b/eden-components/eden-solutions/eden-data-differ/src/main/resources/META-INF/services/org.ylzl.eden.extension.strategy.LoadingStrategy similarity index 90% rename from eden-components/eden-solutions/eden-data-filter/src/main/resources/META-INF/services/org.ylzl.eden.extension.strategy.LoadingStrategy rename to eden-components/eden-solutions/eden-data-differ/src/main/resources/META-INF/services/org.ylzl.eden.extension.strategy.LoadingStrategy index 554b91806..39f7fd7ce 100644 --- a/eden-components/eden-solutions/eden-data-filter/src/main/resources/META-INF/services/org.ylzl.eden.extension.strategy.LoadingStrategy +++ b/eden-components/eden-solutions/eden-data-differ/src/main/resources/META-INF/services/org.ylzl.eden.extension.strategy.LoadingStrategy @@ -14,4 +14,4 @@ # limitations under the License. # -org.ylzl.eden.data.filter.extension.DataFilterLoadingStrategy +org.ylzl.eden.data.differ.extension.DataDifferLoadingStrategy diff --git a/eden-components/eden-solutions/eden-data-auditor/src/test/groovy/org/ylzl/eden/data/auditor/DataDifferTest.groovy b/eden-components/eden-solutions/eden-data-differ/src/test/groovy/org/ylzl/eden/data/differ/DataDifferTest.groovy similarity index 94% rename from eden-components/eden-solutions/eden-data-auditor/src/test/groovy/org/ylzl/eden/data/auditor/DataDifferTest.groovy rename to eden-components/eden-solutions/eden-data-differ/src/test/groovy/org/ylzl/eden/data/differ/DataDifferTest.groovy index 3d2f12a29..7fe383bab 100644 --- a/eden-components/eden-solutions/eden-data-auditor/src/test/groovy/org/ylzl/eden/data/auditor/DataDifferTest.groovy +++ b/eden-components/eden-solutions/eden-data-differ/src/test/groovy/org/ylzl/eden/data/differ/DataDifferTest.groovy @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.ylzl.eden.data.auditor +package org.ylzl.eden.data.differ -import org.ylzl.eden.data.auditor.support.DataDifferHelper +import org.ylzl.eden.data.differ.support.DataDifferHelper import spock.lang.Specification class DataDifferTest extends Specification { diff --git a/eden-components/eden-solutions/eden-data-auditor/src/test/java/org/ylzl/eden/data/auditor/TestCase.java b/eden-components/eden-solutions/eden-data-differ/src/test/java/org/ylzl/eden/data/differ/TestCase.java similarity index 93% rename from eden-components/eden-solutions/eden-data-auditor/src/test/java/org/ylzl/eden/data/auditor/TestCase.java rename to eden-components/eden-solutions/eden-data-differ/src/test/java/org/ylzl/eden/data/differ/TestCase.java index 9fc326c48..f96c36a07 100644 --- a/eden-components/eden-solutions/eden-data-auditor/src/test/java/org/ylzl/eden/data/auditor/TestCase.java +++ b/eden-components/eden-solutions/eden-data-differ/src/test/java/org/ylzl/eden/data/differ/TestCase.java @@ -14,11 +14,10 @@ * limitations under the License. */ -package org.ylzl.eden.data.auditor; +package org.ylzl.eden.data.differ; import com.alibaba.fastjson.annotation.JSONType; import lombok.*; -import org.ylzl.eden.data.auditor.masker.DataMasking; /** * 测试用例 diff --git a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/package-info.java b/eden-components/eden-solutions/eden-data-differ/src/test/java/org/ylzl/eden/data/differ/package-info.java similarity index 94% rename from eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/package-info.java rename to eden-components/eden-solutions/eden-data-differ/src/test/java/org/ylzl/eden/data/differ/package-info.java index f17f80163..cebe986fc 100644 --- a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/package-info.java +++ b/eden-components/eden-solutions/eden-data-differ/src/test/java/org/ylzl/eden/data/differ/package-info.java @@ -14,4 +14,4 @@ * limitations under the License. */ -package org.ylzl.eden.data.filter; +package org.ylzl.eden.data.differ; diff --git a/eden-components/eden-solutions/eden-dynamic-sms/src/test/java/.gitkeep b/eden-components/eden-solutions/eden-data-differ/src/test/resources/.gitkeep similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-sms/src/test/java/.gitkeep rename to eden-components/eden-solutions/eden-data-differ/src/test/resources/.gitkeep diff --git a/eden-components/eden-solutions/eden-data-duplicate/pom.xml b/eden-components/eden-solutions/eden-data-duplicate/pom.xml new file mode 100644 index 000000000..63091521f --- /dev/null +++ b/eden-components/eden-solutions/eden-data-duplicate/pom.xml @@ -0,0 +1,104 @@ + + + + + + 4.0.0 + + io.github.shiyindaxiaojie + eden-solutions + 0.0.1-SNAPSHOT + ../pom.xml + + eden-data-duplicate + jar + eden-data-duplicate + 数据去重组件 + + + + + io.github.shiyindaxiaojie + eden-commons + + + io.github.shiyindaxiaojie + eden-spring-framework + + + + + org.mapstruct + mapstruct + + + org.mapstruct + mapstruct-processor + true + + + org.projectlombok + lombok + true + + + + + org.springframework.data + spring-data-redis + + + + + org.spockframework + spock-core + test + + + org.junit.jupiter + junit-jupiter + test + + + org.mockito + mockito-core + test + + + org.mockito + mockito-junit-jupiter + test + + + org.openjdk.jmh + jmh-core + true + + + org.openjdk.jmh + jmh-generator-annprocess + provided + + + org.springframework + spring-test + test + + + diff --git a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/DuplicateFilter.java b/eden-components/eden-solutions/eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/DuplicateFilter.java similarity index 96% rename from eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/DuplicateFilter.java rename to eden-components/eden-solutions/eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/DuplicateFilter.java index a6b7ba6d8..48e3dcdad 100644 --- a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/DuplicateFilter.java +++ b/eden-components/eden-solutions/eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/DuplicateFilter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ylzl.eden.data.filter; +package org.ylzl.eden.data.duplicate; /** * 数据去重过滤器 diff --git a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/builder/AbstractDuplicateFilterBuilder.java b/eden-components/eden-solutions/eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/builder/AbstractDuplicateFilterBuilder.java similarity index 79% rename from eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/builder/AbstractDuplicateFilterBuilder.java rename to eden-components/eden-solutions/eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/builder/AbstractDuplicateFilterBuilder.java index dd59914b9..482277d4e 100644 --- a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/builder/AbstractDuplicateFilterBuilder.java +++ b/eden-components/eden-solutions/eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/builder/AbstractDuplicateFilterBuilder.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.ylzl.eden.data.filter.builder; +package org.ylzl.eden.data.duplicate.builder; -import org.ylzl.eden.data.filter.config.DuplicateConfig; +import org.ylzl.eden.data.duplicate.config.DuplicateFilterConfig; /** * 数据去重过滤构建器抽象 @@ -26,7 +26,7 @@ */ public abstract class AbstractDuplicateFilterBuilder implements DuplicateFilterBuilder { - private DuplicateConfig config = new DuplicateConfig(); + private DuplicateFilterConfig config = new DuplicateFilterConfig(); /** * 设置数据去重过滤配置 @@ -35,7 +35,7 @@ public abstract class AbstractDuplicateFilterBuilder implements DuplicateFilterB * @return DataDuplicateFilterBuilder */ @Override - public DuplicateFilterBuilder config(DuplicateConfig config) { + public DuplicateFilterBuilder config(DuplicateFilterConfig config) { this.config = config; return this; } @@ -45,7 +45,7 @@ public DuplicateFilterBuilder config(DuplicateConfig config) { * * @return 数据去重过滤配置 */ - protected DuplicateConfig getConfig() { + protected DuplicateFilterConfig getConfig() { return config; } } diff --git a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/builder/DuplicateFilterBuilder.java b/eden-components/eden-solutions/eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/builder/DuplicateFilterBuilder.java similarity index 82% rename from eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/builder/DuplicateFilterBuilder.java rename to eden-components/eden-solutions/eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/builder/DuplicateFilterBuilder.java index c146a3ce1..227accb9d 100644 --- a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/builder/DuplicateFilterBuilder.java +++ b/eden-components/eden-solutions/eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/builder/DuplicateFilterBuilder.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.ylzl.eden.data.filter.builder; +package org.ylzl.eden.data.duplicate.builder; -import org.ylzl.eden.data.filter.DuplicateFilter; -import org.ylzl.eden.data.filter.config.DuplicateConfig; +import org.ylzl.eden.data.duplicate.DuplicateFilter; +import org.ylzl.eden.data.duplicate.config.DuplicateFilterConfig; import org.ylzl.eden.extension.SPI; /** @@ -35,7 +35,7 @@ public interface DuplicateFilterBuilder { * @param config 数据去重过滤配置 * @return DuplicateFilterBuilder */ - DuplicateFilterBuilder config(DuplicateConfig config); + DuplicateFilterBuilder config(DuplicateFilterConfig config); /** * 构建数据去重过滤器 diff --git a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/config/DuplicateConfig.java b/eden-components/eden-solutions/eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/config/DuplicateFilterConfig.java similarity index 93% rename from eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/config/DuplicateConfig.java rename to eden-components/eden-solutions/eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/config/DuplicateFilterConfig.java index 0bbd9ab51..929a9ca4e 100644 --- a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/config/DuplicateConfig.java +++ b/eden-components/eden-solutions/eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/config/DuplicateFilterConfig.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ylzl.eden.data.filter.config; +package org.ylzl.eden.data.duplicate.config; import lombok.EqualsAndHashCode; import lombok.Getter; @@ -31,7 +31,7 @@ @ToString @Setter @Getter -public class DuplicateConfig { +public class DuplicateFilterConfig { private String type = "bloom-filter"; diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/config/package-info.java b/eden-components/eden-solutions/eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/config/package-info.java similarity index 93% rename from eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/config/package-info.java rename to eden-components/eden-solutions/eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/config/package-info.java index a389f4165..32c27e0ed 100644 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/config/package-info.java +++ b/eden-components/eden-solutions/eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/config/package-info.java @@ -14,4 +14,4 @@ * limitations under the License. */ -package org.ylzl.eden.data.auditor.config; +package org.ylzl.eden.data.duplicate.config; diff --git a/eden-components/eden-solutions/eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/extension/DuplicateFilterLoadingStrategy.java b/eden-components/eden-solutions/eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/extension/DuplicateFilterLoadingStrategy.java new file mode 100644 index 000000000..4c2767ad6 --- /dev/null +++ b/eden-components/eden-solutions/eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/extension/DuplicateFilterLoadingStrategy.java @@ -0,0 +1,40 @@ +/* + * Copyright 2012-2019 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.ylzl.eden.data.duplicate.extension; + +import org.ylzl.eden.extension.strategy.LoadingStrategy; + +/** + * 数据去重扩展点加载策略 + * + * @author gyl + * @since 2.4.13 + */ +public class DuplicateFilterLoadingStrategy implements LoadingStrategy { + + public static final String META_INF = "META-INF/data-duplicate/"; + + @Override + public String directory() { + return META_INF; + } + + @Override + public int getPriority() { + return MAX_PRIORITY; + } +} diff --git a/eden-components/eden-solutions/eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/extension/package-info.java b/eden-components/eden-solutions/eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/extension/package-info.java new file mode 100644 index 000000000..6d7a978a7 --- /dev/null +++ b/eden-components/eden-solutions/eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/extension/package-info.java @@ -0,0 +1,17 @@ +/* + * Copyright 2012-2019 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.ylzl.eden.data.duplicate.extension; diff --git a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/duplicate/bloom/BloomFilter.java b/eden-components/eden-solutions/eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/integration/bloom/BloomFilter.java similarity index 91% rename from eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/duplicate/bloom/BloomFilter.java rename to eden-components/eden-solutions/eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/integration/bloom/BloomFilter.java index 03bbf1edb..49c6acaa0 100644 --- a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/duplicate/bloom/BloomFilter.java +++ b/eden-components/eden-solutions/eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/integration/bloom/BloomFilter.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.ylzl.eden.data.filter.integration.duplicate.bloom; +package org.ylzl.eden.data.duplicate.integration.bloom; -import org.ylzl.eden.data.filter.DuplicateFilter; +import org.ylzl.eden.data.duplicate.DuplicateFilter; /** * 布隆过滤器 diff --git a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/duplicate/bloom/BloomFilterBuilder.java b/eden-components/eden-solutions/eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/integration/bloom/BloomFilterBuilder.java similarity index 79% rename from eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/duplicate/bloom/BloomFilterBuilder.java rename to eden-components/eden-solutions/eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/integration/bloom/BloomFilterBuilder.java index a3453ec6f..0acf15353 100644 --- a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/duplicate/bloom/BloomFilterBuilder.java +++ b/eden-components/eden-solutions/eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/integration/bloom/BloomFilterBuilder.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.ylzl.eden.data.filter.integration.duplicate.bloom; +package org.ylzl.eden.data.duplicate.integration.bloom; -import org.ylzl.eden.data.filter.DuplicateFilter; -import org.ylzl.eden.data.filter.builder.AbstractDuplicateFilterBuilder; -import org.ylzl.eden.data.filter.builder.DuplicateFilterBuilder; +import org.ylzl.eden.data.duplicate.DuplicateFilter; +import org.ylzl.eden.data.duplicate.builder.AbstractDuplicateFilterBuilder; +import org.ylzl.eden.data.duplicate.builder.DuplicateFilterBuilder; /** * 布隆过滤器构建 diff --git a/eden-components/eden-solutions/eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/integration/bloom/package-info.java b/eden-components/eden-solutions/eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/integration/bloom/package-info.java new file mode 100644 index 000000000..04a48c372 --- /dev/null +++ b/eden-components/eden-solutions/eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/integration/bloom/package-info.java @@ -0,0 +1,17 @@ +/* + * Copyright 2012-2019 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.ylzl.eden.data.duplicate.integration.bloom; diff --git a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/duplicate/cuckoo/CuckooFilter.java b/eden-components/eden-solutions/eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/integration/cuckoo/CuckooFilter.java similarity index 90% rename from eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/duplicate/cuckoo/CuckooFilter.java rename to eden-components/eden-solutions/eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/integration/cuckoo/CuckooFilter.java index ae6131b15..7ff8505fe 100644 --- a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/duplicate/cuckoo/CuckooFilter.java +++ b/eden-components/eden-solutions/eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/integration/cuckoo/CuckooFilter.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.ylzl.eden.data.filter.integration.duplicate.cuckoo; +package org.ylzl.eden.data.duplicate.integration.cuckoo; -import org.ylzl.eden.data.filter.DuplicateFilter; +import org.ylzl.eden.data.duplicate.DuplicateFilter; /** * 布谷鸟过滤器 diff --git a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/duplicate/cuckoo/CuckooFilterBuilder.java b/eden-components/eden-solutions/eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/integration/cuckoo/CuckooFilterBuilder.java similarity index 79% rename from eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/duplicate/cuckoo/CuckooFilterBuilder.java rename to eden-components/eden-solutions/eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/integration/cuckoo/CuckooFilterBuilder.java index dbe75f911..fd9be457f 100644 --- a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/duplicate/cuckoo/CuckooFilterBuilder.java +++ b/eden-components/eden-solutions/eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/integration/cuckoo/CuckooFilterBuilder.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.ylzl.eden.data.filter.integration.duplicate.cuckoo; +package org.ylzl.eden.data.duplicate.integration.cuckoo; -import org.ylzl.eden.data.filter.DuplicateFilter; -import org.ylzl.eden.data.filter.builder.AbstractDuplicateFilterBuilder; -import org.ylzl.eden.data.filter.builder.DuplicateFilterBuilder; +import org.ylzl.eden.data.duplicate.DuplicateFilter; +import org.ylzl.eden.data.duplicate.builder.AbstractDuplicateFilterBuilder; +import org.ylzl.eden.data.duplicate.builder.DuplicateFilterBuilder; /** * 布谷鸟过滤器构建 diff --git a/eden-components/eden-solutions/eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/integration/cuckoo/package-info.java b/eden-components/eden-solutions/eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/integration/cuckoo/package-info.java new file mode 100644 index 000000000..8776aa9ad --- /dev/null +++ b/eden-components/eden-solutions/eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/integration/cuckoo/package-info.java @@ -0,0 +1,17 @@ +/* + * Copyright 2012-2019 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.ylzl.eden.data.duplicate.integration.cuckoo; diff --git a/eden-components/eden-solutions/eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/integration/package-info.java b/eden-components/eden-solutions/eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/integration/package-info.java new file mode 100644 index 000000000..b8fdde233 --- /dev/null +++ b/eden-components/eden-solutions/eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/integration/package-info.java @@ -0,0 +1,17 @@ +/* + * Copyright 2012-2019 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.ylzl.eden.data.duplicate.integration; diff --git a/eden-components/eden-solutions/eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/package-info.java b/eden-components/eden-solutions/eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/package-info.java new file mode 100644 index 000000000..4a2df3297 --- /dev/null +++ b/eden-components/eden-solutions/eden-data-duplicate/src/main/java/org/ylzl/eden/data/duplicate/package-info.java @@ -0,0 +1,17 @@ +/* + * Copyright 2012-2019 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.ylzl.eden.data.duplicate; diff --git a/eden-components/eden-solutions/eden-data-filter/src/main/resources/META-INF/data-filter/org.ylzl.eden.data.filter.builder.SensitiveFilterBuilder b/eden-components/eden-solutions/eden-data-duplicate/src/main/resources/META-INF/data-duplicate/org.ylzl.eden.data.filter.builder.SensitiveFilterBuilder similarity index 100% rename from eden-components/eden-solutions/eden-data-filter/src/main/resources/META-INF/data-filter/org.ylzl.eden.data.filter.builder.SensitiveFilterBuilder rename to eden-components/eden-solutions/eden-data-duplicate/src/main/resources/META-INF/data-duplicate/org.ylzl.eden.data.filter.builder.SensitiveFilterBuilder diff --git a/eden-components/eden-solutions/eden-data-duplicate/src/main/resources/META-INF/services/org.ylzl.eden.extension.strategy.LoadingStrategy b/eden-components/eden-solutions/eden-data-duplicate/src/main/resources/META-INF/services/org.ylzl.eden.extension.strategy.LoadingStrategy new file mode 100644 index 000000000..1c2094f1c --- /dev/null +++ b/eden-components/eden-solutions/eden-data-duplicate/src/main/resources/META-INF/services/org.ylzl.eden.extension.strategy.LoadingStrategy @@ -0,0 +1,17 @@ +# +# Copyright 2012-2019 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +org.ylzl.eden.data.duplicate.extension.SensitiveWordLoadingStrategy diff --git a/eden-components/eden-solutions/eden-data-filter/src/test/groovy/org/ylzl/eden/data/filter/SensitiveFilterTest.groovy b/eden-components/eden-solutions/eden-data-duplicate/src/test/groovy/org/ylzl/eden/data/duplicate/SensitiveFilterTest.groovy similarity index 88% rename from eden-components/eden-solutions/eden-data-filter/src/test/groovy/org/ylzl/eden/data/filter/SensitiveFilterTest.groovy rename to eden-components/eden-solutions/eden-data-duplicate/src/test/groovy/org/ylzl/eden/data/duplicate/SensitiveFilterTest.groovy index 7ffbc12be..eebca5c98 100644 --- a/eden-components/eden-solutions/eden-data-filter/src/test/groovy/org/ylzl/eden/data/filter/SensitiveFilterTest.groovy +++ b/eden-components/eden-solutions/eden-data-duplicate/src/test/groovy/org/ylzl/eden/data/duplicate/SensitiveFilterTest.groovy @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.ylzl.eden.data.filter +package org.ylzl.eden.data.duplicate import com.google.common.collect.Sets -import org.ylzl.eden.data.filter.builder.SensitiveFilterBuilder -import org.ylzl.eden.data.filter.config.SensitiveConfig -import org.ylzl.eden.data.filter.sensitive.SensitiveWord -import org.ylzl.eden.data.filter.sensitive.SensitiveWordLoader +import org.ylzl.eden.data.duplicate.builder.SensitiveFilterBuilder +import org.ylzl.eden.data.duplicate.config.SensitiveConfig +import org.ylzl.eden.data.duplicate.sensitive.SensitiveWord +import org.ylzl.eden.data.duplicate.sensitive.SensitiveWordLoader import org.ylzl.eden.extension.ExtensionLoader import spock.lang.Specification diff --git a/eden-components/eden-solutions/eden-data-duplicate/src/test/java/org/ylzl/eden/data/duplicate/package-info.java b/eden-components/eden-solutions/eden-data-duplicate/src/test/java/org/ylzl/eden/data/duplicate/package-info.java new file mode 100644 index 000000000..4a2df3297 --- /dev/null +++ b/eden-components/eden-solutions/eden-data-duplicate/src/test/java/org/ylzl/eden/data/duplicate/package-info.java @@ -0,0 +1,17 @@ +/* + * Copyright 2012-2019 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.ylzl.eden.data.duplicate; diff --git a/eden-components/eden-solutions/eden-dynamic-sms/src/test/resources/.gitkeep b/eden-components/eden-solutions/eden-data-duplicate/src/test/resources/.gitkeep similarity index 100% rename from eden-components/eden-solutions/eden-dynamic-sms/src/test/resources/.gitkeep rename to eden-components/eden-solutions/eden-data-duplicate/src/test/resources/.gitkeep diff --git a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/builder/AbstractMaskingFilterBuilder.java b/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/builder/AbstractMaskingFilterBuilder.java deleted file mode 100644 index 9296fe1ad..000000000 --- a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/builder/AbstractMaskingFilterBuilder.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright 2012-2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.ylzl.eden.data.filter.builder; - -import org.ylzl.eden.data.filter.config.MaskingConfig; - -/** - * 数据脱敏过滤构建器抽象 - * - * @author gyl - * @since 2.4.x - */ -public abstract class AbstractMaskingFilterBuilder implements MaskingFilterBuilder { - - private MaskingConfig config = new MaskingConfig(); - - /** - * 设置数据脱敏过滤配置 - * - * @param config 数据脱敏过滤配置 - * @return MaskingFilterBuilder - */ - @Override - public MaskingFilterBuilder config(MaskingConfig config) { - this.config = config; - return this; - } - - /** - * 获取数据脱敏过滤配置 - * - * @return 数据脱敏配置 - */ - protected MaskingConfig getConfig() { - return config; - } -} diff --git a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/builder/MaskingFilterBuilder.java b/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/builder/MaskingFilterBuilder.java deleted file mode 100644 index 6d97c7d97..000000000 --- a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/builder/MaskingFilterBuilder.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright 2012-2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.ylzl.eden.data.filter.builder; - -import org.ylzl.eden.data.filter.MaskingFilter; -import org.ylzl.eden.data.filter.config.MaskingConfig; -import org.ylzl.eden.extension.SPI; - -/** - * 数据脱敏过滤构建器 - * - * @author gyl - * @since 2.4.x - */ -@SPI("chars-scan") -public interface MaskingFilterBuilder { - - /** - * 设置数据脱敏过滤配置 - * - * @param config 数据脱敏过滤配置 - * @return MaskingFilterBuilder - */ - MaskingFilterBuilder config(MaskingConfig config); - - /** - * 构建数据脱敏过滤器 - * - * @return 数据脱敏过滤器 - */ - MaskingFilter build(); -} diff --git a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/duplicate/package-info.java b/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/duplicate/package-info.java deleted file mode 100644 index 6a9237e64..000000000 --- a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/duplicate/package-info.java +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright 2012-2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.ylzl.eden.data.filter.duplicate; diff --git a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/extension/package-info.java b/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/extension/package-info.java deleted file mode 100644 index 43efc0edc..000000000 --- a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/extension/package-info.java +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright 2012-2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.ylzl.eden.data.filter.extension; diff --git a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/duplicate/bloom/package-info.java b/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/duplicate/bloom/package-info.java deleted file mode 100644 index 7dafc2fa9..000000000 --- a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/duplicate/bloom/package-info.java +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright 2012-2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.ylzl.eden.data.filter.integration.duplicate.bloom; diff --git a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/duplicate/cuckoo/package-info.java b/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/duplicate/cuckoo/package-info.java deleted file mode 100644 index 8d4b1edd9..000000000 --- a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/duplicate/cuckoo/package-info.java +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright 2012-2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.ylzl.eden.data.filter.integration.duplicate.cuckoo; diff --git a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/duplicate/package-info.java b/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/duplicate/package-info.java deleted file mode 100644 index fc7dd142f..000000000 --- a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/duplicate/package-info.java +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright 2012-2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.ylzl.eden.data.filter.integration.duplicate; diff --git a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/masking/package-info.java b/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/masking/package-info.java deleted file mode 100644 index 2d549c7b9..000000000 --- a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/masking/package-info.java +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright 2012-2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.ylzl.eden.data.filter.integration.masking; diff --git a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/sensitive/ahocorasick/package-info.java b/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/sensitive/ahocorasick/package-info.java deleted file mode 100644 index f5aa4fb69..000000000 --- a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/sensitive/ahocorasick/package-info.java +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright 2012-2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.ylzl.eden.data.filter.integration.sensitive.ahocorasick; diff --git a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/sensitive/package-info.java b/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/sensitive/package-info.java deleted file mode 100644 index e12fbe177..000000000 --- a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/sensitive/package-info.java +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright 2012-2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.ylzl.eden.data.filter.integration.sensitive; diff --git a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/masking/package-info.java b/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/masking/package-info.java deleted file mode 100644 index 678b31150..000000000 --- a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/masking/package-info.java +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright 2012-2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.ylzl.eden.data.filter.masking; diff --git a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/sensitive/package-info.java b/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/sensitive/package-info.java deleted file mode 100644 index ab9299205..000000000 --- a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/sensitive/package-info.java +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright 2012-2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.ylzl.eden.data.filter.sensitive; diff --git a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/support/MaskingFilterHelper.java b/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/support/MaskingFilterHelper.java deleted file mode 100644 index d07a34cc4..000000000 --- a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/support/MaskingFilterHelper.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright 2012-2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.ylzl.eden.data.filter.support; - -import org.ylzl.eden.data.filter.MaskingFilter; -import org.ylzl.eden.data.filter.builder.MaskingFilterBuilder; -import org.ylzl.eden.data.filter.config.MaskingConfig; -import org.ylzl.eden.extension.ExtensionLoader; - -/** - * 数据脱敏过滤器帮助支持 - * - * @author gyl - * @since 2.4.x - */ -public class MaskingFilterHelper { - - /** - * 获取数据脱敏过滤器实例 - * - * @return 数据脱敏过滤器实例 - */ - public static MaskingFilter maskingFilter() { - return ExtensionLoader.getExtensionLoader(MaskingFilterBuilder.class).getDefaultExtension().build(); - } - - /** - * 获取数据脱敏过滤器实例 - * - * @return 数据脱敏过滤器实例 - */ - public static MaskingFilter maskingFilter(String spi) { - return ExtensionLoader.getExtensionLoader(MaskingFilterBuilder.class).getExtension(spi).build(); - } - - /** - * 获取数据脱敏过滤器实例 - * - * @param config 配置信息 - * @return 数据脱敏过滤器实例 - */ - public static MaskingFilter maskingFilter(MaskingConfig config) { - return ExtensionLoader.getExtensionLoader(MaskingFilterBuilder.class) - .getExtension(config.getType()) - .config(config) - .build(); - } -} diff --git a/eden-components/eden-solutions/eden-data-filter/src/main/resources/META-INF/data-filter/org.ylzl.eden.data.filter.builder.MaskingFilterBuilder b/eden-components/eden-solutions/eden-data-filter/src/main/resources/META-INF/data-filter/org.ylzl.eden.data.filter.builder.MaskingFilterBuilder deleted file mode 100644 index 40b20c574..000000000 --- a/eden-components/eden-solutions/eden-data-filter/src/main/resources/META-INF/data-filter/org.ylzl.eden.data.filter.builder.MaskingFilterBuilder +++ /dev/null @@ -1 +0,0 @@ -chars-scan=org.ylzl.eden.data.filter.integration.masking.charsscan.CharsScanFilterBuilder diff --git a/eden-components/eden-solutions/eden-data-filter/src/main/resources/log4j2.plugins/org.apache.logging.log4j.core.config.plugins.PluginManager b/eden-components/eden-solutions/eden-data-filter/src/main/resources/log4j2.plugins/org.apache.logging.log4j.core.config.plugins.PluginManager deleted file mode 100644 index 0fea0b30c..000000000 --- a/eden-components/eden-solutions/eden-data-filter/src/main/resources/log4j2.plugins/org.apache.logging.log4j.core.config.plugins.PluginManager +++ /dev/null @@ -1 +0,0 @@ -org.ylzl.eden.data.filter.masking.log4j2.MaskingStringLayout diff --git a/eden-components/eden-solutions/eden-data-filter/pom.xml b/eden-components/eden-solutions/eden-data-masker/pom.xml similarity index 85% rename from eden-components/eden-solutions/eden-data-filter/pom.xml rename to eden-components/eden-solutions/eden-data-masker/pom.xml index f84a9ab76..8564a0295 100644 --- a/eden-components/eden-solutions/eden-data-filter/pom.xml +++ b/eden-components/eden-solutions/eden-data-masker/pom.xml @@ -15,8 +15,8 @@ ~ limitations under the License. --> - 4.0.0 @@ -26,10 +26,19 @@ 0.0.1-SNAPSHOT ../pom.xml - eden-data-filter + eden-data-masker jar - eden-data-filter - 数据过滤器 + eden-data-masker + 数据脱敏组件 + + + + + org.codehaus.mojo + exec-maven-plugin + + + @@ -58,18 +67,6 @@ true - - - org.springframework.data - spring-data-redis - - - - - org.ahocorasick - ahocorasick - - org.apache.logging.log4j @@ -106,6 +103,20 @@ + + + com.alibaba + fastjson + true + + + + + com.alibaba.fastjson2 + fastjson2 + true + + org.spockframework diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/DataMasker.java b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/DataMasker.java similarity index 85% rename from eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/DataMasker.java rename to eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/DataMasker.java index c3bcec7fe..f70e9d85b 100644 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/DataMasker.java +++ b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/DataMasker.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.ylzl.eden.data.auditor; +package org.ylzl.eden.data.masker; import org.ylzl.eden.extension.SPI; /** - * 数据脱敏 + * 数据脱敏器 * * @author gyl * @since 2.4.x @@ -30,8 +30,8 @@ public interface DataMasker { /** * 脱敏处理 * - * @param data 原始数据 - * @return 脱敏数据 + * @param text 原始数据 + * @return 脱敏内容 */ - String masking(String data); + String masking(String text); } diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/masker/DataMaskerManager.java b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/DataMaskerManager.java similarity index 96% rename from eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/masker/DataMaskerManager.java rename to eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/DataMaskerManager.java index f1b6174a5..1490e082d 100644 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/masker/DataMaskerManager.java +++ b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/DataMaskerManager.java @@ -14,12 +14,11 @@ * limitations under the License. */ -package org.ylzl.eden.data.auditor.masker; +package org.ylzl.eden.data.masker; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import lombok.extern.slf4j.Slf4j; -import org.ylzl.eden.data.auditor.DataMasker; import org.ylzl.eden.extension.ExtensionLoader; import org.ylzl.eden.spring.framework.error.util.AssertUtils; diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/masker/DataMasking.java b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/Masking.java similarity index 92% rename from eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/masker/DataMasking.java rename to eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/Masking.java index acfcc5737..bcdf807e3 100644 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/masker/DataMasking.java +++ b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/Masking.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ylzl.eden.data.auditor.masker; +package org.ylzl.eden.data.masker; import java.lang.annotation.*; @@ -28,7 +28,7 @@ @Inherited @Retention(value = RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) -public @interface DataMasking { +public @interface Masking { String value() default ""; diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/builder/AbstractDataMaskerBuilder.java b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/builder/AbstractDataMaskerBuilder.java similarity index 92% rename from eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/builder/AbstractDataMaskerBuilder.java rename to eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/builder/AbstractDataMaskerBuilder.java index f6aeaac9d..044fe29e6 100644 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/builder/AbstractDataMaskerBuilder.java +++ b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/builder/AbstractDataMaskerBuilder.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.ylzl.eden.data.auditor.builder; +package org.ylzl.eden.data.masker.builder; -import org.ylzl.eden.data.auditor.DataMasker; -import org.ylzl.eden.data.auditor.config.DataMaskerConfig; +import org.ylzl.eden.data.masker.DataMasker; +import org.ylzl.eden.data.masker.config.DataMaskerConfig; import org.ylzl.eden.extension.ExtensionLoader; /** diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/builder/DataMaskerBuilder.java b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/builder/DataMaskerBuilder.java similarity index 89% rename from eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/builder/DataMaskerBuilder.java rename to eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/builder/DataMaskerBuilder.java index 7ce26dd1a..97205bb3f 100644 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/builder/DataMaskerBuilder.java +++ b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/builder/DataMaskerBuilder.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.ylzl.eden.data.auditor.builder; +package org.ylzl.eden.data.masker.builder; -import org.ylzl.eden.data.auditor.DataMasker; -import org.ylzl.eden.data.auditor.config.DataMaskerConfig; +import org.ylzl.eden.data.masker.DataMasker; +import org.ylzl.eden.data.masker.config.DataMaskerConfig; import org.ylzl.eden.extension.SPI; /** diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/masker/package-info.java b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/builder/package-info.java similarity index 93% rename from eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/masker/package-info.java rename to eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/builder/package-info.java index 24a127c06..21444171f 100644 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/masker/package-info.java +++ b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/builder/package-info.java @@ -14,4 +14,4 @@ * limitations under the License. */ -package org.ylzl.eden.data.auditor.masker; +package org.ylzl.eden.data.masker.builder; diff --git a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/config/MaskingConfig.java b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/config/DataMaskerConfig.java similarity index 64% rename from eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/config/MaskingConfig.java rename to eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/config/DataMaskerConfig.java index dd22568a2..7696238e7 100644 --- a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/config/MaskingConfig.java +++ b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/config/DataMaskerConfig.java @@ -1,11 +1,27 @@ -package org.ylzl.eden.data.filter.config; +/* + * Copyright 2012-2019 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.ylzl.eden.data.masker.config; import com.google.common.base.Enums; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; import lombok.ToString; -import org.ylzl.eden.data.filter.masking.MaskingStrategy; +import org.ylzl.eden.data.masker.support.DataMaskerStrategy; import java.util.Arrays; import java.util.List; @@ -15,13 +31,17 @@ * 数据脱敏配置 * * @author gyl - * @since 2.4.13 + * @since 2.4.x */ @EqualsAndHashCode @ToString @Setter @Getter -public class MaskingConfig { +public class DataMaskerConfig { + + /** 是否允许覆盖扩展点 */ + private boolean allowExtensionOverriding = false; + public static final String CHARS_SCAN = "chars-scan"; @@ -70,7 +90,7 @@ private String convertToValues(String input) { try { return Integer.parseInt(item.trim()); } catch (NumberFormatException e) { - MaskingStrategy strategy = Enums.getIfPresent(MaskingStrategy.class, item.trim()).orNull(); + DataMaskerStrategy strategy = Enums.getIfPresent(DataMaskerStrategy.class, item.trim()).orNull(); if (strategy == null) { throw new IllegalArgumentException("Invalid masking type: " + item); } diff --git a/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/config/package-info.java b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/config/package-info.java new file mode 100644 index 000000000..d7caa91b1 --- /dev/null +++ b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/config/package-info.java @@ -0,0 +1,17 @@ +/* + * Copyright 2012-2019 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.ylzl.eden.data.masker.config; diff --git a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/MaskingFilter.java b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/extension/DataMaskerLoadingStrategy.java similarity index 64% rename from eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/MaskingFilter.java rename to eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/extension/DataMaskerLoadingStrategy.java index 604465c3d..d02af5989 100644 --- a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/MaskingFilter.java +++ b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/extension/DataMaskerLoadingStrategy.java @@ -14,21 +14,27 @@ * limitations under the License. */ -package org.ylzl.eden.data.filter; +package org.ylzl.eden.data.masker.extension; + +import org.ylzl.eden.extension.strategy.LoadingStrategy; /** - * 数据脱敏过滤器 + * 数据脱敏扩展点加载策略 * * @author gyl * @since 2.4.13 */ -public interface MaskingFilter { +public class DataMaskerLoadingStrategy implements LoadingStrategy { + + public static final String META_INF = "META-INF/data-masker/"; + + @Override + public String directory() { + return META_INF; + } - /** - * 文本脱敏 - * - * @param text 文本内容 - * @return 脱敏后的文本内容 - */ - String mask(String text); + @Override + public int getPriority() { + return MAX_PRIORITY; + } } diff --git a/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/extension/package-info.java b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/extension/package-info.java new file mode 100644 index 000000000..545eaf7a8 --- /dev/null +++ b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/extension/package-info.java @@ -0,0 +1,17 @@ +/* + * Copyright 2012-2019 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.ylzl.eden.data.masker.extension; diff --git a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/masking/charsscan/CharsScanFilter.java b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/charsscan/CharsScanDataMasker.java similarity index 83% rename from eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/masking/charsscan/CharsScanFilter.java rename to eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/charsscan/CharsScanDataMasker.java index 73dd3a3be..509f32e71 100644 --- a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/masking/charsscan/CharsScanFilter.java +++ b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/charsscan/CharsScanDataMasker.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.ylzl.eden.data.filter.integration.masking.charsscan; +package org.ylzl.eden.data.masker.integration.charsscan; import com.github.houbb.chars.scan.bs.CharsScanBs; import lombok.RequiredArgsConstructor; -import org.ylzl.eden.data.filter.MaskingFilter; +import org.ylzl.eden.data.masker.DataMasker; /** * CharsScan 组件 @@ -28,12 +28,12 @@ * @link https://github.com/houbb */ @RequiredArgsConstructor -public class CharsScanFilter implements MaskingFilter { +public class CharsScanDataMasker implements DataMasker { private final CharsScanBs charsScanBs; @Override - public String mask(String text) { + public String masking(String text) { try { return charsScanBs.scanAndReplace(text); } catch (Exception e) { diff --git a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/masking/charsscan/CharsScanFilterBuilder.java b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/charsscan/CharsScanDataMaskerBuilder.java similarity index 77% rename from eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/masking/charsscan/CharsScanFilterBuilder.java rename to eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/charsscan/CharsScanDataMaskerBuilder.java index 20a9307ae..ec492aef9 100644 --- a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/masking/charsscan/CharsScanFilterBuilder.java +++ b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/charsscan/CharsScanDataMaskerBuilder.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.ylzl.eden.data.filter.integration.masking.charsscan; +package org.ylzl.eden.data.masker.integration.charsscan; import com.github.houbb.chars.scan.bs.CharsScanBs; import com.github.houbb.chars.scan.util.InnerCharsScanPropertyBuilder; import lombok.RequiredArgsConstructor; -import org.ylzl.eden.data.filter.MaskingFilter; -import org.ylzl.eden.data.filter.builder.AbstractMaskingFilterBuilder; -import org.ylzl.eden.data.filter.builder.MaskingFilterBuilder; +import org.ylzl.eden.data.masker.DataMasker; +import org.ylzl.eden.data.masker.builder.AbstractDataMaskerBuilder; +import org.ylzl.eden.data.masker.builder.DataMaskerBuilder; import java.util.concurrent.atomic.AtomicBoolean; @@ -32,14 +32,14 @@ * @since 2.4.13 */ @RequiredArgsConstructor -public class CharsScanFilterBuilder extends AbstractMaskingFilterBuilder implements MaskingFilterBuilder { +public class CharsScanDataMaskerBuilder extends AbstractDataMaskerBuilder implements DataMaskerBuilder { private CharsScanBs charsScanBs; private static final AtomicBoolean BUILD_STATE = new AtomicBoolean(false); @Override - public MaskingFilter build() { + public DataMasker build() { if (BUILD_STATE.compareAndSet(false, true)) { charsScanBs = InnerCharsScanPropertyBuilder.buildCharsScanBs( getConfig().getCharsScan().getPrefix(), @@ -50,6 +50,6 @@ public MaskingFilter build() { getConfig().getCharsScan().getWhiteList() ); } - return new CharsScanFilter(charsScanBs); + return new CharsScanDataMasker(charsScanBs); } } diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker/fastjson/FastjsonDataMaskerBuilder.java b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/fastjson/FastjsonDataMaskerBuilder.java similarity index 84% rename from eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker/fastjson/FastjsonDataMaskerBuilder.java rename to eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/fastjson/FastjsonDataMaskerBuilder.java index 6e7b69785..87963ee9e 100644 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker/fastjson/FastjsonDataMaskerBuilder.java +++ b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/fastjson/FastjsonDataMaskerBuilder.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.ylzl.eden.data.auditor.integration.masker.fastjson; +package org.ylzl.eden.data.masker.integration.fastjson; -import org.ylzl.eden.data.auditor.DataMasker; -import org.ylzl.eden.data.auditor.builder.AbstractDataMaskerBuilder; +import org.ylzl.eden.data.masker.DataMasker; +import org.ylzl.eden.data.masker.builder.AbstractDataMaskerBuilder; /** * Fastjson 数据脱敏构建器 diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker/fastjson/FastjsonDataMaskingValueFilter.java b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/fastjson/FastjsonDataMaskingValueFilter.java similarity index 80% rename from eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker/fastjson/FastjsonDataMaskingValueFilter.java rename to eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/fastjson/FastjsonDataMaskingValueFilter.java index 32d55da6e..267a8c4c6 100644 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker/fastjson/FastjsonDataMaskingValueFilter.java +++ b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/fastjson/FastjsonDataMaskingValueFilter.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.ylzl.eden.data.auditor.integration.masker.fastjson; +package org.ylzl.eden.data.masker.integration.fastjson; import com.alibaba.fastjson.serializer.ValueFilter; import org.ylzl.eden.commons.lang.ObjectUtils; -import org.ylzl.eden.data.auditor.masker.DataMaskerManager; -import org.ylzl.eden.data.auditor.masker.DataMasking; +import org.ylzl.eden.data.masker.DataMaskerManager; +import org.ylzl.eden.data.masker.Masking; import org.ylzl.eden.spring.framework.json.fastjson.FastjsonFilter; import java.lang.reflect.Field; @@ -43,13 +43,13 @@ public Object process(Object object, String name, Object value) { return value; } - DataMasking dataMasking = field.getAnnotation(DataMasking.class); - if (dataMasking == null) { + Masking masking = field.getAnnotation(Masking.class); + if (masking == null) { return value; } String data = ObjectUtils.trimToString(value); - return DataMaskerManager.getDataMasker(dataMasking.value()).masking(data); + return DataMaskerManager.getDataMasker(masking.value()).masking(data); } catch (NoSuchFieldException e) { throw new FastjsonValueFilterException(e); } diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker/fastjson/FastjsonValueFilterException.java b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/fastjson/FastjsonValueFilterException.java similarity index 93% rename from eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker/fastjson/FastjsonValueFilterException.java rename to eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/fastjson/FastjsonValueFilterException.java index d8ee6cc29..edd05a85d 100644 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker/fastjson/FastjsonValueFilterException.java +++ b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/fastjson/FastjsonValueFilterException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ylzl.eden.data.auditor.integration.masker.fastjson; +package org.ylzl.eden.data.masker.integration.fastjson; /** * Fastjson 属性值过滤异常 diff --git a/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/fastjson/package-info.java b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/fastjson/package-info.java new file mode 100644 index 000000000..d9bbfeff7 --- /dev/null +++ b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/fastjson/package-info.java @@ -0,0 +1,17 @@ +/* + * Copyright 2012-2019 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.ylzl.eden.data.masker.integration.fastjson; diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker/fastjson2/Fastjson2DataMaskerBuilder.java b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/fastjson2/Fastjson2DataMaskerBuilder.java similarity index 84% rename from eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker/fastjson2/Fastjson2DataMaskerBuilder.java rename to eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/fastjson2/Fastjson2DataMaskerBuilder.java index 9519727b8..ddbdfd0ae 100644 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker/fastjson2/Fastjson2DataMaskerBuilder.java +++ b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/fastjson2/Fastjson2DataMaskerBuilder.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.ylzl.eden.data.auditor.integration.masker.fastjson2; +package org.ylzl.eden.data.masker.integration.fastjson2; -import org.ylzl.eden.data.auditor.DataMasker; -import org.ylzl.eden.data.auditor.builder.AbstractDataMaskerBuilder; +import org.ylzl.eden.data.masker.DataMasker; +import org.ylzl.eden.data.masker.builder.AbstractDataMaskerBuilder; /** * Fastjson2 数据脱敏构建器 diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker/fastjson2/Fastjson2DataMaskingValueFilter.java b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/fastjson2/Fastjson2DataMaskingValueFilter.java similarity index 80% rename from eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker/fastjson2/Fastjson2DataMaskingValueFilter.java rename to eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/fastjson2/Fastjson2DataMaskingValueFilter.java index c5eeac998..bc2158447 100644 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker/fastjson2/Fastjson2DataMaskingValueFilter.java +++ b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/fastjson2/Fastjson2DataMaskingValueFilter.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.ylzl.eden.data.auditor.integration.masker.fastjson2; +package org.ylzl.eden.data.masker.integration.fastjson2; import com.alibaba.fastjson2.filter.ValueFilter; import org.ylzl.eden.commons.lang.ObjectUtils; -import org.ylzl.eden.data.auditor.masker.DataMaskerManager; -import org.ylzl.eden.data.auditor.masker.DataMasking; +import org.ylzl.eden.data.masker.DataMaskerManager; +import org.ylzl.eden.data.masker.Masking; import org.ylzl.eden.spring.framework.json.fastjson2.Fastjson2Filter; import java.lang.reflect.Field; @@ -43,13 +43,13 @@ public Object apply(Object object, String name, Object value) { return value; } - DataMasking dataMasking = field.getAnnotation(DataMasking.class); - if (dataMasking == null) { + Masking masking = field.getAnnotation(Masking.class); + if (masking == null) { return value; } String data = ObjectUtils.trimToString(value); - return DataMaskerManager.getDataMasker(dataMasking.value()).masking(data); + return DataMaskerManager.getDataMasker(masking.value()).masking(data); } catch (NoSuchFieldException e) { throw new Fastjson2ValueFilterException(e); } diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker/fastjson2/Fastjson2ValueFilterException.java b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/fastjson2/Fastjson2ValueFilterException.java similarity index 93% rename from eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker/fastjson2/Fastjson2ValueFilterException.java rename to eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/fastjson2/Fastjson2ValueFilterException.java index a80f4f04c..cf03eda60 100644 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker/fastjson2/Fastjson2ValueFilterException.java +++ b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/fastjson2/Fastjson2ValueFilterException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ylzl.eden.data.auditor.integration.masker.fastjson2; +package org.ylzl.eden.data.masker.integration.fastjson2; /** * Fastjson2 属性值过滤异常 diff --git a/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/fastjson2/package-info.java b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/fastjson2/package-info.java new file mode 100644 index 000000000..4c6f0da04 --- /dev/null +++ b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/fastjson2/package-info.java @@ -0,0 +1,17 @@ +/* + * Copyright 2012-2019 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.ylzl.eden.data.masker.integration.fastjson2; diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker/jackson/JacksonDataMaskerBuilder.java b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/jackson/JacksonDataMaskerBuilder.java similarity index 85% rename from eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker/jackson/JacksonDataMaskerBuilder.java rename to eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/jackson/JacksonDataMaskerBuilder.java index ea48f5811..4237a92db 100644 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker/jackson/JacksonDataMaskerBuilder.java +++ b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/jackson/JacksonDataMaskerBuilder.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.ylzl.eden.data.auditor.integration.masker.jackson; +package org.ylzl.eden.data.masker.integration.jackson; -import org.ylzl.eden.data.auditor.DataMasker; -import org.ylzl.eden.data.auditor.builder.AbstractDataMaskerBuilder; +import org.ylzl.eden.data.masker.DataMasker; +import org.ylzl.eden.data.masker.builder.AbstractDataMaskerBuilder; /** * Jackson 数据脱敏构建器 diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker/jackson/JacksonDataMaskingBeanSerializerModifier.java b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/jackson/JacksonDataMaskingBeanSerializerModifier.java similarity index 85% rename from eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker/jackson/JacksonDataMaskingBeanSerializerModifier.java rename to eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/jackson/JacksonDataMaskingBeanSerializerModifier.java index 6a5d8c57f..b2aa2532e 100644 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker/jackson/JacksonDataMaskingBeanSerializerModifier.java +++ b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/jackson/JacksonDataMaskingBeanSerializerModifier.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ylzl.eden.data.auditor.integration.masker.jackson; +package org.ylzl.eden.data.masker.integration.jackson; import com.fasterxml.jackson.databind.BeanDescription; import com.fasterxml.jackson.databind.JsonSerializer; @@ -22,7 +22,7 @@ import com.fasterxml.jackson.databind.ser.BeanPropertyWriter; import com.fasterxml.jackson.databind.ser.BeanSerializerModifier; import com.fasterxml.jackson.databind.type.MapType; -import org.ylzl.eden.data.auditor.masker.DataMasking; +import org.ylzl.eden.data.masker.Masking; import java.util.ArrayList; import java.util.List; @@ -39,9 +39,9 @@ public class JacksonDataMaskingBeanSerializerModifier extends BeanSerializerModi public List changeProperties(SerializationConfig config, BeanDescription beanDesc, List beanProperties) { List newWriters = new ArrayList<>(); for (BeanPropertyWriter writer : beanProperties) { - DataMasking dataMasking = writer.getAnnotation(DataMasking.class); - if (dataMasking != null && writer.getType().isTypeOrSubTypeOf(String.class)) { - JsonSerializer serializer = new JacksonDataMaskingJsonSerializer(dataMasking, writer.getSerializer()); + Masking masking = writer.getAnnotation(Masking.class); + if (masking != null && writer.getType().isTypeOrSubTypeOf(String.class)) { + JsonSerializer serializer = new JacksonDataMaskingJsonSerializer(masking, writer.getSerializer()); writer.assignSerializer(serializer); } newWriters.add(writer); diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker/jackson/JacksonDataMaskingJsonSerializer.java b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/jackson/JacksonDataMaskingJsonSerializer.java similarity index 78% rename from eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker/jackson/JacksonDataMaskingJsonSerializer.java rename to eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/jackson/JacksonDataMaskingJsonSerializer.java index 46663b874..776c804fa 100644 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker/jackson/JacksonDataMaskingJsonSerializer.java +++ b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/jackson/JacksonDataMaskingJsonSerializer.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.ylzl.eden.data.auditor.integration.masker.jackson; +package org.ylzl.eden.data.masker.integration.jackson; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.SerializerProvider; import org.ylzl.eden.commons.lang.ObjectUtils; -import org.ylzl.eden.data.auditor.masker.DataMaskerManager; -import org.ylzl.eden.data.auditor.masker.DataMasking; +import org.ylzl.eden.data.masker.DataMaskerManager; +import org.ylzl.eden.data.masker.Masking; import java.io.IOException; @@ -33,12 +33,12 @@ */ public class JacksonDataMaskingJsonSerializer extends JsonSerializer { - private final DataMasking dataMasking; + private final Masking masking; private final JsonSerializer serializer; - public JacksonDataMaskingJsonSerializer(DataMasking dataMasking, JsonSerializer serializer) { - this.dataMasking = dataMasking; + public JacksonDataMaskingJsonSerializer(Masking masking, JsonSerializer serializer) { + this.masking = masking; this.serializer = serializer; } @@ -47,7 +47,7 @@ public void serialize(Object object, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException { if (ObjectUtils.isNotNull(object) && object instanceof String) { String data = ObjectUtils.trimToString(object); - object = DataMaskerManager.getDataMasker(dataMasking.value()).masking(data); + object = DataMaskerManager.getDataMasker(masking.value()).masking(data); } if (this.serializer != null) { diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker/jackson/JacksonDataMaskingModule.java b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/jackson/JacksonDataMaskingModule.java similarity index 96% rename from eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker/jackson/JacksonDataMaskingModule.java rename to eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/jackson/JacksonDataMaskingModule.java index 6becd6c65..fa920e095 100644 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/integration/masker/jackson/JacksonDataMaskingModule.java +++ b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/jackson/JacksonDataMaskingModule.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ylzl.eden.data.auditor.integration.masker.jackson; +package org.ylzl.eden.data.masker.integration.jackson; import com.fasterxml.jackson.core.Version; import com.fasterxml.jackson.core.util.VersionUtil; diff --git a/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/jackson/package-info.java b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/jackson/package-info.java new file mode 100644 index 000000000..4539013c8 --- /dev/null +++ b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/jackson/package-info.java @@ -0,0 +1,17 @@ +/* + * Copyright 2012-2019 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.ylzl.eden.data.masker.integration.jackson; diff --git a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/masking/log4j2/MaskingStringLayout.java b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/log4j2/DataMaskerStringLayout.java similarity index 57% rename from eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/masking/log4j2/MaskingStringLayout.java rename to eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/log4j2/DataMaskerStringLayout.java index e86636590..a09fc2344 100644 --- a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/masking/log4j2/MaskingStringLayout.java +++ b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/log4j2/DataMaskerStringLayout.java @@ -14,21 +14,24 @@ * limitations under the License. */ -package org.ylzl.eden.data.filter.masking.log4j2; +package org.ylzl.eden.data.masker.integration.log4j2; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.core.Layout; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.config.Configuration; import org.apache.logging.log4j.core.config.Node; -import org.apache.logging.log4j.core.config.plugins.*; +import org.apache.logging.log4j.core.config.plugins.Plugin; +import org.apache.logging.log4j.core.config.plugins.PluginAttribute; +import org.apache.logging.log4j.core.config.plugins.PluginConfiguration; +import org.apache.logging.log4j.core.config.plugins.PluginFactory; import org.apache.logging.log4j.core.layout.AbstractStringLayout; import org.apache.logging.log4j.core.layout.PatternLayout; import org.apache.logging.log4j.core.pattern.LogEventPatternConverter; import org.apache.logging.log4j.core.pattern.PatternFormatter; import org.apache.logging.log4j.core.pattern.PatternParser; -import org.ylzl.eden.data.filter.config.MaskingConfig; -import org.ylzl.eden.data.filter.support.MaskingFilterHelper; +import org.ylzl.eden.data.masker.config.DataMaskerConfig; +import org.ylzl.eden.data.masker.support.DataMaskerHelper; import java.nio.charset.Charset; import java.util.List; @@ -40,22 +43,22 @@ * @since 2.4.13 */ @Plugin(name = "MaskingStringLayout", category = Node.CATEGORY, elementType = Layout.ELEMENT_TYPE, printObject = true) -public class MaskingStringLayout extends AbstractStringLayout { +public class DataMaskerStringLayout extends AbstractStringLayout { private static final String KEY = "Converter"; - private final MaskingConfig maskingConfig; + private final DataMaskerConfig config; private List patternFormatterList; - public MaskingStringLayout(Charset charset, MaskingConfig maskingConfig) { + public DataMaskerStringLayout(Charset charset, DataMaskerConfig config) { super(charset); - this.maskingConfig = maskingConfig; + this.config = config; } - public MaskingStringLayout(Charset charset, byte[] header, byte[] footer, MaskingConfig maskingConfig) { + public DataMaskerStringLayout(Charset charset, byte[] header, byte[] footer, DataMaskerConfig config) { super(charset, header, footer); - this.maskingConfig = maskingConfig; + this.config = config; } @Override @@ -67,18 +70,18 @@ public String toSerializable(LogEvent event) { for (PatternFormatter formatter : patternFormatterList) { formatter.format(event, stringBuilder); } - return MaskingFilterHelper.maskingFilter(maskingConfig).mask(stringBuilder.toString()); + return DataMaskerHelper.dataMasker(config).masking(stringBuilder.toString()); } @PluginFactory - public static MaskingStringLayout createLayout(@PluginConfiguration final Configuration config, - @PluginAttribute(value = "charset", defaultString = "UTF-8") String charset, - @PluginAttribute(value = "pattern", defaultString = PatternLayout.DEFAULT_CONVERSION_PATTERN) String pattern, - @PluginAttribute(value = "type") String type, - @PluginAttribute(value = "strategies") String strategies, - @PluginAttribute(value = "replacement") String replacement, - @PluginAttribute(value = "hash") String hash, - @PluginAttribute(value = "whitelist") String whitelist) { + public static DataMaskerStringLayout createLayout(@PluginConfiguration final Configuration config, + @PluginAttribute(value = "charset", defaultString = "UTF-8") String charset, + @PluginAttribute(value = "pattern", defaultString = PatternLayout.DEFAULT_CONVERSION_PATTERN) String pattern, + @PluginAttribute(value = "type") String type, + @PluginAttribute(value = "strategies") String strategies, + @PluginAttribute(value = "replacement") String replacement, + @PluginAttribute(value = "hash") String hash, + @PluginAttribute(value = "whitelist") String whitelist) { PatternParser patternParser = null; if (config != null) { @@ -88,27 +91,27 @@ public static MaskingStringLayout createLayout(@PluginConfiguration final Config patternParser = new PatternParser(config, KEY, LogEventPatternConverter.class); } - MaskingConfig maskingConfig = new MaskingConfig(); + DataMaskerConfig dataMaskerConfig = new DataMaskerConfig(); if (StringUtils.isNotBlank(type)) { - maskingConfig.setType(type); + dataMaskerConfig.setType(type); } - if (MaskingConfig.CHARS_SCAN.equals(maskingConfig.getType())) { + if (DataMaskerConfig.CHARS_SCAN.equals(dataMaskerConfig.getType())) { if (StringUtils.isNotBlank(strategies)) { - maskingConfig.getCharsScan().setReplaceList(strategies); - maskingConfig.getCharsScan().setScanList(strategies); + dataMaskerConfig.getCharsScan().setReplaceList(strategies); + dataMaskerConfig.getCharsScan().setScanList(strategies); } if (StringUtils.isNotBlank(replacement)) { - maskingConfig.getCharsScan().setDefaultReplace(replacement); + dataMaskerConfig.getCharsScan().setDefaultReplace(replacement); } if (StringUtils.isNotBlank(hash)) { - maskingConfig.getCharsScan().setReplaceHash(hash); + dataMaskerConfig.getCharsScan().setReplaceHash(hash); } if (StringUtils.isNotBlank(whitelist)) { - maskingConfig.getCharsScan().setWhiteList(whitelist); + dataMaskerConfig.getCharsScan().setWhiteList(whitelist); } } - MaskingStringLayout layout = new MaskingStringLayout(Charset.forName(charset), maskingConfig); + DataMaskerStringLayout layout = new DataMaskerStringLayout(Charset.forName(charset), dataMaskerConfig); layout.patternFormatterList = patternParser.parse(pattern); return layout; } diff --git a/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/package-info.java b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/package-info.java new file mode 100644 index 000000000..443b16e7d --- /dev/null +++ b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/package-info.java @@ -0,0 +1,17 @@ +/* + * Copyright 2012-2019 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.ylzl.eden.data.masker.integration; diff --git a/eden-components/eden-solutions/eden-data-auditor/src/test/java/org/ylzl/eden/data/auditor/package-info.java b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/package-info.java similarity index 94% rename from eden-components/eden-solutions/eden-data-auditor/src/test/java/org/ylzl/eden/data/auditor/package-info.java rename to eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/package-info.java index 23a4e8fde..86ab1df26 100644 --- a/eden-components/eden-solutions/eden-data-auditor/src/test/java/org/ylzl/eden/data/auditor/package-info.java +++ b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/package-info.java @@ -14,4 +14,4 @@ * limitations under the License. */ -package org.ylzl.eden.data.auditor; +package org.ylzl.eden.data.masker; diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/masker/spi/AddressDataMasker.java b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/spi/AddressDataMasker.java similarity index 77% rename from eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/masker/spi/AddressDataMasker.java rename to eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/spi/AddressDataMasker.java index a89ee3181..dd9c9198c 100644 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/masker/spi/AddressDataMasker.java +++ b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/spi/AddressDataMasker.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.ylzl.eden.data.auditor.masker.spi; +package org.ylzl.eden.data.masker.spi; -import org.ylzl.eden.data.auditor.DataMasker; +import org.ylzl.eden.data.masker.DataMasker; /** * 住址数据脱敏 @@ -29,11 +29,11 @@ public class AddressDataMasker implements DataMasker { /** * 脱敏处理 * - * @param data 原始数据 - * @return 脱敏数据 + * @param text 原始内容 + * @return 脱敏内容 */ @Override - public String masking(String data) { - return data.replaceAll("(\\S{3})\\S{2}(\\S*)\\S{2}", "$1****$2****"); + public String masking(String text) { + return text.replaceAll("(\\S{3})\\S{2}(\\S*)\\S{2}", "$1****$2****"); } } diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/masker/spi/BankCardDataMasker.java b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/spi/BankCardDataMasker.java similarity index 78% rename from eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/masker/spi/BankCardDataMasker.java rename to eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/spi/BankCardDataMasker.java index 6a265e64d..012bda242 100644 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/masker/spi/BankCardDataMasker.java +++ b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/spi/BankCardDataMasker.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.ylzl.eden.data.auditor.masker.spi; +package org.ylzl.eden.data.masker.spi; -import org.ylzl.eden.data.auditor.DataMasker; +import org.ylzl.eden.data.masker.DataMasker; /** * 银行卡数据脱敏（保留后四位） @@ -29,11 +29,11 @@ public class BankCardDataMasker implements DataMasker { /** * 脱敏处理 * - * @param data 原始数据 - * @return 脱敏数据 + * @param text 原始内容 + * @return 脱敏内容 */ @Override - public String masking(String data) { - return data.replaceAll("(\\d+)(\\d{4})", "****$2"); + public String masking(String text) { + return text.replaceAll("(\\d+)(\\d{4})", "****$2"); } } diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/masker/spi/CarLicenseDataMasker.java b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/spi/CarLicenseDataMasker.java similarity index 77% rename from eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/masker/spi/CarLicenseDataMasker.java rename to eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/spi/CarLicenseDataMasker.java index e9ba0467b..82abf4626 100644 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/masker/spi/CarLicenseDataMasker.java +++ b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/spi/CarLicenseDataMasker.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.ylzl.eden.data.auditor.masker.spi; +package org.ylzl.eden.data.masker.spi; -import org.ylzl.eden.data.auditor.DataMasker; +import org.ylzl.eden.data.masker.DataMasker; /** * 车牌号码数据脱敏 @@ -29,11 +29,11 @@ public class CarLicenseDataMasker implements DataMasker { /** * 脱敏处理 * - * @param data 原始数据 - * @return 脱敏数据 + * @param text 原始内容 + * @return 脱敏内容 */ @Override - public String masking(String data) { - return data.replaceAll("(\\S)(\\d)(\\d*)(\\d)", "$1$2***$4"); + public String masking(String text) { + return text.replaceAll("(\\S)(\\d)(\\d*)(\\d)", "$1$2***$4"); } } diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/masker/spi/ChineseNameDataMasker.java b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/spi/ChineseNameDataMasker.java similarity index 78% rename from eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/masker/spi/ChineseNameDataMasker.java rename to eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/spi/ChineseNameDataMasker.java index 822b3c7bc..8153ab561 100644 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/masker/spi/ChineseNameDataMasker.java +++ b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/spi/ChineseNameDataMasker.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.ylzl.eden.data.auditor.masker.spi; +package org.ylzl.eden.data.masker.spi; -import org.ylzl.eden.data.auditor.DataMasker; +import org.ylzl.eden.data.masker.DataMasker; /** * 中文名数据脱敏 @@ -29,11 +29,11 @@ public class ChineseNameDataMasker implements DataMasker { /** * 脱敏处理 * - * @param data 原始数据 - * @return 脱敏数据 + * @param text 原始内容 + * @return 脱敏内容 */ @Override - public String masking(String data) { - return data.replaceAll("(\\S)\\S(\\S*)", "$1*$2"); + public String masking(String text) { + return text.replaceAll("(\\S)\\S(\\S*)", "$1*$2"); } } diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/masker/spi/EmailDataMasker.java b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/spi/EmailDataMasker.java similarity index 77% rename from eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/masker/spi/EmailDataMasker.java rename to eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/spi/EmailDataMasker.java index 4ee86c19b..26634f041 100644 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/masker/spi/EmailDataMasker.java +++ b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/spi/EmailDataMasker.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.ylzl.eden.data.auditor.masker.spi; +package org.ylzl.eden.data.masker.spi; -import org.ylzl.eden.data.auditor.DataMasker; +import org.ylzl.eden.data.masker.DataMasker; /** * 电子邮件数据脱敏 @@ -29,11 +29,11 @@ public class EmailDataMasker implements DataMasker { /** * 脱敏处理 * - * @param data 原始数据 - * @return 脱敏数据 + * @param text 原始内容 + * @return 脱敏内容 */ @Override - public String masking(String data) { - return data.replaceAll("(\\S)(\\S*)@(\\S*)", "$1****@$3"); + public String masking(String text) { + return text.replaceAll("(\\S)(\\S*)@(\\S*)", "$1****@$3"); } } diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/masker/spi/IdCardDataMasker.java b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/spi/IdCardDataMasker.java similarity index 77% rename from eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/masker/spi/IdCardDataMasker.java rename to eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/spi/IdCardDataMasker.java index a3e7fa8df..54212ad03 100644 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/masker/spi/IdCardDataMasker.java +++ b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/spi/IdCardDataMasker.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.ylzl.eden.data.auditor.masker.spi; +package org.ylzl.eden.data.masker.spi; -import org.ylzl.eden.data.auditor.DataMasker; +import org.ylzl.eden.data.masker.DataMasker; /** * 身份证数据脱敏 @@ -29,11 +29,11 @@ public class IdCardDataMasker implements DataMasker { /** * 脱敏处理 * - * @param data 原始数据 - * @return 脱敏数据 + * @param text 原始内容 + * @return 脱敏内容 */ @Override - public String masking(String data) { - return data.replaceAll("(\\d{4})\\d{10}(\\w{4})", "$1****$2"); + public String masking(String text) { + return text.replaceAll("(\\d{4})\\d{10}(\\w{4})", "$1****$2"); } } diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/masker/spi/MobilePhoneDataMasker.java b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/spi/MobilePhoneDataMasker.java similarity index 77% rename from eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/masker/spi/MobilePhoneDataMasker.java rename to eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/spi/MobilePhoneDataMasker.java index de0dc0cce..9c2d9baf0 100644 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/masker/spi/MobilePhoneDataMasker.java +++ b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/spi/MobilePhoneDataMasker.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.ylzl.eden.data.auditor.masker.spi; +package org.ylzl.eden.data.masker.spi; -import org.ylzl.eden.data.auditor.DataMasker; +import org.ylzl.eden.data.masker.DataMasker; /** * 手机数据脱敏 @@ -29,11 +29,11 @@ public class MobilePhoneDataMasker implements DataMasker { /** * 脱敏处理 * - * @param data 原始数据 - * @return 脱敏数据 + * @param text 原始内容 + * @return 脱敏内容 */ @Override - public String masking(String data) { - return data.replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2"); + public String masking(String text) { + return text.replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2"); } } diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/masker/spi/MoneyDataMasker.java b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/spi/MoneyDataMasker.java similarity index 82% rename from eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/masker/spi/MoneyDataMasker.java rename to eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/spi/MoneyDataMasker.java index 9e8224143..7aa2506e0 100644 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/masker/spi/MoneyDataMasker.java +++ b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/spi/MoneyDataMasker.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.ylzl.eden.data.auditor.masker.spi; +package org.ylzl.eden.data.masker.spi; -import org.ylzl.eden.data.auditor.DataMasker; +import org.ylzl.eden.data.masker.DataMasker; /** * 金额数据脱敏 @@ -29,11 +29,11 @@ public class MoneyDataMasker implements DataMasker { /** * 脱敏处理 * - * @param data 原始数据 - * @return 脱敏数据 + * @param text 原始内容 + * @return 脱敏内容 */ @Override - public String masking(String data) { + public String masking(String text) { return "****"; } } diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/masker/spi/PasswordDataMasker.java b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/spi/PasswordDataMasker.java similarity index 82% rename from eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/masker/spi/PasswordDataMasker.java rename to eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/spi/PasswordDataMasker.java index fed884705..0ca17b42f 100644 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/masker/spi/PasswordDataMasker.java +++ b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/spi/PasswordDataMasker.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.ylzl.eden.data.auditor.masker.spi; +package org.ylzl.eden.data.masker.spi; -import org.ylzl.eden.data.auditor.DataMasker; +import org.ylzl.eden.data.masker.DataMasker; /** * 密码数据脱敏 @@ -29,11 +29,11 @@ public class PasswordDataMasker implements DataMasker { /** * 脱敏处理 * - * @param data 原始数据 - * @return 脱敏数据 + * @param text 原始内容 + * @return 脱敏内容 */ @Override - public String masking(String data) { + public String masking(String text) { return "******"; } } diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/masker/spi/TelephoneDataMasker.java b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/spi/TelephoneDataMasker.java similarity index 77% rename from eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/masker/spi/TelephoneDataMasker.java rename to eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/spi/TelephoneDataMasker.java index 3de6d925c..61eebb968 100644 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/masker/spi/TelephoneDataMasker.java +++ b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/spi/TelephoneDataMasker.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.ylzl.eden.data.auditor.masker.spi; +package org.ylzl.eden.data.masker.spi; -import org.ylzl.eden.data.auditor.DataMasker; +import org.ylzl.eden.data.masker.DataMasker; /** * 座机数据脱敏 @@ -29,11 +29,11 @@ public class TelephoneDataMasker implements DataMasker { /** * 脱敏处理 * - * @param data 原始数据 - * @return 脱敏数据 + * @param text 原始内容 + * @return 脱敏内容 */ @Override - public String masking(String data) { - return data.replaceAll("(\\d{3})(\\d*)(\\d{2})", "$1****$3"); + public String masking(String text) { + return text.replaceAll("(\\d{3})(\\d*)(\\d{2})", "$1****$3"); } } diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/masker/spi/UsernameDataMasker.java b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/spi/UsernameDataMasker.java similarity index 77% rename from eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/masker/spi/UsernameDataMasker.java rename to eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/spi/UsernameDataMasker.java index e2d8957b8..53cd2832f 100644 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/masker/spi/UsernameDataMasker.java +++ b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/spi/UsernameDataMasker.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.ylzl.eden.data.auditor.masker.spi; +package org.ylzl.eden.data.masker.spi; -import org.ylzl.eden.data.auditor.DataMasker; +import org.ylzl.eden.data.masker.DataMasker; /** * 用户名称数据脱敏 @@ -29,11 +29,11 @@ public class UsernameDataMasker implements DataMasker { /** * 脱敏处理 * - * @param data 原始数据 - * @return 脱敏数据 + * @param text 原始内容 + * @return 脱敏内容 */ @Override - public String masking(String data) { - return data.replaceAll("(\\S)(\\S*)(\\S{2})", "$1****$3"); + public String masking(String text) { + return text.replaceAll("(\\S)(\\S*)(\\S{2})", "$1****$3"); } } diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/support/DataMaskerHelper.java b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/support/DataMaskerHelper.java similarity index 70% rename from eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/support/DataMaskerHelper.java rename to eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/support/DataMaskerHelper.java index 99a42f566..9c2b67307 100644 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/support/DataMaskerHelper.java +++ b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/support/DataMaskerHelper.java @@ -14,10 +14,11 @@ * limitations under the License. */ -package org.ylzl.eden.data.auditor.support; +package org.ylzl.eden.data.masker.support; -import org.ylzl.eden.data.auditor.DataMasker; -import org.ylzl.eden.data.auditor.builder.DataMaskerBuilder; +import org.ylzl.eden.data.masker.DataMasker; +import org.ylzl.eden.data.masker.builder.DataMaskerBuilder; +import org.ylzl.eden.data.masker.config.DataMaskerConfig; import org.ylzl.eden.extension.ExtensionLoader; /** @@ -29,7 +30,7 @@ public class DataMaskerHelper { /** - * 获取数据脱敏实例 + * 获取数据脱敏器实例 * * @param strategy 策略 * @return 数据脱敏实例 @@ -39,7 +40,7 @@ public static DataMasker dataMasker(String strategy) { } /** - * 获取数据脱敏实例 + * 获取数据脱敏器实例 * * @param spi 扩展点 * @param strategy 策略 @@ -48,4 +49,17 @@ public static DataMasker dataMasker(String strategy) { public static DataMasker dataMasker(String spi, String strategy) { return ExtensionLoader.getExtensionLoader(DataMaskerBuilder.class).getExtension(spi).strategy(strategy).build(); } + + /** + * 获取数据脱敏器实例 + * + * @param config 配置 + * @return 数据脱敏实例 + */ + public static DataMasker dataMasker(DataMaskerConfig config) { + return ExtensionLoader.getExtensionLoader(DataMaskerBuilder.class) + .getDefaultExtension() + .config(config) + .build(); + } } diff --git a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/masking/MaskingStrategy.java b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/support/DataMaskerStrategy.java similarity index 83% rename from eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/masking/MaskingStrategy.java rename to eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/support/DataMaskerStrategy.java index 6e73487b5..6a93541ee 100644 --- a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/masking/MaskingStrategy.java +++ b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/support/DataMaskerStrategy.java @@ -1,4 +1,4 @@ -package org.ylzl.eden.data.filter.masking; +package org.ylzl.eden.data.masker.support; import lombok.Getter; @@ -9,7 +9,7 @@ * @since 2.4.13 */ @Getter -public enum MaskingStrategy { +public enum DataMaskerStrategy { TELEPHONE(1, "手机号"), ID_CARD(2, "身份证"), @@ -28,7 +28,7 @@ public enum MaskingStrategy { private final int value; private final String description; - MaskingStrategy(int value, String description) { + DataMaskerStrategy(int value, String description) { this.value = value; this.description = description; } diff --git a/eden-components/eden-solutions/eden-data-masker/src/main/resources/META-INF/data-masker/org.ylzl.eden.data.masker.DataMasker b/eden-components/eden-solutions/eden-data-masker/src/main/resources/META-INF/data-masker/org.ylzl.eden.data.masker.DataMasker new file mode 100644 index 000000000..a8d67a7b4 --- /dev/null +++ b/eden-components/eden-solutions/eden-data-masker/src/main/resources/META-INF/data-masker/org.ylzl.eden.data.masker.DataMasker @@ -0,0 +1,11 @@ +address=org.ylzl.eden.data.masker.spi.AddressDataMasker +bank-card=org.ylzl.eden.data.masker.spi.BankCardDataMasker +car-license=org.ylzl.eden.data.masker.spi.CarLicenseDataMasker +chinese-name=org.ylzl.eden.data.masker.spi.ChineseNameDataMasker +email=org.ylzl.eden.data.masker.spi.EmailDataMasker +id-card=org.ylzl.eden.data.masker.spi.IdCardDataMasker +mobile-phone=org.ylzl.eden.data.masker.spi.MobilePhoneDataMasker +money=org.ylzl.eden.data.masker.spi.MoneyDataMasker +password=org.ylzl.eden.data.masker.spi.PasswordDataMasker +telephone=org.ylzl.eden.data.masker.spi.TelephoneDataMasker +username=org.ylzl.eden.data.masker.spi.UsernameDataMasker diff --git a/eden-components/eden-solutions/eden-data-masker/src/main/resources/META-INF/data-masker/org.ylzl.eden.data.masker.builder.DataMaskerBuilder b/eden-components/eden-solutions/eden-data-masker/src/main/resources/META-INF/data-masker/org.ylzl.eden.data.masker.builder.DataMaskerBuilder new file mode 100644 index 000000000..fd430b99d --- /dev/null +++ b/eden-components/eden-solutions/eden-data-masker/src/main/resources/META-INF/data-masker/org.ylzl.eden.data.masker.builder.DataMaskerBuilder @@ -0,0 +1,4 @@ +jackson=org.ylzl.eden.data.masker.integration.jackson.JacksonDataMaskerBuilder +fastjson=org.ylzl.eden.data.masker.integration.fastjson.FastjsonDataMaskerBuilder +fastjson2=org.ylzl.eden.data.masker.integration.fastjson2.Fastjson2DataMaskerBuilder +chars-scan=org.ylzl.eden.data.masker.integration.charsscan.CharsScanDataMaskerBuilder diff --git a/eden-components/eden-solutions/eden-data-masker/src/main/resources/META-INF/internal/org.ylzl.eden.spring.framework.json.fastjson.FastjsonFilter b/eden-components/eden-solutions/eden-data-masker/src/main/resources/META-INF/internal/org.ylzl.eden.spring.framework.json.fastjson.FastjsonFilter new file mode 100644 index 000000000..ea8b0905e --- /dev/null +++ b/eden-components/eden-solutions/eden-data-masker/src/main/resources/META-INF/internal/org.ylzl.eden.spring.framework.json.fastjson.FastjsonFilter @@ -0,0 +1 @@ +value-filter=org.ylzl.eden.data.masker.integration.fastjson.FastjsonDataMaskingValueFilter diff --git a/eden-components/eden-solutions/eden-data-masker/src/main/resources/META-INF/internal/org.ylzl.eden.spring.framework.json.fastjson2.Fastjson2Filter b/eden-components/eden-solutions/eden-data-masker/src/main/resources/META-INF/internal/org.ylzl.eden.spring.framework.json.fastjson2.Fastjson2Filter new file mode 100644 index 000000000..96f11bb9b --- /dev/null +++ b/eden-components/eden-solutions/eden-data-masker/src/main/resources/META-INF/internal/org.ylzl.eden.spring.framework.json.fastjson2.Fastjson2Filter @@ -0,0 +1 @@ +value-filter=org.ylzl.eden.data.masker.integration.fastjson2.Fastjson2DataMaskingValueFilter diff --git a/eden-components/eden-solutions/eden-data-masker/src/main/resources/META-INF/log4j2.plugins/org.apache.logging.log4j.core.config.plugins.PluginManager b/eden-components/eden-solutions/eden-data-masker/src/main/resources/META-INF/log4j2.plugins/org.apache.logging.log4j.core.config.plugins.PluginManager new file mode 100644 index 000000000..2a0808c49 --- /dev/null +++ b/eden-components/eden-solutions/eden-data-masker/src/main/resources/META-INF/log4j2.plugins/org.apache.logging.log4j.core.config.plugins.PluginManager @@ -0,0 +1 @@ +org.ylzl.eden.data.masker.integration.log4j2.DataMaskerStringLayout diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/resources/META-INF/services/org.ylzl.eden.extension.strategy.LoadingStrategy b/eden-components/eden-solutions/eden-data-masker/src/main/resources/META-INF/services/org.ylzl.eden.extension.strategy.LoadingStrategy similarity index 90% rename from eden-components/eden-solutions/eden-data-auditor/src/main/resources/META-INF/services/org.ylzl.eden.extension.strategy.LoadingStrategy rename to eden-components/eden-solutions/eden-data-masker/src/main/resources/META-INF/services/org.ylzl.eden.extension.strategy.LoadingStrategy index 4322ad2b5..d27751661 100644 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/resources/META-INF/services/org.ylzl.eden.extension.strategy.LoadingStrategy +++ b/eden-components/eden-solutions/eden-data-masker/src/main/resources/META-INF/services/org.ylzl.eden.extension.strategy.LoadingStrategy @@ -14,4 +14,4 @@ # limitations under the License. # -org.ylzl.eden.data.auditor.extension.DataAuditorLoadingStrategy +org.ylzl.eden.data.masker.extension.DataMaskerLoadingStrategy diff --git a/eden-components/eden-solutions/eden-data-auditor/src/test/groovy/org/ylzl/eden/data/auditor/DataMaskerTest.groovy b/eden-components/eden-solutions/eden-data-masker/src/test/groovy/org/ylzl/eden/data/masker/DataMaskerTest.groovy similarity index 91% rename from eden-components/eden-solutions/eden-data-auditor/src/test/groovy/org/ylzl/eden/data/auditor/DataMaskerTest.groovy rename to eden-components/eden-solutions/eden-data-masker/src/test/groovy/org/ylzl/eden/data/masker/DataMaskerTest.groovy index fc1cd4d6b..f22094c82 100644 --- a/eden-components/eden-solutions/eden-data-auditor/src/test/groovy/org/ylzl/eden/data/auditor/DataMaskerTest.groovy +++ b/eden-components/eden-solutions/eden-data-masker/src/test/groovy/org/ylzl/eden/data/masker/DataMaskerTest.groovy @@ -14,11 +14,10 @@ * limitations under the License. */ -package org.ylzl.eden.data.auditor +package org.ylzl.eden.data.masker -import org.ylzl.eden.data.auditor.integration.masker.jackson.JacksonDataMaskingModule -import org.ylzl.eden.data.auditor.masker.DataMaskerManager -import org.ylzl.eden.data.auditor.support.DataMaskerHelper +import org.ylzl.eden.data.masker.integration.jackson.JacksonDataMaskingModule +import org.ylzl.eden.data.masker.support.DataMaskerHelper import org.ylzl.eden.spring.framework.json.support.JSONHelper import spock.lang.Specification diff --git a/eden-components/eden-solutions/eden-data-auditor/src/test/java/org/ylzl/eden/data/auditor/DataMaskerBenchmark.java b/eden-components/eden-solutions/eden-data-masker/src/test/java/org/ylzl/eden/data/masker/DataMaskerBenchmark.java similarity index 98% rename from eden-components/eden-solutions/eden-data-auditor/src/test/java/org/ylzl/eden/data/auditor/DataMaskerBenchmark.java rename to eden-components/eden-solutions/eden-data-masker/src/test/java/org/ylzl/eden/data/masker/DataMaskerBenchmark.java index 2ba5c74ba..06fb07dfa 100644 --- a/eden-components/eden-solutions/eden-data-auditor/src/test/java/org/ylzl/eden/data/auditor/DataMaskerBenchmark.java +++ b/eden-components/eden-solutions/eden-data-masker/src/test/java/org/ylzl/eden/data/masker/DataMaskerBenchmark.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ylzl.eden.data.auditor; +package org.ylzl.eden.data.masker; import org.openjdk.jmh.annotations.*; import org.openjdk.jmh.infra.Blackhole; diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/config/DataMaskerConfig.java b/eden-components/eden-solutions/eden-data-masker/src/test/java/org/ylzl/eden/data/masker/TestCase.java similarity index 56% rename from eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/config/DataMaskerConfig.java rename to eden-components/eden-solutions/eden-data-masker/src/test/java/org/ylzl/eden/data/masker/TestCase.java index ac8f8bbce..98e98e1d2 100644 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/config/DataMaskerConfig.java +++ b/eden-components/eden-solutions/eden-data-masker/src/test/java/org/ylzl/eden/data/masker/TestCase.java @@ -14,27 +14,36 @@ * limitations under the License. */ -package org.ylzl.eden.data.auditor.config; +package org.ylzl.eden.data.masker; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.Setter; -import lombok.ToString; +import com.alibaba.fastjson.annotation.JSONType; +import lombok.*; /** - * 数据脱敏配置 + * 测试用例 * * @author gyl * @since 2.4.x */ @EqualsAndHashCode @ToString -@Setter -@Getter -public class DataMaskerConfig { +@AllArgsConstructor +@NoArgsConstructor +@Builder +@Data +@JSONType(orders = {"address", "chineseName", "idCard", "mobilePhone"}) +@com.alibaba.fastjson2.annotation.JSONType(orders = {"address", "chineseName", "idCard", "mobilePhone"}) +public class TestCase { - /** - * 是否允许覆盖扩展点 - */ - private boolean allowExtensionOverriding = false; + @Masking("address") + private String address; + + @Masking("chinese-name") + private String chineseName; + + @Masking("id-card") + private String idCard; + + @Masking("mobile-phone") + private String mobilePhone; } diff --git a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/package-info.java b/eden-components/eden-solutions/eden-data-masker/src/test/java/org/ylzl/eden/data/masker/package-info.java similarity index 94% rename from eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/package-info.java rename to eden-components/eden-solutions/eden-data-masker/src/test/java/org/ylzl/eden/data/masker/package-info.java index 23a4e8fde..86ab1df26 100644 --- a/eden-components/eden-solutions/eden-data-auditor/src/main/java/org/ylzl/eden/data/auditor/package-info.java +++ b/eden-components/eden-solutions/eden-data-masker/src/test/java/org/ylzl/eden/data/masker/package-info.java @@ -14,4 +14,4 @@ * limitations under the License. */ -package org.ylzl.eden.data.auditor; +package org.ylzl.eden.data.masker; diff --git a/eden-components/eden-spring-boot-starters/eden-dynamic-cache-spring-boot-starter/src/test/java/.gitkeep b/eden-components/eden-solutions/eden-data-masker/src/test/resources/.gitkeep similarity index 100% rename from eden-components/eden-spring-boot-starters/eden-dynamic-cache-spring-boot-starter/src/test/java/.gitkeep rename to eden-components/eden-solutions/eden-data-masker/src/test/resources/.gitkeep diff --git a/eden-components/eden-solutions/eden-event-auditor/src/main/java/org/ylzl/eden/event/auditor/differ/package-info.java b/eden-components/eden-solutions/eden-event-auditor/src/main/java/org/ylzl/eden/event/auditor/differ/package-info.java deleted file mode 100644 index 3417d4f0c..000000000 --- a/eden-components/eden-solutions/eden-event-auditor/src/main/java/org/ylzl/eden/event/auditor/differ/package-info.java +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright 2012-2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.ylzl.eden.event.auditor.differ; diff --git a/eden-components/eden-solutions/eden-sensitive-word/pom.xml b/eden-components/eden-solutions/eden-sensitive-word/pom.xml new file mode 100644 index 000000000..268297807 --- /dev/null +++ b/eden-components/eden-solutions/eden-sensitive-word/pom.xml @@ -0,0 +1,117 @@ + + + + + + 4.0.0 + + io.github.shiyindaxiaojie + eden-solutions + 0.0.1-SNAPSHOT + ../pom.xml + + eden-sensitive-word + jar + eden-data-sensitive + 敏感词过滤组件 + + + + + io.github.shiyindaxiaojie + eden-commons + + + io.github.shiyindaxiaojie + eden-spring-framework + + + + + org.mapstruct + mapstruct + + + org.mapstruct + mapstruct-processor + true + + + org.projectlombok + lombok + true + + + + + org.springframework.data + spring-data-redis + + + + + org.ahocorasick + ahocorasick + + + + + org.springframework + spring-webmvc + true + + + + + org.spockframework + spock-core + test + + + org.junit.jupiter + junit-jupiter + test + + + org.mockito + mockito-core + test + + + org.mockito + mockito-junit-jupiter + test + + + org.openjdk.jmh + jmh-core + true + + + org.openjdk.jmh + jmh-generator-annprocess + provided + + + org.springframework + spring-test + test + + + diff --git a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/Sensitive.java b/eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/Sensitive.java similarity index 91% rename from eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/Sensitive.java rename to eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/Sensitive.java index 198a0d861..4f52d410d 100644 --- a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/Sensitive.java +++ b/eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/Sensitive.java @@ -14,9 +14,7 @@ * limitations under the License. */ -package org.ylzl.eden.data.filter; - -import org.ylzl.eden.data.filter.sensitive.SensitiveWordStrategy; +package org.ylzl.eden.data.sensitive; import java.lang.annotation.*; diff --git a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/sensitive/SensitiveWord.java b/eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/SensitiveWord.java similarity index 95% rename from eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/sensitive/SensitiveWord.java rename to eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/SensitiveWord.java index fa12e730b..0d871cadd 100644 --- a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/sensitive/SensitiveWord.java +++ b/eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/SensitiveWord.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ylzl.eden.data.filter.sensitive; +package org.ylzl.eden.data.sensitive; import lombok.*; diff --git a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/SensitiveFilter.java b/eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/SensitiveWordFilter.java similarity index 92% rename from eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/SensitiveFilter.java rename to eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/SensitiveWordFilter.java index 985c8eca5..536b108b4 100644 --- a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/SensitiveFilter.java +++ b/eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/SensitiveWordFilter.java @@ -14,10 +14,9 @@ * limitations under the License. */ -package org.ylzl.eden.data.filter; +package org.ylzl.eden.data.sensitive; import org.ylzl.eden.commons.lang.Strings; -import org.ylzl.eden.data.filter.sensitive.SensitiveWord; import java.util.Collection; @@ -27,7 +26,7 @@ * @author gyl * @since 2.4.x */ -public interface SensitiveFilter { +public interface SensitiveWordFilter { /** * 解析文本 diff --git a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/sensitive/SensitiveWordLoader.java b/eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/SensitiveWordLoader.java similarity index 96% rename from eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/sensitive/SensitiveWordLoader.java rename to eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/SensitiveWordLoader.java index 2e2f5fb84..9b899bdcb 100644 --- a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/sensitive/SensitiveWordLoader.java +++ b/eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/SensitiveWordLoader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ylzl.eden.data.filter.sensitive; +package org.ylzl.eden.data.sensitive; import com.google.common.collect.Sets; import lombok.Getter; diff --git a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/sensitive/SensitiveWordStrategy.java b/eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/SensitiveWordStrategy.java similarity index 94% rename from eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/sensitive/SensitiveWordStrategy.java rename to eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/SensitiveWordStrategy.java index 43bf4715c..315169de0 100644 --- a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/sensitive/SensitiveWordStrategy.java +++ b/eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/SensitiveWordStrategy.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ylzl.eden.data.filter.sensitive; +package org.ylzl.eden.data.sensitive; /** * 敏感词处理策略 diff --git a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/builder/AbstractSensitiveFilterBuilder.java b/eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/builder/AbstractSensitiveWordFilterBuilder.java similarity index 72% rename from eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/builder/AbstractSensitiveFilterBuilder.java rename to eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/builder/AbstractSensitiveWordFilterBuilder.java index 1ec3f370f..f2c2cdd8d 100644 --- a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/builder/AbstractSensitiveFilterBuilder.java +++ b/eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/builder/AbstractSensitiveWordFilterBuilder.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.ylzl.eden.data.filter.builder; +package org.ylzl.eden.data.sensitive.builder; -import org.ylzl.eden.data.filter.config.SensitiveConfig; -import org.ylzl.eden.data.filter.sensitive.SensitiveWordLoader; +import org.ylzl.eden.data.sensitive.config.SensitiveWordConfig; +import org.ylzl.eden.data.sensitive.SensitiveWordLoader; /** * 敏感词过滤构建器抽象 @@ -25,9 +25,9 @@ * @author gyl * @since 2.4.x */ -public abstract class AbstractSensitiveFilterBuilder implements SensitiveFilterBuilder { +public abstract class AbstractSensitiveWordFilterBuilder implements SensitiveWordFilterBuilder { - private SensitiveConfig config = new SensitiveConfig(); + private SensitiveWordConfig config = new SensitiveWordConfig(); private SensitiveWordLoader sensitiveWordLoader; @@ -38,7 +38,7 @@ public abstract class AbstractSensitiveFilterBuilder implements SensitiveFilterB * @return DataSensitiveFilterBuilder */ @Override - public SensitiveFilterBuilder config(SensitiveConfig config) { + public SensitiveWordFilterBuilder config(SensitiveWordConfig config) { this.config = config; return this; } @@ -50,7 +50,7 @@ public SensitiveFilterBuilder config(SensitiveConfig config) { * @return DataSensitiveFilterBuilder */ @Override - public SensitiveFilterBuilder sensitiveWordLoader(SensitiveWordLoader sensitiveWordLoader) { + public SensitiveWordFilterBuilder sensitiveWordLoader(SensitiveWordLoader sensitiveWordLoader) { this.sensitiveWordLoader = sensitiveWordLoader; return this; } @@ -60,7 +60,7 @@ public SensitiveFilterBuilder sensitiveWordLoader(SensitiveWordLoader sensitiveW * * @return 敏感词配置 */ - protected SensitiveConfig getConfig() { + protected SensitiveWordConfig getConfig() { return config; } diff --git a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/builder/SensitiveFilterBuilder.java b/eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/builder/SensitiveWordFilterBuilder.java similarity index 71% rename from eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/builder/SensitiveFilterBuilder.java rename to eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/builder/SensitiveWordFilterBuilder.java index cfe04f6c7..0520deb06 100644 --- a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/builder/SensitiveFilterBuilder.java +++ b/eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/builder/SensitiveWordFilterBuilder.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.ylzl.eden.data.filter.builder; +package org.ylzl.eden.data.sensitive.builder; -import org.ylzl.eden.data.filter.SensitiveFilter; -import org.ylzl.eden.data.filter.config.SensitiveConfig; -import org.ylzl.eden.data.filter.sensitive.SensitiveWordLoader; +import org.ylzl.eden.data.sensitive.SensitiveWordFilter; +import org.ylzl.eden.data.sensitive.config.SensitiveWordConfig; +import org.ylzl.eden.data.sensitive.SensitiveWordLoader; import org.ylzl.eden.extension.SPI; /** @@ -28,7 +28,7 @@ * @since 2.4.x */ @SPI("aho-corasick") -public interface SensitiveFilterBuilder { +public interface SensitiveWordFilterBuilder { /** * 设置敏感词过滤配置 @@ -36,7 +36,7 @@ public interface SensitiveFilterBuilder { * @param config 敏感词过滤配置 * @return SensitiveFilterBuilder */ - SensitiveFilterBuilder config(SensitiveConfig config); + SensitiveWordFilterBuilder config(SensitiveWordConfig config); /** * 设置敏感词处理器 @@ -44,12 +44,12 @@ public interface SensitiveFilterBuilder { * @param sensitiveWordLoader 敏感词加载器 * @return SensitiveFilterBuilder */ - SensitiveFilterBuilder sensitiveWordLoader(SensitiveWordLoader sensitiveWordLoader); + SensitiveWordFilterBuilder sensitiveWordLoader(SensitiveWordLoader sensitiveWordLoader); /** * 构建敏感词过滤器 * * @return 敏感词过滤器 */ - SensitiveFilter build(); + SensitiveWordFilter build(); } diff --git a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/config/SensitiveConfig.java b/eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/config/SensitiveWordConfig.java similarity index 93% rename from eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/config/SensitiveConfig.java rename to eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/config/SensitiveWordConfig.java index d305125a8..67a77b193 100644 --- a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/config/SensitiveConfig.java +++ b/eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/config/SensitiveWordConfig.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ylzl.eden.data.filter.config; +package org.ylzl.eden.data.sensitive.config; import lombok.EqualsAndHashCode; import lombok.Getter; @@ -32,7 +32,7 @@ @ToString @Setter @Getter -public class SensitiveConfig { +public class SensitiveWordConfig { private String type = "aho-corasick"; diff --git a/eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/config/package-info.java b/eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/config/package-info.java new file mode 100644 index 000000000..ae0df6713 --- /dev/null +++ b/eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/config/package-info.java @@ -0,0 +1,17 @@ +/* + * Copyright 2012-2019 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.ylzl.eden.data.sensitive.config; diff --git a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/extension/DataFilterLoadingStrategy.java b/eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/extension/SensitiveWordLoadingStrategy.java similarity index 83% rename from eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/extension/DataFilterLoadingStrategy.java rename to eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/extension/SensitiveWordLoadingStrategy.java index 12541871b..20120df0a 100644 --- a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/extension/DataFilterLoadingStrategy.java +++ b/eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/extension/SensitiveWordLoadingStrategy.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ylzl.eden.data.filter.extension; +package org.ylzl.eden.data.sensitive.extension; import org.ylzl.eden.extension.strategy.LoadingStrategy; @@ -24,9 +24,9 @@ * @author gyl * @since 2.4.13 */ -public class DataFilterLoadingStrategy implements LoadingStrategy { +public class SensitiveWordLoadingStrategy implements LoadingStrategy { - public static final String META_INF = "META-INF/data-filter/"; + public static final String META_INF = "META-INF/data-sensitive/"; @Override public String directory() { diff --git a/eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/extension/package-info.java b/eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/extension/package-info.java new file mode 100644 index 000000000..f879135d8 --- /dev/null +++ b/eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/extension/package-info.java @@ -0,0 +1,17 @@ +/* + * Copyright 2012-2019 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.ylzl.eden.data.sensitive.extension; diff --git a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/sensitive/ahocorasick/AhoCorasickSensitiveFilter.java b/eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/integration/ahocorasick/AhoCorasickSensitiveWordFilter.java similarity index 88% rename from eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/sensitive/ahocorasick/AhoCorasickSensitiveFilter.java rename to eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/integration/ahocorasick/AhoCorasickSensitiveWordFilter.java index e3c871253..6a9a7fdb8 100644 --- a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/sensitive/ahocorasick/AhoCorasickSensitiveFilter.java +++ b/eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/integration/ahocorasick/AhoCorasickSensitiveWordFilter.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.ylzl.eden.data.filter.integration.sensitive.ahocorasick; +package org.ylzl.eden.data.sensitive.integration.ahocorasick; import lombok.RequiredArgsConstructor; import org.ahocorasick.trie.Trie; import org.ylzl.eden.commons.lang.StringUtils; -import org.ylzl.eden.data.filter.SensitiveFilter; -import org.ylzl.eden.data.filter.sensitive.SensitiveWord; +import org.ylzl.eden.data.sensitive.SensitiveWordFilter; +import org.ylzl.eden.data.sensitive.SensitiveWord; import java.util.Collection; import java.util.regex.Pattern; @@ -33,7 +33,7 @@ * @since 2.4.x */ @RequiredArgsConstructor -public class AhoCorasickSensitiveFilter implements SensitiveFilter { +public class AhoCorasickSensitiveWordFilter implements SensitiveWordFilter { private final Trie trie; diff --git a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/sensitive/ahocorasick/AhoCorasickSensitiveFilterBuilder.java b/eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/integration/ahocorasick/AhoCorasickSensitiveWordFilterBuilder.java similarity index 70% rename from eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/sensitive/ahocorasick/AhoCorasickSensitiveFilterBuilder.java rename to eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/integration/ahocorasick/AhoCorasickSensitiveWordFilterBuilder.java index b364c1c41..63c366e53 100644 --- a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/integration/sensitive/ahocorasick/AhoCorasickSensitiveFilterBuilder.java +++ b/eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/integration/ahocorasick/AhoCorasickSensitiveWordFilterBuilder.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.ylzl.eden.data.filter.integration.sensitive.ahocorasick; +package org.ylzl.eden.data.sensitive.integration.ahocorasick; import org.ahocorasick.trie.Trie; -import org.ylzl.eden.data.filter.SensitiveFilter; -import org.ylzl.eden.data.filter.builder.AbstractSensitiveFilterBuilder; -import org.ylzl.eden.data.filter.builder.SensitiveFilterBuilder; +import org.ylzl.eden.data.sensitive.SensitiveWordFilter; +import org.ylzl.eden.data.sensitive.builder.AbstractSensitiveWordFilterBuilder; +import org.ylzl.eden.data.sensitive.builder.SensitiveWordFilterBuilder; import java.util.concurrent.atomic.AtomicBoolean; @@ -29,7 +29,7 @@ * @author gyl * @since 2.4.x */ -public class AhoCorasickSensitiveFilterBuilder extends AbstractSensitiveFilterBuilder implements SensitiveFilterBuilder { +public class AhoCorasickSensitiveWordFilterBuilder extends AbstractSensitiveWordFilterBuilder implements SensitiveWordFilterBuilder { private Trie trie; @@ -41,12 +41,12 @@ public class AhoCorasickSensitiveFilterBuilder extends AbstractSensitiveFilterBu * @return 敏感词过滤器 */ @Override - public SensitiveFilter build() { + public SensitiveWordFilter build() { if (BUILD_STATE.compareAndSet(false, true)) { trie = Trie.builder() .addKeywords(getSensitiveWordLoader().loadSensitiveWords()) .build(); } - return new AhoCorasickSensitiveFilter(trie); + return new AhoCorasickSensitiveWordFilter(trie); } } diff --git a/eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/integration/ahocorasick/package-info.java b/eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/integration/ahocorasick/package-info.java new file mode 100644 index 000000000..c3e84e38a --- /dev/null +++ b/eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/integration/ahocorasick/package-info.java @@ -0,0 +1,17 @@ +/* + * Copyright 2012-2019 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.ylzl.eden.data.sensitive.integration.ahocorasick; diff --git a/eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/integration/package-info.java b/eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/integration/package-info.java new file mode 100644 index 000000000..689602cdc --- /dev/null +++ b/eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/integration/package-info.java @@ -0,0 +1 @@ +package org.ylzl.eden.data.sensitive.integration; diff --git a/eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/package-info.java b/eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/package-info.java new file mode 100644 index 000000000..9fb907b44 --- /dev/null +++ b/eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/package-info.java @@ -0,0 +1,17 @@ +/* + * Copyright 2012-2019 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.ylzl.eden.data.sensitive; diff --git a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/support/SensitiveFilterHelper.java b/eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/support/SensitiveWordFilterHelper.java similarity index 64% rename from eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/support/SensitiveFilterHelper.java rename to eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/support/SensitiveWordFilterHelper.java index ba2be5252..e7c36c498 100644 --- a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/support/SensitiveFilterHelper.java +++ b/eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/support/SensitiveWordFilterHelper.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.ylzl.eden.data.filter.support; +package org.ylzl.eden.data.sensitive.support; -import org.ylzl.eden.data.filter.SensitiveFilter; -import org.ylzl.eden.data.filter.builder.SensitiveFilterBuilder; -import org.ylzl.eden.data.filter.sensitive.SensitiveWordLoader; +import org.ylzl.eden.data.sensitive.SensitiveWordFilter; +import org.ylzl.eden.data.sensitive.builder.SensitiveWordFilterBuilder; +import org.ylzl.eden.data.sensitive.SensitiveWordLoader; import org.ylzl.eden.extension.ExtensionLoader; /** @@ -27,7 +27,7 @@ * @author gyl * @since 2.4.x */ -public class SensitiveFilterHelper { +public class SensitiveWordFilterHelper { /** * 获取敏感词过滤器实例 @@ -35,8 +35,8 @@ public class SensitiveFilterHelper { * @param sensitiveWordLoader 敏感词处理器 * @return 敏感词过滤器实例 */ - public static SensitiveFilter sensitiveFilter(SensitiveWordLoader sensitiveWordLoader) { - return ExtensionLoader.getExtensionLoader(SensitiveFilterBuilder.class).getDefaultExtension() + public static SensitiveWordFilter sensitiveFilter(SensitiveWordLoader sensitiveWordLoader) { + return ExtensionLoader.getExtensionLoader(SensitiveWordFilterBuilder.class).getDefaultExtension() .sensitiveWordLoader(sensitiveWordLoader).build(); } @@ -47,8 +47,8 @@ public static SensitiveFilter sensitiveFilter(SensitiveWordLoader sensitiveWordL * @param sensitiveWordLoader 敏感词处理器 * @return 敏感词过滤器实例 */ - public static SensitiveFilter sensitiveFilter(String spi, SensitiveWordLoader sensitiveWordLoader) { - return ExtensionLoader.getExtensionLoader(SensitiveFilterBuilder.class).getExtension(spi) + public static SensitiveWordFilter sensitiveFilter(String spi, SensitiveWordLoader sensitiveWordLoader) { + return ExtensionLoader.getExtensionLoader(SensitiveWordFilterBuilder.class).getExtension(spi) .sensitiveWordLoader(sensitiveWordLoader).build(); } } diff --git a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/sensitive/web/SensitiveRequestBodyAdvice.java b/eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/web/SensitiveWordRequestBodyAdvice.java similarity index 85% rename from eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/sensitive/web/SensitiveRequestBodyAdvice.java rename to eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/web/SensitiveWordRequestBodyAdvice.java index 4f7ead2ec..a5898f941 100644 --- a/eden-components/eden-solutions/eden-data-filter/src/main/java/org/ylzl/eden/data/filter/sensitive/web/SensitiveRequestBodyAdvice.java +++ b/eden-components/eden-solutions/eden-sensitive-word/src/main/java/org/ylzl/eden/data/sensitive/web/SensitiveWordRequestBodyAdvice.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.ylzl.eden.data.filter.sensitive.web; +package org.ylzl.eden.data.sensitive.web; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -26,8 +26,8 @@ import org.springframework.web.bind.annotation.RestControllerAdvice; import org.springframework.web.servlet.mvc.method.annotation.RequestBodyAdviceAdapter; import org.ylzl.eden.commons.lang.Strings; -import org.ylzl.eden.data.filter.Sensitive; -import org.ylzl.eden.data.filter.SensitiveFilter; +import org.ylzl.eden.data.sensitive.Sensitive; +import org.ylzl.eden.data.sensitive.SensitiveWordFilter; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -43,9 +43,9 @@ @RequiredArgsConstructor @Slf4j @RestControllerAdvice -public class SensitiveRequestBodyAdvice extends RequestBodyAdviceAdapter { +public class SensitiveWordRequestBodyAdvice extends RequestBodyAdviceAdapter { - private final SensitiveFilter sensitiveFilter; + private final SensitiveWordFilter sensitiveWordFilter; @Override public boolean supports(MethodParameter methodParameter, Type targetType, @@ -58,7 +58,7 @@ public HttpInputMessage beforeBodyRead(HttpInputMessage inputMessage, MethodPara Type targetType, Class> converterType) throws IOException { String body = StreamUtils.copyToString(inputMessage.getBody(), StandardCharsets.UTF_8); - String sensitiveBody = doFilter(body, targetType.getClass(), sensitiveFilter); + String sensitiveBody = doFilter(body, targetType.getClass(), sensitiveWordFilter); ByteArrayInputStream inputStream = new ByteArrayInputStream(sensitiveBody.getBytes(StandardCharsets.UTF_8)); return new MappingJacksonInputMessage(inputStream, inputMessage.getHeaders()); } @@ -68,10 +68,10 @@ public HttpInputMessage beforeBodyRead(HttpInputMessage inputMessage, MethodPara * * @param text 文本内容 * @param clazz 目标类型 - * @param sensitiveFilter 敏感词过滤器 + * @param sensitiveWordFilter 敏感词过滤器 * @return 过滤后的内容 */ - private static String doFilter(String text, Class clazz, SensitiveFilter sensitiveFilter) { + private static String doFilter(String text, Class clazz, SensitiveWordFilter sensitiveWordFilter) { Sensitive sensitive = clazz.getAnnotation(Sensitive.class); String replacement = null; switch (sensitive.strategy()) { @@ -84,6 +84,6 @@ private static String doFilter(String text, Class clazz, SensitiveFilter sens replacement = sensitive.replacement(); break; } - return sensitiveFilter.replaceSensitiveWords(text, replacement); + return sensitiveWordFilter.replaceSensitiveWords(text, replacement); } } diff --git a/eden-components/eden-solutions/eden-sensitive-word/src/main/resources/META-INF/data-sensitive/org.ylzl.eden.data.sensitive.builder.SensitiveWordFilterBuilder b/eden-components/eden-solutions/eden-sensitive-word/src/main/resources/META-INF/data-sensitive/org.ylzl.eden.data.sensitive.builder.SensitiveWordFilterBuilder new file mode 100644 index 000000000..a01198770 --- /dev/null +++ b/eden-components/eden-solutions/eden-sensitive-word/src/main/resources/META-INF/data-sensitive/org.ylzl.eden.data.sensitive.builder.SensitiveWordFilterBuilder @@ -0,0 +1 @@ +aho-corasick=org.ylzl.eden.data.sensitive.integration.ahocorasick.AhoCorasickSensitiveWordFilterBuilder diff --git a/eden-components/eden-solutions/eden-sensitive-word/src/main/resources/META-INF/services/org.ylzl.eden.extension.strategy.LoadingStrategy b/eden-components/eden-solutions/eden-sensitive-word/src/main/resources/META-INF/services/org.ylzl.eden.extension.strategy.LoadingStrategy new file mode 100644 index 000000000..f0ab24c72 --- /dev/null +++ b/eden-components/eden-solutions/eden-sensitive-word/src/main/resources/META-INF/services/org.ylzl.eden.extension.strategy.LoadingStrategy @@ -0,0 +1,17 @@ +# +# Copyright 2012-2019 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +org.ylzl.eden.data.sensitive.extension.SensitiveWordLoadingStrategy diff --git a/eden-components/eden-solutions/eden-sensitive-word/src/test/groovy/org/ylzl/eden/data/sensitive/SensitiveWordFilterTest.groovy b/eden-components/eden-solutions/eden-sensitive-word/src/test/groovy/org/ylzl/eden/data/sensitive/SensitiveWordFilterTest.groovy new file mode 100644 index 000000000..a65331450 --- /dev/null +++ b/eden-components/eden-solutions/eden-sensitive-word/src/test/groovy/org/ylzl/eden/data/sensitive/SensitiveWordFilterTest.groovy @@ -0,0 +1,71 @@ +/* + * Copyright 2012-2019 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.ylzl.eden.data.sensitive + +import com.google.common.collect.Sets +import org.ylzl.eden.data.sensitive.builder.SensitiveWordFilterBuilder +import org.ylzl.eden.data.sensitive.config.SensitiveWordConfig +import org.ylzl.eden.extension.ExtensionLoader +import spock.lang.Specification + +class SensitiveWordFilterTest extends Specification { + + static String sensitiveText = "我是大鸡巴美少女，喜欢玩美少女万华镜、3D定制女仆" + + SensitiveWordFilter sensitiveFilter + + def setup() { + SensitiveWordConfig sensitiveConfig = new SensitiveWordConfig(); + sensitiveConfig.getAhoCorasick().setOnlyWholeWords(true) + sensitiveFilter = ExtensionLoader.getExtensionLoader(SensitiveWordFilterBuilder.class) + .getDefaultExtension() + .config(sensitiveConfig) + .sensitiveWordLoader(new SensitiveWordLoader() { + + @Override + Collection loadSensitiveWords() { + return Sets.newHashSet("鸡巴", "女仆") + } + }) + .build() + } + + def "test parse text"() { + given: + Collection sensitiveWords = sensitiveFilter.parseText(sensitiveText) + + expect: + sensitiveWords[index].getKeyword() == keyword + + where: + index || keyword + 0 || "鸡巴" + 1 || "女仆" + } + + def "test filter text"() { + expect: + replacedText == sensitiveFilter.replaceSensitiveWords(sensitiveText) + deletedText == sensitiveFilter.deleteSensitiveWords(sensitiveText) + + where: + replacedText || deletedText + "我是大???美少女，喜欢玩美少女万华镜、3D定制???" || "我是大美少女，喜欢玩美少女万华镜、3D定制" + } +} + +//Generated with love by TestMe :) Please report issues and submit feature requests at: http://weirddev.com/forum#!/testme diff --git a/eden-components/eden-solutions/eden-sensitive-word/src/test/java/org/ylzl/eden/data/sensitive/package-info.java b/eden-components/eden-solutions/eden-sensitive-word/src/test/java/org/ylzl/eden/data/sensitive/package-info.java new file mode 100644 index 000000000..9fb907b44 --- /dev/null +++ b/eden-components/eden-solutions/eden-sensitive-word/src/test/java/org/ylzl/eden/data/sensitive/package-info.java @@ -0,0 +1,17 @@ +/* + * Copyright 2012-2019 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.ylzl.eden.data.sensitive; diff --git a/eden-components/eden-spring-boot-starters/eden-dynamic-cache-spring-boot-starter/src/test/resources/.gitkeep b/eden-components/eden-solutions/eden-sensitive-word/src/test/resources/.gitkeep similarity index 100% rename from eden-components/eden-spring-boot-starters/eden-dynamic-cache-spring-boot-starter/src/test/resources/.gitkeep rename to eden-components/eden-solutions/eden-sensitive-word/src/test/resources/.gitkeep diff --git a/eden-components/eden-solutions/pom.xml b/eden-components/eden-solutions/pom.xml index ae6a74be0..39c1f1637 100644 --- a/eden-components/eden-solutions/pom.xml +++ b/eden-components/eden-solutions/pom.xml @@ -32,21 +32,22 @@ 解决方案 + eden-common-cache + eden-common-excel + eden-common-mail + eden-common-mq + eden-common-security + eden-common-sms eden-consistency-task - eden-data-auditor + eden-data-differ eden-data-crypto - eden-data-filter + eden-data-masker eden-distributed-lock eden-distributed-uid - eden-dynamic-cache - eden-dynamic-excel - eden-dynamic-mail - eden-dynamic-mq - eden-dynamic-security - eden-dynamic-sms eden-event-auditor eden-flow-compose eden-full-tracing eden-idempotent + eden-sensitive-word diff --git a/eden-components/eden-spring-boot-starters/eden-cat-spring-boot-starter/pom.xml b/eden-components/eden-spring-boot-starters/eden-cat-spring-boot-starter/pom.xml index e34e82b79..eff5dcd37 100644 --- a/eden-components/eden-spring-boot-starters/eden-cat-spring-boot-starter/pom.xml +++ b/eden-components/eden-spring-boot-starters/eden-cat-spring-boot-starter/pom.xml @@ -93,7 +93,7 @@ io.github.shiyindaxiaojie - eden-dynamic-mq + eden-common-mq true diff --git a/eden-components/eden-spring-boot-starters/eden-dynamic-cache-spring-boot-starter/pom.xml b/eden-components/eden-spring-boot-starters/eden-common-cache-spring-boot-starter/pom.xml similarity index 90% rename from eden-components/eden-spring-boot-starters/eden-dynamic-cache-spring-boot-starter/pom.xml rename to eden-components/eden-spring-boot-starters/eden-common-cache-spring-boot-starter/pom.xml index 6f1f049e2..a0961144c 100644 --- a/eden-components/eden-spring-boot-starters/eden-dynamic-cache-spring-boot-starter/pom.xml +++ b/eden-components/eden-spring-boot-starters/eden-common-cache-spring-boot-starter/pom.xml @@ -26,10 +26,10 @@ 0.0.1-SNAPSHOT ../pom.xml - eden-dynamic-cache-spring-boot-starter + eden-common-cache-spring-boot-starter jar eden-dynamic-cache-spring-boot-starter - Spring Boot Starter For Dynamic Cache + Spring Boot Starter For Common Cache @@ -48,7 +48,7 @@ io.github.shiyindaxiaojie - eden-dynamic-cache + eden-common-cache diff --git a/eden-components/eden-spring-boot-starters/eden-dynamic-cache-spring-boot-starter/src/main/java/org/ylzl/eden/common/cache/spring/boot/autoconfigure/DynamicCacheAutoConfiguration.java b/eden-components/eden-spring-boot-starters/eden-common-cache-spring-boot-starter/src/main/java/org/ylzl/eden/common/cache/spring/boot/autoconfigure/DynamicCacheAutoConfiguration.java similarity index 100% rename from eden-components/eden-spring-boot-starters/eden-dynamic-cache-spring-boot-starter/src/main/java/org/ylzl/eden/common/cache/spring/boot/autoconfigure/DynamicCacheAutoConfiguration.java rename to eden-components/eden-spring-boot-starters/eden-common-cache-spring-boot-starter/src/main/java/org/ylzl/eden/common/cache/spring/boot/autoconfigure/DynamicCacheAutoConfiguration.java diff --git a/eden-components/eden-spring-boot-starters/eden-dynamic-cache-spring-boot-starter/src/main/java/org/ylzl/eden/common/cache/spring/boot/autoconfigure/JdHotKeyAutoConfiguration.java b/eden-components/eden-spring-boot-starters/eden-common-cache-spring-boot-starter/src/main/java/org/ylzl/eden/common/cache/spring/boot/autoconfigure/JdHotKeyAutoConfiguration.java similarity index 100% rename from eden-components/eden-spring-boot-starters/eden-dynamic-cache-spring-boot-starter/src/main/java/org/ylzl/eden/common/cache/spring/boot/autoconfigure/JdHotKeyAutoConfiguration.java rename to eden-components/eden-spring-boot-starters/eden-common-cache-spring-boot-starter/src/main/java/org/ylzl/eden/common/cache/spring/boot/autoconfigure/JdHotKeyAutoConfiguration.java diff --git a/eden-components/eden-spring-boot-starters/eden-dynamic-cache-spring-boot-starter/src/main/java/org/ylzl/eden/common/cache/spring/boot/autoconfigure/SentinelHotKeyAutoConfiguration.java b/eden-components/eden-spring-boot-starters/eden-common-cache-spring-boot-starter/src/main/java/org/ylzl/eden/common/cache/spring/boot/autoconfigure/SentinelHotKeyAutoConfiguration.java similarity index 100% rename from eden-components/eden-spring-boot-starters/eden-dynamic-cache-spring-boot-starter/src/main/java/org/ylzl/eden/common/cache/spring/boot/autoconfigure/SentinelHotKeyAutoConfiguration.java rename to eden-components/eden-spring-boot-starters/eden-common-cache-spring-boot-starter/src/main/java/org/ylzl/eden/common/cache/spring/boot/autoconfigure/SentinelHotKeyAutoConfiguration.java diff --git a/eden-components/eden-spring-boot-starters/eden-dynamic-cache-spring-boot-starter/src/main/java/org/ylzl/eden/common/cache/spring/boot/autoconfigure/package-info.java b/eden-components/eden-spring-boot-starters/eden-common-cache-spring-boot-starter/src/main/java/org/ylzl/eden/common/cache/spring/boot/autoconfigure/package-info.java similarity index 100% rename from eden-components/eden-spring-boot-starters/eden-dynamic-cache-spring-boot-starter/src/main/java/org/ylzl/eden/common/cache/spring/boot/autoconfigure/package-info.java rename to eden-components/eden-spring-boot-starters/eden-common-cache-spring-boot-starter/src/main/java/org/ylzl/eden/common/cache/spring/boot/autoconfigure/package-info.java diff --git a/eden-components/eden-spring-boot-starters/eden-dynamic-cache-spring-boot-starter/src/main/java/org/ylzl/eden/common/cache/spring/boot/env/CacheProperties.java b/eden-components/eden-spring-boot-starters/eden-common-cache-spring-boot-starter/src/main/java/org/ylzl/eden/common/cache/spring/boot/env/CacheProperties.java similarity index 100% rename from eden-components/eden-spring-boot-starters/eden-dynamic-cache-spring-boot-starter/src/main/java/org/ylzl/eden/common/cache/spring/boot/env/CacheProperties.java rename to eden-components/eden-spring-boot-starters/eden-common-cache-spring-boot-starter/src/main/java/org/ylzl/eden/common/cache/spring/boot/env/CacheProperties.java diff --git a/eden-components/eden-spring-boot-starters/eden-dynamic-cache-spring-boot-starter/src/main/java/org/ylzl/eden/common/cache/spring/boot/env/package-info.java b/eden-components/eden-spring-boot-starters/eden-common-cache-spring-boot-starter/src/main/java/org/ylzl/eden/common/cache/spring/boot/env/package-info.java similarity index 100% rename from eden-components/eden-spring-boot-starters/eden-dynamic-cache-spring-boot-starter/src/main/java/org/ylzl/eden/common/cache/spring/boot/env/package-info.java rename to eden-components/eden-spring-boot-starters/eden-common-cache-spring-boot-starter/src/main/java/org/ylzl/eden/common/cache/spring/boot/env/package-info.java diff --git a/eden-components/eden-spring-boot-starters/eden-dynamic-cache-spring-boot-starter/src/main/java/org/ylzl/eden/common/cache/spring/boot/package-info.java b/eden-components/eden-spring-boot-starters/eden-common-cache-spring-boot-starter/src/main/java/org/ylzl/eden/common/cache/spring/boot/package-info.java similarity index 100% rename from eden-components/eden-spring-boot-starters/eden-dynamic-cache-spring-boot-starter/src/main/java/org/ylzl/eden/common/cache/spring/boot/package-info.java rename to eden-components/eden-spring-boot-starters/eden-common-cache-spring-boot-starter/src/main/java/org/ylzl/eden/common/cache/spring/boot/package-info.java diff --git a/eden-components/eden-spring-boot-starters/eden-dynamic-cache-spring-boot-starter/src/main/resources/META-INF/spring.factories b/eden-components/eden-spring-boot-starters/eden-common-cache-spring-boot-starter/src/main/resources/META-INF/spring.factories similarity index 100% rename from eden-components/eden-spring-boot-starters/eden-dynamic-cache-spring-boot-starter/src/main/resources/META-INF/spring.factories rename to eden-components/eden-spring-boot-starters/eden-common-cache-spring-boot-starter/src/main/resources/META-INF/spring.factories diff --git a/eden-components/eden-spring-boot-starters/eden-dynamic-mail-spring-boot-starter/src/test/java/.gitkeep b/eden-components/eden-spring-boot-starters/eden-common-cache-spring-boot-starter/src/test/java/.gitkeep similarity index 100% rename from eden-components/eden-spring-boot-starters/eden-dynamic-mail-spring-boot-starter/src/test/java/.gitkeep rename to eden-components/eden-spring-boot-starters/eden-common-cache-spring-boot-starter/src/test/java/.gitkeep diff --git a/eden-components/eden-spring-boot-starters/eden-dynamic-mail-spring-boot-starter/src/test/resources/.gitkeep b/eden-components/eden-spring-boot-starters/eden-common-cache-spring-boot-starter/src/test/resources/.gitkeep similarity index 100% rename from eden-components/eden-spring-boot-starters/eden-dynamic-mail-spring-boot-starter/src/test/resources/.gitkeep rename to eden-components/eden-spring-boot-starters/eden-common-cache-spring-boot-starter/src/test/resources/.gitkeep diff --git a/eden-components/eden-spring-boot-starters/eden-dynamic-mail-spring-boot-starter/pom.xml b/eden-components/eden-spring-boot-starters/eden-common-mail-spring-boot-starter/pom.xml similarity index 90% rename from eden-components/eden-spring-boot-starters/eden-dynamic-mail-spring-boot-starter/pom.xml rename to eden-components/eden-spring-boot-starters/eden-common-mail-spring-boot-starter/pom.xml index 79478193f..aa097bec8 100644 --- a/eden-components/eden-spring-boot-starters/eden-dynamic-mail-spring-boot-starter/pom.xml +++ b/eden-components/eden-spring-boot-starters/eden-common-mail-spring-boot-starter/pom.xml @@ -26,10 +26,10 @@ 0.0.1-SNAPSHOT ../pom.xml - eden-dynamic-mail-spring-boot-starter + eden-common-mail-spring-boot-starter jar eden-dynamic-mail-spring-boot-starter - Spring Boot Starter For Dynamic Mail + Spring Boot Starter For Common Mail @@ -48,7 +48,7 @@ io.github.shiyindaxiaojie - eden-dynamic-mail + eden-common-mail diff --git a/eden-components/eden-spring-boot-starters/eden-dynamic-mail-spring-boot-starter/src/main/java/org/ylzl/eden/common/mail/spring/boot/autoconfigure/JavaMailAutoConfiguration.java b/eden-components/eden-spring-boot-starters/eden-common-mail-spring-boot-starter/src/main/java/org/ylzl/eden/common/mail/spring/boot/autoconfigure/JavaMailAutoConfiguration.java similarity index 100% rename from eden-components/eden-spring-boot-starters/eden-dynamic-mail-spring-boot-starter/src/main/java/org/ylzl/eden/common/mail/spring/boot/autoconfigure/JavaMailAutoConfiguration.java rename to eden-components/eden-spring-boot-starters/eden-common-mail-spring-boot-starter/src/main/java/org/ylzl/eden/common/mail/spring/boot/autoconfigure/JavaMailAutoConfiguration.java diff --git a/eden-components/eden-spring-boot-starters/eden-dynamic-mail-spring-boot-starter/src/main/java/org/ylzl/eden/common/mail/spring/boot/autoconfigure/MailAutoConfiguration.java b/eden-components/eden-spring-boot-starters/eden-common-mail-spring-boot-starter/src/main/java/org/ylzl/eden/common/mail/spring/boot/autoconfigure/MailAutoConfiguration.java similarity index 100% rename from eden-components/eden-spring-boot-starters/eden-dynamic-mail-spring-boot-starter/src/main/java/org/ylzl/eden/common/mail/spring/boot/autoconfigure/MailAutoConfiguration.java rename to eden-components/eden-spring-boot-starters/eden-common-mail-spring-boot-starter/src/main/java/org/ylzl/eden/common/mail/spring/boot/autoconfigure/MailAutoConfiguration.java diff --git a/eden-components/eden-spring-boot-starters/eden-dynamic-mail-spring-boot-starter/src/main/java/org/ylzl/eden/common/mail/spring/boot/env/MailProperties.java b/eden-components/eden-spring-boot-starters/eden-common-mail-spring-boot-starter/src/main/java/org/ylzl/eden/common/mail/spring/boot/env/MailProperties.java similarity index 100% rename from eden-components/eden-spring-boot-starters/eden-dynamic-mail-spring-boot-starter/src/main/java/org/ylzl/eden/common/mail/spring/boot/env/MailProperties.java rename to eden-components/eden-spring-boot-starters/eden-common-mail-spring-boot-starter/src/main/java/org/ylzl/eden/common/mail/spring/boot/env/MailProperties.java diff --git a/eden-components/eden-spring-boot-starters/eden-dynamic-mail-spring-boot-starter/src/main/java/org/ylzl/eden/common/mail/spring/boot/support/MailHelper.java b/eden-components/eden-spring-boot-starters/eden-common-mail-spring-boot-starter/src/main/java/org/ylzl/eden/common/mail/spring/boot/support/MailHelper.java similarity index 100% rename from eden-components/eden-spring-boot-starters/eden-dynamic-mail-spring-boot-starter/src/main/java/org/ylzl/eden/common/mail/spring/boot/support/MailHelper.java rename to eden-components/eden-spring-boot-starters/eden-common-mail-spring-boot-starter/src/main/java/org/ylzl/eden/common/mail/spring/boot/support/MailHelper.java diff --git a/eden-components/eden-spring-boot-starters/eden-dynamic-mail-spring-boot-starter/src/main/resources/META-INF/spring.factories b/eden-components/eden-spring-boot-starters/eden-common-mail-spring-boot-starter/src/main/resources/META-INF/spring.factories similarity index 100% rename from eden-components/eden-spring-boot-starters/eden-dynamic-mail-spring-boot-starter/src/main/resources/META-INF/spring.factories rename to eden-components/eden-spring-boot-starters/eden-common-mail-spring-boot-starter/src/main/resources/META-INF/spring.factories diff --git a/eden-components/eden-spring-boot-starters/eden-dynamic-mq-spring-boot-starter/src/test/java/.gitkeep b/eden-components/eden-spring-boot-starters/eden-common-mail-spring-boot-starter/src/test/java/.gitkeep similarity index 100% rename from eden-components/eden-spring-boot-starters/eden-dynamic-mq-spring-boot-starter/src/test/java/.gitkeep rename to eden-components/eden-spring-boot-starters/eden-common-mail-spring-boot-starter/src/test/java/.gitkeep diff --git a/eden-components/eden-spring-boot-starters/eden-dynamic-mq-spring-boot-starter/src/test/resources/.gitkeep b/eden-components/eden-spring-boot-starters/eden-common-mail-spring-boot-starter/src/test/resources/.gitkeep similarity index 100% rename from eden-components/eden-spring-boot-starters/eden-dynamic-mq-spring-boot-starter/src/test/resources/.gitkeep rename to eden-components/eden-spring-boot-starters/eden-common-mail-spring-boot-starter/src/test/resources/.gitkeep diff --git a/eden-components/eden-spring-boot-starters/eden-dynamic-mq-spring-boot-starter/pom.xml b/eden-components/eden-spring-boot-starters/eden-common-mq-spring-boot-starter/pom.xml similarity index 91% rename from eden-components/eden-spring-boot-starters/eden-dynamic-mq-spring-boot-starter/pom.xml rename to eden-components/eden-spring-boot-starters/eden-common-mq-spring-boot-starter/pom.xml index c07e568bd..ca8b7a087 100644 --- a/eden-components/eden-spring-boot-starters/eden-dynamic-mq-spring-boot-starter/pom.xml +++ b/eden-components/eden-spring-boot-starters/eden-common-mq-spring-boot-starter/pom.xml @@ -26,10 +26,10 @@ 0.0.1-SNAPSHOT ../pom.xml - eden-dynamic-mq-spring-boot-starter + eden-common-mq-spring-boot-starter jar eden-dynamic-mq-spring-boot-starter - Spring Boot Starter For Dynamic Message Queue + Spring Boot Starter For Common Message Queue @@ -48,7 +48,7 @@ io.github.shiyindaxiaojie - eden-dynamic-mq + eden-common-mq diff --git a/eden-components/eden-spring-boot-starters/eden-dynamic-mq-spring-boot-starter/src/main/java/org/ylzl/eden/common/mq/spring/boot/autoconfigure/KafkaMessageQueueAutoConfiguration.java b/eden-components/eden-spring-boot-starters/eden-common-mq-spring-boot-starter/src/main/java/org/ylzl/eden/common/mq/spring/boot/autoconfigure/KafkaMessageQueueAutoConfiguration.java similarity index 100% rename from eden-components/eden-spring-boot-starters/eden-dynamic-mq-spring-boot-starter/src/main/java/org/ylzl/eden/common/mq/spring/boot/autoconfigure/KafkaMessageQueueAutoConfiguration.java rename to eden-components/eden-spring-boot-starters/eden-common-mq-spring-boot-starter/src/main/java/org/ylzl/eden/common/mq/spring/boot/autoconfigure/KafkaMessageQueueAutoConfiguration.java diff --git a/eden-components/eden-spring-boot-starters/eden-dynamic-mq-spring-boot-starter/src/main/java/org/ylzl/eden/common/mq/spring/boot/autoconfigure/MessageQueueAutoConfiguration.java b/eden-components/eden-spring-boot-starters/eden-common-mq-spring-boot-starter/src/main/java/org/ylzl/eden/common/mq/spring/boot/autoconfigure/MessageQueueAutoConfiguration.java similarity index 100% rename from eden-components/eden-spring-boot-starters/eden-dynamic-mq-spring-boot-starter/src/main/java/org/ylzl/eden/common/mq/spring/boot/autoconfigure/MessageQueueAutoConfiguration.java rename to eden-components/eden-spring-boot-starters/eden-common-mq-spring-boot-starter/src/main/java/org/ylzl/eden/common/mq/spring/boot/autoconfigure/MessageQueueAutoConfiguration.java diff --git a/eden-components/eden-spring-boot-starters/eden-dynamic-mq-spring-boot-starter/src/main/java/org/ylzl/eden/common/mq/spring/boot/autoconfigure/RocketMQMessageQueueAutoConfiguration.java b/eden-components/eden-spring-boot-starters/eden-common-mq-spring-boot-starter/src/main/java/org/ylzl/eden/common/mq/spring/boot/autoconfigure/RocketMQMessageQueueAutoConfiguration.java similarity index 100% rename from eden-components/eden-spring-boot-starters/eden-dynamic-mq-spring-boot-starter/src/main/java/org/ylzl/eden/common/mq/spring/boot/autoconfigure/RocketMQMessageQueueAutoConfiguration.java rename to eden-components/eden-spring-boot-starters/eden-common-mq-spring-boot-starter/src/main/java/org/ylzl/eden/common/mq/spring/boot/autoconfigure/RocketMQMessageQueueAutoConfiguration.java diff --git a/eden-components/eden-spring-boot-starters/eden-dynamic-mq-spring-boot-starter/src/main/java/org/ylzl/eden/common/mq/spring/boot/autoconfigure/condition/ConditionalOnMessageQueue.java b/eden-components/eden-spring-boot-starters/eden-common-mq-spring-boot-starter/src/main/java/org/ylzl/eden/common/mq/spring/boot/autoconfigure/condition/ConditionalOnMessageQueue.java similarity index 100% rename from eden-components/eden-spring-boot-starters/eden-dynamic-mq-spring-boot-starter/src/main/java/org/ylzl/eden/common/mq/spring/boot/autoconfigure/condition/ConditionalOnMessageQueue.java rename to eden-components/eden-spring-boot-starters/eden-common-mq-spring-boot-starter/src/main/java/org/ylzl/eden/common/mq/spring/boot/autoconfigure/condition/ConditionalOnMessageQueue.java diff --git a/eden-components/eden-spring-boot-starters/eden-dynamic-mq-spring-boot-starter/src/main/java/org/ylzl/eden/common/mq/spring/boot/autoconfigure/condition/OnMessageQueueCondition.java b/eden-components/eden-spring-boot-starters/eden-common-mq-spring-boot-starter/src/main/java/org/ylzl/eden/common/mq/spring/boot/autoconfigure/condition/OnMessageQueueCondition.java similarity index 100% rename from eden-components/eden-spring-boot-starters/eden-dynamic-mq-spring-boot-starter/src/main/java/org/ylzl/eden/common/mq/spring/boot/autoconfigure/condition/OnMessageQueueCondition.java rename to eden-components/eden-spring-boot-starters/eden-common-mq-spring-boot-starter/src/main/java/org/ylzl/eden/common/mq/spring/boot/autoconfigure/condition/OnMessageQueueCondition.java diff --git a/eden-components/eden-spring-boot-starters/eden-dynamic-mq-spring-boot-starter/src/main/java/org/ylzl/eden/common/mq/spring/boot/env/MessageQueueProperties.java b/eden-components/eden-spring-boot-starters/eden-common-mq-spring-boot-starter/src/main/java/org/ylzl/eden/common/mq/spring/boot/env/MessageQueueProperties.java similarity index 100% rename from eden-components/eden-spring-boot-starters/eden-dynamic-mq-spring-boot-starter/src/main/java/org/ylzl/eden/common/mq/spring/boot/env/MessageQueueProperties.java rename to eden-components/eden-spring-boot-starters/eden-common-mq-spring-boot-starter/src/main/java/org/ylzl/eden/common/mq/spring/boot/env/MessageQueueProperties.java diff --git a/eden-components/eden-spring-boot-starters/eden-dynamic-mq-spring-boot-starter/src/main/java/org/ylzl/eden/common/mq/spring/boot/env/RocketMQConsumerProperties.java b/eden-components/eden-spring-boot-starters/eden-common-mq-spring-boot-starter/src/main/java/org/ylzl/eden/common/mq/spring/boot/env/RocketMQConsumerProperties.java similarity index 100% rename from eden-components/eden-spring-boot-starters/eden-dynamic-mq-spring-boot-starter/src/main/java/org/ylzl/eden/common/mq/spring/boot/env/RocketMQConsumerProperties.java rename to eden-components/eden-spring-boot-starters/eden-common-mq-spring-boot-starter/src/main/java/org/ylzl/eden/common/mq/spring/boot/env/RocketMQConsumerProperties.java diff --git a/eden-components/eden-spring-boot-starters/eden-dynamic-mq-spring-boot-starter/src/main/java/org/ylzl/eden/common/mq/spring/boot/env/RocketMQProducerProperties.java b/eden-components/eden-spring-boot-starters/eden-common-mq-spring-boot-starter/src/main/java/org/ylzl/eden/common/mq/spring/boot/env/RocketMQProducerProperties.java similarity index 100% rename from eden-components/eden-spring-boot-starters/eden-dynamic-mq-spring-boot-starter/src/main/java/org/ylzl/eden/common/mq/spring/boot/env/RocketMQProducerProperties.java rename to eden-components/eden-spring-boot-starters/eden-common-mq-spring-boot-starter/src/main/java/org/ylzl/eden/common/mq/spring/boot/env/RocketMQProducerProperties.java diff --git a/eden-components/eden-spring-boot-starters/eden-dynamic-mq-spring-boot-starter/src/main/java/org/ylzl/eden/common/mq/spring/boot/env/convertor/RocketMQConvertor.java b/eden-components/eden-spring-boot-starters/eden-common-mq-spring-boot-starter/src/main/java/org/ylzl/eden/common/mq/spring/boot/env/convertor/RocketMQConvertor.java similarity index 100% rename from eden-components/eden-spring-boot-starters/eden-dynamic-mq-spring-boot-starter/src/main/java/org/ylzl/eden/common/mq/spring/boot/env/convertor/RocketMQConvertor.java rename to eden-components/eden-spring-boot-starters/eden-common-mq-spring-boot-starter/src/main/java/org/ylzl/eden/common/mq/spring/boot/env/convertor/RocketMQConvertor.java diff --git a/eden-components/eden-spring-boot-starters/eden-dynamic-mq-spring-boot-starter/src/main/java/org/ylzl/eden/common/mq/spring/boot/support/MessageQueueHelper.java b/eden-components/eden-spring-boot-starters/eden-common-mq-spring-boot-starter/src/main/java/org/ylzl/eden/common/mq/spring/boot/support/MessageQueueHelper.java similarity index 100% rename from eden-components/eden-spring-boot-starters/eden-dynamic-mq-spring-boot-starter/src/main/java/org/ylzl/eden/common/mq/spring/boot/support/MessageQueueHelper.java rename to eden-components/eden-spring-boot-starters/eden-common-mq-spring-boot-starter/src/main/java/org/ylzl/eden/common/mq/spring/boot/support/MessageQueueHelper.java diff --git a/eden-components/eden-spring-boot-starters/eden-dynamic-mq-spring-boot-starter/src/main/resources/META-INF/spring.factories b/eden-components/eden-spring-boot-starters/eden-common-mq-spring-boot-starter/src/main/resources/META-INF/spring.factories similarity index 100% rename from eden-components/eden-spring-boot-starters/eden-dynamic-mq-spring-boot-starter/src/main/resources/META-INF/spring.factories rename to eden-components/eden-spring-boot-starters/eden-common-mq-spring-boot-starter/src/main/resources/META-INF/spring.factories diff --git a/eden-components/eden-spring-boot-starters/eden-dynamic-sms-spring-boot-starter/src/test/java/.gitkeep b/eden-components/eden-spring-boot-starters/eden-common-mq-spring-boot-starter/src/test/java/.gitkeep similarity index 100% rename from eden-components/eden-spring-boot-starters/eden-dynamic-sms-spring-boot-starter/src/test/java/.gitkeep rename to eden-components/eden-spring-boot-starters/eden-common-mq-spring-boot-starter/src/test/java/.gitkeep diff --git a/eden-components/eden-spring-boot-starters/eden-dynamic-sms-spring-boot-starter/src/test/resources/.gitkeep b/eden-components/eden-spring-boot-starters/eden-common-mq-spring-boot-starter/src/test/resources/.gitkeep similarity index 100% rename from eden-components/eden-spring-boot-starters/eden-dynamic-sms-spring-boot-starter/src/test/resources/.gitkeep rename to eden-components/eden-spring-boot-starters/eden-common-mq-spring-boot-starter/src/test/resources/.gitkeep diff --git a/eden-components/eden-spring-boot-starters/eden-dynamic-sms-spring-boot-starter/pom.xml b/eden-components/eden-spring-boot-starters/eden-common-sms-spring-boot-starter/pom.xml similarity index 90% rename from eden-components/eden-spring-boot-starters/eden-dynamic-sms-spring-boot-starter/pom.xml rename to eden-components/eden-spring-boot-starters/eden-common-sms-spring-boot-starter/pom.xml index d2ad75405..6ea7a7f3d 100644 --- a/eden-components/eden-spring-boot-starters/eden-dynamic-sms-spring-boot-starter/pom.xml +++ b/eden-components/eden-spring-boot-starters/eden-common-sms-spring-boot-starter/pom.xml @@ -26,10 +26,10 @@ 0.0.1-SNAPSHOT ../pom.xml - eden-dynamic-sms-spring-boot-starter + eden-common-sms-spring-boot-starter jar eden-dynamic-sms-spring-boot-starter - Spring Boot Starter For Dynamic SMS + Spring Boot Starter For Common SMS @@ -48,7 +48,7 @@ io.github.shiyindaxiaojie - eden-dynamic-sms + eden-common-sms diff --git a/eden-components/eden-spring-boot-starters/eden-dynamic-sms-spring-boot-starter/src/main/java/org/ylzl/eden/common/sms/spring/boot/autoconfigure/SmsAutoConfiguration.java b/eden-components/eden-spring-boot-starters/eden-common-sms-spring-boot-starter/src/main/java/org/ylzl/eden/common/sms/spring/boot/autoconfigure/SmsAutoConfiguration.java similarity index 100% rename from eden-components/eden-spring-boot-starters/eden-dynamic-sms-spring-boot-starter/src/main/java/org/ylzl/eden/common/sms/spring/boot/autoconfigure/SmsAutoConfiguration.java rename to eden-components/eden-spring-boot-starters/eden-common-sms-spring-boot-starter/src/main/java/org/ylzl/eden/common/sms/spring/boot/autoconfigure/SmsAutoConfiguration.java diff --git a/eden-components/eden-spring-boot-starters/eden-dynamic-sms-spring-boot-starter/src/main/java/org/ylzl/eden/common/sms/spring/boot/env/SmsProperties.java b/eden-components/eden-spring-boot-starters/eden-common-sms-spring-boot-starter/src/main/java/org/ylzl/eden/common/sms/spring/boot/env/SmsProperties.java similarity index 100% rename from eden-components/eden-spring-boot-starters/eden-dynamic-sms-spring-boot-starter/src/main/java/org/ylzl/eden/common/sms/spring/boot/env/SmsProperties.java rename to eden-components/eden-spring-boot-starters/eden-common-sms-spring-boot-starter/src/main/java/org/ylzl/eden/common/sms/spring/boot/env/SmsProperties.java diff --git a/eden-components/eden-spring-boot-starters/eden-dynamic-sms-spring-boot-starter/src/main/java/org/ylzl/eden/common/sms/spring/boot/support/SmsHelper.java b/eden-components/eden-spring-boot-starters/eden-common-sms-spring-boot-starter/src/main/java/org/ylzl/eden/common/sms/spring/boot/support/SmsHelper.java similarity index 100% rename from eden-components/eden-spring-boot-starters/eden-dynamic-sms-spring-boot-starter/src/main/java/org/ylzl/eden/common/sms/spring/boot/support/SmsHelper.java rename to eden-components/eden-spring-boot-starters/eden-common-sms-spring-boot-starter/src/main/java/org/ylzl/eden/common/sms/spring/boot/support/SmsHelper.java diff --git a/eden-components/eden-spring-boot-starters/eden-dynamic-sms-spring-boot-starter/src/main/resources/META-INF/spring.factories b/eden-components/eden-spring-boot-starters/eden-common-sms-spring-boot-starter/src/main/resources/META-INF/spring.factories similarity index 100% rename from eden-components/eden-spring-boot-starters/eden-dynamic-sms-spring-boot-starter/src/main/resources/META-INF/spring.factories rename to eden-components/eden-spring-boot-starters/eden-common-sms-spring-boot-starter/src/main/resources/META-INF/spring.factories diff --git a/eden-components/eden-spring-boot-starters/eden-common-sms-spring-boot-starter/src/test/java/.gitkeep b/eden-components/eden-spring-boot-starters/eden-common-sms-spring-boot-starter/src/test/java/.gitkeep new file mode 100644 index 000000000..617c45fa3 --- /dev/null +++ b/eden-components/eden-spring-boot-starters/eden-common-sms-spring-boot-starter/src/test/java/.gitkeep @@ -0,0 +1,3 @@ +# Ignore everything in this directory +* +# Except this file !.gitkeep diff --git a/eden-components/eden-spring-boot-starters/eden-common-sms-spring-boot-starter/src/test/resources/.gitkeep b/eden-components/eden-spring-boot-starters/eden-common-sms-spring-boot-starter/src/test/resources/.gitkeep new file mode 100644 index 000000000..617c45fa3 --- /dev/null +++ b/eden-components/eden-spring-boot-starters/eden-common-sms-spring-boot-starter/src/test/resources/.gitkeep @@ -0,0 +1,3 @@ +# Ignore everything in this directory +* +# Except this file !.gitkeep diff --git a/eden-components/eden-spring-boot-starters/eden-dynamic-tp-spring-boot-starter/pom.xml b/eden-components/eden-spring-boot-starters/eden-dynamic-tp-spring-boot-starter/pom.xml index 734ad4eb2..a1d845f94 100644 --- a/eden-components/eden-spring-boot-starters/eden-dynamic-tp-spring-boot-starter/pom.xml +++ b/eden-components/eden-spring-boot-starters/eden-dynamic-tp-spring-boot-starter/pom.xml @@ -82,7 +82,7 @@ io.github.shiyindaxiaojie - eden-dynamic-mq + eden-common-mq diff --git a/eden-components/eden-spring-boot-starters/eden-rocketmq-spring-boot-starter/pom.xml b/eden-components/eden-spring-boot-starters/eden-rocketmq-spring-boot-starter/pom.xml index e20a22683..7d54dda39 100644 --- a/eden-components/eden-spring-boot-starters/eden-rocketmq-spring-boot-starter/pom.xml +++ b/eden-components/eden-spring-boot-starters/eden-rocketmq-spring-boot-starter/pom.xml @@ -39,7 +39,7 @@ io.github.shiyindaxiaojie - eden-dynamic-mq + eden-common-mq diff --git a/eden-components/eden-spring-boot-starters/eden-xxljob-spring-boot-starter/src/main/java/org/ylzl/eden/xxljob/spring/boot/admin/AutoRegisterXxlJobExecutor.java b/eden-components/eden-spring-boot-starters/eden-xxljob-spring-boot-starter/src/main/java/org/ylzl/eden/xxljob/spring/boot/admin/AutoRegisterXxlJobExecutor.java index 7ec455128..bb4aa459a 100644 --- a/eden-components/eden-spring-boot-starters/eden-xxljob-spring-boot-starter/src/main/java/org/ylzl/eden/xxljob/spring/boot/admin/AutoRegisterXxlJobExecutor.java +++ b/eden-components/eden-spring-boot-starters/eden-xxljob-spring-boot-starter/src/main/java/org/ylzl/eden/xxljob/spring/boot/admin/AutoRegisterXxlJobExecutor.java @@ -64,23 +64,23 @@ public void start() throws Exception { xxlJobGroup.setAddressType(0); ResponseEntity responseEntity = xxlJobAdminTemplate.saveOrUpdateGroup(xxlJobGroup); if (!responseEntity.getStatusCode().is2xxSuccessful()) { - log.warn("添加执行器 `{}` 失败，原因: 响应状态码为 {}", appName, responseEntity.getStatusCodeValue()); + log.warn("Add executor '{}' failed, cause: response code is {}", appName, responseEntity.getStatusCodeValue()); return; } ReturnT returnT = JSON.parseObject(responseEntity.getBody(), new TypeReference>() { }); if (returnT == null || returnT.getCode() == ReturnT.FAIL_CODE) { - log.warn("添加执行器 `{}` 失败，原因: {}", appName, returnT == null ? "接口返回NULL" : returnT.getMsg()); + log.warn("Add executor '{}' failed, cause: {}", appName, returnT == null ? "response is null" : returnT.getMsg()); return; } - log.info("添加执行器 `{}` 成功", appName); + log.info("Add executor '{}' success", appName); for (XxlJobInfo xxlJobInfo : xxlJobInfos) { xxlJobInfo.setJobGroup(Integer.parseInt(returnT.getContent())); ResponseEntity response = xxlJobAdminTemplate.addOrUpdateJob(xxlJobInfo); if (!responseEntity.getStatusCode().is2xxSuccessful()) { - log.warn("添加任务 `{}` 失败，原因: 响应状态码为 {}", xxlJobInfo.getExecutorHandler(), + log.warn("Add executor '{}' failed, cause: response code is {}", xxlJobInfo.getExecutorHandler(), responseEntity.getStatusCodeValue()); return; } @@ -89,8 +89,8 @@ public void start() throws Exception { ReturnT result = JSON.parseObject(responseBody, new TypeReference>() { }); if (result == null || result.getCode() == ReturnT.FAIL_CODE) { - log.warn("添加任务 `{}` 失败，原因: {}", xxlJobInfo.getExecutorHandler(), result == null ? - "接口返回NULL" : result.getMsg()); + log.warn("Add task '{}' failed, cause: {}", xxlJobInfo.getExecutorHandler(), result == null ? + "response is null" : result.getMsg()); return; } } diff --git a/eden-components/eden-spring-boot-starters/pom.xml b/eden-components/eden-spring-boot-starters/pom.xml index cbe6f924b..b7cb468ce 100644 --- a/eden-components/eden-spring-boot-starters/pom.xml +++ b/eden-components/eden-spring-boot-starters/pom.xml @@ -39,11 +39,11 @@ eden-distributed-lock-spring-boot-starter eden-distributed-uid-spring-boot-starter eden-druid-spring-boot-starter - eden-dynamic-cache-spring-boot-starter + eden-common-cache-spring-boot-starter + eden-common-mail-spring-boot-starter + eden-common-mq-spring-boot-starter + eden-common-sms-spring-boot-starter eden-dynamic-datasource-spring-boot-starter - eden-dynamic-mail-spring-boot-starter - eden-dynamic-mq-spring-boot-starter - eden-dynamic-sms-spring-boot-starter eden-dynamic-tp-spring-boot-starter eden-elasticsearch-spring-boot-starter eden-event-auditor-spring-boot-starter diff --git a/eden-components/eden-spring-cloud-starters/eden-dubbo-spring-cloud-starter/src/main/java/org/ylzl/eden/dubbo/spring/cloud/local/LocalFilter.java b/eden-components/eden-spring-cloud-starters/eden-dubbo-spring-cloud-starter/src/main/java/org/ylzl/eden/dubbo/spring/cloud/local/LocalFilter.java new file mode 100644 index 000000000..be579ba6e --- /dev/null +++ b/eden-components/eden-spring-cloud-starters/eden-dubbo-spring-cloud-starter/src/main/java/org/ylzl/eden/dubbo/spring/cloud/local/LocalFilter.java @@ -0,0 +1,28 @@ +package org.ylzl.eden.dubbo.spring.cloud.local; + +import lombok.extern.slf4j.Slf4j; +import org.apache.dubbo.rpc.*; +import org.ylzl.eden.commons.net.IpConfigUtils; + +/** + * 本地开发过滤器 + * + * @author gyl + * @since 2.4.13 + */ +@Slf4j +public class LocalFilter implements Filter { + + public static final String SOURCE_IP = "sourceIp"; + + @Override + public Result invoke(Invoker invoker, Invocation invocation) throws RpcException { + String sourceIp = invocation.getAttachment(SOURCE_IP); + if (sourceIp == null) { + log.debug("Use localhost address due to missing source address."); + sourceIp = IpConfigUtils.getIpAddress(); + } + invocation.setAttachment(SOURCE_IP, sourceIp); + return invoker.invoke(invocation); + } +} diff --git a/eden-components/eden-spring-cloud-starters/eden-dubbo-spring-cloud-starter/src/main/java/org/ylzl/eden/dubbo/spring/cloud/local/LocalLoadBalance.java b/eden-components/eden-spring-cloud-starters/eden-dubbo-spring-cloud-starter/src/main/java/org/ylzl/eden/dubbo/spring/cloud/local/LocalLoadBalance.java new file mode 100644 index 000000000..2fba4c1d0 --- /dev/null +++ b/eden-components/eden-spring-cloud-starters/eden-dubbo-spring-cloud-starter/src/main/java/org/ylzl/eden/dubbo/spring/cloud/local/LocalLoadBalance.java @@ -0,0 +1,37 @@ +package org.ylzl.eden.dubbo.spring.cloud.local; + +import lombok.extern.slf4j.Slf4j; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.cluster.loadbalance.RandomLoadBalance; +import org.ylzl.eden.commons.net.IpConfigUtils; + +import java.util.List; + +import static org.ylzl.eden.dubbo.spring.cloud.local.LocalFilter.SOURCE_IP; + +/** + * 本地开发负载均衡 + * + * @author gyl + * @since 2.4.13 + */ +@Slf4j +public class LocalLoadBalance extends RandomLoadBalance { + + @Override + public Invoker select(List> invokers, URL url, Invocation invocation) throws RpcException { + String sourceIp = invocation.getAttachment(SOURCE_IP); + if (sourceIp == null) { + sourceIp = IpConfigUtils.getIpAddress(); + } + for (Invoker invoker: invokers) { + if (invoker.getUrl().getIp().equals(sourceIp)) { + return invoker; + } + } + return super.select(invokers, url, invocation); + } +} diff --git a/eden-components/eden-spring-cloud-starters/eden-dubbo-spring-cloud-starter/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter b/eden-components/eden-spring-cloud-starters/eden-dubbo-spring-cloud-starter/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter new file mode 100644 index 000000000..b39151593 --- /dev/null +++ b/eden-components/eden-spring-cloud-starters/eden-dubbo-spring-cloud-starter/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.Filter @@ -0,0 +1 @@ +dev=org.ylzl.eden.dubbo.spring.cloud.local.LocalFilter diff --git a/eden-components/eden-spring-cloud-starters/eden-dubbo-spring-cloud-starter/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.cluster.loadbalance b/eden-components/eden-spring-cloud-starters/eden-dubbo-spring-cloud-starter/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.cluster.loadbalance new file mode 100644 index 000000000..e09ed93bb --- /dev/null +++ b/eden-components/eden-spring-cloud-starters/eden-dubbo-spring-cloud-starter/src/main/resources/META-INF/dubbo/org.apache.dubbo.rpc.cluster.loadbalance @@ -0,0 +1 @@ +dev=org.ylzl.eden.dubbo.spring.cloud.local.LocalLoadBalance diff --git a/eden-components/eden-spring-integration/src/main/java/org/ylzl/eden/spring/integration/cat/integration/web/HttpCatFilter.java b/eden-components/eden-spring-integration/src/main/java/org/ylzl/eden/spring/integration/cat/integration/web/HttpCatFilter.java index f13f35b51..2220d7b4a 100644 --- a/eden-components/eden-spring-integration/src/main/java/org/ylzl/eden/spring/integration/cat/integration/web/HttpCatFilter.java +++ b/eden-components/eden-spring-integration/src/main/java/org/ylzl/eden/spring/integration/cat/integration/web/HttpCatFilter.java @@ -290,7 +290,7 @@ private void logCatMessageId(HttpServletResponse res) { if (traceMode) { String id = Cat.getCurrentMessageId(); res.setHeader(CatConstants.X_CAT_ID, id); - res.setHeader(CatConstants.X_CAT_SERVER, getCatServer()); +// res.setHeader(CatConstants.X_CAT_SERVER, getCatServer()); } } From ea033c0c56cc053d1aa68cb40a2ae12a4c7847f4 Mon Sep 17 00:00:00 2001 From: shiyindaxiaojie <1813986321@qq.com> Date: Tue, 29 Oct 2024 21:41:05 +0800 Subject: [PATCH 2/3] update --- eden-components/eden-dependencies/pom.xml | 14 +++- .../data/differ/support/DataDifferHelper.java | 4 +- .../eden/data/differ/DataDifferTest.groovy | 2 +- .../org/ylzl/eden/data/differ/TestCase.java | 4 - .../src/test/groovy/.gitkeep | 3 + .../data/duplicate/SensitiveFilterTest.groovy | 73 ------------------- .../src/test/java/.gitkeep | 3 + .../eden/data/duplicate/package-info.java | 17 ----- .../log4j2/DataMaskerStringLayout.java | 2 +- .../data/masker/support/DataMaskerHelper.java | 6 +- .../eden/data/masker/DataMaskerTest.groovy | 2 +- 11 files changed, 26 insertions(+), 104 deletions(-) create mode 100644 eden-components/eden-solutions/eden-data-duplicate/src/test/groovy/.gitkeep delete mode 100644 eden-components/eden-solutions/eden-data-duplicate/src/test/groovy/org/ylzl/eden/data/duplicate/SensitiveFilterTest.groovy create mode 100644 eden-components/eden-solutions/eden-data-duplicate/src/test/java/.gitkeep delete mode 100644 eden-components/eden-solutions/eden-data-duplicate/src/test/java/org/ylzl/eden/data/duplicate/package-info.java diff --git a/eden-components/eden-dependencies/pom.xml b/eden-components/eden-dependencies/pom.xml index 614cdb9fd..d6a1398a6 100644 --- a/eden-components/eden-dependencies/pom.xml +++ b/eden-components/eden-dependencies/pom.xml @@ -416,6 +416,11 @@ eden-consistency-task 0.0.1-SNAPSHOT + + io.github.shiyindaxiaojie + eden-data-crypto + 0.0.1-SNAPSHOT + io.github.shiyindaxiaojie eden-data-differ @@ -423,12 +428,12 @@ io.github.shiyindaxiaojie - eden-data-crypto + eden-data-duplicate 0.0.1-SNAPSHOT io.github.shiyindaxiaojie - eden-sensitive-word + eden-data-masker 0.0.1-SNAPSHOT @@ -461,6 +466,11 @@ eden-idempotent 0.0.1-SNAPSHOT + + io.github.shiyindaxiaojie + eden-sensitive-word + 0.0.1-SNAPSHOT + diff --git a/eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/support/DataDifferHelper.java b/eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/support/DataDifferHelper.java index 185991966..bdd1c3e79 100644 --- a/eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/support/DataDifferHelper.java +++ b/eden-components/eden-solutions/eden-data-differ/src/main/java/org/ylzl/eden/data/differ/support/DataDifferHelper.java @@ -33,7 +33,7 @@ public class DataDifferHelper { * * @return 数据比对实例 */ - public static DataDiffer dataDiffer() { + public static DataDiffer build() { return ExtensionLoader.getExtensionLoader(DataDifferBuilder.class).getDefaultExtension().build(); } @@ -43,7 +43,7 @@ public static DataDiffer dataDiffer() { * @param spi 扩展点 * @return 数据比对实例 */ - public static DataDiffer dataDiffer(String spi) { + public static DataDiffer build(String spi) { return ExtensionLoader.getExtensionLoader(DataDifferBuilder.class).getExtension(spi).build(); } } diff --git a/eden-components/eden-solutions/eden-data-differ/src/test/groovy/org/ylzl/eden/data/differ/DataDifferTest.groovy b/eden-components/eden-solutions/eden-data-differ/src/test/groovy/org/ylzl/eden/data/differ/DataDifferTest.groovy index 7fe383bab..582925562 100644 --- a/eden-components/eden-solutions/eden-data-differ/src/test/groovy/org/ylzl/eden/data/differ/DataDifferTest.groovy +++ b/eden-components/eden-solutions/eden-data-differ/src/test/groovy/org/ylzl/eden/data/differ/DataDifferTest.groovy @@ -37,7 +37,7 @@ class DataDifferTest extends Specification { def "test data differing"() { given: - DataDiffer dataDiffer = DataDifferHelper.dataDiffer(spi) + DataDiffer dataDiffer = DataDifferHelper.build(spi) TestCase changeVersion = dataDiffer.compare(oldVersion, newVersion).getChanges().get(0).getAffectedValue(); expect: diff --git a/eden-components/eden-solutions/eden-data-differ/src/test/java/org/ylzl/eden/data/differ/TestCase.java b/eden-components/eden-solutions/eden-data-differ/src/test/java/org/ylzl/eden/data/differ/TestCase.java index f96c36a07..f5dbd4ff3 100644 --- a/eden-components/eden-solutions/eden-data-differ/src/test/java/org/ylzl/eden/data/differ/TestCase.java +++ b/eden-components/eden-solutions/eden-data-differ/src/test/java/org/ylzl/eden/data/differ/TestCase.java @@ -35,15 +35,11 @@ @com.alibaba.fastjson2.annotation.JSONType(orders = {"address", "chineseName", "idCard", "mobilePhone"}) public class TestCase { - @DataMasking("address") private String address; - @DataMasking("chinese-name") private String chineseName; - @DataMasking("id-card") private String idCard; - @DataMasking("mobile-phone") private String mobilePhone; } diff --git a/eden-components/eden-solutions/eden-data-duplicate/src/test/groovy/.gitkeep b/eden-components/eden-solutions/eden-data-duplicate/src/test/groovy/.gitkeep new file mode 100644 index 000000000..617c45fa3 --- /dev/null +++ b/eden-components/eden-solutions/eden-data-duplicate/src/test/groovy/.gitkeep @@ -0,0 +1,3 @@ +# Ignore everything in this directory +* +# Except this file !.gitkeep diff --git a/eden-components/eden-solutions/eden-data-duplicate/src/test/groovy/org/ylzl/eden/data/duplicate/SensitiveFilterTest.groovy b/eden-components/eden-solutions/eden-data-duplicate/src/test/groovy/org/ylzl/eden/data/duplicate/SensitiveFilterTest.groovy deleted file mode 100644 index eebca5c98..000000000 --- a/eden-components/eden-solutions/eden-data-duplicate/src/test/groovy/org/ylzl/eden/data/duplicate/SensitiveFilterTest.groovy +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright 2012-2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.ylzl.eden.data.duplicate - -import com.google.common.collect.Sets -import org.ylzl.eden.data.duplicate.builder.SensitiveFilterBuilder -import org.ylzl.eden.data.duplicate.config.SensitiveConfig -import org.ylzl.eden.data.duplicate.sensitive.SensitiveWord -import org.ylzl.eden.data.duplicate.sensitive.SensitiveWordLoader -import org.ylzl.eden.extension.ExtensionLoader -import spock.lang.Specification - -class SensitiveFilterTest extends Specification { - - static String sensitiveText = "我是大鸡巴美少女，喜欢玩美少女万华镜、3D定制女仆" - - SensitiveFilter sensitiveFilter - - def setup() { - SensitiveConfig sensitiveConfig = new SensitiveConfig(); - sensitiveConfig.getAhoCorasick().setOnlyWholeWords(true) - sensitiveFilter = ExtensionLoader.getExtensionLoader(SensitiveFilterBuilder.class) - .getDefaultExtension() - .config(sensitiveConfig) - .sensitiveWordLoader(new SensitiveWordLoader() { - - @Override - Collection loadSensitiveWords() { - return Sets.newHashSet("鸡巴", "女仆") - } - }) - .build() - } - - def "test parse text"() { - given: - Collection sensitiveWords = sensitiveFilter.parseText(sensitiveText) - - expect: - sensitiveWords[index].getKeyword() == keyword - - where: - index || keyword - 0 || "鸡巴" - 1 || "女仆" - } - - def "test filter text"() { - expect: - replacedText == sensitiveFilter.replaceSensitiveWords(sensitiveText) - deletedText == sensitiveFilter.deleteSensitiveWords(sensitiveText) - - where: - replacedText || deletedText - "我是大???美少女，喜欢玩美少女万华镜、3D定制???" || "我是大美少女，喜欢玩美少女万华镜、3D定制" - } -} - -//Generated with love by TestMe :) Please report issues and submit feature requests at: http://weirddev.com/forum#!/testme diff --git a/eden-components/eden-solutions/eden-data-duplicate/src/test/java/.gitkeep b/eden-components/eden-solutions/eden-data-duplicate/src/test/java/.gitkeep new file mode 100644 index 000000000..617c45fa3 --- /dev/null +++ b/eden-components/eden-solutions/eden-data-duplicate/src/test/java/.gitkeep @@ -0,0 +1,3 @@ +# Ignore everything in this directory +* +# Except this file !.gitkeep diff --git a/eden-components/eden-solutions/eden-data-duplicate/src/test/java/org/ylzl/eden/data/duplicate/package-info.java b/eden-components/eden-solutions/eden-data-duplicate/src/test/java/org/ylzl/eden/data/duplicate/package-info.java deleted file mode 100644 index 4a2df3297..000000000 --- a/eden-components/eden-solutions/eden-data-duplicate/src/test/java/org/ylzl/eden/data/duplicate/package-info.java +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright 2012-2019 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.ylzl.eden.data.duplicate; diff --git a/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/log4j2/DataMaskerStringLayout.java b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/log4j2/DataMaskerStringLayout.java index a09fc2344..f9c4182a4 100644 --- a/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/log4j2/DataMaskerStringLayout.java +++ b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/integration/log4j2/DataMaskerStringLayout.java @@ -70,7 +70,7 @@ public String toSerializable(LogEvent event) { for (PatternFormatter formatter : patternFormatterList) { formatter.format(event, stringBuilder); } - return DataMaskerHelper.dataMasker(config).masking(stringBuilder.toString()); + return DataMaskerHelper.build(config).masking(stringBuilder.toString()); } @PluginFactory diff --git a/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/support/DataMaskerHelper.java b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/support/DataMaskerHelper.java index 9c2b67307..371f19fd1 100644 --- a/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/support/DataMaskerHelper.java +++ b/eden-components/eden-solutions/eden-data-masker/src/main/java/org/ylzl/eden/data/masker/support/DataMaskerHelper.java @@ -35,7 +35,7 @@ public class DataMaskerHelper { * @param strategy 策略 * @return 数据脱敏实例 */ - public static DataMasker dataMasker(String strategy) { + public static DataMasker build(String strategy) { return ExtensionLoader.getExtensionLoader(DataMaskerBuilder.class).getDefaultExtension().strategy(strategy).build(); } @@ -46,7 +46,7 @@ public static DataMasker dataMasker(String strategy) { * @param strategy 策略 * @return 数据脱敏实例 */ - public static DataMasker dataMasker(String spi, String strategy) { + public static DataMasker build(String spi, String strategy) { return ExtensionLoader.getExtensionLoader(DataMaskerBuilder.class).getExtension(spi).strategy(strategy).build(); } @@ -56,7 +56,7 @@ public static DataMasker dataMasker(String spi, String strategy) { * @param config 配置 * @return 数据脱敏实例 */ - public static DataMasker dataMasker(DataMaskerConfig config) { + public static DataMasker build(DataMaskerConfig config) { return ExtensionLoader.getExtensionLoader(DataMaskerBuilder.class) .getDefaultExtension() .config(config) diff --git a/eden-components/eden-solutions/eden-data-masker/src/test/groovy/org/ylzl/eden/data/masker/DataMaskerTest.groovy b/eden-components/eden-solutions/eden-data-masker/src/test/groovy/org/ylzl/eden/data/masker/DataMaskerTest.groovy index f22094c82..dc7d2aaf0 100644 --- a/eden-components/eden-solutions/eden-data-masker/src/test/groovy/org/ylzl/eden/data/masker/DataMaskerTest.groovy +++ b/eden-components/eden-solutions/eden-data-masker/src/test/groovy/org/ylzl/eden/data/masker/DataMaskerTest.groovy @@ -39,7 +39,7 @@ class DataMaskerTest extends Specification { def "test data masking"() { given: - DataMasker dataMasker = DataMaskerHelper.dataMasker(strategy) + DataMasker dataMasker = DataMaskerHelper.build(strategy) expect: maskedData == dataMasker.masking(data) From 03314de26f9fbbecd6511769c79509cfc425b621 Mon Sep 17 00:00:00 2001 From: shiyindaxiaojie <1813986321@qq.com> Date: Tue, 29 Oct 2024 22:04:13 +0800 Subject: [PATCH 3/3] update --- CHANGELOG.md | 10 +++++----- .../eden-solutions/eden-common-cache/pom.xml | 2 +- .../eden-solutions/eden-common-excel/pom.xml | 2 +- .../eden-solutions/eden-common-mail/pom.xml | 2 +- eden-components/eden-solutions/eden-common-mq/pom.xml | 2 +- .../eden-solutions/eden-common-security/pom.xml | 2 +- eden-components/eden-solutions/eden-common-sms/pom.xml | 2 +- .../eden-solutions/eden-data-differ/pom.xml | 9 --------- eden-components/eden-solutions/pom.xml | 1 + .../eden-common-cache-spring-boot-starter/pom.xml | 2 +- .../eden-common-mail-spring-boot-starter/pom.xml | 2 +- .../eden-common-mq-spring-boot-starter/pom.xml | 2 +- .../eden-common-sms-spring-boot-starter/pom.xml | 2 +- 13 files changed, 16 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 57e8ee5fe..8a88791d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,7 @@ 实现最终一致性，详见 [`eden-consistency-task`](https://github.com/shiyindaxiaojie/eden-architect/tree/main/eden-components/eden-solutions/eden-consistency-task) - 自研全链路标记组件，支持常用组件的影子库切换，详见 [`eden-full-tracing`](https://github.com/shiyindaxiaojie/eden-architect/tree/main/eden-components/eden-solutions/eden-full-tracing) - 封装授权认证组件，支持 `OAuth2`、`JWT` - 无缝切换，详见 [`eden-dynamic-security`](https://github.com/shiyindaxiaojie/eden-architect/tree/main/eden-components/eden-solutions/eden-dynamic-security) + 无缝切换，详见 [`eden-common-security`](https://github.com/shiyindaxiaojie/eden-architect/tree/main/eden-components/eden-solutions/eden-dynamic-security) - 封装数据审计组件，提供数据比对、数据脱敏功能，详见 [`eden-data-auditor`](https://github.com/shiyindaxiaojie/eden-architect/tree/main/eden-components/eden-solutions/eden-data-auditor) - 封装数据过滤组件，提供数据去重、敏感词过滤功能，详见 [`eden-data-filter`](https://github.com/shiyindaxiaojie/eden-architect/tree/main/eden-components/eden-solutions/eden-data-filter) - 封装事件审计组件，支持 SpEL @@ -41,9 +41,9 @@ - 基于 `COLA4` 扩展，重构 `DTO` 、状态机、业务扩展点等组件，详见 [`eden-cola`](https://github.com/shiyindaxiaojie/eden-architect/tree/main/eden-components/eden-cola) - 封装分布式缓存组件，支持 `Redis`、`Caffeine`、`Guava` 无缝切换，接入 `JD HotKey` 或者 `Sentinel` - 可实现多级缓存动态切换，详见 [`eden-dynamic-cache`](https://github.com/shiyindaxiaojie/eden-architect/tree/main/eden-components/eden-solutions/eden-dynamic-cache) + 可实现多级缓存动态切换，详见 [`eden-common-cache`](https://github.com/shiyindaxiaojie/eden-architect/tree/main/eden-components/eden-solutions/eden-common-cache) - 封装消息队列组件，支持 `RocketMQ`、`Kafka`、`Pulsar` - 无缝切换，详见 [`eden-dynamic-mq`](https://github.com/shiyindaxiaojie/eden-architect/tree/main/eden-components/eden-solutions/eden-dynamic-mq) + 无缝切换，详见 [`eden-common-mq`](https://github.com/shiyindaxiaojie/eden-architect/tree/main/eden-components/eden-solutions/eden-common-mq) - 封装分布式锁组件，支持 `Redisson`、`Jedis`、`Curator`、`Zookeeper` 无缝切换，详见 [`eden-distrubuted-lock`](https://github.com/shiyindaxiaojie/eden-architect/tree/main/eden-components/eden-solutions/eden-distrubuted-lock) - 封装分布式唯一ID组件，支持 `Leaf`、`UIDGenerator`、`TinyId`、`Snowflake` @@ -51,9 +51,9 @@ - 封装幂等性处理组件，提供 `Token` （校验令牌）或者 `TTL` （过期时间）两种解决方案，详见 [`eden-idempotent`](https://github.com/shiyindaxiaojie/eden-architect/tree/main/eden-components/eden-solutions/eden-idempotent) - 封装 SMS - 组件，支持阿里云、腾讯云、梦网、亿美等短信平台组件无缝切换，详见 [`eden-dynamic-sms`](https://github.com/shiyindaxiaojie/eden-architect/tree/main/eden-components/eden-solutions/eden-dynamic-sms) + 组件，支持阿里云、腾讯云、梦网、亿美等短信平台组件无缝切换，详见 [`eden-common-sms`](https://github.com/shiyindaxiaojie/eden-architect/tree/main/eden-components/eden-solutions/eden-common-sms) - 封装 Mail 组件，由于使用较少，目前仅接入 `JavaMail` - 组件，详见 [`eden-dynamic-mail`](https://github.com/shiyindaxiaojie/eden-architect/tree/main/eden-components/eden-solutions/eden-dynamic-mail) + 组件，详见 [`eden-common-mail`](https://github.com/shiyindaxiaojie/eden-architect/tree/main/eden-components/eden-solutions/eden-common-mail) ### IMPROVEMENTS diff --git a/eden-components/eden-solutions/eden-common-cache/pom.xml b/eden-components/eden-solutions/eden-common-cache/pom.xml index 5669c5660..d650dd00a 100644 --- a/eden-components/eden-solutions/eden-common-cache/pom.xml +++ b/eden-components/eden-solutions/eden-common-cache/pom.xml @@ -28,7 +28,7 @@ eden-common-cache jar - eden-dynamic-cache + eden-common-cache 通用缓存组件 diff --git a/eden-components/eden-solutions/eden-common-excel/pom.xml b/eden-components/eden-solutions/eden-common-excel/pom.xml index ba82d7841..ddc57b2bf 100644 --- a/eden-components/eden-solutions/eden-common-excel/pom.xml +++ b/eden-components/eden-solutions/eden-common-excel/pom.xml @@ -28,7 +28,7 @@ eden-common-excel jar - eden-dynamic-excel + eden-common-excel 通用Excel组件 diff --git a/eden-components/eden-solutions/eden-common-mail/pom.xml b/eden-components/eden-solutions/eden-common-mail/pom.xml index 44e394573..129261dba 100644 --- a/eden-components/eden-solutions/eden-common-mail/pom.xml +++ b/eden-components/eden-solutions/eden-common-mail/pom.xml @@ -28,7 +28,7 @@ eden-common-mail jar - eden-dynamic-mail + eden-common-mail 通用邮件组件 diff --git a/eden-components/eden-solutions/eden-common-mq/pom.xml b/eden-components/eden-solutions/eden-common-mq/pom.xml index f94ecd1fe..07d69fcb2 100644 --- a/eden-components/eden-solutions/eden-common-mq/pom.xml +++ b/eden-components/eden-solutions/eden-common-mq/pom.xml @@ -28,7 +28,7 @@ eden-common-mq jar - eden-dynamic-mq + eden-common-mq 通用消息队列组件 diff --git a/eden-components/eden-solutions/eden-common-security/pom.xml b/eden-components/eden-solutions/eden-common-security/pom.xml index aeb4c1e81..ae7c6fe2c 100644 --- a/eden-components/eden-solutions/eden-common-security/pom.xml +++ b/eden-components/eden-solutions/eden-common-security/pom.xml @@ -28,7 +28,7 @@ eden-common-security jar - eden-dynamic-security + eden-common-security 通用认证授权组件 diff --git a/eden-components/eden-solutions/eden-common-sms/pom.xml b/eden-components/eden-solutions/eden-common-sms/pom.xml index 3042da39c..9e4eda0fe 100644 --- a/eden-components/eden-solutions/eden-common-sms/pom.xml +++ b/eden-components/eden-solutions/eden-common-sms/pom.xml @@ -28,7 +28,7 @@ eden-common-sms jar - eden-dynamic-sms + eden-common-sms 通用短信组件 diff --git a/eden-components/eden-solutions/eden-data-differ/pom.xml b/eden-components/eden-solutions/eden-data-differ/pom.xml index 0bb60b864..c8d744ed3 100644 --- a/eden-components/eden-solutions/eden-data-differ/pom.xml +++ b/eden-components/eden-solutions/eden-data-differ/pom.xml @@ -31,15 +31,6 @@ eden-audit-differ 数据对比组件 - - - - org.codehaus.mojo - exec-maven-plugin - - - - diff --git a/eden-components/eden-solutions/pom.xml b/eden-components/eden-solutions/pom.xml index 39c1f1637..6509d8ec3 100644 --- a/eden-components/eden-solutions/pom.xml +++ b/eden-components/eden-solutions/pom.xml @@ -40,6 +40,7 @@ eden-common-sms eden-consistency-task eden-data-differ + eden-data-duplicate eden-data-crypto eden-data-masker eden-distributed-lock diff --git a/eden-components/eden-spring-boot-starters/eden-common-cache-spring-boot-starter/pom.xml b/eden-components/eden-spring-boot-starters/eden-common-cache-spring-boot-starter/pom.xml index a0961144c..096c215e8 100644 --- a/eden-components/eden-spring-boot-starters/eden-common-cache-spring-boot-starter/pom.xml +++ b/eden-components/eden-spring-boot-starters/eden-common-cache-spring-boot-starter/pom.xml @@ -28,7 +28,7 @@ eden-common-cache-spring-boot-starter jar - eden-dynamic-cache-spring-boot-starter + eden-common-cache-spring-boot-starter Spring Boot Starter For Common Cache diff --git a/eden-components/eden-spring-boot-starters/eden-common-mail-spring-boot-starter/pom.xml b/eden-components/eden-spring-boot-starters/eden-common-mail-spring-boot-starter/pom.xml index aa097bec8..1c18adc92 100644 --- a/eden-components/eden-spring-boot-starters/eden-common-mail-spring-boot-starter/pom.xml +++ b/eden-components/eden-spring-boot-starters/eden-common-mail-spring-boot-starter/pom.xml @@ -28,7 +28,7 @@ eden-common-mail-spring-boot-starter jar - eden-dynamic-mail-spring-boot-starter + eden-common-mail-spring-boot-starter Spring Boot Starter For Common Mail diff --git a/eden-components/eden-spring-boot-starters/eden-common-mq-spring-boot-starter/pom.xml b/eden-components/eden-spring-boot-starters/eden-common-mq-spring-boot-starter/pom.xml index ca8b7a087..a15f8905b 100644 --- a/eden-components/eden-spring-boot-starters/eden-common-mq-spring-boot-starter/pom.xml +++ b/eden-components/eden-spring-boot-starters/eden-common-mq-spring-boot-starter/pom.xml @@ -28,7 +28,7 @@ eden-common-mq-spring-boot-starter jar - eden-dynamic-mq-spring-boot-starter + eden-common-mq-spring-boot-starter Spring Boot Starter For Common Message Queue diff --git a/eden-components/eden-spring-boot-starters/eden-common-sms-spring-boot-starter/pom.xml b/eden-components/eden-spring-boot-starters/eden-common-sms-spring-boot-starter/pom.xml index 6ea7a7f3d..06e0e8a08 100644 --- a/eden-components/eden-spring-boot-starters/eden-common-sms-spring-boot-starter/pom.xml +++ b/eden-components/eden-spring-boot-starters/eden-common-sms-spring-boot-starter/pom.xml @@ -28,7 +28,7 @@ eden-common-sms-spring-boot-starter jar - eden-dynamic-sms-spring-boot-starter + eden-common-sms-spring-boot-starter Spring Boot Starter For Common SMS