From 030ed9ed3b59dc656ade2c51f57b439f693ed3a8 Mon Sep 17 00:00:00 2001 From: ZhouXY108 Date: Fri, 2 May 2025 11:31:57 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=94=B9=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 创建父项目 plusone-parent,将 plusone-commons 放在 plusone-parent 下; 在 plusone-parent 下创建 plusone-dependencies,由 plusone-dependencies 管理可能用到的所有依赖。 --- cspell.json | 6 + plusone-commons/pom.xml | 133 +++++++++ .../commons/annotation/ReaderMethod.java | 0 .../annotation/StaticFactoryMethod.java | 0 .../annotation/UnsupportedOperation.java | 0 .../commons/annotation/ValueObject.java | 0 .../plusone/commons/annotation/Virtual.java | 0 .../commons/annotation/WriterMethod.java | 0 .../commons/annotation/package-info.java | 0 .../plusone/commons/base/IWithCode.java | 0 .../plusone/commons/base/IWithIntCode.java | 0 .../plusone/commons/base/IWithLongCode.java | 0 .../xyz/zhouxy/plusone/commons/base/Ref.java | 0 .../plusone/commons/base/package-info.java | 0 .../commons/collection/CollectionTools.java | 0 .../commons/collection/package-info.java | 0 .../commons/constant/PatternConsts.java | 0 .../plusone/commons/constant/RegexConsts.java | 0 .../commons/constant/package-info.java | 0 .../exception/DataNotExistsException.java | 0 .../exception/MultiTypesException.java | 0 .../exception/ParsingFailureException.java | 0 .../exception/business/BizException.java | 0 .../business/InvalidInputException.java | 0 .../business/RequestParamsException.java | 0 .../exception/business/package-info.java | 0 .../commons/exception/package-info.java | 0 .../system/DataOperationResultException.java | 0 .../system/NoAvailableMacFoundException.java | 0 .../exception/system/SysException.java | 0 .../exception/system/package-info.java | 0 .../commons/function/BoolUnaryOperator.java | 0 .../commons/function/CharUnaryOperator.java | 0 .../plusone/commons/function/Executable.java | 0 .../commons/function/OptionalSupplier.java | 0 .../commons/function/PredicateTools.java | 0 .../commons/function/ThrowingConsumer.java | 0 .../commons/function/ThrowingFunction.java | 0 .../commons/function/ThrowingPredicate.java | 0 .../commons/function/ThrowingSupplier.java | 0 .../function/ToOptionalBiFunction.java | 0 .../commons/function/ToOptionalFunction.java | 0 .../commons/function/package-info.java | 0 .../model/Chinese2ndGenIDCardNumber.java | 0 .../zhouxy/plusone/commons/model/Gender.java | 0 .../plusone/commons/model/IDCardNumber.java | 0 .../model/ValidatableStringRecord.java | 0 .../plusone/commons/model/dto/PageResult.java | 0 .../dto/PagingAndSortingQueryParams.java | 0 .../commons/model/dto/PagingParams.java | 0 .../commons/model/dto/UnifiedResponse.java | 0 .../commons/model/dto/UnifiedResponses.java | 0 .../commons/model/dto/package-info.java | 0 .../plusone/commons/model/package-info.java | 0 .../zhouxy/plusone/commons/time/Quarter.java | 0 .../plusone/commons/time/YearQuarter.java | 0 .../plusone/commons/time/package-info.java | 0 .../plusone/commons/util/ArrayTools.java | 0 .../plusone/commons/util/AssertTools.java | 0 .../plusone/commons/util/BigDecimals.java | 0 .../plusone/commons/util/DateTimeTools.java | 0 .../plusone/commons/util/EnumTools.java | 0 .../plusone/commons/util/Enumeration.java | 0 .../plusone/commons/util/IdGenerator.java | 0 .../zhouxy/plusone/commons/util/IdWorker.java | 0 .../zhouxy/plusone/commons/util/Numbers.java | 0 .../plusone/commons/util/OptionalTools.java | 0 .../plusone/commons/util/RandomTools.java | 0 .../plusone/commons/util/RegexTools.java | 0 .../commons/util/SnowflakeIdGenerator.java | 0 .../plusone/commons/util/StringTools.java | 0 .../plusone/commons/util/TreeBuilder.java | 0 .../plusone/commons/util/package-info.java | 0 .../plusone/commons/EnumerationTests.java | 0 .../zhouxy/plusone/commons/SerialTests.java | 0 .../plusone/commons/base/IWithCodeTests.java | 0 .../zhouxy/plusone/commons/base/RefTests.java | 0 .../collection/CollectionToolsTests.java | 0 .../commons/constant/PatternConstsTests.java | 0 .../test/InvalidInputExceptionTests.java | 0 .../test/ParsingFailureExceptionTests.java | 0 .../commons/function/FunctionTests.java | 0 .../model/Chinese2ndGenIDCardNumberTests.java | 0 .../model/ValidatableStringRecordTests.java | 0 .../CustomUnifiedResponseFactoryTests.java | 0 .../model/dto/UnifiedResponseTests.java | 0 .../PagingAndSortingQueryParamsTests.java | 0 .../plusone/commons/time/QuarterTests.java | 0 .../commons/time/YearQuarterTests.java | 0 .../plusone/commons/util/ArrayToolsTests.java | 0 .../commons/util/AssertToolsTests.java | 0 .../commons/util/BigDecimalsTests.java | 0 .../commons/util/DateTimeToolsTests.java | 4 +- .../plusone/commons/util/EnumToolsTests.java | 0 .../commons/util/IdGeneratorTests.java | 0 .../plusone/commons/util/NumbersTests.java | 0 .../commons/util/OptionalToolsTests.java | 0 .../commons/util/RandomToolsTests.java | 0 .../plusone/commons/util/RegexToolsTests.java | 0 .../commons/util/StringToolsTests.java | 0 .../commons/util/TreeBuilderTests.java | 0 .../src}/test/resources/mybatis-config.xml | 0 .../test/AccountQueries/AccountQueries.xml | 0 plusone-dependencies/pom.xml | 271 ++++++++++++++++++ pom.xml | 176 +----------- 105 files changed, 418 insertions(+), 172 deletions(-) create mode 100644 plusone-commons/pom.xml rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/annotation/ReaderMethod.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/annotation/StaticFactoryMethod.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/annotation/UnsupportedOperation.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/annotation/ValueObject.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/annotation/Virtual.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/annotation/WriterMethod.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/annotation/package-info.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/base/IWithCode.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/base/IWithIntCode.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/base/IWithLongCode.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/base/Ref.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/base/package-info.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/collection/CollectionTools.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/collection/package-info.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/constant/PatternConsts.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/constant/RegexConsts.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/constant/package-info.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/exception/DataNotExistsException.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/exception/MultiTypesException.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/exception/ParsingFailureException.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/exception/business/BizException.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/exception/business/InvalidInputException.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/exception/business/RequestParamsException.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/exception/business/package-info.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/exception/package-info.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/exception/system/DataOperationResultException.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/exception/system/NoAvailableMacFoundException.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/exception/system/SysException.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/exception/system/package-info.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/function/BoolUnaryOperator.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/function/CharUnaryOperator.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/function/Executable.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/function/OptionalSupplier.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/function/PredicateTools.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/function/ThrowingConsumer.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/function/ThrowingFunction.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/function/ThrowingPredicate.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/function/ThrowingSupplier.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/function/ToOptionalBiFunction.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/function/ToOptionalFunction.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/function/package-info.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/model/Chinese2ndGenIDCardNumber.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/model/Gender.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/model/IDCardNumber.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/model/ValidatableStringRecord.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/model/dto/PageResult.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/model/dto/PagingAndSortingQueryParams.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/model/dto/PagingParams.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/model/dto/UnifiedResponse.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/model/dto/UnifiedResponses.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/model/dto/package-info.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/model/package-info.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/time/Quarter.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/time/YearQuarter.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/time/package-info.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/util/ArrayTools.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/util/AssertTools.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/util/BigDecimals.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/util/DateTimeTools.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/util/EnumTools.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/util/Enumeration.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/util/IdGenerator.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/util/IdWorker.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/util/Numbers.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/util/OptionalTools.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/util/RandomTools.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/util/RegexTools.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/util/SnowflakeIdGenerator.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/util/StringTools.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/util/TreeBuilder.java (100%) rename {src => plusone-commons/src}/main/java/xyz/zhouxy/plusone/commons/util/package-info.java (100%) rename {src => plusone-commons/src}/test/java/xyz/zhouxy/plusone/commons/EnumerationTests.java (100%) rename {src => plusone-commons/src}/test/java/xyz/zhouxy/plusone/commons/SerialTests.java (100%) rename {src => plusone-commons/src}/test/java/xyz/zhouxy/plusone/commons/base/IWithCodeTests.java (100%) rename {src => plusone-commons/src}/test/java/xyz/zhouxy/plusone/commons/base/RefTests.java (100%) rename {src => plusone-commons/src}/test/java/xyz/zhouxy/plusone/commons/collection/CollectionToolsTests.java (100%) rename {src => plusone-commons/src}/test/java/xyz/zhouxy/plusone/commons/constant/PatternConstsTests.java (100%) rename {src => plusone-commons/src}/test/java/xyz/zhouxy/plusone/commons/exception/test/InvalidInputExceptionTests.java (100%) rename {src => plusone-commons/src}/test/java/xyz/zhouxy/plusone/commons/exception/test/ParsingFailureExceptionTests.java (100%) rename {src => plusone-commons/src}/test/java/xyz/zhouxy/plusone/commons/function/FunctionTests.java (100%) rename {src => plusone-commons/src}/test/java/xyz/zhouxy/plusone/commons/model/Chinese2ndGenIDCardNumberTests.java (100%) rename {src => plusone-commons/src}/test/java/xyz/zhouxy/plusone/commons/model/ValidatableStringRecordTests.java (100%) rename {src => plusone-commons/src}/test/java/xyz/zhouxy/plusone/commons/model/dto/CustomUnifiedResponseFactoryTests.java (100%) rename {src => plusone-commons/src}/test/java/xyz/zhouxy/plusone/commons/model/dto/UnifiedResponseTests.java (100%) rename {src => plusone-commons/src}/test/java/xyz/zhouxy/plusone/commons/model/dto/test/PagingAndSortingQueryParamsTests.java (100%) rename {src => plusone-commons/src}/test/java/xyz/zhouxy/plusone/commons/time/QuarterTests.java (100%) rename {src => plusone-commons/src}/test/java/xyz/zhouxy/plusone/commons/time/YearQuarterTests.java (100%) rename {src => plusone-commons/src}/test/java/xyz/zhouxy/plusone/commons/util/ArrayToolsTests.java (100%) rename {src => plusone-commons/src}/test/java/xyz/zhouxy/plusone/commons/util/AssertToolsTests.java (100%) rename {src => plusone-commons/src}/test/java/xyz/zhouxy/plusone/commons/util/BigDecimalsTests.java (100%) rename {src => plusone-commons/src}/test/java/xyz/zhouxy/plusone/commons/util/DateTimeToolsTests.java (99%) rename {src => plusone-commons/src}/test/java/xyz/zhouxy/plusone/commons/util/EnumToolsTests.java (100%) rename {src => plusone-commons/src}/test/java/xyz/zhouxy/plusone/commons/util/IdGeneratorTests.java (100%) rename {src => plusone-commons/src}/test/java/xyz/zhouxy/plusone/commons/util/NumbersTests.java (100%) rename {src => plusone-commons/src}/test/java/xyz/zhouxy/plusone/commons/util/OptionalToolsTests.java (100%) rename {src => plusone-commons/src}/test/java/xyz/zhouxy/plusone/commons/util/RandomToolsTests.java (100%) rename {src => plusone-commons/src}/test/java/xyz/zhouxy/plusone/commons/util/RegexToolsTests.java (100%) rename {src => plusone-commons/src}/test/java/xyz/zhouxy/plusone/commons/util/StringToolsTests.java (100%) rename {src => plusone-commons/src}/test/java/xyz/zhouxy/plusone/commons/util/TreeBuilderTests.java (100%) rename {src => plusone-commons/src}/test/resources/mybatis-config.xml (100%) rename {src => plusone-commons/src}/test/resources/xyz/zhouxy/plusone/commons/model/dto/test/AccountQueries/AccountQueries.xml (100%) create mode 100644 plusone-dependencies/pom.xml diff --git a/cspell.json b/cspell.json index a9bde5a..466900a 100644 --- a/cspell.json +++ b/cspell.json @@ -14,25 +14,31 @@ "cspell", "databind", "datasource", + "dbutils", "fasterxml", "findbugs", "gson", "Hikari", "hutool", + "jasypt", + "jbcrypt", "Jdbc", "joda", "logback", "mapstruct", + "mindrot", "Multimap", "Multiset", "mybatis", "Nonnull", "NOSONAR", "okhttp", + "ooxml", "overriden", "plusone", "println", "projectlombok", + "querydsl", "regexs", "Seata", "sonarlint", diff --git a/plusone-commons/pom.xml b/plusone-commons/pom.xml new file mode 100644 index 0000000..441116c --- /dev/null +++ b/plusone-commons/pom.xml @@ -0,0 +1,133 @@ + + + 4.0.0 + + + xyz.zhouxy.plusone + plusone-parent + 1.1.0-SNAPSHOT + + + plusone-commons + + + 常见工具集,结合 guava 使用。 + + + + UTF-8 + 1.8 + 1.8 + 1.8 + + + + + + xyz.zhouxy.plusone + plusone-dependencies + 1.1.0-SNAPSHOT + pom + import + + + + + + + + + + com.google.code.findbugs + jsr305 + + + + com.google.guava + guava + + + + joda-time + joda-time + true + + + + + + org.apache.commons + commons-lang3 + test + + + + ch.qos.logback + logback-classic + test + + + + org.junit.jupiter + junit-jupiter-api + test + + + org.junit.jupiter + junit-jupiter-engine + test + + + org.junit.jupiter + junit-jupiter-params + test + + + + org.projectlombok + lombok + true + test + + + + cn.hutool + hutool-core + test + + + + org.mybatis + mybatis + test + + + + com.h2database + h2 + test + + + + + com.fasterxml.jackson.core + jackson-databind + test + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + test + + + + com.google.code.gson + gson + test + + + + + diff --git a/src/main/java/xyz/zhouxy/plusone/commons/annotation/ReaderMethod.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/annotation/ReaderMethod.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/annotation/ReaderMethod.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/annotation/ReaderMethod.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/annotation/StaticFactoryMethod.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/annotation/StaticFactoryMethod.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/annotation/StaticFactoryMethod.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/annotation/StaticFactoryMethod.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/annotation/UnsupportedOperation.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/annotation/UnsupportedOperation.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/annotation/UnsupportedOperation.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/annotation/UnsupportedOperation.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/annotation/ValueObject.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/annotation/ValueObject.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/annotation/ValueObject.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/annotation/ValueObject.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/annotation/Virtual.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/annotation/Virtual.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/annotation/Virtual.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/annotation/Virtual.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/annotation/WriterMethod.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/annotation/WriterMethod.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/annotation/WriterMethod.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/annotation/WriterMethod.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/annotation/package-info.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/annotation/package-info.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/annotation/package-info.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/annotation/package-info.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/base/IWithCode.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/base/IWithCode.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/base/IWithCode.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/base/IWithCode.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/base/IWithIntCode.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/base/IWithIntCode.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/base/IWithIntCode.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/base/IWithIntCode.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/base/IWithLongCode.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/base/IWithLongCode.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/base/IWithLongCode.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/base/IWithLongCode.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/base/Ref.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/base/Ref.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/base/Ref.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/base/Ref.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/base/package-info.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/base/package-info.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/base/package-info.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/base/package-info.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/collection/CollectionTools.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/collection/CollectionTools.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/collection/CollectionTools.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/collection/CollectionTools.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/collection/package-info.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/collection/package-info.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/collection/package-info.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/collection/package-info.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/constant/PatternConsts.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/constant/PatternConsts.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/constant/PatternConsts.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/constant/PatternConsts.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/constant/RegexConsts.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/constant/RegexConsts.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/constant/RegexConsts.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/constant/RegexConsts.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/constant/package-info.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/constant/package-info.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/constant/package-info.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/constant/package-info.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/exception/DataNotExistsException.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/exception/DataNotExistsException.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/exception/DataNotExistsException.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/exception/DataNotExistsException.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/exception/MultiTypesException.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/exception/MultiTypesException.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/exception/MultiTypesException.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/exception/MultiTypesException.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/exception/ParsingFailureException.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/exception/ParsingFailureException.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/exception/ParsingFailureException.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/exception/ParsingFailureException.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/exception/business/BizException.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/exception/business/BizException.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/exception/business/BizException.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/exception/business/BizException.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/exception/business/InvalidInputException.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/exception/business/InvalidInputException.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/exception/business/InvalidInputException.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/exception/business/InvalidInputException.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/exception/business/RequestParamsException.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/exception/business/RequestParamsException.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/exception/business/RequestParamsException.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/exception/business/RequestParamsException.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/exception/business/package-info.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/exception/business/package-info.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/exception/business/package-info.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/exception/business/package-info.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/exception/package-info.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/exception/package-info.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/exception/package-info.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/exception/package-info.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/exception/system/DataOperationResultException.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/exception/system/DataOperationResultException.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/exception/system/DataOperationResultException.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/exception/system/DataOperationResultException.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/exception/system/NoAvailableMacFoundException.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/exception/system/NoAvailableMacFoundException.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/exception/system/NoAvailableMacFoundException.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/exception/system/NoAvailableMacFoundException.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/exception/system/SysException.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/exception/system/SysException.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/exception/system/SysException.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/exception/system/SysException.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/exception/system/package-info.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/exception/system/package-info.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/exception/system/package-info.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/exception/system/package-info.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/function/BoolUnaryOperator.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/function/BoolUnaryOperator.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/function/BoolUnaryOperator.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/function/BoolUnaryOperator.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/function/CharUnaryOperator.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/function/CharUnaryOperator.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/function/CharUnaryOperator.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/function/CharUnaryOperator.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/function/Executable.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/function/Executable.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/function/Executable.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/function/Executable.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/function/OptionalSupplier.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/function/OptionalSupplier.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/function/OptionalSupplier.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/function/OptionalSupplier.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/function/PredicateTools.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/function/PredicateTools.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/function/PredicateTools.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/function/PredicateTools.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/function/ThrowingConsumer.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/function/ThrowingConsumer.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/function/ThrowingConsumer.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/function/ThrowingConsumer.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/function/ThrowingFunction.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/function/ThrowingFunction.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/function/ThrowingFunction.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/function/ThrowingFunction.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/function/ThrowingPredicate.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/function/ThrowingPredicate.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/function/ThrowingPredicate.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/function/ThrowingPredicate.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/function/ThrowingSupplier.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/function/ThrowingSupplier.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/function/ThrowingSupplier.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/function/ThrowingSupplier.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/function/ToOptionalBiFunction.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/function/ToOptionalBiFunction.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/function/ToOptionalBiFunction.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/function/ToOptionalBiFunction.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/function/ToOptionalFunction.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/function/ToOptionalFunction.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/function/ToOptionalFunction.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/function/ToOptionalFunction.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/function/package-info.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/function/package-info.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/function/package-info.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/function/package-info.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/model/Chinese2ndGenIDCardNumber.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/model/Chinese2ndGenIDCardNumber.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/model/Chinese2ndGenIDCardNumber.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/model/Chinese2ndGenIDCardNumber.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/model/Gender.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/model/Gender.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/model/Gender.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/model/Gender.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/model/IDCardNumber.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/model/IDCardNumber.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/model/IDCardNumber.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/model/IDCardNumber.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/model/ValidatableStringRecord.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/model/ValidatableStringRecord.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/model/ValidatableStringRecord.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/model/ValidatableStringRecord.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/model/dto/PageResult.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/model/dto/PageResult.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/model/dto/PageResult.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/model/dto/PageResult.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/model/dto/PagingAndSortingQueryParams.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/model/dto/PagingAndSortingQueryParams.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/model/dto/PagingAndSortingQueryParams.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/model/dto/PagingAndSortingQueryParams.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/model/dto/PagingParams.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/model/dto/PagingParams.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/model/dto/PagingParams.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/model/dto/PagingParams.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/model/dto/UnifiedResponse.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/model/dto/UnifiedResponse.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/model/dto/UnifiedResponse.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/model/dto/UnifiedResponse.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/model/dto/UnifiedResponses.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/model/dto/UnifiedResponses.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/model/dto/UnifiedResponses.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/model/dto/UnifiedResponses.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/model/dto/package-info.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/model/dto/package-info.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/model/dto/package-info.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/model/dto/package-info.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/model/package-info.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/model/package-info.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/model/package-info.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/model/package-info.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/time/Quarter.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/time/Quarter.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/time/Quarter.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/time/Quarter.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/time/YearQuarter.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/time/YearQuarter.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/time/YearQuarter.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/time/YearQuarter.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/time/package-info.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/time/package-info.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/time/package-info.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/time/package-info.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/util/ArrayTools.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/util/ArrayTools.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/util/ArrayTools.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/util/ArrayTools.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/util/AssertTools.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/util/AssertTools.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/util/AssertTools.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/util/AssertTools.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/util/BigDecimals.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/util/BigDecimals.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/util/BigDecimals.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/util/BigDecimals.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/util/DateTimeTools.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/util/DateTimeTools.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/util/DateTimeTools.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/util/DateTimeTools.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/util/EnumTools.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/util/EnumTools.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/util/EnumTools.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/util/EnumTools.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/util/Enumeration.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/util/Enumeration.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/util/Enumeration.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/util/Enumeration.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/util/IdGenerator.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/util/IdGenerator.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/util/IdGenerator.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/util/IdGenerator.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/util/IdWorker.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/util/IdWorker.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/util/IdWorker.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/util/IdWorker.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/util/Numbers.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/util/Numbers.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/util/Numbers.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/util/Numbers.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/util/OptionalTools.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/util/OptionalTools.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/util/OptionalTools.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/util/OptionalTools.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/util/RandomTools.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/util/RandomTools.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/util/RandomTools.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/util/RandomTools.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/util/RegexTools.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/util/RegexTools.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/util/RegexTools.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/util/RegexTools.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/util/SnowflakeIdGenerator.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/util/SnowflakeIdGenerator.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/util/SnowflakeIdGenerator.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/util/SnowflakeIdGenerator.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/util/StringTools.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/util/StringTools.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/util/StringTools.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/util/StringTools.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/util/TreeBuilder.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/util/TreeBuilder.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/util/TreeBuilder.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/util/TreeBuilder.java diff --git a/src/main/java/xyz/zhouxy/plusone/commons/util/package-info.java b/plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/util/package-info.java similarity index 100% rename from src/main/java/xyz/zhouxy/plusone/commons/util/package-info.java rename to plusone-commons/src/main/java/xyz/zhouxy/plusone/commons/util/package-info.java diff --git a/src/test/java/xyz/zhouxy/plusone/commons/EnumerationTests.java b/plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/EnumerationTests.java similarity index 100% rename from src/test/java/xyz/zhouxy/plusone/commons/EnumerationTests.java rename to plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/EnumerationTests.java diff --git a/src/test/java/xyz/zhouxy/plusone/commons/SerialTests.java b/plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/SerialTests.java similarity index 100% rename from src/test/java/xyz/zhouxy/plusone/commons/SerialTests.java rename to plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/SerialTests.java diff --git a/src/test/java/xyz/zhouxy/plusone/commons/base/IWithCodeTests.java b/plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/base/IWithCodeTests.java similarity index 100% rename from src/test/java/xyz/zhouxy/plusone/commons/base/IWithCodeTests.java rename to plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/base/IWithCodeTests.java diff --git a/src/test/java/xyz/zhouxy/plusone/commons/base/RefTests.java b/plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/base/RefTests.java similarity index 100% rename from src/test/java/xyz/zhouxy/plusone/commons/base/RefTests.java rename to plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/base/RefTests.java diff --git a/src/test/java/xyz/zhouxy/plusone/commons/collection/CollectionToolsTests.java b/plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/collection/CollectionToolsTests.java similarity index 100% rename from src/test/java/xyz/zhouxy/plusone/commons/collection/CollectionToolsTests.java rename to plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/collection/CollectionToolsTests.java diff --git a/src/test/java/xyz/zhouxy/plusone/commons/constant/PatternConstsTests.java b/plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/constant/PatternConstsTests.java similarity index 100% rename from src/test/java/xyz/zhouxy/plusone/commons/constant/PatternConstsTests.java rename to plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/constant/PatternConstsTests.java diff --git a/src/test/java/xyz/zhouxy/plusone/commons/exception/test/InvalidInputExceptionTests.java b/plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/exception/test/InvalidInputExceptionTests.java similarity index 100% rename from src/test/java/xyz/zhouxy/plusone/commons/exception/test/InvalidInputExceptionTests.java rename to plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/exception/test/InvalidInputExceptionTests.java diff --git a/src/test/java/xyz/zhouxy/plusone/commons/exception/test/ParsingFailureExceptionTests.java b/plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/exception/test/ParsingFailureExceptionTests.java similarity index 100% rename from src/test/java/xyz/zhouxy/plusone/commons/exception/test/ParsingFailureExceptionTests.java rename to plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/exception/test/ParsingFailureExceptionTests.java diff --git a/src/test/java/xyz/zhouxy/plusone/commons/function/FunctionTests.java b/plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/function/FunctionTests.java similarity index 100% rename from src/test/java/xyz/zhouxy/plusone/commons/function/FunctionTests.java rename to plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/function/FunctionTests.java diff --git a/src/test/java/xyz/zhouxy/plusone/commons/model/Chinese2ndGenIDCardNumberTests.java b/plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/model/Chinese2ndGenIDCardNumberTests.java similarity index 100% rename from src/test/java/xyz/zhouxy/plusone/commons/model/Chinese2ndGenIDCardNumberTests.java rename to plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/model/Chinese2ndGenIDCardNumberTests.java diff --git a/src/test/java/xyz/zhouxy/plusone/commons/model/ValidatableStringRecordTests.java b/plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/model/ValidatableStringRecordTests.java similarity index 100% rename from src/test/java/xyz/zhouxy/plusone/commons/model/ValidatableStringRecordTests.java rename to plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/model/ValidatableStringRecordTests.java diff --git a/src/test/java/xyz/zhouxy/plusone/commons/model/dto/CustomUnifiedResponseFactoryTests.java b/plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/model/dto/CustomUnifiedResponseFactoryTests.java similarity index 100% rename from src/test/java/xyz/zhouxy/plusone/commons/model/dto/CustomUnifiedResponseFactoryTests.java rename to plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/model/dto/CustomUnifiedResponseFactoryTests.java diff --git a/src/test/java/xyz/zhouxy/plusone/commons/model/dto/UnifiedResponseTests.java b/plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/model/dto/UnifiedResponseTests.java similarity index 100% rename from src/test/java/xyz/zhouxy/plusone/commons/model/dto/UnifiedResponseTests.java rename to plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/model/dto/UnifiedResponseTests.java diff --git a/src/test/java/xyz/zhouxy/plusone/commons/model/dto/test/PagingAndSortingQueryParamsTests.java b/plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/model/dto/test/PagingAndSortingQueryParamsTests.java similarity index 100% rename from src/test/java/xyz/zhouxy/plusone/commons/model/dto/test/PagingAndSortingQueryParamsTests.java rename to plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/model/dto/test/PagingAndSortingQueryParamsTests.java diff --git a/src/test/java/xyz/zhouxy/plusone/commons/time/QuarterTests.java b/plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/time/QuarterTests.java similarity index 100% rename from src/test/java/xyz/zhouxy/plusone/commons/time/QuarterTests.java rename to plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/time/QuarterTests.java diff --git a/src/test/java/xyz/zhouxy/plusone/commons/time/YearQuarterTests.java b/plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/time/YearQuarterTests.java similarity index 100% rename from src/test/java/xyz/zhouxy/plusone/commons/time/YearQuarterTests.java rename to plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/time/YearQuarterTests.java diff --git a/src/test/java/xyz/zhouxy/plusone/commons/util/ArrayToolsTests.java b/plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/util/ArrayToolsTests.java similarity index 100% rename from src/test/java/xyz/zhouxy/plusone/commons/util/ArrayToolsTests.java rename to plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/util/ArrayToolsTests.java diff --git a/src/test/java/xyz/zhouxy/plusone/commons/util/AssertToolsTests.java b/plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/util/AssertToolsTests.java similarity index 100% rename from src/test/java/xyz/zhouxy/plusone/commons/util/AssertToolsTests.java rename to plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/util/AssertToolsTests.java diff --git a/src/test/java/xyz/zhouxy/plusone/commons/util/BigDecimalsTests.java b/plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/util/BigDecimalsTests.java similarity index 100% rename from src/test/java/xyz/zhouxy/plusone/commons/util/BigDecimalsTests.java rename to plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/util/BigDecimalsTests.java diff --git a/src/test/java/xyz/zhouxy/plusone/commons/util/DateTimeToolsTests.java b/plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/util/DateTimeToolsTests.java similarity index 99% rename from src/test/java/xyz/zhouxy/plusone/commons/util/DateTimeToolsTests.java rename to plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/util/DateTimeToolsTests.java index 28f501a..26f9556 100644 --- a/src/test/java/xyz/zhouxy/plusone/commons/util/DateTimeToolsTests.java +++ b/plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/util/DateTimeToolsTests.java @@ -400,7 +400,7 @@ class DateTimeToolsTests { // ================================ // ================================ - // #region - ZondId <--> DateTimeZone + // #region - ZoneId <--> DateTimeZone // ================================ @Test @@ -412,7 +412,7 @@ class DateTimeToolsTests { } // ================================ - // #endregion - ZondId <--> DateTimeZone + // #endregion - ZoneId <--> DateTimeZone // ================================ // ================================ diff --git a/src/test/java/xyz/zhouxy/plusone/commons/util/EnumToolsTests.java b/plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/util/EnumToolsTests.java similarity index 100% rename from src/test/java/xyz/zhouxy/plusone/commons/util/EnumToolsTests.java rename to plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/util/EnumToolsTests.java diff --git a/src/test/java/xyz/zhouxy/plusone/commons/util/IdGeneratorTests.java b/plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/util/IdGeneratorTests.java similarity index 100% rename from src/test/java/xyz/zhouxy/plusone/commons/util/IdGeneratorTests.java rename to plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/util/IdGeneratorTests.java diff --git a/src/test/java/xyz/zhouxy/plusone/commons/util/NumbersTests.java b/plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/util/NumbersTests.java similarity index 100% rename from src/test/java/xyz/zhouxy/plusone/commons/util/NumbersTests.java rename to plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/util/NumbersTests.java diff --git a/src/test/java/xyz/zhouxy/plusone/commons/util/OptionalToolsTests.java b/plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/util/OptionalToolsTests.java similarity index 100% rename from src/test/java/xyz/zhouxy/plusone/commons/util/OptionalToolsTests.java rename to plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/util/OptionalToolsTests.java diff --git a/src/test/java/xyz/zhouxy/plusone/commons/util/RandomToolsTests.java b/plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/util/RandomToolsTests.java similarity index 100% rename from src/test/java/xyz/zhouxy/plusone/commons/util/RandomToolsTests.java rename to plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/util/RandomToolsTests.java diff --git a/src/test/java/xyz/zhouxy/plusone/commons/util/RegexToolsTests.java b/plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/util/RegexToolsTests.java similarity index 100% rename from src/test/java/xyz/zhouxy/plusone/commons/util/RegexToolsTests.java rename to plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/util/RegexToolsTests.java diff --git a/src/test/java/xyz/zhouxy/plusone/commons/util/StringToolsTests.java b/plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/util/StringToolsTests.java similarity index 100% rename from src/test/java/xyz/zhouxy/plusone/commons/util/StringToolsTests.java rename to plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/util/StringToolsTests.java diff --git a/src/test/java/xyz/zhouxy/plusone/commons/util/TreeBuilderTests.java b/plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/util/TreeBuilderTests.java similarity index 100% rename from src/test/java/xyz/zhouxy/plusone/commons/util/TreeBuilderTests.java rename to plusone-commons/src/test/java/xyz/zhouxy/plusone/commons/util/TreeBuilderTests.java diff --git a/src/test/resources/mybatis-config.xml b/plusone-commons/src/test/resources/mybatis-config.xml similarity index 100% rename from src/test/resources/mybatis-config.xml rename to plusone-commons/src/test/resources/mybatis-config.xml diff --git a/src/test/resources/xyz/zhouxy/plusone/commons/model/dto/test/AccountQueries/AccountQueries.xml b/plusone-commons/src/test/resources/xyz/zhouxy/plusone/commons/model/dto/test/AccountQueries/AccountQueries.xml similarity index 100% rename from src/test/resources/xyz/zhouxy/plusone/commons/model/dto/test/AccountQueries/AccountQueries.xml rename to plusone-commons/src/test/resources/xyz/zhouxy/plusone/commons/model/dto/test/AccountQueries/AccountQueries.xml diff --git a/plusone-dependencies/pom.xml b/plusone-dependencies/pom.xml new file mode 100644 index 0000000..9a72e15 --- /dev/null +++ b/plusone-dependencies/pom.xml @@ -0,0 +1,271 @@ + + + 4.0.0 + + + xyz.zhouxy.plusone + plusone-parent + 1.1.0-SNAPSHOT + + + plusone-dependencies + pom + + + plusone 相关项目依赖管理 + + + + UTF-8 + 1.8 + 1.8 + 1.8 + + 33.4.2-jre + 2.14.0 + + 3.0.2 + 3.49.2 + + 3.17.0 + 4.5.0 + 2.19.0 + 1.8.1 + 1.2.0 + + 1.2.13 + + 2.18.3 + 2.13.1 + + 1.6.3 + + 2.2.224 + 3.5.19 + 5.1.0 + + 1.17.5 + + 5.4.1 + + 4.5.0 + 1.9.3 + 0.4 + + 1.18.36 + 5.8.37 + + 5.12.1 + + + + + + com.google.guava + guava + ${guava.version} + + + + joda-time + joda-time + ${joda-time.version} + + + + com.google.code.findbugs + jsr305 + ${google-jsr305.version} + + + org.checkerframework + checker-qual + ${checker-qual.version} + + + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + + + org.apache.commons + commons-collections4 + ${commons-collections4.version} + + + commons-io + commons-io + ${commons-io.version} + + + commons-dbutils + commons-dbutils + ${commons-dbutils.version} + + + org.apache.commons + commons-crypto + ${commons-crypto.version} + + + + ch.qos.logback + logback-classic + ${logback.version} + + + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + ${jackson.version} + + + + com.google.code.gson + gson + ${gson.version} + + + + org.mapstruct + mapstruct + ${mapstruct.version} + + + + com.h2database + h2 + ${h2.version} + + + org.mybatis + mybatis + ${mybatis.version} + + + + com.querydsl + querydsl-sql + ${querydsl.version} + + + + net.bytebuddy + byte-buddy + ${byte-buddy.version} + + + + + org.apache.poi + poi + ${poi.version} + + + + org.apache.poi + poi-ooxml + ${poi.version} + + + + com.auth0 + java-jwt + ${java-jwt.version} + + + org.jasypt + jasypt + #{jasypt.version} + + + org.mindrot + jbcrypt + ${jbcrypt.version} + + + + org.projectlombok + lombok + ${lombok.version} + true + + + + cn.hutool + hutool-bom + ${hutool.version} + pom + import + + + + org.junit.jupiter + junit-jupiter-api + ${junit.version} + + + org.junit.jupiter + junit-jupiter-engine + ${junit.version} + + + org.junit.jupiter + junit-jupiter-params + ${junit.version} + + + + + + + + + maven-clean-plugin + 3.2.0 + + + maven-resources-plugin + 3.3.1 + + + maven-compiler-plugin + 3.11.0 + + + maven-surefire-plugin + 3.0.0 + + + maven-jar-plugin + 3.3.0 + + + maven-install-plugin + 3.1.1 + + + maven-deploy-plugin + 3.1.1 + + + maven-site-plugin + 4.0.0-M7 + + + maven-project-info-reports-plugin + 3.4.2 + + + + + diff --git a/pom.xml b/pom.xml index 3558cdd..addf887 100644 --- a/pom.xml +++ b/pom.xml @@ -5,178 +5,14 @@ 4.0.0 xyz.zhouxy.plusone - plusone-commons + plusone-parent 1.1.0-SNAPSHOT + pom - - - UTF-8 - 1.8 - 1.8 - 1.8 - - - 33.4.2-jre - 2.14.0 - - - 3.17.0 - 1.2.13 - 5.12.1 - 1.18.36 - 5.8.37 - 3.5.19 - 2.2.224 - 2.18.3 - 2.12.1 - - - - - - - - com.google.guava - guava - ${guava.version} - - - - joda-time - joda-time - ${joda-time.version} - true - - - - - - org.apache.commons - commons-lang3 - ${commons-lang3.version} - test - - - - ch.qos.logback - logback-classic - ${logback.version} - test - - - - org.junit.jupiter - junit-jupiter-api - ${junit.version} - test - - - org.junit.jupiter - junit-jupiter-engine - ${junit.version} - test - - - org.junit.jupiter - junit-jupiter-params - ${junit.version} - test - - - - org.projectlombok - lombok - ${lombok.version} - true - test - - - - cn.hutool - hutool-core - ${hutool.version} - test - - - - org.mybatis - mybatis - ${mybatis.version} - test - - - - com.h2database - h2 - ${h2.version} - test - - - - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - test - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - ${jackson.version} - test - - - - com.google.code.gson - gson - ${gson.version} - test - - - - - - - - - maven-clean-plugin - 3.2.0 - - - maven-resources-plugin - 3.3.1 - - - maven-compiler-plugin - 3.11.0 - - - maven-surefire-plugin - 3.0.0 - - - maven-jar-plugin - 3.3.0 - - - maven-install-plugin - 3.1.1 - - - maven-deploy-plugin - 3.1.1 - - - maven-site-plugin - 4.0.0-M7 - - - maven-project-info-reports-plugin - 3.4.2 - - - - + + plusone-commons + plusone-dependencies +